Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[pschweitzer] 54030: [COMP] Fix resource leak

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Oct 6 20:13:54 2011 New Revision: 54030 URL: http://svn.reactos.org/svn/reactos?rev=54030&view=rev Log: [COMP] Fix resource leak Modified: trunk/rosapps/applications/cmdutils/comp/comp.c Modified: trunk/rosapps/applications/cmdutils/comp/comp.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/comp… ============================================================================== --- trunk/rosapps/applications/cmdutils/comp/comp.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/comp/comp.c [iso-8859-1] Thu Oct 6 20:13:54 2011 @@ -149,6 +149,7 @@ if ((fp2 = fopen(File2, "r")) == NULL) { _tprintf(_T("Can't find/open file: %s\n"), File2); + fclose(fp1); return EXIT_FAILURE; }

12 years, 11 months

[dgorbachev] 54029: [NTOSKRNL] Fix dbg output.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Oct 6 19:59:27 2011 New Revision: 54029 URL: http://svn.reactos.org/svn/reactos?rev=54029&view=rev Log: [NTOSKRNL] Fix dbg output. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpnoti… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c [iso-8859-1] Thu Oct 6 19:59:27 2011 @@ -259,10 +259,11 @@ NTSTATUS Status; PAGED_CODE(); - DPRINT("__FUNCTION__(EventCategory 0x%x, EventCategoryFlags 0x%lx, DriverObject %p) called.\n", - EventCategory, - EventCategoryFlags, - DriverObject); + DPRINT("%s(EventCategory 0x%x, EventCategoryFlags 0x%lx, DriverObject %p) called.\n", + __FUNCTION__, + EventCategory, + EventCategoryFlags, + DriverObject); ObReferenceObject(DriverObject); @@ -344,19 +345,18 @@ } default: { - DPRINT1("__FUNCTION__(): unknown EventCategory 0x%x UNIMPLEMENTED\n", - EventCategory); + DPRINT1("%s: unknown EventCategory 0x%x UNIMPLEMENTED\n", + __FUNCTION__, EventCategory); break; } } KeAcquireGuardedMutex(&PnpNotifyListLock); - InsertHeadList(&PnpNotifyListHead, + InsertHeadList(&PnpNotifyListHead, &Entry->PnpNotifyList); KeReleaseGuardedMutex(&PnpNotifyListLock); - DPRINT("IoRegisterPlugPlayNotification() returns NotificationEntry %p\n", - Entry); + DPRINT("%s returns NotificationEntry %p\n", __FUNCTION__, Entry); *NotificationEntry = Entry; @@ -374,7 +374,7 @@ PAGED_CODE(); Entry = (PPNP_NOTIFY_ENTRY)NotificationEntry; - DPRINT("__FUNCTION__(NotificationEntry %p) called\n", Entry); + DPRINT("%s(NotificationEntry %p) called\n", __FUNCTION__, Entry); KeAcquireGuardedMutex(&PnpNotifyListLock); RemoveEntryList(&Entry->PnpNotifyList);

12 years, 11 months

[dgorbachev] 54028: [HAL] Do not write past the end of buffer.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Oct 6 19:59:20 2011 New Revision: 54028 URL: http://svn.reactos.org/svn/reactos?rev=54028&view=rev Log: [HAL] Do not write past the end of buffer. Modified: trunk/reactos/hal/halx86/legacy/bussupp.c Modified: trunk/reactos/hal/halx86/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bussupp.… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] Thu Oct 6 19:59:20 2011 @@ -736,9 +736,9 @@ VendorName += 7; p = strchr(VendorName, '\r'); Length = p - VendorName; - if (Length > sizeof(bVendorName)) Length = sizeof(bVendorName); + if (Length >= sizeof(bVendorName)) Length = sizeof(bVendorName) - 1; strncpy(bVendorName, VendorName, Length); - bVendorName[Length ] = '\0'; + bVendorName[Length] = '\0'; /* Isolate the product name */ sprintf(LookupString, "\t%04x", PciData->DeviceID); @@ -749,7 +749,7 @@ ProductName += 7; p = strchr(ProductName, '\r'); Length = p - ProductName; - if (Length > sizeof(bProductName)) Length = sizeof(bProductName); + if (Length >= sizeof(bProductName)) Length = sizeof(bProductName) - 1; strncpy(bProductName, ProductName, Length); bProductName[Length] = '\0'; @@ -765,7 +765,7 @@ SubVendorName += 13; p = strchr(SubVendorName, '\r'); Length = p - SubVendorName; - if (Length > sizeof(bSubVendorName)) Length = sizeof(bSubVendorName); + if (Length >= sizeof(bSubVendorName)) Length = sizeof(bSubVendorName) - 1; strncpy(bSubVendorName, SubVendorName, Length); bSubVendorName[Length] = '\0'; } @@ -801,7 +801,7 @@ PciData->u.type0.InterruptLine != 0 && PciData->u.type0.InterruptLine != 0xFF) DbgPrint(", IRQ %02d", PciData->u.type0.InterruptLine); DbgPrint("\n"); - + /* Scan addresses */ Size = 0; for (b = 0; b < PCI_TYPE0_ADDRESSES; b++) @@ -926,7 +926,7 @@ { /* Get the bus handler */ BusHandler = HalHandlerForBus(PCIBus, i); - + /* Loop every device */ for (j = 0; j < 32; j++) {

12 years, 11 months

[rharabien] 54027: [NTOSKRNL] - Set special value in Next ptr when Ex(f)InterlockedPopEntryList is called on checked build. Fixes all ntos:ExSingleList kmtests.

by rharabien＠svn.reactos.org

Author: rharabien Date: Thu Oct 6 19:53:51 2011 New Revision: 54027 URL: http://svn.reactos.org/svn/reactos?rev=54027&view=rev Log: [NTOSKRNL] - Set special value in Next ptr when Ex(f)InterlockedPopEntryList is called on checked build. Fixes all ntos:ExSingleList kmtests. Modified: trunk/reactos/ntoskrnl/ex/interlocked.c Modified: trunk/reactos/ntoskrnl/ex/interlocked.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/interlocked.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ex/interlocked.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/interlocked.c [iso-8859-1] Thu Oct 6 19:53:51 2011 @@ -210,6 +210,10 @@ /* Pop the first entry from the list */ ListEntry = PopEntryList(ListHead); +#if DBG + if (ListEntry) + ListEntry->Next = (PSINGLE_LIST_ENTRY)0xBADDD0FF; +#endif /* Release the spinlock and restore interrupts */ _ExiReleaseSpinLockAndRestoreInterupts(Lock, Enable); @@ -412,6 +416,10 @@ /* Pop the first entry from the list */ ListEntry = PopEntryList(ListHead); +#if DBG + if (ListEntry) + ListEntry->Next = (PSINGLE_LIST_ENTRY)0xBADDD0FF; +#endif /* Release the spinlock and restore interrupts */ _ExiReleaseSpinLockAndRestoreInterupts(Lock, Enable);

