October 2019 - Wine-Devel - list.winehq.org

[PATCH] kernel32/tests: Test loading system DLLs with WoW64 redirection disabled
by Brendan Shanks Oct. 10, 2019

Oct. 10, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47912 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/kernel32/tests/loader.c | 44 ++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 65184887b8..4e0c3c92e8 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -84,6 +84,8 @@ static BOOL (WINAPI *pFlsSetValue)(DWORD, PVOID); static PVOID (WINAPI *pFlsGetValue)(DWORD); static BOOL (WINAPI *pFlsFree)(DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { @@ -3812,6 +3814,45 @@ static void test_InMemoryOrderModuleList(void) ok(entry2 == mark2, "expected entry2 == mark2, got %p and %p\n", entry2, mark2); } +static void test_wow64_redirection(void) +{ + VOID *OldValue; + HMODULE lib; + OSVERSIONINFOEXA info; + + if (!is_wow64) + return; + + /* Only run tests on Win7/2008R2 (NT 6.1) and newer. The LoadLibrary calls fail on Vista/2008. */ + memset(&info, 0, sizeof(info)); + info.dwOSVersionInfoSize = sizeof(info); + info.dwMajorVersion = 6; + info.dwMinorVersion = 1; + if (VerifyVersionInfoA(&info, VER_MAJORVERSION|VER_MINORVERSION|VER_SERVICEPACKMAJOR, + VerSetConditionMask(VerSetConditionMask(VerSetConditionMask(0, + VER_MAJORVERSION,VER_GREATER_EQUAL), + VER_MINORVERSION,VER_GREATER_EQUAL), + VER_SERVICEPACKMAJOR,VER_GREATER_EQUAL)) == 0) + return; + + ok(pWow64DisableWow64FsRedirection(&OldValue), "Disabling FS redirection failed\n"); + + /* Use system libraries that shouldn't already be loaded in this process. */ + lib = LoadLibraryExA("bcrypt.dll", NULL, 0); + todo_wine ok (lib != NULL, "Loading bcrypt.dll should succeed with WOW64 redirection disabled\n"); + if (lib) FreeLibrary(lib); + + lib = LoadLibraryExA("dxgi.dll", NULL, 0); + todo_wine ok (lib != NULL, "Loading dxgi.dll should succeed with WOW64 redirection disabled\n"); + if (lib) FreeLibrary(lib); + + lib = LoadLibraryExA("dwrite.dll", NULL, 0); + todo_wine ok (lib != NULL, "Loading dwrite.dll should succeed with WOW64 redirection disabled\n"); + if (lib) FreeLibrary(lib); + + ok(pWow64RevertWow64FsRedirection(OldValue), "Re-enabling FS redirection failed\n"); +} + static void test_dll_file( const char *name ) { HMODULE module = GetModuleHandleA( name ); @@ -3897,6 +3938,8 @@ START_TEST(loader) pFlsGetValue = (void *)GetProcAddress(kernel32, "FlsGetValue"); pFlsFree = (void *)GetProcAddress(kernel32, "FlsFree"); pIsWow64Process = (void *)GetProcAddress(kernel32, "IsWow64Process"); + pWow64DisableWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64DisableWow64FsRedirection"); + pWow64RevertWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64RevertWow64FsRedirection"); pResolveDelayLoadedAPI = (void *)GetProcAddress(kernel32, "ResolveDelayLoadedAPI"); if (pIsWow64Process) pIsWow64Process( GetCurrentProcess(), &is_wow64 ); @@ -3930,6 +3973,7 @@ START_TEST(loader) test_import_resolution(); test_ExitProcess(); test_InMemoryOrderModuleList(); + test_wow64_redirection(); test_dll_file( "ntdll.dll" ); test_dll_file( "kernel32.dll" ); test_dll_file( "advapi32.dll" ); -- 2.17.1

3 3

[PATCH v2 1/5] quartz/tests: Bail out if connecting returns E_FAIL.
by Zebediah Figura Oct. 10, 2019

Oct. 10, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47911 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 928484ccb6a..fa63b5b85cc 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -941,7 +941,7 @@ static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt))) { - ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED || hr == E_FAIL, "Got hr %#x.\n", hr); IPin_Release(peer); iface->pin.peer = NULL; FreeMediaType(&iface->pin.mtCurrent); @@ -1016,6 +1016,11 @@ static void test_connect_pin(void) vih.bmiHeader.biBitCount = bpp_tests[j]; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + if (hr == E_FAIL) + { + skip("Got E_FAIL when connecting.\n"); + goto out; + } ok(hr == S_OK, "Got hr %#x for subtype %s and bpp %u.\n", hr, wine_dbgstr_guid(subtype_tests[i]), bpp_tests[j]); @@ -1087,6 +1092,7 @@ static void test_connect_pin(void) hr = IPin_ConnectionMediaType(pin, &mt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); +out: IPin_Release(pin); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); -- 2.23.0

2 6

[PATCH 1/5] quartz/tests: Bail out if connecting returns E_FAIL.
by Zebediah Figura Oct. 10, 2019

Oct. 10, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47911 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 928484ccb6a..fa63b5b85cc 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -941,7 +941,7 @@ static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt))) { - ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED || hr == E_FAIL, "Got hr %#x.\n", hr); IPin_Release(peer); iface->pin.peer = NULL; FreeMediaType(&iface->pin.mtCurrent); @@ -1016,6 +1016,11 @@ static void test_connect_pin(void) vih.bmiHeader.biBitCount = bpp_tests[j]; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + if (hr == E_FAIL) + { + skip("Got E_FAIL when connecting.\n"); + goto out; + } ok(hr == S_OK, "Got hr %#x for subtype %s and bpp %u.\n", hr, wine_dbgstr_guid(subtype_tests[i]), bpp_tests[j]); @@ -1087,6 +1092,7 @@ static void test_connect_pin(void) hr = IPin_ConnectionMediaType(pin, &mt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); +out: IPin_Release(pin); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); -- 2.23.0

2 6

Using the DDD Debugger with Winedbg?
by Thales Oct. 10, 2019

Oct. 10, 2019

Hello, I'm John Alway. I program in C and C++, among other languages. This is my first message to the list. I've been playing around with the Wine repository for a while and have delved into some of the Bugzilla errors posted on "bugs.winehq.org." In the process of doing this, I've been using the "winedbg" executable with the "--gdb" switch set. That works fine for debugging, but lately I've been trying to employ the graphical application DDD, Data Display Debugger, with the winedbg executable. I've followed the instructions at this link: https://wiki.winehq.org/Wine_Developer%27s_Guide/Debugging_Wine#DDD When I do winedbg comes to life, but then fails. The error reads "Err: winedbg extract_packets Dropping packets: I was too slow to respond" . I do see this error on occasion even when not using DDD, and I can still work, so I don't know if that's the reason it stops. Does anyone have any insights into using this, or is there a better way altogether? I like a visual display where I can see several elements at once. Thanks for any help! Regards,...John Alway

2 2

[PATCH 1/3] crypt32/tests: Tidy up unexpected length failure messages in base64.
by Jeff Smith Oct. 9, 2019

Oct. 9, 2019

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/crypt32/tests/base64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 4ff76272e3..3668543048 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -121,12 +121,12 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen, strLen2 = strLen; ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, NULL, &strLen2); ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); - ok(strLen == strLen2, "Unexpected required length.\n"); + ok(strLen == strLen2, "Unexpected required length %u, expected %u.\n", strLen2, strLen); strLen2 = strLen - 1; ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, NULL, &strLen2); ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); - ok(strLen == strLen2, "Unexpected required length.\n"); + ok(strLen == strLen2, "Unexpected required length %u, expected %u.\n", strLen2, strLen); str = heap_alloc(strLen); @@ -137,7 +137,7 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen, todo_wine ok((!ret && GetLastError() == ERROR_MORE_DATA) || broken(ret) /* XP */, "CryptBinaryToStringA failed %d, error %d.\n", ret, GetLastError()); - ok(strLen2 == strLen || broken(strLen2 == strLen - 1), "Expected length %d, got %d\n", strLen - 1, strLen); + ok(strLen2 == strLen || broken(strLen2 == strLen - 1), "Expected length %d, got %d\n", strLen, strLen2); todo_wine { if (header) ok(str[0] == header[0], "Unexpected buffer contents %#x.\n", str[0]); @@ -147,7 +147,7 @@ todo_wine { strLen2 = strLen; ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, str, &strLen2); ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); - ok(strLen2 == strLen - 1, "Expected length %d, got %d\n", strLen - 1, strLen); + ok(strLen2 == strLen - 1, "Expected length %d, got %d\n", strLen - 1, strLen2); ptr = str; if (header) -- 2.21.0

1 2

[PATCH v3 1/2] wineserver: Implement thread priorities with sched_setscheduler / setpriority.
by Rémi Bernon Oct. 9, 2019

Oct. 9, 2019

This does not report permission errors in order to avoid any breaking change, only the parameter checks that were already there are returning errors. We only call setpriority on Linux, as unix_tid is a Mach port on Mac OS. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- configure.ac | 19 ++++++ include/config.h.in | 6 ++ server/process.c | 20 +++++- server/thread.c | 154 ++++++++++++++++++++++++++++++++++++++++---- server/thread.h | 1 + 5 files changed, 186 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index b9339b90aa7..47c1f7c5315 100644 --- a/configure.ac +++ b/configure.ac @@ -2285,6 +2285,25 @@ then AC_DEFINE(HAVE_SCHED_SETAFFINITY, 1, [Define to 1 if you have the `sched_setaffinity' function.]) fi +AC_CACHE_CHECK([for sched_setscheduler],wine_cv_have_sched_setscheduler, + AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#define _GNU_SOURCE +#include <sched.h>]], [[sched_setscheduler(0, 0, 0);]])],[wine_cv_have_sched_setscheduler=yes],[wine_cv_have_sched_setscheduler=no])) +if test "$wine_cv_have_sched_setscheduler" = "yes" +then + AC_DEFINE(HAVE_SCHED_SETSCHEDULER, 1, [Define to 1 if you have the `sched_setscheduler' function.]) +fi + +AC_CACHE_CHECK([for setpriority],wine_cv_have_setpriority, + AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#define _GNU_SOURCE +#include <sys/resource.h> +#include <sys/time.h>]], [[setpriority(0, 0, 0);]])],[wine_cv_have_setpriority=yes],[wine_cv_have_setpriority=no])) +if test "$wine_cv_have_setpriority" = "yes" +then + AC_DEFINE(HAVE_SETPRIORITY, 1, [Define to 1 if you have the `setpriority' function.]) +fi + AC_CACHE_CHECK([for fallocate],wine_cv_have_fallocate, AC_LINK_IFELSE([AC_LANG_PROGRAM( [[#define _GNU_SOURCE diff --git a/include/config.h.in b/include/config.h.in index 9c7a49ae9a2..929b11a8754 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -785,6 +785,9 @@ /* Define to 1 if you have the `sched_setaffinity' function. */ #undef HAVE_SCHED_SETAFFINITY +/* Define to 1 if you have the `sched_setscheduler' function. */ +#undef HAVE_SCHED_SETSCHEDULER + /* Define to 1 if you have the `sched_yield' function. */ #undef HAVE_SCHED_YIELD @@ -809,6 +812,9 @@ /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT +/* Define to 1 if you have the `setpriority' function. */ +#undef HAVE_SETPRIORITY + /* Define to 1 if you have the `setproctitle' function. */ #undef HAVE_SETPROCTITLE diff --git a/server/process.c b/server/process.c index 16bb5d57e72..0c544b46096 100644 --- a/server/process.c +++ b/server/process.c @@ -1465,6 +1465,24 @@ DECL_HANDLER(get_process_vm_counters) release_object( process ); } +static void set_process_priority( struct process *process, int priority ) +{ + struct thread *thread; + + if (!process->running_threads) + { + set_error( STATUS_PROCESS_IS_TERMINATING ); + return; + } + + LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) + { + set_thread_priority( thread, priority, thread->priority ); + } + + process->priority = priority; +} + static void set_process_affinity( struct process *process, affinity_t affinity ) { struct thread *thread; @@ -1490,7 +1508,7 @@ DECL_HANDLER(set_process_info) if ((process = get_process_from_handle( req->handle, PROCESS_SET_INFORMATION ))) { - if (req->mask & SET_PROCESS_INFO_PRIORITY) process->priority = req->priority; + if (req->mask & SET_PROCESS_INFO_PRIORITY) set_process_priority( process, req->priority ); if (req->mask & SET_PROCESS_INFO_AFFINITY) set_process_affinity( process, req->affinity ); release_object( process ); } diff --git a/server/thread.c b/server/thread.c index e753c8d0dda..36bd41e977f 100644 --- a/server/thread.c +++ b/server/thread.c @@ -38,6 +38,12 @@ #ifdef HAVE_SCHED_H #include <sched.h> #endif +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif +#ifdef HAVE_SYS_RESOURCE_H +#include <sys/resource.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -515,28 +521,149 @@ affinity_t get_thread_affinity( struct thread *thread ) return mask; } +#if defined(HAVE_SCHED_SETSCHEDULER) || defined(HAVE_SETPRIORITY) +static int get_unix_priority( int priority_class, int priority ) +{ + switch (priority_class) { + case PROCESS_PRIOCLASS_IDLE: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 10; + case THREAD_PRIORITY_BELOW_NORMAL: return 8; + case THREAD_PRIORITY_NORMAL: return 6; + case THREAD_PRIORITY_ABOVE_NORMAL: return 4; + case THREAD_PRIORITY_HIGHEST: return 2; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_BELOW_NORMAL: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 8; + case THREAD_PRIORITY_BELOW_NORMAL: return 6; + case THREAD_PRIORITY_NORMAL: return 4; + case THREAD_PRIORITY_ABOVE_NORMAL: return 2; + case THREAD_PRIORITY_HIGHEST: return 0; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_NORMAL: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 4; + case THREAD_PRIORITY_BELOW_NORMAL: return 2; + case THREAD_PRIORITY_NORMAL: return 0; + case THREAD_PRIORITY_ABOVE_NORMAL: return -2; + case THREAD_PRIORITY_HIGHEST: return -4; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_ABOVE_NORMAL: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 0; + case THREAD_PRIORITY_BELOW_NORMAL: return -2; + case THREAD_PRIORITY_NORMAL: return -4; + case THREAD_PRIORITY_ABOVE_NORMAL: return -6; + case THREAD_PRIORITY_HIGHEST: return -8; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_HIGH: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return -2; + case THREAD_PRIORITY_BELOW_NORMAL: return -4; + case THREAD_PRIORITY_NORMAL: return -6; + case THREAD_PRIORITY_ABOVE_NORMAL: return -8; + case THREAD_PRIORITY_HIGHEST: return -10; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_REALTIME: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 1; + case -7: + case -6: + case -5: + case -4: + case -3: + case THREAD_PRIORITY_LOWEST: + case THREAD_PRIORITY_BELOW_NORMAL: + case THREAD_PRIORITY_NORMAL: + case THREAD_PRIORITY_ABOVE_NORMAL: + case THREAD_PRIORITY_HIGHEST: + case 3: + case 4: + case 5: + case 6: + return priority + 9; + case THREAD_PRIORITY_TIME_CRITICAL: + return 16; + } + } + return 0; +} +#endif + #define THREAD_PRIORITY_REALTIME_HIGHEST 6 #define THREAD_PRIORITY_REALTIME_LOWEST -7 +int set_thread_priority( struct thread* thread, int priority_class, int priority ) +{ + int max = THREAD_PRIORITY_HIGHEST; + int min = THREAD_PRIORITY_LOWEST; + if (priority_class == PROCESS_PRIOCLASS_REALTIME) + { + max = THREAD_PRIORITY_REALTIME_HIGHEST; + min = THREAD_PRIORITY_REALTIME_LOWEST; + } + + if ((priority < min || priority > max) && + priority != THREAD_PRIORITY_IDLE && + priority != THREAD_PRIORITY_TIME_CRITICAL) + { + errno = EINVAL; + return -1; + } + + if (thread->process->priority == priority_class && + thread->priority == priority) + return 0; + + thread->priority = priority; + if (thread->unix_tid == -1) + return 0; + +#ifdef __linux__ + if (priority_class == PROCESS_PRIOCLASS_REALTIME) + { +#ifdef HAVE_SCHED_SETSCHEDULER + struct sched_param param; + if (sched_getparam( thread->unix_tid, &param ) != 0) + return 0; /* ignore errors for now */ + + param.sched_priority = get_unix_priority( priority_class, priority ); + if (sched_setscheduler( thread->unix_tid, SCHED_RR|SCHED_RESET_ON_FORK, &param ) == 0) + return 0; +#endif + } + else + { +#ifdef HAVE_SETPRIORITY + if (setpriority( PRIO_PROCESS, thread->unix_tid, + get_unix_priority( priority_class, priority ) ) == 0) + return 0; +#endif + } +#endif + + return 0; /* ignore errors for now */ +} + /* set all information about a thread */ static void set_thread_info( struct thread *thread, const struct set_thread_info_request *req ) { if (req->mask & SET_THREAD_INFO_PRIORITY) { - int max = THREAD_PRIORITY_HIGHEST; - int min = THREAD_PRIORITY_LOWEST; - if (thread->process->priority == PROCESS_PRIOCLASS_REALTIME) - { - max = THREAD_PRIORITY_REALTIME_HIGHEST; - min = THREAD_PRIORITY_REALTIME_LOWEST; - } - if ((req->priority >= min && req->priority <= max) || - req->priority == THREAD_PRIORITY_IDLE || - req->priority == THREAD_PRIORITY_TIME_CRITICAL) - thread->priority = req->priority; - else - set_error( STATUS_INVALID_PARAMETER ); + if (set_thread_priority( thread, thread->process->priority, req->priority )) + file_set_error(); } if (req->mask & SET_THREAD_INFO_AFFINITY) { @@ -1367,6 +1494,7 @@ DECL_HANDLER(init_thread) process->unix_pid = -1; /* can happen with linuxthreads */ init_thread_context( current ); generate_debug_event( current, CREATE_THREAD_DEBUG_EVENT, &req->entry ); + set_thread_priority( current, current->process->priority, current->priority ); set_thread_affinity( current, current->affinity ); } debug_level = max( debug_level, req->debug_level ); diff --git a/server/thread.h b/server/thread.h index e10120dcf6e..b81061aea11 100644 --- a/server/thread.h +++ b/server/thread.h @@ -125,6 +125,7 @@ extern int thread_add_inflight_fd( struct thread *thread, int client, int server extern int thread_get_inflight_fd( struct thread *thread, int client ); extern struct thread_snapshot *thread_snap( int *count ); extern struct token *thread_get_impersonation_token( struct thread *thread ); +extern int set_thread_priority( struct thread *thread, int priority_class, int priority ); extern int set_thread_affinity( struct thread *thread, affinity_t affinity ); extern int is_cpu_supported( enum cpu_type cpu ); extern unsigned int get_supported_cpu_mask(void); -- 2.23.0

1 1

[PATCH 1/4] dwrite: Update to IDWriteFontFaceReference1.
by Nikolay Sivov Oct. 9, 2019

Oct. 9, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 220 ++++++++++++++++++++++++--------------------- 1 file changed, 119 insertions(+), 101 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index be9ff88fe4..f83c14381f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -221,9 +221,10 @@ struct dwrite_fontfile { IDWriteFontFileStream *stream; }; -struct dwrite_fontfacereference { - IDWriteFontFaceReference IDWriteFontFaceReference_iface; - LONG ref; +struct dwrite_fontfacereference +{ + IDWriteFontFaceReference1 IDWriteFontFaceReference1_iface; + LONG refcount; IDWriteFontFile *file; UINT32 index; @@ -317,9 +318,9 @@ static inline struct dwrite_fontlist *impl_from_IDWriteFontList1(IDWriteFontList return CONTAINING_RECORD(iface, struct dwrite_fontlist, IDWriteFontList1_iface); } -static inline struct dwrite_fontfacereference *impl_from_IDWriteFontFaceReference(IDWriteFontFaceReference *iface) +static inline struct dwrite_fontfacereference *impl_from_IDWriteFontFaceReference1(IDWriteFontFaceReference1 *iface) { - return CONTAINING_RECORD(iface, struct dwrite_fontfacereference, IDWriteFontFaceReference_iface); + return CONTAINING_RECORD(iface, struct dwrite_fontfacereference, IDWriteFontFaceReference1_iface); } static HRESULT get_cached_glyph_metrics(struct dwrite_fontface *fontface, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics) @@ -5890,15 +5891,16 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R } /* IDWriteFontFaceReference */ -static HRESULT WINAPI fontfacereference_QueryInterface(IDWriteFontFaceReference *iface, REFIID riid, void **obj) +static HRESULT WINAPI fontfacereference_QueryInterface(IDWriteFontFaceReference1 *iface, REFIID riid, void **obj) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); - if (IsEqualIID(riid, &IID_IDWriteFontFaceReference) || IsEqualIID(riid, &IID_IUnknown)) { + if (IsEqualIID(riid, &IID_IDWriteFontFaceReference1) || + IsEqualIID(riid, &IID_IDWriteFontFaceReference) || + IsEqualIID(riid, &IID_IUnknown)) + { *obj = iface; - IDWriteFontFaceReference_AddRef(iface); + IDWriteFontFaceReference1_AddRef(iface); return S_OK; } @@ -5909,43 +5911,46 @@ static HRESULT WINAPI fontfacereference_QueryInterface(IDWriteFontFaceReference return E_NOINTERFACE; } -static ULONG WINAPI fontfacereference_AddRef(IDWriteFontFaceReference *iface) +static ULONG WINAPI fontfacereference_AddRef(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); - return ref; + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); + ULONG refcount = InterlockedIncrement(&reference->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; } -static ULONG WINAPI fontfacereference_Release(IDWriteFontFaceReference *iface) +static ULONG WINAPI fontfacereference_Release(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); + ULONG refcount = InterlockedDecrement(&reference->refcount); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("%p, refcount %u.\n", iface, refcount); - if (!ref) { - IDWriteFontFile_Release(This->file); - IDWriteFactory5_Release(This->factory); - heap_free(This); + if (!refcount) + { + IDWriteFontFile_Release(reference->file); + IDWriteFactory5_Release(reference->factory); + heap_free(reference); } - return ref; + return refcount; } -static HRESULT WINAPI fontfacereference_CreateFontFace(IDWriteFontFaceReference *iface, IDWriteFontFace3 **fontface) +static HRESULT WINAPI fontfacereference_CreateFontFace(IDWriteFontFaceReference1 *iface, IDWriteFontFace3 **fontface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); - TRACE("(%p)->(%p)\n", This, fontface); + TRACE("%p, %p.\n", iface, fontface); - return IDWriteFontFaceReference_CreateFontFaceWithSimulations(iface, This->simulations, fontface); + return IDWriteFontFaceReference1_CreateFontFaceWithSimulations(iface, reference->simulations, fontface); } -static HRESULT WINAPI fontfacereference_CreateFontFaceWithSimulations(IDWriteFontFaceReference *iface, +static HRESULT WINAPI fontfacereference_CreateFontFaceWithSimulations(IDWriteFontFaceReference1 *iface, DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFace3 **ret) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); DWRITE_FONT_FILE_TYPE file_type; DWRITE_FONT_FACE_TYPE face_type; IDWriteFontFace *fontface; @@ -5953,14 +5958,16 @@ static HRESULT WINAPI fontfacereference_CreateFontFaceWithSimulations(IDWriteFon UINT32 face_num; HRESULT hr; - TRACE("(%p)->(%d %p)\n", This, simulations, ret); + TRACE("%p, %#x, %p.\n", iface, simulations, ret); - hr = IDWriteFontFile_Analyze(This->file, &is_supported, &file_type, &face_type, &face_num); + hr = IDWriteFontFile_Analyze(reference->file, &is_supported, &file_type, &face_type, &face_num); if (FAILED(hr)) return hr; - hr = IDWriteFactory5_CreateFontFace(This->factory, face_type, 1, &This->file, This->index, simulations, &fontface); - if (SUCCEEDED(hr)) { + hr = IDWriteFactory5_CreateFontFace(reference->factory, face_type, 1, &reference->file, reference->index, + simulations, &fontface); + if (SUCCEEDED(hr)) + { hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace3, (void **)ret); IDWriteFontFace_Release(fontface); } @@ -5968,143 +5975,150 @@ static HRESULT WINAPI fontfacereference_CreateFontFaceWithSimulations(IDWriteFon return hr; } -static BOOL WINAPI fontfacereference_Equals(IDWriteFontFaceReference *iface, IDWriteFontFaceReference *ref) +static BOOL WINAPI fontfacereference_Equals(IDWriteFontFaceReference1 *iface, IDWriteFontFaceReference *ref) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); IDWriteFontFile *file; BOOL ret; - TRACE("(%p)->(%p)\n", This, ref); + TRACE("%p, %p.\n", iface, ref); if (FAILED(IDWriteFontFaceReference_GetFontFile(ref, &file))) return FALSE; - ret = is_same_fontfile(This->file, file) && - This->index == IDWriteFontFaceReference_GetFontFaceIndex(ref) && - This->simulations == IDWriteFontFaceReference_GetSimulations(ref); + ret = is_same_fontfile(reference->file, file) && + reference->index == IDWriteFontFaceReference_GetFontFaceIndex(ref) && + reference->simulations == IDWriteFontFaceReference_GetSimulations(ref); IDWriteFontFile_Release(file); return ret; } -static UINT32 WINAPI fontfacereference_GetFontFaceIndex(IDWriteFontFaceReference *iface) +static UINT32 WINAPI fontfacereference_GetFontFaceIndex(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); - TRACE("(%p)\n", This); + TRACE("%p.\n", iface); - return This->index; + return reference->index; } -static DWRITE_FONT_SIMULATIONS WINAPI fontfacereference_GetSimulations(IDWriteFontFaceReference *iface) +static DWRITE_FONT_SIMULATIONS WINAPI fontfacereference_GetSimulations(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); - TRACE("(%p)\n", This); + TRACE("%p.\n", iface); - return This->simulations; + return reference->simulations; } -static HRESULT WINAPI fontfacereference_GetFontFile(IDWriteFontFaceReference *iface, IDWriteFontFile **file) +static HRESULT WINAPI fontfacereference_GetFontFile(IDWriteFontFaceReference1 *iface, IDWriteFontFile **file) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); IDWriteFontFileLoader *loader; const void *key; UINT32 key_size; HRESULT hr; - TRACE("(%p)->(%p)\n", This, file); + TRACE("%p, %p.\n", iface, file); - hr = IDWriteFontFile_GetReferenceKey(This->file, &key, &key_size); + hr = IDWriteFontFile_GetReferenceKey(reference->file, &key, &key_size); if (FAILED(hr)) return hr; - hr = IDWriteFontFile_GetLoader(This->file, &loader); + hr = IDWriteFontFile_GetLoader(reference->file, &loader); if (FAILED(hr)) return hr; - hr = IDWriteFactory5_CreateCustomFontFileReference(This->factory, key, key_size, loader, file); + hr = IDWriteFactory5_CreateCustomFontFileReference(reference->factory, key, key_size, loader, file); IDWriteFontFileLoader_Release(loader); return hr; } -static UINT64 WINAPI fontfacereference_GetLocalFileSize(IDWriteFontFaceReference *iface) +static UINT64 WINAPI fontfacereference_GetLocalFileSize(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - - FIXME("(%p): stub\n", This); + FIXME("%p.\n", iface); return 0; } -static UINT64 WINAPI fontfacereference_GetFileSize(IDWriteFontFaceReference *iface) +static UINT64 WINAPI fontfacereference_GetFileSize(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - - FIXME("(%p): stub\n", This); + FIXME("%p.\n", iface); return 0; } -static HRESULT WINAPI fontfacereference_GetFileTime(IDWriteFontFaceReference *iface, FILETIME *writetime) +static HRESULT WINAPI fontfacereference_GetFileTime(IDWriteFontFaceReference1 *iface, FILETIME *writetime) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - - FIXME("(%p)->(%p): stub\n", This, writetime); + FIXME("%p, %p.\n", iface, writetime); return E_NOTIMPL; } -static DWRITE_LOCALITY WINAPI fontfacereference_GetLocality(IDWriteFontFaceReference *iface) +static DWRITE_LOCALITY WINAPI fontfacereference_GetLocality(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - - FIXME("(%p): stub\n", This); + FIXME("%p.\n", iface); return DWRITE_LOCALITY_LOCAL; } -static HRESULT WINAPI fontfacereference_EnqueueFontDownloadRequest(IDWriteFontFaceReference *iface) +static HRESULT WINAPI fontfacereference_EnqueueFontDownloadRequest(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - - FIXME("(%p): stub\n", This); + FIXME("%p.\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI fontfacereference_EnqueueCharacterDownloadRequest(IDWriteFontFaceReference *iface, WCHAR const *chars, - UINT32 count) +static HRESULT WINAPI fontfacereference_EnqueueCharacterDownloadRequest(IDWriteFontFaceReference1 *iface, + WCHAR const *chars, UINT32 count) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + FIXME("%p, %s, %u.\n", iface, debugstr_wn(chars, count), count); - FIXME("(%p)->(%s:%u): stub\n", This, debugstr_wn(chars, count), count); + return E_NOTIMPL; +} + +static HRESULT WINAPI fontfacereference_EnqueueGlyphDownloadRequest(IDWriteFontFaceReference1 *iface, + UINT16 const *glyphs, UINT32 count) +{ + FIXME("%p, %p, %u.\n", iface, glyphs, count); return E_NOTIMPL; } -static HRESULT WINAPI fontfacereference_EnqueueGlyphDownloadRequest(IDWriteFontFaceReference *iface, UINT16 const *glyphs, - UINT32 count) +static HRESULT WINAPI fontfacereference_EnqueueFileFragmentDownloadRequest(IDWriteFontFaceReference1 *iface, + UINT64 offset, UINT64 size) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + FIXME("%p, 0x%s, 0x%s.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(size)); - FIXME("(%p)->(%p %u): stub\n", This, glyphs, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI fontfacereference1_CreateFontFace(IDWriteFontFaceReference1 *iface, IDWriteFontFace5 **fontface) +{ + FIXME("%p, %p.\n", iface, fontface); return E_NOTIMPL; } -static HRESULT WINAPI fontfacereference_EnqueueFileFragmentDownloadRequest(IDWriteFontFaceReference *iface, - UINT64 offset, UINT64 size) +static UINT32 WINAPI fontfacereference1_GetFontAxisValueCount(IDWriteFontFaceReference1 *iface) { - struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + FIXME("%p.\n", iface); - FIXME("(%p)->(0x%s 0x%s): stub\n", This, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(size)); + return 0; +} + +static HRESULT WINAPI fontfacereference1_GetFontAxisValues(IDWriteFontFaceReference1 *iface, + DWRITE_FONT_AXIS_VALUE *axis_values, UINT32 value_count) +{ + FIXME("%p, %p, %u.\n", iface, axis_values, value_count); return E_NOTIMPL; } -static const IDWriteFontFaceReferenceVtbl fontfacereferencevtbl = { +static const IDWriteFontFaceReference1Vtbl fontfacereferencevtbl = +{ fontfacereference_QueryInterface, fontfacereference_AddRef, fontfacereference_Release, @@ -6121,33 +6135,37 @@ static const IDWriteFontFaceReferenceVtbl fontfacereferencevtbl = { fontfacereference_EnqueueFontDownloadRequest, fontfacereference_EnqueueCharacterDownloadRequest, fontfacereference_EnqueueGlyphDownloadRequest, - fontfacereference_EnqueueFileFragmentDownloadRequest + fontfacereference_EnqueueFileFragmentDownloadRequest, + fontfacereference1_CreateFontFace, + fontfacereference1_GetFontAxisValueCount, + fontfacereference1_GetFontAxisValues, }; HRESULT create_fontfacereference(IDWriteFactory5 *factory, IDWriteFontFile *file, UINT32 index, DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFaceReference **ret) { - struct dwrite_fontfacereference *ref; + struct dwrite_fontfacereference *object; *ret = NULL; if (!is_simulation_valid(simulations)) return E_INVALIDARG; - ref = heap_alloc(sizeof(*ref)); - if (!ref) + object = heap_alloc(sizeof(*object)); + if (!object) return E_OUTOFMEMORY; - ref->IDWriteFontFaceReference_iface.lpVtbl = &fontfacereferencevtbl; - ref->ref = 1; + object->IDWriteFontFaceReference1_iface.lpVtbl = &fontfacereferencevtbl; + object->refcount = 1; + + object->factory = factory; + IDWriteFactory5_AddRef(object->factory); + object->file = file; + IDWriteFontFile_AddRef(object->file); + object->index = index; + object->simulations = simulations; - ref->factory = factory; - IDWriteFactory5_AddRef(ref->factory); - ref->file = file; - IDWriteFontFile_AddRef(ref->file); - ref->index = index; - ref->simulations = simulations; - *ret = &ref->IDWriteFontFaceReference_iface; + *ret = (IDWriteFontFaceReference *)&object->IDWriteFontFaceReference1_iface; return S_OK; } -- 2.23.0

2 4

[PATCH] msxml3/tests: Add IXMLDOMNode::selectSingleNode() test for an XML with multiple namespaces.
by Dmitry Timoshkov Oct. 9, 2019

Oct. 9, 2019

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/tests/domdoc.c | 80 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c4337ab191..eee29add38 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12998,6 +12998,85 @@ static void test_namespaces_as_attributes(void) free_bstrs(); } +static const char ticket[] = +"<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +"<psf:PrintTicket xmlns:psf=\"http://a\" xmlns:xsi=\"http://b\" xmlns:xsd=\"http://c\" xmlns:psk=\"http://d\">" +" <psf:Feature name=\"psk:PageMediaSize\">" +" <psf:Option name=\"psk:ISOA4\">" +" <psf:ScoredProperty name=\"psk:MediaSizeWidth\">" +" <psf:Value xsi:type=\"xsd:integer\">210000</psf:Value>" +" </psf:ScoredProperty>" +" <psf:ScoredProperty name=\"psk:MediaSizeHeight\">" +" <psf:Value xsi:type=\"xsd:integer\">297000</psf:Value>" +" </psf:ScoredProperty>" +" </psf:Option>" +" </psf:Feature>" +"</psf:PrintTicket>"; + +static void test_selectSingleNode_ns(void) +{ + IXMLDOMDocument *doc; + IXMLDOMNode *node, *option, *child, *val; + VARIANT_BOOL b; + VARIANT var; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + + b = VARIANT_FALSE; + hr = IXMLDOMDocument_loadXML(doc, _bstr_(ticket), &b); + ok(hr == S_OK, "got %#x\n", hr ); + ok(b == VARIANT_TRUE, "got %d\n", b); + + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("psf:PrintTicket/psf:Feature[@name='psk:PageMediaSize']"), &node); + ok(hr == S_OK, "got %#x\n", hr ); + + hr = IXMLDOMNode_selectSingleNode(node, _bstr_("./psf:Option"), &option); + ok(hr == S_OK, "got %#x\n", hr ); + + hr = IXMLDOMNode_selectSingleNode(option, _bstr_("./psf:ScoredProperty[@name='psk:MediaSizeWidth']"), &child); + ok(hr == S_OK, "got %#x\n", hr ); + + hr = IXMLDOMNode_selectSingleNode(child, _bstr_("./psf:Value[@xsi:type='xsd:integer']"), &val); +todo_wine + ok(hr == S_OK, "got %#x\n", hr ); + if (hr == S_OK) + { + VariantInit(&var); + hr = IXMLDOMNode_get_nodeTypedValue(val, &var); + ok(hr == S_OK, "got %#x\n", hr ); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"210000"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + IXMLDOMNode_Release(val); + } + IXMLDOMNode_Release(child); + + hr = IXMLDOMNode_selectSingleNode(option, _bstr_("./psf:ScoredProperty[@name='psk:MediaSizeHeight']"), &child); + ok(hr == S_OK, "got %#x\n", hr ); + + hr = IXMLDOMNode_selectSingleNode(child, _bstr_("./psf:Value[@xsi:type='xsd:integer']"), &val); +todo_wine + ok(hr == S_OK, "got %#x\n", hr ); + if (hr == S_OK) + { + VariantInit(&var); + hr = IXMLDOMNode_get_nodeTypedValue(val, &var); + ok(hr == S_OK, "got %#x\n", hr ); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"297000"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + IXMLDOMNode_Release(val); + } + IXMLDOMNode_Release(child); + + IXMLDOMNode_Release(option); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { HRESULT hr; @@ -13014,6 +13093,7 @@ START_TEST(domdoc) return; } + test_selectSingleNode_ns(); test_domdoc(); test_persiststream(); test_domnode(); -- 2.20.1

2 4

[PATCH] dinput: Dont treat Stylus devices as joysticks.
by Alistair Leslie-Hughes Oct. 9, 2019

Oct. 9, 2019

Tablet/Stylus devices have a js* entry which we are treating as a yoystick. Any testbox VM that is configured with is a tablet is currently failing the joystick tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/joystick_linux.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 67898a708d7..3ecbf441aad 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -168,6 +168,7 @@ static INT find_joystick_devices(void) struct JoyDev joydev, *new_joydevs; BYTE axes_map[ABS_MAX + 1]; SHORT btn_map[KEY_MAX - BTN_MISC + 1]; + BOOL is_stylus = FALSE; snprintf(joydev.device, sizeof(joydev.device), "%s%d", JOYDEV_NEW, i); if ((fd = open(joydev.device, O_RDONLY)) == -1) @@ -241,12 +242,22 @@ static INT find_joystick_devices(void) case BTN_DEAD: joydev.is_joystick = TRUE; break; + case BTN_STYLUS: + is_stylus = TRUE; + break; default: break; } } } + if(is_stylus) + { + TRACE("Stylus detected. Skipping\n"); + close(fd); + continue; + } + if (ioctl(fd, JSIOCGAXMAP, axes_map) < 0) { WARN("ioctl(%s,JSIOCGAXMAP) failed: %s\n", joydev.device, strerror(errno)); -- 2.23.0

1 0

[PATCH v3 1/5] winegcc: Strip symbols before the make_wine_builtin call.
by Rémi Bernon Oct. 9, 2019

Oct. 9, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47718 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/winegcc/winegcc.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 0ca553318eb..893ad1021ea 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -406,6 +406,10 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, "-image_base" ); strarray_add( flags, opts->image_base ); } + /* On Mac, change -s into -Wl,-x. ld's -s switch + * is deprecated, and it doesn't work on Tiger with + * MH_BUNDLEs anyway + */ if (opts->strip) strarray_add( flags, "-Wl,-x" ); strarray_addall( link_args, flags ); return link_args; @@ -1250,9 +1254,21 @@ static void build(struct options* opts) if (libgcc) strarray_add(link_args, libgcc); + if (opts->target_platform != PLATFORM_APPLE && !is_pe && opts->strip) + strarray_add(link_args, "-s"); + spawn(opts->prefix, link_args, 0); strarray_free (link_args); + if (opts->target_platform != PLATFORM_APPLE && is_pe && opts->strip) + { + strarray *strip_args = strarray_fromstring(build_tool_name(opts, "strip", "strip"), " "); + strarray_add(strip_args, "--strip-all"); + strarray_add(strip_args, output_path); + spawn(opts->prefix, strip_args, 1); + strarray_free(strip_args); + } + if (is_pe && opts->wine_builtin) make_wine_builtin( output_path ); /* set the base address with prelink if linker support is not present */ @@ -1626,12 +1642,8 @@ int main(int argc, char **argv) opts.shared = 1; raw_compiler_arg = raw_linker_arg = 0; } - else if (strcmp("-s", argv[i]) == 0 && opts.target_platform == PLATFORM_APPLE) + else if (strcmp("-s", argv[i]) == 0) { - /* On Mac, change -s into -Wl,-x. ld's -s switch - * is deprecated, and it doesn't work on Tiger with - * MH_BUNDLEs anyway - */ opts.strip = 1; raw_linker_arg = 0; } @@ -1666,6 +1678,11 @@ int main(int argc, char **argv) opts.wine_builtin = 1; continue; } + if (!strcmp(Wl->base[j], "--strip-all") || !strcmp(Wl->base[j], "-s")) + { + opts.strip = 1; + continue; + } if (!strcmp(Wl->base[j], "--subsystem") && j < Wl->size - 1) { opts.subsystem = strdup( Wl->base[++j] ); -- 2.23.0

1 4