September 2019 - Wine-devel

[PATCH 1/2] user32/tests: Test GetWindowInfo error conditions and incorrect cbSize.
by Brendan Shanks 20 Sep '19

20 Sep '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47783 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/user32/tests/win.c | 73 +++++++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c6fbd7c12a..be170f3cc1 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -24,6 +24,7 @@ #define _WIN32_WINNT 0x0501 #include <assert.h> +#include <limits.h> #include <stdlib.h> #include <stdarg.h> #include <stdio.h> @@ -996,6 +997,59 @@ if (0) "wrong wCreatorVersion %04x for %p in hook %s\n", info->wCreatorVersion, hwnd, hook); } +static void test_window_info(const char *hook, HWND hwnd) +{ + WINDOWINFO info, info2; + + if (0) /* crashes on Win10 */ + ok(!pGetWindowInfo(hwnd, NULL), "GetWindowInfo should fail\n"); + + SetLastError(0xdeadbeef); + ok(!pGetWindowInfo(0, NULL), "GetWindowInfo should fail\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, + "got error %d expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError()); + + SetLastError(0xdeadbeef); + ok(!pGetWindowInfo(0, &info), "GetWindowInfo should fail\n"); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, + "got error %d expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError()); + + info.cbSize = sizeof(WINDOWINFO); + ok(pGetWindowInfo(hwnd, &info), "GetWindowInfo should not fail\n"); + verify_window_info(hook, hwnd, &info); + + /* test different cbSize values. + * Windows ignores it (except for Win98, according to an old comment). + */ + memset(&info, 0xcc, sizeof(WINDOWINFO)); + memset(&info2, 0xcc, sizeof(WINDOWINFO)); + + info.cbSize = sizeof(WINDOWINFO); + info2.cbSize = sizeof(WINDOWINFO); + + ok(pGetWindowInfo(hwnd, &info), "GetWindowInfo should not fail\n"); + ok(pGetWindowInfo(hwnd, &info2), "GetWindowInfo should not fail\n"); + ok(memcmp(&info, &info2, sizeof(WINDOWINFO)) == 0, "identical GetWindowInfo calls produce different result\n"); + + memset(&info2, 0xcc, sizeof(WINDOWINFO)); + info2.cbSize = 0; + ok(pGetWindowInfo(hwnd, &info2), "GetWindowInfo should not fail\n"); + info2.cbSize = sizeof(WINDOWINFO); + ok(memcmp(&info, &info2, sizeof(WINDOWINFO)) == 0, "GetWindowInfo cbSize should be ignored\n"); + + memset(&info2, 0xcc, sizeof(WINDOWINFO)); + info2.cbSize = sizeof(WINDOWINFO)/2; + ok(pGetWindowInfo(hwnd, &info2), "GetWindowInfo should not fail\n"); + info2.cbSize = sizeof(WINDOWINFO); + ok(memcmp(&info, &info2, sizeof(WINDOWINFO)) == 0, "GetWindowInfo cbSize should be ignored\n"); + + memset(&info2, 0xcc, sizeof(WINDOWINFO)); + info2.cbSize = UINT_MAX; + ok(pGetWindowInfo(hwnd, &info2), "GetWindowInfo should not fail\n"); + info2.cbSize = sizeof(WINDOWINFO); + ok(memcmp(&info, &info2, sizeof(WINDOWINFO)) == 0, "GetWindowInfo cbSize should be ignored\n"); +} + static void FixedAdjustWindowRectEx(RECT* rc, LONG style, BOOL menu, LONG exstyle) { AdjustWindowRectEx(rc, style, menu, exstyle); @@ -1172,12 +1226,7 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) ok(createwnd->hwndInsertAfter == HWND_TOP, "hwndInsertAfter should be always HWND_TOP\n"); if (pGetWindowInfo) - { - WINDOWINFO info; - info.cbSize = sizeof(WINDOWINFO); - ok(pGetWindowInfo(hwnd, &info), "GetWindowInfo should not fail\n"); - verify_window_info(code_name, hwnd, &info); - } + test_window_info(code_name, hwnd); /* WS_VISIBLE should be turned off yet */ style = createwnd->lpcs->style & ~WS_VISIBLE; @@ -1238,17 +1287,7 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) case HCBT_MINMAX: case HCBT_ACTIVATE: if (pGetWindowInfo && IsWindow(hwnd)) - { - WINDOWINFO info; - - /* Win98 actually does check the info.cbSize and doesn't allow - * it to be anything except sizeof(WINDOWINFO), while Win95, Win2k, - * WinXP do not check it at all. - */ - info.cbSize = sizeof(WINDOWINFO); - ok(pGetWindowInfo(hwnd, &info), "GetWindowInfo should not fail\n"); - verify_window_info(code_name, hwnd, &info); - } + test_window_info(code_name, hwnd); break; /* window state is undefined */ case HCBT_SETFOCUS: -- 2.17.1

2 3

[RESEND] shell32: Prevent text truncation inside the old "browse folder" dialog
by Fabian Maurer 20 Sep '19

20 Sep '19

We use the same height for the title as in the the new "browse folder" dialog. This is needed for some third party programs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46404 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/shell32/shell32.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 46f0b6f12d..f19b09f8c2 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -274,7 +274,7 @@ FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", 1, 80, 176, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", 2, 134, 176, 50, 14, WS_GROUP | WS_TABSTOP - LTEXT "", IDD_TITLE, 5, 4, 180, 12 + LTEXT "", IDD_TITLE, 5, 4, 180, 24 LTEXT "", IDD_STATUS, 5, 25, 180, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | -- 2.23.0

1 0

[PATCH] kernel32: Report 'No System Battery' in GetSystemPowerStatus
by Derek Lesho 20 Sep '19

