May 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : dinput/tests: Check IDirectInputDevice2AImpl_GetObjectInfo error codes.
by Alexandre Julliard May 26, 2021

May 26, 2021

Module: wine Branch: master Commit: 49c66a3a94725bfee143ca1d7ed0012f025ee451 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49c66a3a94725bfee143ca1d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 26 11:23:03 2021 +0200 dinput/tests: Check IDirectInputDevice2AImpl_GetObjectInfo error codes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 12 ++++++------ dlls/dinput/joystick.c | 8 +++++++- dlls/dinput/mouse.c | 8 +++++++- dlls/dinput/tests/device.c | 10 ++++++++++ 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 31b859801c7..c1388551644 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1457,9 +1457,9 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetObjectInfo( DIDEVICEOBJECTINSTANCEW didoiW; HRESULT res; - if (!pdidoi || - (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEA) && - pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3A))) + if (!pdidoi) return E_POINTER; + if (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEA) && + pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3A)) return DIERR_INVALIDPARAM; didoiW.dwSize = sizeof(didoiW); @@ -1492,9 +1492,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo( TRACE("(%p) %d(0x%08x) -> %p\n", This, dwHow, dwObj, pdidoi); - if (!pdidoi || - (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW) && - pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W))) + if (!pdidoi) return E_POINTER; + if (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW) && + pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W)) return DIERR_INVALIDPARAM; switch (dwHow) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 3749eed7efe..ab8b87f552b 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -580,12 +580,18 @@ HRESULT WINAPI JoystickAGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8A iface, JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; DIDEVICEOBJECTINSTANCEW didoiW; - DWORD dwSize = pdidoi->dwSize; + DWORD dwSize; + + if (!pdidoi) return E_POINTER; + if (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEA) && + pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3A)) + return DIERR_INVALIDPARAM; didoiW.dwSize = sizeof(didoiW); res = JoystickWGenericImpl_GetObjectInfo(IDirectInputDevice8W_from_impl(This), &didoiW, dwObj, dwHow); if (res != DI_OK) return res; + dwSize = pdidoi->dwSize; memset(pdidoi, 0, pdidoi->dwSize); memcpy(pdidoi, &didoiW, FIELD_OFFSET(DIDEVICEOBJECTINSTANCEW, tszName)); pdidoi->dwSize = dwSize; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 65f173daa81..bc99ea37c68 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -802,12 +802,18 @@ static HRESULT WINAPI SysMouseAImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8A iface, SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; DIDEVICEOBJECTINSTANCEW didoiW; - DWORD dwSize = pdidoi->dwSize; + DWORD dwSize; + + if (!pdidoi) return E_POINTER; + if (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEA) && + pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3A)) + return DIERR_INVALIDPARAM; didoiW.dwSize = sizeof(didoiW); res = SysMouseWImpl_GetObjectInfo(IDirectInputDevice8W_from_impl(This), &didoiW, dwObj, dwHow); if (res != DI_OK) return res; + dwSize = pdidoi->dwSize; memset(pdidoi, 0, pdidoi->dwSize); memcpy(pdidoi, &didoiW, FIELD_OFFSET(DIDEVICEOBJECTINSTANCEW, tszName)); pdidoi->dwSize = dwSize; diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 9be00a671fb..485acca4f61 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -158,6 +158,16 @@ static void test_object_info(IDirectInputDeviceA *device, HWND hwnd) hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); + hr = IDirectInputDevice_GetObjectInfo(device, NULL, 16, DIPH_BYOFFSET); + ok(hr == E_POINTER, "IDirectInputDevice_GetObjectInfo returned %08x, expected %08x\n", hr, E_POINTER); + + obj_info.dwSize = 1; + hr = IDirectInputDevice_GetObjectInfo(device, &obj_info, 16, DIPH_BYOFFSET); + ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetObjectInfo returned %08x, expected %08x\n", hr, DIERR_INVALIDPARAM); + obj_info.dwSize = 0xdeadbeef; + hr = IDirectInputDevice_GetObjectInfo(device, &obj_info, 16, DIPH_BYOFFSET); + ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetObjectInfo returned %08x, expected %08x\n", hr, DIERR_INVALIDPARAM); + /* No need to test devices without axis */ obj_info.dwSize = sizeof(obj_info); hr = IDirectInputDevice_GetObjectInfo(device, &obj_info, 16, DIPH_BYOFFSET);

