February 2022 - Wine-commits

Eric Pouech : localui/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: a33ac68a12ed917995b35d86bc596776056aee44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a33ac68a12ed917995b35d86… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:27:47 2022 +0100 localui/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localui/tests/Makefile.in | 1 - dlls/localui/tests/localui.c | 34 +++++++++++++++++----------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/localui/tests/Makefile.in b/dlls/localui/tests/Makefile.in index 9e4afd20e09..8f5cb77f291 100644 --- a/dlls/localui/tests/Makefile.in +++ b/dlls/localui/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = localui.dll IMPORTS = winspool diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index 23be8c779d1..28cecaabd50 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -68,10 +68,10 @@ static PORT_INFO_2W * find_portinfo2(LPCWSTR pPort) win_skip("The service 'Spooler' is required for many tests\n"); return NULL; } - ok(!res, "EnumPorts succeeded: got %d\n", res); + ok(!res, "EnumPorts succeeded: got %ld\n", res); pi_buffer = HeapAlloc(GetProcessHeap(), 0, pi_needed); res = EnumPortsW(NULL, 2, pi_buffer, pi_needed, &pi_needed, &pi_numports); - ok(res == 1, "EnumPorts failed: got %d\n", res); + ok(res == 1, "EnumPorts failed: got %ld\n", res); } if (pi_buffer) { pi = (PORT_INFO_2W *) pi_buffer; @@ -137,21 +137,21 @@ static void test_AddPortUI(void) res = pAddPortUI(NULL, NULL, NULL, NULL); ok( !res && ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), - "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " + "got %ld with %lu (expected '0' with: ERROR_UNKNOWN_PORT or " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); SetLastError(0xdeadbeef); res = pAddPortUI(NULL, NULL, L"", NULL); ok( !res && ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), - "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " + "got %ld with %lu (expected '0' with: ERROR_UNKNOWN_PORT or " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); SetLastError(0xdeadbeef); res = pAddPortUI(NULL, NULL, L"does_not_exist", NULL); ok( !res && ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), - "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " + "got %ld with %lu (expected '0' with: ERROR_UNKNOWN_PORT or " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); if (winetest_interactive) { @@ -170,7 +170,7 @@ static void test_AddPortUI(void) (GetLastError() == ERROR_CANCELLED) || (GetLastError() == ERROR_ACCESS_DENIED) || (GetLastError() == ERROR_NOT_SUPPORTED), - "got %d with %u and %p (expected '!= 0' or '0' with: " + "got %ld with %lu and %p (expected '!= 0' or '0' with: " "ERROR_CANCELLED, ERROR_ACCESS_DENIED or ERROR_NOT_SUPPORTED)\n", res, GetLastError(), new_portname); @@ -194,14 +194,14 @@ static void test_ConfigurePortUI(void) res = pConfigurePortUI(NULL, NULL, NULL); ok( !res && ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), - "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " + "got %ld with %lu (expected '0' with: ERROR_UNKNOWN_PORT or " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); SetLastError(0xdeadbeef); res = pConfigurePortUI(NULL, NULL, L""); ok( !res && ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), - "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " + "got %ld with %lu (expected '0' with: ERROR_UNKNOWN_PORT or " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); @@ -209,7 +209,7 @@ static void test_ConfigurePortUI(void) res = pConfigurePortUI(NULL, NULL, L"does_not_exist"); ok( !res && ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), - "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " + "got %ld with %lu (expected '0' with: ERROR_UNKNOWN_PORT or " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); if (winetest_interactive && lpt_present) { @@ -217,7 +217,7 @@ static void test_ConfigurePortUI(void) res = pConfigurePortUI(NULL, NULL, lpt_present->pPortName); ok( res || (GetLastError() == ERROR_CANCELLED) || (GetLastError() == ERROR_ACCESS_DENIED), - "got %d with %u (expected '!= 0' or '0' with: ERROR_CANCELLED or " + "got %ld with %lu (expected '!= 0' or '0' with: ERROR_CANCELLED or " "ERROR_ACCESS_DENIED)\n", res, GetLastError()); } @@ -226,7 +226,7 @@ static void test_ConfigurePortUI(void) res = pConfigurePortUI(NULL, NULL, lpt_absent); ok( !res && ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), - "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " + "got %ld with %lu (expected '0' with: ERROR_UNKNOWN_PORT or " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); } @@ -235,7 +235,7 @@ static void test_ConfigurePortUI(void) res = pConfigurePortUI(NULL, NULL, com_present->pPortName); ok( res || (GetLastError() == ERROR_CANCELLED) || (GetLastError() == ERROR_ACCESS_DENIED), - "got %d with %u (expected '!= 0' or '0' with: ERROR_CANCELLED or " + "got %ld with %lu (expected '!= 0' or '0' with: ERROR_CANCELLED or " "ERROR_ACCESS_DENIED)\n", res, GetLastError()); } @@ -244,7 +244,7 @@ static void test_ConfigurePortUI(void) res = pConfigurePortUI(NULL, NULL, com_absent); ok( !res && ((GetLastError() == ERROR_UNKNOWN_PORT) || (GetLastError() == ERROR_INVALID_PRINTER_NAME)), - "got %d with %u (expected '0' with: ERROR_UNKNOWN_PORT or " + "got %ld with %lu (expected '0' with: ERROR_UNKNOWN_PORT or " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); } @@ -254,7 +254,7 @@ static void test_ConfigurePortUI(void) res = pConfigurePortUI(NULL, NULL, L"FILE:"); ok( !res && ((GetLastError() == ERROR_CANCELLED) || (GetLastError() == ERROR_ACCESS_DENIED)), - "got %d with %u (expected '0' with: ERROR_CANCELLED or " + "got %ld with %lu (expected '0' with: ERROR_CANCELLED or " "ERROR_ACCESS_DENIED)\n", res, GetLastError()); } } @@ -281,7 +281,7 @@ START_TEST(localui) if (pui) { numentries = (pui->dwMonitorUISize - sizeof(DWORD)) / sizeof(VOID *); ok( numentries == 3, - "dwMonitorUISize (%d) => %d Functions\n", pui->dwMonitorUISize, numentries); + "dwMonitorUISize (%ld) => %ld Functions\n", pui->dwMonitorUISize, numentries); if (numentries > 2) { pAddPortUI = pui->pfnAddPortUI; @@ -302,7 +302,7 @@ START_TEST(localui) /* "LPT1:" - "LPT9:" */ while (((lpt_present == NULL) || (lpt_absent == NULL)) && id < 9) { id++; - sprintf(bufferA, "LPT%u:", id); + sprintf(bufferA, "LPT%lu:", id); MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); pi2 = find_portinfo2(bufferW); if (pi2 && (lpt_present == NULL)) lpt_present = pi2; @@ -313,7 +313,7 @@ START_TEST(localui) /* "COM1:" - "COM9:" */ while (((com_present == NULL) || (com_absent == NULL)) && id < 9) { id++; - sprintf(bufferA, "COM%u:", id); + sprintf(bufferA, "COM%lu:", id); MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); pi2 = find_portinfo2(bufferW); if (pi2 && (com_present == NULL)) com_present = pi2;

1 0

Eric Pouech : lz32/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 74ea292150c49fac463059dda28389ae0994b765 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74ea292150c49fac463059dd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:27:53 2022 +0100 lz32/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/lz32/tests/Makefile.in | 1 - dlls/lz32/tests/lzexpand_main.c | 48 ++++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/lz32/tests/Makefile.in b/dlls/lz32/tests/Makefile.in index 9bb8a580efe..27e7c57c546 100644 --- a/dlls/lz32/tests/Makefile.in +++ b/dlls/lz32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = lz32.dll IMPORTS = lz32 diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 3c80bc09a6b..348fc056e3d 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -74,7 +74,7 @@ static void full_file_path_name_in_a_CWD(const char *src, char *dst, BOOL expect char shortname[MAX_PATH]; retval = GetCurrentDirectoryA(MAX_PATH, dst); - ok(retval > 0, "GetCurrentDirectoryA returned %d, GLE=%d\n", + ok(retval > 0, "GetCurrentDirectoryA returned %ld, GLE=%ld\n", retval, GetLastError()); if(dst[retval-1] != '\\') /* Append backslash only when it's missing */ @@ -84,7 +84,7 @@ static void full_file_path_name_in_a_CWD(const char *src, char *dst, BOOL expect { memcpy(shortname, dst, MAX_PATH); retval = GetShortPathNameA(shortname, dst, MAX_PATH-1); - ok(retval > 0, "GetShortPathNameA returned %d for '%s', GLE=%d\n", + ok(retval > 0, "GetShortPathNameA returned %ld for '%s', GLE=%ld\n", retval, dst, GetLastError()); } } @@ -99,7 +99,7 @@ static void create_file(char *fname) ok(file >= 0, "LZOpenFileA failed to create '%s'\n", fname); LZClose(file); retval = GetFileAttributesA(fname); - ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA('%s'): error %d\n", ofs.szPathName, GetLastError()); + ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA('%s'): error %ld\n", ofs.szPathName, GetLastError()); } static void delete_file(char *fname) @@ -228,7 +228,7 @@ static void test_LZOpenFileA_nonexisting_compressed(void) ok(file == LZERROR_BADINHANDLE, "LZOpenFileA succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "GetLastError() returns %d\n", GetLastError()); + "GetLastError() returns %ld\n", GetLastError()); ok(test.cBytes == 0xA5, "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -247,7 +247,7 @@ static void test_LZOpenFileA_nonexisting_compressed(void) ok(file == LZERROR_BADINHANDLE, "LZOpenFileA succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "GetLastError() returns %d\n", GetLastError()); + "GetLastError() returns %ld\n", GetLastError()); ok(test.cBytes == 0xA5, "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -266,7 +266,7 @@ static void test_LZOpenFileA_nonexisting_compressed(void) ok(file == LZERROR_BADINHANDLE, "LZOpenFileA succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "GetLastError() returns %d\n", GetLastError()); + "GetLastError() returns %ld\n", GetLastError()); ok(test.cBytes == 0xA5, "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -285,7 +285,7 @@ static void test_LZOpenFileA_nonexisting_compressed(void) ok(file == LZERROR_BADINHANDLE, "LZOpenFileA succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "GetLastError() returns %d\n", GetLastError()); + "GetLastError() returns %ld\n", GetLastError()); ok(test.cBytes == 0xA5, "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -310,7 +310,7 @@ static void test_LZOpenFileA(void) ok(file == LZERROR_BADINHANDLE, "LZOpenFileA succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "GetLastError() returns %d\n", GetLastError()); + "GetLastError() returns %ld\n", GetLastError()); LZClose(file); memset(&test, 0xA5, sizeof(test)); @@ -329,7 +329,7 @@ static void test_LZOpenFileA(void) LZClose(file); retval = GetFileAttributesA(filename_); - ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %d\n", + ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); /* Check various opening options: */ @@ -424,7 +424,7 @@ static void test_LZRead(void) file = CreateFileA(filename_, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); ok(file != INVALID_HANDLE_VALUE, "Could not create test file\n"); retok = WriteFile(file, compressed_file, compressed_file_size, &ret, 0); - ok( retok, "WriteFile: error %d\n", GetLastError()); + ok( retok, "WriteFile: error %ld\n", GetLastError()); ok(ret == compressed_file_size, "Wrote wrong number of bytes with WriteFile?\n"); CloseHandle(file); @@ -447,7 +447,7 @@ static void test_LZRead(void) LZClose(cfile); ret = DeleteFileA(filename_); - ok(ret, "DeleteFileA: error %d\n", GetLastError()); + ok(ret, "DeleteFileA: error %ld\n", GetLastError()); } static void test_LZCopy(void) @@ -461,9 +461,9 @@ static void test_LZCopy(void) /* Create the compressed file. */ file = CreateFileA(filename_, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); ok(file != INVALID_HANDLE_VALUE, - "CreateFileA: error %d\n", GetLastError()); + "CreateFileA: error %ld\n", GetLastError()); retok = WriteFile(file, compressed_file, compressed_file_size, &ret, 0); - ok( retok, "WriteFile error %d\n", GetLastError()); + ok( retok, "WriteFile error %ld\n", GetLastError()); ok(ret == compressed_file_size, "Wrote wrong number of bytes\n"); CloseHandle(file); @@ -480,19 +480,19 @@ static void test_LZCopy(void) file = CreateFileA(filename2, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); ok(file != INVALID_HANDLE_VALUE, - "CreateFileA: error %d\n", GetLastError()); + "CreateFileA: error %ld\n", GetLastError()); retok = ReadFile(file, buf, uncompressed_data_size*2, &ret, 0); - ok( retok && ret == uncompressed_data_size, "ReadFile: error %d\n", GetLastError()); + ok( retok && ret == uncompressed_data_size, "ReadFile: error %ld\n", GetLastError()); /* Compare what we read with what we think we should read. */ ok(!memcmp(buf, uncompressed_data, uncompressed_data_size), "buffer contents mismatch\n"); CloseHandle(file); ret = DeleteFileA(filename_); - ok(ret, "DeleteFileA: error %d\n", GetLastError()); + ok(ret, "DeleteFileA: error %ld\n", GetLastError()); ret = DeleteFileA(filename2); - ok(ret, "DeleteFileA: error %d\n", GetLastError()); + ok(ret, "DeleteFileA: error %ld\n", GetLastError()); } static void create_fileW(WCHAR *fnameW) @@ -505,7 +505,7 @@ static void create_fileW(WCHAR *fnameW) ok(file >= 0, "LZOpenFileW failed on creation\n"); LZClose(file); retval = GetFileAttributesW(fnameW); - ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributesW('%s'): error %d\n", ofs.szPathName, GetLastError()); + ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributesW('%s'): error %ld\n", ofs.szPathName, GetLastError()); } static void delete_fileW(WCHAR *fnameW) @@ -628,7 +628,7 @@ static void test_LZOpenFileW_nonexisting_compressed(void) ok(file == LZERROR_BADINHANDLE, "LZOpenFileW succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "GetLastError() returns %d\n", GetLastError()); + "GetLastError() returns %ld\n", GetLastError()); ok(test.cBytes == 0xA5, "LZOpenFileW set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -647,7 +647,7 @@ static void test_LZOpenFileW_nonexisting_compressed(void) ok(file == LZERROR_BADINHANDLE, "LZOpenFileW succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "GetLastError() returns %d\n", GetLastError()); + "GetLastError() returns %ld\n", GetLastError()); ok(test.cBytes == 0xA5, "LZOpenFileW set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -666,7 +666,7 @@ static void test_LZOpenFileW_nonexisting_compressed(void) ok(file == LZERROR_BADINHANDLE, "LZOpenFileW succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "GetLastError() returns %d\n", GetLastError()); + "GetLastError() returns %ld\n", GetLastError()); ok(test.cBytes == 0xA5, "LZOpenFileW set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -685,7 +685,7 @@ static void test_LZOpenFileW_nonexisting_compressed(void) ok(file == LZERROR_BADINHANDLE, "LZOpenFileW succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "GetLastError() returns %d\n", GetLastError()); + "GetLastError() returns %ld\n", GetLastError()); ok(test.cBytes == 0xA5, "LZOpenFileW set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -712,7 +712,7 @@ static void test_LZOpenFileW(void) return; } ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "GetLastError() returns %d\n", GetLastError()); + "GetLastError() returns %ld\n", GetLastError()); ok(file == LZERROR_BADINHANDLE, "LZOpenFileW succeeded on nonexistent file\n"); LZClose(file); @@ -732,7 +732,7 @@ static void test_LZOpenFileW(void) LZClose(file); retval = GetFileAttributesW(filenameW_); - ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributes: error %d\n", + ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributes: error %ld\n", GetLastError()); /* Check various opening options: */

