October 2019 - Wine-commits

Alexandre Julliard : kernel32: Add the new image path to the dll path for a new process.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: c258b5ef1100c8c238aab0a17ca743a326829aac URL: https://source.winehq.org/git/wine.git/?a=commit;h=c258b5ef1100c8c238aab0a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Oct 20 13:54:05 2019 +0200 kernel32: Add the new image path to the dll path for a new process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index d2682ac83e..693179fa05 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1885,9 +1885,9 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( LPCWSTR filename, LPC const STARTUPINFOW *startup ) { RTL_USER_PROCESS_PARAMETERS *params; - UNICODE_STRING imageW, curdirW, cmdlineW, titleW, desktopW, runtimeW, newdirW; + UNICODE_STRING imageW, dllpathW, curdirW, cmdlineW, titleW, desktopW, runtimeW, newdirW; WCHAR imagepath[MAX_PATH]; - WCHAR *envW = env; + WCHAR *load_path, *dummy, *envW = env; if(!GetLongPathNameW( filename, imagepath, MAX_PATH )) lstrcpynW( imagepath, filename, MAX_PATH ); @@ -1914,20 +1914,24 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( LPCWSTR filename, LPC else cur_dir = NULL; } + LdrGetDllPath( imagepath, LOAD_WITH_ALTERED_SEARCH_PATH, &load_path, &dummy ); RtlInitUnicodeString( &imageW, imagepath ); + RtlInitUnicodeString( &dllpathW, load_path ); RtlInitUnicodeString( &curdirW, cur_dir ); RtlInitUnicodeString( &cmdlineW, cmdline ); RtlInitUnicodeString( &titleW, startup->lpTitle ? startup->lpTitle : imagepath ); RtlInitUnicodeString( &desktopW, startup->lpDesktop ); runtimeW.Buffer = (WCHAR *)startup->lpReserved2; runtimeW.Length = runtimeW.MaximumLength = startup->cbReserved2; - if (RtlCreateProcessParametersEx( &params, &imageW, NULL, cur_dir ? &curdirW : NULL, + if (RtlCreateProcessParametersEx( &params, &imageW, &dllpathW, cur_dir ? &curdirW : NULL, &cmdlineW, envW, &titleW, &desktopW, NULL, &runtimeW, PROCESS_PARAMS_FLAG_NORMALIZED )) { + RtlReleasePath( load_path ); if (envW != env) HeapFree( GetProcessHeap(), 0, envW ); return NULL; } + RtlReleasePath( load_path ); if (flags & CREATE_NEW_PROCESS_GROUP) params->ConsoleFlags = 1; if (flags & CREATE_NEW_CONSOLE) params->ConsoleHandle = KERNEL32_CONSOLE_ALLOC;

1 0

