October 2022 - Wine-commits

Nikolay Sivov : mf/samplegrabber: Send MEStreamSinkRateChanged event.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: wine Branch: master Commit: ec7d032b16505e8d66a690675bf53560c91dcd4a URL: https://gitlab.winehq.org/wine/wine/-/commit/ec7d032b16505e8d66a690675bf535… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 31 21:20:40 2022 +0300 mf/samplegrabber: Send MEStreamSinkRateChanged event. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 2d9f8109aca..84b8d71d6be 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -1203,10 +1203,23 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockRestart(IMFClockStateSink static HRESULT WINAPI sample_grabber_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) { struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); + HRESULT hr = S_OK; TRACE("%p, %s, %f.\n", iface, debugstr_time(systime), rate); - return IMFSampleGrabberSinkCallback_OnClockSetRate(sample_grabber_get_callback(grabber), systime, rate); + EnterCriticalSection(&grabber->cs); + + if (grabber->is_shut_down) + hr = MF_E_SHUTDOWN; + else + IMFStreamSink_QueueEvent(&grabber->IMFStreamSink_iface, MEStreamSinkRateChanged, &GUID_NULL, S_OK, NULL); + + LeaveCriticalSection(&grabber->cs); + + if (SUCCEEDED(hr)) + hr = IMFSampleGrabberSinkCallback_OnClockSetRate(sample_grabber_get_callback(grabber), systime, rate); + + return hr; } static HRESULT WINAPI sample_grabber_events_QueryInterface(IMFMediaEventGenerator *iface, REFIID riid, void **obj)

1 0

Nikolay Sivov : mf/samplegrabber: Send MEStreamSinkScrubSampleComplete event.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: wine Branch: master Commit: 9706a70bdaf16203e250f9cc2254e6fb0c830848 URL: https://gitlab.winehq.org/wine/wine/-/commit/9706a70bdaf16203e250f9cc2254e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 31 21:48:06 2022 +0300 mf/samplegrabber: Send MEStreamSinkScrubSampleComplete event. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 84b8d71d6be..e41e74d35ac 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -83,6 +83,7 @@ struct sample_grabber IUnknown *cancel_key; UINT32 ignore_clock; UINT64 sample_time_offset; + float rate; enum sink_state state; CRITICAL_SECTION cs; }; @@ -1138,7 +1139,13 @@ static HRESULT sample_grabber_set_state(struct sample_grabber *grabber, enum sin } do_callback = state != grabber->state || state != SINK_STATE_PAUSED; if (do_callback) + { + if (grabber->rate == 0.0f && state == SINK_STATE_RUNNING) + IMFStreamSink_QueueEvent(&grabber->IMFStreamSink_iface, MEStreamSinkScrubSampleComplete, + &GUID_NULL, S_OK, NULL); + IMFStreamSink_QueueEvent(&grabber->IMFStreamSink_iface, events[state], &GUID_NULL, S_OK, NULL); + } grabber->state = state; } } @@ -1212,7 +1219,10 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockSetRate(IMFClockStateSink if (grabber->is_shut_down) hr = MF_E_SHUTDOWN; else + { IMFStreamSink_QueueEvent(&grabber->IMFStreamSink_iface, MEStreamSinkRateChanged, &GUID_NULL, S_OK, NULL); + grabber->rate = rate; + } LeaveCriticalSection(&grabber->cs); @@ -1433,6 +1443,7 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use object->IMFMediaTypeHandler_iface.lpVtbl = &sample_grabber_stream_type_handler_vtbl; object->timer_callback.lpVtbl = &sample_grabber_stream_timer_callback_vtbl; object->refcount = 1; + object->rate = 1.0f; if (FAILED(IMFSampleGrabberSinkCallback_QueryInterface(context->callback, &IID_IMFSampleGrabberSinkCallback2, (void **)&object->callback2))) {

1 0

