January 2022 - Wine-commits

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 03 Jan '22

03 Jan '22

Module: wine Branch: master Commit: 529e4154a34a5a774fe7036552ffbb060740da90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=529e4154a34a5a774fe70365… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 3 22:29:17 2022 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 398 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 196 insertions(+), 202 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=529e4154a34a5a774fe7…

1 0

Roman Pišl : comctl32: Fix return type of ImageList_WriteEx.
by Alexandre Julliard 03 Jan '22

03 Jan '22

Module: wine Branch: master Commit: dd7d344f292d860eb2b9a4512bb9b69a682856ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd7d344f292d860eb2b9a451… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sun Jan 2 22:27:05 2022 +0100 comctl32: Fix return type of ImageList_WriteEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52323 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 4 ++-- include/commctrl.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 8da8beec1e0..155d4b2a956 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3061,10 +3061,10 @@ failed: /************************************************************************* * ImageList_WriteEx [COMCTL32.@] */ -BOOL WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD flags, IStream *pstm) +HRESULT WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD flags, IStream *pstm) { FIXME("%p %08x %p: semi-stub\n", himl, flags, pstm); - return ImageList_Write(himl, pstm); + return ImageList_Write(himl, pstm) ? S_OK : E_FAIL; } /************************************************************************* diff --git a/include/commctrl.h b/include/commctrl.h index 025eb328c32..c6d9dd32928 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -602,7 +602,7 @@ BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT); #ifdef __IStream_INTERFACE_DEFINED__ HIMAGELIST WINAPI ImageList_Read(LPSTREAM); BOOL WINAPI ImageList_Write(HIMAGELIST,IStream*); -BOOL WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,IStream*); +HRESULT WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,IStream*); #endif #define ImageList_AddIcon(himl,hicon) ImageList_ReplaceIcon(himl,-1,hicon)

1 0

Michael Stefaniuc : dmsynth/tests: Clarify the sink init / synth latency clock relationship.
by Alexandre Julliard 03 Jan '22

03 Jan '22

Module: wine Branch: master Commit: 56034f1f0959102e096c70a50ccaa259c6d3ea1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=56034f1f0959102e096c70a5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jan 3 00:16:03 2022 +0100 dmsynth/tests: Clarify the sink init / synth latency clock relationship. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/tests/dmsynth.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 3ddf40817a5..3970933cb6f 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -44,6 +44,13 @@ static BOOL missing_dmsynth(void) return TRUE; } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + static void test_dmsynth(void) { IDirectMusicSynth *dmsynth = NULL; @@ -52,6 +59,7 @@ static void test_dmsynth(void) IReferenceClock* clock_sink = NULL; IKsControl* control_synth = NULL; IKsControl* control_sink = NULL; + ULONG ref_clock_synth, ref_clock_sink; HRESULT hr; KSPROPERTY property; ULONG value; @@ -104,6 +112,10 @@ static void test_dmsynth(void) ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); ok(value == TRUE, "Return value: %u, should be 1\n", value); + /* Synth isn't fully initialized yet */ + hr = IDirectMusicSynth_Activate(dmsynth, TRUE); + todo_wine ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_Activate returned: %x\n", hr); + /* Synth has no default clock */ hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock_synth); ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); @@ -112,8 +124,9 @@ static void test_dmsynth(void) hr = IDirectMusicSynthSink_GetLatencyClock(dmsynth_sink, &clock_sink); ok(hr == S_OK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); ok(clock_sink != NULL, "No clock returned\n"); + ref_clock_sink = get_refcount(clock_sink); - /* This will set clock to Synth */ + /* This will Init() the SynthSink and finish initializing the Synth */ hr = IDirectMusicSynth_SetSynthSink(dmsynth, dmsynth_sink); ok(hr == S_OK, "IDirectMusicSynth_SetSynthSink returned: %x\n", hr); @@ -122,6 +135,8 @@ static void test_dmsynth(void) ok(hr == S_OK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); ok(clock_synth != NULL, "No clock returned\n"); ok(clock_synth == clock_sink, "Synth and SynthSink clocks are not the same\n"); + ref_clock_synth = get_refcount(clock_synth); + ok(ref_clock_synth > ref_clock_sink + 1, "Latency clock refcount didn't increase\n"); if (control_synth) IDirectMusicSynth_Release(control_synth);

