March 2020 - Wine-devel - list.winehq.org

[PATCH] kernel32/tests: Fix a race condition in test_QueryInformationJobObject().
by Francois Gouget 22 Mar '20

22 Mar '20

The process must still be running for AssignProcessToJobObject() to succeed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e54c43ca942..1889939fff3 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2572,21 +2572,26 @@ static void test_QueryInformationJobObject(void) PJOBOBJECT_BASIC_PROCESS_ID_LIST pid_list = (JOBOBJECT_BASIC_PROCESS_ID_LIST *)buf; JOBOBJECT_EXTENDED_LIMIT_INFORMATION ext_limit_info; JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit_info = &ext_limit_info.BasicLimitInformation; - DWORD dwret, ret_len; + DWORD ret_len; PROCESS_INFORMATION pi[2]; - HANDLE job; + char buffer[50]; + HANDLE job, sem; BOOL ret; job = pCreateJobObjectW(NULL, NULL); ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); /* Only active processes are returned */ - create_process("exit", &pi[0]); + sprintf(buffer, "sync kernel32-process-%x", GetCurrentProcessId()); + sem = CreateSemaphoreA(NULL, 0, 1, buffer + 5); + ok(sem != NULL, "CreateSemaphoreA failed le=%u\n", GetLastError()); + create_process(buffer, &pi[0]); + ret = pAssignProcessToJobObject(job, pi[0].hProcess); ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); - dwret = WaitForSingleObject(pi[0].hProcess, 1000); - ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + ReleaseSemaphore(sem, 1, NULL); + wait_child_process(pi[0].hProcess); CloseHandle(pi[0].hProcess); CloseHandle(pi[0].hThread); -- 2.20.1

1 0

[PATCH] qasf/tests: Fix a couple of spelling errors in ok() messages.
by Francois Gouget 22 Mar '20

22 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/qasf/tests/dmowrapper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 50546ec2a88..05cec938680 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1835,7 +1835,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); - ok(testdmo_output_mt_set, "Ouput type should be set.\n"); + ok(testdmo_output_mt_set, "Output type should be set.\n"); ok(compare_media_types(&testdmo_output_mt, &req_mt), "Media types didn't match.\n"); test_filter_state(control); @@ -1878,7 +1878,7 @@ static void test_connect_pin(void) hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&testsink.sink.pin.mt, &mt2), "Media types didn't match.\n"); - ok(testdmo_output_mt_set, "Ouput type should be set.\n"); + ok(testdmo_output_mt_set, "Output type should be set.\n"); ok(compare_media_types(&testdmo_output_mt, &mt2), "Media types didn't match.\n"); IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); -- 2.20.1

1 0

[PATCH] iphlpapi/tests: Fix a spelling error in an ok() message.
by Francois Gouget 22 Mar '20

22 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/iphlpapi/tests/iphlpapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 77475ca4dfa..d5690c11eee 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2324,7 +2324,7 @@ static void test_NotifyUnicastIpAddressChange(void) ret = pCancelMibChangeNotify2(handle); ok(ret == NO_ERROR, "Unexpected ret %#x.\n", ret); - ok(!CloseHandle(handle), "CloseHandle() succeded.\n"); + ok(!CloseHandle(handle), "CloseHandle() succeeded.\n"); } START_TEST(iphlpapi) -- 2.20.1

1 0

[PATCH 4/4] shell32: pass the executable's full path from SHELL_execute() to CreateProcess()
by Damjan Jovanovic 22 Mar '20

22 Mar '20

Several older Microsoft installers, particularly those changing CDs during installation, break because they launch a child setup.exe, from a parent process also called setup.exe, which Wine finds in the wrong directory, as CreateProcess() first searches the parent executable's own directory, thus re-launching the parent itself instead of the child. Therefore CreateProcess() must be passed a full path from SHELL_execute(), so it launches the correct child. It's about time this 13 year old bug was closed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8439 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/shell32/shlexec.c | 8 ++++++++ dlls/shell32/tests/shlexec.c | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-)

2 1

[PATCH 2/4] shell32/tests: test shlexec argv[0], and same-named executables in a different directory
by Damjan Jovanovic 22 Mar '20

22 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8439 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/shell32/tests/shlexec.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)

2 1