1 0

Rémi Bernon : dinput: Factor out IDirectInputDevice_GetObjectInfo WtoA conversions.
by Alexandre Julliard May 26, 2021

May 26, 2021

Module: wine Branch: master Commit: 08d07c4cc26410a62ee074913cd9a1d9a5fbf01d URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d07c4cc26410a62ee07491… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 26 11:23:04 2021 +0200 dinput: Factor out IDirectInputDevice_GetObjectInfo WtoA conversions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 19 +++++++++++++++++++ dlls/dinput/device.c | 32 -------------------------------- dlls/dinput/joystick.c | 27 --------------------------- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 2 +- dlls/dinput/joystick_private.h | 3 --- dlls/dinput/keyboard.c | 25 +------------------------ dlls/dinput/mouse.c | 29 +---------------------------- 9 files changed, 24 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08d07c4cc26410a62ee0…

1 0

Rémi Bernon : dinput: Implement IDirectInputDevice_EnumEffectsInFile WtoA conversion.
by Alexandre Julliard May 26, 2021

May 26, 2021

Module: wine Branch: master Commit: aa2da27e5258272852d59c282d95b1528b985c79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa2da27e5258272852d59c28… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 26 11:23:07 2021 +0200 dinput: Implement IDirectInputDevice_EnumEffectsInFile WtoA conversion. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 13 +++++++++++++ dlls/dinput/device.c | 12 ------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index eb331891f25..05fc42440d7 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -305,3 +305,16 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SendDeviceData( IDirectInputDevice8A *if IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); return IDirectInputDevice8_SendDeviceData( iface_w, count, data, inout, flags ); } + +HRESULT WINAPI IDirectInputDevice7AImpl_EnumEffectsInFile( IDirectInputDevice8A *iface_a, const char *filename_a, LPDIENUMEFFECTSINFILECALLBACK callback, + void *ref, DWORD flags ) +{ + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); + IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + WCHAR buffer[MAX_PATH], *filename_w = buffer; + + if (!filename_a) filename_w = NULL; + else MultiByteToWideChar( CP_ACP, 0, filename_a, -1, buffer, MAX_PATH ); + + return IDirectInputDevice8_EnumEffectsInFile( iface_w, filename_w, callback, ref, flags ); +} diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index abdb235c097..fe9510d539d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1658,18 +1658,6 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SendDeviceData(LPDIRECTINPUTDEVICE8W ifa return DI_OK; } -HRESULT WINAPI IDirectInputDevice7AImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8A iface, - LPCSTR lpszFileName, - LPDIENUMEFFECTSINFILECALLBACK pec, - LPVOID pvRef, - DWORD dwFlags) -{ - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - FIXME("(%p)->(%s,%p,%p,%08x): stub !\n", This, lpszFileName, pec, pvRef, dwFlags); - - return DI_OK; -} - HRESULT WINAPI IDirectInputDevice7WImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszFileName, LPDIENUMEFFECTSINFILECALLBACK pec,

1 0

Arkadiusz Hiler : dinput8: Use scan codes to test uAppData.
by Alexandre Julliard May 26, 2021

May 26, 2021

