February 2022 - Wine-Commits

Eric Pouech : explorerframe/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: c8431d97bdf41d5ff8a0675643453778d556b713 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8431d97bdf41d5ff8a06756… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:29:34 2022 +0100 explorerframe/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/tests/Makefile.in | 1 - dlls/explorerframe/tests/nstc.c | 596 ++++++++++++++++----------------- dlls/explorerframe/tests/taskbarlist.c | 66 ++-- 3 files changed, 331 insertions(+), 332 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c8431d97bdf41d5ff8a0…

1 0

Eric Pouech : dssenh/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: e792a609741b271d0edc21bde69988b1234bb00a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e792a609741b271d0edc21bd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:28:50 2022 +0100 dssenh/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/Makefile.in | 1 - dlls/dssenh/tests/dssenh.c | 254 +++++++++++++++++++++--------------------- 2 files changed, 127 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e792a609741b271d0edc…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 58d4037290f73e048afe7592a1f293c927171f80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58d4037290f73e048afe7592… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Feb 24 19:15:46 2022 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/po/fi.po b/po/fi.po index b121eaa546f..41e57561142 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6950,54 +6950,40 @@ msgid "This network connection does not exist.\n" msgstr "Tätä verkkoyhteyttä ei ole.\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "Keskeytysaikana virheellinen.\n" +msgstr "Kutsu keskeytetty.\n" #: dlls/kernel32/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "Kahva ei kelpaa.\n" +msgstr "Tiedoston kahva ei kelpaa.\n" #: dlls/kernel32/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "Verkko-osoite ei kelpaa.\n" +msgstr "Osoittimen osoite ei kelpaa.\n" #: dlls/kernel32/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "Nimi ei kelpaa.\n" +msgstr "Argumentti ei kelpaa.\n" #: dlls/kernel32/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "Vastapuoli nollasi yhteyden.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "Pistettä ei löydy.\n" +msgstr "Isäntää ei löydy.\n" #: dlls/kernel32/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "Attribuuttia ei löydy.\n" +msgstr "Isäntää ei löydy (ei-autoritatiivinen).\n" #: dlls/kernel32/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "On tapahtunut peruuttamaton virhe.\n" +msgstr "Peruuttamaton virhe.\n" #: dlls/kernel32/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "Nimi kelpaa, ei tietuetta.\n" #: dlls/kernel32/winerror.mc:3817 msgid "Not implemented.\n" @@ -18357,8 +18343,8 @@ msgid "" msgstr "" "Jos tätä ongelmaa ei esiinny Windowsin kanssa eikä sitä ole vielä " "raportoitu, voit tallentaa yksityiskohtaisemmat tiedot tiedostoon Tallenna " -"nimellä -kohdassa ja sitten <a href=\"https://wiki.winehq.org/Bugs" -"\">lähettää virheraportin</a> ja liittää tiedoston raporttiin." +"nimellä -kohdassa ja sitten <a href=\"https://wiki.winehq.org/" +"Bugs\">lähettää virheraportin</a> ja liittää tiedoston raporttiin." #: programs/winedbg/winedbg.rc:40 msgid ""

1 0

Eric Pouech : directmanipulation/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 2f858cc06494f3a8e50f0c6ff3dd6f1270badb93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f858cc06494f3a8e50f0c6f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:27:50 2022 +0100 directmanipulation/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/tests/Makefile.in | 1 - dlls/directmanipulation/tests/manipulation.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/directmanipulation/tests/Makefile.in b/dlls/directmanipulation/tests/Makefile.in index 6fa94fa3cc6..29ec0db511a 100644 --- a/dlls/directmanipulation/tests/Makefile.in +++ b/dlls/directmanipulation/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = directmanipulation.dll IMPORTS = uuid ole32 diff --git a/dlls/directmanipulation/tests/manipulation.c b/dlls/directmanipulation/tests/manipulation.c index 93b692729b3..92c8ddd9edd 100644 --- a/dlls/directmanipulation/tests/manipulation.c +++ b/dlls/directmanipulation/tests/manipulation.c @@ -39,10 +39,10 @@ static void test_IDirectManipulationManager2(void) win_skip("Failed to create XMLView instance\n"); return; } - ok(hres == S_OK, "CoCreateInstance returned %x, expected S_OK\n", hres); + ok(hres == S_OK, "CoCreateInstance returned %lx, expected S_OK\n", hres); hres = IDirectManipulationManager2_GetUpdateManager(manager2, &IID_IDirectManipulationUpdateManager, (void**)&update); - ok(hres == S_OK, "returned %x, expected S_OK\n", hres); + ok(hres == S_OK, "returned %lx, expected S_OK\n", hres); if(update) IDirectManipulationUpdateManager_Release(update);

