Ros-diffs September 2012

ros-diffs@reactos.org

17 participants
236 discussions

[mnordell] 57317: MS-compatible but interface contract violating return value for QueryInterface with NULL ppvObject.

by mnordell＠svn.reactos.org

Author: mnordell Date: Mon Sep 17 20:27:02 2012 New Revision: 57317 URL: http://svn.reactos.org/svn/reactos?rev=57317&view=rev Log: MS-compatible but interface contract violating return value for QueryInterface with NULL ppvObject. Modified: trunk/reactos/dll/win32/msxml3/msxml3_ros.diff trunk/reactos/dll/win32/msxml3/nodelist.c Modified: trunk/reactos/dll/win32/msxml3/msxml3_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3_ro… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml3_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml3_ros.diff [iso-8859-1] Mon Sep 17 20:27:02 2012 @@ -24,17 +24,18 @@ Index: nodelist.c =================================================================== ---- nodelist.c (revision 57307) +--- nodelist.c (revision 57316) +++ nodelist.c (working copy) -@@ -87,6 +87,11 @@ +@@ -89,7 +89,11 @@ - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); + if (!ppvObject) + { +- return E_POINTER; ++ /* NOTE: Interface documentation for IUnknown explicitly states ++ * this case should return E_POINTER. Empirical data proves ++ * MS violates this contract and instead return E_INVALIDARG. ++ */ ++ return E_INVALIDARG; + } -+ if (!ppvObject) -+ { -+ return E_POINTER; -+ } -+ if ( IsEqualGUID( riid, &IID_IUnknown ) || - IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNodeList ) ) Modified: trunk/reactos/dll/win32/msxml3/nodelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodelist.… ============================================================================== --- trunk/reactos/dll/win32/msxml3/nodelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/nodelist.c [iso-8859-1] Mon Sep 17 20:27:02 2012 @@ -89,7 +89,11 @@ if (!ppvObject) { - return E_POINTER; + /* NOTE: Interface documentation for IUnknown explicitly states + * this case should return E_POINTER. Empirical data proves + * MS violates this contract and instead return E_INVALIDARG. + */ + return E_INVALIDARG; } if ( IsEqualGUID( riid, &IID_IUnknown ) ||

12 years, 3 months

[ekohl] 57316: [DEVMGMT] Do not enumerate the root device. Fixes CORE-6592.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Sep 16 22:59:36 2012 New Revision: 57316 URL: http://svn.reactos.org/svn/reactos?rev=57316&view=rev Log: [DEVMGMT] Do not enumerate the root device. Fixes CORE-6592. Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] Sun Sep 16 22:59:36 2012 @@ -298,6 +298,16 @@ } } } + } + + if (DeviceID != NULL && + _tcscmp(*DeviceID, _T("HTREE\\ROOT\\0")) == 0) + { + HeapFree(GetProcessHeap(), + 0, + *DeviceID); + *DeviceID = NULL; + return -1; } /* get the device's friendly name */

12 years, 3 months

[ekohl] 57315: [DEVMGR] Replace $1 by %1 in message strings. Patch by Hermes BELUSCA - MAITO. Fixes CORE-6638.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Sep 16 21:28:43 2012 New Revision: 57315 URL: http://svn.reactos.org/svn/reactos?rev=57315&view=rev Log: [DEVMGR] Replace $1 by %1 in message strings. Patch by Hermes BELUSCA - MAITO. Fixes CORE-6638. Modified: trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc trunk/reactos/dll/win32/devmgr/lang/de-DE.rc trunk/reactos/dll/win32/devmgr/lang/el-GR.rc trunk/reactos/dll/win32/devmgr/lang/en-US.rc trunk/reactos/dll/win32/devmgr/lang/es-ES.rc trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc trunk/reactos/dll/win32/devmgr/lang/id-ID.rc trunk/reactos/dll/win32/devmgr/lang/it-IT.rc trunk/reactos/dll/win32/devmgr/lang/no-NO.rc trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/bg-B… Modified: trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/cs-C… Modified: trunk/reactos/dll/win32/devmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/de-D… Modified: trunk/reactos/dll/win32/devmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/el-G… Modified: trunk/reactos/dll/win32/devmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/en-U… Modified: trunk/reactos/dll/win32/devmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/es-E… Modified: trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/fr-F… Modified: trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/hu-H… Modified: trunk/reactos/dll/win32/devmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/id-I… Modified: trunk/reactos/dll/win32/devmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/it-I… Modified: trunk/reactos/dll/win32/devmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/no-N… Modified: trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pl-P… Modified: trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pt-B… Modified: trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ro-R… Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… Modified: trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/sk-S… Modified: trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/uk-U…

