- Wine-Devel - list.winehq.org

[PATCH v5 1/2] user32/tests:Add test function Used to verify the child window Z order problem.
by Jiajin Cui June 22, 2020

June 22, 2020

I found that the z-order of window on WIN system will not change when HWND_TOPMOST and HWND_NOTOPMOST attributes are set for the same level window with WS_CHILD style, but it will change in wine, resulting in the problem of overlapping window, so I wrote a test function to explain this problem. v2： Add git log information v3: Move the path to fixup_flags function, only used to fix SetWindowPos function problem. v4: Divide a path into two pathes, better explain the prolem. and add notopmost verification v5: Add todo_wine to test patch[PATCH v5 1/2], and optimize fixup_flags[PATCH v5 2/2]. Signed-off-by: cuijiajin <cuijiajin(a)uniontech.com>

2 1

[PATCH v5 2/2] user32:Fix z order error when WS_CHILD window want to be topmost windows.
by cuijiajin June 22, 2020

June 22, 2020

window with WS_CHILD does not need to change Z order when SetWindowPos param hwndInsertAfter is HWND_TOPMOST or HWND_NOTOPMOST. Solve the problems mentioned in the previous patch, and Remove todo_wine on test_child_topmost_zorder. v2： Add git log information v3: Move the path to fixup_flags function, only used to fix SetWindowPos function problem. v4: Divide a path into two pathes, better explain the prolem. and add notopmost verification v5: Add todo_wine to test patch[patch v5 1/2], and optimize fixup_flags[patch v5 2/2]. Signed-off-by: cuijiajin <cuijiajin(a)uniontech.com>

2 1

[PATCH] user32: Fix store the surface rectangle in the server
by longchao June 22, 2020

June 22, 2020

2 1

[PATCH v5 1/2] user32/tests:Add test function Used to verify the child window Z order problem.
by cuijiajin June 22, 2020

June 22, 2020

I found that the z-order of window on WIN system will not change when HWND_TOPMOST and HWND_NOTOPMOST attributes are set for the same level window with WS_CHILD style, but it will change in wine, resulting in the problem of overlapping window, so I wrote a test function to explain this problem. v2： Add git log information v3: Move the path to fixup_flags function, only used to fix SetWindowPos function problem. v4: Divide a path into two pathes, better explain the prolem. v5: Add todo_wine to test patch[patch v5 1/2], and optimize fixup_flags[patch v5 2/2]. Signed-off-by: cuijiajin <cuijiajin(a)uniontech.com>

2 1

[PATCH] ieframe/tests: Add some tests for Shell Embedding resizing.
by Dmitry Timoshkov June 22, 2020