1 0

Eric Pouech : dwmapi/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 261bf4910ef821358d623d1efbbcf8e79bae580b URL: https://source.winehq.org/git/wine.git/?a=commit;h=261bf4910ef821358d623d1e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:28:56 2022 +0100 dwmapi/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/tests/Makefile.in | 1 - dlls/dwmapi/tests/dwmapi.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dwmapi/tests/Makefile.in b/dlls/dwmapi/tests/Makefile.in index 8821fb5b0fb..6c6130401d6 100644 --- a/dlls/dwmapi/tests/Makefile.in +++ b/dlls/dwmapi/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dwmapi.dll IMPORTS = dwmapi diff --git a/dlls/dwmapi/tests/dwmapi.c b/dlls/dwmapi/tests/dwmapi.c index 1904e283bba..7cb9eb424f1 100644 --- a/dlls/dwmapi/tests/dwmapi.c +++ b/dlls/dwmapi/tests/dwmapi.c @@ -25,11 +25,11 @@ static void test_DwmIsCompositionEnabled(void) HRESULT hr; hr = DwmIsCompositionEnabled(NULL); - ok(hr == E_INVALIDARG, "Expected %#x, got %#x.\n", E_INVALIDARG, hr); + ok(hr == E_INVALIDARG, "Expected %#lx, got %#lx.\n", E_INVALIDARG, hr); enabled = -1; hr = DwmIsCompositionEnabled(&enabled); - ok(hr == S_OK, "Expected %#x, got %#x.\n", S_OK, hr); + ok(hr == S_OK, "Expected %#lx, got %#lx.\n", S_OK, hr); ok(enabled == TRUE || enabled == FALSE, "Got unexpected %#x.\n", enabled); }

1 0

Eric Pouech : comctl32/tests: Use inline function in expect*() macros to handle integral conversion.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 2596bd57c6c0db410fce39af5a47fd119ac52388 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2596bd57c6c0db410fce39af… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:26:53 2022 +0100 comctl32/tests: Use inline function in expect*() macros to handle integral conversion. depending on the files, these macros can be called with: - UINT/UINT, DWORD/DWORD pairs, but also UINT/DWORD or DWORD/UINT pairs... - wrapping inside an inline function allows the compiler to take care of the integral conversions Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/dpa.c | 6 +++++- dlls/comctl32/tests/edit.c | 7 +++++-- dlls/comctl32/tests/header.c | 6 +++++- dlls/comctl32/tests/listview.c | 16 +++++++++++++--- dlls/comctl32/tests/monthcal.c | 13 +++++++++++-- dlls/comctl32/tests/tab.c | 7 ++++++- dlls/comctl32/tests/trackbar.c | 7 ++++++- dlls/comctl32/tests/treeview.c | 6 +++++- dlls/comctl32/tests/updown.c | 6 +++++- 9 files changed, 61 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 4a446a8e2c5..841076ef00f 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -32,7 +32,11 @@ #include "wine/test.h" #include "v6util.h" -#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} typedef struct _STREAMDATA { diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 7fcc44eb4a1..2c108ed419c 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -2032,8 +2032,11 @@ static void test_margins_font_change(void) } -#define edit_pos_ok(exp, got, txt) \ - ok(exp == got, "wrong " #txt " expected %d got %d\n", exp, got); +#define edit_pos_ok(expected, got, txt) edit_pos_ok_(__LINE__, expected, got, #txt) +static inline void edit_pos_ok_(unsigned line, DWORD expected, DWORD got, const char* txt) +{ + ok_(__FILE__, line)(expected == got, "wrong %s expected %d got %d\n", txt, expected, got); +} #define check_pos(hwEdit, set_height, test_top, test_height, test_left) \ do { \ diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 3428936cd75..143bc8f84f4 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -56,7 +56,11 @@ static HWND hWndHeader; #define compare(val, exp, fmt) ok((val) == (exp), #val " value: " fmt ", expected: " fmt "\n", (val), (exp)) -#define expect(expected, got) ok(expected == got, "expected %d, got %d\n", expected,got) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} #define NUM_MSG_SEQUENCES 2 #define PARENT_SEQ_INDEX 0 diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 3810cd8f4bc..1718bf71342 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -46,9 +46,19 @@ enum seq_index { #define LISTVIEW_ID 0 #define HEADER_ID 1 -#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) -#define expect2(expected1, expected2, got1, got2) ok(expected1 == got1 && expected2 == got2, \ - "expected (%d,%d), got (%d,%d)\n", expected1, expected2, got1, got2) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} + +#define expect2(expected1, expected2, got1, got2) expect2_(__LINE__, expected1, expected2, got1, got2) +static inline void expect2_(unsigned line, DWORD expected1, DWORD expected2, DWORD got1, DWORD got2) +{ + ok_(__FILE__, line)(expected1 == got1 && expected2 == got2, + "expected (%d,%d), got (%d,%d)\n", + expected1, expected2, got1, got2); +} static HWND hwndparent, hwndparentW; /* prevents edit box creation, LVN_BEGINLABELEDIT return value */ diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index ae528a0ddb2..5b950ac76c3 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -32,8 +32,17 @@ #include <windows.h> #include "msg.h" -#define expect(expected, got) ok(expected == got, "Expected %d, got %d\n", expected, got); -#define expect_hex(expected, got) ok(expected == got, "Expected %x, got %x\n", expected, got); +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} + +#define expect_hex(expected,got) expect_hex_(__LINE__, expected, got) +static inline void expect_hex_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %x, got %x\n", expected, got); +} #define expect_d(expected, got) ok(abs((expected) - (got)) <= 2, "Expected %d, got %d\n", expected, got); #define NUM_MSG_SEQUENCES 2 diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 9685c8d37f5..c5d57af114d 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -34,7 +34,12 @@ #define PARENT_SEQ_INDEX 0 #define TAB_SEQ_INDEX 1 -#define expect(expected, got) ok ( expected == got, "Expected %d, got %d\n", expected, got) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} + #define expect_str(expected, got)\ ok ( strcmp(expected, got) == 0, "Expected '%s', got '%s'\n", expected, got) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index eb5464483d0..70b61d4db20 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -25,7 +25,12 @@ #include "msg.h" #include "v6util.h" -#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} + #define NUM_MSG_SEQUENCE 2 #define PARENT_SEQ_INDEX 0 #define TRACKBAR_SEQ_INDEX 1 diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 1804e1886a7..45e2091f3b2 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -57,7 +57,11 @@ static BOOL g_v6; #define PARENT_SEQ_INDEX 1 #define PARENT_CD_SEQ_INDEX 2 -#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static struct msg_sequence *item_sequence[1]; diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 97afcb042f6..6ffdcb9e1ab 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -50,7 +50,11 @@ #include "wine/test.h" #include "msg.h" -#define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} #define NUM_MSG_SEQUENCES 3 #define PARENT_SEQ_INDEX 0

