ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

advapi32/tests: Fix a test failure with Wow64.

Browse Source
This commit is contained in:
Paul Vriens 2009-11-16 11:59:57 +01:00 committed by Alexandre Julliard
parent f852d98ee1
commit e32218fd3c
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/advapi32/tests/eventlog.c
View File

@ -31,13 +31,19 @@
static BOOL (WINAPI *pCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); static BOOL (WINAPI *pCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*);
static BOOL (WINAPI *pGetEventLogInformation)(HANDLE,DWORD,LPVOID,DWORD,LPDWORD); static BOOL (WINAPI *pGetEventLogInformation)(HANDLE,DWORD,LPVOID,DWORD,LPDWORD);
static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID *);
static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(PVOID);
static void init_function_pointers(void) static void init_function_pointers(void)
{ {
HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll");
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
pCreateWellKnownSid = (void*)GetProcAddress(hadvapi32, "CreateWellKnownSid"); pCreateWellKnownSid = (void*)GetProcAddress(hadvapi32, "CreateWellKnownSid");
pGetEventLogInformation = (void*)GetProcAddress(hadvapi32, "GetEventLogInformation"); pGetEventLogInformation = (void*)GetProcAddress(hadvapi32, "GetEventLogInformation");
pWow64DisableWow64FsRedirection = (void*)GetProcAddress(hkernel32, "Wow64DisableWow64FsRedirection");
pWow64RevertWow64FsRedirection = (void*)GetProcAddress(hkernel32, "Wow64RevertWow64FsRedirection");
} }
static void create_backup(const char *filename) static void create_backup(const char *filename)
@ -945,6 +951,7 @@ static void test_autocreation(void)
char *p; char *p;
char sources[sizeof(eventsources)]; char sources[sizeof(eventsources)];
char sysdir[MAX_PATH]; char sysdir[MAX_PATH];
void *redir = 0;
RegOpenKeyA(HKEY_LOCAL_MACHINE, eventlogsvc, &key); RegOpenKeyA(HKEY_LOCAL_MACHINE, eventlogsvc, &key);
RegOpenKeyA(key, eventlogname, &eventkey); RegOpenKeyA(key, eventlogname, &eventkey);
@ -974,6 +981,10 @@ static void test_autocreation(void)
RegCloseKey(eventkey); RegCloseKey(eventkey);
RegCloseKey(key); RegCloseKey(key);
/* The directory that holds the eventlog files could be redirected */
if (pWow64DisableWow64FsRedirection)
pWow64DisableWow64FsRedirection(&redir);
/* On Windows we also automatically get an eventlog file */ /* On Windows we also automatically get an eventlog file */
GetSystemDirectoryA(sysdir, sizeof(sysdir)); GetSystemDirectoryA(sysdir, sizeof(sysdir));
@ -994,6 +1005,9 @@ static void test_autocreation(void)
ok(GetFileAttributesA(eventlogfile) != INVALID_FILE_ATTRIBUTES, ok(GetFileAttributesA(eventlogfile) != INVALID_FILE_ATTRIBUTES,
"Expected an eventlog file\n"); "Expected an eventlog file\n");
if (pWow64RevertWow64FsRedirection)
pWow64RevertWow64FsRedirection(redir);
} }
static void cleanup_eventlog(void) static void cleanup_eventlog(void)