Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-13 14:08:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTDLL_WINETEST]

Browse source 
CORE-6977 #comment Make sure the buffer for NtQueryInformationAtom is ULONG aligned. Fixes failed atom tests on ReactOS and Windows when compiled with GCC 4.7.2. Should be sent to wine. Keeping the jira issue open.

svn path=/trunk/; revision=58378
This commit is contained in:
Timo Kreuzer 2013-02-28 11:30:20 +00:00
parent 2bab12f092
commit a263a1faad
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rostests/winetests/ntdll/atom.c
View file

@ -432,7 +432,7 @@ static void test_Global(void)
{ {
NTSTATUS res; NTSTATUS res;
RTL_ATOM atom; RTL_ATOM atom;
char ptr[sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR)]; ULONG ptr[(sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR) + sizeof(ULONG)) / sizeof(ULONG)];
ATOM_BASIC_INFORMATION* abi = (ATOM_BASIC_INFORMATION*)ptr; ATOM_BASIC_INFORMATION* abi = (ATOM_BASIC_INFORMATION*)ptr;
ULONG ptr_size = sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR); ULONG ptr_size = sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR);
@ -445,7 +445,7 @@ static void test_Global(void)
memset( ptr, 0xcc, sizeof(ptr) ); memset( ptr, 0xcc, sizeof(ptr) );
res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL );
ok(!res, "atom lookup\n"); ok(!res, "atom lookup failed with status = 0x%x\n", res);
ok(!lstrcmpW(abi->Name, testAtom1), "ok strings\n"); ok(!lstrcmpW(abi->Name, testAtom1), "ok strings\n");
ok(abi->NameLength == lstrlenW(testAtom1) * sizeof(WCHAR), "wrong string length\n"); ok(abi->NameLength == lstrlenW(testAtom1) * sizeof(WCHAR), "wrong string length\n");
ok(abi->Name[lstrlenW(testAtom1)] == 0, "wrong string termination %x\n", abi->Name[lstrlenW(testAtom1)]); ok(abi->Name[lstrlenW(testAtom1)] == 0, "wrong string termination %x\n", abi->Name[lstrlenW(testAtom1)]);