12 years, 3 months

[ekohl] 57314: [INF] Add german translations of device classes.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Sep 16 21:01:06 2012 New Revision: 57314 URL: http://svn.reactos.org/svn/reactos?rev=57314&view=rev Log: [INF] Add german translations of device classes. Modified: trunk/reactos/media/inf/cpu.inf trunk/reactos/media/inf/legcydrv.inf trunk/reactos/media/inf/monitor.inf trunk/reactos/media/inf/unknown.inf Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=5731… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/legcydrv.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/legcydrv.inf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/monitor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/monitor.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/unknown.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/unknown.inf?rev=… ============================================================================== Binary files - no diff available.

12 years, 3 months

[akhaldi] 57313: * Don't use -momit-leaf-frame-pointer in debug gcc builds, it messes up stack traces. * Remove it from the amd64 gcc builds too.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 16 12:57:22 2012 New Revision: 57313 URL: http://svn.reactos.org/svn/reactos?rev=57313&view=rev Log: * Don't use -momit-leaf-frame-pointer in debug gcc builds, it messes up stack traces. * Remove it from the amd64 gcc builds too. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=57313&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Sep 16 12:57:22 2012 @@ -83,12 +83,15 @@ if(ARCH STREQUAL "i386") add_compile_flags("-mpreferred-stack-boundary=3 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer") if(OPTIMIZE STREQUAL "1") - add_compile_flags("-ftracer -momit-leaf-frame-pointer") + add_compile_flags("-ftracer") + if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") + add_compile_flags("-momit-leaf-frame-pointer") + endif() endif() elseif(ARCH STREQUAL "amd64") add_compile_flags("-mpreferred-stack-boundary=4") if(OPTIMIZE STREQUAL "1") - add_compile_flags("-ftracer -momit-leaf-frame-pointer") + add_compile_flags("-ftracer") endif() elseif(ARCH STREQUAL "arm") if(OPTIMIZE STREQUAL "1")

12 years, 3 months

