October 2019 - Wine-Commits

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

Oct. 21, 2019

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

Alexandre Julliard : kernelbase: Fix variable name aliasing issue.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: 9551cb0b84dc0c0c9c1778cc37d7bafef4fd4299 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9551cb0b84dc0c0c9c1778cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 19 15:23:32 2019 +0200 kernelbase: Fix variable name aliasing issue. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/loader.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 5b70dfd874..456a9f2da4 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -114,12 +114,12 @@ static BOOL load_library_as_datafile( LPCWSTR load_path, DWORD flags, LPCWSTR na if (flags & LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE) { - struct exclusive_datafile *file = HeapAlloc( GetProcessHeap(), 0, sizeof(*file) ); - if (!file) goto failed; - file->module = *mod_ret; - file->file = file; - list_add_head( &exclusive_datafile_list, &file->entry ); - TRACE( "delaying close %p for module %p\n", file->file, file->module ); + struct exclusive_datafile *datafile = HeapAlloc( GetProcessHeap(), 0, sizeof(*datafile) ); + if (!datafile) goto failed; + datafile->module = *mod_ret; + datafile->file = file; + list_add_head( &exclusive_datafile_list, &datafile->entry ); + TRACE( "delaying close %p for module %p\n", datafile->file, datafile->module ); return TRUE; } }

1 0

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

Oct. 21, 2019

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

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

Oct. 21, 2019

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

Alexandre Julliard : notepad: Fix parsing of quoted command line.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

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

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

Oct. 21, 2019

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 : kernel32: Retrieve the Unix codepage from ntdll.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: 6d8c58d7cc2a54a61a15aa83cd5e32ad4914fa59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d8c58d7cc2a54a61a15aa83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 19 14:17:40 2019 +0200 kernel32: Retrieve the Unix codepage from ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 156 +++++-------------------------------------------- dlls/ntdll/directory.c | 6 ++ dlls/ntdll/ntdll.spec | 3 +- dlls/ntdll/rtlstr.c | 3 +- 4 files changed, 24 insertions(+), 144 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6d8c58d7cc2a54a61a15…

1 0