1 0

Eric Pouech : dbghelp/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 56681b53144085d3a77ea7b638d414911ca60292 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56681b53144085d3a77ea7b6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:27:18 2022 +0100 dbghelp/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/tests/Makefile.in | 1 - dlls/dbghelp/tests/dbghelp.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/tests/Makefile.in b/dlls/dbghelp/tests/Makefile.in index 408431fb516..31e5b01e8a8 100644 --- a/dlls/dbghelp/tests/Makefile.in +++ b/dlls/dbghelp/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dbghelp.dll IMPORTS = dbghelp diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index b7e828281cd..73f8ee5f14f 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -26,7 +26,7 @@ static DWORD CALLBACK stack_walk_thread(void *arg) { DWORD count = SuspendThread(GetCurrentThread()); - ok(!count, "got %d\n", count); + ok(!count, "got %ld\n", count); return 0; } @@ -86,7 +86,7 @@ static void test_stack_walk(void) /* first invocation just calculates the return address */ ret = StackWalk64(machine, GetCurrentProcess(), thread, &frame, &ctx, NULL, SymFunctionTableAccess64, SymGetModuleBase64, NULL); - ok(ret, "StackWalk64() failed: %u\n", GetLastError()); + ok(ret, "StackWalk64() failed: %lu\n", GetLastError()); ok(frame.AddrPC.Offset == frame0.AddrPC.Offset, "expected %s, got %s\n", wine_dbgstr_longlong(frame0.AddrPC.Offset), wine_dbgstr_longlong(frame.AddrPC.Offset)); @@ -102,7 +102,7 @@ static void test_stack_walk(void) ret = StackWalk64(machine, GetCurrentProcess(), thread, &frame, &ctx, NULL, SymFunctionTableAccess64, SymGetModuleBase64, NULL); - ok(ret, "StackWalk64() failed: %u\n", GetLastError()); + ok(ret, "StackWalk64() failed: %lu\n", GetLastError()); addr = (void *)(DWORD_PTR)frame.AddrPC.Offset; @@ -199,11 +199,11 @@ START_TEST(dbghelp) SetEnvironmentVariableA("_NT_ALT_SYMBOL_PATH", NULL); ret = SymInitialize(GetCurrentProcess(), NULL, TRUE); - ok(ret, "got error %u\n", GetLastError()); + ok(ret, "got error %lu\n", GetLastError()); test_stack_walk(); test_search_path(); ret = SymCleanup(GetCurrentProcess()); - ok(ret, "got error %u\n", GetLastError()); + ok(ret, "got error %lu\n", GetLastError()); }

