Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 21453: Start Implement HEL 1. Start implement HEL Inisate 2. Start implement HEL GetAvailMem
by aleksey＠studiocerebral.com 04 Apr '06

04 Apr '06

Author: greatlrd Date: Tue Apr 4 15:49:55 2006 New Revision: 21453 URL: http://svn.reactos.ru/svn/reactos?rev=21453&view=rev Log: Start Implement HEL 1. Start implement HEL Inisate 2. Start implement HEL GetAvailMem Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Tue Apr 4 15:49:55 2006 @@ -19,8 +19,7 @@ Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - HRESULT ret; - + if (iface==NULL) { return DDERR_NOTINITIALIZED; @@ -46,13 +45,10 @@ // call software first - if((ret = Hal_DirectDraw_Initialize (iface)) != DD_OK) - return ret; - - // ... then overwrite with hal - if((ret = Hel_DirectDraw_Initialize (iface)) != DD_OK) - return ret; - + Hal_DirectDraw_Initialize (iface); + + Hel_DirectDraw_Initialize (iface); + return DD_OK; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Tue Apr 4 15:49:55 2006 @@ -53,6 +53,9 @@ DWORD cooperative_level; BOOL InitializeDraw; + + /* HEL stuff */ + DWORD HELMemoryAvilable; } IDirectDrawImpl; @@ -136,6 +139,10 @@ HRESULT Hel_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 , DWORD , DWORD ,DWORD , DWORD , DWORD ); HRESULT Hel_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); +/* Setting for HEL should be move to ros special reg key ? */ + +/* setup how much graphic memory should hel be limit, set it now to 64MB */ +#define HEL_GRAPHIC_MEMORY_MAX 67108864 /*********** Macros ***********/ Modified: trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c Tue Apr 4 15:49:55 2006 @@ -11,8 +11,13 @@ #include "rosdraw.h" + HRESULT Hel_DirectDraw_Initialize (LPDIRECTDRAW7 iface) { + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + This->HELMemoryAvilable = HEL_GRAPHIC_MEMORY_MAX; + return DD_OK; } @@ -29,7 +34,11 @@ HRESULT Hel_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, LPDWORD total, LPDWORD free) { - DX_STUB; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + *total = HEL_GRAPHIC_MEMORY_MAX; + *free = This->HELMemoryAvilable; + return DD_OK; }

1 0

[cwittich] 21452: fix some warnings when compiling with msvc
by aleksey＠studiocerebral.com 03 Apr '06

03 Apr '06

Author: cwittich Date: Mon Apr 3 22:26:52 2006 New Revision: 21452 URL: http://svn.reactos.ru/svn/reactos?rev=21452&view=rev Log: fix some warnings when compiling with msvc Modified: trunk/reactos/base/applications/games/winemine/De.rc (contents, props changed) trunk/reactos/base/applications/games/winemine/En.rc (contents, props changed) trunk/reactos/base/applications/games/winemine/resource.h (contents, props changed) Modified: trunk/reactos/base/applications/games/winemine/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/games/win… ============================================================================== --- trunk/reactos/base/applications/games/winemine/De.rc (original) +++ trunk/reactos/base/applications/games/winemine/De.rc Mon Apr 3 22:26:52 2006 @@ -32,10 +32,10 @@ WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Bestzeiten" { - GROUPBOX "Bestzeiten", IDIGNORE, 10, 10, 140, 45 - LTEXT "Anfänger", IDIGNORE, 20, 20, 40, 8 - LTEXT "Fortgeschrittene", IDIGNORE, 20, 30, 40, 8 - LTEXT "Experten", IDIGNORE, 20, 40, 40, 8 + GROUPBOX "Bestzeiten", IDNONE, 10, 10, 140, 45 + LTEXT "Anfänger", IDNONE, 20, 20, 40, 8 + LTEXT "Fortgeschrittene", IDNONE, 20, 30, 40, 8 + LTEXT "Experten", IDNONE, 20, 40, 40, 8 LTEXT "999", IDC_TIME1, 70, 20, 15, 8 LTEXT "999", IDC_TIME2, 70, 30, 15, 8 LTEXT "999", IDC_TIME3, 70, 40, 15, 8 @@ -60,9 +60,9 @@ WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Benutzerdefiniertes Spiel" { - LTEXT "Zeilen", IDIGNORE, 5, 5, 30, 10 - LTEXT "Spalten", IDIGNORE, 5, 35, 30, 10 - LTEXT "Minen", IDIGNORE, 5, 65, 30, 10 + LTEXT "Zeilen", IDNONE, 5, 5, 30, 10 + LTEXT "Spalten", IDNONE, 5, 35, 30, 10 + LTEXT "Minen", IDNONE, 5, 65, 30, 10 EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER @@ -75,9 +75,9 @@ WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "About" { - LTEXT "Winemine", IDIGNORE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDIGNORE, 35, 25, 100, 10 - LTEXT "unter der Wine Lizenz", IDIGNORE, 35, 35, 100, 10 - ICON "WINEMINE", IDIGNORE, 10, 25, 20, 20 + LTEXT "Winemine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "unter der Wine Lizenz", IDNONE, 35, 35, 100, 10 + ICON "WINEMINE", IDNONE, 10, 25, 20, 20 DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 } Propchange: trunk/reactos/base/applications/games/winemine/De.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/base/applications/games/winemine/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/games/win… ============================================================================== --- trunk/reactos/base/applications/games/winemine/En.rc (original) +++ trunk/reactos/base/applications/games/winemine/En.rc Mon Apr 3 22:26:52 2006 @@ -32,10 +32,10 @@ WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Fastest Times" { - GROUPBOX "Fastest Times", IDIGNORE, 10, 10, 140, 45 - LTEXT "Beginner", IDIGNORE, 20, 20, 40, 8 - LTEXT "Advanced", IDIGNORE, 20, 30, 40, 8 - LTEXT "Expert", IDIGNORE, 20, 40, 40, 8 + GROUPBOX "Fastest Times", IDNONE, 10, 10, 140, 45 + LTEXT "Beginner", IDNONE, 20, 20, 40, 8 + LTEXT "Advanced", IDNONE, 20, 30, 40, 8 + LTEXT "Expert", IDNONE, 20, 40, 40, 8 LTEXT "999", IDC_TIME1, 70, 20, 15, 8 LTEXT "999", IDC_TIME2, 70, 30, 15, 8 LTEXT "999", IDC_TIME3, 70, 40, 15, 8 @@ -60,9 +60,9 @@ WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Custom Game" { - LTEXT "Rows", IDIGNORE, 5, 5, 30, 10 - LTEXT "Cols", IDIGNORE, 5, 35, 30, 10 - LTEXT "Mines", IDIGNORE, 5, 65, 30, 10 + LTEXT "Rows", IDNONE, 5, 5, 30, 10 + LTEXT "Cols", IDNONE, 5, 35, 30, 10 + LTEXT "Mines", IDNONE, 5, 65, 30, 10 EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER @@ -75,9 +75,9 @@ WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "About" { - LTEXT "Winemine", IDIGNORE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDIGNORE, 35, 25, 100, 10 - LTEXT "under the Wine license", IDIGNORE, 35, 35, 100, 10 - ICON "WINEMINE", IDIGNORE, 10, 25, 20, 20 + LTEXT "Winemine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "under the Wine license", IDNONE, 35, 35, 100, 10 + ICON "WINEMINE", IDNONE, 10, 25, 20, 20 DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 } Propchange: trunk/reactos/base/applications/games/winemine/En.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/base/applications/games/winemine/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/games/win… ============================================================================== --- trunk/reactos/base/applications/games/winemine/resource.h (original) +++ trunk/reactos/base/applications/games/winemine/resource.h Mon Apr 3 22:26:52 2006 @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#define IDNONE -1 #define ID_TIMER 1000 Propchange: trunk/reactos/base/applications/games/winemine/resource.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 21451: clean up format. I'm not bored, honest....
by aleksey＠studiocerebral.com 03 Apr '06

03 Apr '06

