Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[fireball] 41256: - Properly disable tag validation if using debugging pool (fixes a wrong part of r41255).
by fireball＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: fireball Date: Tue Jun 2 16:54:03 2009 New Revision: 41256 URL: http://svn.reactos.org/svn/reactos?rev=41256&view=rev Log: - Properly disable tag validation if using debugging pool (fixes a wrong part of r41255). Modified: trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=412… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Tue Jun 2 16:54:03 2009 @@ -267,7 +267,7 @@ (char*)Block < ((char*)MmPagedPoolBase + MmPagedPoolSize)) { /* Validate tag */ -#if 0 +#ifndef DEBUG_PPOOL if (Tag != 0 && Tag != EiGetPagedPoolTag(Block)) KeBugCheckEx(BAD_POOL_CALLER, 0x0a, @@ -297,13 +297,14 @@ (char*)Block < ((char*)MiNonPagedPoolStart + MiNonPagedPoolLength)) { /* Validate tag */ - /*if (Tag != 0 && Tag != EiGetNonPagedPoolTag(Block)) +#ifndef DEBUG_NPOOL + if (Tag != 0 && Tag != EiGetNonPagedPoolTag(Block)) KeBugCheckEx(BAD_POOL_CALLER, 0x0a, (ULONG_PTR)Block, EiGetNonPagedPoolTag(Block), - Tag);*/ - + Tag); +#endif /* Validate IRQL */ if (KeGetCurrentIrql() > DISPATCH_LEVEL) KeBugCheckEx(BAD_POOL_CALLER,

1 0

[fireball] 41255: - Add a note about increasing max pool sizes when using pool debugging.
by fireball＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: fireball Date: Tue Jun 2 16:48:00 2009 New Revision: 41255 URL: http://svn.reactos.org/svn/reactos?rev=41255&view=rev Log: - Add a note about increasing max pool sizes when using pool debugging. Modified: trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=412… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Tue Jun 2 16:48:00 2009 @@ -14,7 +14,8 @@ #define NDEBUG #include <debug.h> -/* Uncomment to enable pool overruns debugging */ +/* Uncomment to enable pool overruns debugging. Don't forget to increase + max pool sizes (MM_[NON]PAGED_POOL_SIZE) in include/internal/mm.h */ //#define DEBUG_NPOOL //#define DEBUG_PPOOL @@ -266,13 +267,14 @@ (char*)Block < ((char*)MmPagedPoolBase + MmPagedPoolSize)) { /* Validate tag */ +#if 0 if (Tag != 0 && Tag != EiGetPagedPoolTag(Block)) KeBugCheckEx(BAD_POOL_CALLER, 0x0a, (ULONG_PTR)Block, EiGetPagedPoolTag(Block), Tag); - +#endif /* Validate IRQL */ if (KeGetCurrentIrql() > APC_LEVEL) KeBugCheckEx(BAD_POOL_CALLER, @@ -295,12 +297,12 @@ (char*)Block < ((char*)MiNonPagedPoolStart + MiNonPagedPoolLength)) { /* Validate tag */ - if (Tag != 0 && Tag != EiGetNonPagedPoolTag(Block)) + /*if (Tag != 0 && Tag != EiGetNonPagedPoolTag(Block)) KeBugCheckEx(BAD_POOL_CALLER, 0x0a, (ULONG_PTR)Block, EiGetNonPagedPoolTag(Block), - Tag); + Tag);*/ /* Validate IRQL */ if (KeGetCurrentIrql() > DISPATCH_LEVEL)

1 0

[mjmartin] 41254: IopCreateObjectTypes: Add a DeleteProcedure for Device Objects. IopUnloadDevice: After calling the drivers Unload routine, make the DriverObject temporary and dereference it. IopUnloadDriver: Check that the driver is not already unloading before trying to call unload routine. If any failure, dereference the DriverObject before returning STATUS code. On an attempt to unload the driver, loop through each DeviceObject and set DOE_UNLOAD_PENDING in device extensions flags. Before c
by mjmartin＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: mjmartin Date: Tue Jun 2 16:10:17 2009 New Revision: 41254 URL: http://svn.reactos.org/svn/reactos?rev=41254&view=rev Log: IopCreateObjectTypes: Add a DeleteProcedure for Device Objects. IopUnloadDevice: After calling the drivers Unload routine, make the DriverObject temporary and dereference it. IopUnloadDriver: Check that the driver is not already unloading before trying to call unload routine. If any failure, dereference the DriverObject before returning STATUS code. On an attempt to unload the driver, loop through each DeviceObject and set DOE_UNLOAD_PENDING in device extensions flags. Before calling the driver's unload routine set DRVO_UNLOAD_INVOKED in DriverObject's flags. Fixes Bugchecks when attempting to load driver a second time and when unloading a driver that has upper level device attached. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Tue Jun 2 16:10:17 2009 @@ -938,6 +938,10 @@ // // File Routines // +VOID +NTAPI +IopDeleteDevice(IN PVOID ObjectBody); + NTSTATUS NTAPI IopParseDevice( Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Tue Jun 2 16:10:17 2009 @@ -22,6 +22,21 @@ KSPIN_LOCK ShutdownListLock; /* PRIVATE FUNCTIONS **********************************************************/ + +VOID +NTAPI +IopDeleteDevice(IN PVOID ObjectBody) +{ + PDEVICE_OBJECT DeviceObject = ObjectBody; + PAGED_CODE(); + + /* TODO: Delete Device Node */ + + /* Dereference the driver object, referenced in IoCreateDevice */ + if (DeviceObject->DriverObject); + ObDereferenceObject(DeviceObject->DriverObject); +} + PDEVICE_OBJECT NTAPI @@ -356,6 +371,13 @@ /* Unload it */ if (DriverObject->DriverUnload) DriverObject->DriverUnload(DriverObject); + + /* Make object temporary so it can be deleted */ + ObMakeTemporaryObject(DriverObject); + + /* Dereference once more, referenced at driver object creation */ + ObDereferenceObject(DriverObject); + } VOID Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Tue Jun 2 16:10:17 2009 @@ -977,9 +977,12 @@ UNICODE_STRING ServiceName; UNICODE_STRING ObjectName; PDRIVER_OBJECT DriverObject; + PDEVICE_OBJECT DeviceObject; + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; LOAD_UNLOAD_PARAMS LoadParams; NTSTATUS Status; LPWSTR Start; + BOOLEAN SafeToUnload = TRUE; DPRINT("IopUnloadDriver('%wZ', %d)\n", DriverServiceName, UnloadPnpDrivers); @@ -1031,6 +1034,14 @@ return Status; } + /* Check that driver is not already unloading */ + if (DriverObject->Flags & DRVO_UNLOAD_INVOKED) + { + DPRINT1("Driver deletion pending\n"); + ObDereferenceObject(DriverObject); + return STATUS_DELETE_PENDING; + } + /* * Get path of service... */ @@ -1049,6 +1060,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("RtlQueryRegistryValues() failed (Status %x)\n", Status); + ObDereferenceObject(DriverObject); return Status; } @@ -1061,6 +1073,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("IopNormalizeImagePath() failed (Status %x)\n", Status); + ObDereferenceObject(DriverObject); return Status; } @@ -1069,6 +1082,35 @@ */ ExFreePool(ImagePath.Buffer); + + /* Loop through each device object of the driver + and set DOE_UNLOAD_PENDING flag */ + DeviceObject = DriverObject->DeviceObject; + while (DeviceObject) + { + /* Set the unload pending flag for the device */ + DeviceExtension = IoGetDevObjExtension(DeviceObject); + DeviceExtension->ExtensionFlags |= DOE_UNLOAD_PENDING; + + /* Make sure there are no attached devices or no reference counts */ + if ((DeviceObject->ReferenceCount) || (DeviceObject->AttachedDevice)) + { + /* Not safe to unload */ + DPRINT1("Drivers device object is referenced or has attached devices\n"); + + SafeToUnload = FALSE; + } + + DeviceObject = DeviceObject->NextDevice; + } + + /* If not safe to unload, then return success */ + if (!SafeToUnload) + { + ObDereferenceObject(DriverObject); + return STATUS_SUCCESS; + } + /* * Unload the module and release the references to the device object @@ -1077,6 +1119,9 @@ /* Call the load/unload routine, depending on current process */ if (DriverObject->DriverUnload && DriverObject->DriverSection) { + /* Set the unload invoked flag */ + DriverObject->Flags |= DRVO_UNLOAD_INVOKED; + if (PsGetCurrentProcess() == PsInitialSystemProcess) { /* Just call right away */ Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Tue Jun 2 16:10:17 2009 @@ -265,9 +265,10 @@ NULL, &IoControllerObjectType))) return FALSE; - /* Do the Device Type. FIXME: Needs Delete Routine! */ + /* Do the Device Type */ RtlInitUnicodeString(&Name, L"Device"); ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DEVICE_OBJECT); + ObjectTypeInitializer.DeleteProcedure = IopDeleteDevice; ObjectTypeInitializer.ParseProcedure = IopParseDevice; ObjectTypeInitializer.SecurityProcedure = IopSecurityFile; if (!NT_SUCCESS(ObCreateObjectType(&Name,

