September 2019 - Wine-Commits

Alistair Leslie-Hughes : dsound: Primary buffer doesn't support flag DSBCAPS_CTRLFX.
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

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

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

Sept. 27, 2019

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

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

Sept. 27, 2019

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

Alexandre Julliard : winegcc: Update __stdcall defines for ARM platforms.
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

Module: wine Branch: master Commit: c3072237911eba11195cd3aa0018186022cac869 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3072237911eba11195cd3aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 12:01:40 2019 +0200 winegcc: Update __stdcall defines for ARM platforms. Reported by Kevin Puetz. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index f1798a8978..6f26f60709 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -723,32 +723,29 @@ static void compile(struct options* opts, const char* lang) switch (opts->target_cpu) { case CPU_x86_64: + case CPU_ARM64: strarray_add(comp_args, "-D__stdcall=__attribute__((ms_abi))"); - strarray_add(comp_args, "-D__cdecl=__attribute__((ms_abi))"); - strarray_add(comp_args, "-D_stdcall=__attribute__((ms_abi))"); - strarray_add(comp_args, "-D_cdecl=__attribute__((ms_abi))"); - strarray_add(comp_args, "-D__fastcall=__attribute__((ms_abi))"); - strarray_add(comp_args, "-D_fastcall=__attribute__((ms_abi))"); + strarray_add(comp_args, "-D__cdecl=__stdcall"); + strarray_add(comp_args, "-D__fastcall=__stdcall"); break; case CPU_x86: strarray_add(comp_args, "-D__stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D__cdecl=__attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))"); - strarray_add(comp_args, "-D_stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))"); - strarray_add(comp_args, "-D_cdecl=__attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D__fastcall=__attribute__((__fastcall__))"); - strarray_add(comp_args, "-D_fastcall=__attribute__((__fastcall__))"); break; case CPU_ARM: - case CPU_ARM64: + strarray_add(comp_args, "-D__stdcall=__attribute__((pcs(\"aapcs-vfp\")))"); + strarray_add(comp_args, "-D__cdecl=__stdcall"); + strarray_add(comp_args, "-D__fastcall=__stdcall"); case CPU_POWERPC: strarray_add(comp_args, "-D__stdcall="); strarray_add(comp_args, "-D__cdecl="); - strarray_add(comp_args, "-D_stdcall="); - strarray_add(comp_args, "-D_cdecl="); strarray_add(comp_args, "-D__fastcall="); - strarray_add(comp_args, "-D_fastcall="); break; } + strarray_add(comp_args, "-D_stdcall=__stdcall"); + strarray_add(comp_args, "-D_cdecl=__cdecl"); + strarray_add(comp_args, "-D_fastcall=__fastcall"); strarray_add(comp_args, "-D__declspec(x)=__declspec_##x"); strarray_add(comp_args, "-D__declspec_align(x)=__attribute__((aligned(x)))"); strarray_add(comp_args, "-D__declspec_allocate(x)=__attribute__((section(x)))");

1 0

Piotr Caban : winebus.sys: Stop SDL deviceloop_thread to avoid crash on driver unload.
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

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

Alexandre Julliard : oleaut32: Return value pointer needs to be in x8 on ARM64.
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

