March 2019 - Wine-commits - list.winehq.org

Nikolay Sivov : winegstreamer: Get rid of allocated arguments array.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 9a9e521da8e8cf333368180ac259d244a39dbbae URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a9e521da8e8cf333368180a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 26 08:57:34 2019 +0300 winegstreamer: Get rid of allocated arguments array. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/main.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index a1b1648..18154fb 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -262,7 +262,8 @@ static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ct BOOL *status = param; char argv0[] = "wine"; char argv1[] = "--gst-disable-registry-fork"; - char **argv = HeapAlloc(GetProcessHeap(), 0, sizeof(char *)*3); + char *args[3]; + char **argv = args; int argc = 2; GError *err = NULL; @@ -272,12 +273,8 @@ static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ct argv[1] = argv1; argv[2] = NULL; *status = gst_init_check(&argc, &argv, &err); - HeapFree(GetProcessHeap(), 0, argv); - if (err) { - ERR("Failed to initialize gstreamer: %s\n", err->message); - g_error_free(err); - } - if (*status) { + if (*status) + { HINSTANCE newhandle; /* Unloading glib is a bad idea.. it installs atexit handlers, * so never unload the dll after loading */ @@ -288,6 +285,11 @@ static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ct start_dispatch_thread(); } + else if (err) + { + ERR("Failed to initialize gstreamer: %s\n", debugstr_a(err->message)); + g_error_free(err); + } return TRUE; }

1 0

Nikolay Sivov : winegstreamer: Print current and build version of GStreamer.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: d6fcab825b755137f451f031e1967040e91cc7f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6fcab825b755137f451f031… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 26 08:57:35 2019 +0300 winegstreamer: Print current and build version of GStreamer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 18154fb..fdc8966 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -267,7 +267,7 @@ static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ct int argc = 2; GError *err = NULL; - TRACE("initializing\n"); + TRACE("Initializing...\n"); argv[0] = argv0; argv[1] = argv1; @@ -276,6 +276,10 @@ static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ct if (*status) { HINSTANCE newhandle; + + TRACE("Inititialized, version %s. Built with %d.%d.%d.\n", gst_version_string(), + GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); + /* Unloading glib is a bad idea.. it installs atexit handlers, * so never unload the dll after loading */ GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS,

1 0

Nikolay Sivov : winegstreamer: Actually pin module on initialization.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 11401be90b91236240695a6c876d4140044d7f95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11401be90b91236240695a6c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 26 08:57:36 2019 +0300 winegstreamer: Actually pin module on initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index fdc8966..2a5dbd1 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -275,17 +275,17 @@ static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ct *status = gst_init_check(&argc, &argv, &err); if (*status) { - HINSTANCE newhandle; + HINSTANCE handle; TRACE("Inititialized, version %s. Built with %d.%d.%d.\n", gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); /* Unloading glib is a bad idea.. it installs atexit handlers, * so never unload the dll after loading */ - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, - (LPCWSTR)hInst, &newhandle); - if (!newhandle) - ERR("Could not pin module %p\n", hInst); + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_PIN, + (LPCWSTR)hInst, &handle); + if (!handle) + ERR("Failed to pin module %p.\n", hInst); start_dispatch_thread(); }

1 0