Jeff Smith : kernel32: Quote first command line arg in process paramenters.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: ceb32f668360ef51b932fa6350858a6b8d2d26ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceb32f668360ef51b932fa63… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Fri Oct 4 23:18:22 2019 -0500 kernel32: Quote first command line arg in process paramenters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47790 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 693179fa05..5cb470e0c7 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -987,7 +987,7 @@ static BOOL build_command_line( WCHAR **argv ) has_space=FALSE; bcount=0; a=*arg; - if( !*a ) has_space=TRUE; + if( arg == argv || !*a ) has_space=TRUE; while (*a!='\0') { if (*a=='\\') { bcount++; @@ -1024,7 +1024,7 @@ static BOOL build_command_line( WCHAR **argv ) /* Check for quotes and spaces in this argument */ has_space=has_quote=FALSE; a=*arg; - if( !*a ) has_space=TRUE; + if( arg == argv || !*a ) has_space=TRUE; while (*a!='\0') { if (*a==' ' || *a=='\t') { has_space=TRUE;

1 0

Alexandre Julliard : notepad: Fix parsing of quoted command line.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: bc968469f224a604ea07ec7e2b93c3808014a959 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc968469f224a604ea07ec7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 17:11:08 2019 +0200 notepad: Fix parsing of quoted command line. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/notepad/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 37ee7ec18d..fee15ce6a3 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -629,6 +629,8 @@ static void HandleCommandLine(LPWSTR cmdline) if (*cmdline == delimiter) cmdline++; + while (*cmdline == ' ') cmdline++; + ptr = cmdline; while (*ptr == ' ' || *ptr == '-' || *ptr == '/') {

1 0

Sven Baars : mf: Leave instead of enter a critical section.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 96062c4c79f431e4e5d268c7190cba169cc325e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96062c4c79f431e4e5d268c7… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Oct 20 13:20:31 2019 +0200 mf: Leave instead of enter a critical section. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index c3dc2e1b7f..205bc70b1b 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -1040,7 +1040,7 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) IMFStreamSink_Release(&grabber->stream->IMFStreamSink_iface); grabber->stream = NULL; } - EnterCriticalSection(&grabber->cs); + LeaveCriticalSection(&grabber->cs); return hr; }

1 0

Zebediah Figura : psapi/tests: Increase the GetPerformanceInfo() margins again.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: ccf3dabd7ead21b5b08addb3b2347af23da946b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccf3dabd7ead21b5b08addb3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 19 14:39:58 2019 -0500 psapi/tests: Increase the GetPerformanceInfo() margins again. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index d565053722..78aac2c044 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -259,7 +259,7 @@ static void test_GetPerformanceInfo(void) ok(ret, "GetPerformanceInfo failed with %d\n", GetLastError()); ok(info.cb == sizeof(PERFORMANCE_INFORMATION), "got %d\n", info.cb); - ok(check_with_margin(info.CommitTotal, sys_performance_info->TotalCommittedPages, 288), + ok(check_with_margin(info.CommitTotal, sys_performance_info->TotalCommittedPages, 2048), "expected approximately %ld but got %d\n", info.CommitTotal, sys_performance_info->TotalCommittedPages); ok(check_with_margin(info.CommitLimit, sys_performance_info->TotalCommitLimit, 32), @@ -268,7 +268,7 @@ static void test_GetPerformanceInfo(void) ok(check_with_margin(info.CommitPeak, sys_performance_info->PeakCommitment, 32), "expected approximately %ld but got %d\n", info.CommitPeak, sys_performance_info->PeakCommitment); - ok(check_with_margin(info.PhysicalAvailable, sys_performance_info->AvailablePages, 512), + ok(check_with_margin(info.PhysicalAvailable, sys_performance_info->AvailablePages, 2048), "expected approximately %ld but got %d\n", info.PhysicalAvailable, sys_performance_info->AvailablePages); /* TODO: info.SystemCache not checked yet - to which field(s) does this value correspond to? */ @@ -322,7 +322,7 @@ static void test_GetPerformanceInfo(void) } HeapFree(GetProcessHeap(), 0, sys_process_info); - ok(check_with_margin(info.HandleCount, handle_count, 256), + ok(check_with_margin(info.HandleCount, handle_count, 512), "expected approximately %d but got %d\n", info.HandleCount, handle_count); ok(check_with_margin(info.ProcessCount, process_count, 4),

1 0

Zebediah Figura : psapi/tests: Remove an unreliable test.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: e2206eefdbd459f99fc9886852e52a561c9ee1cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2206eefdbd459f99fc98868… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 19 14:39:59 2019 -0500 psapi/tests: Remove an unreliable test. This fails on Windows 10 version 1709 and later. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 78aac2c044..b02ceed5ec 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -724,7 +724,6 @@ static void test_GetModuleBaseName(void) static void test_ws_functions(void) { PSAPI_WS_WATCH_INFORMATION wswi[4096]; - ULONG_PTR pages[4096]; HANDLE ws_handle; char *addr; unsigned int i; @@ -773,22 +772,6 @@ static void test_ws_functions(void) goto free_page; } - SetLastError(0xdeadbeef); - ret = QueryWorkingSet(hpQI, pages, 4096 * sizeof(ULONG_PTR)); - todo_wine ok(ret == 1, "failed with %d\n", GetLastError()); - if(ret == 1) - { - for(i = 0; i < pages[0]; i++) - if((pages[i+1] & ~0xfffL) == (ULONG_PTR)addr) - { - todo_wine ok(ret == 1, "QueryWorkingSet found our page\n"); - goto test_gwsc; - } - - todo_wine ok(0, "QueryWorkingSet didn't find our page\n"); - } - -test_gwsc: SetLastError(0xdeadbeef); ret = GetWsChanges(hpQI, wswi, sizeof(wswi)); todo_wine ok(ret == 1, "failed with %d\n", GetLastError());

1 0

Zebediah Figura : qwave: Don't test the last error in the successful case.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 5cded9530870fc2c744fb89fdd6e1b1d63ea5e76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cded9530870fc2c744fb89f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 19 14:47:35 2019 -0500 qwave: Don't test the last error in the successful case. On Windows 8 and above we may get ERROR_SERVICE_ALREADY_RUNNING. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qwave/tests/qos.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/qwave/tests/qos.c b/dlls/qwave/tests/qos.c index 5cb3e53996..10a32f7495 100644 --- a/dlls/qwave/tests/qos.c +++ b/dlls/qwave/tests/qos.c @@ -44,12 +44,10 @@ static void test_QOSCreateHandle(void) ok(ret == FALSE, "Expected FALSE, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - SetLastError(0xdeadbeef); ver.MajorVersion = 1; ver.MinorVersion = 0; ret = QOSCreateHandle(&ver, &h); todo_wine ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ver.MajorVersion = 1;

1 0

Zebediah Figura : advapi32/tests: Use unique names for each created service.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 7d35a261bad7db68b5fc13e4916a58e0cb8762fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d35a261bad7db68b5fc13e4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 19 15:31:28 2019 -0500 advapi32/tests: Use unique names for each created service. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 38 ++++++-------------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index f91ea185ae..6c78900bd4 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -199,7 +199,7 @@ static void test_create_delete_svc(void) CHAR username[UNLEN + 1], domain[MAX_PATH]; DWORD user_size = UNLEN + 1; CHAR account[UNLEN + 3]; - static const CHAR servicename [] = "Winetest"; + static const CHAR servicename [] = "winetest_create_delete"; static const CHAR pathname [] = "we_dont_care.exe"; static const CHAR empty [] = ""; static const CHAR password [] = "secret"; @@ -428,12 +428,6 @@ static void test_create_delete_svc(void) CloseServiceHandle(svc_handle1); CloseServiceHandle(scm_handle); - /* Wait a while. One of the following tests also does a CreateService for the - * same servicename and this would result in an ERROR_SERVICE_MARKED_FOR_DELETE - * error if we do this too quickly. Vista seems more picky than the others. - */ - Sleep(1000); - /* And a final NULL check */ SetLastError(0xdeadbeef); ret = DeleteService(NULL); @@ -453,7 +447,7 @@ static void test_get_displayname(void) static const WCHAR spoolerW[] = {'S','p','o','o','l','e','r',0}; static const WCHAR deadbeefW[] = {'D','e','a','d','b','e','e','f',0}; static const WCHAR abcW[] = {'A','B','C',0}; - static const CHAR servicename[] = "Winetest"; + static const CHAR servicename[] = "winetest_displayname"; static const CHAR pathname[] = "we_dont_care.exe"; /* Having NULL for the size of the buffer will crash on W2K3 */ @@ -725,9 +719,6 @@ static void test_get_displayname(void) CloseServiceHandle(svc_handle); CloseServiceHandle(scm_handle); - - /* Wait a while. Just in case one of the following tests does a CreateService again */ - Sleep(1000); } static void test_get_servicekeyname(void) @@ -1861,7 +1852,7 @@ static void test_sequence(void) BOOL ret, is_nt4; QUERY_SERVICE_CONFIGA *config; DWORD given, needed; - static const CHAR servicename [] = "Winetest"; + static const CHAR servicename [] = "winetest_sequence"; static const CHAR displayname [] = "Winetest dummy service"; static const CHAR displayname2[] = "Winetest dummy service (2)"; static const CHAR pathname [] = "we_dont_care.exe"; @@ -2029,10 +2020,6 @@ static void test_sequence(void) ret = DeleteService(svc_handle); ok(ret, "Expected success, got error %u\n", GetLastError()); CloseServiceHandle(svc_handle); - - /* Wait a while. The following test does a CreateService again */ - Sleep(1000); - CloseServiceHandle(scm_handle); HeapFree(GetProcessHeap(), 0, config); } @@ -2046,7 +2033,7 @@ static void test_queryconfig2(void) LPSERVICE_DESCRIPTIONA pConfig = (LPSERVICE_DESCRIPTIONA)buffer; LPSERVICE_DESCRIPTIONW pConfigW = (LPSERVICE_DESCRIPTIONW)buffer; SERVICE_PRESHUTDOWN_INFO preshutdown_info; - static const CHAR servicename [] = "Winetest"; + static const CHAR servicename [] = "winetest_query_config2"; static const CHAR displayname [] = "Winetest dummy service"; static const CHAR pathname [] = "we_dont_care.exe"; static const CHAR dependencies[] = "Master1\0Master2\0+MasterGroup1\0"; @@ -2304,12 +2291,7 @@ static void test_queryconfig2(void) cleanup: DeleteService(svc_handle); - CloseServiceHandle(svc_handle); - - /* Wait a while. The following test does a CreateService again */ - Sleep(1000); - CloseServiceHandle(scm_handle); } @@ -2512,7 +2494,7 @@ static void test_start_stop(void) BOOL ret; SC_HANDLE scm_handle, svc_handle; DWORD le, is_nt4; - static const char servicename[] = "Winetest"; + static const char servicename[] = "winetest_start_stop"; char cmd[MAX_PATH+20]; const char* displayname; @@ -2592,17 +2574,13 @@ cleanup: DeleteService(svc_handle); CloseServiceHandle(svc_handle); } - - /* Wait a while. The following test does a CreateService again */ - Sleep(1000); - CloseServiceHandle(scm_handle); } static void test_refcount(void) { SC_HANDLE scm_handle, svc_handle1, svc_handle2, svc_handle3, svc_handle4, svc_handle5; - static const CHAR servicename [] = "Winetest"; + static const CHAR servicename [] = "winetest_refcount"; static const CHAR pathname [] = "we_dont_care.exe"; BOOL ret; @@ -2681,10 +2659,6 @@ static void test_refcount(void) /* Delete the service */ ret = DeleteService(svc_handle5); ok(ret, "Expected success (err=%d)\n", GetLastError()); - - /* Wait a while. Just in case one of the following tests does a CreateService again */ - Sleep(1000); - CloseServiceHandle(svc_handle5); CloseServiceHandle(scm_handle); }

1 0

Alistair Leslie-Hughes : dplayx: Copy the correct Short name variable.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 982137f73f7be7bde9e7de93be55ef03c54f5adf URL: https://source.winehq.org/git/wine.git/?a=commit;h=982137f73f7be7bde9e7de93… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Oct 20 10:26:56 2019 +0000 dplayx: Copy the correct Short name variable. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index e7d6edc6a0..e2464f8013 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2709,7 +2709,7 @@ static HRESULT DP_IF_GetGroupName( IDirectPlayImpl *This, DPID idGroup, void *lp if( lpGData->name.u1.lpszShortNameA ) { strcpy( ((char*)lpName)+lpGData->name.dwSize, - lpGData->name.u2.lpszLongNameA ); + lpGData->name.u1.lpszShortNameA ); } else {

1 0

Alistair Leslie-Hughes : dpnet: Initialize size before call to RegGetValueW (Coverity).
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 96b1c96c88e770794bea5f8082a8691d41ff6fd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b1c96c88e770794bea5f80… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Oct 20 10:26:58 2019 +0000 dpnet: Initialize size before call to RegGetValueW (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/peer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index f935b2a313..7536af6796 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -157,6 +157,7 @@ HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER next_key = RegEnumKeyW( key, index, provider, MAX_PATH); while(next_key == ERROR_SUCCESS) { + size = 0; res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); if(res == ERROR_SUCCESS) { @@ -198,6 +199,7 @@ HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER next_key = RegEnumKeyW( key, index, provider, MAX_PATH); while(next_key == ERROR_SUCCESS) { + size = 0; res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); if(res == ERROR_SUCCESS) {

1 0