June 22, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/tests/webbrowser.c | 84 ++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 95d5fc4988..9d8a4fc63d 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -1832,7 +1832,9 @@ static HWND create_container_window(void) static void test_DoVerb(IWebBrowser2 *unk) { IOleObject *oleobj; - RECT rect = {0,0,1000,1000}; + IOleWindow *olewin; + HWND hwnd; + RECT rect; HRESULT hres; hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); @@ -1840,6 +1842,12 @@ static void test_DoVerb(IWebBrowser2 *unk) if(FAILED(hres)) return; + hres = IOleObject_QueryInterface(oleobj, &IID_IOleWindow, (void**)&olewin); + ok(hres == S_OK, "Could not get IOleInPlaceSite: %08x\n", hres); + + hres = IOleWindow_GetWindow(olewin, &hwnd); + ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + SET_EXPECT(CanInPlaceActivate); SET_EXPECT(Site_GetWindow); SET_EXPECT(OnInPlaceActivate); @@ -1853,10 +1861,16 @@ static void test_DoVerb(IWebBrowser2 *unk) SET_EXPECT(SetMenu); SET_EXPECT(OnFocus_TRUE); + SetRect(&rect, 0, 0, 500, 500); hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, 0, (HWND)0xdeadbeef, &rect); ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + SetRectEmpty(&rect); + GetWindowRect(hwnd, &rect); + ok(rect.right - rect.left == 1000 && rect.bottom - rect.top == 900, "window size = {%d %d}\n", + rect.right - rect.left, rect.bottom - rect.top); + CHECK_CALLED(CanInPlaceActivate); CHECK_CALLED(Site_GetWindow); CHECK_CALLED(OnInPlaceActivate); @@ -1870,10 +1884,27 @@ static void test_DoVerb(IWebBrowser2 *unk) CHECK_CALLED(SetMenu); CHECK_CALLED(OnFocus_TRUE); + SetRect(&rect, 0, 0, 600, 600); hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, 0, (HWND)0xdeadbeef, &rect); ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + SetRectEmpty(&rect); + GetWindowRect(hwnd, &rect); + ok(rect.right - rect.left == 1000 && rect.bottom - rect.top == 900, "window size = {%d %d}\n", + rect.right - rect.left, rect.bottom - rect.top); + + SetRect(&rect, 0, 0, 700, 700); + hres = IOleObject_DoVerb(oleobj, OLEIVERB_UIACTIVATE, NULL, &ClientSite, + 0, (HWND)0xdeadbeef, &rect); + ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + + SetRectEmpty(&rect); + GetWindowRect(hwnd, &rect); + ok(rect.right - rect.left == 1000 && rect.bottom - rect.top == 900, "window size = {%d %d}\n", + rect.right - rect.left, rect.bottom - rect.top); + + IOleWindow_Release(olewin); IOleObject_Release(oleobj); } @@ -2649,14 +2680,18 @@ static void test_GetControlInfo(IWebBrowser2 *unk) IOleControl_Release(control); } -static void test_Extent(IWebBrowser2 *unk) +static void test_Extent(IWebBrowser2 *unk, BOOL activated) { IOleObject *oleobj; + IOleWindow *olewin; SIZE size, expected; + RECT rc; HRESULT hres; DWORD dpi_x; DWORD dpi_y; HDC hdc; + HWND hwnd; + char buf[256]; /* default aspect ratio is 96dpi / 96dpi */ hdc = GetDC(0); @@ -2671,15 +2706,41 @@ static void test_Extent(IWebBrowser2 *unk) if(FAILED(hres)) return; + hres = IOleObject_QueryInterface(oleobj, &IID_IOleWindow, (void**)&olewin); + ok(hres == S_OK, "Could not get IOleInPlaceSite: %08x\n", hres); + + hres = IOleWindow_GetWindow(olewin, &hwnd); + ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + + buf[0] = 0; + GetClassNameA(hwnd, buf, sizeof(buf)); + ok(!strcmp(buf, "Shell Embedding"), "got %s\n", buf); + size.cx = size.cy = 0xdeadbeef; hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &size); ok(hres == S_OK, "GetExtent failed: %08x\n", hres); - /* Default size is 50x20 pixels, in himetric units */ - expected.cx = MulDiv( 50, 2540, dpi_x ); - expected.cy = MulDiv( 20, 2540, dpi_y ); + if(activated) { + /* FIXME: what is 300x150 coming from? */ + expected.cx = MulDiv( 300, 2540, dpi_x ); + expected.cy = MulDiv( 150, 2540, dpi_y ); + }else { + /* Default size is 50x20 pixels, in himetric units */ + expected.cx = MulDiv( 50, 2540, dpi_x ); + expected.cy = MulDiv( 20, 2540, dpi_y ); + } +todo_wine_if(activated) ok(size.cx == expected.cx && size.cy == expected.cy, "size = {%d %d} (expected %d %d)\n", size.cx, size.cy, expected.cx, expected.cy ); + SetRectEmpty(&rc); + GetWindowRect(hwnd, &rc); + if(activated) + /* window size should match what was set by last ::SetExtent() before activation */ + ok(rc.right - rc.left == 1000 && rc.bottom - rc.top == 900, "window size = {%d %d}\n", + rc.right - rc.left, rc.bottom - rc.top); + else + ok(IsRectEmpty(&rc), "window size = {%d %d}\n", rc.right - rc.left, rc.bottom - rc.top); + size.cx = 800; size.cy = 700; hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &size); @@ -2695,6 +2756,15 @@ static void test_Extent(IWebBrowser2 *unk) ok(hres == S_OK, "GetExtent failed: %08x\n", hres); ok(size.cx == 800 && size.cy == 700, "size = {%d %d}\n", size.cx, size.cy); + SetRectEmpty(&rc); + GetWindowRect(hwnd, &rc); + if(activated) + /* window size should match what was set by last ::SetExtent() before activation */ + ok(rc.right - rc.left == 1000 && rc.bottom - rc.top == 900, "window size = {%d %d}\n", + rc.right - rc.left, rc.bottom - rc.top); + else + ok(IsRectEmpty(&rc), "window size = {%d %d}\n", rc.right - rc.left, rc.bottom - rc.top); + size.cx = 900; size.cy = 800; hres = IOleObject_SetExtent(oleobj, 0, &size); @@ -2725,6 +2795,7 @@ static void test_Extent(IWebBrowser2 *unk) ok(hres == S_OK, "GetExtent failed: %08x\n", hres); ok(size.cx == 1000 && size.cy == 900, "size = {%d %d}\n", size.cx, size.cy); + IOleWindow_Release(olewin); IOleObject_Release(oleobj); } @@ -3754,9 +3825,10 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_LocationURL(webbrowser, L""); test_ConnectionPoint(webbrowser, TRUE); test_ClientSite(webbrowser, &ClientSite, !do_download); - test_Extent(webbrowser); + test_Extent(webbrowser, FALSE); test_wb_funcs(webbrowser, TRUE); test_DoVerb(webbrowser); + test_Extent(webbrowser, TRUE); test_olecmd(webbrowser, FALSE); test_Navigate2(webbrowser, L"about:blank"); test_QueryStatusWB(webbrowser, TRUE); -- 2.26.2