[PATCH 1/4] shell32/tests: tmpdir shouldn't end with a backslash
by Damjan Jovanovic 22 Mar '20

22 Mar '20

GetTempPathA() returns backslash-terminated paths, but all the test code appends its own additional backslash, making a double backslash that breaks path comparisons in my later patches. Fix this. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/shell32/tests/shlexec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

2 1

[PATCH 3/4] shell32: simplify SHELL_execute()
by Damjan Jovanovic 22 Mar '20

22 Mar '20

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/shell32/shlexec.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-)

1 0

[PATCH] include: add missing defines to xinput.h
by Vijay Kiran Kamuju 22 Mar '20

22 Mar '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] wine.inf: Add Winlogon keys
by Alex Henrie 22 Mar '20

22 Mar '20

The Winlogon key in HKLM was incorrectly under "Windows" instead of "Windows NT" whereas the one in HKCU was missing altogether. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48611 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- loader/wine.inf.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 6e0cb21253..ad79c084dd 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -524,6 +524,7 @@ HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57d [CurrentVersion] HKCU,%CurrentVersion%\Run,,16 +HKCU,%CurrentVersionNT%\Winlogon,,16 HKLM,%CurrentVersion%,"CommonFilesDir",,"%16427%" HKLM,%CurrentVersion%,"FirstInstallDateTime",1,21,81,7c,23 HKLM,%CurrentVersion%,"ProductId",,"12345-oem-0000001-54321" @@ -549,7 +550,6 @@ HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" HKLM,%CurrentVersion%\Setup\WindowsFeatures\WindowsMediaVersion,,,"12.0.7601.18840" HKLM,%CurrentVersion%\Shell Extensions\Approved,,16 HKLM,%CurrentVersion%\Uninstall,,16 -HKLM,%CurrentVersion%\Winlogon,,16 HKLM,%CurrentVersionNT%,"InstallDate",0x10003,1273299354 HKLM,%CurrentVersionNT%,"ProductId",,"12345-oem-0000001-54321" HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" @@ -572,6 +572,7 @@ HKLM,%CurrentVersionNT%\Perflib,,16 HKLM,%CurrentVersionNT%\Ports,,16 HKLM,%CurrentVersionNT%\Print,,16 HKLM,%CurrentVersionNT%\ProfileList,,16 +HKLM,%CurrentVersionNT%\Winlogon,"Shell",,"explorer.exe" [CurrentVersionWow64] HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16426%" -- 2.25.2

1 0

[PATCH] include: Fix the definition of USBD_STATUS_CANCELED.
by Zebediah Figura 22 Mar '20

22 Mar '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/ddk/usb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ddk/usb.h b/include/ddk/usb.h index 0cda6a4e43..0e4c83055b 100644 --- a/include/ddk/usb.h +++ b/include/ddk/usb.h @@ -87,7 +87,6 @@ typedef PVOID USBD_INTERFACE_HANDLE; #define USBD_STATUS_ERROR ((USBD_STATUS)0x80000000) #define USBD_STATUS_HALTED ((USBD_STATUS)0xC0000000) -#define USBD_STATUS_CANCELED ((USBD_STATUS)0x00010000) #define USBD_STATUS_CANCELING ((USBD_STATUS)0x00020000) #define USBD_STATUS_CRC ((USBD_STATUS)0xC0000001) #define USBD_STATUS_BTSTUFF ((USBD_STATUS)0xC0000002) @@ -131,6 +130,7 @@ typedef PVOID USBD_INTERFACE_HANDLE; #define USBD_STATUS_TIMEOUT ((USBD_STATUS)0xC0006000) #define USBD_STATUS_DEVICE_GONE ((USBD_STATUS)0xC0007000) #define USBD_STATUS_STATUS_NOT_MAPPED ((USBD_STATUS)0xC0008000) +#define USBD_STATUS_CANCELED ((USBD_STATUS)0xC0010000) #define USBD_STATUS_ISO_NOT_ACCESSED_BY_HW ((USBD_STATUS)0xC0020000) #define USBD_STATUS_ISO_TD_ERROR ((USBD_STATUS)0xC0030000) #define USBD_STATUS_ISO_NA_LATE_USBPORT ((USBD_STATUS)0xC0040000) -- 2.25.2

1 0