Module: wine Branch: master Commit: 6b777d0b20270aff3c7296f9ca16f2e0a7866fe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b777d0b20270aff3c7296f9… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed May 26 14:10:58 2021 +0300 dinput8: Use scan codes to test uAppData. Virtual key codes are layout dependant while direct input works with scan codes. Using virtual key code for 'A' with AZERTY layout resulted in scan code for 'Q' being sent out, which in turn made the tests fail. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50987 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 3e6da23b4ab..17deed193dd 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -91,7 +91,7 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO ok (SUCCEEDED(hr), "Failed to acquire device hr=%08x\n", hr); if (event_type == INPUT_KEYBOARD) - keybd_event(event, MapVirtualKeyA(event, MAPVK_VK_TO_VSC), 0, 0); + keybd_event(0, event, KEYEVENTF_SCANCODE, 0); if (event_type == INPUT_MOUSE) mouse_event( event, 0, 0, 0, 0); @@ -307,7 +307,7 @@ static void test_appdata_property_vs_map(struct enum_data *data) hr = IDirectInputDevice8_SetProperty(data->keyboard, DIPROP_APPDATA, &(dp.diph)); ok(SUCCEEDED(hr), "IDirectInputDevice8_SetProperty failed hr=%08x\n", hr); - test_device_input(data->keyboard, INPUT_KEYBOARD, VK_SPACE, 10); + test_device_input(data->keyboard, INPUT_KEYBOARD, DIK_SPACE, 10); dp.diph.dwHow = DIPH_BYID; dp.diph.dwObj = DIDFT_MAKEINSTANCE(DIK_V) | DIDFT_PSHBUTTON; @@ -319,7 +319,7 @@ static void test_appdata_property_vs_map(struct enum_data *data) hr = IDirectInputDevice8_SetDataFormat(data->keyboard, &c_dfDIKeyboard); ok(SUCCEEDED(hr), "SetDataFormat failed: %08x\n", hr); - test_device_input(data->keyboard, INPUT_KEYBOARD, VK_SPACE, -1); + test_device_input(data->keyboard, INPUT_KEYBOARD, DIK_SPACE, -1); dp.diph.dwHow = DIPH_BYID; dp.diph.dwObj = DIDFT_MAKEINSTANCE(DIK_V) | DIDFT_PSHBUTTON; @@ -327,13 +327,13 @@ static void test_appdata_property_vs_map(struct enum_data *data) hr = IDirectInputDevice8_SetProperty(data->keyboard, DIPROP_APPDATA, &(dp.diph)); ok(SUCCEEDED(hr), "IDirectInputDevice8_SetProperty failed hr=%08x\n", hr); - test_device_input(data->keyboard, INPUT_KEYBOARD, 'V', 11); + test_device_input(data->keyboard, INPUT_KEYBOARD, DIK_V, 11); /* back to action map */ hr = IDirectInputDevice8_SetActionMap(data->keyboard, data->lpdiaf, NULL, 0); ok(SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr); - test_device_input(data->keyboard, INPUT_KEYBOARD, VK_SPACE, 2); + test_device_input(data->keyboard, INPUT_KEYBOARD, DIK_SPACE, 2); } static void test_action_mapping(void) @@ -402,19 +402,19 @@ static void test_action_mapping(void) /* Test keyboard BuildActionMap */ test_build_action_map(data.keyboard, data.lpdiaf, DITEST_KEYBOARDSPACE, DIDFT_PSHBUTTON, DIK_SPACE); /* Test keyboard input */ - test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, 2); + test_device_input(data.keyboard, INPUT_KEYBOARD, DIK_SPACE, 2); /* setting format should reset action map */ hr = IDirectInputDevice8_SetDataFormat(data.keyboard, &c_dfDIKeyboard); ok (SUCCEEDED(hr), "IDirectInputDevice8_SetDataFormat failed: %08x\n", hr); - test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, -1); + test_device_input(data.keyboard, INPUT_KEYBOARD, DIK_SPACE, -1); /* back to action map */ hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, 0); ok (SUCCEEDED(hr), "SetActionMap should succeed hr=%08x\n", hr); - test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, 2); + test_device_input(data.keyboard, INPUT_KEYBOARD, DIK_SPACE, 2); test_appdata_property_vs_map(&data); @@ -958,7 +958,7 @@ static void test_appdata_property(void) ok(SUCCEEDED(hr), "IDirectInputDevice8_SetProperty failed hr=%08x\n", hr); /* the default value */ - test_device_input(di_keyboard, INPUT_KEYBOARD, 'A', -1); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_A, -1); dp.diph.dwHow = DIPH_DEVICE; dp.diph.dwObj = 0; @@ -992,19 +992,19 @@ static void test_appdata_property(void) hr = IDirectInputDevice8_SetProperty(di_keyboard, DIPROP_APPDATA, &(dp.diph)); ok(SUCCEEDED(hr), "IDirectInputDevice8_SetProperty failed hr=%08x\n", hr); - test_device_input(di_keyboard, INPUT_KEYBOARD, VK_SPACE, 3); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'A', 4); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'B', 5); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'C', -1); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_SPACE, 3); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_A, 4); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_B, 5); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_C, -1); /* setting data format resets APPDATA */ hr = IDirectInputDevice8_SetDataFormat(di_keyboard, &c_dfDIKeyboard); ok(SUCCEEDED(hr), "IDirectInputDevice8_SetDataFormat failed: %08x\n", hr); test_device_input(di_keyboard, INPUT_KEYBOARD, VK_SPACE, -1); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'A', -1); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'B', -1); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'C', -1); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_A, -1); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_B, -1); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_C, -1); DestroyWindow(hwnd); IDirectInputDevice_Release(di_keyboard);