1 0

Alex Henrie : faultrep/tests: Remove registry writability check.
by Alexandre Julliard 03 Jan '22

03 Jan '22

Module: wine Branch: master Commit: 3084624fbe4ebbd947b5b97ab9dabe64f15fa891 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3084624fbe4ebbd947b5b97a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 2 21:52:11 2022 -0700 faultrep/tests: Remove registry writability check. This check isn't needed anymore either. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/faultrep/tests/faultrep.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index c71db80cdbb..41f03ee8870 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -72,11 +72,6 @@ static void test_AddERExcludedApplicationA(void) /* clean state */ lres = RegCreateKeyA(HKEY_LOCAL_MACHINE, regpath_root, &hroot); - if (lres == ERROR_ACCESS_DENIED) - { - skip("Not enough access rights\n"); - return; - } if (!lres) lres = RegOpenKeyA(hroot, regpath_exclude, &hexclude);

1 0

Eric Pouech : dbghelp: Don't use .debug_frame section if non present when unwinding.
by Alexandre Julliard 03 Jan '22

03 Jan '22

Module: wine Branch: master Commit: 00a11ff73d22d1392b372cc387f42c9bffc974cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=00a11ff73d22d1392b372cc3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 3 12:02:14 2022 +0100 dbghelp: Don't use .debug_frame section if non present when unwinding. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52295 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 7515e540778..7472b6070e6 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3774,7 +3774,8 @@ static BOOL dwarf2_fetch_frame_info(struct module* module, struct cpu* cpu, LONG fde_ctx.data = modfmt->u.dwarf2_info->debug_frame.address; fde_ctx.end_data = fde_ctx.data + modfmt->u.dwarf2_info->debug_frame.size; delta = module->reloc_delta; - if (!dwarf2_get_cie(ip, module, delta, &fde_ctx, &cie_ctx, info, FALSE)) + if (modfmt->u.dwarf2_info->debug_frame.address == IMAGE_NO_MAP || + !dwarf2_get_cie(ip, module, delta, &fde_ctx, &cie_ctx, info, FALSE)) { TRACE("Couldn't find information for %lx\n", ip); return FALSE;

1 0

Alex Henrie : wined3d: Fix memory leak on error path in wined3d_buffer_vk_create_buffer_object (Coverity).
by Alexandre Julliard 03 Jan '22

03 Jan '22

Module: wine Branch: master Commit: 29c9cf6429ab64d14831b97ad710e47575fe0d81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29c9cf6429ab64d14831b97a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 28 21:02:03 2021 -0700 wined3d: Fix memory leak on error path in wined3d_buffer_vk_create_buffer_object (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c078ba7e634..b42c7bd919a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1498,6 +1498,7 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf vk_memory_type_from_access_flags(resource->access, resource->usage), bo_vk))) { WARN("Failed to create Vulkan buffer.\n"); + heap_free(bo_vk); return FALSE; }

1 0

Paul Gofman : ddraw/tests: Port tests for fullscreen window size reset from d3d9.
by Alexandre Julliard 03 Jan '22

03 Jan '22

Module: wine Branch: master Commit: c52f7de2486f4d02fd18057e1ccfad4bb794f7ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=c52f7de2486f4d02fd18057e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 29 14:01:07 2021 +0300 ddraw/tests: Port tests for fullscreen window size reset from d3d9. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 40 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 156 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c52f7de2486f4d02fd18…

1 0

Rémi Bernon : dinput/tests: Move tests from dinput8/tests.
by Alexandre Julliard 03 Jan '22

03 Jan '22

