Ros-diffs August 2011

ros-diffs@reactos.org

18 participants
498 discussions

[fireball] 53311: [NTDLL/LDR] - Initialize image-specific options. - Close options key if it was opened in LdrpInitializeProcess().
by fireball＠svn.reactos.org 18 Aug '11

18 Aug '11

Author: fireball Date: Thu Aug 18 22:06:27 2011 New Revision: 53311 URL: http://svn.reactos.org/svn/reactos?rev=53311&view=rev Log: [NTDLL/LDR] - Initialize image-specific options. - Close options key if it was opened in LdrpInitializeProcess(). Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Thu Aug 18 22:06:27 2011 @@ -83,6 +83,9 @@ VOID RtlInitializeHeapManager(VOID); extern BOOLEAN RtlpPageHeapEnabled; extern ULONG RtlpDphGlobalFlags; + +ULONG RtlpDisableHeapLookaside; // TODO: Move to heap.c +ULONG RtlpShutdownProcessFlags; // TODO: Use it NTSTATUS LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders, PVOID ImageBase); @@ -1308,8 +1311,104 @@ NTAPI LdrpInitializeExecutionOptions(PUNICODE_STRING ImagePathName, PPEB Peb, PHKEY OptionsKey) { - UNIMPLEMENTED; + NTSTATUS Status; + HKEY KeyHandle; + ULONG ExecuteOptions, MinimumStackCommit = 0, GlobalFlag; + + /* Return error if we were not provided a pointer where to save the options key handle */ + if (!OptionsKey) return STATUS_INVALID_HANDLE; + + /* Zero initialize the optinos key pointer */ *OptionsKey = NULL; + + /* Open the options key */ + Status = LdrOpenImageFileOptionsKey(ImagePathName, 0, &KeyHandle); + + /* Save it if it was opened successfully */ + if (NT_SUCCESS(Status)) + *OptionsKey = KeyHandle; + + if (KeyHandle) + { + /* There are image specific options, read them starting with NXCOMPAT */ + Status = LdrQueryImageFileKeyOption(KeyHandle, + L"ExecuteOptions", + 4, + &ExecuteOptions, + sizeof(ExecuteOptions), + 0); + + if (NT_SUCCESS(Status)) + { + /* TODO: Set execution options for the process */ + /* + if (ExecuteOptions == 0) + ExecuteOptions = 1; + else + ExecuteOptions = 2; + ZwSetInformationProcess(NtCurrentProcess(), + ProcessExecuteFlags, + &ExecuteOptions, + sizeof(ULONG));*/ + + } + + /* Check if this image uses large pages */ + if (Peb->ImageUsesLargePages) + { + /* TODO: If it does, open large page key */ + UNIMPLEMENTED; + } + + /* Get various option values */ + LdrQueryImageFileKeyOption(KeyHandle, + L"DisableHeapLookaside", + REG_DWORD, + &RtlpDisableHeapLookaside, + sizeof(RtlpDisableHeapLookaside), + NULL); + + LdrQueryImageFileKeyOption(KeyHandle, + L"ShutdownFlags", + REG_DWORD, + &RtlpShutdownProcessFlags, + sizeof(RtlpShutdownProcessFlags), + NULL); + + LdrQueryImageFileKeyOption(KeyHandle, + L"MinimumStackCommitInBytes", + REG_DWORD, + &MinimumStackCommit, + sizeof(MinimumStackCommit), + NULL); + + /* Update PEB's minimum stack commit if it's lower */ + if (Peb->MinimumStackCommit < MinimumStackCommit) + Peb->MinimumStackCommit = MinimumStackCommit; + + /* Set the global flag */ + Status = LdrQueryImageFileKeyOption(KeyHandle, + L"GlobalFlag", + REG_DWORD, + &GlobalFlag, + sizeof(GlobalFlag), + NULL); + + if (NT_SUCCESS(Status)) + Peb->NtGlobalFlag = GlobalFlag; + else + GlobalFlag = 0; + } + else + { + /* There are no image-specific options, so perform global initialization */ + if (Peb->NtGlobalFlag & (FLG_POOL_ENABLE_TAIL_CHECK | FLG_HEAP_PAGE_ALLOCS)) + { + // TODO: Initialize app verifier package + // Status = LdrpInitializeApplicationVerifierPackage(ImagePathName, Peb, 1, FALSE); + } + } + return STATUS_SUCCESS; } @@ -1979,13 +2078,12 @@ /* Check if we have a user-defined Post Process Routine */ if (NT_SUCCESS(Status) && Peb->PostProcessInitRoutine) { - DPRINT1("CP\n"); /* Call it */ Peb->PostProcessInitRoutine(); } ///* Close the key if we have one opened */ - //if (hKey) NtClose(hKey); + if (OptionsKey) NtClose(OptionsKey); /* Return status */ return Status;

