Module: wine Branch: master Commit: 010315571e6371821b793f92f5162e2cc6921497 URL: https://source.winehq.org/git/wine.git/?a=commit;h=010315571e6371821b793f92f...
Author: Eric Pouech eric.pouech@gmail.com Date: Tue Mar 22 08:22:51 2022 +0100
ntdll/tests: Enable compilation with long types in path.c.
Signed-off-by: Eric Pouech eric.pouech@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ntdll/tests/path.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 5211945437c..dba42688e05 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */
#include "ntdll_test.h" #include "winnls.h" @@ -375,7 +376,7 @@ static void test_RtlGetFullPathName_U(void) file_part = (WCHAR *)0xdeadbeef; lstrcpyW(rbufferW, deadbeefW); ret = pRtlGetFullPathName_U(NULL, MAX_PATH, rbufferW, &file_part); - ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %u\n", ret); + ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %lu\n", ret); ok(!lstrcmpW(rbufferW, deadbeefW), "Expected the output buffer to be untouched, got %s\n", wine_dbgstr_w(rbufferW)); ok(file_part == (WCHAR *)0xdeadbeef || @@ -385,7 +386,7 @@ static void test_RtlGetFullPathName_U(void) file_part = (WCHAR *)0xdeadbeef; lstrcpyW(rbufferW, deadbeefW); ret = pRtlGetFullPathName_U(emptyW, MAX_PATH, rbufferW, &file_part); - ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %u\n", ret); + ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %lu\n", ret); ok(!lstrcmpW(rbufferW, deadbeefW), "Expected the output buffer to be untouched, got %s\n", wine_dbgstr_w(rbufferW)); ok(file_part == (WCHAR *)0xdeadbeef || @@ -398,7 +399,7 @@ static void test_RtlGetFullPathName_U(void) pRtlMultiByteToUnicodeN(pathbufW , sizeof(pathbufW), NULL, test->path, strlen(test->path)+1 ); ret = pRtlGetFullPathName_U( pathbufW,MAX_PATH, rbufferW, &file_part); ok( ret == len || (test->alt_rname && ret == strlen(test->alt_rname)*sizeof(WCHAR)), - "Wrong result %d/%d for "%s"\n", ret, len, test->path ); + "Wrong result %ld/%d for "%s"\n", ret, len, test->path ); ok(pRtlUnicodeToMultiByteN(rbufferA,MAX_PATH,&reslen,rbufferW,(lstrlenW(rbufferW) + 1) * sizeof(WCHAR)) == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); ok(!lstrcmpA(rbufferA,test->rname) || (test->alt_rname && !lstrcmpA(rbufferA,test->alt_rname)), @@ -580,7 +581,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) if (pRtlDosPathNameToNtPathName_U_WithStatus) { status = pRtlDosPathNameToNtPathName_U_WithStatus(error_paths[i], &nameW, &file_part, NULL); - ok(status == STATUS_OBJECT_NAME_INVALID, "Got status %#x.\n", status); + ok(status == STATUS_OBJECT_NAME_INVALID, "Got status %#lx.\n", status); }
winetest_pop_context(); @@ -600,7 +601,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) { RtlFreeUnicodeString(&nameW); status = pRtlDosPathNameToNtPathName_U_WithStatus(tests[i].dos, &nameW, &file_part, NULL); - ok(status == STATUS_SUCCESS, "%s: Got status %#x.\n", debugstr_w(tests[i].dos), status); + ok(status == STATUS_SUCCESS, "%s: Got status %#lx.\n", debugstr_w(tests[i].dos), status); }
ok(!wcscmp(nameW.Buffer, tests[i].nt) @@ -711,7 +712,7 @@ static void test_nt_names(void) if (handle) NtClose( handle ); todo_wine_if( tests[i].todo ) ok( status == tests[i].expect || broken( tests[i].broken && status == tests[i].broken ), - "%u: got %x / %x for %s + %s\n", i, status, tests[i].expect, + "%u: got %lx / %lx for %s + %s\n", i, status, tests[i].expect, debugstr_w( tests[i].root ), debugstr_w( tests[i].name )); } }