1 0

Jacek Caban : ntdll: Use DECLSPEC_HIDDEN for a few more symbols.
by Alexandre Julliard May 26, 2021

May 26, 2021

Module: wine Branch: master Commit: 1215c2a6b73f4cc66ef82ba9bd116bb218ab6b06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1215c2a6b73f4cc66ef82ba9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 26 17:25:40 2021 +0200 ntdll: Use DECLSPEC_HIDDEN for a few more symbols. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 7 +++++-- dlls/ntdll/unix/signal_x86_64.c | 10 ++++++++-- dlls/ntdll/unix/system.c | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 4a332a50055..87024e1bfce 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -638,7 +638,7 @@ static int solaris_sigaction( int sig, const struct sigaction *new, struct sigac #endif -extern void clear_alignment_flag(void); +extern void clear_alignment_flag(void) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( clear_alignment_flag, "pushfl\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") @@ -914,7 +914,7 @@ static inline void restore_context( const struct xcontext *xcontext, ucontext_t * * Set the new CPU context. */ -extern void set_full_cpu_context(void); +extern void set_full_cpu_context(void) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( set_full_cpu_context, "movl %fs:0x1f8,%ecx\n\t" "movl $0,%fs:0x1f8\n\t" /* x86_thread_data()->syscall_frame = NULL */ @@ -1622,6 +1622,9 @@ struct apc_stack_layout CONTEXT context; }; +struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, struct apc_stack_layout *stack, + void *arg1, void *arg2, void *arg3, + void *func, NTSTATUS status ) DECLSPEC_HIDDEN; struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, struct apc_stack_layout *stack, void *arg1, void *arg2, void *arg3, void *func, NTSTATUS status ) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 0b7dde1b931..dcb0e588c66 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1568,7 +1568,7 @@ static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcon * * Set the new CPU context. */ -extern void set_full_cpu_context(void); +extern void set_full_cpu_context(void) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( set_full_cpu_context, "movq %gs:0x30,%rdx\n\t" "movq 0x328(%rdx),%rsp\n\t" /* amd64_thread_data()->syscall_frame */ @@ -1874,7 +1874,7 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) } -extern void CDECL raise_func_trampoline( void *dispatcher ); +extern void CDECL raise_func_trampoline( void *dispatcher ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( raise_func_trampoline, "jmpq *%r8\n\t") @@ -1971,6 +1971,9 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) /*********************************************************************** * call_user_apc_dispatcher */ +struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, + struct apc_stack_layout *stack, + NTSTATUS status ) DECLSPEC_HIDDEN; struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, struct apc_stack_layout *stack, NTSTATUS status ) @@ -2051,6 +2054,9 @@ void WINAPI call_raise_user_exception_dispatcher( NTSTATUS (WINAPI *dispatcher)( /*********************************************************************** * call_user_exception_dispatcher */ +struct stack_layout * WINAPI setup_user_exception_dispatcher_stack( EXCEPTION_RECORD *rec, CONTEXT *context, + NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*), + struct stack_layout *stack ) DECLSPEC_HIDDEN; struct stack_layout * WINAPI setup_user_exception_dispatcher_stack( EXCEPTION_RECORD *rec, CONTEXT *context, NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*), struct stack_layout *stack ) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 01381630600..429f5fe3fb8 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -197,7 +197,7 @@ static inline void do_cpuid(unsigned int ax, unsigned int cx, unsigned int *p) } #ifdef __i386__ -extern int have_cpuid(void); +extern int have_cpuid(void) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( have_cpuid, "pushfl\n\t" "pushfl\n\t"

1 0

Ziqing Hui : windowscodecs: Implement IWICDdsEncoder_CreateNewFrame.
by Alexandre Julliard May 26, 2021

May 26, 2021

Module: wine Branch: master Commit: bd609f5ed4f12dc6ca07bc64e47a071a48fa5a9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd609f5ed4f12dc6ca07bc64… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 26 09:54:04 2021 +0800 windowscodecs: Implement IWICDdsEncoder_CreateNewFrame. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 85 ++++++++++++++++++++++++++++-------- dlls/windowscodecs/tests/ddsformat.c | 6 +-- 2 files changed, 69 insertions(+), 22 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index af062de06f2..790fe72b8c9 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -166,6 +166,7 @@ typedef struct DdsEncoder { CRITICAL_SECTION lock; IStream *stream; UINT frame_count; + UINT frame_index; BOOL uncommitted_frame; BOOL committed; dds_info info; @@ -511,6 +512,27 @@ static UINT get_frame_count(UINT depth, UINT mip_levels, UINT array_size, WICDds return frame_count; } +static void get_frame_dds_index(UINT index, dds_info *info, UINT *array_index, UINT *mip_level, UINT *slice_index) +{ + UINT frame_per_texture, depth; + + if (info->dimension == WICDdsTextureCube) + frame_per_texture = info->mip_levels; + else + frame_per_texture = info->frame_count / info->array_size; + + *array_index = index / frame_per_texture; + *slice_index = index % frame_per_texture; + depth = info->depth; + *mip_level = 0; + while (*slice_index >= depth) + { + *slice_index -= depth; + (*mip_level)++; + if (depth > 1) depth /= 2; + } +} + static const GUID *dxgi_format_to_wic_format(DXGI_FORMAT dxgi_format) { UINT i; @@ -1208,7 +1230,7 @@ static HRESULT WINAPI DdsDecoder_GetFrame(IWICBitmapDecoder *iface, UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) { DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); - UINT frame_per_texture, array_index, mip_level, slice_index, depth; + UINT array_index, mip_level, slice_index; TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); @@ -1221,21 +1243,7 @@ static HRESULT WINAPI DdsDecoder_GetFrame(IWICBitmapDecoder *iface, return WINCODEC_ERR_WRONGSTATE; } - if (This->info.dimension == WICDdsTextureCube) { - frame_per_texture = This->info.mip_levels; - } else { - frame_per_texture = This->info.frame_count / This->info.array_size; - } - array_index = index / frame_per_texture; - slice_index = index % frame_per_texture; - depth = This->info.depth; - mip_level = 0; - while (slice_index >= depth) - { - slice_index -= depth; - mip_level++; - if (depth > 1) depth /= 2; - } + get_frame_dds_index(index, &This->info, &array_index, &mip_level, &slice_index); LeaveCriticalSection(&This->lock); @@ -1819,8 +1827,48 @@ static HRESULT WINAPI DdsEncoder_Dds_CreateNewFrame(IWICDdsEncoder *iface, IWICBitmapFrameEncode **frameEncode, UINT *arrayIndex, UINT *mipLevel, UINT *sliceIndex) { - FIXME("(%p,%p,%p,%p,%p): stub.\n", iface, frameEncode, arrayIndex, mipLevel, sliceIndex); - return E_NOTIMPL; + DdsEncoder *This = impl_from_IWICDdsEncoder(iface); + UINT array_index, mip_level, slice_index; + DdsFrameEncode *result; + HRESULT hr; + + TRACE("(%p,%p,%p,%p,%p)\n", iface, frameEncode, arrayIndex, mipLevel, sliceIndex); + + EnterCriticalSection(&This->lock); + + if (!This->stream || This->committed || This->uncommitted_frame) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + result = HeapAlloc(GetProcessHeap(), 0, sizeof(*result)); + if (!result) + { + hr = E_OUTOFMEMORY; + goto end; + } + + get_frame_dds_index(This->frame_index, &This->info, &array_index, &mip_level, &slice_index); + if (arrayIndex) *arrayIndex = array_index; + if (mipLevel) *mipLevel = mip_level; + if (sliceIndex) *sliceIndex = slice_index; + + This->frame_index++; + result->IWICBitmapFrameEncode_iface.lpVtbl = &DdsFrameEncode_Vtbl; + result->ref = 1; + result->parent = This; + result->parent->uncommitted_frame = TRUE; + result->initialized = FALSE; + result->frame_created = FALSE; + IWICDdsEncoder_AddRef(iface); + + *frameEncode = &result->IWICBitmapFrameEncode_iface; + hr = S_OK; + +end: + LeaveCriticalSection(&This->lock); + return hr; } static const IWICDdsEncoderVtbl DdsEncoder_Dds_Vtbl = @@ -2076,6 +2124,7 @@ HRESULT DdsEncoder_CreateInstance( REFIID iid, void **ppv) This->ref = 1; This->stream = NULL; This->frame_count = 0; + This->frame_index = 0; This->uncommitted_frame = FALSE; This->committed = FALSE; InitializeCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index ecc5d0ec00d..8900b7699f8 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1446,17 +1446,15 @@ static void test_dds_encoder_create_frame(void) create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); IWICDdsEncoder_SetParameters(dds_encoder, &params); hr = IWICDdsEncoder_CreateNewFrame(dds_encoder, &frame0, &array_index, &mip_level, &slice_index); - todo_wine ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); - if (hr == S_OK) IWICBitmapFrameEncode_Release(frame0); + IWICBitmapFrameEncode_Release(frame0); release_encoder(encoder, dds_encoder, stream); create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); IWICDdsEncoder_SetParameters(dds_encoder, &params); hr = IWICDdsEncoder_CreateNewFrame(dds_encoder, &frame0, NULL, NULL, NULL); - todo_wine ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); - if (hr == S_OK) IWICBitmapFrameEncode_Release(frame0); + IWICBitmapFrameEncode_Release(frame0); end: release_encoder(encoder, dds_encoder, stream);

