wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Nikolay Sivov : mf: Add initial async implementation of SetTopology().
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: d2bd44992e0b863c7623d9147d4538991da5601f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2bd44992e0b863c7623d914… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 27 17:00:45 2019 +0300 mf: Add initial async implementation of SetTopology(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 237 +++++++++++++++++++++++++++++++++++++++++++++++------- include/mfapi.h | 10 +++ 2 files changed, 219 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d2bd44992e0b863c7623…

1 0

Nikolay Sivov : mf: Fix stream IID loader should be testing for.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: e578ee3b0ad4d75ea486c6146b5d261bf88afbf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e578ee3b0ad4d75ea486c614… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 27 17:00:44 2019 +0300 mf: Fix stream IID loader should be testing for. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index e48792eab6..926fd48747 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1726,7 +1726,7 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in IMFTopology **output_topology, IMFTopology *current_topology) { struct topology *topology = unsafe_impl_from_IMFTopology(input_topology); - IMFMediaSink *sink; + IMFStreamSink *sink; HRESULT hr; size_t i; @@ -1745,9 +1745,9 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in if (node->object) { /* Sinks must be bound beforehand. */ - if (FAILED(IUnknown_QueryInterface(node->object, &IID_IMFMediaSink, (void **)&sink))) + if (FAILED(IUnknown_QueryInterface(node->object, &IID_IMFStreamSink, (void **)&sink))) return MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED; - IMFMediaSink_Release(sink); + IMFStreamSink_Release(sink); } break; case MF_TOPOLOGY_SOURCESTREAM_NODE:

1 0

Hans Leidekker : ws2_32: Call the completion routine in GetAddrInfoExW.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: c3bcf83d14e79bc8202d7d22fe773842a42240fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3bcf83d14e79bc8202d7d22… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 27 12:47:28 2019 +0200 ws2_32: Call the completion routine in GetAddrInfoExW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 20 ++++++++++---- dlls/ws2_32/tests/sock.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d82172aa5b..aa0a164ff9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6997,6 +6997,7 @@ static struct WS_addrinfo *addrinfo_WtoA(const struct WS_addrinfoW *ai) struct getaddrinfo_args { OVERLAPPED *overlapped; + LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine; ADDRINFOEXW **result; char *nodename; char *servname; @@ -7007,6 +7008,7 @@ static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *co struct getaddrinfo_args *args = context; OVERLAPPED *overlapped = args->overlapped; HANDLE event = overlapped->hEvent; + LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine = args->completion_routine; struct WS_addrinfo *res; int ret; @@ -7023,10 +7025,12 @@ static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *co HeapFree(GetProcessHeap(), 0, args); overlapped->Internal = ret; + if (completion_routine) completion_routine(ret, 0, overlapped); if (event) SetEvent(event); } -static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const struct WS_addrinfo *hints, ADDRINFOEXW **res, OVERLAPPED *overlapped) +static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const struct WS_addrinfo *hints, ADDRINFOEXW **res, + OVERLAPPED *overlapped, LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine) { int ret = EAI_MEMORY, len, i; char *nodenameA = NULL, *servnameA = NULL; @@ -7082,8 +7086,15 @@ static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const s { struct getaddrinfo_args *args; + if (overlapped->hEvent && completion_routine) + { + ret = WSAEINVAL; + goto end; + } + if (!(args = HeapAlloc(GetProcessHeap(), 0, sizeof(*args)))) goto end; args->overlapped = overlapped; + args->completion_routine = completion_routine; args->result = res; args->nodename = nodenameA; args->servname = servnameA; @@ -7096,7 +7107,6 @@ static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const s goto end; } - if (local_nodenameW != nodename) HeapFree(GetProcessHeap(), 0, local_nodenameW); WSASetLastError(ERROR_IO_PENDING); @@ -7138,12 +7148,10 @@ int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namesp FIXME("Unsupported hints\n"); if (timeout) FIXME("Unsupported timeout\n"); - if (completion_routine) - FIXME("Unsupported completion_routine\n"); if (handle) FIXME("Unsupported cancel handle\n"); - ret = WS_getaddrinfoW(name, servname, NULL, result, overlapped); + ret = WS_getaddrinfoW(name, servname, NULL, result, overlapped, completion_routine); if (ret) return ret; if (handle) *handle = (HANDLE)0xdeadbeef; return 0; @@ -7181,7 +7189,7 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hin *res = NULL; if (hints) hintsA = addrinfo_WtoA(hints); - ret = WS_getaddrinfoW(nodename, servname, hintsA, &resex, NULL); + ret = WS_getaddrinfoW(nodename, servname, hintsA, &resex, NULL, NULL); WS_freeaddrinfo(hintsA); if (ret) return ret; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e97cd381d0..e4b57cfdda 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7617,11 +7617,36 @@ static void test_GetAddrInfoW(void) ok(result2 == NULL, "got %p\n", result2); } +static struct completion_routine_test +{ + WSAOVERLAPPED *overlapped; + DWORD error; + ADDRINFOEXW **result; + HANDLE event; + DWORD called; +} completion_routine_test; + +static void CALLBACK completion_routine(DWORD error, DWORD byte_count, WSAOVERLAPPED *overlapped) +{ + struct completion_routine_test *test = &completion_routine_test; + + ok(error == test->error, "got %u\n", error); + ok(!byte_count, "got %u\n", byte_count); + ok(overlapped == test->overlapped, "got %p\n", overlapped); + ok(overlapped->Internal == test->error, "got %lu\n", overlapped->Internal); + ok(overlapped->Pointer == test->result, "got %p\n", overlapped->Pointer); + ok(overlapped->hEvent == NULL, "got %p\n", overlapped->hEvent); + + test->called++; + SetEvent(test->event); +} + static void test_GetAddrInfoExW(void) { static const WCHAR empty[] = {0}; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; static const WCHAR winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR nxdomain[] = {'n','x','d','o','m','a','i','n','.','w','i','n','e','h','q','.','o','r','g',0}; ADDRINFOEXW *result; OVERLAPPED overlapped; HANDLE event; @@ -7706,6 +7731,53 @@ static void test_GetAddrInfoExW(void) todo_wine_if(ret != WAIT_TIMEOUT) /* Remove when abowe todo_wines are fixed */ ok(ret == WAIT_TIMEOUT, "wait failed\n"); + /* event + completion routine */ + result = (void*)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + overlapped.hEvent = event; + ResetEvent(event); + ret = pGetAddrInfoExW(localhost, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, completion_routine, NULL); + ok(ret == WSAEINVAL, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + + /* completion routine, existing domain */ + result = (void *)0xdeadbeef; + overlapped.hEvent = NULL; + completion_routine_test.overlapped = &overlapped; + completion_routine_test.error = ERROR_SUCCESS; + completion_routine_test.result = &result; + completion_routine_test.event = event; + completion_routine_test.called = 0; + ResetEvent(event); + ret = pGetAddrInfoExW(winehq, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, completion_routine, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(!result, "result != NULL\n"); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(!ret, "overlapped result is %d\n", ret); + ok(overlapped.hEvent == NULL, "hEvent changed %p\n", overlapped.hEvent); + ok(overlapped.Internal == ERROR_SUCCESS, "overlapped.Internal = %lx\n", overlapped.Internal); + ok(overlapped.Pointer == &result, "overlapped.Pointer != &result\n"); + ok(completion_routine_test.called == 1, "got %u\n", completion_routine_test.called); + pFreeAddrInfoExW(result); + + /* completion routine, non-existing domain */ + result = (void *)0xdeadbeef; + completion_routine_test.overlapped = &overlapped; + completion_routine_test.error = WSAHOST_NOT_FOUND; + completion_routine_test.called = 0; + ResetEvent(event); + ret = pGetAddrInfoExW(nxdomain, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, completion_routine, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(!result, "result != NULL\n"); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(ret == WSAHOST_NOT_FOUND, "overlapped result is %d\n", ret); + ok(overlapped.hEvent == NULL, "hEvent changed %p\n", overlapped.hEvent); + ok(overlapped.Internal == WSAHOST_NOT_FOUND, "overlapped.Internal = %lx\n", overlapped.Internal); + ok(overlapped.Pointer == &result, "overlapped.Pointer != &result\n"); + ok(completion_routine_test.called == 1, "got %u\n", completion_routine_test.called); + ok(result == NULL, "got %p\n", result); + WSACloseEvent(event); }

1 0

Piotr Caban : winebus.sys: Stop SDL deviceloop_thread to avoid crash on driver unload.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: 9d5c801d353b02ed0cf3c03bf5c957bb4ffbecdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d5c801d353b02ed0cf3c03b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 27 12:37:52 2019 +0200 winebus.sys: Stop SDL deviceloop_thread to avoid crash on driver unload. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 8fcec46d04..64c5a8a1d2 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -70,6 +70,8 @@ static DWORD map_controllers = 0; DEFINE_GUID(GUID_DEVCLASS_SDL, 0x463d60b5,0x802b,0x4bb2,0x8f,0xdb,0x7d,0xa9,0xb9,0x96,0x04,0xd8); static void *sdl_handle = NULL; +static HANDLE deviceloop_handle; +static UINT quit_event = -1; #ifdef SONAME_LIBSDL2 #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL @@ -109,6 +111,8 @@ MAKE_FUNCPTR(SDL_HapticStopAll); MAKE_FUNCPTR(SDL_JoystickIsHaptic); MAKE_FUNCPTR(SDL_memset); MAKE_FUNCPTR(SDL_GameControllerAddMapping); +MAKE_FUNCPTR(SDL_RegisterEvents); +MAKE_FUNCPTR(SDL_PushEvent); #endif static Uint16 (*pSDL_JoystickGetProduct)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetProductVersion)(SDL_Joystick * joystick); @@ -1075,17 +1079,41 @@ static DWORD CALLBACK deviceloop_thread(void *args) SetEvent(init_done); - while (1) - while (pSDL_WaitEvent(&event) != 0) + while (1) { + while (pSDL_WaitEvent(&event) != 0) { + if (event.type == quit_event) { + TRACE("Device thread exiting\n"); + return 0; + } process_device_event(&event); - - TRACE("Device thread exiting\n"); - return 0; + } + } } void sdl_driver_unload( void ) { + SDL_Event event; + TRACE("Unload Driver\n"); + + if (!deviceloop_handle) + return; + + quit_event = pSDL_RegisterEvents(1); + if (quit_event == -1) { + ERR("error registering quit event\n"); + return; + } + + event.type = quit_event; + if (pSDL_PushEvent(&event) != 1) { + ERR("error pushing quit event\n"); + return; + } + + WaitForSingleObject(deviceloop_handle, INFINITE); + CloseHandle(deviceloop_handle); + wine_dlclose(sdl_handle, NULL, 0); } NTSTATUS sdl_driver_init(void) @@ -1140,6 +1168,8 @@ NTSTATUS sdl_driver_init(void) LOAD_FUNCPTR(SDL_JoystickIsHaptic); LOAD_FUNCPTR(SDL_memset); LOAD_FUNCPTR(SDL_GameControllerAddMapping); + LOAD_FUNCPTR(SDL_RegisterEvents); + LOAD_FUNCPTR(SDL_PushEvent); #undef LOAD_FUNCPTR pSDL_JoystickGetProduct = wine_dlsym(sdl_handle, "SDL_JoystickGetProduct", NULL, 0); pSDL_JoystickGetProductVersion = wine_dlsym(sdl_handle, "SDL_JoystickGetProductVersion", NULL, 0); @@ -1162,12 +1192,13 @@ NTSTATUS sdl_driver_init(void) result = WaitForMultipleObjects(2, events, FALSE, INFINITE); CloseHandle(events[0]); - CloseHandle(events[1]); if (result == WAIT_OBJECT_0) { TRACE("Initialization successful\n"); + deviceloop_handle = events[1]; return STATUS_SUCCESS; } + CloseHandle(events[1]); sym_not_found: wine_dlclose(sdl_handle, NULL, 0);

1 0

Piotr Caban : winebus.sys: Don't do anything in iohid_driver_unload if iohid was not initialized.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: 485aed9f1c0353597d8b5ebecf5599bfc6573d68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=485aed9f1c0353597d8b5ebe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 27 12:37:48 2019 +0200 winebus.sys: Don't do anything in iohid_driver_unload if iohid was not initialized. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index cda77e3011..f0f10ca98e 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -416,6 +416,10 @@ NTSTATUS iohid_driver_init(void) void iohid_driver_unload( void ) { TRACE("Unloading Driver\n"); + + if (!run_loop_handle) + return; + IOHIDManagerUnscheduleFromRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); CFRunLoopStop(run_loop); WaitForSingleObject(run_loop_handle, INFINITE);

1 0

Piotr Caban : winebus.sys: Don't do anything in udev_driver_unload if udev was not initialized.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: ef59d2d11f5aed1d0bd249e159c672df2c8ccc3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef59d2d11f5aed1d0bd249e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 27 12:37:44 2019 +0200 winebus.sys: Don't do anything in udev_driver_unload if udev was not initialized. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index b72e6bf47d..6fa6efb7dc 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1488,6 +1488,9 @@ void udev_driver_unload( void ) { TRACE("Unload Driver\n"); + if (!deviceloop_handle) + return; + write(deviceloop_control[1], "q", 1); WaitForSingleObject(deviceloop_handle, INFINITE); close(deviceloop_control[0]);

1 0

Alistair Leslie-Hughes : dsound: Primary buffer doesn't support flag DSBCAPS_CTRLFX.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: eabb3d444c4cd78381a096665133e286e0805267 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eabb3d444c4cd78381a09666… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 27 03:46:55 2019 +0000 dsound: Primary buffer doesn't support flag DSBCAPS_CTRLFX. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40740 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 1 + dlls/dsound/dsound.c | 6 ++++++ dlls/dsound/tests/dsound8.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 6e4dae6be7..b7b4d01017 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1064,6 +1064,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire /* Update description for creating primary buffer */ desc.dwFlags |= DSBCAPS_PRIMARYBUFFER; + desc.dwFlags &= ~DSBCAPS_CTRLFX; desc.dwBufferBytes = 0; desc.lpwfxFormat = NULL; diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index f3030d6834..8e2b839fe8 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -451,6 +451,12 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( return DSERR_INVALIDPARAM; } + if (dsbd->dwFlags & DSBCAPS_CTRLFX) + { + WARN("Invalid parameter DSBCAPS_CTRLFX\n"); + return DSERR_INVALIDPARAM; + } + if (device->primary) { WARN("Primary Buffer already created\n"); IDirectSoundBuffer8_AddRef(&device->primary->IDirectSoundBuffer8_iface); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 6ed32abbcb..b66275973f 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1173,6 +1173,55 @@ static void test_COM(void) while (IUnknown_Release(unk)); } +static void test_primary_flags(void) +{ + HRESULT rc; + IDirectSound8 *dso; + IDirectSoundBuffer *primary = NULL; + IDirectSoundFXI3DL2Reverb *reverb; + DSBUFFERDESC bufdesc; + DSCAPS dscaps; + + /* Create a DirectSound8 object */ + rc = pDirectSoundCreate8(NULL, &dso, NULL); + ok(rc == DS_OK || rc==DSERR_NODRIVER, "Failed: %08x\n",rc); + + if (rc!=DS_OK) + return; + + rc = IDirectSound8_SetCooperativeLevel(dso, get_hwnd(), DSSCL_PRIORITY); + ok(rc == DS_OK,"Failed: %08x\n", rc); + if (rc != DS_OK) { + IDirectSound8_Release(dso); + return; + } + + dscaps.dwSize = sizeof(dscaps); + rc = IDirectSound8_GetCaps(dso, &dscaps); + ok(rc == DS_OK,"Failed: %08x\n", rc); + trace("0x%x\n", dscaps.dwFlags); + + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_PRIMARYBUFFER | DSBCAPS_CTRLFX; + rc = IDirectSound8_CreateSoundBuffer(dso, &bufdesc, &primary, NULL); + ok(rc == E_INVALIDARG, "got %08x\n", rc); + + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_PRIMARYBUFFER | DSBCAPS_CTRL3D; + rc = IDirectSound8_CreateSoundBuffer(dso, &bufdesc, &primary, NULL); + ok((rc == DS_OK && primary != NULL), "Failed to create a primary buffer: %08x\n", rc); + if (rc == DS_OK) { + rc = IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSoundFXI3DL2Reverb, (LPVOID*)&reverb); + ok(rc==E_NOINTERFACE,"Failed: %08x\n", rc); + + IDirectSoundBuffer_Release(primary); + } + + IDirectSound8_Release(dso); +} + static void test_effects(void) { HRESULT rc; @@ -1711,6 +1760,7 @@ START_TEST(dsound8) dsound8_tests(); test_hw_buffers(); test_first_device(); + test_primary_flags(); test_effects(); test_effects_parameters(); }

1 0

Alexandre Julliard : msvcrt: Move vtbl wrappers together with the other functions.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: 0c853f026578dd7c8aede2f716c8e55d816ccf40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c853f026578dd7c8aede2f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 13:57:06 2019 +0200 msvcrt: Move vtbl wrappers together with the other functions. The .text directive can mess up the variable definitions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47751 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 52 ++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 9e0de95740..53a9669fea 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -36,32 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); static int context_id = -1; static int scheduler_id = -1; -#if defined(__i386__) && !defined(__MINGW32__) - -#define DEFINE_VTBL_WRAPPER(off) \ - __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \ - "popl %eax\n\t" \ - "popl %ecx\n\t" \ - "pushl %eax\n\t" \ - "movl 0(%ecx), %eax\n\t" \ - "jmp *" #off "(%eax)\n\t") - -DEFINE_VTBL_WRAPPER(0); -DEFINE_VTBL_WRAPPER(4); -DEFINE_VTBL_WRAPPER(8); -DEFINE_VTBL_WRAPPER(12); -DEFINE_VTBL_WRAPPER(16); -DEFINE_VTBL_WRAPPER(20); -DEFINE_VTBL_WRAPPER(24); -DEFINE_VTBL_WRAPPER(28); -DEFINE_VTBL_WRAPPER(32); -DEFINE_VTBL_WRAPPER(36); -DEFINE_VTBL_WRAPPER(40); -DEFINE_VTBL_WRAPPER(44); -DEFINE_VTBL_WRAPPER(48); - -#endif - typedef enum { SchedulerKind, MaxConcurrency, @@ -1083,6 +1057,32 @@ void __cdecl _CurrentScheduler__ScheduleTask(void (__cdecl *proc)(void*), void * CurrentScheduler_ScheduleTask(proc, data); } +#if defined(__i386__) && !defined(__MINGW32__) + +#define DEFINE_VTBL_WRAPPER(off) \ + __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \ + "popl %eax\n\t" \ + "popl %ecx\n\t" \ + "pushl %eax\n\t" \ + "movl 0(%ecx), %eax\n\t" \ + "jmp *" #off "(%eax)\n\t") + +DEFINE_VTBL_WRAPPER(0); +DEFINE_VTBL_WRAPPER(4); +DEFINE_VTBL_WRAPPER(8); +DEFINE_VTBL_WRAPPER(12); +DEFINE_VTBL_WRAPPER(16); +DEFINE_VTBL_WRAPPER(20); +DEFINE_VTBL_WRAPPER(24); +DEFINE_VTBL_WRAPPER(28); +DEFINE_VTBL_WRAPPER(32); +DEFINE_VTBL_WRAPPER(36); +DEFINE_VTBL_WRAPPER(40); +DEFINE_VTBL_WRAPPER(44); +DEFINE_VTBL_WRAPPER(48); + +#endif + extern const vtable_ptr MSVCRT_type_info_vtable; DEFINE_RTTI_DATA0(Context, 0, ".?AVContext@Concurrency@@") DEFINE_RTTI_DATA1(ContextBase, 0, &Context_rtti_base_descriptor, ".?AVContextBase@details@Concurrency@@")

1 0

Zebediah Figura : strmbase: Rename "pConnectedTo" to "peer".
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: c7a447b67afa3992405cd6b585310b606edc9ac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7a447b67afa3992405cd6b5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 21:40:53 2019 -0500 strmbase: Rename "pConnectedTo" to "peer". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 16 ++++++++-------- dlls/qcap/smartteefilter.c | 8 ++++---- dlls/qcap/vfwcapture.c | 10 +++++----- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/filesource.c | 10 +++++----- dlls/quartz/videorenderer.c | 2 +- dlls/quartz/vmr9.c | 4 ++-- dlls/strmbase/outputqueue.c | 4 ++-- dlls/strmbase/pin.c | 38 +++++++++++++++++++------------------- dlls/strmbase/renderer.c | 14 +++++++------- dlls/strmbase/transform.c | 12 ++++++------ dlls/strmbase/video.c | 6 +++--- dlls/winegstreamer/gstdemux.c | 38 +++++++++++++++++++------------------- dlls/wineqtdecoder/qtsplitter.c | 20 ++++++++++---------- include/wine/strmbase.h | 2 +- 15 files changed, 93 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7a447b67afa3992405c…

1 0

Zebediah Figura : qcap/smartteefilter: Use strmbase filter state change methods.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: wine Branch: master Commit: e1f00bfc5e0dd9cd7c5b2a318c07986a4d332329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1f00bfc5e0dd9cd7c5b2a31… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 21:40:52 2019 -0500 qcap/smartteefilter: Use strmbase filter state change methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/smartteefilter.c | 48 +++------------------------------------- dlls/qcap/tests/smartteefilter.c | 16 +++++++------- 2 files changed, 11 insertions(+), 53 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index b2e5496b7d..d7e9e8b5f1 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -46,61 +46,19 @@ static inline SmartTeeFilter *impl_from_strmbase_filter(struct strmbase_filter * return CONTAINING_RECORD(filter, SmartTeeFilter, filter); } -static inline SmartTeeFilter *impl_from_IBaseFilter(IBaseFilter *iface) -{ - struct strmbase_filter *filter = CONTAINING_RECORD(iface, struct strmbase_filter, IBaseFilter_iface); - return impl_from_strmbase_filter(filter); -} - static inline SmartTeeFilter *impl_from_strmbase_pin(struct strmbase_pin *pin) { return impl_from_strmbase_filter(pin->filter); } -static HRESULT WINAPI SmartTeeFilter_Stop(IBaseFilter *iface) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - TRACE("(%p)\n", This); - EnterCriticalSection(&This->filter.csFilter); - This->filter.state = State_Stopped; - LeaveCriticalSection(&This->filter.csFilter); - return S_OK; -} - -static HRESULT WINAPI SmartTeeFilter_Pause(IBaseFilter *iface) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI SmartTeeFilter_Run(IBaseFilter *iface, REFERENCE_TIME tStart) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - HRESULT hr = S_OK; - TRACE("(%p, %s)\n", This, wine_dbgstr_longlong(tStart)); - EnterCriticalSection(&This->filter.csFilter); - if(This->filter.state != State_Running) { - /* We share an allocator among all pins, an allocator can only get committed - * once, state transitions occur in upstream order, and only output pins - * commit allocators, so let the filter attached to the input pin worry about it. */ - if (This->sink.pin.pConnectedTo) - This->filter.state = State_Running; - else - hr = VFW_E_NOT_CONNECTED; - } - LeaveCriticalSection(&This->filter.csFilter); - return hr; -} - static const IBaseFilterVtbl SmartTeeFilterVtbl = { BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, - SmartTeeFilter_Stop, - SmartTeeFilter_Pause, - SmartTeeFilter_Run, + BaseFilterImpl_Stop, + BaseFilterImpl_Pause, + BaseFilterImpl_Run, BaseFilterImpl_GetState, BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 437f3f4a7f..4eac344d53 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -2166,25 +2166,25 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -2194,11 +2194,11 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
63
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 September 2019