1 0

Eric Pouech : mapi32/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 739c5192deddc0882733d5aeaae06b23e7437a29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=739c5192deddc0882733d5ae… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:27:59 2022 +0100 mapi32/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/mapi32/tests/Makefile.in | 1 - dlls/mapi32/tests/imalloc.c | 8 +-- dlls/mapi32/tests/prop.c | 114 +++++++++++++++++++++--------------------- dlls/mapi32/tests/util.c | 8 +-- 4 files changed, 65 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=739c5192deddc0882733…

1 0

Eric Pouech : kernelbase/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: c0096afdb72825180eec5f87c046cbc428b3d2f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0096afdb72825180eec5f87… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:27:35 2022 +0100 kernelbase/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/kernelbase/tests/Makefile.in | 1 - dlls/kernelbase/tests/path.c | 274 +++++++++++++++++++------------------- dlls/kernelbase/tests/process.c | 20 +-- dlls/kernelbase/tests/sync.c | 28 ++-- 4 files changed, 161 insertions(+), 162 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0096afdb72825180eec…

1 0

Eric Pouech : jsproxy/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 510542bdefea5f9a11ec5a18ce32917e4c441407 URL: https://source.winehq.org/git/wine.git/?a=commit;h=510542bdefea5f9a11ec5a18… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:27:21 2022 +0100 jsproxy/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/jsproxy/tests/Makefile.in | 1 - dlls/jsproxy/tests/jsproxy.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/jsproxy/tests/Makefile.in b/dlls/jsproxy/tests/Makefile.in index 216fbb34cd9..356947694d3 100644 --- a/dlls/jsproxy/tests/Makefile.in +++ b/dlls/jsproxy/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = jsproxy.dll IMPORTS = jsproxy diff --git a/dlls/jsproxy/tests/jsproxy.c b/dlls/jsproxy/tests/jsproxy.c index d1c905c2e99..59b3c5dfb9e 100644 --- a/dlls/jsproxy/tests/jsproxy.c +++ b/dlls/jsproxy/tests/jsproxy.c @@ -49,48 +49,48 @@ static void test_InternetInitializeAutoProxyDll(void) ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); err = GetLastError(); ok( !ret, "unexpected success\n" ); - ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); buf.dwScriptBufferSize = strlen(script) + 1; ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy ); GlobalFree( proxy ); buf.dwScriptBufferSize = strlen(script2) + 1; buf.lpszScriptBuffer = script2; ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ok( !strcmp( proxy, "PROXY 10.0.0.1:8080" ), "got \"%s\"\n", proxy ); GlobalFree( proxy ); buf.dwScriptBufferSize = strlen(script2) + 2; ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ok( !strcmp( proxy, "PROXY 10.0.0.1:8080" ), "got \"%s\"\n", proxy ); GlobalFree( proxy ); buf.lpszScriptBuffer = script3; buf.dwScriptBufferSize = strlen(script3); ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); - ok( ret || broken(old_jsproxy && !ret), "got %u\n", GetLastError() ); + ok( ret || broken(old_jsproxy && !ret), "got %lu\n", GetLastError() ); buf.dwScriptBufferSize = 1; script3[0] = 0; ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ret = pInternetDeInitializeAutoProxyDll( NULL, 0 ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); } static void test_InternetGetProxyInfo(void) @@ -106,48 +106,48 @@ static void test_InternetGetProxyInfo(void) ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); err = GetLastError(); ok( !ret, "unexpected success\n" ); - ok( err == ERROR_CAN_NOT_COMPLETE, "got %u\n", err ); + ok( err == ERROR_CAN_NOT_COMPLETE, "got %lu\n", err ); buf.dwStructSize = sizeof(buf); buf.lpszScriptBuffer = script; buf.dwScriptBufferSize = strlen(script) + 1; ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); len = 0; proxy = NULL; ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy ); - ok( len == strlen("DIRECT") + 1, "got %u\n", len ); + ok( len == strlen("DIRECT") + 1, "got %lu\n", len ); GlobalFree( proxy ); len = 0; proxy = NULL; ret = pInternetGetProxyInfo( url, strlen(url) + 1, host, strlen(host), &proxy, &len ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy ); - ok( len == strlen("DIRECT") + 1, "got %u\n", len ); + ok( len == strlen("DIRECT") + 1, "got %lu\n", len ); GlobalFree( proxy ); len = 0; proxy = NULL; ret = pInternetGetProxyInfo( url, strlen(url) - 1, host, strlen(host), &proxy, &len ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy ); - ok( len == strlen("DIRECT") + 1, "got %u\n", len ); + ok( len == strlen("DIRECT") + 1, "got %lu\n", len ); GlobalFree( proxy ); len = 0; proxy = NULL; ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host) + 1, &proxy, &len ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy ); - ok( len == strlen("DIRECT") + 1, "got %u\n", len ); + ok( len == strlen("DIRECT") + 1, "got %lu\n", len ); GlobalFree( proxy ); ret = pInternetDeInitializeAutoProxyDll( NULL, 0 ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); } START_TEST(jsproxy)