1 0

Ziqing Hui : windowscodecs: Implement DdsEncoder_CreateNewFrame on top of DdsEncoder_Dds_CreateNewFrame.
by Alexandre Julliard May 26, 2021

May 26, 2021

Module: wine Branch: master Commit: 8a54803c4acfdf6cc64424ee21c887b7e885d57d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a54803c4acfdf6cc64424ee… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 26 09:54:16 2021 +0800 windowscodecs: Implement DdsEncoder_CreateNewFrame on top of DdsEncoder_Dds_CreateNewFrame. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 31 +------------------------------ dlls/windowscodecs/tests/ddsformat.c | 4 ---- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 790fe72b8c9..6dd7a01ff42 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -2043,39 +2043,10 @@ static HRESULT WINAPI DdsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, IWICBitmapFrameEncode **frameEncode, IPropertyBag2 **encoderOptions) { DdsEncoder *This = impl_from_IWICBitmapEncoder(iface); - DdsFrameEncode *result; - HRESULT hr; TRACE("(%p,%p,%p)\n", iface, frameEncode, encoderOptions); - EnterCriticalSection(&This->lock); - - if (!This->stream) - { - hr = WINCODEC_ERR_WRONGSTATE; - goto end; - } - - result = HeapAlloc(GetProcessHeap(), 0, sizeof(*result)); - if (!result) - { - hr = E_OUTOFMEMORY; - goto end; - } - - result->IWICBitmapFrameEncode_iface.lpVtbl = &DdsFrameEncode_Vtbl; - result->ref = 1; - result->parent = This; - result->initialized = FALSE; - result->frame_created = FALSE; - IWICBitmapEncoder_AddRef(iface); - - *frameEncode = &result->IWICBitmapFrameEncode_iface; - hr = S_OK; - -end: - LeaveCriticalSection(&This->lock); - return hr; + return IWICDdsEncoder_CreateNewFrame(&This->IWICDdsEncoder_iface, frameEncode, NULL, NULL, NULL); } static HRESULT WINAPI DdsEncoder_Commit(IWICBitmapEncoder *iface) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 8900b7699f8..d530e65eb2d 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1431,15 +1431,11 @@ static void test_dds_encoder_create_frame(void) hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame0, NULL); ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame1, NULL); - todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "CreateNewFrame got unexpected hr %#x\n", hr); - if (hr == S_OK) IWICBitmapFrameEncode_Release(frame1); IWICBitmapFrameEncode_Release(frame0); hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame1, NULL); - todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "CreateNewFrame got unexpected hr %#x\n", hr); - if (hr == S_OK) IWICBitmapFrameEncode_Release(frame1); release_encoder(encoder, dds_encoder, stream);

