Commit b120836b authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard

kernel32/tests: Run tests again on Win95.

parent e014154f
...@@ -44,6 +44,7 @@ static char** myARGV; ...@@ -44,6 +44,7 @@ static char** myARGV;
static BOOL (WINAPI *pCheckRemoteDebuggerPresent)(HANDLE,PBOOL); static BOOL (WINAPI *pCheckRemoteDebuggerPresent)(HANDLE,PBOOL);
static BOOL (WINAPI *pDebugActiveProcessStop)(DWORD); static BOOL (WINAPI *pDebugActiveProcessStop)(DWORD);
static BOOL (WINAPI *pDebugSetProcessKillOnExit)(BOOL); static BOOL (WINAPI *pDebugSetProcessKillOnExit)(BOOL);
static BOOL (WINAPI *pIsDebuggerPresent)(void);
static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static struct _TEB * (WINAPI *pNtCurrentTeb)(void);
static LONG child_failures; static LONG child_failures;
...@@ -529,7 +530,7 @@ static void doChild(int argc, char **argv) ...@@ -529,7 +530,7 @@ static void doChild(int argc, char **argv)
ret = CloseHandle(parent); ret = CloseHandle(parent);
child_ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); child_ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError());
ret = IsDebuggerPresent(); ret = pIsDebuggerPresent();
child_ok(ret, "Expected ret != 0, got %#x.\n", ret); child_ok(ret, "Expected ret != 0, got %#x.\n", ret);
ret = pCheckRemoteDebuggerPresent(GetCurrentProcess(), &debug); ret = pCheckRemoteDebuggerPresent(GetCurrentProcess(), &debug);
child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError());
...@@ -539,7 +540,7 @@ static void doChild(int argc, char **argv) ...@@ -539,7 +540,7 @@ static void doChild(int argc, char **argv)
{ {
pNtCurrentTeb()->Peb->BeingDebugged = FALSE; pNtCurrentTeb()->Peb->BeingDebugged = FALSE;
ret = IsDebuggerPresent(); ret = pIsDebuggerPresent();
child_ok(!ret, "Expected ret != 0, got %#x.\n", ret); child_ok(!ret, "Expected ret != 0, got %#x.\n", ret);
ret = pCheckRemoteDebuggerPresent(GetCurrentProcess(), &debug); ret = pCheckRemoteDebuggerPresent(GetCurrentProcess(), &debug);
child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError());
...@@ -624,6 +625,7 @@ START_TEST(debugger) ...@@ -624,6 +625,7 @@ START_TEST(debugger)
pCheckRemoteDebuggerPresent=(void*)GetProcAddress(hdll, "CheckRemoteDebuggerPresent"); pCheckRemoteDebuggerPresent=(void*)GetProcAddress(hdll, "CheckRemoteDebuggerPresent");
pDebugActiveProcessStop=(void*)GetProcAddress(hdll, "DebugActiveProcessStop"); pDebugActiveProcessStop=(void*)GetProcAddress(hdll, "DebugActiveProcessStop");
pDebugSetProcessKillOnExit=(void*)GetProcAddress(hdll, "DebugSetProcessKillOnExit"); pDebugSetProcessKillOnExit=(void*)GetProcAddress(hdll, "DebugSetProcessKillOnExit");
pIsDebuggerPresent=(void*)GetProcAddress(hdll, "IsDebuggerPresent");
hdll=GetModuleHandle("ntdll.dll"); hdll=GetModuleHandle("ntdll.dll");
if (hdll) pNtCurrentTeb = (void*)GetProcAddress(hdll, "NtCurrentTeb"); if (hdll) pNtCurrentTeb = (void*)GetProcAddress(hdll, "NtCurrentTeb");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment