October 2021 - Wine-Commits

Jacek Caban : win32u: Don't use CDECL for OSMesa functions.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: fd413f69c9c617d30c5e12d8eaaad79e12e9a00d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd413f69c9c617d30c5e12d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 15 16:53:50 2021 +0200 win32u: Don't use CDECL for OSMesa functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/dibdrv/dibdrv.h | 12 ++++++------ dlls/win32u/dibdrv/opengl.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/win32u/dibdrv/dibdrv.h b/dlls/win32u/dibdrv/dibdrv.h index d5606388e30..b6f6bb41098 100644 --- a/dlls/win32u/dibdrv/dibdrv.h +++ b/dlls/win32u/dibdrv/dibdrv.h @@ -292,12 +292,12 @@ static inline const RGBQUAD *get_dib_color_table( const dib_info *dib ) struct osmesa_funcs { - void (CDECL *get_gl_funcs)( struct opengl_funcs *funcs ); - struct wgl_context * (CDECL *create_context)( HDC hdc, const PIXELFORMATDESCRIPTOR *descr ); - BOOL (CDECL *delete_context)( struct wgl_context *context ); - PROC (CDECL *get_proc_address)( const char *proc ); - BOOL (CDECL *make_current)( struct wgl_context *context, void *bits, - int width, int height, int bpp, int stride ); + void (*get_gl_funcs)( struct opengl_funcs *funcs ); + struct wgl_context * (*create_context)( HDC hdc, const PIXELFORMATDESCRIPTOR *descr ); + BOOL (*delete_context)( struct wgl_context *context ); + PROC (*get_proc_address)( const char *proc ); + BOOL (*make_current)( struct wgl_context *context, void *bits, + int width, int height, int bpp, int stride ); }; extern const struct osmesa_funcs *init_opengl_lib(void) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/dibdrv/opengl.c b/dlls/win32u/dibdrv/opengl.c index 9261cc09299..9504e8efd25 100644 --- a/dlls/win32u/dibdrv/opengl.c +++ b/dlls/win32u/dibdrv/opengl.c @@ -119,7 +119,7 @@ failed: /*********************************************************************** * osmesa_get_gl_funcs */ -static void CDECL osmesa_get_gl_funcs( struct opengl_funcs *funcs ) +static void osmesa_get_gl_funcs( struct opengl_funcs *funcs ) { funcs->gl = opengl_funcs.gl; } @@ -127,7 +127,7 @@ static void CDECL osmesa_get_gl_funcs( struct opengl_funcs *funcs ) /*********************************************************************** * osmesa_create_context */ -static struct wgl_context * CDECL osmesa_create_context( HDC hdc, const PIXELFORMATDESCRIPTOR *descr ) +static struct wgl_context * osmesa_create_context( HDC hdc, const PIXELFORMATDESCRIPTOR *descr ) { struct wgl_context *context; UINT gl_format; @@ -162,7 +162,7 @@ static struct wgl_context * CDECL osmesa_create_context( HDC hdc, const PIXELFOR /*********************************************************************** * osmesa_delete_context */ -static BOOL CDECL osmesa_delete_context( struct wgl_context *context ) +static BOOL osmesa_delete_context( struct wgl_context *context ) { pOSMesaDestroyContext( context->context ); free( context ); @@ -172,7 +172,7 @@ static BOOL CDECL osmesa_delete_context( struct wgl_context *context ) /*********************************************************************** * osmesa_get_proc_address */ -static PROC CDECL osmesa_get_proc_address( const char *proc ) +static PROC osmesa_get_proc_address( const char *proc ) { return (PROC)pOSMesaGetProcAddress( proc ); } @@ -180,8 +180,8 @@ static PROC CDECL osmesa_get_proc_address( const char *proc ) /*********************************************************************** * osmesa_make_current */ -static BOOL CDECL osmesa_make_current( struct wgl_context *context, void *bits, - int width, int height, int bpp, int stride ) +static BOOL osmesa_make_current( struct wgl_context *context, void *bits, + int width, int height, int bpp, int stride ) { BOOL ret; GLenum type;

1 0

Nikolay Sivov : dwrite: Add properties for new Unicode 13 scripts.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 992e0a604541caaec2b84a2fa9dd4c9605f6102b URL: https://source.winehq.org/git/wine.git/?a=commit;h=992e0a604541caaec2b84a2f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 18 15:55:20 2021 +0300 dwrite: Add properties for new Unicode 13 scripts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 4 ++++ dlls/dwrite/scripts.h | 6 +++++- tools/make_unicode | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 89c76da0bb9..e8a30a7ae45 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -198,6 +198,10 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Hmnp */ { 0x706e6d48, 451, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 }, { _OT('h','m','n','p') } }, { /* Nand */ { 0x646e614e, 311, 8, 0x0020, 1, 1, 0, 0, 0, 1, 0 }, { _OT('n','a','n','d') } }, { /* Wcho */ { 0x6f686357, 283, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 }, { _OT('w','c','h','o') } }, + { /* Chrs */ { 0x73726843, 109, 8, 0x0020, 0, 1, 0, 0, 0, 1, 1 }, { _OT('c','h','r','s') } }, + { /* Diak */ { 0x6b616944, 342, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 }, { _OT('d','i','a','k') } }, + { /* Kits */ { 0x7374694b, 288, 8, 0x0020, 1, 0, 1, 1, 0, 0, 0 }, { _OT('k','i','t','s') } }, + { /* Yezi */ { 0x697a6559, 192, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('y','e','z','i') } }, }; #undef _OT diff --git a/dlls/dwrite/scripts.h b/dlls/dwrite/scripts.h index 594d9edea87..fbc467c38bb 100644 --- a/dlls/dwrite/scripts.h +++ b/dlls/dwrite/scripts.h @@ -156,5 +156,9 @@ enum unicode_script_id { Script_Nyiakeng_Puachue_Hmong = 150, Script_Nandinagari = 151, Script_Wancho = 152, - Script_LastId = 152 + Script_Chorasmian = 153, + Script_Dives_Akuru = 154, + Script_Khitan_Small_Script = 155, + Script_Yezidi = 156, + Script_LastId = 156 }; diff --git a/tools/make_unicode b/tools/make_unicode index 4c9d3d6d988..2bfe6f9bb32 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1512,6 +1512,11 @@ my %scripts = "Nyiakeng_Puachue_Hmong" => 150, "Nandinagari" => 151, "Wancho" => 152, + # Win11 + "Chorasmian" => 153, + "Dives_Akuru" => 154, + "Khitan_Small_Script" => 155, + "Yezidi" => 156, ); ################################################################

1 0

Piotr Caban : ucrtbase: Fix fopen x mode test failures.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 658473332756991b2db05dd3fa70ea6dcc520750 URL: https://source.winehq.org/git/wine.git/?a=commit;h=658473332756991b2db05dd3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 18 14:57:29 2021 +0200 ucrtbase: Fix fopen x mode test failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51894 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index a91ea6c98b8..f5dbac70ddb 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1545,17 +1545,18 @@ static void test_fopen_exclusive( void ) DWORD len; FILE *fp; - if (!GetProcAddress(GetModuleHandleA("ucrtbase.dll"), "__std_terminate")) - { - win_skip("skipping fopen x mode tests.\n"); - return; - } - len = GetTempPathA(MAX_PATH, path); ok(len, "GetTempPathA failed\n"); strcat(path, "\\fileexcl.tst"); + SET_EXPECT(global_invalid_parameter_handler); fp = fopen(path, "wx"); + if(called_global_invalid_parameter_handler) + { + win_skip("skipping fopen x mode tests.\n"); + return; + } + expect_global_invalid_parameter_handler = FALSE; ok(fp != NULL, "creating file with mode wx failed\n"); fclose(fp); @@ -1582,7 +1583,7 @@ static void test_fopen_exclusive( void ) ok(!fp, "creating file with mode xw succeeded\n"); fp = fopen(path, "wbx"); - ok(fp != NULL, "creating file with mode wx failed\n"); + ok(fp != NULL, "creating file with mode wbx failed\n"); fclose(fp); unlink(path); }

1 0

Alexandre Julliard : winecfg: Store the logo image in PNG format.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: d208b29d10d09b38aa5506c47b60680ee8303ea9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d208b29d10d09b38aa5506c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 14:42:10 2021 +0200 winecfg: Store the logo image in PNG format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/logo.ico | Bin 361838 -> 134755 bytes programs/winecfg/logo.svg | 2 +- tools/buildimage | 10 ++++++---- 3 files changed, 7 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d208b29d10d09b38aa55…

1 0

Rémi Bernon : dinput: Implement EnumObjects through the internal vtable.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 34f66a0cecc1c4030b732aa81b0510ead5463b27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34f66a0cecc1c4030b732aa8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 18 10:21:53 2021 +0200 dinput: Implement EnumObjects through the internal vtable. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 77 +++++++++++++++++++++++++++++----------- dlls/dinput/device_private.h | 8 +++-- dlls/dinput/joystick_hid.c | 84 ++++++++++++-------------------------------- dlls/dinput/keyboard.c | 1 + dlls/dinput/mouse.c | 1 + 5 files changed, 87 insertions(+), 84 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d23bb8ea975..3d3865ec6dd 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1140,33 +1140,70 @@ ULONG WINAPI IDirectInputDevice2WImpl_AddRef(LPDIRECTINPUTDEVICE8W iface) return ref; } -HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface, - LPDIENUMDEVICEOBJECTSCALLBACKW lpCallback, LPVOID lpvRef, DWORD dwFlags) +HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects( IDirectInputDevice8W *iface, LPDIENUMDEVICEOBJECTSCALLBACKW callback, + void *context, DWORD flags ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - DIDEVICEOBJECTINSTANCEW ddoi; - int i; - - TRACE("(%p)->(%p,%p flags:%08x)\n", This, lpCallback, lpvRef, dwFlags); - TRACE(" - flags = "); - _dump_EnumObjects_flags(dwFlags); - TRACE("\n"); + static const DIPROPHEADER filter = + { + .dwSize = sizeof(filter), + .dwHeaderSize = sizeof(filter), + .dwHow = DIPH_DEVICE, + }; + struct IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); + HRESULT hr; - if (!lpCallback) return DIERR_INVALIDPARAM; + TRACE( "iface %p, callback %p, context %p, flags %#x.\n", iface, callback, context, flags ); - /* Only the fields till dwFFMaxForce are relevant */ - memset(&ddoi, 0, sizeof(ddoi)); - ddoi.dwSize = FIELD_OFFSET(DIDEVICEOBJECTINSTANCEW, dwFFMaxForce); + if (!callback) return DIERR_INVALIDPARAM; + if (flags & ~(DIDFT_AXIS | DIDFT_POV | DIDFT_BUTTON | DIDFT_NODATA | DIDFT_COLLECTION)) + return DIERR_INVALIDPARAM; - for (i = 0; i < This->data_format.wine_df->dwNumObjs; i++) + if (!impl->vtbl->enum_objects) { - LPDIOBJECTDATAFORMAT odf = dataformat_to_odf(This->data_format.wine_df, i); + DIDEVICEOBJECTINSTANCEW ddoi; + DWORD i; + + /* Only the fields till dwFFMaxForce are relevant */ + memset( &ddoi, 0, sizeof(ddoi) ); + ddoi.dwSize = FIELD_OFFSET( DIDEVICEOBJECTINSTANCEW, dwFFMaxForce ); - if (dwFlags != DIDFT_ALL && !(dwFlags & DIDFT_GETTYPE(odf->dwType))) continue; - if (IDirectInputDevice_GetObjectInfo(iface, &ddoi, odf->dwType, DIPH_BYID) != DI_OK) - continue; + for (i = 0; i < impl->data_format.wine_df->dwNumObjs; i++) + { + LPDIOBJECTDATAFORMAT odf = dataformat_to_odf( impl->data_format.wine_df, i ); + + if (flags != DIDFT_ALL && !(flags & DIDFT_GETTYPE( odf->dwType ))) continue; + if (IDirectInputDevice_GetObjectInfo( iface, &ddoi, odf->dwType, DIPH_BYID ) != DI_OK) + continue; - if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) break; + if (callback( &ddoi, context ) != DIENUM_CONTINUE) break; + } + + return DI_OK; + } + + if (flags == DIDFT_ALL || (flags & DIDFT_AXIS)) + { + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_AXIS, callback, context ); + if (FAILED(hr)) return hr; + if (hr != DIENUM_CONTINUE) return DI_OK; + } + if (flags == DIDFT_ALL || (flags & DIDFT_POV)) + { + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_POV, callback, context ); + if (FAILED(hr)) return hr; + if (hr != DIENUM_CONTINUE) return DI_OK; + } + if (flags == DIDFT_ALL || (flags & DIDFT_BUTTON)) + { + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_BUTTON, callback, context ); + if (FAILED(hr)) return hr; + if (hr != DIENUM_CONTINUE) return DI_OK; + } + if (flags == DIDFT_ALL || (flags & (DIDFT_NODATA | DIDFT_COLLECTION))) + { + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_NODATA, callback, context ); + if (FAILED(hr)) return hr; + if (hr != DIENUM_CONTINUE) return DI_OK; } return DI_OK; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 43629abdb15..8589eca41e3 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -57,9 +57,11 @@ typedef HRESULT dinput_device_read_state( IDirectInputDevice8W *iface ); struct dinput_device_vtbl { - HRESULT (*read)(IDirectInputDevice8W *); - HRESULT (*acquire)(IDirectInputDevice8W *); - HRESULT (*unacquire)(IDirectInputDevice8W *); + HRESULT (*read)( IDirectInputDevice8W *iface ); + HRESULT (*acquire)( IDirectInputDevice8W *iface ); + HRESULT (*unacquire)( IDirectInputDevice8W *iface ); + HRESULT (*enum_objects)( IDirectInputDevice8W *iface, const DIPROPHEADER *filter, DWORD flags, + LPDIENUMDEVICEOBJECTSCALLBACKW callback, void *context ); }; #define DEVICE_STATE_MAX_SIZE 1024 diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index b6eeb772fcf..89ad70cbf19 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -656,66 +656,6 @@ static ULONG WINAPI hid_joystick_Release( IDirectInputDevice8W *iface ) return ref; } -struct enum_objects_params -{ - LPDIENUMDEVICEOBJECTSCALLBACKW callback; - void *context; -}; - -static BOOL enum_objects_callback( struct hid_joystick *impl, struct hid_value_caps *caps, - DIDEVICEOBJECTINSTANCEW *instance, void *data ) -{ - struct enum_objects_params *params = data; - return params->callback( instance, params->context ); -} - -static HRESULT WINAPI hid_joystick_EnumObjects( IDirectInputDevice8W *iface, LPDIENUMDEVICEOBJECTSCALLBACKW callback, - void *context, DWORD flags ) -{ - static const DIPROPHEADER filter = - { - .dwSize = sizeof(filter), - .dwHeaderSize = sizeof(filter), - .dwHow = DIPH_DEVICE, - }; - struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); - struct enum_objects_params params = - { - .callback = callback, - .context = context, - }; - BOOL ret; - - TRACE( "iface %p, callback %p, context %p, flags %#x.\n", iface, callback, context, flags ); - - if (!callback) return DIERR_INVALIDPARAM; - if (flags & ~(DIDFT_AXIS | DIDFT_POV | DIDFT_BUTTON | DIDFT_NODATA | DIDFT_COLLECTION)) - return DIERR_INVALIDPARAM; - - if (flags == DIDFT_ALL || (flags & DIDFT_AXIS)) - { - ret = enum_objects( impl, &filter, DIDFT_AXIS, enum_objects_callback, &params ); - if (ret != DIENUM_CONTINUE) return DI_OK; - } - if (flags == DIDFT_ALL || (flags & DIDFT_POV)) - { - ret = enum_objects( impl, &filter, DIDFT_POV, enum_objects_callback, &params ); - if (ret != DIENUM_CONTINUE) return DI_OK; - } - if (flags == DIDFT_ALL || (flags & DIDFT_BUTTON)) - { - ret = enum_objects( impl, &filter, DIDFT_BUTTON, enum_objects_callback, &params ); - if (ret != DIENUM_CONTINUE) return DI_OK; - } - if (flags == DIDFT_ALL || (flags & (DIDFT_NODATA | DIDFT_COLLECTION))) - { - ret = enum_objects( impl, &filter, DIDFT_NODATA, enum_objects_callback, &params ); - if (ret != DIENUM_CONTINUE) return DI_OK; - } - - return DI_OK; -} - static BOOL get_property_prop_range( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { @@ -1392,7 +1332,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = hid_joystick_Release, /*** IDirectInputDevice methods ***/ IDirectInputDevice2WImpl_GetCapabilities, - hid_joystick_EnumObjects, + IDirectInputDevice2WImpl_EnumObjects, hid_joystick_GetProperty, hid_joystick_SetProperty, IDirectInputDevice2WImpl_Acquire, @@ -1616,11 +1556,33 @@ static HRESULT hid_joystick_internal_read( IDirectInputDevice8W *iface ) return hr; } +struct enum_objects_params +{ + LPDIENUMDEVICEOBJECTSCALLBACKW callback; + void *context; +}; + +static BOOL enum_objects_callback( struct hid_joystick *impl, struct hid_value_caps *caps, + DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + struct enum_objects_params *params = data; + return params->callback( instance, params->context ); +} + +static HRESULT hid_joystick_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *filter, DWORD flags, + LPDIENUMDEVICEOBJECTSCALLBACKW callback, void *context ) +{ + struct enum_objects_params params = {.callback = callback, .context = context}; + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + return enum_objects( impl, filter, flags, enum_objects_callback, &params ); +} + static const struct dinput_device_vtbl hid_joystick_internal_vtbl = { hid_joystick_internal_read, hid_joystick_internal_acquire, hid_joystick_internal_unacquire, + hid_joystick_internal_enum_objects, }; static DWORD device_type_for_version( DWORD type, DWORD version ) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 138b8439374..a296ebc98ce 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -412,6 +412,7 @@ static const struct dinput_device_vtbl keyboard_internal_vtbl = NULL, keyboard_internal_acquire, keyboard_internal_unacquire, + NULL, }; static const IDirectInputDevice8WVtbl SysKeyboardWvt = diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 20a4ab9af40..ea3fcbb5581 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -668,6 +668,7 @@ static const struct dinput_device_vtbl mouse_internal_vtbl = NULL, mouse_internal_acquire, mouse_internal_unacquire, + NULL, }; static const IDirectInputDevice8WVtbl SysMouseWvt =

