- Wine-Devel - list.winehq.org

[PATCH alt 2] loader: Fix the generic case in get_self_exe()
by Martin Storsjo Aug. 19, 2020

Aug. 19, 2020

Previously this just returned the matched directory, not the path to the executable itself. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- Smaller modification, but this builds the returned path twice; once for testing with access() and once for returning. --- loader/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/main.c b/loader/main.c index 0e6b6f66b5..52cf5b573e 100644 --- a/loader/main.c +++ b/loader/main.c @@ -220,7 +220,7 @@ static const char *get_self_exe( char *argv0 ) free( name ); if (found) break; } - if (p) p = strdup( p ); + if (p) p = build_path( p, argv0 ); free( path ); return p; } -- 2.24.3 (Apple Git-128)

1 0

[PATCH alt 1] loader: Fix the generic case in get_self_exe()
by Martin Storsjo Aug. 19, 2020

Aug. 19, 2020

Previously this just returned the matched directory, not the path to the executable itself. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- Slightly bigger modification, but more straightforward in the end. --- loader/main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/loader/main.c b/loader/main.c index 0e6b6f66b5..3c06728504 100644 --- a/loader/main.c +++ b/loader/main.c @@ -216,13 +216,15 @@ static const char *get_self_exe( char *argv0 ) for (p = strtok( path, ":" ); p; p = strtok( NULL, ":" )) { char *name = build_path( p, argv0 ); - int found = !access( name, X_OK ); + if (!access( name, X_OK )) + { + free( path ); + return name; + } free( name ); - if (found) break; } - if (p) p = strdup( p ); free( path ); - return p; + return NULL; } return argv0; #endif -- 2.24.3 (Apple Git-128)

1 0

[PATCH] libwine: Fix the init procedure to call __wine_main just like the main laoder does
by Martin Storsjo Aug. 19, 2020

Aug. 19, 2020

This is called if no preloader is available and the loader doesn't find ntdll.so right away. The codepath used normally has seen a fair bit of restructurings in the past few months, while this codepath seems to have been left as things were before. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- libs/wine/loader.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index c3b59d9022..e54cbd4cc1 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -857,6 +857,14 @@ static int apple_alloc_thread_stack( void *base, size_t size, void *arg ) } #endif +static void *init_func_wrap( void *arg ) +{ + void (*init_func)(int, char **, char **) = + (void(*)(int, char **, char **)) arg; + init_func( __wine_main_argc, __wine_main_argv, __wine_main_environ ); + return NULL; +} + /*********************************************************************** * apple_create_wine_thread * @@ -888,7 +896,7 @@ static void apple_create_wine_thread( void *init_func ) #endif if (!pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE ) && - !pthread_create( &thread, &attr, init_func, NULL )) + !pthread_create( &thread, &attr, init_func_wrap, init_func )) success = 1; pthread_attr_destroy( &attr ); @@ -1090,7 +1098,7 @@ void wine_init( int argc, char *argv[], char *error, int error_size ) struct dll_path_context context; char *path; void *ntdll = NULL; - void (*init_func)(void); + void (*init_func)(int, char **, char **); /* force a few limits that are set too low on some platforms */ #ifdef RLIMIT_NOFILE @@ -1105,9 +1113,8 @@ void wine_init( int argc, char *argv[], char *error, int error_size ) __wine_main_argc = argc; __wine_main_argv = argv; __wine_main_environ = __wine_get_main_environment(); - mmap_init(); - for (path = first_dll_path( "ntdll.dll", 0, &context ); path; path = next_dll_path( &context )) + for (path = first_dll_path( "ntdll", 0, &context ); path; path = next_dll_path( &context )) { if ((ntdll = dlopen( path, RTLD_NOW ))) { @@ -1118,7 +1125,7 @@ void wine_init( int argc, char *argv[], char *error, int error_size ) } free_dll_path( &context ); - if (!ntdll || !(init_func = dlsym( ntdll, "__wine_process_init" ))) + if (!ntdll || !(init_func = dlsym( ntdll, "__wine_main" ))) { if (error && error_size) { @@ -1136,6 +1143,6 @@ void wine_init( int argc, char *argv[], char *error, int error_size ) #ifdef __APPLE__ apple_main_thread( init_func ); #else - init_func(); + init_func( __wine_main_argc, __wine_main_argv, __wine_main_environ ); #endif } -- 2.24.3 (Apple Git-128)

2 2

[PATCH] winebrowser: Ensure that a URL opened as HTTP begins with 'http://' or 'https://'.
by Brendan Shanks Aug. 19, 2020

Aug. 19, 2020

Fixes usage like 'winebrowser winehq.org' when xdg-open is used. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- programs/winebrowser/main.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 9cd6812d032..4b623dfac78 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -136,9 +136,15 @@ static int open_http_url( const WCHAR *url ) #endif static const WCHAR browsersW[] = {'B','r','o','w','s','e','r','s',0}; + static const WCHAR httpW[] = + {'h','t','t','p',':','/','/',0}; + static const WCHAR httpsW[] = + {'h','t','t','p','s',':','/','/',0}; WCHAR browsers[256]; + WCHAR *url_prefixed; HKEY key; + int ret; LONG r; /* @@ Wine registry key: HKCU\Software\Wine\WineBrowser */ @@ -150,7 +156,27 @@ static int open_http_url( const WCHAR *url ) if (r != ERROR_SUCCESS) memcpy( browsers, defaultbrowsers, sizeof(defaultbrowsers) ); - return launch_app( browsers, url ); + /* If url doesn't begin with 'http://' or 'https://', prefix it with 'http://'. Required by xdg-open. */ + if (!strncmpiW( url, httpW, strlenW( httpW ) ) || !strncmpiW( url, httpsW , strlenW( httpsW ) )) + { + ret = launch_app( browsers, url ); + } + else + { + url_prefixed = HeapAlloc( GetProcessHeap(), 0, (ARRAY_SIZE(httpW) + strlenW( url )) * sizeof(WCHAR) ); + if (!url_prefixed) + { + WINE_ERR("Out of memory\n"); + return 1; + } + + strcpyW( url_prefixed, httpW ); + strcatW( url_prefixed, url ); + + ret = launch_app( browsers, url_prefixed ); + HeapFree( GetProcessHeap(), 0, url_prefixed ); + } + return ret; } static int open_mailto_url( const WCHAR *url ) -- 2.26.2

2 1

[PATCH][RFC] winemine: Add message context to advanced difficulty string
by Julian Rüger Aug. 19, 2020

Aug. 19, 2020

Hi everyone, as I explained in my previous mail "Translation problem with oledb32", the winemine difficulty and the oledb32 ADO dialog tab both share the same po string "Advanced". That is problematic for at least the German translation. (I wonder if that is the only one, I'd guess not, though I don't speak any other language nearly well enough to judge) I decided to add a message context to winemine and not to oledb32, since winemine is the odd one out in this case, while potentially in the future, other "Advanced" strings would likely have the same translation as oledb32. I'd love to hear some suggestions/opinions on what would be the best way to handle this. 1. Should I add a similar message context to the "Beginner" and "Expert" difficulties as well, to keep it consistent even when there are no collisions (yet)? 2. There are two strings for each difficulty, for the file menu "&Beginner", "&Advanced", ... Add message contexts for these? 3. Avoid this whole thing by changing the winemine string to "Intermediate"? My personal feeling is 1. makes sense, 2. probably not, 3. easiest, cleanest solution but changes the tone, do people care? Also please point out any other issues with the patch. Thanks in advance for your input! Best, Julian

2 1

[PATCH] msvcrt: Optimize memmove implementation.
by Piotr Caban Aug. 19, 2020

Aug. 19, 2020

Based on Torbjorn Granlund code from Glibc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49663 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)

2 2

[PATCH 5/5] windowscodecs/tests: Add macro BLOCK_WIDTH and BLOCK_HEIGHT.
by Ziqing Hui Aug. 19, 2020

Aug. 19, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)

2 1

[PATCH 4/5] windowscodecs/tests: Merge decode_bc*() into a single function.
by Ziqing Hui Aug. 19, 2020

Aug. 19, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 208 +++++++++++---------------- 1 file changed, 80 insertions(+), 128 deletions(-)

2 1

[PATCH 3/5] windowscodecs/tests: Add tests for decoding BC3 format.
by Ziqing Hui Aug. 19, 2020

Aug. 19, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 67 +++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-)

2 1

[PATCH 2/5] windowscodecs/tests: Add tests for decoding BC2 format.
by Ziqing Hui Aug. 19, 2020

Aug. 19, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 69 ++++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 8 deletions(-)

2 1