wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Jacek Caban : dsound: Close sleepev handle after releasing audio client.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 158a2c96cc4044f8cb2f63686ebde6b5f59e747e URL: https://source.winehq.org/git/wine.git/?a=commit;h=158a2c96cc4044f8cb2f6368… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 26 17:33:27 2018 +0100 dsound: Close sleepev handle after releasing audio client. It's used as audio client event handle, so it shouldn't be closed as long as audio client is alive. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 6a49d63..12f1e28 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -207,7 +207,6 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) CloseHandle(device->thread); CloseHandle(device->thread_finished); } - CloseHandle(device->sleepev); EnterCriticalSection(&DSOUND_renderers_lock); list_remove(&device->entry); @@ -234,6 +233,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) IAudioStreamVolume_Release(device->volume); if(device->mmdevice) IMMDevice_Release(device->mmdevice); + CloseHandle(device->sleepev); HeapFree(GetProcessHeap(), 0, device->tmp_buffer); HeapFree(GetProcessHeap(), 0, device->cp_buffer); HeapFree(GetProcessHeap(), 0, device->buffer);

1 0

André Hentschel : kernel32: Implement GetCurrentThreadStackLimits.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: ee9f2c62d53c8838fda5b6f485e1f865f4a8bf69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee9f2c62d53c8838fda5b6f4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 25 17:03:20 2018 +0100 kernel32: Implement GetCurrentThreadStackLimits. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46179 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/thread.c | 26 ++++++++++++++++++++++ dlls/kernel32/thread.c | 9 ++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 6 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index 563bd79..708a8ef 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -15,7 +15,7 @@ @ stdcall GetCurrentProcessorNumberEx(ptr) kernel32.GetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread @ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId -@ stub GetCurrentThreadStackLimits +@ stdcall GetCurrentThreadStackLimits(ptr ptr) kernel32.GetCurrentThreadStackLimits @ stdcall GetExitCodeProcess(long ptr) kernel32.GetExitCodeProcess @ stdcall GetExitCodeThread(long ptr) kernel32.GetExitCodeThread @ stdcall GetPriorityClass(long) kernel32.GetPriorityClass diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index 85830a1..a29ef43 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -15,7 +15,7 @@ @ stdcall GetCurrentProcessorNumberEx(ptr) kernel32.GetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread @ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId -@ stub GetCurrentThreadStackLimits +@ stdcall GetCurrentThreadStackLimits(ptr ptr) kernel32.GetCurrentThreadStackLimits @ stdcall GetExitCodeProcess(long ptr) kernel32.GetExitCodeProcess @ stdcall GetExitCodeThread(long ptr) kernel32.GetExitCodeThread @ stdcall GetPriorityClass(long) kernel32.GetPriorityClass diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 85fce37..ae7bc88 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -635,6 +635,7 @@ @ stdcall GetCurrentProcessorNumberEx(ptr) ntdll.RtlGetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() @ stdcall -norelay GetCurrentThreadId() +@ stdcall GetCurrentThreadStackLimits(ptr ptr) @ stdcall -arch=x86_64 GetCurrentUmsThread() @ stdcall GetDateFormatA(long long ptr str ptr long) @ stdcall GetDateFormatEx(wstr long ptr wstr ptr long wstr) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index b69d2eb..f27bbdf 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -76,6 +76,7 @@ #define ARCH "none" #endif +static void (WINAPI *pGetCurrentThreadStackLimits)(PULONG_PTR,PULONG_PTR); static BOOL (WINAPI *pGetThreadPriorityBoost)(HANDLE,PBOOL); static HANDLE (WINAPI *pOpenThread)(DWORD,BOOL,DWORD); static BOOL (WINAPI *pQueueUserWorkItem)(LPTHREAD_START_ROUTINE,PVOID,ULONG); @@ -992,6 +993,29 @@ static VOID test_thread_processor(void) win_skip("Get/SetThreadGroupAffinity not available\n"); } +static VOID test_GetCurrentThreadStackLimits(void) +{ + ULONG_PTR low = 0, high = 0; + + if (!pGetCurrentThreadStackLimits) + { + win_skip("GetCurrentThreadStackLimits not available.\n"); + return; + } + + if (0) + { + /* crashes on native */ + pGetCurrentThreadStackLimits(NULL, NULL); + pGetCurrentThreadStackLimits(NULL, &high); + pGetCurrentThreadStackLimits(&low, NULL); + } + + pGetCurrentThreadStackLimits(&low, &high); + ok(low == (ULONG_PTR)NtCurrentTeb()->DeallocationStack, "exptected %p, got %lx\n", NtCurrentTeb()->DeallocationStack, low); + ok(high == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase, "exptected %p, got %lx\n", NtCurrentTeb()->Tib.StackBase, high); +} + static VOID test_GetThreadExitCode(void) { DWORD exitCode, threadid; @@ -1999,6 +2023,7 @@ static void init_funcs(void) so that the compile passes */ #define X(f) p##f = (void*)GetProcAddress(hKernel32, #f) + X(GetCurrentThreadStackLimits); X(GetThreadPriorityBoost); X(OpenThread); X(QueueUserWorkItem); @@ -2084,6 +2109,7 @@ START_TEST(thread) test_TerminateThread(); test_CreateThread_stack(); test_thread_priority(); + test_GetCurrentThreadStackLimits(); test_GetThreadTimes(); test_thread_processor(); test_GetThreadExitCode(); diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index e6b99ae..ac5d465 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -701,6 +701,15 @@ HANDLE WINAPI GetCurrentThread(void) return (HANDLE)~(ULONG_PTR)1; } +/*********************************************************************** + * GetCurrentThreadStackLimits (KERNEL32.@) + */ +void WINAPI GetCurrentThreadStackLimits(ULONG_PTR *low, ULONG_PTR *high) +{ + *low = (ULONG_PTR)NtCurrentTeb()->DeallocationStack; + *high = (ULONG_PTR)NtCurrentTeb()->Tib.StackBase; +} + #ifdef __i386__ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index d1bff9f..45b375c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -471,7 +471,7 @@ # @ stub GetCurrentTargetPlatformContext @ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread @ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId -# @ stub GetCurrentThreadStackLimits +@ stdcall GetCurrentThreadStackLimits(ptr ptr) kernel32.GetCurrentThreadStackLimits @ stdcall GetDateFormatA(long long ptr str ptr long) kernel32.GetDateFormatA @ stdcall GetDateFormatEx(wstr long ptr wstr ptr long wstr) kernel32.GetDateFormatEx @ stdcall GetDateFormatW(long long ptr wstr ptr long) kernel32.GetDateFormatW

1 0

Sven Baars : mfplat: Improve CreatePresentationDescriptor stub in IMFMediaSource.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 7a3f08c7a3b6e2bdfea5ca34d6b03a208daed82b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a3f08c7a3b6e2bdfea5ca34… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Nov 25 20:45:05 2018 +0100 mfplat: Improve CreatePresentationDescriptor stub in IMFMediaSource. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 346 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mfplat/tests/mfplat.c | 7 + 2 files changed, 352 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a3f08c7a3b6e2bdfea5…

1 0

Sven Baars : mf: Return S_OK from IMFMediaSession::Close.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: d4ff44427e36bda99323d46e34259ea313587485 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4ff44427e36bda99323d46e… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Nov 25 20:45:04 2018 +0100 mf: Return S_OK from IMFMediaSession::Close. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 18c5f3b..5913af3 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -176,7 +176,7 @@ static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface) FIXME("(%p)\n", This); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface)

1 0

Alexandre Julliard : wineandroid: Enable some Java compiler warnings.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 4e21bb44e4cd403d4ae618a12d01e8af50c3fa8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e21bb44e4cd403d4ae618a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 16:41:33 2018 +0100 wineandroid: Enable some Java compiler warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 2 +- dlls/wineandroid.drv/build.gradle.in | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 4cfe8e0..8013b3a 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -729,7 +729,7 @@ public class WineActivity extends Activity { Log.i( LOGTAG, String.format( "view key event win %08x action %d keycode %d (%s)", window.hwnd, event.getAction(), event.getKeyCode(), - event.keyCodeToString( event.getKeyCode() )));; + KeyEvent.keyCodeToString( event.getKeyCode() )));; boolean ret = wine_keyboard_event( window.hwnd, event.getAction(), event.getKeyCode(), event.getMetaState() ); if (!ret) ret = super.dispatchKeyEvent(event); diff --git a/dlls/wineandroid.drv/build.gradle.in b/dlls/wineandroid.drv/build.gradle.in index 7271c49..3fba34a 100644 --- a/dlls/wineandroid.drv/build.gradle.in +++ b/dlls/wineandroid.drv/build.gradle.in @@ -56,6 +56,11 @@ tasks.whenTaskAdded { t -> } } +tasks.withType(JavaCompile) +{ + options.compilerArgs << "-Xlint" +} + android { compileSdkVersion 25

1 0

Alexandre Julliard : wineandroid: Support for setting the cursor on Android >= N.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 61888e001279d28ba6e95c81b47db4e009148da2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61888e001279d28ba6e95c81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 16:11:44 2018 +0100 wineandroid: Support for setting the cursor on Android >= N. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 28 ++++ dlls/wineandroid.drv/android.h | 4 +- dlls/wineandroid.drv/build.gradle.in | 2 +- dlls/wineandroid.drv/device.c | 72 ++++++++ dlls/wineandroid.drv/window.c | 266 ++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 6 files changed, 371 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61888e001279d28ba6e9…

1 0

Alexandre Julliard : wineandroid: Wrap Java calls to preserve %gs on x86_64.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 2b8d787b176d2f977c88925542fd5bbdb20261d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b8d787b176d2f977c889255… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 14:42:18 2018 +0100 wineandroid: Wrap Java calls to preserve %gs on x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index c0ff072..c9a9a95 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -240,13 +240,39 @@ static inline BOOL is_client_in_process(void) return current_client_id() == GetCurrentProcessId(); } -#ifdef __i386__ /* the Java VM uses %fs for its own purposes, so we need to wrap the calls */ +#ifdef __i386__ /* the Java VM uses %fs/%gs for its own purposes, so we need to wrap the calls */ + static WORD orig_fs, java_fs; static inline void wrap_java_call(void) { wine_set_fs( java_fs ); } static inline void unwrap_java_call(void) { wine_set_fs( orig_fs ); } +static inline void init_java_thread( JavaVM *java_vm ) +{ + orig_fs = wine_get_fs(); + (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); + java_fs = wine_get_fs(); + wine_set_fs( orig_fs ); +} + +#elif defined(__x86_64__) + +#include <asm/prctl.h> +#include <asm/unistd.h> +static void *orig_teb, *java_teb; +static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_prctl, func, ptr ); } +static inline void wrap_java_call(void) { arch_prctl( ARCH_SET_GS, java_teb ); } +static inline void unwrap_java_call(void) { arch_prctl( ARCH_SET_GS, orig_teb ); } +static inline void init_java_thread( JavaVM *java_vm ) +{ + arch_prctl( ARCH_GET_GS, &orig_teb ); + (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); + arch_prctl( ARCH_GET_GS, &java_teb ); + arch_prctl( ARCH_SET_GS, orig_teb ); +} + #else static inline void wrap_java_call(void) { } static inline void unwrap_java_call(void) { } +static inline void init_java_thread( JavaVM *java_vm ) { (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); } #endif /* __i386__ */ static struct native_win_data *data_map[65536]; @@ -1092,15 +1118,7 @@ static DWORD CALLBACK device_thread( void *arg ) if (!(java_vm = wine_get_java_vm())) return 0; /* not running under Java */ -#ifdef __i386__ - orig_fs = wine_get_fs(); - (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); - java_fs = wine_get_fs(); - wine_set_fs( orig_fs ); - if (java_fs != orig_fs) TRACE( "%%fs changed from %04x to %04x by Java VM\n", orig_fs, java_fs ); -#else - (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); -#endif + init_java_thread( java_vm ); create_desktop_window( GetDesktopWindow() ); @@ -1116,7 +1134,9 @@ static DWORD CALLBACK device_thread( void *arg ) ret = wine_ntoskrnl_main_loop( stop_event ); + wrap_java_call(); (*java_vm)->DetachCurrentThread( java_vm ); + unwrap_java_call(); return ret; }

1 0

Alexandre Julliard : wineandroid: Avoid using deprecated Build.CPU_ABI.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 996f7a192d6148c9eb017d87d220d1af5841c54b URL: https://source.winehq.org/git/wine.git/?a=commit;h=996f7a192d6148c9eb017d87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 14:40:33 2018 +0100 wineandroid: Avoid using deprecated Build.CPU_ABI. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 38 +++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 1d5b346..e9ab1f2 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -20,6 +20,7 @@ package org.winehq.wine; +import android.annotation.TargetApi; import android.app.Activity; import android.app.ProgressDialog; import android.content.Context; @@ -74,18 +75,38 @@ public class WineActivity extends Activity new Thread( new Runnable() { public void run() { loadWine( null ); }} ).start(); } + @TargetApi(21) + @SuppressWarnings("deprecation") + private String[] get_supported_abis() + { + if (Build.VERSION.SDK_INT >= 21) return Build.SUPPORTED_ABIS; + return new String[]{ Build.CPU_ABI }; + } + + private String get_wine_abi() + { + for (String abi : get_supported_abis()) + { + File server = new File( getFilesDir(), abi + "/bin/wineserver" ); + if (server.canExecute()) return abi; + } + Log.e( LOGTAG, "could not find a supported ABI" ); + return null; + } + private void loadWine( String cmdline ) { - File bindir = new File( getFilesDir(), Build.CPU_ABI + "/bin" ); - File libdir = new File( getFilesDir(), Build.CPU_ABI + "/lib" ); + copyAssetFiles(); + + String wine_abi = get_wine_abi(); + File bindir = new File( getFilesDir(), wine_abi + "/bin" ); + File libdir = new File( getFilesDir(), wine_abi + "/lib" ); File dlldir = new File( libdir, "wine" ); File prefix = new File( getFilesDir(), "prefix" ); File loader = new File( bindir, "wine" ); String locale = Locale.getDefault().getLanguage() + "_" + Locale.getDefault().getCountry() + ".UTF-8"; - copyAssetFiles(); - HashMap<String,String> env = new HashMap<String,String>(); env.put( "WINELOADER", loader.toString() ); env.put( "WINEPREFIX", prefix.toString() ); @@ -166,15 +187,18 @@ public class WineActivity extends Activity { if (name.equals( "files.sum" )) return true; if (name.startsWith( "share/" )) return true; - if (name.startsWith( Build.CPU_ABI + "/system/" )) return false; - if (name.startsWith( Build.CPU_ABI + "/" )) return true; + for (String abi : get_supported_abis()) + { + if (name.startsWith( abi + "/system/" )) return false; + if (name.startsWith( abi + "/" )) return true; + } if (name.startsWith( "x86/" )) return true; return false; } private final boolean isFileExecutable( String name ) { - return name.startsWith( Build.CPU_ABI + "/" ) || name.startsWith( "x86/" ); + return !name.equals( "files.sum" ) && !name.startsWith( "share/" ); } private final HashMap<String,String> readMapFromInputStream( InputStream in )

1 0

Alexandre Julliard : makefiles: Create 64-bit winewrapper symlink in the WoW64 build tree.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: faac33827c640c3884974d73f36d1582d97a0577 URL: https://source.winehq.org/git/wine.git/?a=commit;h=faac33827c640c3884974d73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 14:20:39 2018 +0100 makefiles: Create 64-bit winewrapper symlink in the WoW64 build tree. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 2 +- configure | 2 +- configure.ac | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 289ee92..25ac678 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -257,7 +257,7 @@ dnl dnl Usage: WINE_CONFIG_SYMLINK(target,src,files,enable,srcfile) dnl AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl -m4_ifval([$4],[if test "x$[$4]" != xno; then +m4_ifval([$4],[if test $4; then ])m4_foreach([f],[$3], [AC_CONFIG_LINKS(m4_ifval([$1],[$1/])f[:]m4_ifval([$2],[$2/])m4_ifval([$5],[$5],f))])dnl m4_if([$1],[$2],[test "$srcdir" = "." || ])dnl diff --git a/configure b/configure index 63f4633..bb2817c 100755 --- a/configure +++ b/configure @@ -18977,7 +18977,7 @@ ac_config_links="$ac_config_links loader/l_intl.nls:loader/l_intl.nls" test "$srcdir" = "." || wine_fn_config_symlink loader/l_intl.nls ac_config_links="$ac_config_links wine:tools/winewrapper" wine_fn_config_symlink wine -if test "x$enable_win64" != xno; then +if test "x$enable_win64" != xno -o -n "$with_wine64"; then ac_config_links="$ac_config_links wine64:tools/winewrapper" wine_fn_config_symlink wine64 fi diff --git a/configure.ac b/configure.ac index 39cabf2..8bf5e10 100644 --- a/configure.ac +++ b/configure.ac @@ -2832,10 +2832,10 @@ Makefile: $srcdir/Makefile.in config.status \$(MAKEDEP) depend: \$(MAKEDEP) dummy \$(MAKEDEP)]) -WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf,wingding.ttf],enable_fonts) +WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf,wingding.ttf],["x$enable_fonts" != xno]) WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls]) WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper) -WINE_CONFIG_SYMLINK(,tools,[wine64],enable_win64,winewrapper) +WINE_CONFIG_SYMLINK(,tools,[wine64],["x$enable_win64" != xno -o -n "$with_wine64"],winewrapper) WINE_CONFIG_MAKEFILE(dlls/acledit) WINE_CONFIG_MAKEFILE(dlls/aclui)

1 0

Alexandre Julliard : makefiles: Create 64-bit wine loader symlinks in the WoW64 build tree.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 013c51aca031676f629f9e9601085f6c88f54647 URL: https://source.winehq.org/git/wine.git/?a=commit;h=013c51aca031676f629f9e96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 14:06:39 2018 +0100 makefiles: Create 64-bit wine loader symlinks in the WoW64 build tree. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 10 ++++++++-- configure.ac | 10 ++++++++-- dlls/kernel32/process.c | 2 +- dlls/ntdll/process.c | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 3c235e3..63f4633 100755 --- a/configure +++ b/configure @@ -20188,15 +20188,21 @@ fi if test -n "$with_wine64" then - wine_fn_append_rule "all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader + case "$with_wine64" in + /*) reldir="" ;; + *) reldir="../" ;; + esac + wine_fn_append_rule "all: fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader fonts server: \$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@ +loader/wine64 loader/wine64-preloader: + \$(RM) \$@ && \$(LN_S) $reldir$with_wine64/\$@ \$@ $with_wine64/loader/wine: \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@ $with_wine64/loader/wine-preloader: \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@ clean:: - \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader" + \$(RM) fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else WINELOADER_INSTALL="wine.inf l_intl.nls" diff --git a/configure.ac b/configure.ac index 294fe4b..39cabf2 100644 --- a/configure.ac +++ b/configure.ac @@ -4058,16 +4058,22 @@ fi if test -n "$with_wine64" then + case "$with_wine64" in + /*) reldir="" ;; + *) reldir="../" ;; + esac WINE_APPEND_RULE( -[all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader +[all: fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader fonts server: \$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@] +loader/wine64 loader/wine64-preloader: + \$(RM) \$[@] && \$(LN_S) $reldir$with_wine64/\$[@] \$[@] $with_wine64/loader/wine: \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@] $with_wine64/loader/wine-preloader: \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@] clean:: - \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) + \$(RM) fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else AC_SUBST(WINELOADER_INSTALL,"wine.inf l_intl.nls") case $host_os in diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index abf33df..26c576e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1958,7 +1958,7 @@ static const char *get_alternate_loader( char **ret_env ) *ret_env = NULL; - if (wine_get_build_dir()) loader = is_win64 ? "loader/wine" : "server/../loader/wine64"; + if (wine_get_build_dir()) loader = is_win64 ? "loader/wine" : "loader/wine64"; if (loader_env) { diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 623bf65..2ff8610 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -976,7 +976,7 @@ static const char *get_alternate_loader( char **ret_env ) *ret_env = NULL; - if (wine_get_build_dir()) loader = is_win64 ? "loader/wine" : "server/../loader/wine64"; + if (wine_get_build_dir()) loader = is_win64 ? "loader/wine" : "loader/wine64"; if (loader_env) {

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2018