Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[peterw] 31038: - Update the readme a bit (Basic Usage section) and update the changelog.

by peterw＠svn.reactos.org

Author: peterw Date: Thu Dec 6 11:16:57 2007 New Revision: 31038 URL: http://svn.reactos.org/svn/reactos?rev=31038&view=rev Log: - Update the readme a bit (Basic Usage section) and update the changelog. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Thu Dec 6 11:16:57 2007 @@ -11,14 +11,21 @@ - Add a pushd/popd to options.cmd so that options.exe pulls up a better default path for MinGW/GCC. (Peter Ward) - Set the working directory for the "Options" shortcut correctly (see above bullet). (Colin Fink) - Add back detection of previous versions of RosBE (versions 0.3.5b2 and before). (Peter Ward) +- Prevent multiple instances of the installer from running. (Peter Ward) - Fix the uninstall previous routine. (Peter Ward) +- Added a small utility (rquote) to remove any quotes from a string (needed for the spaces fix in chdefgcc.cmd). (Peter Ward) +- Fix a problem with spaces in chdefgcc.cmd. (Peter Ward) +- Make 'chdefgcc' bail if no MinGW/GCC is found in the given path. (Peter Ward) - Fix a bug in Clean.cmd. It accidently killed some not anymore Autogenerated Resources. (Daniel Reimer) +- Remove file deletions that are no longer needed from Clean.cmd so it now only removes + obj-i386\., output-i386\., reactos\. and makefile.auto. (Peter Ward) - Fix a bug in TimeDate.cmd. (Peter Ward) - Fix a bug in reladdr2line.cmd. (Peter Ward) - Change the default ReactOS source directory from APPDATA\RosBE\Source to PROFILE\reactos. (Peter Ward) - Remove the installation and APPDATA\RosBE directories on uninstall which weren't being removed. (Peter Ward) - Set the ccache directory to APPDATA\RosBE\.ccache instead of PROFILE\.ccache. (Peter Ward) - Switch default install directory back to PROGRAMFILES\RosBE. (Peter Ward) +- Detect if running on a x64 system and install to "Program Files" and not "Program Files (x86)" to avoid problems with (). (Peter Ward) - Add a "Standard MinGW Build Environment" and the associated MinGW.cmd + an icon. (Peter Ward) *** Nov 18th, 2007 - RosBE 1.0 Released Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available.

17 years

[cwittich] 31037: really fix the bug now - count from CM_KCBS_PER_PAGE -1 to 0 instead of CM_KCBS_PER_PAGE -1 to 1

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Dec 6 10:11:20 2007 New Revision: 31037 URL: http://svn.reactos.org/svn/reactos?rev=31037&view=rev Log: really fix the bug now - count from CM_KCBS_PER_PAGE -1 to 0 instead of CM_KCBS_PER_PAGE -1 to 1 Modified: trunk/reactos/ntoskrnl/config/cmalloc.c Modified: trunk/reactos/ntoskrnl/config/cmalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmalloc.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmalloc.c (original) +++ trunk/reactos/ntoskrnl/config/cmalloc.c Thu Dec 6 10:11:20 2007 @@ -88,12 +88,12 @@ if (++AllocPage->FreeCount == CM_KCBS_PER_PAGE) { /* Loop all the entries */ - for (i = CM_KCBS_PER_PAGE - 1; i; i--) + for (i = CM_KCBS_PER_PAGE; i; i--) { /* Get the KCB */ Kcb = (PVOID)((ULONG_PTR)AllocPage + FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage) + - i * sizeof(CM_KEY_CONTROL_BLOCK)); + (i - 1) * sizeof(CM_KEY_CONTROL_BLOCK)); /* Remove the entry */ RemoveEntryList(&Kcb->FreeListEntry);

17 years

[peterw] 31036: - Prevent multiple instances of the installer from running.

by peterw＠svn.reactos.org

Author: peterw Date: Thu Dec 6 08:54:22 2007 New Revision: 31036 URL: http://svn.reactos.org/svn/reactos?rev=31036&view=rev Log: - Prevent multiple instances of the installer from running. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Thu Dec 6 08:54:22 2007 @@ -42,6 +42,11 @@ ;; Read our custom page ini, remove previous version. ;; Function .onInit + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "RosBE-v${PRODUCT_VERSION}-Installer") i .r1 ?e' + Pop $R0 + StrCmp $R0 0 +3 + MessageBox MB_OK|MB_ICONEXCLAMATION "The ${PRODUCT_NAME} v${PRODUCT_VERSION} installer is already running." + Abort ${If} ${RunningX64} StrCpy $INSTDIR "$PROGRAMFILES64\RosBE" ${Else}

