April 2020 - Wine-Commits - list.winehq.org

Jacek Caban : ntdll: Leave critical section before blocking in RtlWaitOnAddress.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: eaad2380003777fa3036d9e7286f02d82a15064a URL: https://source.winehq.org/git/wine.git/?a=commit;h=eaad2380003777fa3036d9e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 20 00:02:29 2020 +0200 ntdll: Leave critical section before blocking in RtlWaitOnAddress. Fixes regression from commit 4f673d5386f44d4af4459a95b3059cfb887db8c9. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 4 ++-- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/server.c | 9 +++++++-- dlls/ntdll/sync.c | 4 +--- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 87341654ba..5df037b7ea 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -114,7 +114,7 @@ void wait_suspend( CONTEXT *context ) int saved_errno = errno; /* wait with 0 timeout, will only return once the thread is no longer suspended */ - server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, context, NULL ); + server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, context, NULL, NULL ); errno = saved_errno; } @@ -159,7 +159,7 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con { select_op.wait.op = SELECT_WAIT; select_op.wait.handles[0] = handle; - server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, TIMEOUT_INFINITE, &exception_context, NULL ); + server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, TIMEOUT_INFINITE, &exception_context, NULL, NULL ); SERVER_START_REQ( get_exception_status ) { diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 964953e27d..eaed3cc1fc 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -117,7 +117,7 @@ extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; extern void server_enter_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; extern void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; extern unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, - timeout_t abs_timeout, CONTEXT *context, user_apc_t *user_apc ) DECLSPEC_HIDDEN; + timeout_t abs_timeout, CONTEXT *context, RTL_CRITICAL_SECTION *cs, user_apc_t *user_apc ) DECLSPEC_HIDDEN; extern unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT flags, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 3de5a93556..c0dd0f35fc 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -602,7 +602,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) * server_select */ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, - timeout_t abs_timeout, CONTEXT *context, user_apc_t *user_apc ) + timeout_t abs_timeout, CONTEXT *context, RTL_CRITICAL_SECTION *cs, user_apc_t *user_apc ) { unsigned int ret; int cookie; @@ -660,6 +660,11 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT size = offsetof( select_op_t, signal_and_wait.signal ); } pthread_sigmask( SIG_SETMASK, &old_set, NULL ); + if (cs) + { + RtlLeaveCriticalSection( cs ); + cs = NULL; + } if (ret != STATUS_PENDING) break; ret = wait_select_reply( &cookie ); @@ -692,7 +697,7 @@ unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT f for (;;) { - ret = server_select( select_op, size, flags, abs_timeout, NULL, &apc ); + ret = server_select( select_op, size, flags, abs_timeout, NULL, NULL, &apc ); if (ret != STATUS_USER_APC) break; invoke_apc( &apc ); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index d3927a05af..fbfb8f893e 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2584,9 +2584,7 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size select_op.keyed_event.handle = wine_server_obj_handle( keyed_event ); select_op.keyed_event.key = wine_server_client_ptr( addr ); - ret = server_select( &select_op, sizeof(select_op.keyed_event), SELECT_INTERRUPTIBLE, abs_timeout, NULL, NULL ); - RtlLeaveCriticalSection( &addr_section ); - return ret; + return server_select( &select_op, sizeof(select_op.keyed_event), SELECT_INTERRUPTIBLE, abs_timeout, NULL, &addr_section, NULL ); } /***********************************************************************

1 0

Dmitry Timoshkov : wldap32: Set count and result to 0 when returning LDAP_NO_RESULTS_RETURNED.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 3c7fddbcae460fabbbc46829387b22dcbd6dc8e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c7fddbcae460fabbbc46829… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 20 13:59:38 2020 +0800 wldap32: Set count and result to 0 when returning LDAP_NO_RESULTS_RETURNED. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/page.c | 2 ++ dlls/wldap32/tests/parse.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 32e7e91fb2..959567c2bf 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -185,6 +185,8 @@ ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search, if (search->cookie && search->cookie->bv_len == 0) { /* end of paged results */ + *count = 0; + *results = NULL; return WLDAP32_LDAP_NO_RESULTS_RETURNED; } diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 2915d9c02b..c982be9e59 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -264,9 +264,7 @@ static void test_ldap_paged_search(void) res = (void *)0xdeadbeef; ret = ldap_get_next_page_s( ld, search, NULL, 1, &count, &res ); ok( ret == LDAP_NO_RESULTS_RETURNED, "got 0x%x\n", ret ); -todo_wine ok( !res, "expected res == NULL\n" ); -todo_wine ok( count == 0, "got %u\n", count ); ldap_search_abandon_page( ld, search );