1 0

[gadamopoulos] 53310: [desk] -remove theme.h and merge it in appearance.h
by gadamopoulos＠svn.reactos.org 18 Aug '11

18 Aug '11

Author: gadamopoulos Date: Thu Aug 18 21:18:33 2011 New Revision: 53310 URL: http://svn.reactos.org/svn/reactos?rev=53310&view=rev Log: [desk] -remove theme.h and merge it in appearance.h Removed: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/theme.h Modified: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/appearance.h branches/GSoC_2011/ThemesSupport/dll/cpl/desk/desk.h Modified: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/appearance.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/cpl… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/cpl/desk/appearance.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/cpl/desk/appearance.h [iso-8859-1] Thu Aug 18 21:18:33 2011 @@ -1,3 +1,81 @@ +/* Some definitions for theme */ +#define SIZE_BORDER_X 0 +#define SIZE_BORDER_Y 1 +#define SIZE_CAPTION_Y 2 +#define SIZE_ICON_X 3 +#define SIZE_ICON_Y 4 +#define SIZE_ICON_SPC_X 5 +#define SIZE_ICON_SPC_Y 6 +#define SIZE_MENU_SIZE_X 7 +#define SIZE_MENU_Y 8 +#define SIZE_SCROLL_X 9 +#define SIZE_SCROLL_Y 10 +#define SIZE_SMCAPTION_Y 11 +#define SIZE_EDGE_X 12 +#define SIZE_EDGE_Y 13 +#define SIZE_FRAME_Y 14 +#define SIZE_MENU_CHECK_X 15 +#define SIZE_MENU_CHECK_Y 16 +#define SIZE_MENU_SIZE_Y 17 +#define SIZE_SIZE_X 18 +#define SIZE_SIZE_Y 19 + +#define FONT_CAPTION 0 +#define FONT_SMCAPTION 1 +#define FONT_HILIGHT 2 +#define FONT_MENU 2 +#define FONT_ICON 3 +#define FONT_INFO 4 +#define FONT_DIALOG 5 + +#define NUM_ELEMENTS 22 +#define NUM_FONTS 6 +#define NUM_SIZES 20 +#define NUM_COLORS 31 +#define MAX_TEMPLATES 50 +#define MAX_TEMPLATENAMELENTGH 80 + +/* Some typedefs for theme */ + +/* Most (but not all) fields below correspond to HKCU\Control Panel\Desktop\UserPreferencesMask */ +typedef struct +{ + BOOL bActiveWindowTracking; + BOOL bMenuAnimation; + BOOL bComboBoxAnimation; + BOOL bListBoxSmoothScrolling; + BOOL bGradientCaptions; + BOOL bKeyboardCues; + BOOL bActiveWndTrkZorder; + BOOL bHotTracking; + BOOL bMenuFade; + BOOL bSelectionFade; + BOOL bTooltipAnimation; + BOOL bTooltipFade; + BOOL bCursorShadow; + BOOL bUiEffects; + BOOL bFontSmoothing; + BOOL bDragFullWindows; + UINT uiFontSmoothingType; +} EFFECTS; + +typedef struct +{ + COLORREF crColor[NUM_COLORS]; + LOGFONT lfFont[NUM_FONTS]; + INT Size[NUM_SIZES]; + BOOL bFlatMenus; + EFFECTS Effects; +} COLOR_SCHEME; + +typedef struct +{ + TCHAR strKeyName[4]; + TCHAR strSizeName[4]; + TCHAR strDisplayName[MAX_TEMPLATENAMELENTGH]; + TCHAR strLegacyName[MAX_TEMPLATENAMELENTGH]; +} SCHEME_PRESET; + /* Some typedefs for appearance */ /* This is the global structure used to store the current values. @@ -16,6 +94,15 @@ BOOL bInitializing; } GLOBALS; +extern SCHEME_PRESET g_ColorSchemes[MAX_TEMPLATES]; + +/* prototypes for theme.c */ +VOID LoadCurrentScheme(COLOR_SCHEME* scheme); +BOOL LoadSchemeFromReg(COLOR_SCHEME* scheme, INT SchemeId); +VOID ApplyScheme(COLOR_SCHEME* scheme, INT SchemeId); +BOOL SaveScheme(COLOR_SCHEME* scheme, LPCTSTR strLegacyName); +INT LoadSchemePresetEntries(LPTSTR pszSelectedStyle); + /* prototypes for appearance.c */ INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); Modified: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/desk.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/cpl… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/cpl/desk/desk.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/cpl/desk/desk.h [iso-8859-1] Thu Aug 18 21:18:33 2011 @@ -12,7 +12,6 @@ #include <dll/desk/deskcplx.h> #include <cfgmgr32.h> -#include "theme.h" #include "appearance.h" #include "preview.h" #include "draw.h" Removed: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/theme.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/cpl… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/cpl/desk/theme.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/cpl/desk/theme.h (removed) @@ -1,86 +1,0 @@ -/* Some definitions for theme */ -#define SIZE_BORDER_X 0 -#define SIZE_BORDER_Y 1 -#define SIZE_CAPTION_Y 2 -#define SIZE_ICON_X 3 -#define SIZE_ICON_Y 4 -#define SIZE_ICON_SPC_X 5 -#define SIZE_ICON_SPC_Y 6 -#define SIZE_MENU_SIZE_X 7 -#define SIZE_MENU_Y 8 -#define SIZE_SCROLL_X 9 -#define SIZE_SCROLL_Y 10 -#define SIZE_SMCAPTION_Y 11 -#define SIZE_EDGE_X 12 -#define SIZE_EDGE_Y 13 -#define SIZE_FRAME_Y 14 -#define SIZE_MENU_CHECK_X 15 -#define SIZE_MENU_CHECK_Y 16 -#define SIZE_MENU_SIZE_Y 17 -#define SIZE_SIZE_X 18 -#define SIZE_SIZE_Y 19 - -#define FONT_CAPTION 0 -#define FONT_SMCAPTION 1 -#define FONT_HILIGHT 2 -#define FONT_MENU 2 -#define FONT_ICON 3 -#define FONT_INFO 4 -#define FONT_DIALOG 5 - -#define NUM_ELEMENTS 22 -#define NUM_FONTS 6 -#define NUM_SIZES 20 -#define NUM_COLORS 31 -#define MAX_TEMPLATES 50 -#define MAX_TEMPLATENAMELENTGH 80 - -/* Some typedefs for theme */ - -/* Most (but not all) fields below correspond to HKCU\Control Panel\Desktop\UserPreferencesMask */ -typedef struct -{ - BOOL bActiveWindowTracking; - BOOL bMenuAnimation; - BOOL bComboBoxAnimation; - BOOL bListBoxSmoothScrolling; - BOOL bGradientCaptions; - BOOL bKeyboardCues; - BOOL bActiveWndTrkZorder; - BOOL bHotTracking; - BOOL bMenuFade; - BOOL bSelectionFade; - BOOL bTooltipAnimation; - BOOL bTooltipFade; - BOOL bCursorShadow; - BOOL bUiEffects; - BOOL bFontSmoothing; - BOOL bDragFullWindows; - UINT uiFontSmoothingType; -} EFFECTS; - -typedef struct -{ - COLORREF crColor[NUM_COLORS]; - LOGFONT lfFont[NUM_FONTS]; - INT Size[NUM_SIZES]; - BOOL bFlatMenus; - EFFECTS Effects; -} COLOR_SCHEME; - -typedef struct -{ - TCHAR strKeyName[4]; - TCHAR strSizeName[4]; - TCHAR strDisplayName[MAX_TEMPLATENAMELENTGH]; - TCHAR strLegacyName[MAX_TEMPLATENAMELENTGH]; -} SCHEME_PRESET; - -extern SCHEME_PRESET g_ColorSchemes[MAX_TEMPLATES]; - -/* prototypes for theme.c */ -VOID LoadCurrentScheme(COLOR_SCHEME* scheme); -BOOL LoadSchemeFromReg(COLOR_SCHEME* scheme, INT SchemeId); -VOID ApplyScheme(COLOR_SCHEME* scheme, INT SchemeId); -BOOL SaveScheme(COLOR_SCHEME* scheme, LPCTSTR strLegacyName); -INT LoadSchemePresetEntries(LPTSTR pszSelectedStyle);