Author: gedmurphy Date: Mon Apr 3 20:50:42 2006 New Revision: 21451 URL: http://svn.reactos.ru/svn/reactos?rev=21451&view=rev Log: clean up format. I'm not bored, honest.... Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=2… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Mon Apr 3 20:50:42 2006 @@ -26,95 +26,95 @@ work to import a new dll. The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-0_9_5 -reactos/tools/wpp # Synced to Wine-0_9_5 -reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-0_9_5 -reactos/tools/wmc # Synced to Wine-0_9_5 -reactos/tools/wrc # Synced to Wine-0_9_5 -reactos/tools/widl # Forked at Wine-20050930 +reactos/tools/unicode # Synced to Wine-0_9_5 +reactos/tools/wpp # Synced to Wine-0_9_5 +reactos/tools/bin2res # Resource to binary converter +reactos/tools/winebuild # Synced to Wine-0_9_5 +reactos/tools/wmc # Synced to Wine-0_9_5 +reactos/tools/wrc # Synced to Wine-0_9_5 +reactos/tools/widl # Forked at Wine-20050930 The following libraries are shared with Wine. -reactos/dll/win32/avifil32 # Synced to Wine-0_9_5 -reactos/dll/win32/cabinet # Synced to Wine-0_9_5 -reactos/dll/win32/comctl32 # Synced to Wine-20060328 -reactos/dll/win32/comdlg32 # Synced to Wine-0_9_5 -reactos/dll/win32/crypt32 # Synced to Wine-0_9_5 -reactos/dll/win32/dbghelp # -reactos/dll/win32/icmp # Synced to Wine-0_9_5 -reactos/dll/win32/imm32 # Synced to Wine-0_9_5 -reactos/dll/win32/iphlpapi # Out of sync -reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. -reactos/dll/win32/mapi32 # Synced to Wine-0_9_5 -reactos/dll/win32/msvcrt20 # Out of sync -reactos/dll/win32/mpr # Synced to Wine-0_9_5 -reactos/dll/win32/msacm # Out of sync -reactos/dll/win32/msimg32 # Synced to Wine-0_9_5 -reactos/dll/win32/msi # Synced to Wine-0_9_5 -reactos/dll/win32/msvideo # Out of sync -reactos/dll/win32/netapi32 # Synced to Wine-0_9_5 -reactos/dll/win32/objsel # Synced to Wine-0_9_5 -reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. -reactos/dll/win32/ole32 # Synced to Wine-0_9_5 -reactos/dll/win32/oleacc # Synced to Wine-0_9_5 -reactos/dll/win32/oleaut32 # Synced to Wine-0_9_10 -reactos/dll/win32/oledlg # Synced to Wine-0_9_5 -reactos/dll/win32/olepro32 # Synced to Wine-0_9_5 -reactos/dll/win32/riched20 # Synced to Wine-0_9_5 -reactos/dll/win32/richedit # Synced to Wine-0_9_5 -reactos/dll/win32/rpcrt4 # Synced to Wine-0_9_10 -reactos/dll/win32/setupapi # Forked at Wine-20050524 -reactos/dll/win32/shell32 # Synced to Wine-0_9_5 -reactos/dll/win32/shdocvw # Synced to Wine-0_9_5 -reactos/dll/win32/shfolder # Synced to Wine-0_9_5 -reactos/dll/win32/shlwapi # Synced to Wine-0_9_5 -reactos/dll/win32/twain # Out of sync -reactos/dll/win32/urlmon # Synced to Wine-0_9_5 -reactos/dll/win32/uxtheme # Synced to Wine-0_9_5 -reactos/dll/win32/version # Out of sync -reactos/dll/win32/wininet # Synced to Wine-0_9_5 -reactos/dll/win32/wintrust # Synced to Wine-0_9_5 -reactos/dll/win32/winmm # Forked at Wine-20050628 -reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 -reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 -reactos/dll/directx/dinput # Synced to Wine-0_9_5 -reactos/dll/directx/dinput8 # Synced to Wine-0_9_5 -reactos/dll/directx/dplay # Synced to Wine-0_9_5 -reactos/dll/directx/dplayx # Synced to Wine-0_9_5 -reactos/dll/directx/dxdiagn # Synced to Wine-0_9_5 +reactos/dll/win32/avifil32 # Synced to Wine-0_9_5 +reactos/dll/win32/cabinet # Synced to Wine-0_9_5 +reactos/dll/win32/comctl32 # Synced to Wine-20060328 +reactos/dll/win32/comdlg32 # Synced to Wine-0_9_5 +reactos/dll/win32/crypt32 # Synced to Wine-0_9_5 +reactos/dll/win32/dbghelp # +reactos/dll/win32/icmp # Synced to Wine-0_9_5 +reactos/dll/win32/imm32 # Synced to Wine-0_9_5 +reactos/dll/win32/iphlpapi # Out of sync +reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. +reactos/dll/win32/mapi32 # Synced to Wine-0_9_5 +reactos/dll/win32/msvcrt20 # Out of sync +reactos/dll/win32/mpr # Synced to Wine-0_9_5 +reactos/dll/win32/msacm # Out of sync +reactos/dll/win32/msimg32 # Synced to Wine-0_9_5 +reactos/dll/win32/msi # Synced to Wine-0_9_5 +reactos/dll/win32/msvideo # Out of sync +reactos/dll/win32/netapi32 # Synced to Wine-0_9_5 +reactos/dll/win32/objsel # Synced to Wine-0_9_5 +reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. +reactos/dll/win32/ole32 # Synced to Wine-0_9_5 +reactos/dll/win32/oleacc # Synced to Wine-0_9_5 +reactos/dll/win32/oleaut32 # Synced to Wine-0_9_10 +reactos/dll/win32/oledlg # Synced to Wine-0_9_5 +reactos/dll/win32/olepro32 # Synced to Wine-0_9_5 +reactos/dll/win32/riched20 # Synced to Wine-0_9_5 +reactos/dll/win32/richedit # Synced to Wine-0_9_5 +reactos/dll/win32/rpcrt4 # Synced to Wine-0_9_10 +reactos/dll/win32/setupapi # Forked at Wine-20050524 +reactos/dll/win32/shell32 # Synced to Wine-0_9_5 +reactos/dll/win32/shdocvw # Synced to Wine-0_9_5 +reactos/dll/win32/shfolder # Synced to Wine-0_9_5 +reactos/dll/win32/shlwapi # Synced to Wine-0_9_5 +reactos/dll/win32/twain # Out of sync +reactos/dll/win32/urlmon # Synced to Wine-0_9_5 +reactos/dll/win32/uxtheme # Synced to Wine-0_9_5 +reactos/dll/win32/version # Out of sync +reactos/dll/win32/wininet # Synced to Wine-0_9_5 +reactos/dll/win32/wintrust # Synced to Wine-0_9_5 +reactos/dll/win32/winmm # Forked at Wine-20050628 +reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 +reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 +reactos/dll/directx/dinput # Synced to Wine-0_9_5 +reactos/dll/directx/dinput8 # Synced to Wine-0_9_5 +reactos/dll/directx/dplay # Synced to Wine-0_9_5 +reactos/dll/directx/dplayx # Synced to Wine-0_9_5 +reactos/dll/directx/dxdiagn # Synced to Wine-0_9_5 ReactOS shares the following programs with Winehq. -reactos/base/applications/regedit # Out of sync -reactos/base/system/expand # Out of sync -reactos/base/system/msiexec # Synced to Wine-0_9_3 +reactos/base/applications/regedit # Out of sync +reactos/base/system/expand # Out of sync +reactos/base/system/msiexec # Synced to Wine-0_9_3 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files check Wine current souces first as it may already be fixed. -reactos/lib/uuid # +reactos/lib/uuid # advapi32 - - reactos/dll/win32/advapi32/crypt/*.c # ekohl says we're not sharing this + reactos/dll/win32/advapi32/crypt/*.c # ekohl says we're not sharing this gdi32 - - reactos/dll/win32/gdi32/objects/linedda.c # Out of sync + reactos/dll/win32/gdi32/objects/linedda.c # Out of sync kernel32 - - reactos/dll/win32/kernel32/misc/errormsg.c # Out of sync - reactos/dll/win32/kernel32/misc/profile.c # Out of sync - reactos/dll/win32/kernel32/misc/lcformat.c # Out of sync + reactos/dll/win32/kernel32/misc/errormsg.c # Out of sync + reactos/dll/win32/kernel32/misc/profile.c # Out of sync + reactos/dll/win32/kernel32/misc/lcformat.c # Out of sync msvcrt - - reactos/dll/win32/msvcrt/wine/*.c # Out of sync + reactos/dll/win32/msvcrt/wine/*.c # Out of sync User32 - - reactos/dll/win32/user32/controls/button.c # Out of sync - reactos/dll/win32/user32/controls/edit.c # Out of sync - reactos/dll/win32/user32/controls/static.c # Out of sync - reactos/dll/win32/user32/misc/wsprintf.c # Out of sync - reactos/dll/win32/user32/windows/mdi.c # Out of sync + reactos/dll/win32/user32/controls/button.c # Out of sync + reactos/dll/win32/user32/controls/edit.c # Out of sync + reactos/dll/win32/user32/controls/static.c # Out of sync + reactos/dll/win32/user32/misc/wsprintf.c # Out of sync + reactos/dll/win32/user32/windows/mdi.c # Out of sync - Cd to the parent directory of your top-level "reactos" directory - Check out the Wine release: "cvs -d :pserver:cvs@cvs.winehq.com:2401/home/wine co wine -r Wine-20050211"

1 0

[cwittich] 21450: fix warning
by aleksey＠studiocerebral.com 02 Apr '06

02 Apr '06

Author: cwittich Date: Mon Apr 3 01:17:14 2006 New Revision: 21450 URL: http://svn.reactos.ru/svn/reactos?rev=21450&view=rev Log: fix warning Modified: trunk/reactos/dll/directx/ddraw/ddraw.def Modified: trunk/reactos/dll/directx/ddraw/ddraw.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.def… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.def (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.def Mon Apr 3 01:17:14 2006 @@ -1,7 +1,7 @@ EXPORTS ;AcquireDDThreadLock ;CompleteCreateSysmemSurface -D3DParseUnknownCommand +D3DParseUnknownCommand@8 ;DDGetAttachedSurfaceLcl ;DDInternalLock ;DDInternalUnlock

1 0

[greatlrd] 21449: Fix Bug 1185 patch from j_anderw(j_anderw@sbox.tugraz.at) Frik85, DrFred and I talk if we shall commit this small hack to getting open office being install in ReactOS or not
by aleksey＠studiocerebral.com 02 Apr '06

02 Apr '06

Author: greatlrd Date: Mon Apr 3 00:37:53 2006 New Revision: 21449 URL: http://svn.reactos.ru/svn/reactos?rev=21449&view=rev Log: Fix Bug 1185 patch from j_anderw(j_anderw(a)sbox.tugraz.at) Frik85, DrFred and I talk if we shall commit this small hack to getting open office being install in ReactOS or not Modified: trunk/reactos/dll/win32/msi/action.c Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c (original) +++ trunk/reactos/dll/win32/msi/action.c Mon Apr 3 00:37:53 2006 @@ -154,6 +154,8 @@ {'I','n','s','t','a','l','l','O','D','B','C',0}; static const WCHAR szInstallServices[] = {'I','n','s','t','a','l','l','S','e','r','v','i','c','e','s',0}; +static const WCHAR szISInitAllUsers[] = + {'I','S','I','n','i','t','A','l','l','U','s','e','r','s',0}; const WCHAR szPatchFiles[] = {'P','a','t','c','h','F','i','l','e','s',0}; static const WCHAR szPublishComponents[] = @@ -4277,6 +4279,7 @@ { szMoveFiles, ACTION_MoveFiles }, { szMsiPublishAssemblies, ACTION_MsiPublishAssemblies }, { szMsiUnpublishAssemblies, ACTION_MsiUnpublishAssemblies }, + { szISInitAllUsers, NULL }, { szInstallODBC, NULL}, { szInstallServices, ACTION_InstallServices }, { szPatchFiles, ACTION_PatchFiles },

1 0

[mbosma] 21448: replace tabs with spaces
by aleksey＠studiocerebral.com 02 Apr '06

02 Apr '06

