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

server: Don't report LOAD_DLL debug event for exe module.

Browse Source
This commit is contained in:
Michael Karcher 2009-08-17 09:19:53 +02:00 committed by Alexandre Julliard
parent 9d6d3b3b3c
commit a0eb2ed413
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/kernel32/tests/process.c
View File

@ -1241,6 +1241,7 @@ static void test_SuspendFlag(void)
static void test_DebuggingFlag(void) static void test_DebuggingFlag(void)
{ {
char buffer[MAX_PATH]; char buffer[MAX_PATH];
void *processbase = NULL;
PROCESS_INFORMATION info; PROCESS_INFORMATION info;
STARTUPINFOA startup, us; STARTUPINFOA startup, us;
DEBUG_EVENT de; DEBUG_EVENT de;
@ -1261,7 +1262,15 @@ static void test_DebuggingFlag(void)
{ {
ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n");
ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE); ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE);
if (!dbg)
{
ok(de.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT,
"first event: %d\n", de.dwDebugEventCode);
processbase = de.u.CreateProcessInfo.lpBaseOfImage;
}
if (de.dwDebugEventCode != EXCEPTION_DEBUG_EVENT) dbg++; if (de.dwDebugEventCode != EXCEPTION_DEBUG_EVENT) dbg++;
ok(de.dwDebugEventCode != LOAD_DLL_DEBUG_EVENT ||
de.u.LoadDll.lpBaseOfDll != processbase, "got LOAD_DLL for main module\n");
} while (de.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT); } while (de.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT);
ok(dbg, "I have seen a debug event\n"); ok(dbg, "I have seen a debug event\n");

2
server/debugger.c
View File

@ -514,7 +514,7 @@ void generate_startup_debug_events( struct process *process, client_ptr_t entry
/* generate dll events (in loading order, i.e. reverse list order) */ /* generate dll events (in loading order, i.e. reverse list order) */
ptr = list_tail( &process->dlls ); ptr = list_tail( &process->dlls );
while (ptr) while (ptr != list_head( &process->dlls ))
{ {
struct process_dll *dll = LIST_ENTRY( ptr, struct process_dll, entry ); struct process_dll *dll = LIST_ENTRY( ptr, struct process_dll, entry );
generate_debug_event( first_thread, LOAD_DLL_DEBUG_EVENT, dll ); generate_debug_event( first_thread, LOAD_DLL_DEBUG_EVENT, dll );