1 0

[mkupfer] 41253: Gabriel Ilardi <gabrielilardi AT hotmail DOT it> - Fixes the TAB_STOP problem for taskmanager. - See issue #3954 for details.
by mkupfer＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: mkupfer Date: Tue Jun 2 15:28:47 2009 New Revision: 41253 URL: http://svn.reactos.org/svn/reactos?rev=41253&view=rev Log: Gabriel Ilardi <gabrielilardi AT hotmail DOT it> - Fixes the TAB_STOP problem for taskmanager. - See issue #3954 for details. Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc trunk/reactos/base/applications/taskmgr/lang/da-DK.rc trunk/reactos/base/applications/taskmgr/lang/de-DE.rc trunk/reactos/base/applications/taskmgr/lang/el-GR.rc trunk/reactos/base/applications/taskmgr/lang/en-US.rc trunk/reactos/base/applications/taskmgr/lang/es-ES.rc trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc trunk/reactos/base/applications/taskmgr/lang/id-ID.rc trunk/reactos/base/applications/taskmgr/lang/it-IT.rc trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc trunk/reactos/base/applications/taskmgr/lang/no-NO.rc trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…

1 0

[cgutman] 41213: - Export and hackplement NdisSetTimerEx - Implementation is #ifed out currently but I may enable it later - Hopefully somebody can think of a better way to do it than the current code
by cgutman＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: cgutman Date: Sun May 31 03:07:13 2009 New Revision: 41213 URL: http://svn.reactos.org/svn/reactos?rev=41213&view=rev Log: - Export and hackplement NdisSetTimerEx - Implementation is #ifed out currently but I may enable it later - Hopefully somebody can think of a better way to do it than the current code Modified: trunk/reactos/drivers/network/ndis/ndis.def trunk/reactos/drivers/network/ndis/ndis/time.c Modified: trunk/reactos/drivers/network/ndis/ndis.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis.… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] Sun May 31 03:07:13 2009 @@ -257,6 +257,7 @@ NdisSetPacketPoolProtocolId@8 ;NdisSetProtocolFilter ? NdisSetTimer@8 +NdisSetTimerEx@12 NdisSetupDmaTransfer@24 NdisSystemProcessorCount@0 NdisTerminateWrapper@8 Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Sun May 31 03:07:13 2009 @@ -243,5 +243,26 @@ KeSetTimer (&Timer->Timer, Timeout, &Timer->Dpc); } +VOID +EXPORT +NdisSetTimerEx( + IN PNDIS_TIMER Timer, + IN UINT MillisecondsToDelay, + IN PVOID FunctionContext) +{ +#if 0 + /* FIXME: I'm not sure how to this in a nice way + * We can't store the function context anywhere in NDIS_TIMER + * so I'm forced to do this + */ + + Timer->Dpc.DeferredContext = FunctionContext; + + NdisSetTimer(Timer, MillisecondsToDelay); +#else + UNIMPLEMENTED +#endif +} + /* EOF */

2 1

[mkupfer] 41252: set menu checkmark always on top always
by mkupfer＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: mkupfer Date: Tue Jun 2 15:04:02 2009 New Revision: 41252 URL: http://svn.reactos.org/svn/reactos?rev=41252&view=rev Log: set menu checkmark always on top always Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Tue Jun 2 15:04:02 2009 @@ -267,6 +267,9 @@ if(OnTop) { CheckMenuItem(hPopupMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND | MF_CHECKED); + } else + { + CheckMenuItem(hPopupMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND | MF_UNCHECKED); } SetForegroundWindow(hMainWnd);

1 0