1 0

[gadamopoulos] 53309: [desk] - Use GdiGradientFill and GdiTransparentBlt instead of GradientFill and TransparentBlt - Do not link to msimg32
by gadamopoulos＠svn.reactos.org 18 Aug '11

18 Aug '11

Author: gadamopoulos Date: Thu Aug 18 21:07:16 2011 New Revision: 53309 URL: http://svn.reactos.org/svn/reactos?rev=53309&view=rev Log: [desk] - Use GdiGradientFill and GdiTransparentBlt instead of GradientFill and TransparentBlt - Do not link to msimg32 Modified: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/CMakeLists.txt branches/GSoC_2011/ThemesSupport/dll/cpl/desk/background.c branches/GSoC_2011/ThemesSupport/dll/cpl/desk/desk.rbuild branches/GSoC_2011/ThemesSupport/dll/cpl/desk/draw.c Modified: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/cpl… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/cpl/desk/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/cpl/desk/CMakeLists.txt [iso-8859-1] Thu Aug 18 21:07:16 2011 @@ -41,7 +41,6 @@ ole32 setupapi shell32 - msimg32 kernel32 ntdll) Modified: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/cpl… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/cpl/desk/background.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/cpl/desk/background.c [iso-8859-1] Thu Aug 18 21:07:16 2011 @@ -649,14 +649,14 @@ } } - TransparentBlt(draw->hDC, - draw->rcItem.left, draw->rcItem.top, - draw->rcItem.right-draw->rcItem.left+1, - draw->rcItem.bottom-draw->rcItem.top+1, - hDC, - 0, 0, - pData->cxSource, pData->cySource, - 0xFF00FF); + GdiTransparentBlt(draw->hDC, + draw->rcItem.left, draw->rcItem.top, + draw->rcItem.right-draw->rcItem.left+1, + draw->rcItem.bottom-draw->rcItem.top+1, + hDC, + 0, 0, + pData->cxSource, pData->cySource, + 0xFF00FF); SelectObject(hDC, hOldObj); DeleteDC(hDC); Modified: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/cpl… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/cpl/desk/desk.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/cpl/desk/desk.rbuild [iso-8859-1] Thu Aug 18 21:07:16 2011 @@ -13,7 +13,6 @@ <library>setupapi</library> <library>shell32</library> <library>ntdll</library> - <library>msimg32</library> <library>uuid</library> <file>advmon.c</file> <file>appearance.c</file> Modified: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/draw.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/cpl… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/cpl/desk/draw.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/cpl/desk/draw.c [iso-8859-1] Thu Aug 18 21:07:16 2011 @@ -475,7 +475,7 @@ vert[1].Blue = (WORD)(Colors[1]>>8) & 0xFF00; vert[1].Alpha = 0; - GradientFill(hdc, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_H); + GdiGradientFill(hdc, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_H); } else {

