[PATCH] dlls/ntdll/tests/atom.c: enable compilation with long types
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/atom.c | 187 ++++++++++++++++++++++++----------------------- 1 file changed, 94 insertions(+), 93 deletions(-) diff --git a/dlls/ntdll/tests/atom.c b/dlls/ntdll/tests/atom.c index 6bb789867bf..f93194d450f 100644 --- a/dlls/ntdll/tests/atom.c +++ b/dlls/ntdll/tests/atom.c @@ -20,6 +20,7 @@ * We use function pointers here as there is no import library for NTDLL on * windows. */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdio.h> #include <stdarg.h> @@ -100,30 +101,30 @@ static DWORD WINAPI RtlAtomTestThread(LPVOID Table) WCHAR Name[64]; res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &Atom); - ok(!res, "Unable to find atom from another thread, retval: %x\n", res); + ok(!res, "Unable to find atom from another thread, retval: %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom2, &Atom); - ok(!res, "Unable to lookup pinned atom in table, retval: %x\n", res); + ok(!res, "Unable to lookup pinned atom in table, retval: %lx\n", res); res = pRtlQueryAtomInAtomTable(AtomTable, Atom, &RefCount, &PinCount, Name, &Len); - ok(res == STATUS_BUFFER_TOO_SMALL, "We got wrong retval: %x\n", res); + ok(res == STATUS_BUFFER_TOO_SMALL, "We got wrong retval: %lx\n", res); Len = 64; res = pRtlQueryAtomInAtomTable(AtomTable, Atom, &RefCount, &PinCount, Name, &Len); - ok(!res, "Failed with long enough buffer, retval: %x\n", res); - ok(RefCount == 1, "Refcount was not 1 but %x\n", RefCount); - ok(PinCount == 1, "Pincount was not 1 but %x\n", PinCount); + ok(!res, "Failed with long enough buffer, retval: %lx\n", res); + ok(RefCount == 1, "Refcount was not 1 but %lx\n", RefCount); + ok(PinCount == 1, "Pincount was not 1 but %lx\n", PinCount); ok(!lstrcmpW(Name, testAtom2), "We found wrong atom!!\n"); - ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %d\n", Len); + ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %ld\n", Len); Len = 64; res = pRtlQueryAtomInAtomTable(AtomTable, Atom, NULL, NULL, Name, &Len); - ok(!res, "RtlQueryAtomInAtomTable with optional args invalid failed, retval: %x\n", res); + ok(!res, "RtlQueryAtomInAtomTable with optional args invalid failed, retval: %lx\n", res); ok(!lstrcmpW(Name, testAtom2), "Found Wrong atom!\n"); - ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %d\n", Len); + ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %ld\n", Len); res = pRtlPinAtomInAtomTable(AtomTable, Atom); - ok(!res, "Unable to pin atom in atom table, retval: %x\n", res); + ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res); return 0; } @@ -145,39 +146,39 @@ static void test_NtAtom(void) if (!res) { res = pRtlDestroyAtomTable(AtomTable); - ok(!res, "We could create the atom table, but we couldn't destroy it! retval: %x\n", res); + ok(!res, "We could create the atom table, but we couldn't destroy it! retval: %lx\n", res); } AtomTable = NULL; res = pRtlCreateAtomTable(37, &AtomTable); - ok(!res, "We're unable to create an atom table with a valid table size retval: %x\n", res); + ok(!res, "We're unable to create an atom table with a valid table size retval: %lx\n", res); if (!res) { - ok( *(DWORD *)AtomTable == 0x6d6f7441, "wrong signature %x\n", *(DWORD *)AtomTable ); + ok( *(DWORD *)AtomTable == 0x6d6f7441, "wrong signature %lx\n", *(DWORD *)AtomTable ); res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom1); - ok(!res, "We were unable to add a simple atom to the atom table, retval: %x\n", res); + ok(!res, "We were unable to add a simple atom to the atom table, retval: %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1Cap, &testAtom); - ok(!res, "We were unable to find capital version of the atom, retval: %x\n", res); + ok(!res, "We were unable to find capital version of the atom, retval: %lx\n", res); ok(Atom1 == testAtom, "Found wrong atom in table when querying capital atom\n"); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1Low, &testAtom); - ok(!res, "Unable to find lowercase version of the atom, retval: %x\n", res); + ok(!res, "Unable to find lowercase version of the atom, retval: %lx\n", res); ok(testAtom == Atom1, "Found wrong atom when querying lowercase atom\n"); res = pRtlAddAtomToAtomTable(AtomTable, EmptyAtom, &testEAtom); - ok(res == STATUS_OBJECT_NAME_INVALID, "Got wrong retval, retval: %x\n", res); + ok(res == STATUS_OBJECT_NAME_INVALID, "Got wrong retval, retval: %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom); - ok(!res, "Failed to find totally legitimate atom, retval: %x\n", res); + ok(!res, "Failed to find totally legitimate atom, retval: %lx\n", res); ok(testAtom == Atom1, "Found wrong atom!\n"); res = pRtlAddAtomToAtomTable(AtomTable, testAtom2, &Atom2); - ok(!res, "Unable to add other legitimate atom to table, retval: %x\n", res); + ok(!res, "Unable to add other legitimate atom to table, retval: %lx\n", res); res = pRtlPinAtomInAtomTable(AtomTable, Atom2); - ok(!res, "Unable to pin atom in atom table, retval: %x\n", res); + ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res); testThread = CreateThread(NULL, 0, RtlAtomTestThread, &AtomTable, 0, NULL); WaitForSingleObject(testThread, INFINITE); @@ -185,28 +186,28 @@ static void test_NtAtom(void) Len = 64; res = pRtlQueryAtomInAtomTable(AtomTable, Atom2, &RefCount, &PinCount, Name, &Len); - ok(!res, "Unable to query atom in atom table, retval: %x\n", res); - ok(RefCount == 1, "RefCount is not 1 but %x\n", RefCount); - ok(PinCount == 1, "PinCount is not 1 but %x\n", PinCount); + ok(!res, "Unable to query atom in atom table, retval: %lx\n", res); + ok(RefCount == 1, "RefCount is not 1 but %lx\n", RefCount); + ok(PinCount == 1, "PinCount is not 1 but %lx\n", PinCount); ok(!lstrcmpW(Name, testAtom2), "We found wrong atom\n"); - ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %d\n", Len); + ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %ld\n", Len); res = pRtlEmptyAtomTable(AtomTable, FALSE); - ok(!res, "Unable to empty atom table, retval %x\n", res); + ok(!res, "Unable to empty atom table, retval %lx\n", res); Len = 64; res = pRtlQueryAtomInAtomTable(AtomTable, Atom2, &RefCount, &PinCount, Name, &Len); - ok(!res, "It seems RtlEmptyAtomTable deleted our pinned atom eaven though we asked it not to, retval: %x\n", res); - ok(RefCount == 1, "RefCount is not 1 but %x\n", RefCount); - ok(PinCount == 1, "PinCount is not 1 but %x\n", PinCount); + ok(!res, "It seems RtlEmptyAtomTable deleted our pinned atom eaven though we asked it not to, retval: %lx\n", res); + ok(RefCount == 1, "RefCount is not 1 but %lx\n", RefCount); + ok(PinCount == 1, "PinCount is not 1 but %lx\n", PinCount); ok(!lstrcmpW(Name, testAtom2), "We found wrong atom\n"); - ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %d\n", Len); + ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %ld\n", Len); Len = 8; Name[0] = Name[1] = Name[2] = Name[3] = Name[4] = 0x1337; res = pRtlQueryAtomInAtomTable(AtomTable, Atom2, NULL, NULL, Name, &Len); - ok(!res, "query atom %x\n", res); - ok(Len == 6, "wrong length %u\n", Len); + ok(!res, "query atom %lx\n", res); + ok(Len == 6, "wrong length %lu\n", Len); ok(!memcmp(Name, testAtom2, Len), "wrong atom string\n"); ok(!Name[3], "wrong string termination\n"); ok(Name[4] == 0x1337, "buffer overwrite\n"); @@ -214,75 +215,75 @@ static void test_NtAtom(void) Len = lstrlenW(testAtom2) * sizeof(WCHAR); memset(Name, '.', sizeof(Name)); res = pRtlQueryAtomInAtomTable( AtomTable, Atom2, NULL, NULL, Name, &Len ); - ok(!res, "query atom %x\n", res); - ok(Len == (lstrlenW(testAtom2) - 1) * sizeof(WCHAR), "wrong length %u\n", Len); + ok(!res, "query atom %lx\n", res); + ok(Len == (lstrlenW(testAtom2) - 1) * sizeof(WCHAR), "wrong length %lu\n", Len); ok(!memcmp(testAtom2, Name, (lstrlenW(testAtom2) - 1) * sizeof(WCHAR)), "wrong atom name\n"); ok(Name[lstrlenW(testAtom2) - 1] == '\0', "wrong char\n"); ok(Name[lstrlenW(testAtom2)] == ('.' << 8) + '.', "wrong char\n"); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom2, &testAtom); - ok(!res, "We can't find our pinned atom!! retval: %x\n", res); + ok(!res, "We can't find our pinned atom!! retval: %lx\n", res); ok(testAtom == Atom2, "We found wrong atom!!!\n"); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom); - ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "We found the atom in our table eaven though we asked RtlEmptyAtomTable to remove it, retval: %x\n", res); + ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "We found the atom in our table eaven though we asked RtlEmptyAtomTable to remove it, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, testAtom3, &Atom3); - ok(!res, "Unable to add atom to table, retval: %x\n", res); + ok(!res, "Unable to add atom to table, retval: %lx\n", res); res = pRtlEmptyAtomTable(AtomTable, TRUE); - ok(!res, "Unable to empty atom table, retval: %x\n", res); + ok(!res, "Unable to empty atom table, retval: %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom2, &testAtom); - ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "The pinned atom should be removed, retval: %x\n", res); + ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "The pinned atom should be removed, retval: %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom3, &testAtom); - ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Non pinned atom should also be removed, retval: %x\n", res); + ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Non pinned atom should also be removed, retval: %lx\n", res); res = pRtlDestroyAtomTable(AtomTable); - ok(!res, "Can't destroy atom table, retval: %x\n", res); + ok(!res, "Can't destroy atom table, retval: %lx\n", res); } AtomTable = NULL; res = pRtlCreateAtomTable(37, &AtomTable); - ok(!res, "Unable to create atom table, retval: %x\n", res); + ok(!res, "Unable to create atom table, retval: %lx\n", res); if (!res) { res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom); - ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Didn't get expected retval with querying an empty atom table, retval: %x\n", res); + ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Didn't get expected retval with querying an empty atom table, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom1); - ok(!res, "Unable to add atom to atom table, retval %x\n", res); + ok(!res, "Unable to add atom to atom table, retval %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom); - ok(!res, "Can't find previously added atom in table, retval: %x\n", res); - ok(testAtom == Atom1, "Found wrong atom! retval: %x\n", res); + ok(!res, "Can't find previously added atom in table, retval: %lx\n", res); + ok(testAtom == Atom1, "Found wrong atom! retval: %lx\n", res); res = pRtlDeleteAtomFromAtomTable(AtomTable, Atom1); - ok(!res, "Unable to delete atom from table, retval: %x\n", res); + ok(!res, "Unable to delete atom from table, retval: %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom); - ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Able to find previously deleted atom in table, retval: %x\n", res); + ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Able to find previously deleted atom in table, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom1); - ok(!res, "Unable to add atom to atom table, retval: %x\n", res); + ok(!res, "Unable to add atom to atom table, retval: %lx\n", res); Len = 0; res = pRtlQueryAtomInAtomTable(AtomTable, Atom1, NULL, NULL, Name, &Len); - ok(res == STATUS_BUFFER_TOO_SMALL, "Got wrong retval, retval: %x\n", res); - ok((lstrlenW(testAtom1) * sizeof(WCHAR)) == Len || broken(!Len) /* nt4 */, "Got wrong length %x\n", Len); + ok(res == STATUS_BUFFER_TOO_SMALL, "Got wrong retval, retval: %lx\n", res); + ok((lstrlenW(testAtom1) * sizeof(WCHAR)) == Len || broken(!Len) /* nt4 */, "Got wrong length %lx\n", Len); if (!Len) pNtAddAtomNT4 = (void *)pNtAddAtom; res = pRtlPinAtomInAtomTable(AtomTable, Atom1); - ok(!res, "Unable to pin atom in atom table, retval: %x\n", res); + ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom); - ok(!res, "Unable to find atom in atom table, retval: %x\n", res); + ok(!res, "Unable to find atom in atom table, retval: %lx\n", res); ok(testAtom == Atom1, "Wrong atom found\n"); res = pRtlDeleteAtomFromAtomTable(AtomTable, Atom1); - ok(res == STATUS_WAS_LOCKED, "Unable to delete atom from table, retval: %x\n", res); + ok(res == STATUS_WAS_LOCKED, "Unable to delete atom from table, retval: %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom); ok(!res, "Able to find deleted atom in table\n"); @@ -305,82 +306,82 @@ static void test_NtIntAtom(void) AtomTable = NULL; res = pRtlCreateAtomTable(37, &AtomTable); - ok(!res, "Unable to create atom table, %x\n", res); + ok(!res, "Unable to create atom table, %lx\n", res); if (!res) { /* According to the kernel32 functions, integer atoms are only allowed from * 0x0001 to 0xbfff and not 0xc000 to 0xffff, which is correct */ res = pRtlAddAtomToAtomTable(AtomTable, NULL, &testAtom); - ok(res == STATUS_INVALID_PARAMETER, "Didn't get expected result from adding 0 int atom, retval: %x\n", res); + ok(res == STATUS_INVALID_PARAMETER, "Didn't get expected result from adding 0 int atom, retval: %lx\n", res); for (i = 1; i <= 0xbfff; i++) { res = pRtlAddAtomToAtomTable(AtomTable, (LPWSTR)i, &testAtom); - ok(!res, "Unable to add valid integer atom %li, retval: %x\n", i, res); + ok(!res, "Unable to add valid integer atom %Ii, retval: %lx\n", i, res); } for (i = 1; i <= 0xbfff; i++) { res = pRtlLookupAtomInAtomTable(AtomTable, (LPWSTR)i, &testAtom); - ok(!res, "Unable to find int atom %li, retval: %x\n", i, res); + ok(!res, "Unable to find int atom %Ii, retval: %lx\n", i, res); if (!res) { res = pRtlPinAtomInAtomTable(AtomTable, testAtom); - ok(!res, "Unable to pin int atom %li, retval: %x\n", i, res); + ok(!res, "Unable to pin int atom %Ii, retval: %lx\n", i, res); } } for (i = 0xc000; i <= 0xffff; i++) { res = pRtlAddAtomToAtomTable(AtomTable, (LPWSTR)i, &testAtom); - ok(res, "Able to illeageal integer atom %li, retval: %x\n", i, res); + ok(res, "Able to illeageal integer atom %Ii, retval: %lx\n", i, res); } res = pRtlDestroyAtomTable(AtomTable); - ok(!res, "Unable to destroy atom table, retval: %x\n", res); + ok(!res, "Unable to destroy atom table, retval: %lx\n", res); } AtomTable = NULL; res = pRtlCreateAtomTable(37, &AtomTable); - ok(!res, "Unable to create atom table, %x\n", res); + ok(!res, "Unable to create atom table, %lx\n", res); if (!res) { res = pRtlLookupAtomInAtomTable(AtomTable, (PWSTR)123, &testAtom); - ok(!res, "Unable to query atom in atom table, retval: %x\n", res); + ok(!res, "Unable to query atom in atom table, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, testAtomInt, &testAtom); - ok(!res, "Unable to add int atom to table, retval: %x\n", res); + ok(!res, "Unable to add int atom to table, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, testAtomIntInv, &testAtom); - ok(!res, "Unable to add int atom to table, retval: %x\n", res); + ok(!res, "Unable to add int atom to table, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, (PWSTR)123, &testAtom); - ok(!res, "Unable to add int atom to table, retval: %x\n", res); + ok(!res, "Unable to add int atom to table, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, (PWSTR)123, &testAtom); - ok(!res, "Unable to re-add int atom to table, retval: %x\n", res); + ok(!res, "Unable to re-add int atom to table, retval: %lx\n", res); Len = 64; res = pRtlQueryAtomInAtomTable(AtomTable, testAtom, &RefCount, &PinCount, Name, &Len); - ok(!res, "Unable to query atom in atom table, retval: %x\n", res); - ok(PinCount == 1, "Expected pincount 1 but got %x\n", PinCount); - ok(RefCount == 1, "Expected refcount 1 but got %x\n", RefCount); + ok(!res, "Unable to query atom in atom table, retval: %lx\n", res); + ok(PinCount == 1, "Expected pincount 1 but got %lx\n", PinCount); + ok(RefCount == 1, "Expected refcount 1 but got %lx\n", RefCount); ok(!lstrcmpW(testAtomOTT, Name), "Got wrong atom name\n"); - ok((lstrlenW(testAtomOTT) * sizeof(WCHAR)) == Len, "Got wrong len %d\n", Len); + ok((lstrlenW(testAtomOTT) * sizeof(WCHAR)) == Len, "Got wrong len %ld\n", Len); res = pRtlPinAtomInAtomTable(AtomTable, testAtom); - ok(!res, "Unable to pin int atom, retval: %x\n", res); + ok(!res, "Unable to pin int atom, retval: %lx\n", res); res = pRtlPinAtomInAtomTable(AtomTable, testAtom); - ok(!res, "Unable to pin int atom, retval: %x\n", res); + ok(!res, "Unable to pin int atom, retval: %lx\n", res); res = pRtlQueryAtomInAtomTable(AtomTable, testAtom, &RefCount, &PinCount, NULL, NULL); - ok(!res, "Unable to query atom in atom table, retval: %x\n", res); - ok(PinCount == 1, "Expected pincount 1 but got %x\n", PinCount); - ok(RefCount == 1, "Expected refcount 1 but got %x\n", RefCount); + ok(!res, "Unable to query atom in atom table, retval: %lx\n", res); + ok(PinCount == 1, "Expected pincount 1 but got %lx\n", PinCount); + ok(RefCount == 1, "Expected refcount 1 but got %lx\n", RefCount); res = pRtlDestroyAtomTable(AtomTable); - ok(!res, "Unable to destroy atom table, retval: %x\n", res); + ok(!res, "Unable to destroy atom table, retval: %lx\n", res); } } @@ -394,40 +395,40 @@ static void test_NtRefPinAtom(void) AtomTable = NULL; res = pRtlCreateAtomTable(37, &AtomTable); - ok(!res, "Unable to create atom table, %x\n", res); + ok(!res, "Unable to create atom table, %lx\n", res); if (!res) { res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom); - ok(!res, "Unable to add our atom to the atom table, retval: %x\n", res); + ok(!res, "Unable to add our atom to the atom table, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom); - ok(!res, "Unable to add our atom to the atom table, retval: %x\n", res); + ok(!res, "Unable to add our atom to the atom table, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom); - ok(!res, "Unable to add our atom to the atom table, retval: %x\n", res); + ok(!res, "Unable to add our atom to the atom table, retval: %lx\n", res); res = pRtlQueryAtomInAtomTable(AtomTable, Atom, &RefCount, &PinCount, NULL, NULL); - ok(!res, "Unable to query atom in atom table, retval: %x\n", res); - ok(PinCount == 0, "Expected pincount 0 but got %x\n", PinCount); - ok(RefCount == 3, "Expected refcount 3 but got %x\n", RefCount); + ok(!res, "Unable to query atom in atom table, retval: %lx\n", res); + ok(PinCount == 0, "Expected pincount 0 but got %lx\n", PinCount); + ok(RefCount == 3, "Expected refcount 3 but got %lx\n", RefCount); res = pRtlPinAtomInAtomTable(AtomTable, Atom); - ok(!res, "Unable to pin atom in atom table, retval: %x\n", res); + ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res); res = pRtlPinAtomInAtomTable(AtomTable, Atom); - ok(!res, "Unable to pin atom in atom table, retval: %x\n", res); + ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res); res = pRtlPinAtomInAtomTable(AtomTable, Atom); - ok(!res, "Unable to pin atom in atom table, retval: %x\n", res); + ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res); res = pRtlQueryAtomInAtomTable(AtomTable, Atom, &RefCount, &PinCount, NULL, NULL); - ok(!res, "Unable to query atom in atom table, retval: %x\n", res); - ok(PinCount == 1, "Expected pincount 1 but got %x\n", PinCount); - ok(RefCount == 3, "Expected refcount 3 but got %x\n", RefCount); + ok(!res, "Unable to query atom in atom table, retval: %lx\n", res); + ok(PinCount == 1, "Expected pincount 1 but got %lx\n", PinCount); + ok(RefCount == 3, "Expected refcount 3 but got %lx\n", RefCount); res = pRtlDestroyAtomTable(AtomTable); - ok(!res, "Unable to destroy atom table, retval: %x\n", res); + ok(!res, "Unable to destroy atom table, retval: %lx\n", res); } } @@ -444,7 +445,7 @@ static void test_Global(void) else res = pNtAddAtom(testAtom1, lstrlenW(testAtom1) * sizeof(WCHAR), &atom); - ok(!res, "Added atom (%x)\n", res); + ok(!res, "Added atom (%lx)\n", res); memset( ptr, 0xcc, sizeof(ptr) ); res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); @@ -456,14 +457,14 @@ static void test_Global(void) ptr_size = sizeof(ATOM_BASIC_INFORMATION); res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); - ok(res == STATUS_BUFFER_TOO_SMALL, "wrong return status (%x)\n", res); + ok(res == STATUS_BUFFER_TOO_SMALL, "wrong return status (%lx)\n", res); ok(abi->NameLength == lstrlenW(testAtom1) * sizeof(WCHAR) || broken(abi->NameLength == sizeof(WCHAR)), /* nt4 */ "string length %u\n",abi->NameLength); memset( ptr, 0xcc, sizeof(ptr) ); ptr_size = sizeof(ATOM_BASIC_INFORMATION) + lstrlenW(testAtom1) * sizeof(WCHAR); res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); - ok(!res, "atom lookup %x\n", res); + ok(!res, "atom lookup %lx\n", res); ok(!lstrcmpW(abi->Name, testAtom1), "strings don't match\n"); ok(abi->NameLength == lstrlenW(testAtom1) * sizeof(WCHAR), "wrong string length\n"); ok(abi->Name[lstrlenW(testAtom1)] == 0, "buffer overwrite %x\n", abi->Name[lstrlenW(testAtom1)]);
participants (1)
-
Eric Pouech