Author: mbosma Date: Mon Apr 3 00:08:10 2006 New Revision: 21448 URL: http://svn.reactos.ru/svn/reactos?rev=21448&view=rev Log: replace tabs with spaces Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/nt… ============================================================================== --- branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c (original) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c Mon Apr 3 00:08:10 2006 @@ -216,26 +216,26 @@ KEBUGCHECK(0); } Length = PAGE_ROUND_UP(SectionSegments[i].Length); - for (Offset = 0; Offset < Length; Offset += PAGE_SIZE) - { - Entry = MmGetPageEntrySectionSegment(&SectionSegments[i], Offset); - if (Entry != 0) - { - if (IS_SWAP_FROM_SSE(Entry)) - { - KEBUGCHECK(0); - } - else if (MmGetShareCountPage(PFN_FROM_SSE(Entry)) != 0) - { - DPRINT1("%d %x\n", i, Offset, MmGetShareCountPage(PFN_FROM_SSE(Entry))); - KEBUGCHECK(0); - } - else - { - MmReleasePageMemoryConsumer(MC_USER, PFN_FROM_SSE(Entry)); - } - } - } + for (Offset = 0; Offset < Length; Offset += PAGE_SIZE) + { + Entry = MmGetPageEntrySectionSegment(&SectionSegments[i], Offset); + if (Entry != 0) + { + if (IS_SWAP_FROM_SSE(Entry)) + { + KEBUGCHECK(0); + } + else if (MmGetShareCountPage(PFN_FROM_SSE(Entry)) != 0) + { + DPRINT1("%d %x\n", i, Offset, MmGetShareCountPage(PFN_FROM_SSE(Entry))); + KEBUGCHECK(0); + } + else + { + MmReleasePageMemoryConsumer(MC_USER, PFN_FROM_SSE(Entry)); + } + } + } MmFreePageTablesSectionSegment(&SectionSegments[i]); } RemoveEntryList(&ImageSectionObject->ListEntry); @@ -299,8 +299,8 @@ FoundPageOp = FALSE; while (Offset < Length) { - while (NULL != (PageOp = MmCheckForPageOp(CcCacheViewMemoryArea, NULL, NULL, Segment, Offset))) - { + while (NULL != (PageOp = MmCheckForPageOp(CcCacheViewMemoryArea, NULL, NULL, Segment, Offset))) + { MmUnlockSectionSegment(Segment); Status = MmspWaitForPageOpCompletionEvent(PageOp); if (Status != STATUS_SUCCESS) @@ -310,36 +310,36 @@ } MmLockSectionSegment(Segment); MmspCompleteAndReleasePageOp(PageOp); - FoundPageOp = TRUE; - } - if (FoundPageOp) - { - FoundPageOp = FALSE; + FoundPageOp = TRUE; + } + if (FoundPageOp) + { + FoundPageOp = FALSE; Length = PAGE_ROUND_UP(Segment->Length); Offset = 0; continue; - } + } Entry = MmGetPageEntrySectionSegment(Segment, Offset); - if (Entry != 0) - { - if (IS_SWAP_FROM_SSE(Entry)) - { - KEBUGCHECK(0); - } - else if (MmGetShareCountPage(PFN_FROM_SSE(Entry)) != 0) - { - DPRINT1("%d %x\n", Offset, MmGetShareCountPage(PFN_FROM_SSE(Entry))); - KEBUGCHECK(0); - } - else - { - if (Entry & 0x2) - { - DPRINT1("Releasing dirty page at offset %d from %wZ\n", Offset, &Segment->FileObject->FileName); + if (Entry != 0) + { + if (IS_SWAP_FROM_SSE(Entry)) + { + KEBUGCHECK(0); + } + else if (MmGetShareCountPage(PFN_FROM_SSE(Entry)) != 0) + { + DPRINT1("%d %x\n", Offset, MmGetShareCountPage(PFN_FROM_SSE(Entry))); + KEBUGCHECK(0); + } + else + { + if (Entry & 0x2) + { + DPRINT1("Releasing dirty page at offset %d from %wZ\n", Offset, &Segment->FileObject->FileName); MmInitializeMdl(Mdl, NULL, PAGE_SIZE); - Pfn = PFN_FROM_SSE(Entry); + Pfn = PFN_FROM_SSE(Entry); MmBuildMdlFromPages(Mdl, &Pfn); FileOffset.QuadPart = Offset * PAGE_SIZE; KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -352,13 +352,13 @@ { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); Status = Iosb.Status; - } + } MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); - } - MmReleasePageMemoryConsumer(MC_USER, PFN_FROM_SSE(Entry)); - } - } - Offset += PAGE_SIZE; + } + MmReleasePageMemoryConsumer(MC_USER, PFN_FROM_SSE(Entry)); + } + } + Offset += PAGE_SIZE; } MmUnlockSectionSegment(Segment); RemoveEntryList(&Segment->ListEntry); @@ -376,7 +376,7 @@ VOID MmChangeSectionSegmentSize(PMM_SECTION_SEGMENT Segment, - ULONG NewLength) + ULONG NewLength) { PSECTION_PAGE_TABLE Table; ULONG i, j; @@ -392,19 +392,19 @@ for (i = 0; i < NR_SECTION_PAGE_ENTRIES; i++) { if (Table->Entry[i]) - { - Table = ExAllocatePoolWithTag(NonPagedPool, sizeof(SECTION_PAGE_TABLE), + { + Table = ExAllocatePoolWithTag(NonPagedPool, sizeof(SECTION_PAGE_TABLE), TAG_SECTION_PAGE_TABLE); - if (Table == NULL) - { - KEBUGCHECK(0); - } - memcpy(Table, Segment->PageDirectory.PageTables, sizeof(SECTION_PAGE_TABLE)); - memset(Segment->PageDirectory.PageTables, 0, sizeof(SECTION_PAGE_TABLE)); - Segment->PageDirectory.PageTables[0] = Table; - break; - } - } + if (Table == NULL) + { + KEBUGCHECK(0); + } + memcpy(Table, Segment->PageDirectory.PageTables, sizeof(SECTION_PAGE_TABLE)); + memset(Segment->PageDirectory.PageTables, 0, sizeof(SECTION_PAGE_TABLE)); + Segment->PageDirectory.PageTables[0] = Table; + break; + } + } } Segment->RawLength = NewLength; Segment->Length = PAGE_ROUND_UP(NewLength); @@ -415,56 +415,56 @@ if (PAGE_ROUND_UP(NewLength) > NR_SECTION_PAGE_TABLES * PAGE_SIZE) { for (i = PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(PAGE_ROUND_UP(NewLength)); - i < NR_SECTION_PAGE_TABLES; - i++) - { - Table = Segment->PageDirectory.PageTables[i]; - if (Table) - { + i < NR_SECTION_PAGE_TABLES; + i++) + { + Table = Segment->PageDirectory.PageTables[i]; + if (Table) + { if (i > PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(PAGE_ROUND_UP(Segment->Length))) - { - KEBUGCHECK(0); - } + { + KEBUGCHECK(0); + } if (i == PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(PAGE_ROUND_UP(NewLength)) && - PAGE_ROUND_UP(NewLength) % (NR_SECTION_PAGE_TABLES * PAGE_SIZE)) - { - Start = PAGE_ROUND_UP(NewLength) % (NR_SECTION_PAGE_TABLES * PAGE_SIZE); - } - else - { - Start = 0; - } - for (j = Start; j < NR_SECTION_PAGE_TABLES; j++) - { + PAGE_ROUND_UP(NewLength) % (NR_SECTION_PAGE_TABLES * PAGE_SIZE)) + { + Start = PAGE_ROUND_UP(NewLength) % (NR_SECTION_PAGE_TABLES * PAGE_SIZE); + } + else + { + Start = 0; + } + for (j = Start; j < NR_SECTION_PAGE_TABLES; j++) + { if(Table->Entry[j]) - { - KEBUGCHECK(0); - } - } - if (i > PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(PAGE_ROUND_UP(NewLength))) - { - ExFreePool(Table); + { + KEBUGCHECK(0); + } + } + if (i > PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(PAGE_ROUND_UP(NewLength))) + { + ExFreePool(Table); Segment->PageDirectory.PageTables[i] = NULL; - } - } - } + } + } + } } else { for (i = PAGE_ROUND_UP(NewLength); i < NR_SECTION_PAGE_TABLES; i++) - { - if (Segment->PageDirectory.PageTables[i]) - { - KEBUGCHECK(0); - } - } + { + if (Segment->PageDirectory.PageTables[i]) + { + KEBUGCHECK(0); + } + } } if (PAGE_ROUND_UP(NewLength) <= NR_SECTION_PAGE_TABLES * PAGE_SIZE && - PAGE_ROUND_UP(Segment->Length) > NR_SECTION_PAGE_TABLES * PAGE_SIZE) + PAGE_ROUND_UP(Segment->Length) > NR_SECTION_PAGE_TABLES * PAGE_SIZE) { Table = Segment->PageDirectory.PageTables[0]; - memcpy(Segment->PageDirectory.PageTables, Table->Entry, sizeof(SECTION_PAGE_TABLE)); - ExFreePool(Table); + memcpy(Segment->PageDirectory.PageTables, Table->Entry, sizeof(SECTION_PAGE_TABLE)); + ExFreePool(Table); } } else @@ -608,46 +608,46 @@ if (PageOut) { - MmSetPageEntrySectionSegment(Segment, Offset, 0); + MmSetPageEntrySectionSegment(Segment, Offset, 0); MmReleasePageMemoryConsumer(MC_USER, Page); } else { if (Section->AllocationAttributes & SEC_IMAGE && - !(Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) - { - if (SavedSwapEntry) - { - KEBUGCHECK(0); - } - if (Dirty || (Entry & 0x2)) - { - KEBUGCHECK(0); - } - } - else if (!(Section->AllocationAttributes & SEC_IMAGE) && - Section->FileObject != NULL) - { - if (SavedSwapEntry) - { - KEBUGCHECK(0); - } - if (Dirty && !(Entry & 0x2)) - { - MmSetPageEntrySectionSegment(Segment, Offset, Entry | 0x2); - } - } - else if(Segment->Flags & MM_PAGEFILE_SEGMENT || + !(Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) + { + if (SavedSwapEntry) + { + KEBUGCHECK(0); + } + if (Dirty || (Entry & 0x2)) + { + KEBUGCHECK(0); + } + } + else if (!(Section->AllocationAttributes & SEC_IMAGE) && + Section->FileObject != NULL) + { + if (SavedSwapEntry) + { + KEBUGCHECK(0); + } + if (Dirty && !(Entry & 0x2)) + { + MmSetPageEntrySectionSegment(Segment, Offset, Entry | 0x2); + } + } + else if(Segment->Flags & MM_PAGEFILE_SEGMENT || Segment->Characteristics & IMAGE_SCN_MEM_SHARED) - { - if (Dirty && !(Entry & 0x2)) - { - MmSetPageEntrySectionSegment(Segment, Offset, Entry | 0x2); - } - } - else - { - KEBUGCHECK(0); + { + if (Dirty && !(Entry & 0x2)) + { + MmSetPageEntrySectionSegment(Segment, Offset, Entry | 0x2); + } + } + else + { + KEBUGCHECK(0); if (SavedSwapEntry == 0) { if (!PageOut && @@ -666,37 +666,37 @@ else { if (IsImageSection) - { + { if (PageOut) - { - MmSetPageEntrySectionSegment(Segment, Offset, 0); + { + MmSetPageEntrySectionSegment(Segment, Offset, 0); MmReleasePageMemoryConsumer(MC_USER, Page); - } - else - { -// MmSetPageEntrySectionSegment(Segment, Offset, Entry); - } - } - else if (Section->FileObject != NULL) - { - if (PageOut && !Dirty && !(Entry & 0x2)) - { - MmSetPageEntrySectionSegment(Segment, Offset, 0); + } + else + { +// MmSetPageEntrySectionSegment(Segment, Offset, Entry); + } + } + else if (Section->FileObject != NULL) + { + if (PageOut && !Dirty && !(Entry & 0x2)) + { + MmSetPageEntrySectionSegment(Segment, Offset, 0); MmReleasePageMemoryConsumer(MC_USER, Page); - } - else - { - if (Dirty && !(Entry & 0x2)) - { - MmSetPageEntrySectionSegment(Segment, Offset, Entry | 0x2); - } - } - } - else - { + } + else + { + if (Dirty && !(Entry & 0x2)) + { + MmSetPageEntrySectionSegment(Segment, Offset, Entry | 0x2); + } + } + } + else + { MmSetPageEntrySectionSegment(Segment, Offset, 0); MmReleasePageMemoryConsumer(MC_USER, Page); - } + } } } else @@ -704,7 +704,7 @@ if ((Segment->Flags & MM_PAGEFILE_SEGMENT) || (Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) { - CHECKPOINT1; + CHECKPOINT1; if (!PageOut) { if (Dirty) @@ -725,11 +725,11 @@ MmSetPageEntrySectionSegment(Segment, Offset, MAKE_SWAP_SSE(SavedSwapEntry)); MmSetSavedSwapEntryPage(Page, 0); } - else - { - CHECKPOINT1; -// MmSetPageEntrySectionSegment(Segment, Offset, 0); - } + else + { + CHECKPOINT1; +// MmSetPageEntrySectionSegment(Segment, Offset, 0); + } MmReleasePageMemoryConsumer(MC_USER, Page); } else @@ -774,7 +774,7 @@ if (!NT_SUCCESS(Status)) { MmspReleasePages(i, Pfns); - return Status; + return Status; } } return STATUS_SUCCESS; @@ -782,10 +782,10 @@ NTSTATUS MmspRawReadPages(PFILE_OBJECT FileObject, - ULONG SectorSize, - PLARGE_INTEGER FileOffset, - ULONG ReadSize, - PPFN_TYPE Pfns) + ULONG SectorSize, + PLARGE_INTEGER FileOffset, + ULONG ReadSize, + PPFN_TYPE Pfns) { ULONG PageCount = PAGE_ROUND_UP(ReadSize) / PAGE_SIZE; ULONG MdlSize; @@ -839,36 +839,36 @@ if (Offset != FileOffset->u.LowPart) { *MdlPages++ = Pfn; - if (FileOffset->u.LowPart - Offset > PAGE_SIZE) - { - MdlSize -= PAGE_SIZE; - Offset += PAGE_SIZE; - } - else - { - MdlSize -= (FileOffset->u.LowPart - Offset); - Offset = FileOffset->u.LowPart; - } + if (FileOffset->u.LowPart - Offset > PAGE_SIZE) + { + MdlSize -= PAGE_SIZE; + Offset += PAGE_SIZE; + } + else + { + MdlSize -= (FileOffset->u.LowPart - Offset); + Offset = FileOffset->u.LowPart; + } } i = 0; while (MdlSize > 0) { if (i < PageCount) - { - *MdlPages++ = Pfns[i++]; - } - else - { - *MdlPages++ = Pfn; - } - if (MdlSize > PAGE_SIZE) - { - MdlSize -= PAGE_SIZE; - } - else - { - MdlSize = 0; - } + { + *MdlPages++ = Pfns[i++]; + } + else + { + *MdlPages++ = Pfn; + } + if (MdlSize > PAGE_SIZE) + { + MdlSize -= PAGE_SIZE; + } + else + { + MdlSize = 0; + } } } KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -891,9 +891,9 @@ NTSTATUS MmspReadSectionSegmentPages(PSECTION_DATA SectionData, - ULONG SegOffset, - ULONG PageCount, - PPFN_TYPE Pages) + ULONG SegOffset, + ULONG PageCount, + PPFN_TYPE Pages) { NTSTATUS Status; ULONG SectorSize; @@ -926,9 +926,9 @@ Status = MmspRawReadPages(SectionData->Section->FileObject, SectorSize, - &FileOffset, - Length, - Pages); + &FileOffset, + Length, + Pages); if (!NT_SUCCESS(Status) && SectionData->Segment->BytesPerSector == 0) { NTSTATUS tmpStatus; @@ -936,22 +936,22 @@ tmpStatus = IoQueryVolumeInformation(SectionData->Section->FileObject, FileFsSizeInformation, - sizeof(FILE_FS_SIZE_INFORMATION), + sizeof(FILE_FS_SIZE_INFORMATION), &FileFsSize, - NULL); + NULL); if (NT_SUCCESS(tmpStatus)) { DPRINT("%d\n", FileFsSize.BytesPerSector); SectionData->Segment->BytesPerSector = FileFsSize.BytesPerSector; - if (FileFsSize.BytesPerSector != 512) - { + if (FileFsSize.BytesPerSector != 512) + { Status = MmspRawReadPages(SectionData->Section->FileObject, FileFsSize.BytesPerSector, - &FileOffset, - PageCount * PAGE_SIZE, - Pages); - } + &FileOffset, + PageCount * PAGE_SIZE, + Pages); + } } } if (!NT_SUCCESS(Status)) @@ -965,9 +965,9 @@ NTSTATUS MmspNotPresentFaultPhysMemSectionView(PMADDRESS_SPACE AddressSpace, - MEMORY_AREA* MemoryArea, - PVOID Address, - BOOLEAN Locked) + MEMORY_AREA* MemoryArea, + PVOID Address, + BOOLEAN Locked) { PVOID PAddress; ULONG Offset; @@ -1025,9 +1025,9 @@ NTSTATUS MmspNotPresentFaultImageSectionView(PMADDRESS_SPACE AddressSpace, - MEMORY_AREA* MemoryArea, - PVOID Address, - BOOLEAN Locked) + MEMORY_AREA* MemoryArea, + PVOID Address, + BOOLEAN Locked) { PVOID PAddress; ULONG SectionOffset; @@ -1140,11 +1140,11 @@ if (!MmIsPagePresent(AddressSpace->Process, Address)) { HasSwapEntry = MmIsPageSwapEntry(AddressSpace->Process, (PVOID)PAddress); - if (!HasSwapEntry) - { + if (!HasSwapEntry) + { Entry = MmGetPageEntrySectionSegment(Segment, SegmentOffset); Pfn[0] = PFN_FROM_SSE(Entry); - } + } if (HasSwapEntry || Pfn[0] == 0) { /* @@ -1307,35 +1307,35 @@ PageCount = 1; while (PageCount < 4) { - if (SegmentOffset + PageCount * PAGE_SIZE < Segment->RawLength && - SegmentOffset + PageCount * PAGE_SIZE < (ULONG_PTR)RegionBase + Region->Length - (ULONG_PTR)MemoryArea->StartingAddress && - 0 == MmGetPageEntrySectionSegment(Segment, SegmentOffset + PageCount * PAGE_SIZE)) - { - PageOp[PageCount] = MmGetPageOp(MemoryArea, 0, 0, Segment, SegmentOffset + PageCount * PAGE_SIZE, MM_PAGEOP_PAGEIN, TRUE); - if (PageOp[PageCount]) - { - PageCount++; - continue; - } - } + if (SegmentOffset + PageCount * PAGE_SIZE < Segment->RawLength && + SegmentOffset + PageCount * PAGE_SIZE < (ULONG_PTR)RegionBase + Region->Length - (ULONG_PTR)MemoryArea->StartingAddress && + 0 == MmGetPageEntrySectionSegment(Segment, SegmentOffset + PageCount * PAGE_SIZE)) + { + PageOp[PageCount] = MmGetPageOp(MemoryArea, 0, 0, Segment, SegmentOffset + PageCount * PAGE_SIZE, MM_PAGEOP_PAGEIN, TRUE); + if (PageOp[PageCount]) + { + PageCount++; + continue; + } + } #if 0 - if (Offset >= PAGE_SIZE && - MemoryArea->StartingAddress + Offset - PAGE_SIZE >= RegionBase && - 0 == MmGetPageEntrySectionSegment(Segment, Offset - PAGE_SIZE)) - { - tmpPageOp = MmGetPageOp(MemoryArea, 0, 0, Segment, Offset - PAGE_SIZE, MM_PAGEOP_PAGEIN, TRUE); - if (tmpPageOp) - { - memmove(&PageOp[1], &PageOp[0], sizeof(PMM_PAGEOP) * PageCount); - PageOp[0] = tmpPageOp; - PageCount++; - Offset -= PAGE_SIZE; - PAddress -= PAGE_SIZE; - continue; - } - } + if (Offset >= PAGE_SIZE && + MemoryArea->StartingAddress + Offset - PAGE_SIZE >= RegionBase && + 0 == MmGetPageEntrySectionSegment(Segment, Offset - PAGE_SIZE)) + { + tmpPageOp = MmGetPageOp(MemoryArea, 0, 0, Segment, Offset - PAGE_SIZE, MM_PAGEOP_PAGEIN, TRUE); + if (tmpPageOp) + { + memmove(&PageOp[1], &PageOp[0], sizeof(PMM_PAGEOP) * PageCount); + PageOp[0] = tmpPageOp; + PageCount++; + Offset -= PAGE_SIZE; + PAddress -= PAGE_SIZE; + continue; + } + } #endif - break; + break; } DPRINT("%d %wZ\n", PageCount, &MemoryArea->Data.SectionData.Section->FileObject->FileName); @@ -1348,13 +1348,13 @@ if (SegmentOffset >= PAGE_ROUND_UP(Segment->RawLength)) { for (i = 0; i < PageCount; i++) - { + { Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Pfn[i]); if (!NT_SUCCESS(Status)) { DPRINT1("MmRequestPageMemoryConsumer failed (Status %x)\n", Status); } - } + } } else { @@ -1377,10 +1377,10 @@ * Cleanup and release locks */ for (i = 0; i < PageCount; i++) - { + { PageOp[i]->Status = Status; MmspCompleteAndReleasePageOp(PageOp[i]); - } + } DPRINT("Address 0x%.8X\n", Address); return(Status); } @@ -1434,7 +1434,7 @@ } for(i = 0; i < PageCount; i++) { - PageOp[i]->Status = STATUS_SUCCESS; + PageOp[i]->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp[i]); } DPRINT("%x %x %x %x Address 0x%.8X\n", *(PULONG)Address, Region->Protect, Attributes, MemoryArea->StartingAddress + SegmentOffset, Address); @@ -1689,15 +1689,15 @@ if (!MmIsPagePresent(AddressSpace->Process, Address)) { Entry = MmGetPageEntrySectionSegment(Segment, Offset); - if (IS_SWAP_FROM_SSE(Entry)) - { - KEBUGCHECK(0); - } - Pfn[0] = PFN_FROM_SSE(Entry); - if (Pfn[0] == 0) - { - KEBUGCHECK(0); - } + if (IS_SWAP_FROM_SSE(Entry)) + { + KEBUGCHECK(0); + } + Pfn[0] = PFN_FROM_SSE(Entry); + if (Pfn[0] == 0) + { + KEBUGCHECK(0); + } MmSharePageEntrySectionSegment(Segment, Offset); Status = MmCreateVirtualMapping(AddressSpace->Process, @@ -1745,16 +1745,16 @@ while (PageCount < 4) { if (Offset + PageCount * PAGE_SIZE < Segment->RawLength && - Offset + PageCount * PAGE_SIZE < (ULONG_PTR)RegionBase + Region->Length - (ULONG_PTR)StartingAddress && - 0 == MmGetPageEntrySectionSegment(Segment, Offset + PageCount * PAGE_SIZE)) - { - PageOp[PageCount] = MmGetPageOp(MemoryArea, 0, 0, Segment, Offset + PageCount * PAGE_SIZE, MM_PAGEOP_PAGEIN, TRUE); - if (PageOp[PageCount]) - { - PageCount++; - continue; - } - } + Offset + PageCount * PAGE_SIZE < (ULONG_PTR)RegionBase + Region->Length - (ULONG_PTR)StartingAddress && + 0 == MmGetPageEntrySectionSegment(Segment, Offset + PageCount * PAGE_SIZE)) + { + PageOp[PageCount] = MmGetPageOp(MemoryArea, 0, 0, Segment, Offset + PageCount * PAGE_SIZE, MM_PAGEOP_PAGEIN, TRUE); + if (PageOp[PageCount]) + { + PageCount++; + continue; + } + } break; } @@ -1779,11 +1779,11 @@ /* * Cleanup and release locks */ - for (i = 0; i < PageCount; i++) - { + for (i = 0; i < PageCount; i++) + { PageOp[i]->Status = Status; MmspCompleteAndReleasePageOp(PageOp[i]); - } + } DPRINT("Address 0x%.8X\n", Address); return(Status); } @@ -1810,7 +1810,7 @@ * data */ Entry = MAKE_SSE(Pfn[i] << PAGE_SHIFT, 0); - ASSERT (Entry); + ASSERT (Entry); MmSharePage(Pfn[i]); MmSetPageEntrySectionSegment(Segment, Offset + i * PAGE_SIZE, Entry); } @@ -1875,9 +1875,9 @@ /*****************************************************************************************************/ NTSTATUS MmspNotPresentFaultPageFileSectionView(PMADDRESS_SPACE AddressSpace, - MEMORY_AREA* MemoryArea, - PVOID Address, - BOOLEAN Locked) + MEMORY_AREA* MemoryArea, + PVOID Address, + BOOLEAN Locked) { PVOID PAddress; ULONG Offset; @@ -1984,15 +1984,15 @@ if (!MmIsPagePresent(AddressSpace->Process, Address)) { Entry = MmGetPageEntrySectionSegment(Segment, Offset); - if (IS_SWAP_FROM_SSE(Entry)) - { - KEBUGCHECK(0); - } - Pfn = PFN_FROM_SSE(Entry); - if (Pfn == 0) - { - KEBUGCHECK(0); - } + if (IS_SWAP_FROM_SSE(Entry)) + { + KEBUGCHECK(0); + } + Pfn = PFN_FROM_SSE(Entry); + if (Pfn == 0) + { + KEBUGCHECK(0); + } Pfn = PFN_FROM_SSE(Entry); @@ -3264,12 +3264,12 @@ MmspWorkerThread(PVOID); Status = PsCreateSystemThread(&ThreadHandle, - THREAD_ALL_ACCESS, - NULL, - NULL, - &ThreadId, - MmspWorkerThread, - NULL); + THREAD_ALL_ACCESS, + NULL, + NULL, + &ThreadId, + MmspWorkerThread, + NULL); KeSetTimerEx(&MmspWorkerThreadTimer, DueTime, 5000, NULL); } @@ -3391,7 +3391,7 @@ ULONG SectionPageProtection, ULONG AllocationAttributes, PFILE_OBJECT FileObject, - BOOLEAN CacheManager) + BOOLEAN CacheManager) /* * Create a section backed by a data file */ @@ -3462,7 +3462,7 @@ { ObDereferenceObject(Section); ObDereferenceObject(FileObject); - return STATUS_FILE_INVALID; + return STATUS_FILE_INVALID; } DPRINT("%I64x\n", UMaximumSize->QuadPart); MaximumSize = *UMaximumSize; @@ -3477,9 +3477,9 @@ */ Status = IoQueryFileInformation(FileObject, FileStandardInformation, - sizeof(FILE_STANDARD_INFORMATION), - &FileInfo, - &Length); + sizeof(FILE_STANDARD_INFORMATION), + &FileInfo, + &Length); if (!NT_SUCCESS(Status)) { ObDereferenceObject(Section); @@ -3490,7 +3490,7 @@ { ObDereferenceObject(Section); ObDereferenceObject(FileObject); - return STATUS_FILE_INVALID; + return STATUS_FILE_INVALID; } /* @@ -3518,7 +3518,7 @@ Status = IoSetInformation(FileObject, FileAllocationInformation, sizeof(LARGE_INTEGER), - &MaximumSize); + &MaximumSize); if (!NT_SUCCESS(Status)) { ObDereferenceObject(Section); @@ -3591,17 +3591,17 @@ ExAcquireFastMutex(&Segment->Lock); tmpSegment = InterlockedCompareExchangePointer(&FileObject->SectionObjectPointer->DataSectionObject, - Segment, NULL); + Segment, NULL); if (tmpSegment != NULL) { CHECKPOINT; MmUnlockSectionSegment(Segment); - ExFreePool(Segment); - Segment = tmpSegment; + ExFreePool(Segment); + Segment = tmpSegment; MmLockSectionSegment(Segment); - CHECKPOINT; - Segment->ReferenceCount++; - Section->Segment = Segment; + CHECKPOINT; + Segment->ReferenceCount++; + Section->Segment = Segment; if (MaximumSize.u.LowPart > Segment->RawLength && !(AllocationAttributes & SEC_RESERVE)) @@ -3612,7 +3612,7 @@ } else { - InsertHeadList(&DataSectionObjectListHead, &Segment->ListEntry); + InsertHeadList(&DataSectionObjectListHead, &Segment->ListEntry); ObReferenceObject(FileObject); } } @@ -3716,7 +3716,7 @@ NTSTATUS NTAPI ExeFmtpReadFile(IN PFILE_OBJECT FileObject, - ULONG SectorSize, + ULONG SectorSize, IN PLARGE_INTEGER Offset, IN ULONG Length, OUT PVOID * Data, @@ -3779,9 +3779,9 @@ } Status = MmspRawReadPages(FileObject, SectorSize, - &FileOffset, - BufferSize, - Pages); + &FileOffset, + BufferSize, + Pages); UsedSize = BufferSize; if(NT_SUCCESS(Status) && UsedSize < OffsetAdjustment) { @@ -4156,9 +4156,9 @@ Status = IoQueryVolumeInformation(FileObject, FileFsSizeInformation, - sizeof(FILE_FS_SIZE_INFORMATION), + sizeof(FILE_FS_SIZE_INFORMATION), &FileFsSize, - NULL); + NULL); if (!NT_SUCCESS(Status)) { return Status; @@ -4401,10 +4401,10 @@ CHECKPOINT; CcFlushCache(FileObject->SectionObjectPointer, NULL, 0, &Iosb); - if (!NT_SUCCESS(Iosb.Status)) - { + if (!NT_SUCCESS(Iosb.Status)) + { DPRINT1("%x\n", Iosb.Status); - } + } } ImageSectionObject = ExAllocatePoolWithTag(NonPagedPool, sizeof(MM_IMAGE_SECTION_OBJECT), TAG_MM_SECTION_SEGMENT); @@ -4422,9 +4422,9 @@ if (!NT_SUCCESS(StatusExeFmt)) { if(ImageSectionObject->Segments != NULL) - { + { ExFreePool(ImageSectionObject->Segments); - } + } ExFreePool(ImageSectionObject); ObDereferenceObject(Section); @@ -4458,9 +4458,9 @@ else { ImageSectionObject->RefCount++; - InsertHeadList(&ImageSectionObjectListHead, &ImageSectionObject->ListEntry); - ImageSectionObjectCount++; - ImageSectionObject->FileObject = FileObject; + InsertHeadList(&ImageSectionObjectListHead, &ImageSectionObject->ListEntry); + ImageSectionObjectCount++; + ImageSectionObject->FileObject = FileObject; ObReferenceObject(FileObject); } @@ -4988,7 +4988,7 @@ else { MmDeleteRmap(Page, AddressSpace->Process, Address); - DPRINT("%x\n", Address); + DPRINT("%x\n", Address); MmUnsharePageEntrySectionSegment(Section, Segment, Offset, Dirty, FALSE); } } @@ -5431,7 +5431,7 @@ NTSTATUS STDCALL MmChangeSectionSize(PSECTION_OBJECT Section, - PLARGE_INTEGER NewMaxSize) + PLARGE_INTEGER NewMaxSize) { PMM_SECTION_SEGMENT Segment; ULONG Offset; @@ -5469,30 +5469,30 @@ if (Entry != 0) { if (IS_SWAP_FROM_SSE(Entry)) - { - KEBUGCHECK(0); - } - else if (MmCheckForPageOp(CcCacheViewMemoryArea, NULL, NULL, Segment, Offset)) - { - /* page operation in progress */ - KEBUGCHECK(0); - } - else - { - Pfn = PFN_FROM_SSE(Entry); - if (0 != (ShareCount = MmGetShareCountPage(Pfn))) - { + { + KEBUGCHECK(0); + } + else if (MmCheckForPageOp(CcCacheViewMemoryArea, NULL, NULL, Segment, Offset)) + { + /* page operation in progress */ + KEBUGCHECK(0); + } + else + { + Pfn = PFN_FROM_SSE(Entry); + if (0 != (ShareCount = MmGetShareCountPage(Pfn))) + { /* page is mapped */ - DPRINT1("%d\n", ShareCount); - KEBUGCHECK(0); - } - else - { - MmSetPageEntrySectionSegment(Segment, Offset, 0); - DPRINT("%x %x\n", Offset, Pfn); + DPRINT1("%d\n", ShareCount); + KEBUGCHECK(0); + } + else + { + MmSetPageEntrySectionSegment(Segment, Offset, 0); + DPRINT("%x %x\n", Offset, Pfn); MmReleasePageMemoryConsumer(MC_USER, Pfn); - } - } + } + } } } } @@ -5862,72 +5862,72 @@ Result = TRUE; ExAcquireFastMutex(&ImageSectionObjectLock); if (ImageSectionObject) - { - if(ImageSectionObject->RefCount == 0) - { + { + if(ImageSectionObject->RefCount == 0) + { DPRINT1("%x %d\n", ImageSectionObject, ImageSectionObject->RefCount); MmFreeImageSectionSegments(SectionObjectPointer); - } - else - { - Result = FALSE; - } - } + } + else + { + Result = FALSE; + } + } ExReleaseFastMutex(&ImageSectionObjectLock); #if 1 ExAcquireFastMutex(&DataSectionObjectLock); - if (Segment) - { + if (Segment) + { DPRINT("%d %wZ\n", Segment->ReferenceCount, &Segment->FileObject->FileName); - if (Segment->ReferenceCount == 0) - { - MmFreeDataSectionSegments(SectionObjectPointer); - } - else - { -// Result = FALSE; - } - } + if (Segment->ReferenceCount == 0) + { + MmFreeDataSectionSegments(SectionObjectPointer); + } + else + { +// Result = FALSE; + } + } ExReleaseFastMutex(&DataSectionObjectLock); #endif - if (Result) - { + if (Result) + { #if 1 -// KEBUGCHECK(0); +// KEBUGCHECK(0); #else - CcRosSetRemoveOnClose(SectionObjectPointer); + CcRosSetRemoveOnClose(SectionObjectPointer); #endif - } + } break; case MmFlushForWrite: - Result = TRUE; + Result = TRUE; ExAcquireFastMutex(&ImageSectionObjectLock); if (ImageSectionObject) - { - if (ImageSectionObject->RefCount == 0) - { - MmFreeImageSectionSegments(SectionObjectPointer); - } - else - { - Result = FALSE; - } - } + { + if (ImageSectionObject->RefCount == 0) + { + MmFreeImageSectionSegments(SectionObjectPointer); + } + else + { + Result = FALSE; + } + } ExReleaseFastMutex(&ImageSectionObjectLock); #if 0 ExAcquireFastMutex(&DataSectionObjectLock); - if (Segment) - { - CHECKPOINT; - if (Segment->ReferenceCount == 0) - { - MmFreeDataSectionSegments(SectionObjectPointer); - } - else - { - Result = FALSE; - } - } + if (Segment) + { + CHECKPOINT; + if (Segment->ReferenceCount == 0) + { + MmFreeDataSectionSegments(SectionObjectPointer); + } + else + { + Result = FALSE; + } + } ExReleaseFastMutex(&DataSectionObjectLock); #endif break; @@ -6006,8 +6006,8 @@ IN OUT PSIZE_T ViewSize ) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } @@ -6038,8 +6038,8 @@ IN PVOID MappedBase ) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -6164,11 +6164,11 @@ } Status = ObReferenceObjectByHandle(FileHandle, - FileAccess, - IoFileObjectType, - UserMode, - (PVOID*)&FileObject, - NULL); + FileAccess, + IoFileObjectType, + UserMode, + (PVOID*)&FileObject, + NULL); if (!NT_SUCCESS(Status)) { return Status; @@ -6194,13 +6194,13 @@ { DPRINT("%wZ\n", &FileObject->FileName); Status = MmCreateDataFileSection(SectionObject, - DesiredAccess, - ObjectAttributes, - MaximumSize, - SectionPageProtection, - AllocationAttributes, - FileObject, - FALSE); + DesiredAccess, + ObjectAttributes, + MaximumSize, + SectionPageProtection, + AllocationAttributes, + FileObject, + FALSE); } else { @@ -6251,34 +6251,34 @@ for (i = 0; i < NrSegments && *NrFreed < Target; i++) { Length = PAGE_ROUND_UP(SectionSegments[i].Length); - for (Offset = 0; Offset < Length && *NrFreed < Target; Offset += PAGE_SIZE) - { - Entry = MmGetPageEntrySectionSegment(&SectionSegments[i], Offset); - if (Entry != 0) - { - if (IS_SWAP_FROM_SSE(Entry)) - { - KEBUGCHECK(0); - } - else if (MmGetShareCountPage(PFN_FROM_SSE(Entry)) != 0) - { - DPRINT1("%d %x\n", i, Offset, MmGetShareCountPage(PFN_FROM_SSE(Entry))); - KEBUGCHECK(0); - } - else - { - MmReleasePageMemoryConsumer(MC_USER, PFN_FROM_SSE(Entry)); - MmSetPageEntrySectionSegment(&SectionSegments[i], Offset, 0); - (*NrFreed)++; - } - } - } - } - if (*NrFreed >= Target) - { - break; - } - } + for (Offset = 0; Offset < Length && *NrFreed < Target; Offset += PAGE_SIZE) + { + Entry = MmGetPageEntrySectionSegment(&SectionSegments[i], Offset); + if (Entry != 0) + { + if (IS_SWAP_FROM_SSE(Entry)) + { + KEBUGCHECK(0); + } + else if (MmGetShareCountPage(PFN_FROM_SSE(Entry)) != 0) + { + DPRINT1("%d %x\n", i, Offset, MmGetShareCountPage(PFN_FROM_SSE(Entry))); + KEBUGCHECK(0); + } + else + { + MmReleasePageMemoryConsumer(MC_USER, PFN_FROM_SSE(Entry)); + MmSetPageEntrySectionSegment(&SectionSegments[i], Offset, 0); + (*NrFreed)++; + } + } + } + } + if (*NrFreed >= Target) + { + break; + } + } if (current->ListEntry.Blink == &ImageSectionObjectListHead) { @@ -6301,8 +6301,8 @@ NTSTATUS MmspWriteDataSectionPage(PMM_SECTION_SEGMENT Segment, - ULONG Offset, - PMM_PAGEOP PageOp) + ULONG Offset, + PMM_PAGEOP PageOp) { ULONG Entry; PFN_TYPE Pfn; @@ -6422,7 +6422,7 @@ { Entry = MmGetPageEntrySectionSegment(((PPAGE_IO_CONTEXT)Context)->Segment, Offset); MmSetPageEntrySectionSegment(((PPAGE_IO_CONTEXT)Context)->Segment, Offset, Entry | 0x2); - Offset += PAGE_SIZE; + Offset += PAGE_SIZE; } ((PPAGE_IO_CONTEXT)Context)->PageOp[i]->Status = Status; MmspCompleteAndReleasePageOp(((PPAGE_IO_CONTEXT)Context)->PageOp[i]); @@ -6445,10 +6445,10 @@ while(1) { KeWaitForSingleObject(&MmspWorkerThreadTimer, - 0, - KernelMode, - FALSE, - NULL); + 0, + KernelMode, + FALSE, + NULL); DPRINT("MmspWorkerThread\n"); @@ -6459,63 +6459,63 @@ { current = CONTAINING_RECORD(entry, MM_SECTION_SEGMENT, ListEntry); MmLockSectionSegment(current); - entry = entry->Flink; + entry = entry->Flink; Context = NULL; - for (i = 0; i < PAGE_ROUND_UP(current->Length)/PAGE_SIZE; i++) - { + for (i = 0; i < PAGE_ROUND_UP(current->Length)/PAGE_SIZE; i++) + { Entry = MmGetPageEntrySectionSegment(current, i * PAGE_SIZE); - Pfn = PFN_FROM_SSE(Entry); - - if (!IS_SWAP_FROM_SSE(Entry) && Pfn && !(Entry & 0x2) && MmGetShareCountPage(Pfn) && MmIsDirtyPageRmap(Pfn)) - { - Entry |= 0x2; - MmSetPageEntrySectionSegment(current, i * PAGE_SIZE, Entry); - } + Pfn = PFN_FROM_SSE(Entry); + + if (!IS_SWAP_FROM_SSE(Entry) && Pfn && !(Entry & 0x2) && MmGetShareCountPage(Pfn) && MmIsDirtyPageRmap(Pfn)) + { + Entry |= 0x2; + MmSetPageEntrySectionSegment(current, i * PAGE_SIZE, Entry); + } if (!IS_SWAP_FROM_SSE(Entry) && Pfn && (Entry & 0x2)) - { - PageOp = MmGetPageOp(CcCacheViewMemoryArea, NULL, NULL, current, i * PAGE_SIZE, MM_PAGEOP_PAGESYNCH, TRUE); + { + PageOp = MmGetPageOp(CcCacheViewMemoryArea, NULL, NULL, current, i * PAGE_SIZE, MM_PAGEOP_PAGESYNCH, TRUE); if (PageOp) - { - if (Context == NULL) - { - Context = ExAllocatePool(NonPagedPool, sizeof(PAGE_IO_CONTEXT)); - Context->Segment = current; - Context->Offset = i * PAGE_SIZE; - Context->PageCount = 0; - ExInitializeWorkItem(&Context->WorkQueueItem, MmspWriteDataSectionPages, Context); - } - Context->PageOp[Context->PageCount++] = PageOp; - if (Context->PageCount == 16) - { + { + if (Context == NULL) + { + Context = ExAllocatePool(NonPagedPool, sizeof(PAGE_IO_CONTEXT)); + Context->Segment = current; + Context->Offset = i * PAGE_SIZE; + Context->PageCount = 0; + ExInitializeWorkItem(&Context->WorkQueueItem, MmspWriteDataSectionPages, Context); + } + Context->PageOp[Context->PageCount++] = PageOp; + if (Context->PageCount == 16) + { ExQueueWorkItem(&Context->WorkQueueItem, HyperCriticalWorkQueue); - Context = NULL; - } - } - else - { - if (Context) - { + Context = NULL; + } + } + else + { + if (Context) + { ExQueueWorkItem(&Context->WorkQueueItem, HyperCriticalWorkQueue); - Context = NULL; - } - } - } + Context = NULL; + } + } + } else - { - if (Context) - { + { + if (Context) + { ExQueueWorkItem(&Context->WorkQueueItem, HyperCriticalWorkQueue); - Context = NULL; - } - } - } + Context = NULL; + } + } + } if (Context) - { + { ExQueueWorkItem(&Context->WorkQueueItem, HyperCriticalWorkQueue); - Context = NULL; - } - - MmUnlockSectionSegment(current); + Context = NULL; + } + + MmUnlockSectionSegment(current); } ExReleaseFastMutex(&DataSectionObjectLock); } @@ -6630,50 +6630,50 @@ if (!IS_SWAP_FROM_SSE(Entry) && Pfn && !(Entry & 0x2) && MmGetShareCountPage(Pfn) && MmIsDirtyPageRmap(Pfn)) { Entry|=0x2; - MmSetPageEntrySectionSegment(Segment, i * PAGE_SIZE, Entry); + MmSetPageEntrySectionSegment(Segment, i * PAGE_SIZE, Entry); } if (!IS_SWAP_FROM_SSE(Entry) && Pfn && (Entry & 0x2)) { - PageOp = MmGetPageOp(CcCacheViewMemoryArea, NULL, NULL, Segment, i * PAGE_SIZE, MM_PAGEOP_PAGESYNCH, TRUE); + PageOp = MmGetPageOp(CcCacheViewMemoryArea, NULL, NULL, Segment, i * PAGE_SIZE, MM_PAGEOP_PAGESYNCH, TRUE); if (PageOp) - { - if (Context == NULL) - { - Context = ExAllocatePool(NonPagedPool, sizeof(PAGE_IO_CONTEXT)); - Context->Segment = Segment; - Context->Offset = i * PAGE_SIZE; - Context->PageCount = 0; - } - Context->PageOp[Context->PageCount++] = PageOp; - if (Context->PageCount == 16) - { - MmUnlockSectionSegment(Segment); + { + if (Context == NULL) + { + Context = ExAllocatePool(NonPagedPool, sizeof(PAGE_IO_CONTEXT)); + Context->Segment = Segment; + Context->Offset = i * PAGE_SIZE; + Context->PageCount = 0; + } + Context->PageOp[Context->PageCount++] = PageOp; + if (Context->PageCount == 16) + { + MmUnlockSectionSegment(Segment); MmspWriteDataSectionPages(Context); - Context = NULL; - MmLockSectionSegment(Segment); - } - } - else - { - CHECKPOINT; - if (Context) - { - MmUnlockSectionSegment(Segment); + Context = NULL; + MmLockSectionSegment(Segment); + } + } + else + { + CHECKPOINT; + if (Context) + { + MmUnlockSectionSegment(Segment); MmspWriteDataSectionPages(Context); - Context = NULL; - MmLockSectionSegment(Segment); - } - } + Context = NULL; + MmLockSectionSegment(Segment); + } + } } else { - if (Context) - { - MmUnlockSectionSegment(Segment); + if (Context) + { + MmUnlockSectionSegment(Segment); MmspWriteDataSectionPages(Context); - Context = NULL; - MmLockSectionSegment(Segment); - } + Context = NULL; + MmLockSectionSegment(Segment); + } } } MmUnlockSectionSegment(Segment);