[akhaldi] 57312: [LIBUSB]: Handle configuration descriptors partial reads. By Jérôme Gardou. CORE-6634 #resolve

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 16 12:44:39 2012 New Revision: 57312 URL: http://svn.reactos.org/svn/reactos?rev=57312&view=rev Log: [LIBUSB]: Handle configuration descriptors partial reads. By Jérôme Gardou. CORE-6634 #resolve Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Sun Sep 16 12:44:39 2012 @@ -1494,11 +1494,10 @@ IN OUT PURB Urb) { NTSTATUS Status = STATUS_NOT_IMPLEMENTED; - PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; PUCHAR Buffer; PUSBDEVICE UsbDevice; - ULONG Length; + ULONG Length, BufferLength; DPRINT("[USBLIB] HandleGetDescriptor\n"); @@ -1557,44 +1556,70 @@ // sanity checks // PC_ASSERT(Urb->UrbControlDescriptorRequest.TransferBuffer); - PC_ASSERT(Urb->UrbControlDescriptorRequest.TransferBufferLength >= sizeof(USB_CONFIGURATION_DESCRIPTOR)); + // + // From MSDN + // The caller must allocate a buffer large enough to hold all of this information or the data is truncated without error. + // + BufferLength = Urb->UrbControlDescriptorRequest.TransferBufferLength; + Buffer = (PUCHAR) Urb->UrbControlDescriptorRequest.TransferBuffer; if (Urb->UrbHeader.UsbdDeviceHandle == PVOID(this)) { // // request is for the root bus controller // - RtlCopyMemory(Urb->UrbControlDescriptorRequest.TransferBuffer, &ROOTHUB2_CONFIGURATION_DESCRIPTOR, sizeof(USB_CONFIGURATION_DESCRIPTOR)); - - // - // get configuration descriptor, very retarded! - // - ConfigurationDescriptor = (PUSB_CONFIGURATION_DESCRIPTOR)Urb->UrbControlDescriptorRequest.TransferBuffer; - - // - // check if buffer can hold interface and endpoint descriptor - // - if (ConfigurationDescriptor->wTotalLength > Urb->UrbControlDescriptorRequest.TransferBufferLength) + Length = BufferLength > sizeof(USB_CONFIGURATION_DESCRIPTOR) ? + sizeof(USB_CONFIGURATION_DESCRIPTOR) : BufferLength; + RtlCopyMemory(Buffer, &ROOTHUB2_CONFIGURATION_DESCRIPTOR, Length); + + // + // Check if we still have some space left + // + if(Length == BufferLength) { // - // buffer too small + // We copied all we could // Status = STATUS_SUCCESS; - ASSERT(FALSE); break; } + // + // Go further + // + Buffer += Length; + BufferLength -= Length; // // copy interface descriptor template // - Buffer = (PUCHAR)(ConfigurationDescriptor + 1); - RtlCopyMemory(Buffer, &ROOTHUB2_INTERFACE_DESCRIPTOR, sizeof(USB_INTERFACE_DESCRIPTOR)); - + Length = BufferLength > sizeof(USB_INTERFACE_DESCRIPTOR) ? + sizeof(USB_INTERFACE_DESCRIPTOR) : BufferLength; + RtlCopyMemory(Buffer, &ROOTHUB2_INTERFACE_DESCRIPTOR, Length); + + // + // Check if we still have some space left + // + if(Length == BufferLength) + { + // + // We copied all we could + // + Status = STATUS_SUCCESS; + break; + } + // + // Go further + // + Buffer += Length; + BufferLength -= Length; + + // // copy end point descriptor template // - Buffer += sizeof(USB_INTERFACE_DESCRIPTOR); - RtlCopyMemory(Buffer, &ROOTHUB2_ENDPOINT_DESCRIPTOR, sizeof(USB_ENDPOINT_DESCRIPTOR)); + Length = BufferLength > sizeof(USB_ENDPOINT_DESCRIPTOR) ? + sizeof(USB_ENDPOINT_DESCRIPTOR) : BufferLength; + RtlCopyMemory(Buffer, &ROOTHUB2_ENDPOINT_DESCRIPTOR, Length); // // done @@ -1621,25 +1646,34 @@ // get device // UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); - - if (sizeof(USB_CONFIGURATION_DESCRIPTOR) > Urb->UrbControlDescriptorRequest.TransferBufferLength) + + // + // Allocate temporary buffer + // + BufferLength = UsbDevice->GetConfigurationDescriptorsLength(); + Buffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, BufferLength, TAG_USBLIB); + if(!Buffer) { - // - // buffer too small - // - Urb->UrbControlDescriptorRequest.TransferBufferLength = UsbDevice->GetConfigurationDescriptorsLength(); - - // - // bail out - // - Status = STATUS_SUCCESS; + Status = STATUS_NO_MEMORY; break; } // // perform work in IUSBDevice // - UsbDevice->GetConfigurationDescriptors((PUSB_CONFIGURATION_DESCRIPTOR)Urb->UrbControlDescriptorRequest.TransferBuffer, Urb->UrbControlDescriptorRequest.TransferBufferLength, &Length); + UsbDevice->GetConfigurationDescriptors((PUSB_CONFIGURATION_DESCRIPTOR)Buffer, BufferLength, &Length); + + // + // Copy what we can + // + Length = Urb->UrbControlDescriptorRequest.TransferBufferLength > Length ? + Length : Urb->UrbControlDescriptorRequest.TransferBufferLength; + RtlCopyMemory(Urb->UrbControlDescriptorRequest.TransferBuffer, Buffer, Length); + + // + // Free temporary buffer + // + ExFreePoolWithTag(Buffer, TAG_USBLIB); // // store result size

12 years, 3 months

