Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 41794: - Hit another one. Check window is still alive.
by jimtabor＠svn.reactos.org 07 Jul '09

07 Jul '09

Author: jimtabor Date: Tue Jul 7 07:23:27 2009 New Revision: 41794 URL: http://svn.reactos.org/svn/reactos?rev=41794&view=rev Log: - Hit another one. Check window is still alive. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Jul 7 07:23:27 2009 @@ -190,6 +190,8 @@ PWINDOW_OBJECT FASTCALL IntGetParent(PWINDOW_OBJECT Wnd) { + if (!Wnd->Wnd) return NULL; + if (Wnd->Wnd->Style & WS_POPUP) { return UserGetWindowObject(Wnd->hOwner);

1 0

[jimtabor] 41793: - Check window is still alive.
by jimtabor＠svn.reactos.org 07 Jul '09

07 Jul '09

Author: jimtabor Date: Tue Jul 7 04:06:54 2009 New Revision: 41793 URL: http://svn.reactos.org/svn/reactos?rev=41793&view=rev Log: - Check window is still alive. 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 Jul 7 04:06:54 2009 @@ -895,6 +895,8 @@ ASSERT_REFS_CO(Window); + if (!Window->Wnd) return FALSE; + /* FIXME: Get current active window from active queue. */ /*

1 0

[sginsberg] 41792: - Remove a deprecated check from MmpAccessFault -- PsGetCurrentProcess doesn't return NULL since revision 24148.
by sginsberg＠svn.reactos.org 06 Jul '09

06 Jul '09

Author: sginsberg Date: Tue Jul 7 03:35:59 2009 New Revision: 41792 URL: http://svn.reactos.org/svn/reactos?rev=41792&view=rev Log: - Remove a deprecated check from MmpAccessFault -- PsGetCurrentProcess doesn't return NULL since revision 24148. Modified: trunk/reactos/ntoskrnl/mm/mmfault.c Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] Tue Jul 7 03:35:59 2009 @@ -61,11 +61,6 @@ if (KeGetCurrentIrql() >= DISPATCH_LEVEL) { DPRINT1("Page fault at high IRQL was %d\n", KeGetCurrentIrql()); - return(STATUS_UNSUCCESSFUL); - } - if (PsGetCurrentProcess() == NULL) - { - DPRINT("No current process\n"); return(STATUS_UNSUCCESSFUL); }

1 0

[jimtabor] 41791: - Update apptest.
by jimtabor＠svn.reactos.org 06 Jul '09

06 Jul '09

Author: jimtabor Date: Tue Jul 7 00:57:23 2009 New Revision: 41791 URL: http://svn.reactos.org/svn/reactos?rev=41791&view=rev Log: - Update apptest. Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def [iso-8859-1] Tue Jul 7 00:57:23 2009 @@ -587,7 +587,7 @@ NtUserUnregisterHotKey@8 NtUserUpdateInputContext@12 NtUserUpdateInstance@12 -NtUserUpdateLayeredWindow@36 +NtUserUpdateLayeredWindow@40 NtUserGetLayeredWindowAttributes@16 NtUserSetLayeredWindowAttributes@16 NtUserUpdatePerUserSystemParameters@8

1 0

[jimtabor] 41790: - fix build.
by jimtabor＠svn.reactos.org 06 Jul '09

06 Jul '09

Author: jimtabor Date: Tue Jul 7 00:56:48 2009 New Revision: 41790 URL: http://svn.reactos.org/svn/reactos?rev=41790&view=rev Log: - fix build. Modified: trunk/reactos/dll/win32/user32/user32.pspec Modified: trunk/reactos/dll/win32/user32/user32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.ps… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] Tue Jul 7 00:56:48 2009 @@ -712,8 +712,8 @@ @ stdcall UnregisterHotKey(long long) NtUserUnregisterHotKey @ stub UnregisterMessagePumpHook @ stub UnregisterUserApiHook -@ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) NtUserUpdateLayeredWindow -@ stub UpdateLayeredWindowIndirect +@ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) +@ stdcall UpdateLayeredWindowIndirect(long ptr) @ stdcall UpdatePerUserSystemParameters(long long) @ stdcall UpdateWindow(long) @ stdcall User32InitializeImmEntryTable(ptr)