17 years

[jimtabor] 31035: Restore to default behavior for now.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Dec 6 07:00:51 2007 New Revision: 31035 URL: http://svn.reactos.org/svn/reactos?rev=31035&view=rev Log: Restore to default behavior for now. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Thu Dec 6 07:00:51 2007 @@ -108,6 +108,7 @@ HDC STDCALL NtUserGetDC(HWND hWnd) { +#if 0 if (!hWnd) { // MSDN: //"hWnd [in] Handle to the window whose DC is to be retrieved. @@ -119,6 +120,9 @@ return NULL; } return NtUserGetDCEx(hWnd, NULL, DCX_USESTYLE); +#endif +// We have a problem here! + return NtUserGetDCEx(hWnd, NULL, NULL == hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE); } PDCE FASTCALL @@ -406,9 +410,9 @@ if (NULL == Window) { // Do the same as GetDC with a NULL. - Window = UserGetWindowObject(IntGetDesktopWindow()); - if (Window) Wnd = Window->Wnd; - else +// Window = UserGetWindowObject(IntGetDesktopWindow()); +// if (Window) Wnd = Window->Wnd; +// else Flags &= ~DCX_USESTYLE; } else @@ -729,7 +733,7 @@ } IntGdiDeleteDC(pdce->hDC, TRUE); - + if (pdce->hClipRgn && ! (pdce->DCXFlags & DCX_KEEPCLIPRGN)) { NtGdiDeleteObject(pdce->hClipRgn);

17 years

[jimtabor] 31034: Sorry Fix bug.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Dec 6 05:20:37 2007 New Revision: 31034 URL: http://svn.reactos.org/svn/reactos?rev=31034&view=rev Log: Sorry Fix bug. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Dec 6 05:20:37 2007 @@ -932,9 +932,9 @@ { DPRINT1("No! You Naughty Application!\n"); // if(!UserReleaseDC(NULL, hDC, FALSE)) Ret = FALSE; - } - DC_UnlockDc( DCToDelete ); - return Ret; + DC_UnlockDc( DCToDelete ); + return Ret; + } } /* First delete all saved DCs */

17 years

[jimtabor] 31033: Fixed one more test, now from 23 to 22 fail. Reordered NtGdiDeleteObjectApp and created a separate function so that applications can not delete DCs belonging to DCEs. Add a check for Wnd = NULL for UserGetDCEx, this did not help the test results. Test Qemu Linux, Xp and hardware. Install and run AbiWord and FF as tests.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Dec 6 05:09:56 2007 New Revision: 31033 URL: http://svn.reactos.org/svn/reactos?rev=31033&view=rev Log: Fixed one more test, now from 23 to 22 fail. Reordered NtGdiDeleteObjectApp and created a separate function so that applications can not delete DCs belonging to DCEs. Add a check for Wnd = NULL for UserGetDCEx, this did not help the test results. Test Qemu Linux, Xp and hardware. Install and run AbiWord and FF as tests. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/dce.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Thu Dec 6 05:09:56 2007 @@ -108,12 +108,14 @@ VOID FASTCALL DC_UnlockDisplay(HDC); VOID FASTCALL IntGdiCopyFromSaveState(PDC, PDC, HDC); VOID FASTCALL IntGdiCopyToSaveState(PDC, PDC); +BOOL FASTCALL IntGdiDeleteDC(HDC, BOOL); VOID FASTCALL DC_UpdateXforms(PDC dc); BOOL FASTCALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest); BOOL FASTCALL DCU_SyncDcAttrtoUser(PDC); BOOL FASTCALL DCU_SynchDcAttrtoUser(HDC); +VOID FASTCALL DCU_SetDcUndeletable(HDC); VOID FASTCALL IntGetViewportExtEx(PDC dc, LPSIZE pt); VOID FASTCALL IntGetViewportOrgEx(PDC dc, LPPOINT pt); Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dce.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dce.h Thu Dec 6 05:09:56 2007 @@ -40,6 +40,7 @@ #define DCX_DCEEMPTY 0x00000800 #define DCX_DCEBUSY 0x00001000 #define DCX_DCEDIRTY 0x00002000 +#define DCX_DCOWNED 0x00008000 #define DCX_USESTYLE 0x00010000 #define DCX_KEEPCLIPRGN 0x00040000 #define DCX_NOCLIPCHILDREN 0x00080000 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Thu Dec 6 05:09:56 2007 @@ -161,6 +161,8 @@ FirstDce = pDce; KeLeaveCriticalRegion(); + DCU_SetDcUndeletable(pDce->hDC); + if (Type == DCE_WINDOW_DC) //Window DCE have ownership. { // Process should already own it. pDce->pProcess = PsGetCurrentProcess(); @@ -403,8 +405,11 @@ PWINDOW Wnd = NULL; if (NULL == Window) - { - Flags &= ~DCX_USESTYLE; + { // Do the same as GetDC with a NULL. + Window = UserGetWindowObject(IntGetDesktopWindow()); + if (Window) Wnd = Window->Wnd; + else + Flags &= ~DCX_USESTYLE; } else Wnd = Window->Wnd; @@ -723,7 +728,8 @@ } } - NtGdiDeleteObjectApp(pdce->hDC); + IntGdiDeleteDC(pdce->hDC, TRUE); + if (pdce->hClipRgn && ! (pdce->DCXFlags & DCX_KEEPCLIPRGN)) { NtGdiDeleteObject(pdce->hClipRgn); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Dec 6 05:09:56 2007 @@ -910,29 +910,32 @@ } +// +// +// BOOL -STDCALL -NtGdiDeleteObjectApp(HANDLE DCHandle) -{ - PDC DCToDelete; - - if (GDI_HANDLE_GET_TYPE(DCHandle) != GDI_OBJECT_TYPE_DC) - return NtGdiDeleteObject((HGDIOBJ) DCHandle); - - if(IsObjectDead((HGDIOBJ)DCHandle)) return TRUE; - - if (!GDIOBJ_OwnedByCurrentProcess(GdiHandleTable, DCHandle)) +FASTCALL +IntGdiDeleteDC(HDC hDC, BOOL Force) +{ + BOOL Ret = FALSE; + PDC DCToDelete = DC_LockDc(hDC); + + if (DCToDelete == NULL) { SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - DCToDelete = DC_LockDc(DCHandle); - if (DCToDelete == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } + if(!Force) + { + if (DCToDelete->DC_Flags & DC_FLAG_PERMANENT) + { + DPRINT1("No! You Naughty Application!\n"); +// if(!UserReleaseDC(NULL, hDC, FALSE)) Ret = FALSE; + } + DC_UnlockDc( DCToDelete ); + return Ret; + } /* First delete all saved DCs */ while (DCToDelete->saveLevel) @@ -995,8 +998,29 @@ } DC_UnlockDc( DCToDelete ); - DC_FreeDC ( DCHandle ); + DC_FreeDC ( hDC ); return TRUE; +} + +BOOL +STDCALL +NtGdiDeleteObjectApp(HANDLE DCHandle) +{ + + if (GDI_HANDLE_IS_STOCKOBJ(DCHandle)) return TRUE; + + if (GDI_HANDLE_GET_TYPE(DCHandle) != GDI_OBJECT_TYPE_DC) + return NtGdiDeleteObject((HGDIOBJ) DCHandle); + + if(IsObjectDead((HGDIOBJ)DCHandle)) return TRUE; + + if (!GDIOBJ_OwnedByCurrentProcess(GdiHandleTable, DCHandle)) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + return IntGdiDeleteDC(DCHandle, FALSE); } INT Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Thu Dec 6 05:09:56 2007 @@ -257,3 +257,19 @@ NtGdiSelectBrush(hDC, hBrush); return oldColor; } + +VOID +FASTCALL +DCU_SetDcUndeletable(HDC hDC) +{ + PDC dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return; + } + + dc->DC_Flags |= DC_FLAG_PERMANENT; + DC_UnlockDc( dc ); + return; +}

17 years