Module: wine Branch: master Commit: d22746fe09da29e9d71ee304fd19a59065437ea9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d22746fe09da29e9d71ee304… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 3 14:43:34 2022 +0100 dinput/tests: Move tests from dinput8/tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/dinput/tests/Makefile.in | 12 ++++++++++-- dlls/{dinput8/tests/device.c => dinput/tests/device8.c} | 2 +- dlls/dinput/tests/dinput.c | 4 +++- dlls/{dinput8/tests/dinput.c => dinput/tests/dinput8.c} | 5 ++--- dlls/{dinput8 => dinput}/tests/driver_hid.c | 0 dlls/{dinput8 => dinput}/tests/driver_hid.h | 0 dlls/{dinput8 => dinput}/tests/driver_hid.spec | 0 dlls/{dinput8 => dinput}/tests/hid.c | 0 dlls/{dinput8 => dinput}/tests/pop_hid_macros.h | 0 dlls/{dinput8 => dinput}/tests/psh_hid_macros.h | 0 dlls/dinput8/tests/Makefile.in | 12 ------------ 13 files changed, 16 insertions(+), 21 deletions(-) diff --git a/configure b/configure index d05938409a5..5c3536900d1 100755 --- a/configure +++ b/configure @@ -21820,7 +21820,6 @@ wine_fn_config_makefile dlls/difxapi enable_difxapi wine_fn_config_makefile dlls/dinput enable_dinput wine_fn_config_makefile dlls/dinput/tests enable_tests wine_fn_config_makefile dlls/dinput8 enable_dinput8 -wine_fn_config_makefile dlls/dinput8/tests enable_tests wine_fn_config_makefile dlls/directmanipulation enable_directmanipulation wine_fn_config_makefile dlls/directmanipulation/tests enable_tests wine_fn_config_makefile dlls/dispdib.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 9b2c111119f..ddd45b8c241 100644 --- a/configure.ac +++ b/configure.ac @@ -2743,7 +2743,6 @@ WINE_CONFIG_MAKEFILE(dlls/difxapi) WINE_CONFIG_MAKEFILE(dlls/dinput) WINE_CONFIG_MAKEFILE(dlls/dinput/tests) WINE_CONFIG_MAKEFILE(dlls/dinput8) -WINE_CONFIG_MAKEFILE(dlls/dinput8/tests) WINE_CONFIG_MAKEFILE(dlls/directmanipulation) WINE_CONFIG_MAKEFILE(dlls/directmanipulation/tests) WINE_CONFIG_MAKEFILE(dlls/dispdib.dll16,enable_win16) diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index 858c2cdae7a..87a4dad2708 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -1,9 +1,17 @@ TESTDLL = dinput.dll -IMPORTS = dinput ole32 version user32 +IMPORTS = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev setupapi wintrust winmm -C_SRCS = \ +driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass +driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native + +SOURCES = \ device.c \ + device8.c \ dinput.c \ + dinput8.c \ + driver_hid.c \ + driver_hid.spec \ + hid.c \ joystick.c \ keyboard.c \ mouse.c diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput/tests/device8.c similarity index 99% rename from dlls/dinput8/tests/device.c rename to dlls/dinput/tests/device8.c index 8b34de276db..817e843e33c 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput/tests/device8.c @@ -1836,7 +1836,7 @@ static void test_keyboard_info(void) ok( ref == 0, "Release returned %d\n", ref ); } -START_TEST(device) +START_TEST(device8) { instance = GetModuleHandleW( NULL ); diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index c7fa0b76397..10da888fdd4 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -19,8 +19,10 @@ #define DIRECTINPUT_VERSION 0x0700 #define COBJMACROS -#include <initguid.h> #include <windows.h> +#include "objbase.h" + +#include <initguid.h> #include <dinput.h> #include <dinputd.h> diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput/tests/dinput8.c similarity index 99% rename from dlls/dinput8/tests/dinput.c rename to dlls/dinput/tests/dinput8.c index 3e2e4fbb371..81aeb8191f6 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput/tests/dinput8.c @@ -22,13 +22,12 @@ #include <windows.h> #include <objidl.h> -#include <initguid.h> #include <dinput.h> #include <dinputd.h> #include "wine/test.h" -HINSTANCE hInstance; +static HINSTANCE hInstance; static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *context) { @@ -711,7 +710,7 @@ static void test_Initialize(void) IDirectInput8_Release(pDI); } -START_TEST(dinput) +START_TEST(dinput8) { hInstance = GetModuleHandleA(NULL); diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput/tests/driver_hid.c similarity index 100% rename from dlls/dinput8/tests/driver_hid.c rename to dlls/dinput/tests/driver_hid.c diff --git a/dlls/dinput8/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h similarity index 100% rename from dlls/dinput8/tests/driver_hid.h rename to dlls/dinput/tests/driver_hid.h diff --git a/dlls/dinput8/tests/driver_hid.spec b/dlls/dinput/tests/driver_hid.spec similarity index 100% rename from dlls/dinput8/tests/driver_hid.spec rename to dlls/dinput/tests/driver_hid.spec diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput/tests/hid.c similarity index 100% rename from dlls/dinput8/tests/hid.c rename to dlls/dinput/tests/hid.c diff --git a/dlls/dinput8/tests/pop_hid_macros.h b/dlls/dinput/tests/pop_hid_macros.h similarity index 100% rename from dlls/dinput8/tests/pop_hid_macros.h rename to dlls/dinput/tests/pop_hid_macros.h diff --git a/dlls/dinput8/tests/psh_hid_macros.h b/dlls/dinput/tests/psh_hid_macros.h similarity index 100% rename from dlls/dinput8/tests/psh_hid_macros.h rename to dlls/dinput/tests/psh_hid_macros.h diff --git a/dlls/dinput8/tests/Makefile.in b/dlls/dinput8/tests/Makefile.in deleted file mode 100644 index 336dbd500ba..00000000000 --- a/dlls/dinput8/tests/Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ -TESTDLL = dinput8.dll -IMPORTS = dinput8 dinput ole32 user32 hid advapi32 uuid crypt32 newdev setupapi wintrust winmm - -driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass -driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native - -SOURCES = \ - device.c \ - dinput.c \ - driver_hid.c \ - driver_hid.spec \ - hid.c

1 0

Rémi Bernon : dinput/tests: Split joystick tests into separate sources.
by Alexandre Julliard 03 Jan '22

03 Jan '22

Module: wine Branch: master Commit: 4c4dedb941c14af1a523a63d71b065ff4458cfaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c4dedb941c14af1a523a63d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 3 14:43:35 2022 +0100 dinput/tests: Split joystick tests into separate sources. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/Makefile.in | 2 + dlls/dinput/tests/dinput_test.h | 100 + dlls/dinput/tests/driver_hid.c | 1 + dlls/dinput/tests/driver_hid.h | 2 - dlls/dinput/tests/force_feedback.c | 4337 +++++++++++++++++++++++ dlls/dinput/tests/hid.c | 6761 +----------------------------------- dlls/dinput/tests/joystick8.c | 2594 ++++++++++++++ 7 files changed, 7122 insertions(+), 6675 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c4dedb941c14af1a523…

1 0

Rémi Bernon : dinput/tests: Remove verbose and redundant tests.
by Alexandre Julliard 03 Jan '22

03 Jan '22

Module: wine Branch: master Commit: 6ac7d042f7c301c822cca740a9f4011c741ad659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ac7d042f7c301c822cca740… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 3 14:43:36 2022 +0100 dinput/tests: Remove verbose and redundant tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick8.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index f1fd4be36e5..e986bf2d1cb 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -2170,15 +2170,9 @@ static BOOL test_device_types( DWORD version ) hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); ok( hr == DI_OK, "GetDeviceInfo returned %#x\n", hr ); check_member( devinst, expect_devinst[i], "%d", dwSize ); - todo_wine - check_member_guid( devinst, expect_devinst[i], guidInstance ); check_member_guid( devinst, expect_devinst[i], guidProduct ); todo_wine_if( version <= 0x700 && i == 3 ) check_member( devinst, expect_devinst[i], "%#x", dwDevType ); - todo_wine - check_member_wstr( devinst, expect_devinst[i], tszInstanceName ); - todo_wine - check_member_wstr( devinst, expect_devinst[i], tszProductName ); check_member_guid( devinst, expect_devinst[i], guidFFDriver ); check_member( devinst, expect_devinst[i], "%04x", wUsagePage ); check_member( devinst, expect_devinst[i], "%04x", wUsage );

1 0