1 0

Eric Pouech : localspl/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 27a22e2accf645c6b8e49b9b4bf47339c376cd7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=27a22e2accf645c6b8e49b9b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:27:41 2022 +0100 localspl/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/tests/Makefile.in | 1 - dlls/localspl/tests/localmon.c | 250 ++++++++++++++++++++-------------------- 2 files changed, 125 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=27a22e2accf645c6b8e4…

1 0

Eric Pouech : itss/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: e34414905c3e65d6eb7be700fd8730eaf45ab35a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e34414905c3e65d6eb7be700… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:27:09 2022 +0100 itss/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/itss/tests/Makefile.in | 1 - dlls/itss/tests/protocol.c | 130 ++++++++++++++++++++++---------------------- 2 files changed, 65 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e34414905c3e65d6eb7b…

1 0

Eric Pouech : infosoft/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 7ebbc4f8cd438a22fc7b039c7b4d3b12a0270490 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ebbc4f8cd438a22fc7b039c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:26:57 2022 +0100 infosoft/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/infosoft/tests/Makefile.in | 1 - dlls/infosoft/tests/infosoft.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/infosoft/tests/Makefile.in b/dlls/infosoft/tests/Makefile.in index 037957adef9..971d67b9f48 100644 --- a/dlls/infosoft/tests/Makefile.in +++ b/dlls/infosoft/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = infosoft.dll IMPORTS = ole32 diff --git a/dlls/infosoft/tests/infosoft.c b/dlls/infosoft/tests/infosoft.c index 996af73ca20..72b33f25ce7 100644 --- a/dlls/infosoft/tests/infosoft.c +++ b/dlls/infosoft/tests/infosoft.c @@ -76,10 +76,10 @@ static HRESULT WINAPI ws_PutWord(IWordSink *iface, ULONG cwc, const WCHAR *pwcIn winetest_push_context("word %d", wordnum); if (wordnum < ARRAY_SIZE(testres)) { - ok(testres[wordnum].len == cwcSrcLen, "expected length %d, got %d\n", + ok(testres[wordnum].len == cwcSrcLen, "expected length %d, got %ld\n", testres[wordnum].len, cwcSrcLen); ok(!cwcSrcPos || (testres[wordnum].ofs == cwcSrcPos), - "expected offset %d, got %d\n", testres[wordnum].ofs, cwcSrcPos); + "expected offset %d, got %ld\n", testres[wordnum].ofs, cwcSrcPos); ok(!memcmp(testres[wordnum].data, pwcInBuf, cwcSrcLen), "expected data %s, got %s\n", wine_dbgstr_wn(testres[wordnum].data, cwcSrcLen), @@ -176,7 +176,7 @@ START_TEST(infosoft) TEXT_SOURCE ts; r = CoInitialize(NULL); - ok( r == S_OK, "failed: %08x\n", r); + ok( r == S_OK, "failed: %08lx\n", r); r = CoCreateInstance( &CLSID_wb_neutral, NULL, CLSCTX_INPROC_SERVER, &_IID_IWordBreaker, (LPVOID)&wb); @@ -194,7 +194,7 @@ START_TEST(infosoft) ts.iEnd = lstrlenW(ts.awcBuffer); ts.iCur = 0; r = IWordBreaker_BreakText(wb, &ts, &wordsink.IWordSink_iface, NULL); - ok( r == S_OK, "failed: %08x\n", r); + ok( r == S_OK, "failed: %08lx\n", r); ok(wordnum == 4, "expected 4 words, got %d\n", wordnum); @@ -205,10 +205,10 @@ START_TEST(infosoft) ts.iCur = 0; r = fillbuf_many(&ts); - ok( r == S_OK, "failed: %08x\n", r); + ok( r == S_OK, "failed: %08lx\n", r); r = IWordBreaker_BreakText(wb, &ts, &wordsink.IWordSink_iface, NULL); - ok( r == S_OK, "failed: %08x\n", r); + ok( r == S_OK, "failed: %08lx\n", r); ok(wordnum == 4, "expected 4 words, got %d\n", wordnum); IWordBreaker_Release( wb );

1 0

Eric Pouech : iphlpapi/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 0c25cf0a0840f9b890dd3c37783f03b06ac143cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c25cf0a0840f9b890dd3c37… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:27:03 2022 +0100 iphlpapi/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/Makefile.in | 1 - dlls/iphlpapi/tests/iphlpapi.c | 946 ++++++++++++++++++++-------------------- 2 files changed, 473 insertions(+), 474 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c25cf0a0840f9b890dd…

1 0

Eric Pouech : inetmib1/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 34c2e56d1bffc087290fa767532f9930901501cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=34c2e56d1bffc087290fa767… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:26:51 2022 +0100 inetmib1/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/inetmib1/tests/Makefile.in | 1 - dlls/inetmib1/tests/main.c | 58 ++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/inetmib1/tests/Makefile.in b/dlls/inetmib1/tests/Makefile.in index 82417f742ce..9229fb660a8 100644 --- a/dlls/inetmib1/tests/Makefile.in +++ b/dlls/inetmib1/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = inetmib1.dll IMPORTS = snmpapi diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index 32785fcc3fe..25ff35fe41e 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -65,7 +65,7 @@ if (0) /* crashes on native */ } ret = pSnmpExtensionInit(0, &event, &oid); - ok(ret, "SnmpExtensionInit failed: %d\n", GetLastError()); + ok(ret, "SnmpExtensionInit failed: %ld\n", GetLastError()); ok(!strcmp("1.3.6.1.2.1.1", SnmpUtilOidToA(&oid)), "Expected 1.3.6.1.2.1.1, got %s\n", SnmpUtilOidToA(&oid)); @@ -115,10 +115,10 @@ if (0) /* crashes on native */ error = 0xdeadbeef; index = 0xdeadbeef; ret = pSnmpExtensionQuery(SNMP_PDU_GET, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); + ok(ret, "SnmpExtensionQuery failed: %ld, %ld\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, - "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); - ok(index == 0, "expected index 0, got %d\n", index); + "expected SNMP_ERRORSTATUS_NOERROR, got %ld\n", error); + ok(index == 0, "expected index 0, got %ld\n", index); /* Oddly enough, this "succeeds," even though the OID is clearly * unsupported. @@ -132,15 +132,15 @@ if (0) /* crashes on native */ error = 0xdeadbeef; index = 0xdeadbeef; ret = pSnmpExtensionQuery(SNMP_PDU_GET, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); + ok(ret, "SnmpExtensionQuery failed: %ld, %ld\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR || broken(error == ERROR_FILE_NOT_FOUND) /* NT4 */, - "expected SNMP_ERRORSTATUS_NOERROR or ERROR_FILE_NOT_FOUND, got %d\n", + "expected SNMP_ERRORSTATUS_NOERROR or ERROR_FILE_NOT_FOUND, got %ld\n", error); if (error == SNMP_ERRORSTATUS_NOERROR) - ok(index == 0, "expected index 0, got %d\n", index); + ok(index == 0, "expected index 0, got %ld\n", index); else if (error == ERROR_FILE_NOT_FOUND) - ok(index == 1, "expected index 1, got %d\n", index); + ok(index == 1, "expected index 1, got %ld\n", index); /* The OID isn't changed either: */ ok(!strcmp("1.2.3.4", SnmpUtilOidToA(&vars[0].name)), "expected 1.2.3.4, got %s\n", SnmpUtilOidToA(&vars[0].name)); @@ -152,11 +152,11 @@ if (0) /* crashes on native */ error = 0xdeadbeef; index = 0xdeadbeef; ret = pSnmpExtensionQuery(SNMP_PDU_GET, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); + ok(ret, "SnmpExtensionQuery failed: %ld, %ld\n", error, index); ok(error == SNMP_ERRORSTATUS_NOSUCHNAME, - "expected SNMP_ERRORSTATUS_NOSUCHNAME, got %d\n", error); + "expected SNMP_ERRORSTATUS_NOSUCHNAME, got %ld\n", error); /* The index is 1-based rather than 0-based */ - ok(index == 1, "expected index 1, got %d\n", index); + ok(index == 1, "expected index 1, got %ld\n", index); /* A Get fails on something that specifies a table (but not a particular * entry in it)... @@ -172,10 +172,10 @@ if (0) /* crashes on native */ error = 0xdeadbeef; index = 0xdeadbeef; ret = pSnmpExtensionQuery(SNMP_PDU_GET, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); + ok(ret, "SnmpExtensionQuery failed: %ld, %ld\n", error, index); ok(error == SNMP_ERRORSTATUS_NOSUCHNAME, - "expected SNMP_ERRORSTATUS_NOSUCHNAME, got %d\n", error); - ok(index == 1, "expected index 1, got %d\n", index); + "expected SNMP_ERRORSTATUS_NOSUCHNAME, got %ld\n", error); + ok(index == 1, "expected index 1, got %ld\n", index); /* but a GetNext succeeds with the same values, because GetNext gets the * entry after the specified OID, not the entry specified by it. The * successor to the table is the first entry in the table. @@ -194,10 +194,10 @@ if (0) /* crashes on native */ error = 0xdeadbeef; index = 0xdeadbeef; ret = pSnmpExtensionQuery(SNMP_PDU_GETNEXT, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); + ok(ret, "SnmpExtensionQuery failed: %ld, %ld\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, - "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); - ok(index == 0, "expected index 0, got %d\n", index); + "expected SNMP_ERRORSTATUS_NOERROR, got %ld\n", error); + ok(index == 0, "expected index 0, got %ld\n", index); if (!ret) moreData = FALSE; else if (error) @@ -276,10 +276,10 @@ if (0) /* crashes on native */ list.list = vars2; noChange = FALSE; ret = pSnmpExtensionQuery(SNMP_PDU_GETNEXT, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); + ok(ret, "SnmpExtensionQuery failed: %ld, %ld\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, - "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); - ok(index == 0, "expected index 0, got %d\n", index); + "expected SNMP_ERRORSTATUS_NOERROR, got %ld\n", error); + ok(index == 0, "expected index 0, got %ld\n", index); vars3[0].name.idLength = ARRAY_SIZE(mib2If); vars3[0].name.ids = mib2If; ok(!SnmpUtilOidNCmp(&vars2[0].name, &vars[0].name, vars[0].name.idLength) || @@ -298,10 +298,10 @@ if (0) /* crashes on native */ moreData = TRUE; do { ret = pSnmpExtensionQuery(SNMP_PDU_GETNEXT, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); + ok(ret, "SnmpExtensionQuery failed: %ld, %ld\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, - "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); - ok(index == 0, "expected index 0, got %d\n", index); + "expected SNMP_ERRORSTATUS_NOERROR, got %ld\n", error); + ok(index == 0, "expected index 0, got %ld\n", index); if (!ret) moreData = FALSE; else if (error) @@ -364,10 +364,10 @@ if (0) /* crashes on native */ noChange = FALSE; do { ret = pSnmpExtensionQuery(SNMP_PDU_GETNEXT, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); + ok(ret, "SnmpExtensionQuery failed: %ld, %ld\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, - "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); - ok(index == 0, "expected index 0, got %d\n", index); + "expected SNMP_ERRORSTATUS_NOERROR, got %ld\n", error); + ok(index == 0, "expected index 0, got %ld\n", index); if (!ret) moreData = FALSE; else if (error) @@ -430,7 +430,7 @@ if (0) /* crashes on native */ noChange = FALSE; do { ret = pSnmpExtensionQuery(SNMP_PDU_GETNEXT, &list, &error, &index); - ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); + ok(ret, "SnmpExtensionQuery failed: %ld, %ld\n", error, index); /* FIXME: error and index aren't checked here because the UDP table is * the last OID currently supported by Wine, so the last GetNext fails. * todo_wine is also not effective because it will succeed for all but @@ -439,8 +439,8 @@ if (0) /* crashes on native */ */ if (0) { ok(error == SNMP_ERRORSTATUS_NOERROR, - "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); - ok(index == 0, "expected index 0, got %d\n", index); + "expected SNMP_ERRORSTATUS_NOERROR, got %ld\n", error); + ok(index == 0, "expected index 0, got %ld\n", index); } if (!ret) moreData = FALSE;

1 0