Module: wine Branch: master Commit: d01470ad451b5aff7b1586f35ef90ff039458d02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d01470ad451b5aff7b1586f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 12:00:09 2019 +0200 oleaut32: Return value pointer needs to be in x8 on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d40c0efb0f..7ad92837da 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6823,7 +6823,7 @@ __ASM_GLOBAL_FUNC( call_method, "ldr x4, [x2, x1, lsl #3]\n\t" "str x4, [sp, x1, lsl #3]\n\t" "cbnz x1, 1b\n" - "2:\tmov x8, x0\n\t" + "2:\tmov x16, x0\n\t" "mov x9, x3\n\t" "ldp d0, d1, [x9]\n\t" "ldp d2, d3, [x9, #0x10]\n\t" @@ -6833,7 +6833,8 @@ __ASM_GLOBAL_FUNC( call_method, "ldp x2, x3, [x9, #0x50]\n\t" "ldp x4, x5, [x9, #0x60]\n\t" "ldp x6, x7, [x9, #0x70]\n\t" - "blr x8\n\t" + "ldr x8, [x9, #0x80]\n\t" + "blr x16\n\t" "mov sp, x29\n\t" "ldp x29, x30, [sp], #16\n\t" "ret" ) @@ -6856,7 +6857,7 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART float f; double d; } fp[8]; - DWORD_PTR x[8]; + DWORD_PTR x[9]; } regs; int rcount; /* 64-bit register index count */ int fpcount = 0; /* float register index count */ @@ -6887,7 +6888,7 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART { case VT_DECIMAL: case VT_VARIANT: - regs.x[rcount++] = (DWORD_PTR)result; /* arg 0 is a pointer to the result */ + regs.x[8] = (DWORD_PTR)result; /* x8 is a pointer to the result */ break; case VT_HRESULT: WARN("invalid return type %u\n", ret_type);

1 0

Alexandre Julliard : kernelbase: Use set_ntstatus() in more places.
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

Module: wine Branch: master Commit: 31d522ea53e5cfeb426e88e5badd3864be5b047a URL: https://source.winehq.org/git/wine.git/?a=commit;h=31d522ea53e5cfeb426e88e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 12:42:16 2019 +0200 kernelbase: Use set_ntstatus() in more places. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/loader.c | 30 +++++-------------- dlls/kernelbase/main.c | 14 ++------- dlls/kernelbase/memory.c | 9 ++---- dlls/kernelbase/sync.c | 78 ++++++++---------------------------------------- dlls/kernelbase/thread.c | 47 +++++++++++------------------ 5 files changed, 43 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=31d522ea53e5cfeb426e…

1 0

Zebediah Figura : qcap/smartteefilter: Use strmbase filter state change methods.
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

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

Alexandre Julliard : rpcrt4: Add stubless proxy support for ARM64.
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

Module: wine Branch: master Commit: d9adc902f88445fb1a33825775884de394124d71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9adc902f88445fb1a338257… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 12:39:49 2019 +0200 rpcrt4: Add stubless proxy support for ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/cproxy.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/cstub.c | 17 +++++++++++++++++ dlls/rpcrt4/ndr_stubless.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 3b9467735b..968c7b5156 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -196,6 +196,50 @@ static inline void init_thunk( struct thunk *thunk, unsigned int index ) thunk->func = call_stubless_func; } +#elif defined(__aarch64__) + +extern void call_stubless_func(void); +__ASM_GLOBAL_FUNC( call_stubless_func, + "stp x29, x30, [sp, #-0x90]!\n\t" + "mov x29, sp\n\t" + "stp d0, d1, [sp, #0x10]\n\t" + "stp d2, d3, [sp, #0x20]\n\t" + "stp d4, d5, [sp, #0x30]\n\t" + "stp d6, d7, [sp, #0x40]\n\t" + "stp x0, x1, [sp, #0x50]\n\t" + "stp x2, x3, [sp, #0x60]\n\t" + "stp x4, x5, [sp, #0x70]\n\t" + "stp x6, x7, [sp, #0x80]\n\t" + "ldr x0, [x0]\n\t" /* This->lpVtbl */ + "ldr x0, [x0, #-16]\n\t" /* MIDL_STUBLESS_PROXY_INFO */ + "ldp x1, x4, [x0, #8]\n\t" /* info->ProcFormatString, FormatStringOffset */ + "ldrh w4, [x4, x16, lsl #1]\n\t" /* info->FormatStringOffset[index] */ + "add x1, x1, x4\n\t" /* info->ProcFormatString + offset */ + "ldr x0, [x0]\n\t" /* info->pStubDesc */ + "add x2, sp, #0x50\n\t" /* stack */ + "add x3, sp, #0x10\n\t" /* fpu_stack */ + "bl " __ASM_NAME("ndr_client_call") "\n\t" + "ldp x29, x30, [sp], #0x90\n\t" + "ret" ) + +struct thunk +{ + DWORD ldr_index; /* ldr w16, index */ + DWORD ldr_func; /* ldr x17, func */ + DWORD br; /* br x17 */ + DWORD index; + void *func; +}; + +static inline void init_thunk( struct thunk *thunk, unsigned int index ) +{ + thunk->ldr_index = 0x18000070; /* ldr w16,index */ + thunk->ldr_func = 0x58000071; /* ldr x17,func */ + thunk->br = 0xd61f0220; /* br x17 */ + thunk->index = index; + thunk->func = call_stubless_func; +} + #else /* __i386__ */ #warning You must implement stubless proxies for your CPU diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 607e9d4bc8..1903a5f0c9 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -183,6 +183,23 @@ typedef struct DWORD offset; } vtbl_method_t; +#elif defined(__aarch64__) + +static const DWORD opcodes[] = +{ + 0xf9401000, /* ldr x0, [x0,#32] */ + 0xf9400010, /* ldr x16, [x0] */ + 0x18000071, /* ldr w17, offset */ + 0xf8716a10, /* ldr x16, [x16,x17] */ + 0xd61f0200 /* br x16 */ +}; + +typedef struct +{ + DWORD opcodes[ARRAY_SIZE(opcodes)]; + DWORD offset; +} vtbl_method_t; + #else #warning You must implement delegated proxies/stubs for your CPU diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index bceecdc827..cc52ee27e8 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1169,6 +1169,35 @@ __ASM_GLOBAL_FUNC( call_server_func, "5:\tblx r4\n\t" "mov SP, r5\n\t" "pop {r4, r5, PC}" ) +#elif defined __aarch64__ +LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char *args, unsigned int stack_size); +__ASM_GLOBAL_FUNC( call_server_func, + "stp x29, x30, [sp, #-16]!\n\t" + "mov x29, sp\n\t" + "add x3, x2, #15\n\t" + "lsr x3, x3, #4\n\t" + "sub sp, sp, x3, lsl #4\n\t" + "cbz x2, 2f\n" + "1:\tsub x2, x2, #8\n\t" + "ldr x4, [x1, x2]\n\t" + "str x4, [sp, x2]\n\t" + "cbnz x2, 1b\n" + "2:\tmov x8, x0\n\t" + "cbz x3, 3f\n\t" + "ldp x0, x1, [sp], #16\n\t" + "cmp x3, #1\n\t" + "b.le 3f\n\t" + "ldp x2, x3, [sp], #16\n\t" + "cmp x3, #2\n\t" + "b.le 3f\n\t" + "ldp x4, x5, [sp], #16\n\t" + "cmp x3, #3\n\t" + "b.le 3f\n\t" + "ldp x6, x7, [sp], #16\n" + "3:\tblr x8\n\t" + "mov sp, x29\n\t" + "ldp x29, x30, [sp], #16\n\t" + "ret" ) #else #warning call_server_func not implemented for your architecture LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, unsigned short stack_size)

