Alexandre Julliard : kernel32: Move the 16-bit debugger functions to kernel16.c.

Alexandre Julliard julliard at winehq.org
Thu Oct 8 08:57:11 CDT 2009


Module: wine
Branch: master
Commit: 79cb7798f95e296675fae816b7eb5174f82711d2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=79cb7798f95e296675fae816b7eb5174f82711d2

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Oct  7 17:23:06 2009 +0200

kernel32: Move the 16-bit debugger functions to kernel16.c.

---

 dlls/kernel32/debugger.c |   48 ----------------------------------------------
 dlls/kernel32/kernel16.c |   23 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 48 deletions(-)

diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c
index 50a7428..d732d8b 100644
--- a/dlls/kernel32/debugger.c
+++ b/dlls/kernel32/debugger.c
@@ -22,7 +22,6 @@
 #include <string.h>
 
 #include "winerror.h"
-#include "wine/winbase16.h"
 #include "wine/server.h"
 #include "kernel_private.h"
 #include "wine/debug.h"
@@ -358,23 +357,6 @@ void WINAPI OutputDebugStringW( LPCWSTR str )
 
 
 /***********************************************************************
- *           OutputDebugString   (KERNEL.115)
- *
- *  Output by a 16 bit application of an ascii string to a debugger (if attached)
- *  and program log.
- *
- * PARAMS
- *  str [I] The message to be logged and given to the debugger.
- *
- * RETURNS
- */
-void WINAPI OutputDebugString16( LPCSTR str )
-{
-    OutputDebugStringA( str );
-}
-
-
-/***********************************************************************
  *           DebugBreak   (KERNEL32.@)
  *
  *  Raises an exception so that a debugger (if attached)
@@ -421,36 +403,6 @@ BOOL WINAPI DebugBreakProcess(HANDLE hProc)
 
 
 /***********************************************************************
- *           DebugBreak   (KERNEL.203)
- *
- *  Raises an exception in a 16 bit application so that a debugger (if attached)
- *  can take some action.
- *
- * PARAMS
- *
- * RETURNS
- *
- * BUGS
- *
- *  Only 386 compatible processors implemented.
- */
-void WINAPI DebugBreak16(
-    CONTEXT86 *context) /* [in/out] A pointer to the 386 compatible processor state. */
-{
-#ifdef __i386__
-    EXCEPTION_RECORD rec;
-
-    rec.ExceptionCode    = EXCEPTION_BREAKPOINT;
-    rec.ExceptionFlags   = 0;
-    rec.ExceptionRecord  = NULL;
-    rec.ExceptionAddress = (LPVOID)context->Eip;
-    rec.NumberParameters = 0;
-    NtRaiseException( &rec, context, TRUE );
-#endif  /* defined(__i386__) */
-}
-
-
-/***********************************************************************
  *           IsDebuggerPresent   (KERNEL32.@)
  *
  *  Allows a process to determine if there is a debugger attached.
diff --git a/dlls/kernel32/kernel16.c b/dlls/kernel32/kernel16.c
index 70e87ea..5c3aed0 100644
--- a/dlls/kernel32/kernel16.c
+++ b/dlls/kernel32/kernel16.c
@@ -175,6 +175,29 @@ INT16 WINAPI lstrlen16( LPCSTR str )
 }
 
 /***********************************************************************
+ *           OutputDebugString   (KERNEL.115)
+ */
+void WINAPI OutputDebugString16( LPCSTR str )
+{
+    OutputDebugStringA( str );
+}
+
+/***********************************************************************
+ *           DebugBreak   (KERNEL.203)
+ */
+void WINAPI DebugBreak16( CONTEXT *context )
+{
+    EXCEPTION_RECORD rec;
+
+    rec.ExceptionCode    = EXCEPTION_BREAKPOINT;
+    rec.ExceptionFlags   = 0;
+    rec.ExceptionRecord  = NULL;
+    rec.ExceptionAddress = (LPVOID)context->Eip;
+    rec.NumberParameters = 0;
+    NtRaiseException( &rec, context, TRUE );
+}
+
+/***********************************************************************
  *           hmemcpy   (KERNEL.348)
  */
 void WINAPI hmemcpy16( LPVOID dst, LPCVOID src, LONG count )




More information about the wine-cvs mailing list