Alexandre Julliard : ntdll: Initialize Unix codepage early during startup.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: 4f4208876261737d69923552ddfc317beea38553 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f4208876261737d69923552… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 19 14:16:19 2019 +0200 ntdll: Initialize Unix codepage early during startup. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/rtlstr.c | 22 --------- 2 files changed, 128 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index e3f805a48f..398f25e290 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -30,6 +30,8 @@ #endif #include <errno.h> #include <fcntl.h> +#include <locale.h> +#include <langinfo.h> #include <stdarg.h> #include <string.h> #include <stdlib.h> @@ -167,6 +169,8 @@ struct file_identity static struct file_identity ignored_files[MAX_IGNORED_FILES]; static unsigned int ignored_files_count; +static const union cptable *unix_table; /* NULL if UTF8 */ + union file_directory_info { ULONG next; @@ -229,6 +233,109 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = static RTL_CRITICAL_SECTION dir_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +#if !defined(__APPLE__) && !defined(__ANDROID__) /* these platforms always use UTF-8 */ + +/* charset to codepage map, sorted by name */ +static const struct { const char *name; UINT cp; } charset_names[] = +{ + { "ANSIX341968", 20127 }, + { "BIG5", 950 }, + { "BIG5HKSCS", 950 }, + { "CP1250", 1250 }, + { "CP1251", 1251 }, + { "CP1252", 1252 }, + { "CP1253", 1253 }, + { "CP1254", 1254 }, + { "CP1255", 1255 }, + { "CP1256", 1256 }, + { "CP1257", 1257 }, + { "CP1258", 1258 }, + { "CP932", 932 }, + { "CP936", 936 }, + { "CP949", 949 }, + { "CP950", 950 }, + { "EUCJP", 20932 }, + { "EUCKR", 949 }, + { "GB18030", 936 /* 54936 */ }, + { "GB2312", 936 }, + { "GBK", 936 }, + { "IBM037", 37 }, + { "IBM1026", 1026 }, + { "IBM424", 424 }, + { "IBM437", 437 }, + { "IBM500", 500 }, + { "IBM850", 850 }, + { "IBM852", 852 }, + { "IBM855", 855 }, + { "IBM857", 857 }, + { "IBM860", 860 }, + { "IBM861", 861 }, + { "IBM862", 862 }, + { "IBM863", 863 }, + { "IBM864", 864 }, + { "IBM865", 865 }, + { "IBM866", 866 }, + { "IBM869", 869 }, + { "IBM874", 874 }, + { "IBM875", 875 }, + { "ISO88591", 28591 }, + { "ISO885910", 28600 }, + { "ISO885911", 28601 }, + { "ISO885913", 28603 }, + { "ISO885914", 28604 }, + { "ISO885915", 28605 }, + { "ISO885916", 28606 }, + { "ISO88592", 28592 }, + { "ISO88593", 28593 }, + { "ISO88594", 28594 }, + { "ISO88595", 28595 }, + { "ISO88596", 28596 }, + { "ISO88597", 28597 }, + { "ISO88598", 28598 }, + { "ISO88599", 28599 }, + { "KOI8R", 20866 }, + { "KOI8U", 21866 }, + { "TIS620", 28601 }, + { "UTF8", CP_UTF8 } +}; + +static void init_unix_codepage(void) +{ + char charset_name[16]; + const char *name; + size_t i, j; + int min = 0, max = ARRAY_SIZE(charset_names) - 1; + + setlocale( LC_CTYPE, "" ); + if (!(name = nl_langinfo( CODESET ))) return; + + /* remove punctuation characters from charset name */ + for (i = j = 0; name[i] && j < sizeof(charset_name)-1; i++) + if (isalnum((unsigned char)name[i])) charset_name[j++] = name[i]; + charset_name[j] = 0; + + while (min <= max) + { + int pos = (min + max) / 2; + int res = _strnicmp( charset_names[pos].name, charset_name, -1 ); + if (!res) + { + if (charset_names[pos].cp == CP_UTF8) return; + unix_table = wine_cp_get_table( charset_names[pos].cp ); + return; + } + if (res > 0) max = pos - 1; + else min = pos + 1; + } + ERR( "unrecognized charset '%s'\n", name ); +} + +#else /* __APPLE__ || __ANDROID__ */ + +static void init_unix_codepage(void) { } + +#endif /* __APPLE__ || __ANDROID__ */ + /* check if a given Unicode char is OK in a DOS short name */ static inline BOOL is_invalid_dos_char( WCHAR ch ) { @@ -395,6 +502,26 @@ static void free_dir_data( struct dir_data *data ) RtlFreeHeap( GetProcessHeap(), 0, data ); } +int ntdll_umbstowcs( DWORD flags, const char *src, int srclen, WCHAR *dst, int dstlen ) +{ +#ifdef __APPLE__ + /* work around broken Mac OS X filesystem that enforces decomposed Unicode */ + flags |= MB_COMPOSITE; +#endif + return unix_table ? + wine_cp_mbstowcs( unix_table, flags, src, srclen, dst, dstlen ) : + wine_utf8_mbstowcs( flags, src, srclen, dst, dstlen ); +} + +int ntdll_wcstoumbs( DWORD flags, const WCHAR *src, int srclen, char *dst, int dstlen, + const char *defchar, int *used ) +{ + if (unix_table) + return wine_cp_wcstombs( unix_table, flags, src, srclen, dst, dstlen, defchar, used ); + if (used) *used = 0; /* all chars are valid for UTF-8 */ + return wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); +} + /* support for a directory queue for filesystem searches */ @@ -2319,6 +2446,7 @@ static int get_redirect_path( char *unix_name, int pos, const WCHAR *name, int l */ void init_directories(void) { + init_unix_codepage(); #ifndef _WIN64 if (is_wow64) init_redirects(); #endif diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 977f57a907..94370e7ff6 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -48,7 +48,6 @@ extern const union cptable cptable_20127; /* 7-bit ASCII */ static const union cptable *ansi_table = &cptable_20127; static const union cptable *oem_table = &cptable_20127; -static const union cptable* unix_table; /* NULL if UTF8 */ /************************************************************************** @@ -61,30 +60,9 @@ void CDECL __wine_init_codepages( const union cptable *ansi, const union cptable { ansi_table = ansi; oem_table = oem; - unix_table = ucp; NlsAnsiCodePage = ansi->info.codepage; } -int ntdll_umbstowcs(DWORD flags, const char* src, int srclen, WCHAR* dst, int dstlen) -{ -#ifdef __APPLE__ - /* work around broken Mac OS X filesystem that enforces decomposed Unicode */ - if (!unix_table) flags |= MB_COMPOSITE; -#endif - return (unix_table) ? - wine_cp_mbstowcs( unix_table, flags, src, srclen, dst, dstlen ) : - wine_utf8_mbstowcs( flags, src, srclen, dst, dstlen ); -} - -int ntdll_wcstoumbs(DWORD flags, const WCHAR* src, int srclen, char* dst, int dstlen, - const char* defchar, int *used ) -{ - if (unix_table) - return wine_cp_wcstombs( unix_table, flags, src, srclen, dst, dstlen, defchar, used ); - if (used) *used = 0; /* all chars are valid for UTF-8 */ - return wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); -} - /************************************************************************** * RtlInitAnsiString (NTDLL.@) *

1 0

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

Oct. 21, 2019

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

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

Oct. 21, 2019

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