Piotr Caban : ntdll: Fix tolower implementation to not depend on locale.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 4ed792439050c06c1833406ca74924153d9856cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ed792439050c06c1833406c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:26:12 2019 +0100 ntdll: Fix tolower implementation to not depend on locale. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/string.c | 18 +++++++++--------- dlls/ntdll/tests/string.c | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index e0bf5be..d881e85 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -218,6 +218,15 @@ void * __cdecl _memccpy( void *dst, const void *src, int c, size_t n ) /********************************************************************* + * tolower (NTDLL.@) + */ +int __cdecl NTDLL_tolower( int c ) +{ + return (char)c >= 'A' && (char)c <= 'Z' ? c - 'A' + 'a' : c; +} + + +/********************************************************************* * _memicmp (NTDLL.@) * * Compare two blocks of memory as strings, ignoring case. @@ -308,15 +317,6 @@ LPSTR __cdecl _strlwr( LPSTR str ) /********************************************************************* - * tolower (NTDLL.@) - */ -int __cdecl NTDLL_tolower( int c ) -{ - return tolower( c ); -} - - -/********************************************************************* * toupper (NTDLL.@) */ int __cdecl NTDLL_toupper( int c ) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 0ab28ff..84755fd 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -61,6 +61,7 @@ static void (__cdecl *p_qsort)(void *,size_t,size_t, int(__cdecl *compar)(co static void* (__cdecl *p_bsearch)(void *,void*,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); static int (WINAPIV *p__snprintf)(char *, size_t, const char *, ...); +static int (__cdecl *p_tolower)(int); static void InitFunctionPtrs(void) { @@ -99,6 +100,8 @@ static void InitFunctionPtrs(void) p_bsearch= (void *)GetProcAddress(hntdll, "bsearch"); p__snprintf = (void *)GetProcAddress(hntdll, "_snprintf"); + + p_tolower = (void *)GetProcAddress(hntdll, "tolower"); } /* if */ } @@ -1327,6 +1330,26 @@ static void test__snprintf(void) ok(!strcmp(buffer, teststring), "_snprintf returned buffer '%s', expected '%s'.\n", buffer, teststring); } +static void test_tolower(void) +{ + int i, ret, exp_ret; + + if (!GetProcAddress(GetModuleHandleA("ntdll"), "NtRemoveIoCompletionEx")) + { + win_skip("tolower tests\n"); + return; + } + + ok(p_tolower != NULL, "tolower is not available\n"); + + for (i = -512; i < 512; i++) + { + exp_ret = (char)i >= 'A' && (char)i <= 'Z' ? i - 'A' + 'a' : i; + ret = p_tolower(i); + ok(ret == exp_ret, "tolower(%d) = %d\n", i, ret); + } +} + START_TEST(string) { InitFunctionPtrs(); @@ -1363,4 +1386,5 @@ START_TEST(string) test_bsearch(); if (p__snprintf) test__snprintf(); + test_tolower(); }

1 0

Piotr Caban : ntdll: Use ANSI code page in toupper.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 748628e23e774bb4f3ade085d931ed09973037e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=748628e23e774bb4f3ade085… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:26:16 2019 +0100 ntdll: Use ANSI code page in toupper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/string.c | 12 +++++++++++- dlls/ntdll/tests/string.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index d881e85..3e71740 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -321,7 +321,17 @@ LPSTR __cdecl _strlwr( LPSTR str ) */ int __cdecl NTDLL_toupper( int c ) { - return toupper( c ); + char str[2], *p = str; + WCHAR wc; + DWORD len; + + str[0] = c; + str[1] = c >> 8; + wc = RtlAnsiCharToUnicodeChar( &p ); + wc = RtlUpcaseUnicodeChar( wc ); + RtlUnicodeToMultiByteN( str, sizeof(str), &len, &wc, sizeof(wc) ); + if (len == 2) return ((unsigned char)str[0] << 8) + (unsigned char)str[1]; + return (unsigned char)str[0]; } diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 84755fd..22f2359 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -24,6 +24,7 @@ #include <stdlib.h> #include "ntdll_test.h" +#include "winnls.h" /* Function ptrs for ntdll calls */ @@ -62,6 +63,7 @@ static void* (__cdecl *p_bsearch)(void *,void*,size_t,size_t, int(__cdecl *co static int (WINAPIV *p__snprintf)(char *, size_t, const char *, ...); static int (__cdecl *p_tolower)(int); +static int (__cdecl *p_toupper)(int); static void InitFunctionPtrs(void) { @@ -102,6 +104,7 @@ static void InitFunctionPtrs(void) p__snprintf = (void *)GetProcAddress(hntdll, "_snprintf"); p_tolower = (void *)GetProcAddress(hntdll, "tolower"); + p_toupper = (void *)GetProcAddress(hntdll, "toupper"); } /* if */ } @@ -1350,6 +1353,34 @@ static void test_tolower(void) } } +static void test_toupper(void) +{ + + int i, ret, exp_ret; + char str[2], *p; + WCHAR wc; + + ok(p_toupper != NULL, "toupper is not available\n"); + + for (i = -512; i < 0xffff; i++) + { + str[0] = i; + str[1] = i >> 8; + p = str; + wc = RtlAnsiCharToUnicodeChar( &p ); + wc = RtlUpcaseUnicodeChar( wc ); + ret = WideCharToMultiByte( CP_ACP, 0, &wc, 1, str, 2, NULL, NULL ); + ok(ret == 1 || ret == 2, "WideCharToMultiByte returned %d\n", ret); + if (ret == 2) + exp_ret = (unsigned char)str[1] + ((unsigned char)str[0] << 8); + else + exp_ret = (unsigned char)str[0]; + + ret = p_toupper(i); + ok(ret == exp_ret, "toupper(%x) = %x, expected %x\n", i, ret, exp_ret); + } +} + START_TEST(string) { InitFunctionPtrs(); @@ -1387,4 +1418,5 @@ START_TEST(string) if (p__snprintf) test__snprintf(); test_tolower(); + test_toupper(); }

1 0

Piotr Caban : ntdll: Use NTDLL_tolower in _memicmp.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: f9ee9e63a5a83a6bfec429e52b3e660655e12be5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9ee9e63a5a83a6bfec429e5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:26:22 2019 +0100 ntdll: Use NTDLL_tolower in _memicmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 3e71740..0323c09 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -249,7 +249,7 @@ INT __cdecl _memicmp( LPCSTR s1, LPCSTR s2, DWORD len ) int ret = 0; while (len--) { - if ((ret = tolower(*s1) - tolower(*s2))) break; + if ((ret = NTDLL_tolower(*s1) - NTDLL_tolower(*s2))) break; s1++; s2++; }

1 0

Piotr Caban : ntdll: Use NTDLL_tolower in _strlwr.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 985178578379c9355429f9737977d772ac11cb16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=985178578379c9355429f973… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:26:29 2019 +0100 ntdll: Use NTDLL_tolower in _strlwr. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 0323c09..efae4d4 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -311,7 +311,7 @@ LPSTR __cdecl _strupr( LPSTR str ) LPSTR __cdecl _strlwr( LPSTR str ) { LPSTR ret = str; - for ( ; *str; str++) *str = tolower(*str); + for ( ; *str; str++) *str = NTDLL_tolower(*str); return ret; }

1 0

Detlef Riekenberg : hid/tests: Do not access uninitialized memory.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: f5f34fe018f2d2d0c0663027bddb4a073f5308d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5f34fe018f2d2d0c0663027… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 21 15:19:48 2019 +0100 hid/tests: Do not access uninitialized memory. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index f20677f..ff17229 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -82,7 +82,8 @@ static void run_for_each_device(device_test *test) ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", wine_dbgstr_w(data->DevicePath), GetLastError()); - test(file); + if (file != INVALID_HANDLE_VALUE) + test(file); CloseHandle(file); }

1 0

Detlef Riekenberg : hid/tests: Do not fail when the device is busy.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 4640081494533f790c16d3a916a9fa09cb7edaa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4640081494533f790c16d3a9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 21 15:19:49 2019 +0100 hid/tests: Do not fail when the device is busy. Some devices do not allow shared access (mouse, sound device). Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index ff17229..4651ced 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -79,6 +79,12 @@ static void run_for_each_device(device_test *test) trace("Not enough permissions to read device %s.\n", wine_dbgstr_w(data->DevicePath)); continue; } + if (file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SHARING_VIOLATION) + { + trace("Device is busy: %s.\n", wine_dbgstr_w(data->DevicePath)); + continue; + } + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", wine_dbgstr_w(data->DevicePath), GetLastError());

1 0

Vincent Povirk : appwiz.cpl: Search /opt/wine for addons.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 2f6896b14d2b1905a25b1ef55bcdc792f9fa02ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f6896b14d2b1905a25b1ef5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 21 10:14:39 2019 -0500 appwiz.cpl: Search /opt/wine for addons. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 225f915..b070307 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -330,6 +330,8 @@ static enum install_res install_from_default_dir(void) ret = install_from_unix_file(INSTALL_DATADIR "/wine/", addon->subdir_name, addon->file_name); if (ret == INSTALL_NEXT && strcmp(INSTALL_DATADIR, "/usr/share")) ret = install_from_unix_file("/usr/share/wine/", addon->subdir_name, addon->file_name); + if (ret == INSTALL_NEXT) + ret = install_from_unix_file("/opt/wine/", addon->subdir_name, addon->file_name); return ret; } @@ -794,6 +796,7 @@ BOOL install_addon(addon_t addon_type) * - $datadir/$addon_subdir/ * - $INSTALL_DATADIR/wine/$addon_subdir/ * - /usr/share/wine/$addon_subdir/ + * - /opt/wine/$addon_subdir/ * - download from URL stored in $url_config_key value of HKCU/Software/Wine/$config_key key */ if (install_from_registered_dir() == INSTALL_NEXT

1 0