February 2022 - Wine-Commits

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

Feb. 23, 2022

Module: wine Branch: master Commit: cdc92a7bcb254619c1b594d6933f3036a754cabf URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdc92a7bcb254619c1b594d6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:11:59 2022 +0100 credui/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/credui/tests/Makefile.in | 1 - dlls/credui/tests/credui.c | 36 ++++++++++++++++++------------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/credui/tests/Makefile.in b/dlls/credui/tests/Makefile.in index b2a8c778df4..4442837ed11 100644 --- a/dlls/credui/tests/Makefile.in +++ b/dlls/credui/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = credui.dll IMPORTS = credui diff --git a/dlls/credui/tests/credui.c b/dlls/credui/tests/credui.c index f2b71d603cc..715ae35b130 100644 --- a/dlls/credui/tests/credui.c +++ b/dlls/credui/tests/credui.c @@ -50,10 +50,10 @@ static void test_CredUIPromptForCredentials(void) ret = CredUIConfirmCredentialsW(NULL, TRUE); ok(ret == ERROR_INVALID_PARAMETER /* 2003 + */ || ret == ERROR_NOT_FOUND /* XP */, - "CredUIConfirmCredentials should have returned ERROR_INVALID_PARAMETER or ERROR_NOT_FOUND instead of %d\n", ret); + "CredUIConfirmCredentials should have returned ERROR_INVALID_PARAMETER or ERROR_NOT_FOUND instead of %ld\n", ret); ret = CredUIConfirmCredentialsW(wszServerName, TRUE); - ok(ret == ERROR_NOT_FOUND, "CredUIConfirmCredentials should have returned ERROR_NOT_FOUND instead of %d\n", ret); + ok(ret == ERROR_NOT_FOUND, "CredUIConfirmCredentials should have returned ERROR_NOT_FOUND instead of %ld\n", ret); username[0] = '\0'; password[0] = '\0'; @@ -61,19 +61,19 @@ static void test_CredUIPromptForCredentials(void) ARRAY_SIZE(username), password, ARRAY_SIZE(password), NULL, CREDUI_FLAGS_ALWAYS_SHOW_UI); - ok(ret == ERROR_INVALID_FLAGS, "CredUIPromptForCredentials should have returned ERROR_INVALID_FLAGS instead of %d\n", ret); + ok(ret == ERROR_INVALID_FLAGS, "CredUIPromptForCredentials should have returned ERROR_INVALID_FLAGS instead of %ld\n", ret); ret = CredUIPromptForCredentialsW(NULL, NULL, NULL, 0, username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), NULL, CREDUI_FLAGS_ALWAYS_SHOW_UI | CREDUI_FLAGS_GENERIC_CREDENTIALS); - ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_PARAMETER instead of %ld\n", ret); ret = CredUIPromptForCredentialsW(NULL, wszServerName, NULL, 0, username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), NULL, CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX); - ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_PARAMETER instead of %ld\n", ret); if (winetest_interactive) { @@ -81,11 +81,11 @@ static void test_CredUIPromptForCredentials(void) ARRAY_SIZE(username), password, ARRAY_SIZE(password), &save, CREDUI_FLAGS_EXPECT_CONFIRMATION); - ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %ld\n", ret); if (ret == ERROR_SUCCESS) { ret = CredUIConfirmCredentialsW(wszServerName, FALSE); - ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %ld\n", ret); } credui_info.pszCaptionText = L"CREDUI_FLAGS_EXPECT_CONFIRMATION"; @@ -93,11 +93,11 @@ static void test_CredUIPromptForCredentials(void) username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), &save, CREDUI_FLAGS_EXPECT_CONFIRMATION); - ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %ld\n", ret); if (ret == ERROR_SUCCESS) { ret = CredUIConfirmCredentialsW(wszServerName, FALSE); - ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %ld\n", ret); } credui_info.pszCaptionText = L"CREDUI_FLAGS_INCORRECT_PASSWORD|CREDUI_FLAGS_EXPECT_CONFIRMATION"; @@ -105,11 +105,11 @@ static void test_CredUIPromptForCredentials(void) username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), NULL, CREDUI_FLAGS_INCORRECT_PASSWORD|CREDUI_FLAGS_EXPECT_CONFIRMATION); - ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %ld\n", ret); if (ret == ERROR_SUCCESS) { ret = CredUIConfirmCredentialsW(wszServerName, FALSE); - ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %ld\n", ret); } @@ -119,7 +119,7 @@ static void test_CredUIPromptForCredentials(void) username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), &save, CREDUI_FLAGS_DO_NOT_PERSIST|CREDUI_FLAGS_EXPECT_CONFIRMATION); - ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %ld\n", ret); ok(save, "save flag should have been untouched\n"); save = FALSE; @@ -128,12 +128,12 @@ static void test_CredUIPromptForCredentials(void) username, ARRAY_SIZE(username), password, ARRAY_SIZE(password), &save, CREDUI_FLAGS_PERSIST|CREDUI_FLAGS_EXPECT_CONFIRMATION); - ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %ld\n", ret); ok(!save, "save flag should have been untouched\n"); if (ret == ERROR_SUCCESS) { ret = CredUIConfirmCredentialsW(wszServerName, FALSE); - ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); + ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %ld\n", ret); } } @@ -160,17 +160,17 @@ static void test_SspiPromptForCredentials(void) info.pszCaptionText = L"basic"; info.hbmBanner = NULL; ret = pSspiPromptForCredentialsW( NULL, &info, 0, L"basic", NULL, &id, &save, 0 ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ok( ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret ); ret = pSspiPromptForCredentialsW( L"SspiTest", &info, 0, NULL, NULL, &id, &save, 0 ); - ok( ret == ERROR_NO_SUCH_PACKAGE, "got %u\n", ret ); + ok( ret == ERROR_NO_SUCH_PACKAGE, "got %lu\n", ret ); if (winetest_interactive) { id = NULL; save = -1; ret = pSspiPromptForCredentialsW( L"SspiTest", &info, 0, L"basic", NULL, &id, &save, 0 ); - ok( ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "got %u\n", ret ); + ok( ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "got %lu\n", ret ); if (ret == ERROR_SUCCESS) { ok( id != NULL, "id not set\n" ); @@ -179,7 +179,7 @@ static void test_SspiPromptForCredentials(void) username = creds = NULL; domain = (const WCHAR *)0xdeadbeef; status = pSspiEncodeAuthIdentityAsStrings( id, &username, &domain, &creds ); - ok( status == SEC_E_OK, "got %u\n", status ); + ok( status == SEC_E_OK, "got %lu\n", status ); ok( username != NULL, "username not set\n" ); ok( domain == NULL, "domain not set\n" ); ok( creds != NULL, "creds not set\n" );