[jimtabor] 57311: [User32Test] - Update msg test to wine 1.5.13.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Sep 16 01:09:00 2012 New Revision: 57311 URL: http://svn.reactos.org/svn/reactos?rev=57311&view=rev Log: [User32Test] - Update msg test to wine 1.5.13. Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Sun Sep 16 01:09:00 2012 @@ -1721,6 +1721,7 @@ static BOOL (WINAPI *pUnhookWinEvent)(HWINEVENTHOOK); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); +static BOOL (WINAPI *pUpdateLayeredWindow)(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD); /* kernel32 functions */ static BOOL (WINAPI *pGetCPInfoExA)(UINT, DWORD, LPCPINFOEXA); @@ -1744,6 +1745,7 @@ GET_PROC(user32, UnhookWinEvent) GET_PROC(user32, GetMonitorInfoA) GET_PROC(user32, MonitorFromPoint) + GET_PROC(user32, UpdateLayeredWindow) GET_PROC(kernel32, GetCPInfoExA) @@ -13772,6 +13774,131 @@ CloseHandle(hthread); } +static const struct message WmSetLayeredStyle[] = { + { WM_STYLECHANGING, sent }, + { WM_STYLECHANGED, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { 0 } +}; + +static const struct message WmSetLayeredStyle2[] = { + { WM_STYLECHANGING, sent }, + { WM_STYLECHANGED, sent }, + { WM_WINDOWPOSCHANGING, sent|optional|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional|wparam|defwinproc, 1 }, + { WM_WINDOWPOSCHANGED, sent|optional|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_MOVE, sent|optional|defwinproc|wparam, 0 }, + { WM_SIZE, sent|optional|defwinproc|wparam, SIZE_RESTORED }, + { 0 } +}; + +static void test_layered_window(void) +{ + HWND hwnd; + HDC hdc; + HBITMAP bmp; + BOOL ret; + SIZE size; + POINT pos, src; + RECT rect, client; + + if (!pUpdateLayeredWindow) + { + win_skip( "UpdateLayeredWindow not supported\n" ); + return; + } + + hdc = CreateCompatibleDC( 0 ); + bmp = CreateCompatibleBitmap( hdc, 300, 300 ); + SelectObject( hdc, bmp ); + + hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_CAPTION | WS_THICKFRAME | WS_SYSMENU, + 100, 100, 300, 300, 0, 0, 0, NULL); + ok( hwnd != 0, "failed to create window\n" ); + ShowWindow( hwnd, SW_SHOWNORMAL ); + UpdateWindow( hwnd ); + flush_events(); + flush_sequence(); + + GetWindowRect( hwnd, &rect ); + GetClientRect( hwnd, &client ); + ok( client.right < rect.right - rect.left, "wrong client area\n" ); + ok( client.bottom < rect.bottom - rect.top, "wrong client area\n" ); + + src.x = src.y = 0; + pos.x = pos.y = 300; + size.cx = size.cy = 250; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( !ret, "UpdateLayeredWindow should fail on non-layered window\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED ); + ok_sequence( WmSetLayeredStyle, "WmSetLayeredStyle", FALSE ); + + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() ); + ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 300 && rect.top == 300 && rect.right == 550 && rect.bottom == 550, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( rect.right == client.right - 50 && rect.bottom == client.bottom - 50, + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + size.cx = 150; + pos.y = 200; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() ); + ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 300 && rect.top == 200 && rect.right == 450 && rect.bottom == 450, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( rect.right == client.right - 150 && rect.bottom == client.bottom - 50, + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + SetWindowLong( hwnd, GWL_STYLE, + GetWindowLong(hwnd, GWL_STYLE) & ~(WS_CAPTION | WS_THICKFRAME | WS_SYSMENU) ); + ok_sequence( WmSetLayeredStyle2, "WmSetLayeredStyle2", FALSE ); + + size.cx = 200; + pos.x = 200; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() ); + ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 200 && rect.top == 200 && rect.right == 400 && rect.bottom == 450, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( (rect.right == 200 && rect.bottom == 250) || + broken(rect.right == client.right - 100 && rect.bottom == client.bottom - 50), + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + size.cx = 0; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( !ret, "UpdateLayeredWindow should fail on non-layered window\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(ERROR_MR_MID_NOT_FOUND) /* win7 */, + "wrong error %u\n", GetLastError() ); + size.cx = 1; + size.cy = -1; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( !ret, "UpdateLayeredWindow should fail on non-layered window\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) & ~WS_EX_LAYERED ); + ok_sequence( WmSetLayeredStyle, "WmSetLayeredStyle", FALSE ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 200 && rect.top == 200 && rect.right == 400 && rect.bottom == 450, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( (rect.right == 200 && rect.bottom == 250) || + broken(rect.right == client.right - 100 && rect.bottom == client.bottom - 50), + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + DestroyWindow( hwnd ); + DeleteDC( hdc ); + DeleteObject( bmp ); +} + START_TEST(msg) { char **test_argv; @@ -13884,6 +14011,7 @@ test_clipboard_viewers(); test_keyflags(); test_hotkey(); + test_layered_window(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */

12 years, 3 months

[mnordell] 57310: Fix crash in xmlnodelist_QueryInterface. Solves CORE-6665.

by mnordell＠svn.reactos.org