1 0

[jimtabor] 41789: - Update UpdateLayeredWindow and Indirect.
by jimtabor＠svn.reactos.org 06 Jul '09

06 Jul '09

Author: jimtabor Date: Tue Jul 7 00:56:17 2009 New Revision: 41789 URL: http://svn.reactos.org/svn/reactos?rev=41789&view=rev Log: - Update UpdateLayeredWindow and Indirect. Modified: trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Tue Jul 7 00:56:17 2009 @@ -1654,7 +1654,7 @@ { return FALSE; } - Result = NtUserPostMessage( KMMsg.hwnd, + Result = NtUserPostMessage( Wnd, KMMsg.message, KMMsg.wParam, KMMsg.lParam); Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Tue Jul 7 00:56:17 2009 @@ -1608,14 +1608,55 @@ /* - * @unimplemented + * @implemented + */ +BOOL WINAPI +UpdateLayeredWindow( HWND hwnd, + HDC hdcDst, + POINT *pptDst, + SIZE *psize, + HDC hdcSrc, + POINT *pptSrc, + COLORREF crKey, + BLENDFUNCTION *pbl, + DWORD dwFlags) +{ + if ( dwFlags & ULW_EX_NORESIZE) + dwFlags = ~(ULW_EX_NORESIZE|ULW_OPAQUE|ULW_ALPHA|ULW_COLORKEY); + return NtUserUpdateLayeredWindow( hwnd, + hdcDst, + pptDst, + psize, + hdcSrc, + pptSrc, + crKey, + pbl, + dwFlags, + NULL); +} + +/* + * @implemented */ BOOL WINAPI UpdateLayeredWindowIndirect(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info) { - UNIMPLEMENTED; - return FALSE; + if (info && info->cbSize == sizeof(info)) + { + return NtUserUpdateLayeredWindow( hwnd, + info->hdcDst, + (POINT *)info->pptDst, + (SIZE *)info->psize, + info->hdcSrc, + (POINT *)info->pptSrc, + info->crKey, + (BLENDFUNCTION *)info->pblend, + info->dwFlags, + (RECT *)info->prcDirty); + } + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Jul 7 00:56:17 2009 @@ -2744,7 +2744,8 @@ POINT *pptSrc, COLORREF crKey, BLENDFUNCTION *pblend, - DWORD dwFlags); + DWORD dwFlags, + RECT *prcDirty); BOOL NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Jul 7 00:56:17 2009 @@ -4653,7 +4653,8 @@ POINT *pptSrc, COLORREF crKey, BLENDFUNCTION *pblend, - DWORD dwFlags) + DWORD dwFlags, + RECT *prcDirty) { UNIMPLEMENTED Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Tue Jul 7 00:56:17 2009 @@ -583,7 +583,7 @@ NtUserUnregisterHotKey 2 NtUserUpdateInputContext 3 NtUserUpdateInstance 3 -NtUserUpdateLayeredWindow 9 +NtUserUpdateLayeredWindow 10 NtUserGetLayeredWindowAttributes 4 NtUserSetLayeredWindowAttributes 4 NtUserUpdatePerUserSystemParameters 2

1 0

[dgorbachev] 41787: Fix compilation with latest GCC.
by dgorbachev＠svn.reactos.org 06 Jul '09

06 Jul '09