1 0

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

Feb. 23, 2022

Module: wine Branch: master Commit: 4e1c7cd007acac01b6490cc60bfdff3fe814d661 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e1c7cd007acac01b6490cc6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:11:23 2022 +0100 atl/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/atl/tests/Makefile.in | 2 +- dlls/atl/tests/atl_ax.c | 14 +++++++------- dlls/atl/tests/module.c | 28 ++++++++++++++-------------- dlls/atl/tests/registrar.c | 26 +++++++++++++------------- 4 files changed, 35 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4e1c7cd007acac01b649…

1 0

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

Feb. 23, 2022

Module: wine Branch: master Commit: 488505360e7d5d536526667bdfa158e80cf93e6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=488505360e7d5d536526667b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:10:58 2022 +0100 advpack/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/advpack/tests/Makefile.in | 1 - dlls/advpack/tests/advpack.c | 88 +++++++++++++++++++++--------------------- dlls/advpack/tests/files.c | 48 +++++++++++------------ dlls/advpack/tests/install.c | 50 ++++++++++++------------ 4 files changed, 93 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=488505360e7d5d536526…

1 0

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

Feb. 23, 2022

Module: wine Branch: master Commit: 339f4a3a70b0df6a17b07cc73fe8aecc64b7d3ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=339f4a3a70b0df6a17b07cc7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:10:51 2022 +0100 advapi32/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/advapi32/tests/Makefile.in | 1 - dlls/advapi32/tests/cred.c | 152 +-- dlls/advapi32/tests/crypt.c | 304 +++--- dlls/advapi32/tests/eventlog.c | 234 ++--- dlls/advapi32/tests/lsa.c | 108 +- dlls/advapi32/tests/perf.c | 52 +- dlls/advapi32/tests/registry.c | 1610 +++++++++++++++--------------- dlls/advapi32/tests/security.c | 2060 +++++++++++++++++++-------------------- dlls/advapi32/tests/service.c | 658 ++++++------- 9 files changed, 2589 insertions(+), 2590 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=339f4a3a70b0df6a17b0…