1 0

Rémi Bernon : dinput: Implement IDirectInputDevice_WriteEffectToFile WtoA conversion.
by Alexandre Julliard May 26, 2021

May 26, 2021

Module: wine Branch: master Commit: 06fa39cd7657146ad4b90dee74143daee408c86f URL: https://source.winehq.org/git/wine.git/?a=commit;h=06fa39cd7657146ad4b90dee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 26 11:23:08 2021 +0200 dinput: Implement IDirectInputDevice_WriteEffectToFile WtoA conversion. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 13 +++++++++++++ dlls/dinput/device.c | 12 ------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 05fc42440d7..5d1ea9f0b4e 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -318,3 +318,16 @@ HRESULT WINAPI IDirectInputDevice7AImpl_EnumEffectsInFile( IDirectInputDevice8A return IDirectInputDevice8_EnumEffectsInFile( iface_w, filename_w, callback, ref, flags ); } + +HRESULT WINAPI IDirectInputDevice7AImpl_WriteEffectToFile( IDirectInputDevice8A *iface_a, const char *filename_a, DWORD entries, + DIFILEEFFECT *file_effect, DWORD flags ) +{ + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); + IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + WCHAR buffer[MAX_PATH], *filename_w = buffer; + + if (!filename_a) filename_w = NULL; + else MultiByteToWideChar( CP_ACP, 0, filename_a, -1, buffer, MAX_PATH ); + + return IDirectInputDevice8_WriteEffectToFile( iface_w, filename_w, entries, file_effect, flags ); +} diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index fe9510d539d..541f39954f6 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1670,18 +1670,6 @@ HRESULT WINAPI IDirectInputDevice7WImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8W return DI_OK; } -HRESULT WINAPI IDirectInputDevice7AImpl_WriteEffectToFile(LPDIRECTINPUTDEVICE8A iface, - LPCSTR lpszFileName, - DWORD dwEntries, - LPDIFILEEFFECT rgDiFileEft, - DWORD dwFlags) -{ - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - FIXME("(%p)->(%s,%08x,%p,%08x): stub !\n", This, lpszFileName, dwEntries, rgDiFileEft, dwFlags); - - return DI_OK; -} - HRESULT WINAPI IDirectInputDevice7WImpl_WriteEffectToFile(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszFileName, DWORD dwEntries,