Author: dgorbachev Date: Mon Jul 6 22:26:57 2009 New Revision: 41787 URL: http://svn.reactos.org/svn/reactos?rev=41787&view=rev Log: Fix compilation with latest GCC. Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Mon Jul 6 22:26:57 2009 @@ -922,8 +922,8 @@ Ke386SetInterruptDescriptorTable(IdtDesc); // Jump to proper CS and clear prefetch queue - asm("ljmp $0x08, $mb1\n" - "mb1:\n"); + asm("ljmp $0x08, $1f\n" + "1:\n"); // Set SS selector asm(".intel_syntax noprefix\n");

1 0

[hyperion] 41786: Reverting incomplete commit r41782 on request of the author
by hyperion＠svn.reactos.org 06 Jul '09

06 Jul '09

Author: hyperion Date: Mon Jul 6 22:19:05 2009 New Revision: 41786 URL: http://svn.reactos.org/svn/reactos?rev=41786&view=rev Log: Reverting incomplete commit r41782 on request of the author Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Mon Jul 6 22:19:05 2009 @@ -883,51 +883,6 @@ NdisFreePacketPool(GlobalPacketPool); NdisFreeBufferPool(GlobalBufferPool); return Status; - } - - /* Use direct I/O */ - IPDeviceObject->Flags |= DO_DIRECT_IO; - RawIPDeviceObject->Flags |= DO_DIRECT_IO; - UDPDeviceObject->Flags |= DO_DIRECT_IO; - TCPDeviceObject->Flags |= DO_DIRECT_IO; - - /* Initialize the driver object with this driver's entry points */ - DriverObject->MajorFunction[IRP_MJ_CREATE] = TiDispatchOpenClose; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = TiDispatchOpenClose; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = TiDispatchOpenClose; - DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = TiDispatchInternal; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = TiDispatch; - - DriverObject->DriverUnload = TiUnload; - - /* Initialize our periodic timer and its associated DPC object. When the - timer expires, the IPTimeout deferred procedure call (DPC) is queued */ - ExInitializeWorkItem( &IpWorkItem, IPTimeout, NULL ); - KeInitializeDpc(&IPTimeoutDpc, IPTimeoutDpcFn, NULL); - KeInitializeTimer(&IPTimer); - - /* Start the periodic timer with an initial and periodic - relative expiration time of IP_TIMEOUT milliseconds */ - DueTime.QuadPart = -(LONGLONG)IP_TIMEOUT * 10000; - KeSetTimerEx(&IPTimer, DueTime, IP_TIMEOUT, &IPTimeoutDpc); - - /* Open loopback adapter */ - Status = LoopRegisterAdapter(NULL, NULL); - if (!NT_SUCCESS(Status)) { - TI_DbgPrint(MIN_TRACE, ("Failed to create loopback adapter. Status (0x%X).\n", Status)); - TCPShutdown(); - UDPShutdown(); - RawIPShutdown(); - IPShutdown(); - ChewShutdown(); - IoDeleteDevice(IPDeviceObject); - IoDeleteDevice(RawIPDeviceObject); - IoDeleteDevice(UDPDeviceObject); - IoDeleteDevice(TCPDeviceObject); - exFreePool(EntityList); - NdisFreePacketPool(GlobalPacketPool); - NdisFreeBufferPool(GlobalBufferPool); - return Status; } /* Register protocol with NDIS */ @@ -958,6 +913,52 @@ return Status; } + /* Open loopback adapter */ + Status = LoopRegisterAdapter(NULL, NULL); + if (!NT_SUCCESS(Status)) { + TI_DbgPrint(MIN_TRACE, ("Failed to create loopback adapter. Status (0x%X).\n", Status)); + TCPShutdown(); + UDPShutdown(); + RawIPShutdown(); + IPShutdown(); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + exFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + LANUnregisterProtocol(); + return Status; + } + + /* Use direct I/O */ + IPDeviceObject->Flags |= DO_DIRECT_IO; + RawIPDeviceObject->Flags |= DO_DIRECT_IO; + UDPDeviceObject->Flags |= DO_DIRECT_IO; + TCPDeviceObject->Flags |= DO_DIRECT_IO; + + /* Initialize the driver object with this driver's entry points */ + DriverObject->MajorFunction[IRP_MJ_CREATE] = TiDispatchOpenClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = TiDispatchOpenClose; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = TiDispatchOpenClose; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = TiDispatchInternal; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = TiDispatch; + + DriverObject->DriverUnload = TiUnload; + + /* Initialize our periodic timer and its associated DPC object. When the + timer expires, the IPTimeout deferred procedure call (DPC) is queued */ + ExInitializeWorkItem( &IpWorkItem, IPTimeout, NULL ); + KeInitializeDpc(&IPTimeoutDpc, IPTimeoutDpcFn, NULL); + KeInitializeTimer(&IPTimer); + + /* Start the periodic timer with an initial and periodic + relative expiration time of IP_TIMEOUT milliseconds */ + DueTime.QuadPart = -(LONGLONG)IP_TIMEOUT * 10000; + KeSetTimerEx(&IPTimer, DueTime, IP_TIMEOUT, &IPTimeoutDpc); + return STATUS_SUCCESS; }