12 years, 11 months

[rharabien] 54026: [NTOSKRNL] - Save special values in F/Blink when Ex(f)InterlockedRemoveHeadList is called on checked build. Fixes all ntos:ExDoubleList kmtests

by rharabien＠svn.reactos.org

Author: rharabien Date: Thu Oct 6 19:39:37 2011 New Revision: 54026 URL: http://svn.reactos.org/svn/reactos?rev=54026&view=rev Log: [NTOSKRNL] - Save special values in F/Blink when Ex(f)InterlockedRemoveHeadList is called on checked build. Fixes all ntos:ExDoubleList kmtests Modified: trunk/reactos/ntoskrnl/ex/interlocked.c Modified: trunk/reactos/ntoskrnl/ex/interlocked.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/interlocked.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ex/interlocked.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/interlocked.c [iso-8859-1] Thu Oct 6 19:39:37 2011 @@ -183,6 +183,10 @@ { /* Remove the first entry from the list head */ ListEntry = RemoveHeadList(ListHead); +#if DBG + ListEntry->Flink = (PLIST_ENTRY)0xBADDD0FF; + ListEntry->Blink = (PLIST_ENTRY)0xBADDD0FF; +#endif } /* Release the spinlock and restore interrupts */ @@ -381,6 +385,10 @@ { /* Remove the first entry from the list head */ ListEntry = RemoveHeadList(ListHead); +#if DBG + ListEntry->Flink = (PLIST_ENTRY)0x0BADD0FF; + ListEntry->Blink = (PLIST_ENTRY)0x0BADD0FF; +#endif } /* Release the spinlock and restore interrupts */

12 years, 11 months

[gadamopoulos] 54025: [user32_apitest] - Add a couple of tests for the messages sent when changing the z-oder of windows with DeferWindowPos (this test ignores owners z-order)

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Oct 6 14:19:04 2011 New Revision: 54025 URL: http://svn.reactos.org/svn/reactos?rev=54025&view=rev Log: [user32_apitest] - Add a couple of tests for the messages sent when changing the z-oder of windows with DeferWindowPos (this test ignores owners z-order) Modified: trunk/rostests/apitests/user32/DeferWindowPos.c Modified: trunk/rostests/apitests/user32/DeferWindowPos.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DeferWind… ============================================================================== --- trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] Thu Oct 6 14:19:04 2011 @@ -278,6 +278,19 @@ {2,WM_MOVE}, {0,0}}; + +MSG_ENTRY ZOrder1_chain[]={ + {1,WM_WINDOWPOSCHANGING, SENT, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOMOVE|SWP_NOSIZE}, + {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOMOVE|SWP_NOSIZE | SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {0,0}}; + +MSG_ENTRY ZOrder1and2_chain[]={ + {1,WM_WINDOWPOSCHANGING, SENT, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOMOVE|SWP_NOSIZE}, + {2,WM_WINDOWPOSCHANGING, SENT, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOMOVE|SWP_NOSIZE}, + {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOMOVE|SWP_NOSIZE | SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {2,WM_WINDOWPOSCHANGED, SENT, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOMOVE|SWP_NOSIZE | SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {0,0}}; + static void Test_DWP_SimpleMsg(HWND hWnd1, HWND hWnd2) { HDWP hdwp; @@ -291,8 +304,6 @@ /* move hWnd1 */ hdwp = BeginDeferWindowPos(1); ok(hdwp != NULL, "BeginDeferWindowPos failed\n"); - FlushMessages(); - COMPARE_CACHE(empty_chain); hdwp = DeferWindowPos(hdwp, hWnd1, HWND_TOP, 20, 30, 100, 100, SWP_NOACTIVATE|SWP_NOOWNERZORDER); ok(hdwp != NULL, "DeferWindowPos failed\n"); FlushMessages(); @@ -305,8 +316,6 @@ /* resize hWnd1 */ hdwp = BeginDeferWindowPos(1); ok(hdwp != NULL, "BeginDeferWindowPos failed\n"); - FlushMessages(); - COMPARE_CACHE(empty_chain); hdwp = DeferWindowPos(hdwp, hWnd1, HWND_TOP, 20, 30, 110, 110, SWP_NOACTIVATE|SWP_NOOWNERZORDER); ok(hdwp != NULL, "DeferWindowPos failed\n"); FlushMessages(); @@ -315,17 +324,12 @@ ok(ret != 0, "EndDeferWindowPos failed\n"); FlushMessages(); COMPARE_CACHE(resize1_chain); - /* move both windows */ hdwp = BeginDeferWindowPos(1); ok(hdwp != NULL, "BeginDeferWindowPos failed\n"); - FlushMessages(); - COMPARE_CACHE(empty_chain); hdwp = DeferWindowPos(hdwp, hWnd1, HWND_TOP, 30, 40, 110, 110, SWP_NOACTIVATE|SWP_NOOWNERZORDER); ok(hdwp != NULL, "DeferWindowPos failed\n"); - FlushMessages(); - COMPARE_CACHE(empty_chain); hdwp = DeferWindowPos(hdwp, hWnd2, HWND_TOP, 30, 40, 100, 100, SWP_NOACTIVATE|SWP_NOOWNERZORDER); ok(hdwp != NULL, "DeferWindowPos failed\n"); FlushMessages(); @@ -334,6 +338,33 @@ ok(ret != 0, "EndDeferWindowPos failed\n"); FlushMessages(); COMPARE_CACHE(move1_2_chain); + + /* change the z-order of the first window */ + hdwp = BeginDeferWindowPos(1); + ok(hdwp != NULL, "BeginDeferWindowPos failed\n"); + hdwp = DeferWindowPos(hdwp, hWnd1, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOMOVE|SWP_NOSIZE); + ok(hdwp != NULL, "DeferWindowPos failed\n"); + FlushMessages(); + COMPARE_CACHE(empty_chain); + ret = EndDeferWindowPos(hdwp); + ok(ret != 0, "EndDeferWindowPos failed\n"); + FlushMessages(); + COMPARE_CACHE(ZOrder1_chain); + + /* change the z-order of both windows */ + hdwp = BeginDeferWindowPos(2); + ok(hdwp != NULL, "BeginDeferWindowPos failed\n"); + hdwp = DeferWindowPos(hdwp, hWnd1, HWND_TOP, 0, 0, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOMOVE|SWP_NOSIZE); + ok(hdwp != NULL, "DeferWindowPos failed\n"); + hdwp = DeferWindowPos(hdwp, hWnd2, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOMOVE|SWP_NOSIZE); + ok(hdwp != NULL, "DeferWindowPos failed\n"); + FlushMessages(); + COMPARE_CACHE(empty_chain); + ret = EndDeferWindowPos(hdwp); + ok(ret != 0, "EndDeferWindowPos failed\n"); + FlushMessages(); + COMPARE_CACHE(ZOrder1and2_chain); + } #define OwnerZOrderAParams SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOSIZE

12 years, 11 months

[tkreuzer] 54024: [WIN32K] use GreCreateBitmapEx in IntSetDIBits as well to handle RLE images. Fixes bug 6388

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Oct 6 13:38:45 2011 New Revision: 54024 URL: http://svn.reactos.org/svn/reactos?rev=54024&view=rev Log: [WIN32K] use GreCreateBitmapEx in IntSetDIBits as well to handle RLE images. Fixes bug 6388 Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu Oct 6 13:38:45 2011 @@ -250,21 +250,26 @@ INT result = 0; RECT rcDst; POINTL ptSrc; - PVOID pvBits; EXLATEOBJ exlo; - - SourceBitmap = DIB_CreateDIBSection(DC, bmi, ColorUse, &pvBits, NULL, 0, 0); - if (0 == SourceBitmap) - { - DPRINT1("Error : Could not create a DIBSection.\n"); + HPALETTE hpalDIB = 0; + PPALETTE ppalDIB = 0; + + SourceBitmap = GreCreateBitmapEx(bmi->bmiHeader.biWidth, + ScanLines, + 0, + BitmapFormat(bmi->bmiHeader.biBitCount, + bmi->bmiHeader.biCompression), + bmi->bmiHeader.biHeight < 0 ? BMF_TOPDOWN : 0, + bmi->bmiHeader.biSizeImage, + (PVOID)Bits, + 0); + if (!SourceBitmap) + { + DPRINT1("Error: Could not create a bitmap.\n"); EngSetLastError(ERROR_NO_SYSTEM_RESOURCES); return 0; } - RtlCopyMemory(pvBits, Bits, DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth, - bmi->bmiHeader.biHeight, - bmi->bmiHeader.biBitCount)); - psurfDst = SURFACE_ShareLockSurface(hBitmap); psurfSrc = SURFACE_ShareLockSurface(SourceBitmap); @@ -273,17 +278,37 @@ DPRINT1("Error, could not lock surfaces\n"); goto cleanup; } + + /* Create a palette for the DIB */ + hpalDIB = BuildDIBPalette(bmi); + if (!hpalDIB) + { + EngSetLastError(ERROR_NO_SYSTEM_RESOURCES); + goto cleanup; + } + + /* Lock the DIB palette */ + ppalDIB = PALETTE_ShareLockPalette(hpalDIB); + if (!ppalDIB) + { + EngSetLastError(ERROR_INVALID_HANDLE); + goto cleanup; + } + + /* Initialize EXLATEOBJ */ + EXLATEOBJ_vInitialize(&exlo, + ppalDIB, + psurfDst->ppal, + RGB(0xff, 0xff, 0xff), + RGB(0xff, 0xff, 0xff), //DC->pdcattr->crBackgroundClr, + 0); // DC->pdcattr->crForegroundClr); rcDst.top = StartScan; rcDst.left = 0; rcDst.bottom = rcDst.top + ScanLines; rcDst.right = psurfDst->SurfObj.sizlBitmap.cx; - ptSrc.x = 0; ptSrc.y = 0; - - /* 1bpp bitmaps have 0 for white, 1 for black */ - EXLATEOBJ_vInitialize(&exlo, psurfSrc->ppal, psurfDst->ppal, 0xFFFFFF, 0xFFFFFF, 0); result = IntEngCopyBits(&psurfDst->SurfObj, &psurfSrc->SurfObj, @@ -297,14 +322,10 @@ EXLATEOBJ_vCleanup(&exlo); cleanup: - if(psurfSrc) - { - SURFACE_ShareUnlockSurface(psurfSrc); - } - if(psurfDst) - { - SURFACE_ShareUnlockSurface(psurfDst); - } + if (ppalDIB) PALETTE_ShareUnlockPalette(ppalDIB); + if (hpalDIB) GreDeleteObject(hpalDIB); + if(psurfSrc) SURFACE_ShareUnlockSurface(psurfSrc); + if(psurfDst) SURFACE_ShareUnlockSurface(psurfDst); GreDeleteObject(SourceBitmap); return result;

12 years, 11 months

