Get Back Relay Debugging for NTDLL and Kernel32
Uwe Bonnes
bon at elektron.ikp.physik.tu-darmstadt.de
Sun Oct 26 10:48:17 CST 2003
Changelog:
wine/dlls/ntdll/relay.c: RELAY_InitDebugLists()
Setup relay debugging for NTDLL/Kernel32
--
Uwe Bonnes bon at elektron.ikp.physik.tu-darmstadt.de
Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt
--------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------
Index: wine/dlls/ntdll/loader.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/loader.c,v
retrieving revision 1.52
diff -u -r1.52 loader.c
--- wine/dlls/ntdll/loader.c 24 Oct 2003 00:32:36 -0000 1.52
+++ wine/dlls/ntdll/loader.c 26 Oct 2003 16:43:14 -0000
@@ -1138,7 +1138,8 @@
}
SERVER_END_REQ;
- /* setup relay debugging entry points */
+ /* setup relay debugging entry points. NTDLL/Kernel32 setup is delayed until the call to
+ RELAY_InitDebugLists */
if (TRACE_ON(relay)) RELAY_SetupDLL( module );
}
Index: wine/dlls/ntdll/relay.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/relay.c,v
retrieving revision 1.6
diff -u -r1.6 relay.c
--- wine/dlls/ntdll/relay.c 16 Oct 2003 00:24:49 -0000 1.6
+++ wine/dlls/ntdll/relay.c 26 Oct 2003 16:43:16 -0000
@@ -181,6 +181,23 @@
}
NtClose( hkey );
+ /* NTDLL and KERNEL32 are already loaded. Now do the Relay Setup */
+ if (TRACE_ON(relay))
+ {
+ HMODULE ret;
+ UNICODE_STRING wstr;
+ NTSTATUS nts;
+
+ RtlCreateUnicodeStringFromAsciiz(&wstr, "ntdll.dll");
+ nts = LdrGetDllHandle(0, 0, &wstr, &ret);
+ RtlFreeUnicodeString( &wstr );
+ if (nts == STATUS_SUCCESS) RELAY_SetupDLL(ret);
+ RtlCreateUnicodeStringFromAsciiz(&wstr, "kernel32.dll");
+ nts = LdrGetDllHandle(0, 0, &wstr, &ret);
+ RtlFreeUnicodeString( &wstr );
+ if (nts == STATUS_SUCCESS) RELAY_SetupDLL(ret);
+ }
+
}
More information about the wine-patches
mailing list