1 0

[greatlrd] 21447: Fix regress in GetCaps Thx Christoph_vW seding me the test apps left todo implement Hel Getmemoryavil then we will getting a opengl drv for diablo2 working
by aleksey＠studiocerebral.com 02 Apr '06

02 Apr '06

Author: greatlrd Date: Sun Apr 2 23:08:31 2006 New Revision: 21447 URL: http://svn.reactos.ru/svn/reactos?rev=21447&view=rev Log: Fix regress in GetCaps Thx Christoph_vW seding me the test apps left todo implement Hel Getmemoryavil then we will getting a opengl drv for diablo2 working Modified: trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/ddraw… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c Sun Apr 2 23:08:31 2006 @@ -260,6 +260,17 @@ DeleteObject(hbmp); //DeleteDC(This->hdc); + DDHAL_GETDRIVERINFODATA DriverInfo; + memset(&DriverInfo,0, sizeof(DDHAL_GETDRIVERINFODATA)); + DriverInfo.dwSize = sizeof(DDHAL_GETDRIVERINFODATA); + DriverInfo.dwContext = This->mDDrawGlobal.hDD; + + /* Get the MiscellaneousCallbacks */ + DriverInfo.guidInfo = GUID_MiscellaneousCallbacks; + DriverInfo.lpvData = &This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->mHALInfo.GetDriverInfo(&DriverInfo); + return DD_OK; } @@ -337,16 +348,16 @@ DDHAL_GETAVAILDRIVERMEMORYDATA mem; if (!(This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY)) - { - return DDERR_NODRIVERSUPPORT; + { + return DDERR_NODRIVERSUPPORT; } mem.lpDD = &This->mDDrawGlobal; mem.ddRVal = DDERR_NOTPALETTIZED; if (This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemory(&mem) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; + { + return DDERR_NODRIVERSUPPORT; } ddscaps->dwCaps = mem.DDSCaps.dwCaps; Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Apr 2 23:08:31 2006 @@ -272,13 +272,63 @@ /* start alloc memory */ if ((pDDSD->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) { - // Do not alloc system memmory + ///* HAL Code */ + //DDHAL_CANCREATESURFACEDATA CanCreateData; + // memset(&CanCreateData, 0, sizeof(DDHAL_CANCREATESURFACEDATA)); + // CanCreateData.lpDD = &This->mDDrawGlobal; + // CanCreateData.lpDDSurfaceDesc = &mddsdPrimary; + // + // if (mDDrawGlobal.lpDDCBtmp->HALDD.CanCreateSurface(&CanCreateData) == DDHAL_DRIVER_NOTHANDLED) + // { + // return DDERR_INVALIDPARAMS; + // } + + //memset(&mPrimaryGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + // mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + // mPrimaryGlobal.lpDD = &mDDrawGlobal; + // mPrimaryGlobal.lpDDHandle = &mDDrawGlobal; + // mPrimaryGlobal.wWidth = (WORD)mpModeInfos[0].dwWidth; + // mPrimaryGlobal.wHeight = (WORD)mpModeInfos[0].dwHeight; + // mPrimaryGlobal.lPitch = mpModeInfos[0].lPitch; + + //memset(&mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + // mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + // memset(&mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + // mPrimaryLocal.lpGbl = &mPrimaryGlobal; + // mPrimaryLocal.lpSurfMore = &mPrimaryMore; + // mPrimaryLocal.dwProcessId = GetCurrentProcessId(); + // // mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; + // + // mPrimaryLocal.ddsCaps.dwCaps = mddsdPrimary.ddsCaps.dwCaps; + + // mpPrimaryLocals[0] = &mPrimaryLocal; + // + // DDHAL_CREATESURFACEDATA CreateData; + // memset(&CreateData, 0, sizeof(DDHAL_CREATESURFACEDATA)); + // CreateData.lpDD = &mDDrawGlobal; + // CreateData.lpDDSurfaceDesc = &mddsdPrimary; + // CreateData.dwSCnt = 1; + // CreateData.lplpSList = mpPrimaryLocals; + // CreateData.ddRVal = DD_FALSE; + // + // if (mDDrawGlobal.lpDDCBtmp->HALDD.CreateSurface(&CreateData)==DDHAL_DRIVER_NOTHANDLED) + // { + // return DD_FALSE; + // } + + // if(CreateData.ddRVal != DD_OK) + // { + // return CreateData.ddRVal; + // } + // return DD_OK; } else { // Create system mmeory //DDSCAPS_SYSTEMMEMORY + return DD_FALSE; } @@ -295,7 +345,6 @@ // DDSCAPS_OVERLAY create overlay surface // DDSCAPS_TEXTURE - // DDSCAPS_SYSTEMMEMORY // return That->lpVtbl->Initialize (*ppSurf, (LPDIRECTDRAW)iface, pDDSD); return DD_OK; @@ -364,19 +413,30 @@ HRESULT WINAPI Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, LPDDCAPS pHELCaps) -{ - DWORD status = DD_FALSE; +{ + DDSCAPS2 ddscaps; + DWORD status = DD_FALSE; IDirectDrawImpl *This = (IDirectDrawImpl *)iface; if (pDriverCaps != NULL) - { - RtlCopyMemory(pDriverCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); + { + Main_DirectDraw_GetAvailableVidMem(iface, + &ddscaps, + &This->mDDrawGlobal.ddCaps.dwVidMemTotal, + &This->mDDrawGlobal.ddCaps.dwVidMemFree); + + RtlCopyMemory(pDriverCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); status = DD_OK; } if (pHELCaps != NULL) - { - RtlCopyMemory(pDriverCaps,&This->mDDrawGlobal.ddHELCaps,sizeof(DDCORECAPS)); + { + Main_DirectDraw_GetAvailableVidMem(iface, + &ddscaps, + &This->mDDrawGlobal.ddHELCaps.dwVidMemTotal, + &This->mDDrawGlobal.ddHELCaps.dwVidMemFree); + + RtlCopyMemory(pDriverCaps,&This->mDDrawGlobal.ddHELCaps,sizeof(DDCORECAPS)); status = DD_OK; } @@ -438,6 +498,7 @@ { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + if (This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY) { return Hal_DirectDraw_GetAvailableVidMem (iface,ddscaps,total,free); Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sun Apr 2 23:08:31 2006 @@ -112,6 +112,8 @@ /********* Prototypes **********/ +HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, LPDWORD total, LPDWORD free); + HRESULT Hal_DirectDraw_Initialize (LPDIRECTDRAW7 ); HRESULT Hal_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 ); VOID Hal_DirectDraw_Release (LPDIRECTDRAW7 );