[gadamopoulos] 54023: [user32_apitest] - remove all previous SetActiveWindow tests as they were completely wrong. This is because changing the z-order of the owner windows is done by SetWindowPos a...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Oct 6 13:06:52 2011 New Revision: 54023 URL: http://svn.reactos.org/svn/reactos?rev=54023&view=rev Log: [user32_apitest] - remove all previous SetActiveWindow tests as they were completely wrong. This is because changing the z-order of the owner windows is done by SetWindowPos as tested in the same test suite. However SetActiveWindow calls SetWindowPos without SWP_NOOWNERZORDER parameter which leads to changing the zorder of owner windows Modified: trunk/rostests/apitests/user32/SetActiveWindow.c Modified: trunk/rostests/apitests/user32/SetActiveWindow.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetActive… ============================================================================== --- trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] Thu Oct 6 13:06:52 2011 @@ -11,15 +11,13 @@ #include "helper.h" #include <undocuser.h> -HWND hWnd1, hWnd2, hWnd3, hWnd4; +HWND hWnd1, hWnd2; /* FIXME: test for HWND_TOP, etc...*/ static int get_iwnd(HWND hWnd) { if(hWnd == hWnd1) return 1; else if(hWnd == hWnd2) return 2; - else if(hWnd == hWnd3) return 3; - else if(hWnd == hWnd4) return 4; else return 0; } @@ -79,31 +77,13 @@ 20, 20, 300, 300, NULL, NULL, 0, NULL); hWnd2 = CreateWindowW(L"ownertest", L"ownertest", WS_OVERLAPPEDWINDOW, - 20, 350, 300, 300, hWnd1, NULL, 0, NULL); - - hWnd3 = CreateWindowW(L"ownertest", L"ownertest", WS_OVERLAPPEDWINDOW, 200, 200, 300, 300, NULL, NULL, 0, NULL); - - hWnd4 = CreateWindowW(L"ownertest", L"ownertest", WS_OVERLAPPEDWINDOW, - 250, 250, 200, 200, hWnd1, NULL, 0, NULL); } static void set_default_zorder() { - /* show the windows */ - ShowWindow(hWnd1, SW_SHOW); - UpdateWindow(hWnd1); - ShowWindow(hWnd2, SW_SHOW); - UpdateWindow(hWnd2); - ShowWindow(hWnd3, SW_SHOW); - UpdateWindow(hWnd3); - ShowWindow(hWnd4, SW_SHOW); - UpdateWindow(hWnd4); - - SetWindowPos(hWnd3, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); - SetWindowPos(hWnd1, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); - SetWindowPos(hWnd2, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); - SetWindowPos(hWnd4, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); + SetWindowPos(hWnd1, 0, 0,0,0,0, SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW); + SetWindowPos(hWnd2, 0, 0,0,0,0, SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW); FlushMessages(); empty_message_cache(); @@ -113,198 +93,50 @@ { DestroyWindow(hWnd1); DestroyWindow(hWnd2); - DestroyWindow(hWnd3); - DestroyWindow(hWnd4); UnregisterClassW(L"testClass", 0); } -#define EXPECT_NEXT(hWnd1, hWnd2) \ - ok(get_iwnd(GetWindow(hWnd1,GW_HWNDNEXT)) == get_iwnd(hWnd2), \ - "After hwnd%d, expected hwnd%d not hwnd%d\n", \ - get_iwnd(hWnd1), get_iwnd(hWnd2),get_iwnd(GetWindow(hWnd1,GW_HWNDNEXT)) ) - -#define EXPECT_CHAIN(A,B,C,D,X) \ - EXPECT_NEXT(hWnd##A, hWnd##B); \ - EXPECT_NEXT(hWnd##B, hWnd##C); \ - EXPECT_NEXT(hWnd##C, hWnd##D); \ - EXPECT_NEXT(hWnd##D, 0); \ - EXPECT_ACTIVE(hWnd##X); - -/* the actual test begins here */ - -MSG_ENTRY Activate1_chain[]= - {{4,WM_NCACTIVATE}, - {4,WM_ACTIVATE}, - {4,WM_WINDOWPOSCHANGING,SENT,0,SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, - {2,WM_WINDOWPOSCHANGING,SENT,4,SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, - {1,WM_WINDOWPOSCHANGING,SENT,2,SWP_NOMOVE | SWP_NOSIZE}, - {1,WM_NCACTIVATE}, - {1,WM_ACTIVATE}, - {4,WM_KILLFOCUS}, - {1,WM_SETFOCUS}, - {0,0}}; - -MSG_ENTRY Activate2_chain[]= - {{1,WM_NCACTIVATE}, - {1,WM_ACTIVATE}, - {3,WM_WINDOWPOSCHANGING,SENT, 0, SWP_NOMOVE | SWP_NOSIZE}, - {3,WM_WINDOWPOSCHANGED ,SENT, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, - {3,WM_NCACTIVATE}, - {3,WM_ACTIVATE}, - {1,WM_KILLFOCUS}, - {3,WM_SETFOCUS}, - {0,0}}; - -MSG_ENTRY Activate3_chain[]= - {{3,WM_NCACTIVATE}, - {3,WM_ACTIVATE}, - {2,WM_WINDOWPOSCHANGING, SENT,0, SWP_NOMOVE | SWP_NOSIZE }, - {4,WM_WINDOWPOSCHANGING, SENT,2, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, - {1,WM_WINDOWPOSCHANGING, SENT,4, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, - {2,WM_WINDOWPOSCHANGED, SENT,0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOCLIENTMOVE |SWP_NOCLIENTSIZE }, - {4,WM_WINDOWPOSCHANGED, SENT,2, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE |SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, - {1,WM_WINDOWPOSCHANGED, SENT,4, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE |SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, +MSG_ENTRY activate2to1_chain[]={ {2,WM_NCACTIVATE}, {2,WM_ACTIVATE}, - {3,WM_KILLFOCUS}, - {2,WM_SETFOCUS}, - {0,0}}; - -MSG_ENTRY Activate4_chain[]= - {{2,WM_NCACTIVATE, }, - {2,WM_ACTIVATE}, - {2,WM_WINDOWPOSCHANGING, SENT ,0 ,SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, - {4,WM_WINDOWPOSCHANGING, SENT, 2, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE} , - {1,WM_WINDOWPOSCHANGING, SENT, 4, SWP_NOMOVE | SWP_NOSIZE}, + {1,WM_WINDOWPOSCHANGING, SENT,0, SWP_NOSIZE|SWP_NOMOVE}, + {1,WM_WINDOWPOSCHANGED, SENT,0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, {1,WM_NCACTIVATE}, {1,WM_ACTIVATE}, {2,WM_KILLFOCUS}, {1,WM_SETFOCUS}, {0,0}}; -MSG_ENTRY Activate5_chain[]= - {{1,WM_NCACTIVATE, }, +MSG_ENTRY activate1to2_chain[]={ + {1,WM_NCACTIVATE}, {1,WM_ACTIVATE}, - {4,WM_WINDOWPOSCHANGING, SENT, 0 ,SWP_NOMOVE | SWP_NOSIZE}, - {2,WM_WINDOWPOSCHANGING, SENT, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, - {1,WM_WINDOWPOSCHANGING, SENT, 2, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, - {4,WM_WINDOWPOSCHANGED, SENT, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, - {4,WM_NCACTIVATE}, - {4,WM_ACTIVATE}, + {2,WM_WINDOWPOSCHANGING, SENT,0, SWP_NOSIZE|SWP_NOMOVE}, + {2,WM_WINDOWPOSCHANGED, SENT,0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {2,WM_NCACTIVATE}, + {2,WM_ACTIVATE}, {1,WM_KILLFOCUS}, - {4,WM_SETFOCUS}, + {2,WM_SETFOCUS}, {0,0}}; -/* - some notes about this testcase: - from the expected series of messages it is obbvious that SetActiveWindow uses SetWindowPos. - So the big question is, that if this behaviour (of changing the z order of owner and owned windows) - is implemented in SetActiveWindow or SetWindowPos. - More tests reveal that calling SetWindowPos like this, has the same effect in the zorder: - SetWindowPos(hWndX, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW); - However if it is called like this it does NOT change the z-order of owner or owned windows: - SetWindowPos(hWndX, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); - So the conclusion is that SetActiveWindow calls Begin/Defer/EndDeferWindow pos - moving all affected windows in a batch move operation -*/ - -void Test_OwnerWindows() +void Test_msg_simple() { SetCursorPos(0,0); create_test_windows(); set_default_zorder(); - /* before we start testing SetActiveWindow we have to be sure they are on the ocrrect order*/ - EXPECT_CHAIN(4,2,1,3,4); - - /* move the windows on top in the following order 1 2 3 1 4 */ SetActiveWindow(hWnd1); FlushMessages(); - EXPECT_CHAIN(4,2,1,3,1); - COMPARE_CACHE(Activate1_chain); - - SetActiveWindow(hWnd3); - FlushMessages(); - EXPECT_CHAIN(3,4,2,1,3); - COMPARE_CACHE(Activate2_chain); + COMPARE_CACHE(activate2to1_chain); SetActiveWindow(hWnd2); FlushMessages(); - EXPECT_CHAIN(2,4,1,3,2); - COMPARE_CACHE(Activate3_chain); - - SetActiveWindow(hWnd1); - FlushMessages(); - EXPECT_CHAIN(2,4,1,3,1); - COMPARE_CACHE(Activate4_chain); - - SetActiveWindow(hWnd4); - FlushMessages(); - EXPECT_CHAIN(4,2,1,3,4); - /* in this test xp and 7 give different results :/ */ - /*COMPARE_CACHE(Activate5_chain);*/ - - /* move the windows on top with the same order but now using SetWindowPos */ - /* note: the zorder of windows change in the same way they change with SetActiveWindow */ - set_default_zorder(); - - SetWindowPos(hWnd1, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW); - FlushMessages(); - empty_message_cache(); - EXPECT_CHAIN(4,2,1,3,1); - - SetWindowPos(hWnd3, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW); - FlushMessages(); - empty_message_cache(); - EXPECT_CHAIN(3,4,2,1,3); - - SetWindowPos(hWnd2, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW); - FlushMessages(); - empty_message_cache(); - EXPECT_CHAIN(2,4,1,3,2); - - SetWindowPos(hWnd1, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW); - FlushMessages(); - empty_message_cache(); - EXPECT_CHAIN(2,4,1,3,1); - - SetWindowPos(hWnd4, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW); - FlushMessages(); - empty_message_cache(); - EXPECT_CHAIN(4,2,1,3,4); - - /* now do the same thing one more time with SWP_NOACTIVATE */ - set_default_zorder(); - - SetWindowPos(hWnd1, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); - FlushMessages(); - empty_message_cache(); - EXPECT_CHAIN(1,4,2,3,4); - - SetWindowPos(hWnd3, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); - FlushMessages(); - empty_message_cache(); - EXPECT_CHAIN(3,1,4,2,4); - - SetWindowPos(hWnd2, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); - FlushMessages(); - empty_message_cache(); - EXPECT_CHAIN(2,3,1,4,4); - - SetWindowPos(hWnd1, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); - FlushMessages(); - empty_message_cache(); - EXPECT_CHAIN(1,2,3,4,4); - - SetWindowPos(hWnd4, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); - FlushMessages(); - EXPECT_CHAIN(4,1,2,3,4); + COMPARE_CACHE(activate1to2_chain); destroy_test_window(); } START_TEST(SetActiveWindow) { - Test_OwnerWindows(); + Test_msg_simple(); }