[mkupfer] 41251: - fixes the problem of unsetting the HWND_TOPMOST property (e.g. taskmgr) - review recommended, but i think it's sufficient to limit topmost property to desktop windows only (otherwise we can remove this part of condition)
by mkupfer＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: mkupfer Date: Tue Jun 2 14:13:30 2009 New Revision: 41251 URL: http://svn.reactos.org/svn/reactos?rev=41251&view=rev Log: - fixes the problem of unsetting the HWND_TOPMOST property (e.g. taskmgr) - review recommended, but i think it's sufficient to limit topmost property to desktop windows only (otherwise we can remove this part of condition) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Tue Jun 2 14:13:30 2009 @@ -1012,11 +1012,7 @@ if (InsertAfterWindow != NULL) UserDereferenceObject(InsertAfterWindow); if ((HWND_TOPMOST == WinPos.hwndInsertAfter) - || (0 != (Window->Wnd->ExStyle & WS_EX_TOPMOST) - && NULL != Window->PrevSibling - && 0 != (Window->PrevSibling->Wnd->ExStyle & WS_EX_TOPMOST)) - || (NULL != Window->NextSibling - && 0 != (Window->NextSibling->Wnd->ExStyle & WS_EX_TOPMOST))) + && (IntIsDesktopWindow(Window->Parent))) { Window->Wnd->ExStyle |= WS_EX_TOPMOST; }

1 0

[jimtabor] 41250: - Hax-implement NtGdiSetPixelFormat and add a support function UserGethWnd with some code cleanup.
by jimtabor＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: jimtabor Date: Tue Jun 2 10:50:36 2009 New Revision: 41250 URL: http://svn.reactos.org/svn/reactos?rev=41250&view=rev Log: - Hax-implement NtGdiSetPixelFormat and add a support function UserGethWnd with some code cleanup. Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/wingl.c 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dce.h [iso-8859-1] Tue Jun 2 10:50:36 2009 @@ -56,5 +56,6 @@ void FASTCALL DceEmptyCache(void); VOID FASTCALL DceResetActiveDCEs(PWINDOW_OBJECT Window); void FASTCALL DceFreeClassDCE(HDC); +HWND FASTCALL UserGethWnd(HDC,PWNDOBJ*); #endif /* _WIN32K_DCE_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Tue Jun 2 10:50:36 2009 @@ -1922,18 +1922,18 @@ ProbeForRead(lpRc, sizeof(RECTL), sizeof(ULONG)); RtlCopyMemory(&SafeRect, lpRc, sizeof(RECTL)); if (str != NULL) - { - SafeStr = ProbeForReadUnicodeString(str); - if (SafeStr.Length != 0) - { - ProbeForRead(SafeStr.Buffer, - SafeStr.Length, - sizeof(WCHAR)); - } - Ret = UserDrawCaption(pWnd, hDC, &SafeRect, hFont, hIcon, &SafeStr, uFlags); - } - else - Ret = UserDrawCaption(pWnd, hDC, &SafeRect, hFont, hIcon, NULL, uFlags); + { + SafeStr = ProbeForReadUnicodeString(str); + if (SafeStr.Length != 0) + { + ProbeForRead( SafeStr.Buffer, + SafeStr.Length, + sizeof(WCHAR)); + } + Ret = UserDrawCaption(pWnd, hDC, &SafeRect, hFont, hIcon, &SafeStr, uFlags); + } + else + Ret = UserDrawCaption(pWnd, hDC, &SafeRect, hFont, hIcon, NULL, uFlags); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Tue Jun 2 10:50:36 2009 @@ -864,6 +864,36 @@ UserGetWindowDC(PWINDOW_OBJECT Wnd) { return UserGetDCEx(Wnd, 0, DCX_USESTYLE | DCX_WINDOW); +} + +HWND FASTCALL +UserGethWnd( HDC hdc, PWNDOBJ *pwndo) +{ + PWNDGDI pWndgdi; + PWINDOW_OBJECT Wnd = NULL; + HWND hWnd; + BOOL Hit = FALSE; + PLIST_ENTRY Entry; + hWnd = IntWindowFromDC(hdc); + + if (hWnd && !(Wnd = UserGetWindowObject(hWnd))) + { + KeEnterCriticalRegion(); + Entry = Wnd->WndObjListHead.Flink; + while (Entry != &Wnd->WndObjListHead) + { + pWndgdi = (PWNDGDI)Entry; + if (pWndgdi->Hwnd == hWnd) + { + Hit = TRUE; + break; + } + Entry = Entry->Flink; + } + if (pwndo && Hit) *pwndo = (PWNDOBJ)pWndgdi; + KeLeaveCriticalRegion(); + } + return hWnd; } HDC APIENTRY Modified: trunk/reactos/subsystems/win32/win32k/objects/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/wingl.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/wingl.c [iso-8859-1] Tue Jun 2 10:50:36 2009 @@ -38,7 +38,6 @@ if (ppdev->DriverFunctions.DescribePixelFormat) { - Ret = ppdev->DriverFunctions.DescribePixelFormat( ppdev->hPDev, 1, @@ -94,7 +93,6 @@ if (ppdev->DriverFunctions.DescribePixelFormat) { - Ret = ppdev->DriverFunctions.DescribePixelFormat( ppdev->hPDev, PixelFormat, @@ -129,8 +127,77 @@ IN HDC hdc, IN INT ipfd) { - UNIMPLEMENTED; - return FALSE; + PDC pdc; + PPDEVOBJ ppdev; + HWND hWnd; + PWNDOBJ pWndObj; + SURFOBJ *pso = NULL; + BOOL Ret = FALSE; + + pdc = DC_LockDc(hdc); + if (!pdc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!pdc->ipfdDevMax) IntGetipfdDevMax(pdc); + + if ( ipfd < 1 || + ipfd > pdc->ipfdDevMax ) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + goto Exit; + } + + UserEnterExclusive(); + hWnd = UserGethWnd(hdc, &pWndObj); + UserLeave(); + + if (!hWnd) + { + SetLastWin32Error(ERROR_INVALID_WINDOW_STYLE); + goto Exit; + } + + ppdev = pdc->ppdev; + + if (pWndObj) pso = pWndObj->psoOwner; + else + { + SetLastWin32Error(ERROR_INVALID_PIXEL_FORMAT); + goto Exit; + } + + if (!pso) + { + /* + Based on some rules! InfoDC to DC or, based on wiki information! + All pointers, it's a "must be!", (CONTAINING_RECORD +10h = SURFOBJ), the + pointer will start at SURFOBJ of the SURFACE structure. + */ + pso = (SURFOBJ *)pdc->dclevel.pSurface; + if (!pso) pso = pdc->pSurfInfo; + if (!pso) pso = ppdev->pSurface; + } + + if (ppdev->flFlags & PDEV_META_DEVICE) + { + UNIMPLEMENTED; + goto Exit; + } + + if (ppdev->DriverFunctions.SetPixelFormat) + { + Ret = ppdev->DriverFunctions.SetPixelFormat( + pso, + ipfd, + hWnd); + } + +Exit: + DC_UnlockDc(pdc); + return Ret; } BOOL