1 0

Alistair Leslie-Hughes : wbemprox: Add WMI namespace.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 725655de79be751ee478b584a6c9aef482b33b4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=725655de79be751ee478b584… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Oct 16 19:01:25 2021 +1100 wbemprox: Add WMI namespace. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 1 + dlls/wbemprox/tests/services.c | 1 + dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 58b5ed76dfa..346ba365b74 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -4138,6 +4138,7 @@ builtin_namespaces[WBEMPROX_NAMESPACE_LAST] = { {L"cimv2", cimv2_builtin_classes, ARRAY_SIZE(cimv2_builtin_classes)}, {L"Microsoft\\Windows\\Storage", NULL, 0}, + {L"wmi", NULL, 0}, }; void init_table_list( void ) diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index 86ee99c335c..f72d43c0b0b 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -258,6 +258,7 @@ static void test_namespaces(void) { {L"ROOT\\CIMV2"}, {L"ROOT\\Microsoft\\Windows\\Storage", TRUE /* Before Win8. */}, + {L"ROOT\\WMI"}, }; IWbemLocator *locator; IWbemServices *services; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 6b94bbb9ef6..a2bf5071612 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -24,6 +24,7 @@ enum wbm_namespace { WBEMPROX_NAMESPACE_CIMV2, WBEMPROX_NAMESPACE_MS_WINDOWS_STORAGE, + WBEMPROX_NAMESPACE_WMI, WBEMPROX_NAMESPACE_LAST, };