12 years, 11 months

[gadamopoulos] 54022: [user32_apitest] - Add some more tests for SetWindowPos with or without SWP_NOOWNERZORDER. This clears the misunderstanding on changing owner window z-order once and for all

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Oct 6 12:46:21 2011 New Revision: 54022 URL: http://svn.reactos.org/svn/reactos?rev=54022&view=rev Log: [user32_apitest] - Add some more tests for SetWindowPos with or without SWP_NOOWNERZORDER. This clears the misunderstanding on changing owner window z-order once and for all Modified: trunk/rostests/apitests/user32/DeferWindowPos.c Modified: trunk/rostests/apitests/user32/DeferWindowPos.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DeferWind… ============================================================================== --- trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] Thu Oct 6 12:46:21 2011 @@ -11,13 +11,15 @@ #include "helper.h" #include <undocuser.h> -HWND hWnd1, hWnd2; +HWND hWnd1, hWnd2, hWnd3, hWnd4; /* FIXME: test for HWND_TOP, etc...*/ static int get_iwnd(HWND hWnd) { if(hWnd == hWnd1) return 1; else if(hWnd == hWnd2) return 2; + else if(hWnd == hWnd3) return 3; + else if(hWnd == hWnd4) return 4; else return 0; } @@ -62,16 +64,57 @@ } } +/* unfortunately sometimes MSCTF windows get between the expected chain of windows + so just checking the next window does not work*/ +static BOOL IsNext(HWND hWnd1, HWND hWnd2) +{ + HWND hWndNext; + + hWndNext=hWnd1; + while((hWndNext = GetWindow(hWndNext,GW_HWNDNEXT))) + { + if(hWndNext == hWnd2) + { + return TRUE; + } + } + return FALSE; +} + +#define EXPECT_NEXT(hWnd1, hWnd2) \ + ok(IsNext(hWnd1, hWnd2), \ + "After hwnd%d, expected hwnd%d not hwnd%d\n", \ + get_iwnd(hWnd1), get_iwnd(hWnd2),get_iwnd(GetWindow(hWnd1,GW_HWNDNEXT)) ) + +#define EXPECT_CHAIN(A,B,C,D) \ + EXPECT_NEXT(hWnd##A, hWnd##B); \ + EXPECT_NEXT(hWnd##B, hWnd##C); \ + EXPECT_NEXT(hWnd##C, hWnd##D); + #define ok_windowpos(hwnd, x, y, w, h, wnd) do { RECT rt; GetWindowRect(hwnd, &rt); \ ok(rt.left == (x) && rt.top == (y) && rt.right == (x)+(w) && rt.bottom == (y)+(h), \ "Unexpected %s position: (%ld, %ld) - (%ld, %ld)\n", wnd, rt.left, rt.top, rt.right, rt.bottom); } while (0) #define ok_lasterr(err, s) ok(GetLastError() == (err), "%s error = %lu\n", s, GetLastError()) +static void set_default_pos() +{ + SetWindowPos(hWnd1, 0, 10,20,200,210, SWP_NOOWNERZORDER|SWP_SHOWWINDOW|SWP_NOACTIVATE); + SetWindowPos(hWnd2, 0, 30,40,220,230, SWP_NOOWNERZORDER|SWP_SHOWWINDOW|SWP_NOACTIVATE); + SetWindowPos(hWnd3, 0, 20,350,300,300, SWP_NOOWNERZORDER|SWP_SHOWWINDOW|SWP_NOACTIVATE); + SetWindowPos(hWnd4, 0, 250,250,200,200, SWP_NOOWNERZORDER|SWP_SHOWWINDOW|SWP_NOACTIVATE); + SetActiveWindow(hWnd4); + FlushMessages(); + empty_message_cache(); +} + static void Test_DWP_Error(HWND hWnd, HWND hWnd2) { HDWP hDwp; BOOL ret; + + ok_windowpos(hWnd1, 10, 20, 200, 210, "Window 1"); + ok_windowpos(hWnd2, 30, 40, 220, 230, "Window 2"); /* close invalid handles */ SetLastError(DNS_ERROR_RCODE_NXRRSET); @@ -209,29 +252,29 @@ } MSG_ENTRY move1_chain[]={ - {1,WM_WINDOWPOSCHANGING, SENT, 0, SWP_NOACTIVATE}, + {1,WM_WINDOWPOSCHANGING, SENT, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER}, {1,WM_GETMINMAXINFO}, - {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOCLIENTSIZE}, + {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_NOSIZE | SWP_NOACTIVATE|SWP_NOOWNERZORDER | SWP_NOCLIENTSIZE}, {1,WM_MOVE}, {0,0}}; MSG_ENTRY resize1_chain[]={ - {1,WM_WINDOWPOSCHANGING, SENT, 0, SWP_NOACTIVATE}, + {1,WM_WINDOWPOSCHANGING, SENT, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER}, {1,WM_GETMINMAXINFO}, {1,WM_NCCALCSIZE}, - {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCLIENTMOVE}, + {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE|SWP_NOOWNERZORDER | SWP_NOCLIENTMOVE}, {1,WM_SIZE}, {1,WM_NCCALCSIZE}, {0,0}}; MSG_ENTRY move1_2_chain[]={ - {1,WM_WINDOWPOSCHANGING, SENT, 0, SWP_NOACTIVATE}, + {1,WM_WINDOWPOSCHANGING, SENT, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER}, {1,WM_GETMINMAXINFO}, - {2,WM_WINDOWPOSCHANGING, SENT, 0, SWP_NOACTIVATE}, + {2,WM_WINDOWPOSCHANGING, SENT, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER}, {2,WM_GETMINMAXINFO}, - {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCLIENTSIZE}, + {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE|SWP_NOOWNERZORDER | SWP_NOCLIENTSIZE}, {1,WM_MOVE}, - {2,WM_WINDOWPOSCHANGED, SENT, 0, SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOCLIENTSIZE}, + {2,WM_WINDOWPOSCHANGED, SENT, 0, SWP_NOSIZE | SWP_NOACTIVATE|SWP_NOOWNERZORDER | SWP_NOCLIENTSIZE}, {2,WM_MOVE}, {0,0}}; @@ -239,13 +282,18 @@ { HDWP hdwp; BOOL ret; + + SetWindowPos(hWnd1, 0, 10,20,100,100,0); + SetWindowPos(hWnd2, 0, 10,20,100,100,0); + FlushMessages(); + empty_message_cache(); /* move hWnd1 */ hdwp = BeginDeferWindowPos(1); ok(hdwp != NULL, "BeginDeferWindowPos failed\n"); FlushMessages(); COMPARE_CACHE(empty_chain); - hdwp = DeferWindowPos(hdwp, hWnd1, HWND_TOP, 20, 30, 100, 100, SWP_NOACTIVATE); + hdwp = DeferWindowPos(hdwp, hWnd1, HWND_TOP, 20, 30, 100, 100, SWP_NOACTIVATE|SWP_NOOWNERZORDER); ok(hdwp != NULL, "DeferWindowPos failed\n"); FlushMessages(); COMPARE_CACHE(empty_chain); @@ -259,7 +307,7 @@ ok(hdwp != NULL, "BeginDeferWindowPos failed\n"); FlushMessages(); COMPARE_CACHE(empty_chain); - hdwp = DeferWindowPos(hdwp, hWnd1, HWND_TOP, 20, 30, 110, 110, SWP_NOACTIVATE); + hdwp = DeferWindowPos(hdwp, hWnd1, HWND_TOP, 20, 30, 110, 110, SWP_NOACTIVATE|SWP_NOOWNERZORDER); ok(hdwp != NULL, "DeferWindowPos failed\n"); FlushMessages(); COMPARE_CACHE(empty_chain); @@ -274,11 +322,11 @@ ok(hdwp != NULL, "BeginDeferWindowPos failed\n"); FlushMessages(); COMPARE_CACHE(empty_chain); - hdwp = DeferWindowPos(hdwp, hWnd1, HWND_TOP, 30, 40, 110, 110, SWP_NOACTIVATE); + hdwp = DeferWindowPos(hdwp, hWnd1, HWND_TOP, 30, 40, 110, 110, SWP_NOACTIVATE|SWP_NOOWNERZORDER); ok(hdwp != NULL, "DeferWindowPos failed\n"); FlushMessages(); COMPARE_CACHE(empty_chain); - hdwp = DeferWindowPos(hdwp, hWnd2, HWND_TOP, 30, 40, 100, 100, SWP_NOACTIVATE); + hdwp = DeferWindowPos(hdwp, hWnd2, HWND_TOP, 30, 40, 100, 100, SWP_NOACTIVATE|SWP_NOOWNERZORDER); ok(hdwp != NULL, "DeferWindowPos failed\n"); FlushMessages(); COMPARE_CACHE(empty_chain); @@ -286,6 +334,136 @@ ok(ret != 0, "EndDeferWindowPos failed\n"); FlushMessages(); COMPARE_CACHE(move1_2_chain); +} + +#define OwnerZOrderAParams SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOSIZE + +MSG_ENTRY OwnerZOrder1A_chain[]={ + {4,WM_WINDOWPOSCHANGING, SENT,0, OwnerZOrderAParams}, + {3,WM_WINDOWPOSCHANGING, SENT,4, OwnerZOrderAParams}, + {1,WM_WINDOWPOSCHANGING, SENT,3, OwnerZOrderAParams}, + {0,0}}; + +MSG_ENTRY OwnerZOrder2A_chain[]={ + {2,WM_WINDOWPOSCHANGING, SENT, 0, OwnerZOrderAParams}, + {2,WM_WINDOWPOSCHANGED , SENT, 0, OwnerZOrderAParams | SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {0,0}}; + +MSG_ENTRY OwnerZOrder3A_chain[]={ + {3,WM_WINDOWPOSCHANGING, SENT, 0, OwnerZOrderAParams}, + {4,WM_WINDOWPOSCHANGING, SENT, 0, OwnerZOrderAParams}, + {1,WM_WINDOWPOSCHANGING, SENT, 4, OwnerZOrderAParams}, + {3,WM_WINDOWPOSCHANGED, SENT, 0, OwnerZOrderAParams |SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {4,WM_WINDOWPOSCHANGED, SENT, 0, OwnerZOrderAParams |SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {1,WM_WINDOWPOSCHANGED, SENT, 4, OwnerZOrderAParams |SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {0,0}}; + +MSG_ENTRY OwnerZOrder4A_chain[]={ + {3,WM_WINDOWPOSCHANGING, SENT, 0 ,OwnerZOrderAParams}, + {4,WM_WINDOWPOSCHANGING, SENT, 0, OwnerZOrderAParams} , + {1,WM_WINDOWPOSCHANGING, SENT, 4, OwnerZOrderAParams}, + {0,0}}; + +MSG_ENTRY OwnerZOrder5A_chain[]={ + {4,WM_WINDOWPOSCHANGING, SENT, 0, OwnerZOrderAParams}, + {3,WM_WINDOWPOSCHANGING, SENT, 4, OwnerZOrderAParams}, + {1,WM_WINDOWPOSCHANGING, SENT, 3, OwnerZOrderAParams}, + {4,WM_WINDOWPOSCHANGED, SENT, 0, OwnerZOrderAParams|SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {0,0}}; + +#define OwnerZOrderBParams SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOOWNERZORDER + +MSG_ENTRY OwnerZOrder1B_chain[]={ + {1,WM_WINDOWPOSCHANGING, SENT, 0, OwnerZOrderBParams}, + {1,WM_WINDOWPOSCHANGED, SENT, 0, OwnerZOrderBParams | SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {0,0}}; + +MSG_ENTRY OwnerZOrder2B_chain[]={ + {2,WM_WINDOWPOSCHANGING, SENT, 0, OwnerZOrderBParams}, + {2,WM_WINDOWPOSCHANGED, SENT, 0, OwnerZOrderBParams | SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {0,0}}; + +MSG_ENTRY OwnerZOrder3B_chain[]={ + {3,WM_WINDOWPOSCHANGING, SENT, 0, OwnerZOrderBParams}, + {3,WM_WINDOWPOSCHANGED, SENT, 0, OwnerZOrderBParams | SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {0,0}}; + +MSG_ENTRY OwnerZOrder4B_chain[]={ + {1,WM_WINDOWPOSCHANGING, SENT, 0, OwnerZOrderBParams}, + {1,WM_WINDOWPOSCHANGED, SENT, 0, OwnerZOrderBParams | SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {0,0}}; + +MSG_ENTRY OwnerZOrder5B_chain[]={ + {4,WM_WINDOWPOSCHANGING, SENT, 0, OwnerZOrderBParams}, + {4,WM_WINDOWPOSCHANGED, SENT, 0, OwnerZOrderBParams | SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {0,0}}; + +static void Test_DWP_OwnerZOrder() +{ + EXPECT_CHAIN(4,3,1,2); + + /* test how SetWindowPos can change the z order of owner windows */ + /* note that SWP_NOACTIVATE must be used because otherwise + SetWindowPos will call SetWindowPos again with different parameters */ + SetWindowPos(hWnd1, 0, 0,0,0,0, OwnerZOrderAParams); + FlushMessages(); + COMPARE_CACHE(OwnerZOrder1A_chain); + EXPECT_CHAIN(4,3,1,2); + + SetWindowPos(hWnd2, 0, 0,0,0,0, OwnerZOrderAParams); + FlushMessages(); + COMPARE_CACHE(OwnerZOrder2A_chain); + EXPECT_CHAIN(2,4,3,1); + + SetWindowPos(hWnd3, 0, 0,0,0,0, OwnerZOrderAParams); + FlushMessages(); + COMPARE_CACHE(OwnerZOrder3A_chain); + EXPECT_CHAIN(3,4,1,2); + + SetWindowPos(hWnd1, 0, 0,0,0,0, OwnerZOrderAParams); + FlushMessages(); + COMPARE_CACHE(OwnerZOrder4A_chain); + EXPECT_CHAIN(3,4,1,2); + + SetWindowPos(hWnd4, 0, 0,0,0,0, OwnerZOrderAParams); + FlushMessages(); + COMPARE_CACHE(OwnerZOrder5A_chain); + EXPECT_CHAIN(4,3,1,2); + + /* now do the same thing one more time with SWP_NOOWNERZORDER */ + /* SWP_NOACTIVATE is needed because without it SetActiveWindow + will be calledit and it will call SetWindowPos again + WITHOUT SWP_NOOWNERZORDER. that means that + in order for SWP_NOOWNERZORDER to have effect we have to use + SWP_NOACTIVATE as well */ + set_default_pos(); + EXPECT_CHAIN(4,3,2,1); + + SetWindowPos(hWnd1, 0, 0,0,0,0, OwnerZOrderBParams); + FlushMessages(); + COMPARE_CACHE(OwnerZOrder1B_chain); + EXPECT_CHAIN(1,4,3,2); + + SetWindowPos(hWnd2, 0, 0,0,0,0, OwnerZOrderBParams); + FlushMessages(); + COMPARE_CACHE(OwnerZOrder2B_chain); + EXPECT_CHAIN(2,1,4,3); + + SetWindowPos(hWnd3, 0, 0,0,0,0, OwnerZOrderBParams); + FlushMessages(); + COMPARE_CACHE(OwnerZOrder3B_chain); + EXPECT_CHAIN(3,2,1,4); + + SetWindowPos(hWnd1, 0, 0,0,0,0, OwnerZOrderBParams); + FlushMessages(); + COMPARE_CACHE(OwnerZOrder4B_chain); + EXPECT_CHAIN(1,3,2,4); + + SetWindowPos(hWnd4, 0, 0,0,0,0, OwnerZOrderBParams); + FlushMessages(); + COMPARE_CACHE(OwnerZOrder5B_chain); + EXPECT_CHAIN(4,1,3,2); + } START_TEST(DeferWindowPos) @@ -295,24 +473,27 @@ 200, 210, NULL, NULL, 0, NULL); hWnd2 = CreateWindowExW(0, L"ownertest", L"def", 0, 30, 40, 220, 230, NULL, NULL, 0, NULL); + hWnd3 = CreateWindowW(L"ownertest", L"ownertest", WS_OVERLAPPEDWINDOW, + 20, 350, 300, 300, hWnd1, NULL, 0, NULL); + hWnd4 = CreateWindowW(L"ownertest", L"ownertest", WS_OVERLAPPEDWINDOW, + 250, 250, 200, 200, hWnd1, NULL, 0, NULL); + ok(hWnd1 != NULL, "CreateWindow failed\n"); ok(hWnd2 != NULL, "CreateWindow failed\n"); - ShowWindow(hWnd1, SW_SHOW); - ShowWindow(hWnd2, SW_SHOW); - ok_windowpos(hWnd1, 10, 20, 200, 210, "Window 1"); - ok_windowpos(hWnd2, 30, 40, 220, 230, "Window 2"); - FlushMessages(); - empty_message_cache(); - + ok(hWnd3 != NULL, "CreateWindow failed\n"); + ok(hWnd4 != NULL, "CreateWindow failed\n"); + + set_default_pos(); Test_DWP_Error(hWnd1, hWnd2); - SetWindowPos(hWnd1, 0, 10,20,100,100,0); - SetWindowPos(hWnd2, 0, 10,20,100,100,0); - FlushMessages(); - empty_message_cache(); - + set_default_pos(); Test_DWP_SimpleMsg(hWnd1, hWnd2); + set_default_pos(); + Test_DWP_OwnerZOrder(); + + DestroyWindow(hWnd4); + DestroyWindow(hWnd3); DestroyWindow(hWnd2); DestroyWindow(hWnd1); }