Paul Gofman : ntdll: Move SO_REUSEADDR handling to server.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: wine Branch: master Commit: 039f8b16f6492f3e7e29e7c881a22e319497c276 URL: https://gitlab.winehq.org/wine/wine/-/commit/039f8b16f6492f3e7e29e7c881a22e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Sat Oct 15 10:29:58 2022 -0500 ntdll: Move SO_REUSEADDR handling to server. --- dlls/ntdll/unix/socket.c | 21 --------------------- server/sock.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index b502d3a03cb..7dbf03365bb 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1977,27 +1977,6 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_SO_OOBINLINE: return do_setsockopt( handle, io, SOL_SOCKET, SO_OOBINLINE, in_buffer, in_size ); - case IOCTL_AFD_WINE_GET_SO_REUSEADDR: - return do_getsockopt( handle, io, SOL_SOCKET, SO_REUSEADDR, out_buffer, out_size ); - - /* BSD socket SO_REUSEADDR is not 100% compatible to winsock semantics; - * however, using it the BSD way fixes bug 8513 and seems to be what - * most programmers assume, anyway */ - case IOCTL_AFD_WINE_SET_SO_REUSEADDR: - { - int ret; - - if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) - return status; - - ret = setsockopt( fd, SOL_SOCKET, SO_REUSEADDR, in_buffer, in_size ); -#ifdef __APPLE__ - if (!ret) ret = setsockopt( fd, SOL_SOCKET, SO_REUSEPORT, in_buffer, in_size ); -#endif - status = ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; - break; - } - case IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP: return do_setsockopt( handle, io, IPPROTO_IP, IP_ADD_MEMBERSHIP, in_buffer, in_size ); diff --git a/server/sock.c b/server/sock.c index 4e57d6774a6..87a536bb363 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2905,6 +2905,29 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } + /* BSD socket SO_REUSEADDR is not 100% compatible to winsock semantics; + * however, using it the BSD way fixes bug 8513 and seems to be what + * most programmers assume, anyway */ + case IOCTL_AFD_WINE_SET_SO_REUSEADDR: + { + int reuse, ret; + + if (get_req_data_size() < sizeof(reuse)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return; + } + + reuse = *(int *)get_req_data(); + ret = setsockopt( unix_fd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse) ); +#ifdef __APPLE__ + if (!ret) ret = setsockopt( unix_fd, SOL_SOCKET, SO_REUSEPORT, &reuse, sizeof(reuse) ); +#endif + if (ret) + set_error( sock_get_ntstatus( errno ) ); + return; + } + case IOCTL_AFD_WINE_GET_SO_SNDBUF: { int sndbuf = sock->sndbuf; @@ -2992,6 +3015,24 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } + case IOCTL_AFD_WINE_GET_SO_REUSEADDR: + { + int reuse; + socklen_t len = sizeof(reuse); + + if (!get_reply_max_size()) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return; + } + + if (!getsockopt( unix_fd, SOL_SOCKET, SO_REUSEADDR, &reuse, &len )) + set_reply_data( &reuse, min( sizeof(reuse), get_reply_max_size() )); + else + set_error( sock_get_ntstatus( errno ) ); + return; + } + case IOCTL_AFD_POLL: { if (get_reply_max_size() < get_req_data_size())

1 0

Paul Gofman : server: Track SO_REUSEADDR value.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: wine Branch: master Commit: 382ec78db305cc9ed77efa3aa85fb7fc8d74e543 URL: https://gitlab.winehq.org/wine/wine/-/commit/382ec78db305cc9ed77efa3aa85fb7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Sat Oct 15 10:47:52 2022 -0500 server: Track SO_REUSEADDR value. --- server/sock.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/server/sock.c b/server/sock.c index 87a536bb363..7c5f0185fd5 100644 --- a/server/sock.c +++ b/server/sock.c @@ -233,6 +233,7 @@ struct sock unsigned int nonblocking : 1; /* is the socket nonblocking? */ unsigned int bound : 1; /* is the socket bound? */ unsigned int reset : 1; /* did we get a TCP reset? */ + unsigned int reuseaddr : 1; /* winsock SO_REUSEADDR option value */ }; static void sock_dump( struct object *obj, int verbose ); @@ -1545,6 +1546,7 @@ static struct sock *create_socket(void) sock->nonblocking = 0; sock->bound = 0; sock->reset = 0; + sock->reuseaddr = 0; sock->rcvbuf = 0; sock->sndbuf = 0; sock->rcvtimeo = 0; @@ -2720,14 +2722,8 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (bind( unix_fd, &bind_addr.addr, unix_len ) < 0) { - if (errno == EADDRINUSE) - { - int reuse; - socklen_t len = sizeof(reuse); - - if (!getsockopt( unix_fd, SOL_SOCKET, SO_REUSEADDR, (char *)&reuse, &len ) && reuse) - errno = EACCES; - } + if (errno == EADDRINUSE && sock->reuseaddr) + errno = EACCES; set_error( sock_get_ntstatus( errno ) ); return; @@ -2925,6 +2921,8 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) #endif if (ret) set_error( sock_get_ntstatus( errno ) ); + else + sock->reuseaddr = !!reuse; return; } @@ -3018,7 +3016,6 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) case IOCTL_AFD_WINE_GET_SO_REUSEADDR: { int reuse; - socklen_t len = sizeof(reuse); if (!get_reply_max_size()) { @@ -3026,10 +3023,8 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } - if (!getsockopt( unix_fd, SOL_SOCKET, SO_REUSEADDR, &reuse, &len )) - set_reply_data( &reuse, min( sizeof(reuse), get_reply_max_size() )); - else - set_error( sock_get_ntstatus( errno ) ); + reuse = sock->reuseaddr; + set_reply_data( &reuse, min( sizeof(reuse), get_reply_max_size() )); return; }

1 0

Paul Gofman : server: Set Unix SO_REUSEADDR on all the TCP sockets.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: wine Branch: master Commit: ef7de1fc1f011bede33c0fa1d08d5feebba6adf7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef7de1fc1f011bede33c0fa1d08d5f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 18 16:00:20 2022 -0500 server: Set Unix SO_REUSEADDR on all the TCP sockets. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50955 --- dlls/httpapi/tests/httpapi.c | 6 +- server/sock.c | 211 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 197 insertions(+), 20 deletions(-)

1 0

Paul Gofman : ws2_32/tests: Also test bind to any together with loopback in a different order.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: wine Branch: master Commit: f307d472706d56ea4cfdeb98daaac39239b7d814 URL: https://gitlab.winehq.org/wine/wine/-/commit/f307d472706d56ea4cfdeb98daaac3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Oct 26 13:28:00 2022 -0500 ws2_32/tests: Also test bind to any together with loopback in a different order. --- dlls/ws2_32/tests/sock.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 943ee8539ea..5460bc621d3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2123,7 +2123,7 @@ static void test_so_reuseaddr(void) closesocket(s3); closesocket(s4); - /* Test binding and listening on any addr together with loopback. */ + /* Test binding and listening on any addr together with loopback, any addr first. */ s1 = socket(tests[i].domain, SOCK_STREAM, 0); ok(s1 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); @@ -2157,6 +2157,41 @@ static void test_so_reuseaddr(void) closesocket(s3); closesocket(s4); + /* Test binding and listening on any addr together with loopback, loopback addr first. */ + + s1 = socket(tests[i].domain, SOCK_STREAM, 0); + ok(s1 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); + + rc = bind(s1, tests[i].addr_loopback, tests[i].addrlen); + ok(!rc, "got error %d.\n", WSAGetLastError()); + + rc = listen(s1, 1); + ok(!rc, "got error %d.\n", WSAGetLastError()); + + s2 = socket(tests[i].domain, SOCK_STREAM, 0); + ok(s2 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); + + rc = bind(s2, tests[i].addr_any, tests[i].addrlen); + todo_wine ok(!rc, "got rc %d, error %d.\n", rc, WSAGetLastError()); + + rc = listen(s2, 1); + todo_wine ok(!rc, "got error %d.\n", WSAGetLastError()); + + s3 = socket(tests[i].domain, SOCK_STREAM, 0); + ok(s3 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); + + rc = connect(s3, tests[i].addr_loopback, tests[i].addrlen); + ok(!rc, "got error %d.\n", WSAGetLastError()); + size = tests[i].addrlen; + s4 = accept(s1, &saddr, &size); + + ok(s4 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); + + closesocket(s1); + closesocket(s2); + closesocket(s3); + closesocket(s4); + /* Test binding to INADDR_ANY on two sockets. */ s1 = socket(tests[i].domain, SOCK_STREAM, 0); ok(s1 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError());