1 0

[mbosma] 21446: Merge a bit better.
by aleksey＠studiocerebral.com 02 Apr '06

02 Apr '06

Author: mbosma Date: Sun Apr 2 22:09:19 2006 New Revision: 21446 URL: http://svn.reactos.ru/svn/reactos?rev=21446&view=rev Log: Merge a bit better. Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/pe.c branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/pe.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/nt… ============================================================================== --- branches/cache_manager_rewrite/reactos/ntoskrnl/mm/pe.c (original) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/mm/pe.c Sun Apr 2 22:09:19 2006 @@ -146,16 +146,13 @@ [1] Microsoft Corporation, "Microsoft Portable Executable and Common Object File Format Specification", revision 6.0 (February 1999) */ -NTSTATUS NTAPI PeFmtCreateSection -( - IN CONST VOID * FileHeader, - IN SIZE_T FileHeaderSize, - IN PFILE_OBJECT FileObject, - OUT PMM_IMAGE_SECTION_OBJECT ImageSectionObject, - OUT PULONG Flags, - IN PEXEFMT_CB_READ_FILE ReadFileCb, - IN PEXEFMT_CB_ALLOCATE_SEGMENTS AllocateSegmentsCb -) +NTSTATUS NTAPI PeFmtCreateSection(IN CONST VOID * FileHeader, + IN SIZE_T FileHeaderSize, + IN PFILE_OBJECT FileObject, + OUT PMM_IMAGE_SECTION_OBJECT ImageSectionObject, + OUT PULONG Flags, + IN PEXEFMT_CB_READ_FILE ReadFileCb, + IN PEXEFMT_CB_ALLOCATE_SEGMENTS AllocateSegmentsCb) { NTSTATUS nStatus; ULONG cbFileHeaderOffsetSize = 0; @@ -177,12 +174,12 @@ ULONG nFileSizeOfHeaders = 0; ULONG i; - ASSERT(FileHeader); - ASSERT(FileHeaderSize > 0); - ASSERT(FileObject); - ASSERT(ImageSectionObject); - ASSERT(ReadFileCb); - ASSERT(AllocateSegmentsCb); + ASSERT(FileHeader); + ASSERT(FileHeaderSize > 0); + ASSERT(FileObject); + ASSERT(ImageSectionObject); + ASSERT(ReadFileCb); + ASSERT(AllocateSegmentsCb); ASSERT(Intsafe_CanOffsetPointer(FileHeader, FileHeaderSize)); @@ -247,17 +244,8 @@ cbNtHeaderSize = 0; lnOffset.QuadPart = pidhDosHeader->e_lfanew; - /* read the header from the file */ - nStatus = ReadFileCb - ( - FileObject, - ImageSectionObject->BytesPerSector, - &lnOffset, - sizeof(IMAGE_NT_HEADERS64), - &pData, - &pBuffer, - &cbReadSize - ); + /* read the header from the file */ + nStatus = ReadFileCb(FileObject, ImageSectionObject->BytesPerSector, &lnOffset, sizeof(IMAGE_NT_HEADERS64), &pData, &pBuffer, &cbReadSize); if(!NT_SUCCESS(nStatus)) DIE(("ReadFile failed, status %08X\n", nStatus)); @@ -538,17 +526,8 @@ lnOffset.QuadPart = cbSectionHeadersOffset; - /* read the header from the file */ - nStatus = ReadFileCb - ( - FileObject, - ImageSectionObject->BytesPerSector, - &lnOffset, - cbSectionHeadersSize, - &pData, - &pBuffer, - &cbReadSize - ); + /* read the header from the file */ + nStatus = ReadFileCb(FileObject, ImageSectionObject->BytesPerSector, &lnOffset, cbSectionHeadersSize, &pData, &pBuffer, &cbReadSize); if(!NT_SUCCESS(nStatus)) DIE(("ReadFile failed with status %08X\n", nStatus)); Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/nt… ============================================================================== --- branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c (original) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c Sun Apr 2 22:09:19 2006 @@ -6129,6 +6129,21 @@ BOOLEAN FileObjectCreated; PSECTION_OBJECT *SectionObject = (PSECTION_OBJECT *)Section; + /* + * Check the protection + */ + ULONG Protection = SectionPageProtection & ~(PAGE_GUARD | PAGE_NOCACHE); + if (Protection != PAGE_NOACCESS && + Protection != PAGE_READONLY && + Protection != PAGE_READWRITE && + Protection != PAGE_WRITECOPY && + Protection != PAGE_EXECUTE && + Protection != PAGE_EXECUTE_READ && Protection != PAGE_EXECUTE_READWRITE && Protection != PAGE_EXECUTE_WRITECOPY) + { + CHECKPOINT1; + return STATUS_INVALID_PAGE_PROTECTION; + } + if (AllocationAttributes & SEC_IMAGE && FileHandle == NULL && FileObject == NULL)