12 years, 11 months

[akhaldi] 54021: [SPEC2DEF] * Support thiscall and float specifiers. By Samuel Serapion. See issue #6539 for more details.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Oct 6 11:10:54 2011 New Revision: 54021 URL: http://svn.reactos.org/svn/reactos?rev=54021&view=rev Log: [SPEC2DEF] * Support thiscall and float specifiers. By Samuel Serapion. See issue #6539 for more details. Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Thu Oct 6 11:10:54 2011 @@ -54,6 +54,7 @@ CC_STDCALL, CC_CDECL, CC_FASTCALL, + CC_THISCALL, CC_EXTERN, CC_STUB, }; @@ -65,7 +66,8 @@ ARG_STR, ARG_WSTR, ARG_DBL, - ARG_INT64 + ARG_INT64, + ARG_FLOAT }; char* astrCallingConventions[] = @@ -73,6 +75,7 @@ "STDCALL", "CDECL", "FASTCALL", + "THISCALL", "EXTERN" }; @@ -189,6 +192,7 @@ case ARG_STR: fprintf(file, "char*"); break; case ARG_WSTR: fprintf(file, "wchar_t*"); break; case ARG_DBL: case ARG_INT64 : fprintf(file, "__int64"); break; + case ARG_FLOAT: fprintf(file, "float"); break; } fprintf(file, " a%d", i); } @@ -206,6 +210,7 @@ case ARG_WSTR: fprintf(file, "'%%ws'"); break; case ARG_DBL: fprintf(file, "%%f"); break; case ARG_INT64: fprintf(file, "%%\"PRix64\""); break; + case ARG_FLOAT: fprintf(file, "%%f"); break; } } fprintf(file, ")\\n\""); @@ -221,6 +226,7 @@ case ARG_WSTR: fprintf(file, "(wchar_t*)a%d", i); break; case ARG_DBL: fprintf(file, "(double)a%d", i); break; case ARG_INT64: fprintf(file, "(__int64)a%d", i); break; + case ARG_FLOAT: fprintf(file, "(float)a%d", i); break; } } fprintf(file, ");\n"); @@ -451,6 +457,10 @@ else if (CompareToken(pc, "fastcall")) { exp.nCallingConvention = CC_FASTCALL; + } + else if (CompareToken(pc, "thiscall")) + { + exp.nCallingConvention = CC_THISCALL; } else if (CompareToken(pc, "extern")) { @@ -590,6 +600,11 @@ exp.nStackBytes += 8; exp.anArgs[exp.nArgCount] = ARG_INT64; } + else if (CompareToken(pc, "float")) + { + exp.nStackBytes += 4; + exp.anArgs[exp.nArgCount] = ARG_FLOAT; + } else fprintf(stderr, "error: line %d, expected type, got: %.10s\n", nLine, pc);

12 years, 11 months

← Newer
1
...
23
24
25
26
27
28
29
...
37
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 October 2011