1 0

[jimtabor] 41785: - Update apitests.
by jimtabor＠svn.reactos.org 06 Jul '09

06 Jul '09

Author: jimtabor Date: Mon Jul 6 20:24:00 2009 New Revision: 41785 URL: http://svn.reactos.org/svn/reactos?rev=41785&view=rev Log: - Update apitests. Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def [iso-8859-1] Mon Jul 6 20:24:00 2009 @@ -241,7 +241,7 @@ NtGdiMoveTo@16 NtGdiOffsetClipRgn@12 NtGdiOffsetRgn@12 -NtGdiOpenDCW@28 +NtGdiOpenDCW@32 NtGdiPatBlt@24 NtGdiPolyPatBlt@20 NtGdiPathToRegion@4

1 0

[jimtabor] 41784: - Update NtGdiOpenDCW to the newest sdk.
by jimtabor＠svn.reactos.org 06 Jul '09

06 Jul '09

Author: jimtabor Date: Mon Jul 6 20:22:11 2009 New Revision: 41784 URL: http://svn.reactos.org/svn/reactos?rev=41784&view=rev Log: - Update NtGdiOpenDCW to the newest sdk. Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/include/psdk/ntgdi.h trunk/reactos/subsystems/win32/win32k/objects/dclife.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Mon Jul 6 20:22:11 2009 @@ -64,6 +64,7 @@ (PDEVMODEW) lpInitData, (lpwszOutput ? &Output : NULL), iType, // DCW 0 and ICW 1. + Display, hspool, (PVOID) NULL, // NULL for now. (PVOID) &UMdhpdev ); Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] Mon Jul 6 20:22:11 2009 @@ -2085,6 +2085,7 @@ IN DEVMODEW *pdm, // See note for NtGdiResetDC IN PUNICODE_STRING pustrLogAddr, IN ULONG iType, + IN BOOL bDisplay, IN OPTIONAL HANDLE hspool, IN OPTIONAL VOID *pDriverInfo2, // this is "typedef struct _DRIVER_INFO_2W DRIVER_INFO_2W;" OUT VOID *pUMdhpdev Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Mon Jul 6 20:22:11 2009 @@ -358,6 +358,7 @@ DEVMODEW *InitData, PUNICODE_STRING pustrLogAddr, ULONG iType, + BOOL bDisplay, HANDLE hspool, VOID *pDriverInfo2, VOID *pUMdhpdev) Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Mon Jul 6 20:22:11 2009 @@ -235,7 +235,7 @@ NtGdiMoveTo 4 NtGdiOffsetClipRgn 3 NtGdiOffsetRgn 3 -NtGdiOpenDCW 7 +NtGdiOpenDCW 8 NtGdiPatBlt 6 NtGdiPolyPatBlt 5 NtGdiPathToRegion 1

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