1 0

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

Feb. 23, 2022

Module: wine Branch: master Commit: 63bcb0f6098905f239864d3c0865daaa22ed440c URL: https://source.winehq.org/git/wine.git/?a=commit;h=63bcb0f6098905f239864d3c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:10:45 2022 +0100 adsldp/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/adsldp/tests/Makefile.in | 1 - dlls/adsldp/tests/ldap.c | 120 +++++++++++++++++++++--------------------- dlls/adsldp/tests/sysinfo.c | 50 +++++++++--------- 3 files changed, 85 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63bcb0f6098905f23986…

1 0

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

Feb. 23, 2022

Module: wine Branch: master Commit: b2de0f43a3dcd6f0f21c9494b5ddaa89c24219dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2de0f43a3dcd6f0f21c9494… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:11:11 2022 +0100 apphelp/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/apphelp/tests/Makefile.in | 1 - dlls/apphelp/tests/apphelp.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/apphelp/tests/Makefile.in b/dlls/apphelp/tests/Makefile.in index a1f28608371..2a05c019955 100644 --- a/dlls/apphelp/tests/Makefile.in +++ b/dlls/apphelp/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = apphelp.dll IMPORTS = ole32 diff --git a/dlls/apphelp/tests/apphelp.c b/dlls/apphelp/tests/apphelp.c index 81104d28512..dd01f7630ae 100644 --- a/dlls/apphelp/tests/apphelp.c +++ b/dlls/apphelp/tests/apphelp.c @@ -64,13 +64,13 @@ static void test_ApphelpCheckShellObject(void) flags = 0xdeadbeef; SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(objects[i], FALSE, &flags); - ok(res && (flags == 0), "%s 0: got %d and %s with 0x%x (expected TRUE and 0)\n", + ok(res && (flags == 0), "%s 0: got %d and %s with 0x%lx (expected TRUE and 0)\n", wine_dbgstr_guid(objects[i]), res, wine_dbgstr_longlong(flags), GetLastError()); flags = 0xdeadbeef; SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(objects[i], TRUE, &flags); - ok(res && (flags == 0), "%s 1: got %d and %s with 0x%x (expected TRUE and 0)\n", + ok(res && (flags == 0), "%s 1: got %d and %s with 0x%lx (expected TRUE and 0)\n", wine_dbgstr_guid(objects[i]), res, wine_dbgstr_longlong(flags), GetLastError()); } @@ -78,7 +78,7 @@ static void test_ApphelpCheckShellObject(void) /* NULL as pointer to flags is checked */ SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(&GUID_NULL, FALSE, NULL); - ok(res, "%s 0: got %d with 0x%x (expected != FALSE)\n", wine_dbgstr_guid(&GUID_NULL), res, GetLastError()); + ok(res, "%s 0: got %d with 0x%lx (expected != FALSE)\n", wine_dbgstr_guid(&GUID_NULL), res, GetLastError()); /* NULL as CLSID* crash on Windows */ if (0) @@ -86,7 +86,7 @@ static void test_ApphelpCheckShellObject(void) flags = 0xdeadbeef; SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(NULL, FALSE, &flags); - trace("NULL as CLSID*: got %d and %s with 0x%x\n", res, wine_dbgstr_longlong(flags), GetLastError()); + trace("NULL as CLSID*: got %d and %s with 0x%lx\n", res, wine_dbgstr_longlong(flags), GetLastError()); } }