[cfinck] 31032: - Changes by Martin Grogan (groganm AT gmail DOT com, IRC nick _Lazybones_): * Make the appearance and layout more like the MS version * Added functionality for resetting scores * Auto-complete the board, when the player is guaranteed to win - Changes by myself: * Add a new define WINEMINE_REGKEY to define the registry path of the WineMine settings only one time * Store the settings in HKCU instead of HKLM and use REG_DWORD, when it makes sense * Get WineMine to compile warning-f

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Dec 6 02:17:15 2007 New Revision: 31032 URL: http://svn.reactos.org/svn/reactos?rev=31032&view=rev Log: - Changes by Martin Grogan (groganm AT gmail DOT com, IRC nick _Lazybones_): * Make the appearance and layout more like the MS version * Added functionality for resetting scores * Auto-complete the board, when the player is guaranteed to win - Changes by myself: * Add a new define WINEMINE_REGKEY to define the registry path of the WineMine settings only one time * Store the settings in HKCU instead of HKLM and use REG_DWORD, when it makes sense * Get WineMine to compile warning-free under MSVC * Make the new "seconds" string translateable * Make all WineMine resource files consistent and ensure that all visual elements are visible See issue #2060 for more details. Modified: trunk/reactos/base/applications/games/winemine/dialog.c trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc trunk/reactos/base/applications/games/winemine/lang/ca-ES.rc trunk/reactos/base/applications/games/winemine/lang/de-DE.rc trunk/reactos/base/applications/games/winemine/lang/el-GR.rc trunk/reactos/base/applications/games/winemine/lang/en-US.rc trunk/reactos/base/applications/games/winemine/lang/es-ES.rc trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc trunk/reactos/base/applications/games/winemine/lang/id-ID.rc trunk/reactos/base/applications/games/winemine/lang/it-IT.rc trunk/reactos/base/applications/games/winemine/lang/lt-LT.rc trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc trunk/reactos/base/applications/games/winemine/lang/sk-SK.rc trunk/reactos/base/applications/games/winemine/lang/th-TH.rc trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc trunk/reactos/base/applications/games/winemine/main.c trunk/reactos/base/applications/games/winemine/main.h trunk/reactos/base/applications/games/winemine/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/games/winemine/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…

17 years

[jimtabor] 31031: Fix one wine test, from 75 to 23 no.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Dec 6 01:30:44 2007 New Revision: 31031 URL: http://svn.reactos.org/svn/reactos?rev=31031&view=rev Log: Fix one wine test, from 75 to 23 no. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Thu Dec 6 01:30:44 2007 @@ -108,7 +108,17 @@ HDC STDCALL NtUserGetDC(HWND hWnd) { - return NtUserGetDCEx(hWnd, NULL, NULL == hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE); + if (!hWnd) + { // MSDN: + //"hWnd [in] Handle to the window whose DC is to be retrieved. + // If this value is NULL, GetDC retrieves the DC for the entire screen." + hWnd = IntGetDesktopWindow(); + if (hWnd) + return NtUserGetDCEx(hWnd, NULL, DCX_CACHE | DCX_WINDOW); + else + return NULL; + } + return NtUserGetDCEx(hWnd, NULL, DCX_USESTYLE); } PDCE FASTCALL

17 years

[fireball] 31030: - Save hive flags instead of ignoring them (but ignore no lazy flush for now). - Get rid of CmiKeyObjectListHead and code that was adding/removing entries into it, it wasn't used for anything. - Change the stupid subkey array (which caused pool fragmentation and slow-downs) with a linked-list version, since we never used the array for random indexing (the point of an array vs a linked list). - Link key object children to parent key control blocks so that KCBs now own PKEY_OBJEC

by fireball＠svn.reactos.org