Author: mnordell Date: Sat Sep 15 21:41:46 2012 New Revision: 57310 URL: http://svn.reactos.org/svn/reactos?rev=57310&view=rev Log: Fix crash in xmlnodelist_QueryInterface. Solves CORE-6665. Modified: trunk/reactos/dll/win32/msxml3/msxml3_ros.diff trunk/reactos/dll/win32/msxml3/nodelist.c Modified: trunk/reactos/dll/win32/msxml3/msxml3_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3_ro… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml3_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml3_ros.diff [iso-8859-1] Sat Sep 15 21:41:46 2012 @@ -20,3 +20,21 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) + + +Index: nodelist.c +=================================================================== +--- nodelist.c (revision 57307) ++++ nodelist.c (working copy) +@@ -87,6 +87,11 @@ + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); + ++ if (!ppvObject) ++ { ++ return E_POINTER; ++ } ++ + if ( IsEqualGUID( riid, &IID_IUnknown ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IXMLDOMNodeList ) ) Modified: trunk/reactos/dll/win32/msxml3/nodelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodelist.… ============================================================================== --- trunk/reactos/dll/win32/msxml3/nodelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/nodelist.c [iso-8859-1] Sat Sep 15 21:41:46 2012 @@ -87,6 +87,11 @@ TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); + if (!ppvObject) + { + return E_POINTER; + } + if ( IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IXMLDOMNodeList ) )

12 years, 3 months

[mnordell] 57309: Disable crashing usermode test. See CORE-6640.

by mnordell＠svn.reactos.org

Author: mnordell Date: Sat Sep 15 19:39:14 2012 New Revision: 57309 URL: http://svn.reactos.org/svn/reactos?rev=57309&view=rev Log: Disable crashing usermode test. See CORE-6640. Modified: trunk/rostests/kmtests/rtl/RtlException.c Modified: trunk/rostests/kmtests/rtl/RtlException.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlException.… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlException.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlException.c [iso-8859-1] Sat Sep 15 19:39:14 2012 @@ -43,6 +43,7 @@ /* We cannot test this in kernel mode easily - the stack is just "somewhere" * in system space, and there's no guard page below it */ +#if CORE_6640_IS_FIXED #ifdef KMT_USER_MODE /* Overflow the stack - must cause a special exception */ KmtStartSeh() @@ -55,4 +56,5 @@ } KmtEndSeh(STATUS_STACK_OVERFLOW); #endif +#endif /* CORE_6640_IS_FIXED */ }

12 years, 3 months

[mnordell] 57308: Disable more crashing font tests.

by mnordell＠svn.reactos.org

Author: mnordell Date: Sat Sep 15 19:31:48 2012 New Revision: 57308 URL: http://svn.reactos.org/svn/reactos?rev=57308&view=rev Log: Disable more crashing font tests. Modified: trunk/rostests/winetests/gdiplus/font.c trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff Modified: trunk/rostests/winetests/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/font.c?… ============================================================================== --- trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] Sat Sep 15 19:31:48 2012 @@ -87,6 +87,7 @@ GdipDeleteFontFamily(fontfamily); } +#if CORE_6660_IS_FIXED static void test_logfont(void) { LOGFONTA lfa, lfa2; @@ -274,6 +275,7 @@ GdipDeleteFontFamily(clonedFontFamily); } +#endif // CORE_6660_IS_FIXED static void test_fontfamily_properties (void) { @@ -740,8 +742,10 @@ test_font_metrics(); #endif test_createfont(); +#if CORE_6660_IS_FIXED test_logfont(); test_fontfamily(); +#endif test_fontfamily_properties(); test_getgenerics(); test_installedfonts(); Modified: trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/gdiplus… ============================================================================== --- trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff [iso-8859-1] Sat Sep 15 19:31:48 2012 @@ -31,31 +31,32 @@ Index: font.c =================================================================== ---- font.c (revision 57206) +--- font.c (revision 57301) +++ font.c (working copy) -@@ -485,6 +485,7 @@ +@@ -87,6 +87,7 @@ GdipDeleteFontFamily(fontfamily); } +#if CORE_6660_IS_FIXED - static int CALLBACK font_enum_proc(const LOGFONTW *lfe, const TEXTMETRICW *ntme, - DWORD type, LPARAM lparam) + static void test_logfont(void) { -@@ -721,6 +722,7 @@ - GdipDeleteGraphics(graphics); - DeleteDC(hdc); + LOGFONTA lfa, lfa2; +@@ -274,6 +275,7 @@ + + GdipDeleteFontFamily(clonedFontFamily); } +#endif // CORE_6660_IS_FIXED - START_TEST(font) + static void test_fontfamily_properties (void) { -@@ -734,7 +736,9 @@ - - GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); - +@@ -740,8 +742,10 @@ + test_font_metrics(); + #endif + test_createfont(); +#if CORE_6660_IS_FIXED - test_font_metrics(); -+#endif - test_createfont(); test_logfont(); test_fontfamily(); ++#endif + test_fontfamily_properties(); + test_getgenerics(); + test_installedfonts();

12 years, 3 months

← Newer
1
...
11
12
13
14
15
16
17
...
24
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 September 2012