1 0

[cgutman] 41249: - Fix a potential crash in IoGetLowerDeviceObject if nothing is attached to us
by cgutman＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: cgutman Date: Tue Jun 2 05:34:12 2009 New Revision: 41249 URL: http://svn.reactos.org/svn/reactos?rev=41249&view=rev Log: - Fix a potential crash in IoGetLowerDeviceObject if nothing is attached to us Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Tue Jun 2 05:34:12 2009 @@ -1186,8 +1186,12 @@ /* Get the Lower Device Object */ LowerDeviceObject = DeviceExtension->AttachedTo; - /* Reference it */ - ObReferenceObject(LowerDeviceObject); + /* Check that we got a valid device object */ + if (LowerDeviceObject) + { + /* We did so let's reference it */ + ObReferenceObject(LowerDeviceObject); + } } /* Return it */

1 0

[cgutman] 41248: - Use MmFreeContiguousMemorySpecifyCache to free memory allocated by MmAllocateContiguousMemorySpecifyCache in HalAllocateCommonBuffer
by cgutman＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: cgutman Date: Tue Jun 2 05:30:52 2009 New Revision: 41248 URL: http://svn.reactos.org/svn/reactos?rev=41248&view=rev Log: - Use MmFreeContiguousMemorySpecifyCache to free memory allocated by MmAllocateContiguousMemorySpecifyCache in HalAllocateCommonBuffer Modified: trunk/reactos/hal/halx86/generic/dma.c Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Tue Jun 2 05:30:52 2009 @@ -903,7 +903,9 @@ PVOID VirtualAddress, BOOLEAN CacheEnabled) { - MmFreeContiguousMemory(VirtualAddress); + MmFreeContiguousMemorySpecifyCache(VirtualAddress, + Length, + CacheEnabled ? MmCached : MmNonCached); } /**

1 0

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 June 2009