1 0

[PATH] user32: Fix store the surface rectangle in the server
by longchao＠uniontech.com June 22, 2020

June 22, 2020

-------------- longchao(a)uniontech.com

2 1

[PATCH 1/2] include: Correct definition of PRTL_AVL_ALLOCATE_ROUTINE
by Alex Henrie June 22, 2020

June 22, 2020

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/ddk/ntddk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index b9f8295db8..497d42da39 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -165,7 +165,7 @@ typedef enum _RTL_GENERIC_COMPARE_RESULTS { typedef RTL_GENERIC_COMPARE_RESULTS (WINAPI *PRTL_AVL_COMPARE_ROUTINE)(struct _RTL_AVL_TABLE *, void *, void *); -typedef void (WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG); +typedef void * (WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG); typedef void (WINAPI *PRTL_AVL_FREE_ROUTINE )(struct _RTL_AVL_TABLE *, void *buffer); -- 2.27.0

1 1

[PATH] user32: Fix store the surface rectangle in the server
by 龙超 June 22, 2020

June 22, 2020

2 1

[PATCH 1/6] kernel32/tests: Add tests for profile struct functions.
by Zebediah Figura June 22, 2020

June 22, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I actually had a local version of 30ad67dc14 written several months ago. I figure it's at least worth sending the tests I wrote for that. dlls/kernel32/tests/profile.c | 72 +++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 1339b2b20ce..ce82a746e71 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -1092,6 +1092,77 @@ static void test_WritePrivateProfileString(void) DeleteFileA(path); } +static void test_profile_struct(void) +{ + static const char expect_data[] = "[s]\r\nkey=616261637573006F\r\n"; + char buffer[20]; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, sizeof(buffer), "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_BAD_LENGTH, "got error %u\n", GetLastError()); + + ret = WritePrivateProfileStructA("s", "key", (void *)"abacus", sizeof("abacus"), "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + ok(check_file_data("./winetest.ini", expect_data), "file doesn't match\n"); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 6, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_BAD_LENGTH, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 8, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_BAD_LENGTH, "got error %u\n", GetLastError()); + + memset(buffer, 0xcc, sizeof(buffer)); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(buffer, "abacus"), "data didn't match\n"); + + memset(buffer, 0xcc, sizeof(buffer)); + ret = GetPrivateProfileStringA("s", "key", "default", buffer, sizeof(buffer), "./winetest.ini"); + ok(ret == 16, "got size %u\n", ret); + ok(!strcmp(buffer, "616261637573006F"), "got %s\n", debugstr_a(buffer)); + + ret = WritePrivateProfileStringA("s", "key", "636163747573006F", "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "got error %u\n", GetLastError()); + + ret = WritePrivateProfileStringA("s", "key", "6361637475730083", "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + + memset(buffer, 0xcc, sizeof(buffer)); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(buffer, "cactus"), "data didn't match\n"); + + ret = WritePrivateProfileStringA("s", "key", "636163747573008Q", "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "got error %u\n", GetLastError()); + + ret = WritePrivateProfileStringA("s", "key", "16361637475730083", "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_BAD_LENGTH, "got error %u\n", GetLastError()); + + ret = DeleteFileA("./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); +} + START_TEST(profile) { test_profile_int(); @@ -1119,4 +1190,5 @@ START_TEST(profile) "[section2]\r", "CR only"); test_WritePrivateProfileString(); + test_profile_struct(); } -- 2.27.0

2 10

[PATCH] winevulkan: Update to VK spec version 1.2.145.
by Liam Middlebrook June 21, 2020

June 21, 2020

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Andy Ritger <aritger(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index d027b9eaa7..a0bf6b0859 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.142" +VK_XML_VERSION = "1.2.145" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.26.2

1 0