1 0

Rémi Bernon : dinput/tests: Add tests for IRawGameControllerStatics_FromGameController.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: d337f6fbce33947e676b2fa486b7d6f89bf705b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d337f6fbce33947e676b2fa4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 23 17:49:38 2022 +0100 dinput/tests: Add tests for IRawGameControllerStatics_FromGameController. And check the RawGameController IGameController interface. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick8.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 959f91aae78..d98faf7d3ee 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -3272,10 +3272,11 @@ static void test_windows_gaming_input(void) }; static const WCHAR *controller_class_name = RuntimeClass_Windows_Gaming_Input_RawGameController; + IRawGameController *raw_controller, *tmp_raw_controller; IVectorView_RawGameController *controllers_view; IRawGameControllerStatics *controller_statics; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; - IRawGameController *raw_controller; + IGameController *game_controller; UINT32 size; HSTRING str; HRESULT hr; @@ -3339,7 +3340,26 @@ static void test_windows_gaming_input(void) check_interface( raw_controller, &IID_IGameController, TRUE ); check_interface( raw_controller, &IID_IGamepad, FALSE ); + hr = IRawGameController_QueryInterface( raw_controller, &IID_IGameController, (void **)&game_controller ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + + check_runtimeclass( game_controller, RuntimeClass_Windows_Gaming_Input_RawGameController ); + check_interface( game_controller, &IID_IUnknown, TRUE ); + check_interface( game_controller, &IID_IInspectable, TRUE ); + check_interface( game_controller, &IID_IAgileObject, TRUE ); + check_interface( game_controller, &IID_IRawGameController, TRUE ); + check_interface( game_controller, &IID_IRawGameController2, TRUE ); + check_interface( game_controller, &IID_IGameController, TRUE ); + check_interface( game_controller, &IID_IGamepad, FALSE ); + + hr = IRawGameControllerStatics_FromGameController( controller_statics, game_controller, &tmp_raw_controller ); + ok( hr == S_OK, "FromGameController returned %#lx\n", hr ); + ok( tmp_raw_controller == raw_controller, "got unexpected IGameController interface\n" ); + IRawGameController_Release( tmp_raw_controller ); + + IGameController_Release( game_controller ); IRawGameController_Release( raw_controller ); + IRawGameControllerStatics_Release( controller_statics ); done:

1 0

Eric Pouech : comctl32/tests: Use correct integral type.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 330261b9b4010fb94235721e2c49813f51cad692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=330261b9b4010fb94235721e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:26:47 2022 +0100 comctl32/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 2 +- dlls/comctl32/tests/rebar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index a4d6a658cda..2ce964f8a27 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -1210,7 +1210,7 @@ static void test_wm_notify(void) DONT_CONVERT_SEND | DONT_CONVERT_RECEIVE}, {&nmtbr, sizeof(nmtbr), NULL, 0, (WCHAR **)&nmtbr.tbButton.iString, NULL, TBN_RESTORE, TBN_RESTORE, DONT_CONVERT_SEND | DONT_CONVERT_RECEIVE}, - {&nmtbdi, sizeof(nmtbdi), &nmtbdi.dwMask, TBNF_TEXT, &nmtbdi.pszText, &nmtbdi.cchText, TBN_GETDISPINFOW, + {&nmtbdi, sizeof(nmtbdi), (UINT*)&nmtbdi.dwMask, TBNF_TEXT, &nmtbdi.pszText, &nmtbdi.cchText, TBN_GETDISPINFOW, TBN_GETDISPINFOW, DONT_CONVERT_SEND | DONT_CONVERT_RECEIVE}, {&nmtb, sizeof(nmtb), NULL, 0, &nmtb.pszText, &nmtb.cchText, TBN_GETBUTTONINFOW, TBN_GETBUTTONINFOA, SEND_EMPTY_IF_NULL | CONVERT_SEND | CONVERT_RECEIVE}, diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 63449d4d457..e868198b4d8 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -195,7 +195,7 @@ static int string_width(const CHAR *s) { typedef struct { RECT rc; - DWORD fStyle; + UINT fStyle; UINT cx; } rbband_result_t;

1 0

Rémi Bernon : dinput/tests: Add some windows.gaming.input hotplug tests.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 7e7c0ed9c5fc1482e2ff26a791a5e7dab6435097 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e7c0ed9c5fc1482e2ff26a7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 23 17:49:36 2022 +0100 dinput/tests: Add some windows.gaming.input hotplug tests. 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/hotplug.c | 244 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 245 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e7c0ed9c5fc1482e2ff…

1 0