1 0

[gadamopoulos] 53308: -add definition for GdiTransparentBlt
by gadamopoulos＠svn.reactos.org 18 Aug '11

18 Aug '11

Author: gadamopoulos Date: Thu Aug 18 20:51:26 2011 New Revision: 53308 URL: http://svn.reactos.org/svn/reactos?rev=53308&view=rev Log: -add definition for GdiTransparentBlt Modified: branches/GSoC_2011/ThemesSupport/include/psdk/wingdi.h Modified: branches/GSoC_2011/ThemesSupport/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/include… ============================================================================== --- branches/GSoC_2011/ThemesSupport/include/psdk/wingdi.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/include/psdk/wingdi.h [iso-8859-1] Thu Aug 18 20:51:26 2011 @@ -2995,6 +2995,7 @@ DWORD WINAPI GdiGetBatchLimit(void); DWORD WINAPI GdiSetBatchLimit(DWORD); BOOL WINAPI GdiGradientFill(HDC,PTRIVERTEX,ULONG,PVOID,ULONG,ULONG); +BOOL WINAPI GdiTransparentBlt(HDC,int,int,int,int,HDC,int,int,int,int,UINT); BOOL WINAPI GdiIsMetaFileDC(HDC); #define GetCValue(cmyk) ((BYTE)(cmyk)) #define GetMValue(cmyk) ((BYTE)((cmyk)>> 8))