1 0

Rémi Bernon : dinput: Implement internal enum_objects for the mouse device.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: d2aa45329d7695f4b7d2f6c3bd551a54b5fd801f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2aa45329d7695f4b7d2f6c3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 18 10:21:54 2021 +0200 dinput: Implement internal enum_objects for the mouse device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 142 +++++++++++++++++++++++++++++++++++++------- dlls/dinput8/tests/device.c | 10 +--- 2 files changed, 121 insertions(+), 31 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index ea3fcbb5581..cdbdd083c00 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -138,8 +138,6 @@ static HRESULT mousedev_enum_device(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEIN static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseImpl **out ) { SysMouseImpl* newDevice; - LPDIDATAFORMAT df = NULL; - unsigned i; WCHAR buffer[20]; HKEY hkey, appkey; HRESULT hr; @@ -147,13 +145,10 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseIm if (FAILED(hr = direct_input_device_alloc( sizeof(SysMouseImpl), &SysMouseWvt, &mouse_internal_vtbl, rguid, dinput, (void **)&newDevice ))) return hr; - df = newDevice->base.data_format.wine_df; newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysMouseImpl*->base.crit"); fill_mouse_dideviceinstanceW( &newDevice->base.instance, newDevice->base.dinput->dwVersion ); newDevice->base.caps.dwDevType = newDevice->base.instance.dwDevType; - newDevice->base.caps.dwAxes = 3; - newDevice->base.caps.dwButtons = 8; newDevice->base.caps.dwFirmwareRevision = 100; newDevice->base.caps.dwHardwareRevision = 100; newDevice->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; @@ -167,17 +162,11 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseIm if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); - /* Create copy of default data format */ - memcpy(df, &c_dfDIMouse2, c_dfDIMouse2.dwSize); - if (!(df->rgodf = malloc( df->dwNumObjs * df->dwObjSize ))) goto failed; - memcpy(df->rgodf, c_dfDIMouse2.rgodf, df->dwNumObjs * df->dwObjSize); - - /* Because we don't do any detection yet just modify instance and type */ - for (i = 0; i < df->dwNumObjs; i++) - if (DIDFT_GETTYPE(df->rgodf[i].dwType) & DIDFT_AXIS) - df->rgodf[i].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_RELAXIS; - else - df->rgodf[i].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON; + if (FAILED(hr = direct_input_device_init( &newDevice->base.IDirectInputDevice8W_iface ))) + { + IDirectInputDevice_Release( &newDevice->base.IDirectInputDevice8W_iface ); + return hr; + } if (dinput->dwVersion >= 0x0800) { @@ -188,12 +177,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseIm *out = newDevice; return DI_OK; - -failed: - if (df) free( df->rgodf ); - free( df ); - free( newDevice ); - return DIERR_OUTOFMEMORY; } static HRESULT mousedev_create_device( IDirectInputImpl *dinput, REFGUID rguid, IDirectInputDevice8W **out ) @@ -663,12 +646,125 @@ static HRESULT mouse_internal_unacquire( IDirectInputDevice8W *iface ) return DI_OK; } +static BOOL try_enum_object( const DIPROPHEADER *filter, DWORD flags, LPDIENUMDEVICEOBJECTSCALLBACKW callback, + DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + if (flags != DIDFT_ALL && !(flags & DIDFT_GETTYPE( instance->dwType ))) return DIENUM_CONTINUE; + + switch (filter->dwHow) + { + case DIPH_DEVICE: + return callback( instance, data ); + case DIPH_BYOFFSET: + if (filter->dwObj != instance->dwOfs) return DIENUM_CONTINUE; + return callback( instance, data ); + case DIPH_BYID: + if ((filter->dwObj & 0x00ffffff) != (instance->dwType & 0x00ffffff)) return DIENUM_CONTINUE; + return callback( instance, data ); + } + + return DIENUM_CONTINUE; +} + +static HRESULT mouse_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *header, DWORD flags, + LPDIENUMDEVICEOBJECTSCALLBACKW callback, void *context ) +{ + DIDEVICEOBJECTINSTANCEW instances[] = + { + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_XAxis, + .dwOfs = DIMOFS_X, + .dwType = DIDFT_RELAXIS|DIDFT_MAKEINSTANCE(0), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"X-axis", + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_YAxis, + .dwOfs = DIMOFS_Y, + .dwType = DIDFT_RELAXIS|DIDFT_MAKEINSTANCE(1), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Y-axis", + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_ZAxis, + .dwOfs = DIMOFS_Z, + .dwType = DIDFT_RELAXIS|DIDFT_MAKEINSTANCE(2), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Wheel", + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Button, + .dwOfs = DIMOFS_BUTTON0, + .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(3), + .tszName = L"Button 0", + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Button, + .dwOfs = DIMOFS_BUTTON1, + .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(4), + .tszName = L"Button 1", + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Button, + .dwOfs = DIMOFS_BUTTON2, + .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(5), + .tszName = L"Button 2", + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Button, + .dwOfs = DIMOFS_BUTTON3, + .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(6), + .tszName = L"Button 3", + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Button, + .dwOfs = DIMOFS_BUTTON4, + .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(7), + .tszName = L"Button 4", + }, + }; + SysMouseImpl *impl = impl_from_IDirectInputDevice8W( iface ); + DIDATAFORMAT *format = impl->base.data_format.wine_df; + int *offsets = impl->base.data_format.offsets; + DIPROPHEADER filter = *header; + BOOL ret; + DWORD i; + + if (header->dwHow != DIPH_DEVICE && header->dwHow != DIPH_BYOFFSET && header->dwHow != DIPH_BYID) + return DIERR_UNSUPPORTED; + + if (filter.dwHow == DIPH_BYOFFSET) + { + if (!offsets) return DIENUM_CONTINUE; + for (i = 0; i < format->dwNumObjs; ++i) + if (offsets[i] == filter.dwObj) break; + if (i == format->dwNumObjs) return DIENUM_CONTINUE; + filter.dwObj = format->rgodf[i].dwOfs; + } + + for (i = 0; i < ARRAY_SIZE(instances); ++i) + { + ret = try_enum_object( &filter, flags, callback, instances + i, context ); + if (ret != DIENUM_CONTINUE) return DIENUM_STOP; + } + + return DIENUM_CONTINUE; +} + static const struct dinput_device_vtbl mouse_internal_vtbl = { NULL, mouse_internal_acquire, mouse_internal_unacquire, - NULL, + mouse_internal_enum_objects, }; static const IDirectInputDevice8WVtbl SysMouseWvt = diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 6571d1b26b2..9122799b118 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -1068,7 +1068,7 @@ static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *ar winetest_push_context( "obj[%d]", params->index ); - todo_wine + todo_wine_if( obj->dwSize == sizeof(DIDEVICEOBJECTINSTANCE_DX3W) ) check_member( *obj, *exp, "%u", dwSize ); check_member_guid( *obj, *exp, guidType ); todo_wine_if( todo->offset ) @@ -1183,11 +1183,7 @@ static void test_mouse_info(void) .tszName = L"Button 4", }, }; - struct check_objects_todos todo_objects[ARRAY_SIZE(expect_objects)] = - { - {.name = TRUE}, - {.name = TRUE}, - }; + struct check_objects_todos todo_objects[ARRAY_SIZE(expect_objects)] = {{0}}; struct check_objects_params check_objects_params = { .expect_count = ARRAY_SIZE(expect_objects), @@ -1283,7 +1279,6 @@ static void test_mouse_info(void) todo_wine check_member( caps, expect_caps, "%#x", dwDevType ); check_member( caps, expect_caps, "%d", dwAxes ); - todo_wine check_member( caps, expect_caps, "%d", dwButtons ); check_member( caps, expect_caps, "%d", dwPOVs ); check_member( caps, expect_caps, "%d", dwFFSamplePeriod ); @@ -1410,7 +1405,6 @@ static void test_mouse_info(void) res = 0; hr = IDirectInputDevice8_EnumObjects( device, check_object_count, &res, DIDFT_AXIS | DIDFT_PSHBUTTON ); ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); - todo_wine ok( res == 8, "got %u expected %u\n", res, 8 ); hr = IDirectInputDevice8_EnumObjects( device, check_objects, &check_objects_params, DIDFT_ALL ); ok( hr == DI_OK, "EnumObjects returned %#x\n", hr );

1 0

Rémi Bernon : dinput8/tests: Add mouse and keyboard object enumeration tests.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 2ffdb5519fede29f1055b1057999fbcd7265e1e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ffdb5519fede29f1055b105… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 18 10:21:51 2021 +0200 dinput8/tests: Add mouse and keyboard object enumeration tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 810 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 807 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2ffdb5519fede29f1055…

1 0

Piotr Caban : ucrtbase: Avoid bool optimization in __std_exception_copy.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 21da1f2f1143cfc154a8d46c51d4922ff71008d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21da1f2f1143cfc154a8d46c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 18 14:58:01 2021 +0200 ucrtbase: Avoid bool optimization in __std_exception_copy. Otherwise GCC changes do_free = 1 assignment to *dst = *src which breaks ucrtbase/cpp tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 3920b0e9580..ac0bb50f0fb 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -473,7 +473,7 @@ void CDECL __CxxUnregisterExceptionObject(cxx_frame_info *frame_info, BOOL in_us struct __std_exception_data { char *what; - bool dofree; + char dofree; }; #if _MSVCR_VER>=140

1 0

Piotr Caban : ucrtbase: Change _isblank_l return value for '\t'.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 7a98557352f3d2734ddf23fa44e5161218982af0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a98557352f3d2734ddf23fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 18 14:57:46 2021 +0200 ucrtbase: Change _isblank_l return value for '\t'. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 5 ++++- dlls/ucrtbase/tests/misc.c | 17 ++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 7cfba52c9f4..5a7d3450eda 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -397,7 +397,10 @@ int CDECL isxdigit(int c) */ int CDECL _isblank_l(int c, _locale_t locale) { - return c == '\t' || _isctype_l( c, _BLANK, locale ); +#if _MSVCR_VER < 140 + if (c == '\t') return _BLANK; +#endif + return _isctype_l( c, _BLANK, locale ); } /********************************************************************* diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index f5dbac70ddb..60f569c69ff 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -538,16 +538,19 @@ static void test_lldiv(void) static void test_isblank(void) { - int c; + int c, r; for(c = 0; c <= 0xff; c++) { - if(c == '\t' || c == ' ') { - if(c == '\t') - ok(!_isctype(c, _BLANK), "tab shouldn't be blank\n"); - else - ok(_isctype(c, _BLANK), "space should be blank\n"); + if(c == '\t') { + ok(!_isctype(c, _BLANK), "tab shouldn't be blank\n"); + ok(isblank(c), "%d should be blank\n", c); + r = _isblank_l(c, NULL); + ok(!r || broken(r == _BLANK), "tab shouldn't be blank (got %x)\n", r); + } else if(c == ' ') { + ok(_isctype(c, _BLANK), "space should be blank\n"); ok(isblank(c), "%d should be blank\n", c); - ok(_isblank_l(c, NULL), "%d should be blank\n", c); + r = _isblank_l(c, NULL); + ok(r == _BLANK, "space should be blank (got %x)\n", r); } else { ok(!_isctype(c, _BLANK), "%d shouldn't be blank\n", c); ok(!isblank(c), "%d shouldn't be blank\n", c);

1 0