1 0

Jacek Caban : makedep: Always use -mno-cygwin for extra test modules.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: wine Branch: master Commit: 4920d08e5f5f7cd3156f5dade59c1099f01fc346 URL: https://gitlab.winehq.org/wine/wine/-/commit/4920d08e5f5f7cd3156f5dade59c10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 31 20:45:03 2022 +0100 makedep: Always use -mno-cygwin for extra test modules. --- tools/makedep.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 82cd37934b5..ac2b7a19ff3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3065,14 +3065,15 @@ static void output_source_in( struct makefile *make, struct incl_file *source, c static void output_source_spec( struct makefile *make, struct incl_file *source, const char *obj ) { struct strarray imports = get_expanded_file_local_var( make, obj, "IMPORTS" ); - struct strarray dll_flags = get_expanded_file_local_var( make, obj, "EXTRADLLFLAGS" ); + struct strarray dll_flags = empty_strarray; struct strarray all_libs = empty_strarray, dep_libs = empty_strarray; struct strarray default_imports = empty_strarray; const char *dll_name, *obj_name, *res_name, *output_file, *debug_file; unsigned int arch = make->is_cross ? 1 : 0; if (!imports.count) imports = make->imports; - if (!dll_flags.count) dll_flags = make->extradllflags; + strarray_addall( &dll_flags, make->extradllflags ); + strarray_addall( &dll_flags, get_expanded_file_local_var( make, obj, "EXTRADLLFLAGS" )); if (!strarray_exists( &dll_flags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports ); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, arch ) );

1 0

Alexandre Julliard : configure: Remove no longer needed check for dlltool.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: wine Branch: master Commit: 37910bebfd33bcf7ab4803663c570bccf9f3ee1a URL: https://gitlab.winehq.org/wine/wine/-/commit/37910bebfd33bcf7ab4803663c570b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 12:28:41 2022 +0100 configure: Remove no longer needed check for dlltool. --- configure | 104 -------------------------------------------------------- configure.ac | 1 - tools/makedep.c | 2 -- 3 files changed, 107 deletions(-) diff --git a/configure b/configure index 0a2e5964f64..a5a4debb40f 100755 --- a/configure +++ b/configure @@ -761,7 +761,6 @@ COREFOUNDATION_LIBS ac_ct_OBJC OBJCFLAGS OBJC -DLLTOOL WINELOADER_PROGRAMS CONFIGURE_TARGETS DISABLED_SUBDIRS @@ -9461,108 +9460,6 @@ libwine_soversion=`expr $libwine_version : '$[0-9]*$\..*'` case $host_os in cygwin*|mingw32*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_DLLTOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -printf "%s\n" "$DLLTOOL" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_DLLTOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_DLLTOOL="dlltool" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -printf "%s\n" "$ac_ct_DLLTOOL" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DLLTOOL=$ac_ct_DLLTOOL - fi -else - DLLTOOL="$ac_cv_prog_DLLTOOL" -fi - LIBEXT="dll" EXTRACFLAGS="-D__WINE_PE_BUILD" case $host_cpu in @@ -23244,7 +23141,6 @@ SUBDIRS = $SUBDIRS DISABLED_SUBDIRS = $DISABLED_SUBDIRS CONFIGURE_TARGETS = $CONFIGURE_TARGETS WINELOADER_PROGRAMS = $WINELOADER_PROGRAMS -DLLTOOL = $DLLTOOL OBJC = $OBJC OBJCFLAGS = $OBJCFLAGS ac_ct_OBJC = $ac_ct_OBJC diff --git a/configure.ac b/configure.ac index e11f3cfdb63..10c773908be 100644 --- a/configure.ac +++ b/configure.ac @@ -667,7 +667,6 @@ libwine_soversion=`expr $libwine_version : '$[[0-9]]*$\..*'` case $host_os in cygwin*|mingw32*) - AC_CHECK_TOOL(DLLTOOL,dlltool,false) LIBEXT="dll" EXTRACFLAGS="-D__WINE_PE_BUILD" dnl Disable stdcall fixups to catch prototype mismatches diff --git a/tools/makedep.c b/tools/makedep.c index 86a6493a33f..21ea7fa9820 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -157,7 +157,6 @@ static const char *ar; static const char *ranlib; static const char *rsvg; static const char *icotool; -static const char *dlltool; static const char *msgfmt; static const char *ln_s; static const char *sed_cmd; @@ -4480,7 +4479,6 @@ int main( int argc, char *argv[] ) ranlib = get_expanded_make_variable( top_makefile, "RANLIB" ); rsvg = get_expanded_make_variable( top_makefile, "RSVG" ); icotool = get_expanded_make_variable( top_makefile, "ICOTOOL" ); - dlltool = get_expanded_make_variable( top_makefile, "DLLTOOL" ); msgfmt = get_expanded_make_variable( top_makefile, "MSGFMT" ); sed_cmd = get_expanded_make_variable( top_makefile, "SED_CMD" ); ln_s = get_expanded_make_variable( top_makefile, "LN_S" );