20 Sep '19

Nine Chapters naively checks for the low and critical battery flags, ignoring the possibility that the Battery status is unknown. Fixes Proton bug #3068 Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/kernel32/powermgnt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index 190dc016c3..cb5bb5237b 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -50,7 +50,8 @@ BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS ps) if (ps) { ps->ACLineStatus = 255; - ps->BatteryFlag = 255; + /* Nine Parchments doesn't handle an unknown battery status correctly. */ + ps->BatteryFlag = 128; ps->BatteryLifePercent = 255; ps->Reserved1 = 0; ps->BatteryLifeTime = ~0u; -- 2.23.0

2 1

[PATCH] testbot/CheckForWinetestUpdate: Fix the other and 64 bit WineTest jobs.
by Francois Gouget 20 Sep '19

20 Sep '19

The priority field was not getting set so that saving the job was failing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 7e58afc8b..c30da162a 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -211,7 +211,7 @@ sub AddJob($$$$) my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); - $NewJob->Priority($BaseJob eq "base" and $Build eq "exe32" ? 8 : 9); + $NewJob->Priority(($BaseJob eq "base" and $Build eq "exe32") ? 8 : 9); $NewJob->Remarks($Remarks); # Add a task for each VM -- 2.20.1

1 0

Path manipulation issue in Python - likely broken API in Wine
by Sebastian M. Ernst 20 Sep '19

20 Sep '19

Hi all, I am working with CPython on top of Wine 4.14. I know for certain that some path manipulation logic in Wine is broken but I am having trouble tracking down the root cause. I am launching Python like this: user(a)comp:/path/other> WINEDEBUG=-all PYTHONHOME="z:\\path\\.to\\target" wine /path/.to/target/python.exe Notice that the environment variable PYTHONHOME contains a folder with a leading dot (`.to`). Python should pick it up and expose it as the path to its executable - like this: user(a)comp:/path/other> WINEDEBUG=-all PYTHONHOME="z:\\path\\.to\\target" wine /path/.to/target/python.exe -c "import sys; print(sys.executable)" Z:\pathto\target\python.exe Notice that `\.` is missing from the path that is being printed. It gets even weirder if the folder name starts with two leading dots, i.e. `..to` - like this: user(a)comp:/path/other> WINEDEBUG=-all PYTHONHOME="z:\\path\\..to\\target" wine /path/..to/target/python.exe -c "import sys; print(sys.executable)" Z:\to\target\python.exe Now an even longer segment is missing: `path\..` I confirmed that the above steps work correctly on Windows 10, so it is very likely a bug in Wine. I collected all necessary steps required for reproducing this bug below this email. The startup code of CPython is somewhat convoluted, which is why I am having trouble identifying the Wine/Windows API in question. Any help is greatly appreciated. Best regards, Sebastian --- user(a)comp:/path/.to/target> wget https://www.python.org/ftp/python/3.7.4/python-3.7.4-embed-win32.zip 2> /dev/null user(a)comp:/path/.to/target> unzip python-3.7.4-embed-win32.zip > /dev/null; rm python-3.7.4-embed-win32.zip user(a)comp:/path/.to/target> rm python37._pth user(a)comp:/path/.to/target> mkdir Lib; mv python37.zip Lib/; cd Lib; unzip python37.zip > /dev/null; rm python37.zip; cd .. user(a)comp:/path/.to/target> cd /path/other/ user(a)comp:/path/other> WINEDEBUG=-all PYTHONHOME="z:\\path\\.to\\target" wine /path/.to/target/python.exe Python 3.7.4 (tags/v3.7.4:e09359112e, Jul 8 2019, 19:29:22) [MSC v.1916 32 bit (Intel)] on win32 Type "help", "copyright", "credits" or "license" for more information. Traceback (most recent call last): File "/etc/pythonstart", line 7, in <module> import readline ModuleNotFoundError: No module named 'readline' >>> exit() user(a)comp:/path/other> WINEDEBUG=-all PYTHONHOME="z:\\path\\.to\\target" wine /path/.to/target/python.exe -c "import sys; print(sys.executable)" Z:\pathto\target\python.exe

3 5

[PATCH] testbot: Put the 'Task: Updated' lines in the 'info' category.
by Francois Gouget 20 Sep '19

20 Sep '19

There is no need to put them front and center like build errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 3b1c35658..194648239 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -146,7 +146,7 @@ sub GetLogLineCategory($) $Line =~ /^\+ \S/ or $Line =~ /^LANG=/ or $Line =~ /^Running (?:the tests|WineTest) / or - $Line =~ /^Task: (?:ok|tests)/) + $Line =~ /^Task: (?:ok|tests|Updated)/) { return "info"; } -- 2.20.1

1 0

[PATCH] kernel32/tests: Enable debug break exception race tests on i386 Wine.
by Jacek Caban 20 Sep '19

20 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH] wined3d: Reset the CS state before unbinding the device state.
by Zebediah Figura 20 Sep '19

20 Sep '19

Otherwise the CS might later try to unbind a resource that has already been freed. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 92259e3ea5b..0d92177cd0c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1142,6 +1142,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_texture_decref(texture); } + wined3d_cs_emit_reset_state(device->cs); state_unbind_resources(&device->state); for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { -- 2.23.0

2 3

[PATCH 7/7] scrobj: Create script engine instances for script hosts.
by Jacek Caban 20 Sep '19

20 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 108 +++++++++++++++++++++++++++++++++++-- dlls/scrobj/tests/scrobj.c | 5 -- 2 files changed, 105 insertions(+), 8 deletions(-)

1 0

[PATCH 6/7] scrobj: Add IServiceProvider stub implementation.
by Jacek Caban 20 Sep '19

20 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)

1 0