Changeset 3794 for trunk/src

Timestamp:

Jul 3, 2000, 2:12:38 PM (25 years ago)

Author:

bird

Message:

Moved OutputDebugString to debug.cpp.

Location:

trunk/src/kernel32

Files:

• KERNEL32.CPP (modified) (12 diffs)
• debug.cpp (modified) (2 diffs)

trunk/src/kernel32/KERNEL32.CPP

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.47 2000-06-23 19:02:36 sandervl Exp $ */
+/* $Id: KERNEL32.CPP,v 1.48 2000-07-03 12:12:37 bird Exp $ */
 
 /*
@@ -731 +731 @@
 
   dprintf(("KERNEL32:  GetStringTypeW, not properly implemented\n"));
-  if((DWORD)lpSrcStr == (DWORD)lpCharType || 
-     !lpSrcStr || 
-     !lpCharType) 
+  if((DWORD)lpSrcStr == (DWORD)lpCharType ||
+     !lpSrcStr ||
+     !lpCharType)
   {
     O32_SetLastError(ERROR_INVALID_PARAMETER);
     return(FALSE);
   }
-  
+
   if(cchSrc == -1)
     cchSrc = UniStrlen((UniChar*)lpSrcStr);
@@ -761 +761 @@
       return TRUE;
       break;
-    
+
     case CT_CTYPE2:
     case CT_CTYPE3: //not supported right now
@@ -767 +767 @@
       break;
   }
-  
+
   return FALSE;
 }
@@ -801 +801 @@
 {
   int i;
-  
-  if ((src==NULL) || 
-      (chartype==NULL) || 
+
+  if ((src==NULL) ||
+      (chartype==NULL) ||
       (src==(LPSTR)chartype))
   {
@@ -809 +809 @@
     return FALSE;
   }
-  
+
   if (cchSrc==-1)
     cchSrc=lstrlenA(src)+1;
-  
-  switch (dwInfoType) 
+
+  switch (dwInfoType)
   {
     case CT_CTYPE1:
@@ -832 +832 @@
       }
       return TRUE;
-  
+
     case CT_CTYPE2:
       for (i=0;i<cchSrc;i++)
@@ -839 +839 @@
       }
       return TRUE;
-  
+
     case CT_CTYPE3:
       for (i=0;i<cchSrc;i++)
@@ -846 +846 @@
       }
       return TRUE;
-      
+
     default:
       dprintf(("Unknown dwInfoType:%ld\n",
@@ -1017 +1017 @@
 
    if(lpString1 == NULL || lpString2 == NULL)
-   {    
+   {
         dprintf(("CompareStringA: (s1=%s,s2=%s): Invalid NULL string\n", lpString1, lpString2));
         SetLastError(ERROR_INVALID_PARAMETER);
@@ -1065 +1065 @@
 
    if(lpString1 == NULL || lpString2 == NULL)
-   {    
+   {
         dprintf(("CompareStringW: (s1=%s,s2=%s): Invalid NULL string\n", lpString1, lpString2));
         SetLastError(ERROR_INVALID_PARAMETER);
@@ -1206 +1206 @@
 }
 //******************************************************************************
-//SvL: 26-6-'97 - Added
-//******************************************************************************
-VOID WIN32API OutputDebugStringW(LPCWSTR arg1)
-{
- char *astring;
-
-    astring = UnicodeToAsciiString((LPWSTR)arg1);
-    dprintf(("KERNEL32:  OS2OutputDebugStringW %s\n", astring));
-    FreeAsciiString(astring);
-}
-//******************************************************************************
-//******************************************************************************
-VOID WIN32API OutputDebugStringA(LPCSTR lpszOutputString)
-{
-  dprintf(("KERNEL32:  OutputDebugStringA: %s\n", lpszOutputString));
-  return;
-}
-//******************************************************************************
 //******************************************************************************
 BOOL WIN32API FlushInstructionCache(     /*PLF Mon  98-02-09 23:56:49 : STUB STUB STUB STUB STUB */

trunk/src/kernel32/debug.cpp

@@ -1 @@
-/* $Id: debug.cpp,v 1.3 2000-07-03 11:20:52 bird Exp $ */
+/* $Id: debug.cpp,v 1.4 2000-07-03 12:12:38 bird Exp $ */
 
 /*
@@ -86 +86 @@
  *              being debugged, so that it can change behaviour and for example
  *              provide more debug information using functions like OutputDebugString.
+ *
+ *              You could change the result of this by SET ODIN32.DEBUGGERPRESENT=1 on
+ *              the commandline.
  */
 BOOL WIN32API IsDebuggerPresent(VOID)
 {
     dprintf(("KERNEL32:  IsDebuggerPresent() -> FALSE\n"));
-    return FALSE;
+    return (getenv("ODIN32.DEBUGGERPRESENT") != NULL);
 }
+
+
+/**
+ * Send a string to the debugger for the current application.
+ * @param       lpszOutputString    Pointer to the string to send to the debugger. (intput)
+ * @sketch      Convert and log the string.
+ * @status      STUB
+ * @author      Sander van Leeuwen
+ * @remark      The string is send to the system debugger if there is no
+ *              debugger available for this application.
+ *              If the application has not debugger and the system debugger
+ *              is not active this API does nothing.
+ */
+VOID WIN32API OutputDebugStringW(LPCWSTR lpszOutputString)
+{
+    char    *pszAscii = UnicodeToAsciiString((LPWSTR)lpszOutputString);
+    dprintf(("KERNEL32:  OS2OutputDebugStringW %s\n", pszAscii));
+    FreeAsciiString(pszAscii);
+}
+
+
+/**
+ * Send a string to the debugger for the current application.
+ * @param       lpszOutputString    Pointer to the string to send to the debugger. (input)
+ * @sketch      Log the string.
+ * @status      STUB
+ * @author      Sander van Leeuwen
+ * @remark      The string is send to the system debugger if there is no
+ *              debugger available for this application.
+ *              If the application has not debugger and the system debugger
+ *              is not active this API does nothing.
+ */
+VOID WIN32API OutputDebugStringA(LPCSTR lpszOutputString)
+{
+    dprintf(("KERNEL32:  OutputDebugStringA: %s\n", lpszOutputString));
+}
+