1 0

Alexandre Julliard : makedep: Remove arch directories on distclean.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: wine Branch: master Commit: abee72f32dbca311764aeafd7ad1b76efcad28a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/abee72f32dbca311764aeafd7ad1b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 12:30:07 2022 +0100 makedep: Remove arch directories on distclean. --- tools/makedep.c | 59 ++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 21ea7fa9820..82cd37934b5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -436,19 +436,19 @@ static void output_filenames( struct strarray array ) /******************************************************************* * output_rm_filenames */ -static void output_rm_filenames( struct strarray array ) +static void output_rm_filenames( struct strarray array, const char *command ) { static const unsigned int max_cmdline = 30000; /* to be on the safe side */ unsigned int i, len; if (!array.count) return; - output( "\trm -f" ); + output( "\t%s", command ); for (i = len = 0; i < array.count; i++) { if (len > max_cmdline) { output( "\n" ); - output( "\trm -f" ); + output( "\t%s", command ); len = 0; } output_filename( array.str[i] ); @@ -2600,6 +2600,30 @@ static int cmp_string_length( const char **a, const char **b ) return strcmp( *a, *b ); } +/******************************************************************* + * get_removable_dirs + * + * Retrieve a list of directories to try to remove after deleting the files. + */ +static struct strarray get_removable_dirs( struct strarray files ) +{ + struct strarray dirs = empty_strarray; + unsigned int i; + + for (i = 0; i < files.count; i++) + { + char *dir = xstrdup( files.str[i] ); + while (strchr( dir, '/' )) + { + *strrchr( dir, '/' ) = 0; + strarray_add_uniq( &dirs, xstrdup(dir) ); + } + } + strarray_qsort( &dirs, cmp_string_length ); + return dirs; +} + + /******************************************************************* * output_uninstall_rules */ @@ -2608,25 +2632,16 @@ static void output_uninstall_rules( struct makefile *make ) static const char *dirs_order[] = { "$(includedir)", "$(mandir)", "$(fontdir)", "$(nlsdir)", "$(datadir)", "$(dlldir)" }; - struct strarray uninstall_dirs = empty_strarray; + struct strarray uninstall_dirs; unsigned int i, j; if (!make->uninstall_files.count) return; output( "uninstall::\n" ); - output_rm_filenames( make->uninstall_files ); + output_rm_filenames( make->uninstall_files, "rm -f" ); strarray_add_uniq( &make->phony_targets, "uninstall" ); if (!subdirs.count) return; - for (i = 0; i < make->uninstall_files.count; i++) - { - char *dir = xstrdup( make->uninstall_files.str[i] ); - while (strchr( dir, '/' )) - { - *strrchr( dir, '/' ) = 0; - strarray_add_uniq( &uninstall_dirs, xstrdup(dir) ); - } - } - strarray_qsort( &uninstall_dirs, cmp_string_length ); + uninstall_dirs = get_removable_dirs( make->uninstall_files ); output( "\t-rmdir" ); for (i = 0; i < ARRAY_SIZE(dirs_order); i++) { @@ -3664,6 +3679,7 @@ static void output_subdirs( struct makefile *make ) struct strarray clean_files = empty_strarray; struct strarray testclean_files = empty_strarray; struct strarray distclean_files = empty_strarray; + struct strarray distclean_dirs = empty_strarray; struct strarray dependencies = empty_strarray; struct strarray install_deps[NB_INSTALL_RULES] = { empty_strarray }; struct strarray tooldeps_deps = empty_strarray; @@ -3675,12 +3691,16 @@ static void output_subdirs( struct makefile *make ) for (arch = 0; arch < archs.count; arch++) strarray_addall( &all_targets, make->all_targets[arch] ); for (i = 0; i < subdirs.count; i++) { + struct strarray subclean = empty_strarray; + strarray_addall( &subclean, get_removable_dirs( submakes[i]->clean_files )); + strarray_addall( &subclean, get_removable_dirs( submakes[i]->distclean_files )); strarray_add( &makefile_deps, src_dir_path( submakes[i], "Makefile.in" )); strarray_addall_uniq( &make->phony_targets, submakes[i]->phony_targets ); strarray_addall_uniq( &make->uninstall_files, submakes[i]->uninstall_files ); strarray_addall_uniq( &dependencies, submakes[i]->dependencies ); strarray_addall_path( &clean_files, submakes[i]->obj_dir, submakes[i]->clean_files ); strarray_addall_path( &distclean_files, submakes[i]->obj_dir, submakes[i]->distclean_files ); + strarray_addall_path( &distclean_dirs, submakes[i]->obj_dir, subclean ); strarray_addall_path( &make->maintainerclean_files, submakes[i]->obj_dir, submakes[i]->maintainerclean_files ); strarray_addall_path( &testclean_files, submakes[i]->obj_dir, submakes[i]->ok_files ); strarray_addall_path( &make->pot_files, submakes[i]->obj_dir, submakes[i]->pot_files ); @@ -3740,13 +3760,14 @@ static void output_subdirs( struct makefile *make ) if (get_expanded_make_variable( make, "GETTEXTPO_LIBS" )) output_po_files( make ); output( "clean::\n"); - output_rm_filenames( clean_files ); + output_rm_filenames( clean_files, "rm -f" ); output( "testclean::\n"); - output_rm_filenames( testclean_files ); + output_rm_filenames( testclean_files, "rm -f" ); output( "distclean::\n"); - output_rm_filenames( distclean_files ); + output_rm_filenames( distclean_files, "rm -f" ); + output_rm_filenames( distclean_dirs, "-rmdir 2>/dev/null" ); output( "maintainer-clean::\n"); - output_rm_filenames( make->maintainerclean_files ); + output_rm_filenames( make->maintainerclean_files, "rm -f" ); strarray_add_uniq( &make->phony_targets, "distclean" ); strarray_add_uniq( &make->phony_targets, "testclean" ); strarray_add_uniq( &make->phony_targets, "maintainer-clean" );

1 0

Nikolay Sivov : user32: Add DragObject() stub.
by Alexandre Julliard 31 Oct '22

31 Oct '22

Module: wine Branch: master Commit: 645326214f0ef263e0fd8cf4758b67f74977fbf3 URL: https://gitlab.winehq.org/wine/wine/-/commit/645326214f0ef263e0fd8cf4758b67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 30 22:00:23 2022 +0300 user32: Add DragObject() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53768 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/user32.spec | 2 +- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 10 ++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 11 +++++++++++ include/ntuser.h | 1 + 7 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 1bf3ebdc90d..4f15b4c06e5 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -182,7 +182,7 @@ @ stdcall DlgDirSelectExA(long ptr long long) @ stdcall DlgDirSelectExW(long ptr long long) @ stdcall DragDetect(long int64) -@ stub DragObject +@ stdcall DragObject(long long long long long) NtUserDragObject @ stdcall DrawAnimatedRects(long long ptr ptr) @ stdcall DrawCaption(long long ptr long) @ stdcall DrawCaptionTempA(long long ptr long long str long) diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index ec21f7f5984..ec6cd859ff6 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -141,6 +141,7 @@ static void * const syscalls[] = NtUserDispatchMessage, NtUserDisplayConfigGetDeviceInfo, NtUserDragDetect, + NtUserDragObject, NtUserDrawIconEx, NtUserEmptyClipboard, NtUserEnableMenuItem, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 8a3344257ed..3771dafcf76 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -846,7 +846,7 @@ @ stub NtUserDoSoundDisconnect @ stub NtUserDownlevelTouchpad @ stdcall -syscall NtUserDragDetect(long long long) -@ stub NtUserDragObject +@ stdcall -syscall NtUserDragObject(long long long long long) @ stub NtUserDrawAnimatedRects @ stub NtUserDrawCaption @ stdcall NtUserDrawCaptionTemp(long long ptr long long wstr long) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 5b87dcdf465..1672c4b02a0 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5539,3 +5539,13 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return 0; } } + +/******************************************************************* + * NtUserDragObject (win32u.@) + */ +DWORD WINAPI NtUserDragObject( HWND parent, HWND hwnd, UINT fmt, ULONG_PTR data, HCURSOR cursor ) +{ + FIXME( "%p, %p, %u, %#lx, %p stub!\n", parent, hwnd, fmt, data, cursor ); + + return 0; +} diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 683e7978653..e9b63f365dd 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -127,6 +127,7 @@ SYSCALL_ENTRY( NtUserDispatchMessage ) \ SYSCALL_ENTRY( NtUserDisplayConfigGetDeviceInfo ) \ SYSCALL_ENTRY( NtUserDragDetect ) \ + SYSCALL_ENTRY( NtUserDragObject ) \ SYSCALL_ENTRY( NtUserDrawIconEx ) \ SYSCALL_ENTRY( NtUserEmptyClipboard ) \ SYSCALL_ENTRY( NtUserEnableMenuItem ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 8d15c84ac30..e1454347ecf 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1558,6 +1558,17 @@ NTSTATUS WINAPI wow64_NtUserDragDetect( UINT *args ) return NtUserDragDetect( hwnd, x, y ); } +NTSTATUS WINAPI wow64_NtUserDragObject( UINT *args ) +{ + HWND parent = get_handle( &args ); + HWND hwnd = get_handle( &args ); + UINT fmt = get_ulong( &args ); + ULONG_PTR data = get_ulong( &args ); + HCURSOR hcursor = get_handle( &args ); + + return NtUserDragObject( parent, hwnd, fmt, data, hcursor ); +} + NTSTATUS WINAPI wow64_NtUserDrawIconEx( UINT *args ) { HDC hdc = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 1ec4898dcd1..7759f2b3174 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -679,6 +679,7 @@ BOOL WINAPI NtUserDisableThreadIme( DWORD thread_id ); LRESULT WINAPI NtUserDispatchMessage( const MSG *msg ); NTSTATUS WINAPI NtUserDisplayConfigGetDeviceInfo( DISPLAYCONFIG_DEVICE_INFO_HEADER *packet ); BOOL WINAPI NtUserDragDetect( HWND hwnd, int x, int y ); +DWORD WINAPI NtUserDragObject( HWND parent, HWND hwnd, UINT fmt, ULONG_PTR data, HCURSOR cursor ); BOOL WINAPI NtUserDrawCaptionTemp( HWND hwnd, HDC hdc, const RECT *rect, HFONT font, HICON icon, const WCHAR *str, UINT flags ); BOOL WINAPI NtUserDrawIconEx( HDC hdc, INT x0, INT y0, HICON icon, INT width,

1 0