1 0

[greatlrd] 21445: at last no more crash in create surface but it is not finish
by aleksey＠studiocerebral.com 02 Apr '06

02 Apr '06

Author: greatlrd Date: Sun Apr 2 20:12:25 2006 New Revision: 21445 URL: http://svn.reactos.ru/svn/reactos?rev=21445&view=rev Log: at last no more crash in create surface but it is not finish Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Apr 2 20:12:25 2006 @@ -266,9 +266,38 @@ *ppSurf = (LPDIRECTDRAWSURFACE7)That; + + //This->mpLocal = (DDRAWI_DDRAWSURFACE_LCL* )DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_LCL) * This->cSurfaces); + //This->mppLocal = (DDRAWI_DDRAWSURFACE_LCL**)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_LCL*) * This->cSurfaces); + /* start alloc memory */ + if ((pDDSD->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + // Do not alloc system memmory + + } + else + { + // Create system mmeory + //DDSCAPS_SYSTEMMEMORY + } + + + + // the real surface object creation //return That->lpVtbl->Initialize (*ppSurf, (LPDIRECTDRAW)iface, pDDSD); + /* alloc memmory if we need it for diffent surface */ + // DDSCAPS_VIDEOMEMORY graphic card alloc memmory */ + + // DDSCAPS_OFFSCREENPLAIN offcreen surface alloc memmory ?? + + // DDSCAPS_OVERLAY create overlay surface + + // DDSCAPS_TEXTURE + // DDSCAPS_SYSTEMMEMORY + + // return That->lpVtbl->Initialize (*ppSurf, (LPDIRECTDRAW)iface, pDDSD); return DD_OK; }

