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

Alistair Leslie-Hughes : wbemprox: Support only getting type in record_get_value.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 6daec612cf7effccb3d89bbad3d1ac1ea279bd68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6daec612cf7effccb3d89bba… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 26 15:59:26 2021 +1000 wbemprox: Support only getting type in record_get_value. 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/class.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 2f2d3ef2bfb..2f7752e8671 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -354,6 +354,7 @@ static HRESULT record_get_value( const struct record *record, UINT index, VARIAN VARTYPE vartype = to_vartype( record->fields[index].type & CIM_TYPE_MASK ); if (type) *type = record->fields[index].type; + if (!var) return S_OK; if (record->fields[index].type & CIM_FLAG_ARRAY) {

1 0

Alistair Leslie-Hughes : wbemprox: Support using record in IWbemClassObject Next.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: d7de82fda01848cd85bae781dda21b983332627a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7de82fda01848cd85bae781… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 26 15:59:27 2021 +1000 wbemprox: Support using record in IWbemClassObject Next. Makes the code the same as class_object_Get. 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/class.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 2f7752e8671..3b7bc066aea 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -546,7 +546,17 @@ static HRESULT WINAPI class_object_Next( if (is_method( table, i )) continue; if (!is_result_prop( view, table->columns[i].name )) continue; if (!(prop = SysAllocString( table->columns[i].name ))) return E_OUTOFMEMORY; - if ((hr = get_propval( view, obj->index, prop, pVal, pType, plFlavor )) != S_OK) + if (obj->record) + { + UINT index; + + if ((hr = get_column_index( table, table->columns[i].name, &index )) == S_OK) + hr = record_get_value( obj->record, index, pVal, pType ); + } + else + hr = get_propval( view, obj->index, prop, pVal, pType, plFlavor ); + + if (FAILED(hr)) { SysFreeString( prop ); return hr;

1 0

Alexandre Julliard : ntdll: Remove no longer used syswow64 directory string.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: a71cb210f114ba6e29ae4b6fedf234c809111860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a71cb210f114ba6e29ae4b6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 26 11:57:42 2021 +0200 ntdll: Remove no longer used syswow64 directory string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 - dlls/ntdll/ntdll_misc.h | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a0d6573a526..f3a37d4e8a6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -78,7 +78,6 @@ const struct unix_funcs *unix_funcs = NULL; const WCHAR windows_dir[] = L"C:\\windows"; /* system directory with trailing backslash */ const WCHAR system_dir[] = L"C:\\windows\\system32\\"; -const WCHAR syswow64_dir[] = L"C:\\windows\\syswow64\\"; HMODULE kernel32_handle = 0; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1e00dcda2ec..30640366f5b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -74,7 +74,6 @@ extern void RELAY_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern void SNOOP_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern const WCHAR windows_dir[] DECLSPEC_HIDDEN; extern const WCHAR system_dir[] DECLSPEC_HIDDEN; -extern const WCHAR syswow64_dir[] DECLSPEC_HIDDEN; extern HMODULE kernel32_handle DECLSPEC_HIDDEN; extern void (FASTCALL *pBaseThreadInitThunk)(DWORD,LPTHREAD_START_ROUTINE,void *) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : kernel32: Fix GetLogicalProcessorInformationEx() usage.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 171de0a7f6510a9fa1e2de4f601e31c3208254fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=171de0a7f6510a9fa1e2de4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 26 21:19:42 2021 +0200 kernel32: Fix GetLogicalProcessorInformationEx() usage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 57 ++++++++++++++++------------------------ dlls/ntoskrnl.exe/tests/driver.c | 2 +- 2 files changed, 24 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index aa0922f5164..17a23cca08d 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -604,24 +604,34 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK return S_OK; } +static SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *get_logical_processor_info(void) +{ + DWORD size = 0; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; + + GetLogicalProcessorInformationEx( RelationGroup, NULL, &size ); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL; + if (!(info = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; + if (!GetLogicalProcessorInformationEx( RelationGroup, info, &size )) + { + HeapFree( GetProcessHeap(), 0, info ); + return NULL; + } + return info; +} + + /*********************************************************************** * GetActiveProcessorGroupCount (KERNEL32.@) */ WORD WINAPI GetActiveProcessorGroupCount(void) { WORD groups; - DWORD size = 0; SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; TRACE("()\n"); - if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; - if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; - if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) - { - HeapFree(GetProcessHeap(), 0, info); - return 0; - } + if (!(info = get_logical_processor_info())) return 0; groups = info->Group.ActiveGroupCount; @@ -635,18 +645,11 @@ WORD WINAPI GetActiveProcessorGroupCount(void) DWORD WINAPI GetActiveProcessorCount(WORD group) { DWORD cpus = 0; - DWORD size = 0; SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; TRACE("(0x%x)\n", group); - if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; - if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; - if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) - { - HeapFree(GetProcessHeap(), 0, info); - return 0; - } + if (!(info = get_logical_processor_info())) return 0; if (group == ALL_PROCESSOR_GROUPS) { @@ -669,27 +672,20 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) DWORD WINAPI GetMaximumProcessorCount(WORD group) { DWORD cpus = 0; - DWORD size = 0; SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; TRACE("(0x%x)\n", group); - if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; - if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; - if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) - { - HeapFree(GetProcessHeap(), 0, info); - return 0; - } + if (!(info = get_logical_processor_info())) return 0; if (group == ALL_PROCESSOR_GROUPS) { - for (group = 0; group < info->Group.ActiveGroupCount; group++) + for (group = 0; group < info->Group.MaximumGroupCount; group++) cpus += info->Group.GroupInfo[group].MaximumProcessorCount; } else { - if (group < info->Group.ActiveGroupCount) + if (group < info->Group.MaximumGroupCount) cpus = info->Group.GroupInfo[group].MaximumProcessorCount; } @@ -703,18 +699,11 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group) WORD WINAPI GetMaximumProcessorGroupCount(void) { WORD groups; - DWORD size = 0; SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; TRACE("()\n"); - if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; - if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; - if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) - { - HeapFree(GetProcessHeap(), 0, info); - return 0; - } + if (!(info = get_logical_processor_info())) return 0; groups = info->Group.MaximumGroupCount; diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 0d991cd98d6..f1c72d8fdaf 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1832,7 +1832,7 @@ static void test_affinity(void) ok(!!pKeRevertToUserAffinityThreadEx, "KeRevertToUserAffinityThreadEx is not available.\n"); count = pKeQueryActiveProcessorCountEx(1); - todo_wine ok(!count, "Got unexpected count %u.\n", count); + ok(!count, "Got unexpected count %u.\n", count); cpu_count = pKeQueryActiveProcessorCountEx(0); ok(cpu_count, "Got unexpected cpu_count %u.\n", cpu_count);

1 0

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

26 May '21

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

Jeremy Newman : switching IRC to irc.libera.chat
by Jeremy Newman 26 May '21

26 May '21

Module: website Branch: master Commit: 2d01ffc96add684d4faace0a95ed8f0c4df1d1ef URL: https://source.winehq.org/git/website.git/?a=commit;h=2d01ffc96add684d4faac… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 26 10:22:14 2021 -0500 switching IRC to irc.libera.chat --- templates/en/irc.template | 27 ++++++++++++++------------- templates/es/irc.template | 17 ++++++++--------- templates/fr/irc.template | 12 ++++++------ templates/ko/irc.template | 26 +++++++++++++------------- templates/nl/irc.template | 14 +++++++------- templates/pl/irc.template | 10 +++++----- templates/pt/irc.template | 10 +++++----- templates/tr/irc.template | 10 +++++----- templates/zh-cn/irc.template | 28 ++++++++++++++-------------- 9 files changed, 77 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=2d01ffc96add684d4…

1 0

Rémi Bernon : dinput: Use generic WtoA wrappers when possible.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: 90ef30828ee6ae958ccbd55803a758f8213be1ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=90ef30828ee6ae958ccbd558… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 18:48:54 2021 +0200 dinput: Use generic WtoA wrappers when possible. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 20 +++++------ dlls/dinput/joystick.c | 18 ---------- dlls/dinput/joystick_linux.c | 33 +++-------------- dlls/dinput/joystick_linuxinput.c | 75 +++++---------------------------------- dlls/dinput/joystick_osx.c | 61 +++---------------------------- dlls/dinput/joystick_private.h | 3 -- dlls/dinput/keyboard.c | 17 ++------- dlls/dinput/mouse.c | 33 +++-------------- 8 files changed, 35 insertions(+), 225 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90ef30828ee6ae958ccb…

1 0

Rémi Bernon : dinput: Move IDirectInputDeviceA wrappers to ansi.c.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: 740f8dc6d89effa849cb9f1bd6fc59f00f116b62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=740f8dc6d89effa849cb9f1b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 18:48:55 2021 +0200 dinput: Move IDirectInputDeviceA wrappers to ansi.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/Makefile.in | 1 + dlls/dinput/ansi.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dinput/device.c | 129 -------------------------------- dlls/dinput8/Makefile.in | 1 + 4 files changed, 190 insertions(+), 129 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=740f8dc6d89effa849cb…

1 0

Rémi Bernon : dinput/tests: Check IDirectInputDevice_EnumObjects error codes.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: ab8e41678704196067de1f5618f4cea62717408a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab8e41678704196067de1f56… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 18:48:56 2021 +0200 dinput/tests: Check IDirectInputDevice_EnumObjects 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 | 4 ++++ dlls/dinput/tests/device.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 972cfd604c7..c6385e6c025 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1259,6 +1259,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects(LPDIRECTINPUTDEVICE8A iface, _dump_EnumObjects_flags(dwFlags); TRACE("\n"); + if (!lpCallback) return DIERR_INVALIDPARAM; + /* Only the fields till dwFFMaxForce are relevant */ memset(&ddoi, 0, sizeof(ddoi)); ddoi.dwSize = FIELD_OFFSET(DIDEVICEOBJECTINSTANCEA, dwFFMaxForce); @@ -1289,6 +1291,8 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface, _dump_EnumObjects_flags(dwFlags); TRACE("\n"); + if (!lpCallback) return DIERR_INVALIDPARAM; + /* Only the fields till dwFFMaxForce are relevant */ memset(&ddoi, 0, sizeof(ddoi)); ddoi.dwSize = FIELD_OFFSET(DIDEVICEOBJECTINSTANCEW, dwFFMaxForce); diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 071fc6de6bb..9be00a671fb 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -84,6 +84,9 @@ static void test_object_info(IDirectInputDeviceA *device, HWND hwnd) DWORD cnt = 0; DIDEVICEOBJECTDATA buffer[5]; + hr = IDirectInputDevice_EnumObjects(device, NULL, &cnt, DIDFT_ALL); + ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_EnumObjects returned %08x, expected %08x\n", hr, DIERR_INVALIDPARAM); + hr = IDirectInputDevice_EnumObjects(device, enum_callback, &cnt, DIDFT_ALL); ok(SUCCEEDED(hr), "EnumObjects() failed: %08x\n", hr);

1 0

Rémi Bernon : dinput: Implement IDirectInputDevice_EnumObjects WtoA conversion.
by Alexandre Julliard 25 May '21

25 May '21

Module: wine Branch: master Commit: 9b834bb8bf8b399f0f4bd9323d891f74ad5228c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b834bb8bf8b399f0f4bd932… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 18:48:57 2021 +0200 dinput: Implement IDirectInputDevice_EnumObjects WtoA conversion. Instead of a separate duplicate implementation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dinput/device.c | 32 -------------------------------- 2 files changed, 48 insertions(+), 32 deletions(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 99156195423..5158d326073 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -43,6 +43,27 @@ static IDirectInputDevice8W *IDirectInputDevice8W_from_impl( IDirectInputDeviceI return &impl->IDirectInputDevice8W_iface; } +static void dideviceobjectinstance_wtoa( const DIDEVICEOBJECTINSTANCEW *in, DIDEVICEOBJECTINSTANCEA *out ) +{ + out->guidType = in->guidType; + out->dwOfs = in->dwOfs; + out->dwType = in->dwType; + out->dwFlags = in->dwFlags; + WideCharToMultiByte( CP_ACP, 0, in->tszName, -1, out->tszName, sizeof(out->tszName), NULL, NULL ); + + if (out->dwSize <= FIELD_OFFSET( DIDEVICEOBJECTINSTANCEA, dwFFMaxForce )) return; + + out->dwFFMaxForce = in->dwFFMaxForce; + out->dwFFForceResolution = in->dwFFForceResolution; + out->wCollectionNumber = in->wCollectionNumber; + out->wDesignatorIndex = in->wDesignatorIndex; + out->wUsagePage = in->wUsagePage; + out->wUsage = in->wUsage; + out->dwDimension = in->dwDimension; + out->wExponent = in->wExponent; + out->wReserved = in->wReserved; +} + HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface( IDirectInputDevice8A *iface_a, REFIID iid, void **out ) { IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); @@ -64,6 +85,33 @@ ULONG WINAPI IDirectInputDevice2AImpl_Release( IDirectInputDevice8A *iface_a ) return IDirectInputDevice8_Release( iface_w ); } +struct enum_objects_wtoa_params +{ + LPDIENUMDEVICEOBJECTSCALLBACKA callback; + void *ref; +}; + +static BOOL CALLBACK enum_objects_wtoa_callback( const DIDEVICEOBJECTINSTANCEW *instance_w, void *ref ) +{ + struct enum_objects_wtoa_params *params = ref; + DIDEVICEOBJECTINSTANCEA instance_a = {sizeof(instance_a)}; + + dideviceobjectinstance_wtoa( instance_w, &instance_a ); + return params->callback( &instance_a, params->ref ); +} + +HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects( IDirectInputDevice8A *iface_a, LPDIENUMDEVICEOBJECTSCALLBACKA callback, + void *ref, DWORD flags ) +{ + struct enum_objects_wtoa_params params = {callback, ref}; + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); + IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + + if (!callback) return DIERR_INVALIDPARAM; + + return IDirectInputDevice8_EnumObjects( iface_w, enum_objects_wtoa_callback, &params, flags ); +} + HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty( IDirectInputDevice8A *iface_a, REFGUID guid, DIPROPHEADER *header ) { IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c6385e6c025..31b859801c7 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1247,38 +1247,6 @@ ULONG WINAPI IDirectInputDevice2WImpl_AddRef(LPDIRECTINPUTDEVICE8W iface) return ref; } -HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects(LPDIRECTINPUTDEVICE8A iface, - LPDIENUMDEVICEOBJECTSCALLBACKA lpCallback, LPVOID lpvRef, DWORD dwFlags) -{ - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - DIDEVICEOBJECTINSTANCEA ddoi; - int i; - - TRACE("(%p)->(%p,%p flags:%08x)\n", This, lpCallback, lpvRef, dwFlags); - TRACE(" - flags = "); - _dump_EnumObjects_flags(dwFlags); - TRACE("\n"); - - if (!lpCallback) return DIERR_INVALIDPARAM; - - /* Only the fields till dwFFMaxForce are relevant */ - memset(&ddoi, 0, sizeof(ddoi)); - ddoi.dwSize = FIELD_OFFSET(DIDEVICEOBJECTINSTANCEA, dwFFMaxForce); - - for (i = 0; i < This->data_format.wine_df->dwNumObjs; i++) - { - LPDIOBJECTDATAFORMAT odf = dataformat_to_odf(This->data_format.wine_df, i); - - if (dwFlags != DIDFT_ALL && !(dwFlags & DIDFT_GETTYPE(odf->dwType))) continue; - if (IDirectInputDevice_GetObjectInfo(iface, &ddoi, odf->dwType, DIPH_BYID) != DI_OK) - continue; - - if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) break; - } - - return DI_OK; -} - HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface, LPDIENUMDEVICEOBJECTSCALLBACKW lpCallback, LPVOID lpvRef, DWORD dwFlags) {

1 0