From 441f8dc306ba0eabef8048610782cecd8977c986 Mon Sep 17 00:00:00 2001 From: Mark Jansen Date: Thu, 17 Aug 2017 11:06:46 +0000 Subject: [PATCH] [ADVAPI32_APITEST] Addendum to 75585, use void pointers to work around gcc ignoring pshpack1. svn path=/trunk/; revision=75587 --- rostests/apitests/advapi32/RegOpenKeyExW.c | 35 +++++++--------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/rostests/apitests/advapi32/RegOpenKeyExW.c b/rostests/apitests/advapi32/RegOpenKeyExW.c index fc6dc40b561..c84989072e0 100644 --- a/rostests/apitests/advapi32/RegOpenKeyExW.c +++ b/rostests/apitests/advapi32/RegOpenKeyExW.c @@ -2,39 +2,27 @@ * PROJECT: ReactOS api tests * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: Test for the RegOpenKeyExW alignment - * PROGRAMMER: Mark Jansen + * PROGRAMMER: Mark Jansen (mark.jansen@reactos.org) */ #include #define WIN32_NO_STATUS #include -#include -struct Unalignment1 -{ - char dum; - WCHAR buffer[20]; -} Unalignment1; -struct Unalignment2 -{ - char dum; - HKEY hk; -} Unalignment2; -#include - #define TEST_STR L".exe" START_TEST(RegOpenKeyExW) { - struct Unalignment1 un; - struct Unalignment2 un2; + char GccShouldNotAlignThis[20 * 2]; + char GccShouldNotAlignThis2[20]; + PVOID Alias = GccShouldNotAlignThis + 1; + PVOID UnalignedKey = GccShouldNotAlignThis2 + 1; HKEY hk; LONG lRes; - memcpy(un.buffer, TEST_STR, sizeof(TEST_STR)); - un2.hk = 0; + memcpy(Alias, TEST_STR, sizeof(TEST_STR)); lRes = RegOpenKeyExW(HKEY_CLASSES_ROOT, TEST_STR, 0, KEY_READ, &hk); ok_int(lRes, ERROR_SUCCESS); @@ -42,18 +30,17 @@ START_TEST(RegOpenKeyExW) return; RegCloseKey(hk); - ok_hex(((ULONG_PTR)un.buffer) % 2, 1); - lRes = RegOpenKeyExW(HKEY_CLASSES_ROOT, un.buffer, 0, KEY_READ, &hk); + ok_hex(((ULONG_PTR)Alias) % 2, 1); + lRes = RegOpenKeyExW(HKEY_CLASSES_ROOT, Alias, 0, KEY_READ, &hk); ok_int(lRes, ERROR_SUCCESS); if (!lRes) RegCloseKey(hk); - ok_hex(((ULONG_PTR)&un2.hk) % 2, 1); - lRes = RegOpenKeyExW(HKEY_CLASSES_ROOT, TEST_STR, 0, KEY_READ, &un2.hk); + ok_hex(((ULONG_PTR)UnalignedKey) % 2, 1); + lRes = RegOpenKeyExW(HKEY_CLASSES_ROOT, TEST_STR, 0, KEY_READ, UnalignedKey); ok_int(lRes, ERROR_SUCCESS); if (!lRes) { - hk = un2.hk; - RegCloseKey(hk); + RegCloseKey(*(HKEY*)(UnalignedKey)); } }