1 0

[gadamopoulos] 53307: [desk] - Use DPRINT1 instead of DbgPrint
by gadamopoulos＠svn.reactos.org 18 Aug '11

18 Aug '11

Author: gadamopoulos Date: Thu Aug 18 20:41:16 2011 New Revision: 53307 URL: http://svn.reactos.org/svn/reactos?rev=53307&view=rev Log: [desk] - Use DPRINT1 instead of DbgPrint Modified: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/devsett.c Modified: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/devsett.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/cpl… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/cpl/desk/devsett.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/cpl/desk/devsett.c [iso-8859-1] Thu Aug 18 20:41:16 2011 @@ -181,19 +181,19 @@ CM_LOCATE_DEVNODE_NORMAL); if (cr == CR_SUCCESS) { - DbgPrint("Success1\n"); + DPRINT1("Success1\n"); cr = CM_Get_Device_ID_Size(&BufLen, DevInst, 0); if (cr == CR_SUCCESS) { - DbgPrint("Success2\n"); + DPRINT1("Success2\n"); lpDevInstId = LocalAlloc(LMEM_FIXED, (BufLen + 1) * sizeof(WCHAR)); if (lpDevInstId != NULL) { - DbgPrint("Success3\n"); + DPRINT1("Success3\n"); cr = CM_Get_Device_IDW(DevInst, lpDevInstId, BufLen, @@ -204,7 +204,7 @@ LocalFree((HLOCAL)lpDevInstId); lpDevInstId = NULL; } - DbgPrint("instance id: %ws\n", lpDevInstId); + DPRINT1("instance id: %ws\n", lpDevInstId); } } }

1 0

[cgutman] 53306: - Revert r53305 because Windows unprotects pages this way
by cgutman＠svn.reactos.org 18 Aug '11

18 Aug '11