1 0

Paul Gofman : server: Check for system regs before suspending for ptrace.
by Alexandre Julliard May 26, 2021

May 26, 2021

Module: wine Branch: master Commit: 385142bb9ec9bdfcb8d46f38f0a6f054d6448dbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=385142bb9ec9bdfcb8d46f38… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 24 14:45:40 2021 +0300 server: Check for system regs before suspending for ptrace. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/ptrace.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 3621e8d82ad..b2d23d89aaf 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -571,15 +571,15 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int /* all other regs are handled on the client side */ assert( flags == SERVER_CTX_DEBUG_REGISTERS ); - if (!suspend_for_ptrace( thread )) return; - if (!(thread->system_regs & SERVER_CTX_DEBUG_REGISTERS)) { /* caller has initialized everything to 0 already, just return */ context->flags |= SERVER_CTX_DEBUG_REGISTERS; - goto done; + return; } + if (!suspend_for_ptrace( thread )) return; + for (i = 0; i < 8; i++) { if (i == 4 || i == 5) continue;

1 0

Hans Leidekker : webservices: Support IPv6 address format in WsDecodeUrl.
by Alexandre Julliard May 26, 2021

May 26, 2021

Module: wine Branch: master Commit: ea931c82ef5d7a42ba59ac00b17e057068f95818 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea931c82ef5d7a42ba59ac00… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 26 10:57:48 2021 +0200 webservices: Support IPv6 address format in WsDecodeUrl. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/url.c | 4 ++++ dlls/webservices/url.c | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/tests/url.c b/dlls/webservices/tests/url.c index 718f072f19c..4343dc6a3dd 100644 --- a/dlls/webservices/tests/url.c +++ b/dlls/webservices/tests/url.c @@ -50,6 +50,8 @@ static void test_WsDecodeUrl(void) static const WCHAR url25[] = L"http://host?query%202"; static const WCHAR url26[] = L"http://host#frag%202"; static const WCHAR url27[] = L"http://host/%c3%ab/"; + static const WCHAR url28[] = L"net.tcp://[::1]"; + static const WCHAR url29[] = L"net.tcp://[::1]:1111"; static const struct { const WCHAR *str; @@ -97,6 +99,8 @@ static void test_WsDecodeUrl(void) { url25, S_OK, WS_URL_HTTP_SCHEME_TYPE, url25 + 7, 4, 80, NULL, 0, NULL, 0, L"query 2", 7 }, { url26, S_OK, WS_URL_HTTP_SCHEME_TYPE, url26 + 7, 4, 80, NULL, 0, NULL, 0, NULL, 0, L"frag 2", 6 }, { url27, S_OK, WS_URL_HTTP_SCHEME_TYPE, url27 + 7, 4, 80, NULL, 0, L"/\x00eb/", 3 }, + { url28, S_OK, WS_URL_NETTCP_SCHEME_TYPE, url28 + 10, 5, 808, NULL, 0, NULL, 0 }, + { url29, S_OK, WS_URL_NETTCP_SCHEME_TYPE, url29 + 10, 5, 1111, url29 + 16, 4, NULL, 0 }, }; WS_HEAP *heap; WS_STRING str; diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index f2fbda83c1f..b44ee468e27 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -169,16 +169,14 @@ static WCHAR *url_decode( WCHAR *str, ULONG len, WS_HEAP *heap, ULONG *ret_len ) /************************************************************************** * WsDecodeUrl [webservices.@] */ -HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS_URL **ret, - WS_ERROR *error ) +HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS_URL **ret, WS_ERROR *error ) { HRESULT hr = WS_E_QUOTA_EXCEEDED; WCHAR *p, *q, *decoded = NULL; WS_HTTP_URL *url = NULL; ULONG len, len_decoded, port = 0; - TRACE( "%s %08x %p %p %p\n", str ? debugstr_wn(str->chars, str->length) : "null", flags, - heap, ret, error ); + TRACE( "%s %08x %p %p %p\n", str ? debugstr_wn(str->chars, str->length) : "null", flags, heap, ret, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!str || !heap) return E_INVALIDARG; @@ -203,7 +201,15 @@ HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS if (!--len || *++q != '/') goto done; p = ++q; len--; - while (len && *q != '/' && *q != ':' && *q != '?' && *q != '#') { q++; len--; }; + if (*q == '[') + { + while (len && *q != ']') { q++; len--; }; + if (*q++ != ']') goto done; + } + else + { + while (len && *q != '/' && *q != ':' && *q != '?' && *q != '#') { q++; len--; }; + } if (q == p) goto done; url->host.length = q - p; url->host.chars = p;

1 0