1 0

Francois Gouget : testbot/web: Add a page to create special jobs.
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

Module: tools Branch: master Commit: fc4933ddbf3c978553e3793f80f5a0a7abdc4837 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fc4933ddbf3c978553e3793… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 27 13:03:59 2019 +0200 testbot/web: Add a page to create special jobs. These can be used to schedule a WineTest run on a specific VM or when the jobs were not created automatically for whatever reason. Note that the web server typically does not own the latest/ files and thus cannot hard-link them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 + testbot/lib/WineTestBot/SpecialJobs.pm | 12 +- testbot/web/admin/SpecialJobs.pl | 265 ++++++++++++++++++++++++++++++++ 3 files changed, 276 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index e3d2e04..613bddd 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -287,6 +287,8 @@ EOF if (defined($Session) && $Session->User->HasRole("admin")) { print " <li class='top'><p>Admin</p></li>\n"; + print " <li><p><a href='", MakeSecureURL("/admin/SpecialJobs.pl"), + "'>Special Jobs</a></p></li>\n"; print " <li><p><a href='", MakeSecureURL("/admin/UsersList.pl"), "'>Users</a></p></li>\n"; print " <li class='divider'> </li>\n"; diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm index c313567..0371084 100644 --- a/testbot/lib/WineTestBot/SpecialJobs.pm +++ b/testbot/lib/WineTestBot/SpecialJobs.pm @@ -36,6 +36,8 @@ our @EXPORT = qw(GetReconfigVMs AddReconfigJob GetWindowsTestVMs AddWindowsTestJob GetWineTestVMs AddWineTestJob); +use File::Copy; + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Missions; @@ -189,9 +191,13 @@ sub AddWindowsTestJob($$$$$) return "Failed to save the '$Remarks' job: $ErrMessage"; } - # Stage the test file so it can be picked up by the job - if (!link("$DataDir/latest/$LatestBaseName", - "$DataDir/staging/job". $NewJob->Id ."_$LatestBaseName")) + # Stage the test file so it can be picked up by the job. Note that the + # caller may not own the latest files and thus may be unable to hard-link + # them (e.g. web server). + my $LatestFileName = "$DataDir/latest/$LatestBaseName"; + my $StagingFileName = "$DataDir/staging/job". $NewJob->Id ."_$LatestBaseName"; + if (!link($LatestFileName, $StagingFileName) && + !copy($LatestFileName, $StagingFileName)) { return "Failed to stage $LatestBaseName: $!"; } diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl new file mode 100644 index 0000000..1556b55 --- /dev/null +++ b/testbot/web/admin/SpecialJobs.pl @@ -0,0 +1,265 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# WineTestBot special jobs creation page +# +# Copyright 2019 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package SpecialJobsPage; + +use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + +use WineTestBot::Config; +use WineTestBot::Engine::Notify; +use WineTestBot::SpecialJobs; +use WineTestBot::Utils; +use WineTestBot::Log; + + +# +# Page state management +# + +sub _initialize($$$) +{ + my ($self, $Request, $RequiredRole) = @_; + + $self->{JobTemplates} = { + "Build" => {Label => "Update build VMs", + Options => ["No", "All Build VMs"], + VMs => GetReconfigVMs(undef, "build"), + }, + "Win32" => {Label => "Run the 32 bit WineTest suite on Windows VMs", + Options => ["No", "All Base VMs", "All WineTest VMs", + "All Base and WineTest VMs"], + VMs => GetWindowsTestVMs(undef, "exe32", undef), + }, + "Win64" => {Label => "Run the 64 bit WineTest suite on Windows VMs", + Options => ["No", "All Base VMs", "All WineTest VMs", + "All Base and WineTest VMs"], + VMs => GetWindowsTestVMs(undef, "exe64", undef), + }, + "Wine" => {Label => "Update Wine VMs", + Options => ["No", "All Wine VMs"], + VMs => GetReconfigVMs(undef, "wine"), + }, + "WineTest" => {Label => "Run the WineTest suite on Wine VMs", + Options => ["No", "All Wine VMs"], + VMs => GetWineTestVMs(undef), + }, + }; + + foreach my $JobName (keys %{$self->{JobTemplates}}) + { + my $JobTemplate = $self->{JobTemplates}->{$JobName}; + my $VMKey = $self->GetParam($JobName); + foreach my $Option (@{$JobTemplate->{Options}}) + { + if ($VMKey eq "*$Option") + { + $JobTemplate->{VMKey} = $VMKey; + last; + } + } + if (!exists $JobTemplate->{VMKey}) + { + foreach my $VM (@{$JobTemplate->{VMs}}) + { + if ($VMKey eq $VM->Name) + { + $JobTemplate->{VMKey} = $VM->Name; + last; + } + } + } + $JobTemplate->{VMKey} ||= "*No"; + } + + $self->SUPER::_initialize($Request, $RequiredRole, undef); +} + + +# +# Page generation +# + +sub GetTitle($) +{ + #my ($self) = @_; + return "Create Special Jobs"; +} + +sub GenerateJobFields($$$$$) +{ + my ($self, $JobName) = @_; + + my $JobTemplate = $self->{JobTemplates}->{$JobName}; + return if (!@{$JobTemplate->{VMs}}); + + print "<div class='ItemProperty'><label>$JobTemplate->{Label}</label>\n", + "<div class='ItemValue'>\n", + "<select name='$JobName' size='1'>\n"; + foreach my $Option (@{$JobTemplate->{Options}}) + { + my $Selected = $JobTemplate->{VMKey} eq "*$Option" ? " selected" : ""; + print "<option value='*", $self->CGI->escapeHTML($Option), + "'$Selected>$Option</option>\n"; + } + foreach my $VM (@{$JobTemplate->{VMs}}) + { + my $Selected = $JobTemplate->{VMKey} eq $VM->Name ? " selected" : ""; + print "<option value='", $self->CGI->escapeHTML($VM->Name), + "'$Selected>", $self->CGI->escapeHTML($VM->Name), "</option>\n"; + } + print "</select> </div></div>\n"; +} + +sub GenerateFields($) +{ + my ($self) = @_; + + $self->GenerateJobFields("Build"); + $self->GenerateJobFields("Win32"); + $self->GenerateJobFields("Win64"); + + $self->GenerateJobFields("Wine"); + $self->GenerateJobFields("WineTest"); + + $self->SUPER::GenerateFields(); +} + +sub GetActions($) +{ + my ($self) = @_; + + my $Actions = $self->SUPER::GetActions(); + push @$Actions, "Submit"; + return $Actions; +} + + +# +# Page actions +# + +sub OnSubmit($) +{ + my ($self) = @_; + my $VMKey; + my @Errors = (); + + # Update Build VMs + $VMKey = $self->{JobTemplates}->{Build}->{VMKey}; + if ($VMKey ne "*No") + { + $VMKey = undef if ($VMKey eq "*All Wine VMs"); + my $VMs = GetReconfigVMs($VMKey, "build"); + push @Errors, "Found no build VM to update" if (!@$VMs); + my $ErrMessage = AddReconfigJob($VMs, $VMKey, "build"); + } + + # Run 32 bit WineTest + $VMKey = $self->{JobTemplates}->{Win32}->{VMKey}; + if ($VMKey ne "*No") + { + my @BaseJobs = $VMKey eq "*All Base VMs" ? ("base") : + $VMKey eq "*All WineTest VMs" ? ("other") : + $VMKey eq "*All Base and WineTest VMs" ? ("base", "other") : + (undef); + $VMKey = undef if ($VMKey =~ /^\*/); + foreach my $BaseJob (@BaseJobs) + { + my $VMs = GetWindowsTestVMs($VMKey, "exe32", $BaseJob); + push @Errors, "Found no $BaseJob VM to run WineTest on" if (!@$VMs); + my $ErrMessage = AddWindowsTestJob($VMs, $VMKey, "exe32", $BaseJob, "winetest-latest.exe"); + push @Errors, $ErrMessage if (defined $ErrMessage); + } + } + + # Run 64 bit WineTest + $VMKey = $self->{JobTemplates}->{Win64}->{VMKey}; + if ($VMKey ne "*No") + { + # Traditionally we don't create separate 'base' and 'other' jobs for + # 64 bit VMs. + my $BaseJob = $VMKey eq "*All Base VMs" ? "base" : + $VMKey eq "*All WineTest VMs" ? "other" : + $VMKey eq "*All Base and WineTest VMs" ? "all" : + undef; + $VMKey = undef if ($VMKey eq "*All Base and WineTest VMs"); + my $VMs = GetWindowsTestVMs($VMKey, "exe64", $BaseJob); + push @Errors, "Found no 64 bit VM to run WineTest on" if (!@$VMs); + my $ErrMessage = AddWindowsTestJob($VMs, $VMKey, "exe64", $BaseJob, "winetest64-latest.exe"); + push @Errors, $ErrMessage if (defined $ErrMessage); + } + + # Update Wine VMs + $VMKey = $self->{JobTemplates}->{Wine}->{VMKey}; + if ($VMKey ne "*No") + { + $VMKey = undef if ($VMKey eq "*All Wine VMs"); + my $VMs = GetReconfigVMs($VMKey, "wine"); + push @Errors, "Found no Wine VM to update" if (!@$VMs); + my $ErrMessage = AddReconfigJob($VMs, $VMKey, "wine"); + push @Errors, $ErrMessage if (defined $ErrMessage); + } + + # Run WineTest on Wine + $VMKey = $self->{JobTemplates}->{WineTest}->{VMKey}; + if ($VMKey ne "*No") + { + $VMKey = undef if ($VMKey eq "*All Wine VMs"); + my $VMs = GetWineTestVMs($VMKey); + push @Errors, "Found no Wine VM to run WineTest on" if (!@$VMs); + my $ErrMessage = AddWineTestJob($VMs, $VMKey); + push @Errors, $ErrMessage if (defined $ErrMessage); + } + + # Notify engine + my $ErrMessage = RescheduleJobs(); + push @Errors, $ErrMessage if (defined $ErrMessage); + + if (@Errors) + { + $self->{ErrMessage} = join("\n", @Errors); + return undef; + } + + $self->Redirect("/"); # does not return + exit; +} + +sub OnAction($$) +{ + my ($self, $Action) = @_; + + if ($Action eq "Submit") + { + return $self->OnSubmit(); + } + + return $self->SUPER::OnAction($Action); +} + + +package main; + +my $Request = shift; + +my $SubmitPage = SpecialJobsPage->new($Request, "admin"); +$SubmitPage->GeneratePage();

1 0