Author: cgutman Date: Thu Aug 18 19:50:19 2011 New Revision: 53306 URL: http://svn.reactos.org/svn/reactos?rev=53306&view=rev Log: - Revert r53305 because Windows unprotects pages this way Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Thu Aug 18 19:50:19 2011 @@ -626,7 +626,7 @@ if (MmProtectFreedNonPagedPool) { /* We need to be able to touch this page, unprotect it */ - MiUnProtectFreeNonPagedPool(NextEntry, 1); + MiUnProtectFreeNonPagedPool(NextEntry, 0); } // @@ -946,7 +946,7 @@ if (MmProtectFreedNonPagedPool) { /* The freed block will be merged, it must be made accessible */ - MiUnProtectFreeNonPagedPool(MiPteToAddress(PointerPte), 1); + MiUnProtectFreeNonPagedPool(MiPteToAddress(PointerPte), 0); } // @@ -1020,7 +1020,7 @@ if (MmProtectFreedNonPagedPool) { /* The freed block will be merged, it must be made accessible */ - MiUnProtectFreeNonPagedPool(MiPteToAddress(PointerPte), 1); + MiUnProtectFreeNonPagedPool(MiPteToAddress(PointerPte), 0); } /* Check if this is valid pool, or a guard page */ @@ -1058,7 +1058,7 @@ if (MmProtectFreedNonPagedPool) { /* The freed block will be merged, it must be made accessible */ - MiUnProtectFreeNonPagedPool(FreeEntry, 1); + MiUnProtectFreeNonPagedPool(FreeEntry, 0); } //

1 0

[cgutman] 53305: [NTOSKRNL] - Specify a valid number of pages to unprotect
by cgutman＠svn.reactos.org 18 Aug '11

18 Aug '11

Author: cgutman Date: Thu Aug 18 19:36:40 2011 New Revision: 53305 URL: http://svn.reactos.org/svn/reactos?rev=53305&view=rev Log: [NTOSKRNL] - Specify a valid number of pages to unprotect Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Thu Aug 18 19:36:40 2011 @@ -626,7 +626,7 @@ if (MmProtectFreedNonPagedPool) { /* We need to be able to touch this page, unprotect it */ - MiUnProtectFreeNonPagedPool(NextEntry, 0); + MiUnProtectFreeNonPagedPool(NextEntry, 1); } // @@ -946,7 +946,7 @@ if (MmProtectFreedNonPagedPool) { /* The freed block will be merged, it must be made accessible */ - MiUnProtectFreeNonPagedPool(MiPteToAddress(PointerPte), 0); + MiUnProtectFreeNonPagedPool(MiPteToAddress(PointerPte), 1); } // @@ -1020,7 +1020,7 @@ if (MmProtectFreedNonPagedPool) { /* The freed block will be merged, it must be made accessible */ - MiUnProtectFreeNonPagedPool(MiPteToAddress(PointerPte), 0); + MiUnProtectFreeNonPagedPool(MiPteToAddress(PointerPte), 1); } /* Check if this is valid pool, or a guard page */ @@ -1058,7 +1058,7 @@ if (MmProtectFreedNonPagedPool) { /* The freed block will be merged, it must be made accessible */ - MiUnProtectFreeNonPagedPool(FreeEntry, 0); + MiUnProtectFreeNonPagedPool(FreeEntry, 1); } //

1 0

[cgutman] 53304: [NTOSKRNL] - Implement a special case copy-in for IRP_MN_FILTER_RESOURCE_REQUIREMENTS to prevent NULL pointer access in function drivers
by cgutman＠svn.reactos.org 18 Aug '11

18 Aug '11

Author: cgutman Date: Thu Aug 18 18:35:03 2011 New Revision: 53304 URL: http://svn.reactos.org/svn/reactos?rev=53304&view=rev Log: [NTOSKRNL] - Implement a special case copy-in for IRP_MN_FILTER_RESOURCE_REQUIREMENTS to prevent NULL pointer access in function drivers Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Thu Aug 18 18:35:03 2011 @@ -884,6 +884,14 @@ /* Initialize to failure */ Irp->IoStatus.Status = IoStatusBlock.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = IoStatusBlock.Information = 0; + + /* Special case for IRP_MN_FILTER_RESOURCE_REQUIREMENTS */ + if (IoStackLocation->MinorFunction == IRP_MN_FILTER_RESOURCE_REQUIREMENTS) + { + /* Copy the resource requirements list into the IOSB */ + Irp->IoStatus.Information = + IoStatusBlock.Information = (ULONG_PTR)IoStackLocation->Parameters.FilterResourceRequirements.IoResourceRequirementList; + } /* Initialize the event */ KeInitializeEvent(&Event, SynchronizationEvent, FALSE);