1 0

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

Feb. 23, 2022

Module: wine Branch: master Commit: 78b6f417f90f5247f7a2b2ea59c3321f35e4990e URL: https://source.winehq.org/git/wine.git/?a=commit;h=78b6f417f90f5247f7a2b2ea… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:11:04 2022 +0100 amstream/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/amstream/tests/Makefile.in | 1 - dlls/amstream/tests/amstream.c | 3504 +++++++++++++++++++-------------------- 2 files changed, 1752 insertions(+), 1753 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=78b6f417f90f5247f7a2…

1 0

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

Feb. 23, 2022

Module: wine Branch: master Commit: 2021c98bad5f77302dd23aadadf0a1c406e31594 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2021c98bad5f77302dd23aad… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:11:53 2022 +0100 comsvcs/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/comsvcs/tests/Makefile.in | 1 - dlls/comsvcs/tests/comsvcs.c | 126 ++++++++++++++++++++--------------------- dlls/comsvcs/tests/property.c | 20 +++---- 3 files changed, 73 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2021c98bad5f77302dd2…

1 0

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

Feb. 23, 2022

Module: wine Branch: master Commit: e240aeb757e3d70285eac7bc13a4a46f62210896 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e240aeb757e3d70285eac7bc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:11:47 2022 +0100 comdlg32/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/comdlg32/tests/Makefile.in | 1 - dlls/comdlg32/tests/filedlg.c | 126 +++--- dlls/comdlg32/tests/finddlg.c | 2 +- dlls/comdlg32/tests/fontdlg.c | 8 +- dlls/comdlg32/tests/itemdlg.c | 936 ++++++++++++++++++++-------------------- dlls/comdlg32/tests/printdlg.c | 56 +-- 6 files changed, 564 insertions(+), 565 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e240aeb757e3d70285ea…

1 0

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

Feb. 23, 2022

Module: wine Branch: master Commit: cd4c58f588adfc3660a9d4f1c347da52c76a8e6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd4c58f588adfc3660a9d4f1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 09:11:41 2022 +0100 comcat/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/comcat/tests/Makefile.in | 1 - dlls/comcat/tests/comcat.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/comcat/tests/Makefile.in b/dlls/comcat/tests/Makefile.in index 905bb1dcd0c..51e92329a05 100644 --- a/dlls/comcat/tests/Makefile.in +++ b/dlls/comcat/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = comcat.dll IMPORTS = ole32 advapi32 diff --git a/dlls/comcat/tests/comcat.c b/dlls/comcat/tests/comcat.c index 97048cc46b8..b561756f9da 100644 --- a/dlls/comcat/tests/comcat.c +++ b/dlls/comcat/tests/comcat.c @@ -29,7 +29,7 @@ #include "wine/test.h" -#define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) +#define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error %#08lx\n", hr) static BOOL register_testentry(void) { @@ -88,8 +88,8 @@ static void do_enum(void) ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories"); hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched); - ok (hr == S_FALSE,"Expected S_FALSE, got 0x%08x\n", hr); - ok (fetched == 0,"Fetched wrong number of guids %u\n",fetched); + ok (hr == S_FALSE,"Expected S_FALSE, got 0x%08lx\n", hr); + ok (fetched == 0,"Fetched wrong number of guids %lu\n",fetched); IEnumGUID_Release(pIEnum); if (register_testentry()) @@ -98,8 +98,8 @@ static void do_enum(void) ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories"); hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched); - ok (hr == S_OK,"Expected S_OK, got 0x%08x\n", hr); - ok (fetched == 1,"Fetched wrong number of guids %u\n",fetched); + ok (hr == S_OK,"Expected S_OK, got 0x%08lx\n", hr); + ok (fetched == 1,"Fetched wrong number of guids %lu\n",fetched); ok (IsEqualGUID(the_guid,&wanted_guid),"Guids do not match\n"); IEnumGUID_Release(pIEnum);

1 0