1 0

[greatlrd] 21444: Remove Hal_DDrawSurface_Initialize, Hel_DDrawSurface_Initialize and make sure DDrawSurface_Initialize act as windows ddraw.dll and wine ddraw.dll Under devlopin with small changes in Main_DirectDraw_CreateSurface this interface shall split now into one hel and one hal part
by aleksey＠studiocerebral.com 02 Apr '06

02 Apr '06

Author: greatlrd Date: Sun Apr 2 19:04:09 2006 New Revision: 21444 URL: http://svn.reactos.ru/svn/reactos?rev=21444&view=rev Log: Remove Hal_DDrawSurface_Initialize, Hel_DDrawSurface_Initialize and make sure DDrawSurface_Initialize act as windows ddraw.dll and wine ddraw.dll Under devlopin with small changes in Main_DirectDraw_CreateSurface this interface shall split now into one hel and one hal part Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/soft/surface_hel.c Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surfa… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Sun Apr 2 19:04:09 2006 @@ -9,115 +9,6 @@ */ #include "rosdraw.h" - -HRESULT Hal_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) -{ - IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - - if(sizeof(DDSURFACEDESC2) != pDDSD2->dwSize) - return DDERR_UNSUPPORTED; - - This->owner = (IDirectDrawImpl*)pDD; - - /************ fill the discription of our primary surface ***********************/ - - memset (&This->ddsd, 0, sizeof(DDSURFACEDESC)); - This->ddsd.dwSize = sizeof(DDSURFACEDESC); - - RtlCopyMemory(&This->ddsd.ddckCKDestBlt,&pDDSD2->ddckCKDestBlt,sizeof(This->ddsd.ddckCKDestBlt)); - RtlCopyMemory(&This->ddsd.ddckCKDestOverlay,&pDDSD2->ddckCKDestOverlay,sizeof(This->ddsd.ddckCKDestOverlay)); - RtlCopyMemory(&This->ddsd.ddckCKSrcBlt,&pDDSD2->ddckCKSrcBlt,sizeof(This->ddsd.ddckCKSrcBlt)); - RtlCopyMemory(&This->ddsd.ddckCKSrcOverlay,&pDDSD2->ddckCKSrcOverlay,sizeof(This->ddsd.ddckCKSrcOverlay)); - RtlCopyMemory(&This->ddsd.ddpfPixelFormat,&pDDSD2->ddpfPixelFormat,sizeof(This->ddsd.ddpfPixelFormat)); - RtlCopyMemory(&This->ddsd.ddsCaps,&pDDSD2->ddsCaps,sizeof(This->ddsd.ddsCaps)); - - This->ddsd.dwAlphaBitDepth = pDDSD2->dwAlphaBitDepth; - This->ddsd.dwBackBufferCount = pDDSD2->dwBackBufferCount; - This->ddsd.dwFlags = pDDSD2->dwFlags; - This->ddsd.dwHeight = pDDSD2->dwHeight; - This->ddsd.dwLinearSize = pDDSD2->dwLinearSize; - This->ddsd.dwMipMapCount = pDDSD2->dwMipMapCount; - This->ddsd.dwRefreshRate = pDDSD2->dwRefreshRate; - This->ddsd.dwReserved = pDDSD2->dwReserved; - This->ddsd.dwWidth = pDDSD2->dwWidth; - This->ddsd.lPitch = pDDSD2->lPitch; - This->ddsd.lpSurface = pDDSD2->lpSurface; - - /************ Test see if we can Create Surface ***********************/ - - if (This->owner->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) - { - /* can the driver create the surface */ - DDHAL_CANCREATESURFACEDATA CanCreateData; - memset(&CanCreateData, 0, sizeof(DDHAL_CANCREATESURFACEDATA)); - CanCreateData.lpDD = &This->owner->mDDrawGlobal; - CanCreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC)&This->ddsd; - - if (This->owner->mDDrawGlobal.lpDDCBtmp->HALDD.CanCreateSurface(&CanCreateData) == DDHAL_DRIVER_NOTHANDLED) - return DDERR_INVALIDPARAMS; - - if(CanCreateData.ddRVal != DD_OK) - return CanCreateData.ddRVal; - } - - /************ Create Surface ***********************/ - - /* surface global struct */ - memset(&This->Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - This->Global.lpDD = &This->owner->mDDrawGlobal; - This->Global.wHeight = This->owner->mDDrawGlobal.vmiData.dwDisplayHeight; - This->Global.wWidth = This->owner->mDDrawGlobal.vmiData.dwDisplayWidth; - This->Global.dwLinearSize = This->owner->mDDrawGlobal.vmiData.lDisplayPitch; - if(pDDSD2->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - This->Global.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; - - /* surface more struct */ - memset(&This->More, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - This->More.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - This->More.dmiDDrawReserved7.wWidth = This->Global.wWidth; - This->More.dmiDDrawReserved7.wHeight = This->Global.wHeight; - //This->More.dmiDDrawReserved7.wBPP = This->owner->Bpp; - This->More.dmiDDrawReserved7.wBPP = This->Global.dwLinearSize; - - This->More.dmiDDrawReserved7.wRefreshRate = This->owner->mDDrawGlobal.dwMonitorFrequency; - //This->More.dmiDDrawReserved7.wMonitorsAttachedToDesktop = 2; - /* ToDo: fill ddsCapsEx */ - - /* surface local struct */ - memset(&This->Local, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - This->Local.lpGbl = &This->Global; - This->Local.lpSurfMore = &This->More; - This->Local.ddsCaps.dwCaps = pDDSD2->ddsCaps.dwCaps; - This->Local.dwProcessId = This->owner->ExclusiveOwner.dwProcessId; - - /* for the double pointer below */ - This->pLocal[0] = &This->Local; - This->pLocal[1] = NULL; - - /* the parameter struct */ - DDHAL_CREATESURFACEDATA CreateData; - memset(&CreateData, 0, sizeof(DDHAL_CREATESURFACEDATA)); - CreateData.lpDD = &This->owner->mDDrawGlobal; - CreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC)&This->ddsd; - CreateData.dwSCnt = 1; - CreateData.lplpSList = This->pLocal; - asm("int3"); - CreateData.ddRVal = 1; - - /* this is the call we were waiting for */ - if(This->owner->mDDrawGlobal.lpDDCBtmp->HALDD.CreateSurface(&CreateData) == DDHAL_DRIVER_NOTHANDLED) - return DDERR_INVALIDPARAMS; - asm("int3"); - - /* FIXME remove the if and debug string*/ - if(CreateData.ddRVal != DD_OK) - return CreateData.ddRVal; - - OutputDebugString(L"This does hit By Ati Readon but not for nvida :( "); - OutputDebugString(L"Yet ;)"); - - return DD_OK; -} HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rDest, Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Apr 2 19:04:09 2006 @@ -43,12 +43,6 @@ RtlCopyMemory(&This->mDDrawGlobal.cObsolete,&"DISPLAY",7); RtlCopyMemory(&This->mDDrawGlobal.cDriverName,&"DISPLAY",7); - /* Setup the lpExclusiveOwner struct in msdn this struct member is undoc - I am using there name to figout which info it should be fild with - My hardware drv does not support call to SetExusive so I can not - debug it see how it should be fild - this part have been move to HAL - */ // call software first @@ -254,8 +248,9 @@ That = (IDirectDrawSurfaceImpl*)HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectDrawSurfaceImpl)); if (That == NULL) + { return E_OUTOFMEMORY; - + } ZeroMemory(That, sizeof(IDirectDrawSurfaceImpl)); That->lpVtbl = &DirectDrawSurface7_Vtable; @@ -272,7 +267,9 @@ *ppSurf = (LPDIRECTDRAWSURFACE7)That; // the real surface object creation - return That->lpVtbl->Initialize (*ppSurf, (LPDIRECTDRAW)iface, pDDSD); + //return That->lpVtbl->Initialize (*ppSurf, (LPDIRECTDRAW)iface, pDDSD); + + return DD_OK; } HRESULT WINAPI Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface, DWORD dwFlags, Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Sun Apr 2 19:04:09 2006 @@ -11,18 +11,10 @@ #include "rosdraw.h" + HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) { - IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - - /* Call the Hal CreateSurface */ - if (This->owner->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) - { - return Hal_DDrawSurface_Initialize (iface, pDD, pDDSD2); - } - - /* Call Hel if Hal of CreateSurface is not supported */ - return Hel_DDrawSurface_Initialize (iface, pDD, pDDSD2); + return DDERR_ALREADYINITIALIZED; } ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7 iface) @@ -55,10 +47,10 @@ HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst, LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_FLIPTOGDISURFACE) + if (This->owner->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_SURFCB32_BLT) { return Hal_DDrawSurface_Blt( iface, rdst, src, rsrc, dwFlags, lpbltfx); } @@ -69,7 +61,15 @@ HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event) -{ +{ /* + IDirectDrawSurfaceImpl* That = (IDirectDrawSurfaceImpl*)iface; + + if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) + { + return Hal_DDrawSurface_Lock( iiface, LPRECT prect, pDDSD, flags, event); + } + + return Hel_DDrawSurface_Lock( iiface, LPRECT prect, pDDSD, flags, event);*/ DX_STUB; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sun Apr 2 19:04:09 2006 @@ -121,7 +121,7 @@ HRESULT Hal_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 ); HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7, DWORD, DWORD, DWORD, DWORD, DWORD ); HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); -HRESULT Hal_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 , LPDIRECTDRAW , LPDDSURFACEDESC2 ); + HRESULT Hel_DirectDraw_Initialize (LPDIRECTDRAW7 ); @@ -133,7 +133,7 @@ HRESULT Hel_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 ); HRESULT Hel_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 , DWORD , DWORD ,DWORD , DWORD , DWORD ); HRESULT Hel_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); -HRESULT Hel_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 , LPDIRECTDRAW , LPDDSURFACEDESC2 ); + /*********** Macros ***********/ Modified: trunk/reactos/dll/directx/ddraw/soft/surface_hel.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/surface_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/surface_hel.c Sun Apr 2 19:04:09 2006 @@ -10,10 +10,7 @@ #include "rosdraw.h" -HRESULT Hel_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) -{ - DX_STUB; -} + HRESULT Hel_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst, LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs