September 2020 - Wine-commits

Myah Caron : cmd.exe: Don't prompt for move when non-interactive.
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: d1790c984bebb55e4d08644e84cfabd85abeefe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1790c984bebb55e4d08644e… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Thu Sep 10 19:17:36 2020 +0000 cmd.exe: Don't prompt for move when non-interactive. Based on a patch by Francesco Noferi. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48396 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d2f2ea517a..934e55ac58 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3033,15 +3033,28 @@ void WCMD_move (void) WCHAR copycmd[MAXSTRING]; DWORD len; - /* /-Y has the highest priority, then /Y and finally the COPYCMD env. variable */ + /* Default whether automatic overwriting is on. If we are interactive then + we prompt by default, otherwise we overwrite by default + /-Y has the highest priority, then /Y and finally the COPYCMD env. variable */ if (wcsstr (quals, parmNoY)) force = FALSE; else if (wcsstr (quals, parmY)) force = TRUE; else { static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; + /* By default, we will force the overwrite in batch mode and ask for + * confirmation in interactive mode. */ + force = !interactive; + /* If COPYCMD is set, then we force the overwrite with /Y and ask for + * confirmation with /-Y. If COPYCMD is neither of those, then we use the + * default behavior. */ len = GetEnvironmentVariableW(copyCmdW, copycmd, ARRAY_SIZE(copycmd)); - force = (len && len < ARRAY_SIZE(copycmd) && !lstrcmpiW(copycmd, parmY)); + if (len && len < ARRAY_SIZE(copycmd)) { + if (!lstrcmpiW (copycmd, parmY)) + force = TRUE; + else if (!lstrcmpiW (copycmd, parmNoY)) + force = FALSE; + } } /* Prompt if overwriting */

1 0

Zebediah Figura : ws2_32: Keep a list of open sockets.
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: 23dbfaadbb93eea84601d763d303273ab9872f66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23dbfaadbb93eea84601d763… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 10 16:17:14 2020 -0500 ws2_32: Keep a list of open sockets. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 99 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 77 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b7a570043c..4421463029 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -267,26 +267,22 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, LPWSABUF lpControlBuffer ); -/* critical section to protect some non-reentrant net function */ -static CRITICAL_SECTION csWSgetXXXbyYYY; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &csWSgetXXXbyYYY, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": csWSgetXXXbyYYY") } -}; -static CRITICAL_SECTION csWSgetXXXbyYYY = { &critsect_debug, -1, 0, 0, 0, 0 }; +#define DECLARE_CRITICAL_SECTION(cs) \ + static CRITICAL_SECTION cs; \ + static CRITICAL_SECTION_DEBUG cs##_debug = \ + { 0, 0, &cs, { &cs##_debug.ProcessLocksList, &cs##_debug.ProcessLocksList }, \ + 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ + static CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 } + +DECLARE_CRITICAL_SECTION(csWSgetXXXbyYYY); +DECLARE_CRITICAL_SECTION(cs_if_addr_cache); +DECLARE_CRITICAL_SECTION(cs_socket_list); static in_addr_t *if_addr_cache; static unsigned int if_addr_cache_size; -static CRITICAL_SECTION cs_if_addr_cache; -static CRITICAL_SECTION_DEBUG cs_if_addr_cache_debug = -{ - 0, 0, &cs_if_addr_cache, - { &cs_if_addr_cache_debug.ProcessLocksList, &cs_if_addr_cache_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": cs_if_addr_cache") } -}; -static CRITICAL_SECTION cs_if_addr_cache = { &cs_if_addr_cache_debug, -1, 0, 0, 0, 0 }; + +static SOCKET *socket_list; +static unsigned int socket_list_size; union generic_unix_sockaddr { @@ -481,6 +477,48 @@ static inline const char *debugstr_optval(const char *optval, int optlenval) #define SOCKET2HANDLE(s) ((HANDLE)(s)) #define HANDLE2SOCKET(h) ((SOCKET)(h)) +static BOOL socket_list_add(SOCKET socket) +{ + unsigned int i, new_size; + SOCKET *new_array; + + EnterCriticalSection(&cs_socket_list); + for (i = 0; i < socket_list_size; ++i) + { + if (!socket_list[i]) + { + socket_list[i] = socket; + LeaveCriticalSection(&cs_socket_list); + return TRUE; + } + } + new_size = max(socket_list_size * 2, 8); + if (!(new_array = heap_realloc(socket_list, new_size * sizeof(*socket_list)))) + return FALSE; + socket_list = new_array; + memset(socket_list + socket_list_size, 0, (new_size - socket_list_size) * sizeof(*socket_list)); + socket_list[socket_list_size] = socket; + socket_list_size = new_size; + LeaveCriticalSection(&cs_socket_list); + return TRUE; +} + +static void socket_list_remove(SOCKET socket) +{ + unsigned int i; + + EnterCriticalSection(&cs_socket_list); + for (i = 0; i < socket_list_size; ++i) + { + if (socket_list[i] == socket) + { + socket_list[i] = 0; + break; + } + } + LeaveCriticalSection(&cs_socket_list); +} + /**************************************************************** * Async IO declarations ****************************************************************/ @@ -2832,6 +2870,11 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) SERVER_END_REQ; if (!err) { + if (!socket_list_add(as)) + { + CloseHandle(SOCKET2HANDLE(as)); + return SOCKET_ERROR; + } if (addr && addrlen32 && WS_getpeername(as, addr, addrlen32)) { WS_closesocket(as); @@ -3483,6 +3526,7 @@ int WINAPI WS_closesocket(SOCKET s) if (fd >= 0) { release_sock_fd(s, fd); + socket_list_remove(s); if (CloseHandle(SOCKET2HANDLE(s))) res = 0; } @@ -7558,10 +7602,16 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, } /* hack for WSADuplicateSocket */ - if (lpProtocolInfo && lpProtocolInfo->dwServiceFlags4 == 0xff00ff00) { - ret = lpProtocolInfo->dwServiceFlags3; - TRACE("\tgot duplicate %04lx\n", ret); - return ret; + if (lpProtocolInfo && lpProtocolInfo->dwServiceFlags4 == 0xff00ff00) + { + ret = lpProtocolInfo->dwServiceFlags3; + TRACE("\tgot duplicate %04lx\n", ret); + if (!socket_list_add(ret)) + { + CloseHandle(SOCKET2HANDLE(ret)); + return INVALID_SOCKET; + } + return ret; } if (lpProtocolInfo) @@ -7685,7 +7735,12 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, } } #endif - return ret; + if (!socket_list_add(ret)) + { + CloseHandle(SOCKET2HANDLE(ret)); + return INVALID_SOCKET; + } + return ret; } if (err == WSAEACCES) /* raw socket denied */

1 0

Zebediah Figura : ws2_32: Close all open sockets in WSACleanup().
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: 470b9d037988cf5e79b039370e2c6c55daf3459c URL: https://source.winehq.org/git/wine.git/?a=commit;h=470b9d037988cf5e79b03937… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 10 16:17:15 2020 -0500 ws2_32: Close all open sockets in WSACleanup(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18670 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 14 +++++++++++--- dlls/ws2_32/tests/sock.c | 3 --- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4421463029..246a0e2819 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1770,9 +1770,17 @@ int WINAPI WSAStartup(WORD wVersionRequested, LPWSADATA lpWSAData) */ INT WINAPI WSACleanup(void) { - if (num_startup) { - num_startup--; - TRACE("pending cleanups: %d\n", num_startup); + TRACE("decreasing startup count from %d\n", num_startup); + if (num_startup) + { + if (!--num_startup) + { + unsigned int i; + + for (i = 0; i < socket_list_size; ++i) + CloseHandle(SOCKET2HANDLE(socket_list[i])); + memset(socket_list, 0, socket_list_size * sizeof(*socket_list)); + } return 0; } SetLastError(WSANOTINITIALISED); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c7f88d6f3b..7835246397 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1221,7 +1221,6 @@ static void test_WithWSAStartup(void) ok(res == 0, "WSAStartup() failed unexpectedly: %d\n", res); /* show that sockets are destroyed automatically after WSACleanup */ - todo_wine { SetLastError(0xdeadbeef); res = send(pairs[0].src, "TEST", 4, 0); error = WSAGetLastError(); @@ -1258,8 +1257,6 @@ static void test_WithWSAStartup(void) } } - } - /* While wine is not fixed, close all sockets manually */ for (i = 0; i < socks; i++) {

1 0

Zebediah Figura : server: Remove no longer used enumerate_handles().
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: 24021931a88ed917bc2b52c0914c059c2d8d2f30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24021931a88ed917bc2b52c0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 10 16:17:16 2020 -0500 server: Remove no longer used enumerate_handles(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/handle.c | 21 --------------------- server/handle.h | 2 -- 2 files changed, 23 deletions(-) diff --git a/server/handle.c b/server/handle.c index 9ae99cd0c6..10e6a52e57 100644 --- a/server/handle.c +++ b/server/handle.c @@ -486,27 +486,6 @@ obj_handle_t find_inherited_handle( struct process *process, const struct object return 0; } -/* enumerate handles of a given type */ -/* this is needed for window stations and desktops */ -obj_handle_t enumerate_handles( struct process *process, const struct object_ops *ops, - unsigned int *index ) -{ - struct handle_table *table = process->handles; - unsigned int i; - struct handle_entry *entry; - - if (!table) return 0; - - for (i = *index, entry = &table->entries[i]; i <= table->last; i++, entry++) - { - if (!entry->ptr) continue; - if (entry->ptr->ops != ops) continue; - *index = i + 1; - return index_to_handle(i); - } - return 0; -} - /* get/set the handle reserved flags */ /* return the old flags (or -1 on error) */ static int set_handle_flags( struct process *process, obj_handle_t handle, int mask, int flags ) diff --git a/server/handle.h b/server/handle.h index f1deb79fb5..40b3b427c2 100644 --- a/server/handle.h +++ b/server/handle.h @@ -48,8 +48,6 @@ extern obj_handle_t open_object( struct process *process, obj_handle_t parent, u const struct object_ops *ops, const struct unicode_str *name, unsigned int attr ); extern obj_handle_t find_inherited_handle( struct process *process, const struct object_ops *ops ); -extern obj_handle_t enumerate_handles( struct process *process, const struct object_ops *ops, - unsigned int *index ); extern void close_process_handles( struct process *process ); extern struct handle_table *alloc_handle_table( struct process *process, int count ); extern struct handle_table *copy_handle_table( struct process *process, struct process *parent );

1 0

Zebediah Figura : server: Remove no longer used is_fd_signaled().
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: 820d703c3182de41a175f6dddf339b9f6147734f URL: https://source.winehq.org/git/wine.git/?a=commit;h=820d703c3182de41a175f6dd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 10 16:17:17 2020 -0500 server: Remove no longer used is_fd_signaled(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 6 ------ server/file.h | 1 - 2 files changed, 7 deletions(-) diff --git a/server/fd.c b/server/fd.c index 7ea8ac273e..a88ba39ef0 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2057,12 +2057,6 @@ void set_fd_signaled( struct fd *fd, int signaled ) if (signaled) wake_up( fd->user, 0 ); } -/* check if fd is signaled */ -int is_fd_signaled( struct fd *fd ) -{ - return fd->signaled; -} - /* handler for close_handle that refuses to close fd-associated handles in other processes */ int fd_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) { diff --git a/server/file.h b/server/file.h index e8ace7f49e..b02c9fe603 100644 --- a/server/file.h +++ b/server/file.h @@ -99,7 +99,6 @@ extern obj_handle_t lock_fd( struct fd *fd, file_pos_t offset, file_pos_t count, extern void unlock_fd( struct fd *fd, file_pos_t offset, file_pos_t count ); extern void allow_fd_caching( struct fd *fd ); extern void set_fd_signaled( struct fd *fd, int signaled ); -extern int is_fd_signaled( struct fd *fd ); extern char *dup_fd_name( struct fd *root, const char *name ); extern int default_fd_signaled( struct object *obj, struct wait_queue_entry *entry );

1 0

Alexandre Julliard : Release 5.17.
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: 01bacebba418bf6f58a644b1aab41be215bd200a URL: https://source.winehq.org/git/wine.git/?a=commit;h=01bacebba418bf6f58a644b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 21:49:16 2020 +0200 Release 5.17. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 700 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 5 + VERSION | 2 +- configure | 18 +- 4 files changed, 382 insertions(+), 343 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01bacebba418bf6f58a6…

1 0

Tag wine-5.17 : Alexandre Julliard : Release 5.17
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: refs/tags/wine-5.17 Tag: b825ffeb07eff01f8d4ef8aa04291a070975ef6a URL: https://source.winehq.org/git/wine.git/?a=tag;h=b825ffeb07eff01f8d4ef8aa042… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 21:49:16 2020 +0200 Release 5.17

1 0

Alexandre Julliard : wineandroid.drv: Load libwine dynamically.
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: 4935576d4a5cb13bc58eebfca1ca43bc43866ff9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4935576d4a5cb13bc58eebfc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 11:43:21 2020 +0200 wineandroid.drv: Load libwine dynamically. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 1 - dlls/wineandroid.drv/android.h | 4 ++-- dlls/wineandroid.drv/device.c | 4 ++-- dlls/wineandroid.drv/init.c | 17 ++++++++++++++--- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index fcc988b211..aab69c88de 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,6 +1,5 @@ MODULE = wineandroid.drv IMPORTS = uuid ole32 user32 gdi32 advapi32 ntoskrnl -EXTRALIBS = -lwine C_SRCS = \ device.c \ diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index befaa3c27d..7db10d87f1 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -155,7 +155,7 @@ union event_data int send_event( const union event_data *data ) DECLSPEC_HIDDEN; -extern JavaVM *wine_get_java_vm(void); -extern jobject wine_get_java_object(void); +extern JavaVM * (*p_wine_get_java_vm)(void); +extern jobject (*p_wine_get_java_object)(void); #endif /* __WINE_ANDROID_H */ diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index c9321c4899..c2eb63382a 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -687,7 +687,7 @@ static int status_to_android_error( NTSTATUS status ) static jobject load_java_method( jmethodID *method, const char *name, const char *args ) { - jobject object = wine_get_java_object(); + jobject object = p_wine_get_java_object(); if (!*method) { @@ -1163,7 +1163,7 @@ static DWORD CALLBACK device_thread( void *arg ) TRACE( "starting process %x\n", GetCurrentProcessId() ); - if (!(java_vm = wine_get_java_vm())) return 0; /* not running under Java */ + if (!(java_vm = p_wine_get_java_vm())) return 0; /* not running under Java */ init_java_thread( java_vm ); diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 7b2850e452..43d4de0d6d 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -104,7 +104,7 @@ void set_screen_dpi( DWORD dpi ) */ static void fetch_display_metrics(void) { - if (wine_get_java_vm()) return; /* for Java threads it will be set when the top view is created */ + if (p_wine_get_java_vm()) return; /* for Java threads it will be set when the top view is created */ SERVER_START_REQ( get_window_rectangles ) { @@ -620,16 +620,27 @@ static void load_android_libs(void) #undef DECL_FUNCPTR #undef LOAD_FUNCPTR +JavaVM * (*p_wine_get_java_vm)(void) = NULL; +jobject (*p_wine_get_java_object)(void) = NULL; + static BOOL process_attach(void) { jclass class; - jobject object = wine_get_java_object(); + jobject object; JNIEnv *jni_env; JavaVM *java_vm; + void *libwine; + + if (!(libwine = dlopen( "libwine.so", RTLD_NOW ))) return FALSE; + + p_wine_get_java_vm = dlsym( libwine, "wine_get_java_vm" ); + p_wine_get_java_object = dlsym( libwine, "wine_get_java_object" ); + + object = p_wine_get_java_object(); load_hardware_libs(); - if ((java_vm = wine_get_java_vm())) /* running under Java */ + if ((java_vm = p_wine_get_java_vm())) /* running under Java */ { #ifdef __i386__ WORD old_fs;

1 0

Alexandre Julliard : wineandroid.drv: Pass the source directory on the gradle command line.
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: 22628bcc1742273affa85cbafb0e494922f424f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22628bcc1742273affa85cba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 12:40:43 2020 +0200 wineandroid.drv: Pass the source directory on the gradle command line. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 +- dlls/wineandroid.drv/Makefile.in | 2 +- dlls/wineandroid.drv/build.gradle.in | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5c6a3e30c5..3f8196ed85 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,7 +75,7 @@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) DELAYLOADFLAG = @DELAYLOADFLAG@ PACKAGE_VERSION = @PACKAGE_VERSION@ -SED_CMD = LC_ALL=C sed -e 's,@bindir\@,${bindir},g' -e 's,@dlldir\@,${dlldir},g' -e 's,@srcdir\@,${srcdir},g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' +SED_CMD = LC_ALL=C sed -e 's,@bindir\@,${bindir},g' -e 's,@dlldir\@,${dlldir},g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' api_manext = 3w WINELOADER_PROGRAMS = @WINELOADER_PROGRAMS@ WINELOADER_DEPENDS = @WINELOADER_DEPENDS@ diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index aab69c88de..cb352e38c9 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -18,5 +18,5 @@ SVG_SRCS = \ EXTRA_TARGETS = wine-debug.apk wine-debug.apk: build.gradle $(srcdir)/AndroidManifest.xml $(srcdir)/WineActivity.java $(srcdir)/wine.svg - gradle -q assembleDebug + gradle -q -Psrcdir=$(srcdir) assembleDebug mv build/outputs/apk/wine-debug.apk $@ diff --git a/dlls/wineandroid.drv/build.gradle.in b/dlls/wineandroid.drv/build.gradle.in index 8ae2fb4764..47b9f7a177 100644 --- a/dlls/wineandroid.drv/build.gradle.in +++ b/dlls/wineandroid.drv/build.gradle.in @@ -39,7 +39,7 @@ def add_icon_task( dir, scale ) outputs.dir( outdir ) doFirst { outdir.mkdirs() } def png = new File( outdir, "wine.png" ) - def svg = new File( "@srcdir@", "wine.svg" ) + def svg = new File( srcdir, "wine.svg" ) inputs.file( svg ) outputs.file( png ) commandLine "rsvg-convert", "-z", scale, "-o", png, svg @@ -97,10 +97,10 @@ android sourceSets { main.assets.srcDirs = [ "assets" ] - main.java.srcDirs = [ "@srcdir@" ] + main.java.srcDirs = [ srcdir ] main.jniLibs.srcDirs = [ "lib" ] main.java.excludes = [ "build" ] main.res.srcDirs = [ "res" ] - main.manifest.srcFile "@srcdir@/AndroidManifest.xml" + main.manifest.srcFile srcdir + "/AndroidManifest.xml" } }

1 0

Alexandre Julliard : makefiles: Also store the basename without object dir for generated files.
by Alexandre Julliard 11 Sep '20

11 Sep '20

Module: wine Branch: master Commit: 9da7d620efad6b14685f2c25a706affd4e5f7b53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9da7d620efad6b14685f2c25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 09:53:23 2020 +0200 makefiles: Also store the basename without object dir for generated files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 62fa516319..7a559302c0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -76,6 +76,7 @@ struct incl_file struct file *file; char *name; char *filename; + char *basename; /* base target name for generated files */ char *sourcename; /* source file name for generated headers */ struct incl_file *included_by; /* file that included this one */ int included_line; /* line where this file was included */ @@ -975,7 +976,8 @@ static struct incl_file *add_generated_source( struct makefile *make, memset( file, 0, sizeof(*file) ); file->file = add_file( name ); file->name = xstrdup( name ); - file->filename = obj_dir_path( make, filename ? filename : name ); + file->basename = xstrdup( filename ? filename : name ); + file->filename = obj_dir_path( make, file->basename ); file->file->flags = FLAG_GENERATED; file->use_msvcrt = make->use_msvcrt; list_add_tail( &make->sources, &file->entry ); @@ -3122,7 +3124,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour if ((source->file->flags & FLAG_GENERATED) && (!make->testdll || !strendswith( source->filename, "testlist.c" ))) - strarray_add( &make->clean_files, source->filename ); + strarray_add( &make->clean_files, source->basename ); if (source->file->flags & FLAG_C_IMPLIB) strarray_add( &make->implib_objs, strmake( "%s.o", obj )); if (need_obj)

1 0