March 2022 - Wine-commits - list.winehq.org

Rémi Bernon : dinput/tests: Add tests for ICustomGameControllerFactory_CreateGameController.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: df0566d531b4454673eb71a0903986d215988e40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df0566d531b4454673eb71a0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 2 14:03:07 2022 +0100 dinput/tests: Add tests for ICustomGameControllerFactory_CreateGameController. This shows that the runtime uses COM aggregation to provide the IGameController and IGameControllerBatteryInfo implementation, while expecting the custom controller to implement several other interfaces depending on the type of provider used as a backend. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hotplug.c | 371 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 365 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=df0566d531b4454673eb…

1 0

Eric Pouech : ntprint/tests: Use correct integral type.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: 7f6c2330bf6a2fd7c6e95226bb2bbc806f10526c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f6c2330bf6a2fd7c6e95226… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:03:57 2022 +0100 ntprint/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/ntprint/tests/ntprint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntprint/tests/ntprint.c b/dlls/ntprint/tests/ntprint.c index 57caa49ab27..7e27c1ce58b 100644 --- a/dlls/ntprint/tests/ntprint.c +++ b/dlls/ntprint/tests/ntprint.c @@ -67,7 +67,7 @@ static void test_PSetupCreateMonitorInfo(VOID) { HANDLE mi; WCHAR buffer[1024] = {'\\','\\'}; - UINT len = ARRAY_SIZE(buffer) - 2; + DWORD len = ARRAY_SIZE(buffer) - 2; GetComputerNameW(buffer + 2, &len); SetLastError(0xdeadbeef);

1 0

Eric Pouech : ntprint/tests: Enable compilation with long types.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: 82ad9054c07311d7ef0936ba3934afc478e7e758 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82ad9054c07311d7ef0936ba… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:04:03 2022 +0100 ntprint/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/ntprint/tests/Makefile.in | 1 - dlls/ntprint/tests/ntprint.c | 32 ++++++++++++++++---------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ntprint/tests/Makefile.in b/dlls/ntprint/tests/Makefile.in index 94a1d9192c6..0c1793fe9e8 100644 --- a/dlls/ntprint/tests/Makefile.in +++ b/dlls/ntprint/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ntprint.dll C_SRCS = \ diff --git a/dlls/ntprint/tests/ntprint.c b/dlls/ntprint/tests/ntprint.c index 7e27c1ce58b..e877b4df1f1 100644 --- a/dlls/ntprint/tests/ntprint.c +++ b/dlls/ntprint/tests/ntprint.c @@ -76,19 +76,19 @@ static void test_PSetupCreateMonitorInfo(VOID) win_skip("The service 'Spooler' is required for many tests\n"); return; } - ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); + ok( mi != NULL, "got %p with %lu (expected '!= NULL')\n", mi, GetLastError()); if (mi) pPSetupDestroyMonitorInfo(mi); SetLastError(0xdeadbeef); mi = pPSetupCreateMonitorInfo(0, buffer); - ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); + ok( mi != NULL, "got %p with %lu (expected '!= NULL')\n", mi, GetLastError()); if (mi) pPSetupDestroyMonitorInfo(mi); SetLastError(0xdeadbeef); mi = pPSetupCreateMonitorInfo(0, buffer + 1); todo_wine { ok( mi == NULL, "got %p\n", mi ); - ok( GetLastError() == ERROR_INVALID_NAME, "got %d\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_NAME, "got %ld\n", GetLastError() ); } if (mi) pPSetupDestroyMonitorInfo(mi); } @@ -103,7 +103,7 @@ static void test_PSetupDestroyMonitorInfo(VOID) SetLastError(0xdeadbeef); pPSetupDestroyMonitorInfo(NULL); /* lasterror is returned */ - trace("returned with %u\n", GetLastError()); + trace("returned with %lu\n", GetLastError()); SetLastError(0xdeadbeef); mi = pPSetupCreateMonitorInfo(0, NULL); @@ -111,20 +111,20 @@ static void test_PSetupDestroyMonitorInfo(VOID) win_skip("The service 'Spooler' is required for many tests\n"); return; } - ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); + ok( mi != NULL, "got %p with %lu (expected '!= NULL')\n", mi, GetLastError()); if (!mi) return; SetLastError(0xdeadbeef); pPSetupDestroyMonitorInfo(mi); /* lasterror is returned */ - trace("returned with %u\n", GetLastError()); + trace("returned with %lu\n", GetLastError()); /* Trying to destroy the handle twice crashes with native ntprint.dll */ if (0) { SetLastError(0xdeadbeef); pPSetupDestroyMonitorInfo(mi); - trace(" with %u\n", GetLastError()); + trace(" with %lu\n", GetLastError()); } } @@ -151,13 +151,13 @@ static void test_PSetupEnumMonitor(VOID) SetLastError(0xdeadbeef); res = pPSetupEnumMonitor(mi, 0, NULL, &minsize); ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER) && (minsize > 0), - "got %u with %u and %u (expected '0' with ERROR_INSUFFICIENT_BUFFER " + "got %lu with %lu and %lu (expected '0' with ERROR_INSUFFICIENT_BUFFER " "and '> 0')\n", res, GetLastError(), minsize); size = ARRAY_SIZE(buffer); if ((minsize + 1) > size) { - skip("overflow: %u\n", minsize); + skip("overflow: %lu\n", minsize); pPSetupDestroyMonitorInfo(mi); return; } @@ -168,7 +168,7 @@ static void test_PSetupEnumMonitor(VOID) size = ARRAY_SIZE(buffer); res = pPSetupEnumMonitor(NULL, 0, buffer, &size); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + "got %lu with %lu (expected '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); } @@ -177,7 +177,7 @@ static void test_PSetupEnumMonitor(VOID) SetLastError(0xdeadbeef); size = ARRAY_SIZE(buffer); res = pPSetupEnumMonitor(mi, 0, NULL, &size); - trace("got %u with %u and %u\n", res, GetLastError(), size); + trace("got %lu with %lu and %lu\n", res, GetLastError(), size); } if (0) { @@ -185,7 +185,7 @@ static void test_PSetupEnumMonitor(VOID) SetLastError(0xdeadbeef); res = pPSetupEnumMonitor(mi, 0, buffer, NULL); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + "got %lu with %lu (expected '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); } @@ -193,20 +193,20 @@ static void test_PSetupEnumMonitor(VOID) size = minsize - 1; res = pPSetupEnumMonitor(mi, 0, buffer, &size); ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "got %u with %u and %u (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", + "got %lu with %lu and %lu (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError(), size); SetLastError(0xdeadbeef); size = minsize; res = pPSetupEnumMonitor(mi, 0, buffer, &size); - ok( res, "got %u with %u and %u (expected '!= 0')\n", + ok( res, "got %lu with %lu and %lu (expected '!= 0')\n", res, GetLastError(), size); SetLastError(0xdeadbeef); size = minsize + 1; res = pPSetupEnumMonitor(mi, 0, buffer, &size); - ok( res, "got %u with %u and %u (expected '!= 0')\n", + ok( res, "got %lu with %lu and %lu (expected '!= 0')\n", res, GetLastError(), size); /* try max. 20 monitors */ @@ -216,7 +216,7 @@ static void test_PSetupEnumMonitor(VOID) size = ARRAY_SIZE(buffer); res = pPSetupEnumMonitor(mi, index, buffer, &size); ok( res || (GetLastError() == ERROR_NO_MORE_ITEMS), - "(%u) got %u with %u and %u (expected '!=0' or: '0' with " + "(%lu) got %lu with %lu and %lu (expected '!=0' or: '0' with " "ERROR_NO_MORE_ITEMS)\n", index, res, GetLastError(), size); if (res) index++;

1 0

Eric Pouech : odbccp32/tests: Enable compilation with long types.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: c0b6ae58af7a91e298c535d2741ad3701d4cbf34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0b6ae58af7a91e298c535d2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:04:09 2022 +0100 odbccp32/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/odbccp32/tests/Makefile.in | 1 - dlls/odbccp32/tests/misc.c | 74 ++++++++++++++++++++--------------------- 2 files changed, 37 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0b6ae58af7a91e298c5…

1 0

Eric Pouech : ole32/tests: Use correct integral type.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: 3aa87091f0c2312630d60266a891ea7fbfe2a715 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa87091f0c2312630d60266… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:04:15 2022 +0100 ole32/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/ole32/tests/moniker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index afbea762e89..ec4273284e3 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3183,7 +3183,7 @@ static void test_generic_composite_moniker(void) for (i = 0; i < ARRAY_SIZE(simplify_tests); ++i) { IMoniker *left, *right, *composite = NULL; - unsigned int moniker_type; + DWORD moniker_type; WCHAR *name; winetest_push_context("simplify[%u]", i);

1 0

Eric Pouech : ole32/tests: Enable compilation with long types.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: a74217447c7d550532152b3df05560bbd1a0ae76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a74217447c7d550532152b3d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:04:21 2022 +0100 ole32/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/ole32/tests/Makefile.in | 1 - dlls/ole32/tests/clipboard.c | 570 +++++++++--------- dlls/ole32/tests/compobj.c | 882 ++++++++++++++-------------- dlls/ole32/tests/defaulthandler.c | 48 +- dlls/ole32/tests/dragdrop.c | 40 +- dlls/ole32/tests/errorinfo.c | 8 +- dlls/ole32/tests/hglobalstream.c | 144 ++--- dlls/ole32/tests/marshal.c | 248 ++++---- dlls/ole32/tests/moniker.c | 1162 ++++++++++++++++++------------------- dlls/ole32/tests/ole2.c | 826 +++++++++++++------------- dlls/ole32/tests/ole_server.c | 86 +-- dlls/ole32/tests/propvariant.c | 72 +-- dlls/ole32/tests/stg_prop.c | 238 ++++---- dlls/ole32/tests/storage32.c | 724 +++++++++++------------ dlls/ole32/tests/usrmarshal.c | 238 ++++---- 15 files changed, 2643 insertions(+), 2644 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a74217447c7d55053215…

1 0

Eric Pouech : oleacc/tests: Use correct integral type.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: 79d1c69635ce3852e097050a81fbb17de807a5ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=79d1c69635ce3852e097050a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:04:28 2022 +0100 oleacc/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/oleacc/tests/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 6b0000e5f56..379611e17d8 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -538,7 +538,7 @@ static void test_GetStateText(void) ok(!ret, "31) GetStateText succeeded: %d\n", ret); } -static int Object_ref = 1; +static LONG Object_ref = 1; static HRESULT WINAPI Object_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { if(IsEqualIID(riid, &IID_IUnknown)) {

1 0

Eric Pouech : oleacc/tests: Enable compilation with long types.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: 83991665db8eb70194b3acecb77e0e89f29b3813 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83991665db8eb70194b3acec… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:04:34 2022 +0100 oleacc/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/oleacc/tests/Makefile.in | 1 - dlls/oleacc/tests/main.c | 358 +++++++++++++++++++++--------------------- 2 files changed, 179 insertions(+), 180 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=83991665db8eb70194b3…

1 0

Eric Pouech : oledb32/tests: Enable compilation with long types.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: 786a7e8b0c201c87abf3dae19bf8b9c9369604d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=786a7e8b0c201c87abf3dae1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:04:40 2022 +0100 oledb32/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/oledb32/tests/Makefile.in | 1 - dlls/oledb32/tests/convert.c | 2408 ++++++++++++++++++++-------------------- dlls/oledb32/tests/database.c | 248 ++--- dlls/oledb32/tests/marshal.c | 22 +- 4 files changed, 1339 insertions(+), 1340 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=786a7e8b0c201c87abf3…

1 0

Eric Pouech : oledlg/tests: Enable compilation with long types.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: 137946d61bde0c3ce6abb1f69d15e577a319d0e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=137946d61bde0c3ce6abb1f6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:04:47 2022 +0100 oledlg/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/oledlg/tests/Makefile.in | 1 - dlls/oledlg/tests/main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oledlg/tests/Makefile.in b/dlls/oledlg/tests/Makefile.in index 10f77e8042e..5c6227bb59d 100644 --- a/dlls/oledlg/tests/Makefile.in +++ b/dlls/oledlg/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = oledlg.dll IMPORTS = oledlg ole32 user32 diff --git a/dlls/oledlg/tests/main.c b/dlls/oledlg/tests/main.c index 919cd008542..384b7b38626 100644 --- a/dlls/oledlg/tests/main.c +++ b/dlls/oledlg/tests/main.c @@ -51,7 +51,7 @@ static ULONG WINAPI enumverbs_Release(IEnumOLEVERB *iface) static int g_enumpos; static HRESULT WINAPI enumverbs_Next(IEnumOLEVERB *iface, ULONG count, OLEVERB *verbs, ULONG *fetched) { - ok(count == 1, "got %u\n", count); + ok(count == 1, "got %lu\n", count); ok(fetched == NULL, "got %p\n", fetched); ok(g_enumpos == 0 || g_enumpos == 1, "got pos %d\n", g_enumpos); @@ -209,7 +209,7 @@ static HRESULT WINAPI oleobject_GetUserClassID(IOleObject *iface, CLSID *clsid) static HRESULT WINAPI oleobject_GetUserType(IOleObject *iface, DWORD formoftype, LPOLESTR *usertype) { - ok(formoftype == USERCLASSTYPE_SHORT, "got %d\n", formoftype); + ok(formoftype == USERCLASSTYPE_SHORT, "got %ld\n", formoftype); *usertype = CoTaskMemAlloc(sizeof(L"test")); lstrcpyW(*usertype, L"test"); return S_OK;

1 0