1 0

Vincent Povirk : mscoree: Update Wine Mono to 5.0.0.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: fc77666c0b354392a3244ba5211669849df4d53c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc77666c0b354392a3244ba5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Apr 18 22:01:17 2020 -0500 mscoree: Update Wine Mono to 5.0.0. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 12 +++++++++--- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 48a84f3958..c1405d5ec8 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,8 +58,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.9.4" -#define MONO_SHA "51a6ff38323fcda71d70ead90c252b5eaeacec542ba737dbd1d676787b210fdd" +#define MONO_VERSION "5.0.0" +#if defined(__i386__) || defined(__x86_64__) +#define MONO_ARCH "x86" +#define MONO_SHA "17da208645a82a5e45e84fc75c73a8440acda484411cb8fae8e9b72db9886cd5" +#else +#define MONO_ARCH "" +#define MONO_SHA "???" +#endif typedef struct { const char *version; @@ -88,7 +94,7 @@ static const addon_info_t addons_info[] = { }, { MONO_VERSION, - L"wine-mono-" MONO_VERSION ".msi", + L"wine-mono-" MONO_VERSION "-" MONO_ARCH ".msi", L"mono", MONO_SHA, "http://source.winehq.org/winemono.php", diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index f824cc9d5c..cd032aefc0 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.9.4" +#define WINE_MONO_VERSION "5.0.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Nikolay Sivov : ole32: Improve locking safety in IMalloc::Free().
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: da5903e7d17ab8af0ba0a2df395b13650123d712 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da5903e7d17ab8af0ba0a2df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 10:59:19 2020 +0300 ole32: Improve locking safety in IMalloc::Free(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index dfced20de2..f1dae0c956 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -254,35 +254,39 @@ static void * WINAPI IMalloc_fnRealloc(IMalloc *iface, void *pv, SIZE_T cb) /****************************************************************************** * IMalloc32_Free [VTABLE] */ -static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) +static void WINAPI IMalloc_fnFree(IMalloc *iface, void *mem) { - BOOL fSpyed = FALSE; - - TRACE("(%p)\n",pv); - - if(!pv) - return; + BOOL spyed_block = FALSE, spy_active = FALSE; - if(Malloc32.pSpy) { - EnterCriticalSection(&IMalloc32_SpyCS); - fSpyed = mallocspy_remove_spyed_memory(pv); - pv = IMallocSpy_PreFree(Malloc32.pSpy, pv, fSpyed); - } + TRACE("(%p)\n", mem); - HeapFree(GetProcessHeap(),0,pv); + if (!mem) + return; - if(Malloc32.pSpy) { - IMallocSpy_PostFree(Malloc32.pSpy, fSpyed); + if (Malloc32.pSpy) + { + EnterCriticalSection(&IMalloc32_SpyCS); + spyed_block = mallocspy_remove_spyed_memory(mem); + spy_active = TRUE; + mem = IMallocSpy_PreFree(Malloc32.pSpy, mem, spyed_block); + } - /* check if can release the spy */ - if(Malloc32.SpyReleasePending && !Malloc32.SpyedAllocationsLeft) { - IMallocSpy_Release(Malloc32.pSpy); - Malloc32.SpyReleasePending = FALSE; - Malloc32.pSpy = NULL; - } + HeapFree(GetProcessHeap(), 0, mem); - LeaveCriticalSection(&IMalloc32_SpyCS); + if (spy_active) + { + IMallocSpy_PostFree(Malloc32.pSpy, spyed_block); + + /* check if can release the spy */ + if (Malloc32.SpyReleasePending && !Malloc32.SpyedAllocationsLeft) + { + IMallocSpy_Release(Malloc32.pSpy); + Malloc32.SpyReleasePending = FALSE; + Malloc32.pSpy = NULL; } + + LeaveCriticalSection(&IMalloc32_SpyCS); + } } /******************************************************************************

1 0

Jacek Caban : ntdll: Remove APC handling from RtlWaitOnAddress.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 7a1069e9bd3ba4a7abbc78b9f012bc05e9b818e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a1069e9bd3ba4a7abbc78b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 20 00:02:00 2020 +0200 ntdll: Remove APC handling from RtlWaitOnAddress. It uses non-alertable wait anyway. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 2 -- dlls/ntdll/server.c | 4 ++-- dlls/ntdll/sync.c | 34 +++++++++++----------------------- 3 files changed, 13 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 336d7c0463..964953e27d 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -128,8 +128,6 @@ extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret, data_size_t *ret_len ) DECLSPEC_HIDDEN; extern NTSTATUS validate_open_object_attributes( const OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN; -extern int wait_select_reply( void *cookie ) DECLSPEC_HIDDEN; -extern void invoke_apc( const user_apc_t *apc ) DECLSPEC_HIDDEN; /* module handling */ extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index be080a9f73..3de5a93556 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -349,7 +349,7 @@ void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sig * * Wait for a reply on the waiting pipe of the current thread. */ -int wait_select_reply( void *cookie ) +static int wait_select_reply( void *cookie ) { int signaled; struct wake_up_reply reply; @@ -381,7 +381,7 @@ int wait_select_reply( void *cookie ) } -void invoke_apc( const user_apc_t *apc ) +static void invoke_apc( const user_apc_t *apc ) { switch( apc->type ) { diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index be00ac75d0..d3927a05af 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2557,9 +2557,7 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size { select_op_t select_op; NTSTATUS ret; - BOOL user_apc = FALSE; timeout_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; - user_apc_t apc; if (size != 1 && size != 2 && size != 4 && size != 8) return STATUS_INVALID_PARAMETER; @@ -2567,9 +2565,12 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size if ((ret = fast_wait_addr( addr, cmp, size, timeout )) != STATUS_NOT_IMPLEMENTED) return ret; - select_op.keyed_event.op = SELECT_KEYED_EVENT_WAIT; - select_op.keyed_event.handle = wine_server_obj_handle( keyed_event ); - select_op.keyed_event.key = wine_server_client_ptr( addr ); + RtlEnterCriticalSection( &addr_section ); + if (!compare_addr( addr, cmp, size )) + { + RtlLeaveCriticalSection( &addr_section ); + return STATUS_SUCCESS; + } if (abs_timeout < 0) { @@ -2579,25 +2580,12 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size abs_timeout -= now.QuadPart; } - for (;;) - { - RtlEnterCriticalSection( &addr_section ); - if (!compare_addr( addr, cmp, size )) - ret = STATUS_SUCCESS; - else - ret = server_select( &select_op, sizeof(select_op.keyed_event), SELECT_INTERRUPTIBLE, abs_timeout, NULL, &apc ); - RtlLeaveCriticalSection( &addr_section ); - - if (ret != STATUS_USER_APC) break; - invoke_apc( &apc ); - - /* if we ran a user apc we have to check once more if additional apcs are queued, - * but we don't want to wait */ - abs_timeout = 0; - user_apc = TRUE; - } + select_op.keyed_event.op = SELECT_KEYED_EVENT_WAIT; + select_op.keyed_event.handle = wine_server_obj_handle( keyed_event ); + select_op.keyed_event.key = wine_server_client_ptr( addr ); - if (ret == STATUS_TIMEOUT && user_apc) ret = STATUS_USER_APC; + ret = server_select( &select_op, sizeof(select_op.keyed_event), SELECT_INTERRUPTIBLE, abs_timeout, NULL, NULL ); + RtlLeaveCriticalSection( &addr_section ); return ret; }

1 0

Anton Baskanov : amstream: Implement AMAudioStream::SetState.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 86bc6a28f724e22c543cc3a3fe24729e39369fa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86bc6a28f724e22c543cc3a3… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Apr 19 17:14:20 2020 -0500 amstream: Implement AMAudioStream::SetState. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 13 ++++++++++--- dlls/amstream/tests/amstream.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 1f9aed7338..4e34b2549e 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -184,6 +184,7 @@ struct audio_stream IMemAllocator *allocator; AM_MEDIA_TYPE mt; WAVEFORMATEX format; + FILTER_STATE state; }; static inline struct audio_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) @@ -340,11 +341,17 @@ static HRESULT WINAPI audio_IAMMediaStream_Initialize(IAMMediaStream *iface, IUn static HRESULT WINAPI audio_IAMMediaStream_SetState(IAMMediaStream *iface, FILTER_STATE state) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); - FIXME("(%p/%p)->(%u) stub!\n", This, iface, state); + TRACE("stream %p, state %u.\n", stream, state); - return S_FALSE; + EnterCriticalSection(&stream->cs); + + stream->state = state; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI audio_IAMMediaStream_JoinAMMultiMediaStream(IAMMediaStream *iface, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 82a833ad6f..472c6558fc 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2780,6 +2780,40 @@ static void test_audiostream_receive_connection(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_audiostream_set_state(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IAMMediaStream *am_stream; + IMediaStream *stream; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IAMMediaStream, (void **)&am_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMediaStream_SetState(am_stream, 4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMediaStream_SetState(am_stream, State_Running); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMediaStream_SetState(am_stream, State_Paused); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMediaStream_SetState(am_stream, State_Stopped); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IAMMediaStream_Release(am_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + void test_mediastreamfilter_get_state(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -2951,6 +2985,7 @@ START_TEST(amstream) test_audiostream_get_format(); test_audiostream_set_format(); test_audiostream_receive_connection(); + test_audiostream_set_state(); test_mediastreamfilter_get_state(); test_mediastreamfilter_stop_pause_run();

1 0

Zebediah Figura : wineusb.sys: Implement URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: d6fac18a72a5e118b135e91cde89ab4b42e6e238 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6fac18a72a5e118b135e91c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 17 18:03:07 2020 -0500 wineusb.sys: Implement URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index a926970047..aa4f204415 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -431,6 +431,10 @@ static void transfer_cb(struct libusb_transfer *transfer) { switch (urb->UrbHeader.Function) { + case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: + urb->UrbBulkOrInterruptTransfer.TransferBufferLength = transfer->actual_length; + break; + case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: { struct _URB_CONTROL_DESCRIPTOR_REQUEST *req = &urb->UrbControlDescriptorRequest; @@ -488,6 +492,18 @@ static HANDLE make_pipe_handle(unsigned char endpoint, USBD_PIPE_TYPE type) return u.handle; } +static struct pipe get_pipe(HANDLE handle) +{ + union + { + struct pipe pipe; + HANDLE handle; + } u; + + u.handle = handle; + return u.pipe; +} + static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) { URB *urb = IoGetCurrentIrpStackLocation(irp)->Parameters.Others.Argument1; @@ -498,6 +514,43 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) switch (urb->UrbHeader.Function) { + case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: + { + struct _URB_BULK_OR_INTERRUPT_TRANSFER *req = &urb->UrbBulkOrInterruptTransfer; + struct pipe pipe = get_pipe(req->PipeHandle); + + if (req->TransferBufferMDL) + FIXME("Unhandled MDL output buffer.\n"); + + if (!(transfer = libusb_alloc_transfer(0))) + return STATUS_NO_MEMORY; + + if (pipe.type == UsbdPipeTypeBulk) + { + libusb_fill_bulk_transfer(transfer, device->handle, pipe.endpoint, + req->TransferBuffer, req->TransferBufferLength, transfer_cb, irp, 0); + } + else if (pipe.type == UsbdPipeTypeInterrupt) + { + libusb_fill_interrupt_transfer(transfer, device->handle, pipe.endpoint, + req->TransferBuffer, req->TransferBufferLength, transfer_cb, irp, 0); + } + else + { + WARN("Invalid pipe type %#x.\n", pipe.type); + libusb_free_transfer(transfer); + return USBD_STATUS_INVALID_PIPE_HANDLE; + } + + queue_irp(device, irp, transfer); + transfer->flags = LIBUSB_TRANSFER_FREE_TRANSFER; + ret = libusb_submit_transfer(transfer); + if (ret < 0) + ERR("Failed to submit bulk transfer: %s\n", libusb_strerror(ret)); + + return STATUS_PENDING; + } + case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: { struct _URB_CONTROL_DESCRIPTOR_REQUEST *req = &urb->UrbControlDescriptorRequest;

1 0

Nikolay Sivov : ole32: Remove unused field.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 7c4106aa892ff93eff90b32f6f048d8cd379e0bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c4106aa892ff93eff90b32f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 10:59:21 2020 +0300 ole32: Remove unused field. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 96977fc751..62007800e3 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -49,7 +49,6 @@ static const IMallocVtbl VT_IMalloc32; typedef struct { IMalloc IMalloc_iface; - DWORD dummy; /* nothing, we are static */ IMallocSpy * pSpy; /* the spy when active */ DWORD SpyedAllocationsLeft; /* number of spyed allocations left */ BOOL SpyReleasePending; /* CoRevokeMallocSpy called with spyed allocations left*/ @@ -58,7 +57,7 @@ typedef struct { } _Malloc32; /* this is the static object instance */ -static _Malloc32 Malloc32 = {{&VT_IMalloc32}, 0, NULL, 0, 0, NULL, 0}; +static _Malloc32 Malloc32 = {{&VT_IMalloc32}, NULL, 0, 0, NULL, 0}; /* with a spy active all calls from pre to post methods are threadsafe */ static CRITICAL_SECTION IMalloc32_SpyCS;

1 0

Zebediah Figura : wine.inf: Set the default Current{Major, Minor}VersionNumber registry values.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: e13d54665765d9dd8829233f0ea748fd685a1913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e13d54665765d9dd8829233f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 18 12:50:30 2020 -0500 wine.inf: Set the default Current{Major, Minor}VersionNumber registry values. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 91eb68e6d5..dbdec4c38a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3738,6 +3738,8 @@ HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Ca [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1" +HKLM,%CurrentVersionNT%,"CurrentMajorVersionNumber",0x10001,6 +HKLM,%CurrentVersionNT%,"CurrentMinorVersionNumber",0x10001,1 HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601"

1 0

Jeff Smith : gdiplus/tests: Use originating line when ok_path reports failures.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 28dde825b3beb7135659ef736be5d3946cfbcead URL: https://source.winehq.org/git/wine.git/?a=commit;h=28dde825b3beb7135659ef73… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Apr 18 10:18:45 2020 -0500 gdiplus/tests: Use originating line when ok_path reports failures. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphicspath.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index a02500bc1d..a987cd165d 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -75,8 +75,10 @@ typedef struct int todo; } path_test_t; -#define ok_path(a,b,c,d) ok_path_fudge(a,b,c,d,2.0) -static void ok_path_fudge(GpPath* path, const path_test_t *expected, INT expected_size, BOOL todo_size, REAL fudge) +#define ok_path(a,b,c,d) _ok_path_fudge(a,b,c,d,2.0,__LINE__) +#define ok_path_fudge(a,b,c,d,e) _ok_path_fudge(a,b,c,d,e,__LINE__) +static void _ok_path_fudge(GpPath* path, const path_test_t *expected, INT expected_size, + BOOL todo_size, REAL fudge, int line) { BYTE * types; INT size, idx = 0, eidx = 0, numskip; @@ -89,7 +91,7 @@ static void ok_path_fudge(GpPath* path, const path_test_t *expected, INT expecte } todo_wine_if (todo_size) - ok(size == expected_size, "Path size %d does not match expected size %d\n", + ok_(__FILE__,line)(size == expected_size, "Path size %d does not match expected size %d\n", size, expected_size); points = HeapAlloc(GetProcessHeap(), 0, size * sizeof(GpPointF)); @@ -112,7 +114,7 @@ static void ok_path_fudge(GpPath* path, const path_test_t *expected, INT expecte stringify_point_type(types[idx], name); todo_wine_if (expected[eidx].todo || numskip) - ok(match, "Expected #%d: %s (%.1f,%.1f) but got %s (%.1f,%.1f)\n", eidx, + ok_(__FILE__,line)(match, "Expected #%d: %s (%.1f,%.1f) but got %s (%.1f,%.1f)\n", eidx, ename, expected[eidx].X, expected[eidx].Y, name, points[idx].X, points[idx].Y);

1 0