Author: fireball Date: Thu Dec 6 01:30:33 2007 New Revision: 31030 URL: http://svn.reactos.org/svn/reactos?rev=31030&view=rev Log: - Save hive flags instead of ignoring them (but ignore no lazy flush for now). - Get rid of CmiKeyObjectListHead and code that was adding/removing entries into it, it wasn't used for anything. - Change the stupid subkey array (which caused pool fragmentation and slow-downs) with a linked-list version, since we never used the array for random indexing (the point of an array vs a linked list). - Link key object children to parent key control blocks so that KCBs now own PKEY_OBJECTs (will help with parsing later). - Get rid of CmiAddKeyToList since this is just an InsertTailList now. - Remove ReactOS hacks in flush code. - Do full parallel hive loading code in normal boot too, not just in cd-rom boot: CmpSetFileSize was causing the problem to happen so it's been disabled for now; this allowed removal of multiple ReactOS hacks. - Use the "Allocate" flag during linking instead of hard-coding FALSE, since this also works now. - Set HIVE_NOLAZYFLUSH to newly create hives since this is required for later. - Remove CmiConnectedHiveList since it's not used for anything. Modified: trunk/reactos/lib/cmlib/hiveinit.c trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=3… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c (original) +++ trunk/reactos/lib/cmlib/hiveinit.c Thu Dec 6 01:30:33 2007 @@ -460,6 +460,7 @@ Hive->StorageTypeCount = HTYPE_COUNT; Hive->Cluster = 1; Hive->Version = HSYS_MINOR; + Hive->HiveFlags = HiveFlags &~ HIVE_NOLAZYFLUSH; switch (Operation) { Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=31030… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Thu Dec 6 01:30:33 2007 @@ -4,13 +4,8 @@ #include "ntoskrnl/config/cm.h" extern POBJECT_TYPE CmpKeyObjectType; -extern KSPIN_LOCK CmiKeyListLock; extern ERESOURCE CmpRegistryLock; extern EX_PUSH_LOCK CmpHiveListHeadLock; - -NTSTATUS -CmiCallRegisteredCallbacks(IN REG_NOTIFY_CLASS Argument1, - IN PVOID Argument2); #define VERIFY_BIN_HEADER(x) ASSERT(x->HeaderId == REG_BIN_ID) #define VERIFY_KEY_CELL(x) ASSERT(x->Signature == CM_KEY_NODE_SIGNATURE) Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Thu Dec 6 01:30:33 2007 @@ -175,7 +175,7 @@ KeyObject->KeyControlBlock->ValueCache.Count = Node->ValueList.Count; /* Link child to parent */ - CmiAddKeyToList(Parent, KeyObject); + CmiAddKeyToList(Parent->KeyControlBlock, KeyObject); /* Create the actual handle to the object */ Status = CmpCreateHandle(KeyObject, Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Thu Dec 6 01:30:33 2007 @@ -17,7 +17,6 @@ #include "cm.h" -extern LIST_ENTRY CmiKeyObjectListHead; extern ULONG CmiTimer; static NTSTATUS @@ -440,22 +439,18 @@ /* Preconditions: Must be called with CmpRegistryLock held. */ NTSTATUS -CmiScanKeyList(PKEY_OBJECT Parent, +CmiScanKeyList(PCM_KEY_CONTROL_BLOCK Parent, PCUNICODE_STRING KeyName, ULONG Attributes, PKEY_OBJECT* ReturnedObject) { PKEY_OBJECT CurKey = NULL; - ULONG Index; - - DPRINT("Scanning key list for: %wZ (Parent: %wZ)\n", - KeyName, &Parent->Name); - - /* FIXME: if list maintained in alphabetic order, use dichotomic search */ - /* (a binary search) */ - for (Index=0; Index < Parent->SubKeyCounts; Index++) - { - CurKey = Parent->SubKeys[Index]; + PLIST_ENTRY NextEntry; + + NextEntry = Parent->KeyBodyListHead.Flink; + while (NextEntry != &Parent->KeyBodyListHead) + { + CurKey = CONTAINING_RECORD(NextEntry, KEY_OBJECT, KeyBodyEntry); if (Attributes & OBJ_CASE_INSENSITIVE) { DPRINT("Comparing %wZ and %wZ\n", KeyName, &CurKey->Name); @@ -473,9 +468,11 @@ break; } } - } - - if (Index < Parent->SubKeyCounts) + + NextEntry = NextEntry->Flink; + } + + if (NextEntry != &Parent->KeyBodyListHead) { if (CurKey->KeyControlBlock->Delete) { @@ -588,7 +585,7 @@ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - Status = CmiScanKeyList(ParsedKey, + Status = CmiScanKeyList(ParsedKey->KeyControlBlock, &KeyName, Attributes, &FoundObject); @@ -722,9 +719,8 @@ FoundObject->KeyControlBlock = Kcb; ASSERT(FoundObject->KeyControlBlock->KeyHive == ParsedKey->KeyControlBlock->KeyHive); - InsertTailList(&CmiKeyObjectListHead, &FoundObject->KeyBodyList); RtlpCreateUnicodeString(&FoundObject->Name, KeyName.Buffer, NonPagedPool); - CmiAddKeyToList(ParsedKey, FoundObject); + CmiAddKeyToList(ParsedKey->KeyControlBlock, FoundObject); DPRINT("Created object 0x%p\n", FoundObject); } else @@ -784,9 +780,6 @@ } } - RemoveEntryList(&FoundObject->KeyBodyList); - InsertHeadList(&CmiKeyObjectListHead, &FoundObject->KeyBodyList); - ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); @@ -831,15 +824,9 @@ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - RemoveEntryList(&KeyObject->KeyBodyList); RtlFreeUnicodeString(&KeyObject->Name); ASSERT((KeyObject->KeyControlBlock->Delete) == FALSE); - - if (KeyObject->SizeOfSubKeys) - { - ExFreePool(KeyObject->SubKeys); - } ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); @@ -917,41 +904,10 @@ } VOID -CmiAddKeyToList(PKEY_OBJECT ParentKey, +CmiAddKeyToList(PCM_KEY_CONTROL_BLOCK ParentKey, PKEY_OBJECT NewKey) { - DPRINT("ParentKey %.08x\n", ParentKey); - - if (ParentKey->SizeOfSubKeys <= ParentKey->SubKeyCounts) - { - PKEY_OBJECT *tmpSubKeys = ExAllocatePool(NonPagedPool, - (ParentKey->SubKeyCounts + 1) * sizeof(ULONG)); - - if (ParentKey->SubKeyCounts > 0) - { - RtlCopyMemory (tmpSubKeys, - ParentKey->SubKeys, - ParentKey->SubKeyCounts * sizeof(ULONG)); - } - - if (ParentKey->SubKeys) - ExFreePool(ParentKey->SubKeys); - - ParentKey->SubKeys = tmpSubKeys; - ParentKey->SizeOfSubKeys = ParentKey->SubKeyCounts + 1; - } - - /* FIXME: Please maintain the list in alphabetic order */ - /* to allow a dichotomic search */ - ParentKey->SubKeys[ParentKey->SubKeyCounts++] = NewKey; - - DPRINT("Reference parent key: 0x%p\n", ParentKey); - - ObReferenceObjectByPointer(ParentKey, - STANDARD_RIGHTS_REQUIRED, - CmpKeyObjectType, - KernelMode); - //NewKey->ParentKey = ParentKey; + InsertTailList(&ParentKey->KeyBodyListHead, &NewKey->KeyBodyEntry); } static NTSTATUS Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Thu Dec 6 01:30:33 2007 @@ -202,8 +202,6 @@ struct _CM_KEY_CONTROL_BLOCK *KeyControlBlock; struct _CM_NOTIFY_BLOCK *NotifyBlock; HANDLE ProcessID; - ULONG Callers; - PVOID CallerAddress[10]; LIST_ENTRY KeyBodyList; } CM_KEY_BODY, *PCM_KEY_BODY; @@ -496,11 +494,8 @@ { ULONG Type; UNICODE_STRING Name; - LIST_ENTRY KeyBodyList; - ULONG SubKeyCounts; - ULONG SizeOfSubKeys; - struct _KEY_OBJECT **SubKeys; PCM_KEY_CONTROL_BLOCK KeyControlBlock; + LIST_ENTRY KeyBodyEntry; } KEY_OBJECT, *PKEY_OBJECT; NTSTATUS NTAPI @@ -513,7 +508,7 @@ IN PVOID ParseContext); NTSTATUS CmiCallRegisteredCallbacks(IN REG_NOTIFY_CLASS Argument1, IN PVOID Argument2); VOID -CmiAddKeyToList(IN PKEY_OBJECT ParentKey, +CmiAddKeyToList(IN PCM_KEY_CONTROL_BLOCK ParentKey, IN PKEY_OBJECT NewKey); /////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Thu Dec 6 01:30:33 2007 @@ -39,26 +39,9 @@ Hive = CONTAINING_RECORD(NextEntry, CMHIVE, HiveList); if (!(Hive->Hive.HiveFlags & HIVE_NOLAZYFLUSH)) { - /* Find out why this is needed? [Aleksey] */ - ULONG Disposition; - CmpOpenHiveFiles(&Hive->FileFullPath, - L".LOG", - &Hive->FileHandles[HFILE_TYPE_PRIMARY], - &Hive->FileHandles[HFILE_TYPE_LOG], - &Disposition, - &Disposition, - FALSE, - FALSE, - TRUE, - NULL); - /* Do the sync */ Status = HvSyncHive(&Hive->Hive); if (!NT_SUCCESS(Status)) Result = FALSE; - - /* ReactOS requires this */ - ZwClose(Hive->FileHandles[HFILE_TYPE_PRIMARY]); - ZwClose(Hive->FileHandles[HFILE_TYPE_LOG]); } /* Try the next entry */ @@ -1170,30 +1153,12 @@ } else { - ULONG Disposition; - - /* ReactOS Requires this */ - CmpOpenHiveFiles(&CmHive->FileFullPath, - L".LOG", - &CmHive->FileHandles[HFILE_TYPE_PRIMARY], - &CmHive->FileHandles[HFILE_TYPE_LOG], - &Disposition, - &Disposition, - FALSE, - FALSE, - TRUE, - NULL); - /* Flush only this hive */ if (!HvSyncHive(Hive)) { /* Fail */ Status = STATUS_REGISTRY_IO_FAILED; } - - /* ReactOS requires this */ - ZwClose(CmHive->FileHandles[HFILE_TYPE_PRIMARY]); - ZwClose(CmHive->FileHandles[HFILE_TYPE_LOG]); } /* Return the status */ Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Thu Dec 6 01:30:33 2007 @@ -230,10 +230,6 @@ /* Now fill out the Cm object */ KeyBody->KeyControlBlock = Kcb; - KeyBody->SubKeyCounts = 0; - KeyBody->SubKeys = NULL; - KeyBody->SizeOfSubKeys = 0; - InsertTailList(&CmiKeyObjectListHead, &KeyBody->KeyBodyList); Quickie: /* Check if we got here because of failure */ @@ -488,10 +484,6 @@ /* Get the key body and fill it out */ KeyBody = (PKEY_OBJECT)(*Object); KeyBody->KeyControlBlock = Kcb; - KeyBody->SubKeyCounts = 0; - KeyBody->SubKeys = NULL; - KeyBody->SizeOfSubKeys = 0; - InsertTailList(&CmiKeyObjectListHead, &KeyBody->KeyBodyList); } else { Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Thu Dec 6 01:30:33 2007 @@ -17,8 +17,6 @@ PCMHIVE CmiVolatileHive; LIST_ENTRY CmpHiveListHead; ERESOURCE CmpRegistryLock; -LIST_ENTRY CmiKeyObjectListHead; -LIST_ENTRY CmiConnectedHiveList; KGUARDED_MUTEX CmpSelfHealQueueLock; LIST_ENTRY CmpSelfHealQueueListHead; KEVENT CmpLoadWorkerEvent; @@ -184,10 +182,6 @@ NewHive->FileFullPath.MaximumLength = HiveName->MaximumLength; } - /* ROS: Close the hive files */ - ZwClose(FileHandle); - if (LogHandle) ZwClose(LogHandle); - /* Return success */ return STATUS_SUCCESS; } @@ -530,8 +524,8 @@ /* We have one */ ParseContext.ChildHive.KeyCell = RegistryHive->Hive.BaseBlock->RootCell; } - - DPRINT1("Ready to parse\n"); + + /* Create the link node */ Status = ObOpenObjectByName(&ObjectAttributes, CmpKeyObjectType, KernelMode, @@ -539,8 +533,6 @@ KEY_READ | KEY_WRITE, (PVOID)&ParseContext, &KeyHandle); - DPRINT1("Parse done: %lx\n", Status); - //while (TRUE); /* Capture all the info */ Status = ObpCaptureObjectAttributes(&ObjectAttributes, @@ -622,7 +614,7 @@ ObReferenceObject(NewKey); /* Link this key to the parent */ - CmiAddKeyToList(ParentKey, NewKey); + CmiAddKeyToList(ParentKey->KeyControlBlock, NewKey); return STATUS_SUCCESS; } @@ -670,7 +662,7 @@ ((PHBASE_BLOCK)HiveBase)->Length = LoaderBlock->RegistryLength; Status = CmpInitializeHive((PCMHIVE*)&SystemHive, HINIT_MEMORY, - 0, //HIVE_NOLAZYFLUSH, + HIVE_NOLAZYFLUSH, HFILE_TYPE_LOG, HiveBase, NULL, @@ -915,13 +907,7 @@ RootKey->ProcessID = PsGetCurrentProcessId(); #else RtlpCreateUnicodeString(&RootKey->Name, L"Registry", NonPagedPool); - RootKey->SubKeyCounts = 0; - RootKey->SubKeys = NULL; - RootKey->SizeOfSubKeys = 0; #endif - - /* Insert it into the object list head */ - InsertTailList(&CmiKeyObjectListHead, &RootKey->KeyBodyList); /* Insert the key into the namespace */ Status = ObInsertObject(RootKey, @@ -1023,8 +1009,8 @@ { WCHAR FileBuffer[MAX_PATH], RegBuffer[MAX_PATH], ConfigPath[MAX_PATH]; UNICODE_STRING TempName, FileName, RegName; - ULONG FileStart, RegStart, i, ErrorResponse, ClusterSize, WorkerCount; - ULONG PrimaryDisposition, SecondaryDisposition, Length; + ULONG FileStart, RegStart, i, ErrorResponse, WorkerCount, Length; + ULONG PrimaryDisposition, SecondaryDisposition, ClusterSize; PCMHIVE CmHive; HANDLE PrimaryHandle, LogHandle; NTSTATUS Status = STATUS_SUCCESS; @@ -1101,13 +1087,12 @@ } else { - if (ExpInTextModeSetup) { + CmHive = CmpMachineHiveList[i].CmHive; /* We already have a hive, is it volatile? */ - CmHive = CmpMachineHiveList[i].CmHive; if (!(CmHive->Hive.HiveFlags & HIVE_VOLATILE)) { DPRINT1("[HiveLoad]: Open from file %wZ\n", &FileName); - + /* It's now, open the hive file and log */ Status = CmpOpenHiveFiles(&FileName, L".LOG", @@ -1137,31 +1122,31 @@ /* Save the file handles. This should remove our sync hacks */ CmHive->FileHandles[HFILE_TYPE_LOG] = LogHandle; CmHive->FileHandles[HFILE_TYPE_PRIMARY] = PrimaryHandle; - + /* Allow lazy flushing since the handles are there -- remove sync hacks */ //ASSERT(CmHive->Hive.HiveFlags & HIVE_NOLAZYFLUSH); CmHive->Hive.HiveFlags &= ~HIVE_NOLAZYFLUSH; - + /* Get the real size of the hive */ Length = CmHive->Hive.Storage[Stable].Length + HBLOCK_SIZE; - + /* Check if the cluster size doesn't match */ if (CmHive->Hive.Cluster != ClusterSize) ASSERT(FALSE); /* Set the file size */ - if (!CmpFileSetSize((PHHIVE)CmHive, HFILE_TYPE_PRIMARY, Length, Length)) + //if (!CmpFileSetSize((PHHIVE)CmHive, HFILE_TYPE_PRIMARY, Length, Length)) { /* This shouldn't fail */ - ASSERT(FALSE); + //ASSERT(FALSE); } - + /* Another thing we don't support is NTLDR-recovery */ if (CmHive->Hive.BaseBlock->BootRecover) ASSERT(FALSE); /* Finally, set our allocated hive to the same hive we've had */ CmpMachineHiveList[i].CmHive2 = CmHive; ASSERT(CmpMachineHiveList[i].CmHive == CmpMachineHiveList[i].CmHive2); - }} + } } /* We're done */ @@ -1289,7 +1274,7 @@ Status = CmpLinkHiveToMaster(&RegName, NULL, CmpMachineHiveList[i].CmHive2, - FALSE, //CmpMachineHiveList[i].Allocate, + CmpMachineHiveList[i].Allocate, SecurityDescriptor); if (Status != STATUS_SUCCESS) { @@ -1368,12 +1353,6 @@ /* Save the current process and lock the registry */ CmpSystemProcess = PsGetCurrentProcess(); -#if 1 - /* OLD CM: Initialize the key object list */ - InitializeListHead(&CmiKeyObjectListHead); - InitializeListHead(&CmiConnectedHiveList); -#endif - /* Create the key object types */ Status = CmpCreateObjectTypes(); if (!NT_SUCCESS(Status)) @@ -1475,7 +1454,7 @@ ((PHBASE_BLOCK)BaseAddress)->Length = Length; Status = CmpInitializeHive((PCMHIVE*)&HardwareHive, HINIT_MEMORY, //HINIT_CREATE, - HIVE_VOLATILE, + HIVE_VOLATILE | HIVE_NOLAZYFLUSH, HFILE_TYPE_PRIMARY, BaseAddress, // NULL, NULL,

17 years

[peterw] 31029: - This really isn't funny... or is it?

by peterw＠svn.reactos.org

Author: peterw Date: Thu Dec 6 01:17:59 2007 New Revision: 31029 URL: http://svn.reactos.org/svn/reactos?rev=31029&view=rev Log: - This really isn't funny... or is it? Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd Thu Dec 6 01:17:59 2007 @@ -16,7 +16,7 @@ :: Parse the command line arguments. :: for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools\rquote.exe" %1"`) do set _1=%%i -if "%1" == "" ( +if "%_1%" == "" ( call :INTERACTIVE ) @@ -35,8 +35,7 @@ goto :EOC :INTERACTIVE -set /p _1="Please enter a MinGW/GCC directory: " -for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools\rquote.exe" %_1%"`) do set _1=%%i +set /p _1="Please enter a MinGW/GCC directory (don't use quotes): " if "%_1%" == "" ( echo ERROR: You must enter a MinGW/GCC directory. goto :EOC

17 years

← Newer
1
...
47
48
49
50
51
52
53
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007