1 0

[cgutman] 53303: - Swap the failure cases - Missed change from r53301
by cgutman＠svn.reactos.org 18 Aug '11

18 Aug '11

Author: cgutman Date: Thu Aug 18 18:13:52 2011 New Revision: 53303 URL: http://svn.reactos.org/svn/reactos?rev=53303&view=rev Log: - Swap the failure cases - Missed change from r53301 Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Thu Aug 18 18:13:52 2011 @@ -1155,25 +1155,6 @@ if (!NT_SUCCESS(Status)) { DPRINT1("ZwSetValueKey() failed with status 0x%08lx\n", Status); - ExFreePool(SymbolicLinkName->Buffer); - } - else - { - SymbolicLinkName->Buffer[1] = '?'; - } - - /* Create symbolic link */ - DPRINT("IoRegisterDeviceInterface(): creating symbolic link %wZ -> %wZ\n", SymbolicLinkName, &PdoNameInfo->Name); - Status = IoCreateSymbolicLink(SymbolicLinkName, &PdoNameInfo->Name); - - /* If the symbolic link already exists, return an informational success status */ - if (Status == STATUS_OBJECT_NAME_COLLISION) - Status = STATUS_OBJECT_NAME_EXISTS; - - /* Check if it really failed */ - if (!NT_SUCCESS(Status)) - { - DPRINT1("IoCreateSymbolicLink() failed with status 0x%08lx\n", Status); ZwClose(SubKey); ZwClose(InterfaceKey); ZwClose(ClassKey); @@ -1182,6 +1163,25 @@ ExFreePool(BaseKeyName.Buffer); ExFreePool(SymbolicLinkName->Buffer); return Status; + } + else + { + SymbolicLinkName->Buffer[1] = '?'; + } + + /* Create symbolic link */ + DPRINT("IoRegisterDeviceInterface(): creating symbolic link %wZ -> %wZ\n", SymbolicLinkName, &PdoNameInfo->Name); + Status = IoCreateSymbolicLink(SymbolicLinkName, &PdoNameInfo->Name); + + /* If the symbolic link already exists, return an informational success status */ + if (Status == STATUS_OBJECT_NAME_COLLISION) + Status = STATUS_OBJECT_NAME_EXISTS; + + /* Check if it really failed */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoCreateSymbolicLink() failed with status 0x%08lx\n", Status); + ExFreePool(SymbolicLinkName->Buffer); } ZwClose(SubKey);

1 0

[cgutman] 53302: [NTOSKRNL] - Fix a typo in a remove lock timeout check - Fixes breaking into kdbg randomly when a caller specifies no timeout on their remove lock
by cgutman＠svn.reactos.org 18 Aug '11

18 Aug '11

Author: cgutman Date: Thu Aug 18 18:06:07 2011 New Revision: 53302 URL: http://svn.reactos.org/svn/reactos?rev=53302&view=rev Log: [NTOSKRNL] - Fix a typo in a remove lock timeout check - Fixes breaking into kdbg randomly when a caller specifies no timeout on their remove lock Modified: trunk/reactos/ntoskrnl/io/iomgr/remlock.c Modified: trunk/reactos/ntoskrnl/io/iomgr/remlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/remlock.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] Thu Aug 18 18:06:07 2011 @@ -170,8 +170,8 @@ while (TrackingBlock != NULL) { /* First of all, check if the lock was locked for too long */ - if (TrackingBlock->LockMoment.QuadPart && - CurrentMoment.QuadPart - TrackingBlock->LockMoment.QuadPart > Lock->Dbg.MaxLockedTicks) + if (Lock->Dbg.MaxLockedTicks && + CurrentMoment.QuadPart - TrackingBlock->LockMoment.QuadPart > Lock->Dbg.MaxLockedTicks) { DPRINT("Lock %#08lx (with tag %#08lx) was supposed to be held at max %I64d ticks but lasted longer\n", Lock, TrackingBlock->Tag, Lock->Dbg.MaxLockedTicks);

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2011