Changeset 4451 for trunk/src

Timestamp:

Oct 8, 2000, 4:01:02 PM (25 years ago)

Author:

sandervl

Message:

extra logging + toolhelp apis not exported anymore

Location:

trunk/src/kernel32

Files:

• KERNEL32.DEF (modified) (5 diffs)
• environ.cpp (modified) (3 diffs)
• ole2nls.cpp (modified) (4 diffs)
• toolhelp.cpp (modified) (7 diffs)

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.89 2000-10-06 15:15:59 sandervl Exp $
+; $Id: KERNEL32.DEF,v 1.90 2000-10-08 14:00:59 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -231 +231 @@
      CreateTapePartition        = _CreateTapePartition@16          @177
      CreateThread               = _CreateThread@24                 @178
-     CreateToolhelp32Snapshot   = _CreateToolhelp32Snapshot@8      @179  ;W95
+;;;;     CreateToolhelp32Snapshot   = _CreateToolhelp32Snapshot@8      @179  ;W95
 ;    CreateVirtualBuffer        = _CreateVirtualBuffer@??          @68   ;NT
      CreateWaitableTimerA       = _CreateWaitableTimerA@12         @69   ;NT
@@ -634 +634 @@
     MapViewOfFile              = _MapViewOfFile@20           @525
     MapViewOfFileEx            = _MapViewOfFileEx@24         @526
-    Module32First              = _Module32First@8            @527       ;W95
-    Module32Next               = _Module32Next@8             @528       ;W95
+;;;;    Module32First              = _Module32First@8            @527       ;W95
+;;;;    Module32Next               = _Module32Next@8             @528       ;W95
     MoveFileA                  = _MoveFileA@8                @529
     MoveFileExA                = _MoveFileExA@12             @530
@@ -665 +665 @@
     PostQueuedCompletionStatus  = _PostQueuedCompletionStatus@16 @553
     PrepareTape                = _PrepareTape@12             @554
-    Process32First             = _Process32First@8           @555       ;W95
-    Process32Next              = _Process32Next@8            @556       ;W95
+;;;    Process32First             = _Process32First@8           @555       ;W95
+;;;    Process32Next              = _Process32Next@8            @556       ;W95
     PulseEvent                 = _PulseEvent@4               @557
     PurgeComm                  = _PurgeComm@8                @558
@@ -832 +832 @@
     TerminateProcess           = _TerminateProcess@8         @684
     TerminateThread            = _TerminateThread@8          @685
-;   Thread32First              = _Thread32First@??           @686       ;W95
-;   Thread32Next               = _Thread32Next@??            @687       ;W95
+;;;;    Thread32First              = _Thread32First@8            @686       ;W95
+;;;;    Thread32Next               = _Thread32Next@8             @687       ;W95
     ThunkConnect32             = _ThunkConnect32@24          @688       ;W95
     TlsAlloc                   = _TlsAlloc@0                 @689

trunk/src/kernel32/environ.cpp

@@ -1 @@
-/* $Id: environ.cpp,v 1.8 2000-10-02 16:22:09 phaller Exp $ */
+/* $Id: environ.cpp,v 1.9 2000-10-08 14:01:01 sandervl Exp $ */
 
 /*
@@ -120 +120 @@
               DWORD,  nSize)
 {
+  dprintf(("GetEnvironmentVariableA %s", lpName));
   return O32_GetEnvironmentVariable(lpName, lpBuffer, nSize);
 }
@@ -132 +133 @@
   DWORD rc;
 
-  asciibuffer = (char *)malloc(nSize+1);
-  *asciibuffer = 0;
+  if(nSize) {
+       asciibuffer = (char *)malloc(nSize+1);
+       *asciibuffer = 0;
+  }
+  else asciibuffer = NULL;
+
   astring     = UnicodeToAsciiString((LPWSTR)lpName);
 
-  rc = O32_GetEnvironmentVariable(astring, asciibuffer, nSize);
+  rc = CALL_ODINFUNC(GetEnvironmentVariableA)(astring, asciibuffer, nSize);
   AsciiToUnicode(asciibuffer, lpBuffer);
   FreeAsciiString(astring);
-  free(asciibuffer);
+  if(asciibuffer)
+        free(asciibuffer);
   return(rc);
 }

trunk/src/kernel32/ole2nls.cpp

@@ -1 @@
-/* $Id: ole2nls.cpp,v 1.4 2000-10-02 18:39:34 sandervl Exp $ */
+/* $Id: ole2nls.cpp,v 1.5 2000-10-08 14:01:01 sandervl Exp $ */
 
 /*
@@ -199 +199 @@
     char buf_en_language[128];
 
-    TRACE("%04X\n", (UINT)LangID);
+    dprintf2(("%04X\n", (UINT)LangID));
     if(PRIMARYLANGID(LangID) == LANG_NEUTRAL)
         return TRUE; /* continue search */
@@ -1912 +1912 @@
   int i;
 
-  TRACE("(0x%04lx,0x%08lx,%s,%d,%p,%d)\n",
-        lcid,mapflags,srcstr,srclen,dststr,dstlen);
+  dprintf2(("LCMapStringA: (0x%04lx,0x%08lx,%s,%d,%p,%d)",
+        lcid,mapflags,srcstr,srclen,dststr,dstlen));
 
   if ( ((dstlen!=0) && (dststr==NULL)) || (srcstr==NULL) )
@@ -2492 +2492 @@
   int result;
   LPSTR sk1,sk2;
-  TRACE("%s and %s\n",
-        debugstr_a (s1), debugstr_a (s2));
+  dprintf2(("%s and %s\n",
+        debugstr_a (s1), debugstr_a (s2)));
 
   if ( (s1==NULL) || (s2==NULL) )

trunk/src/kernel32/toolhelp.cpp

@@ -1 @@
-/* $Id: toolhelp.cpp,v 1.2 2000-02-16 14:23:12 sandervl Exp $ */
+/* $Id: toolhelp.cpp,v 1.3 2000-10-08 14:01:02 sandervl Exp $ */
 
 /*
@@ -23 +23 @@
 #include "winerror.h"
 #include "tlhelp32.h"
-#include "toolhelp.h"
 
 #define DBG_LOCALLOG    DBG_toolhelp
@@ -37 +36 @@
                                               DWORD,dwProcess)
 {
-  dprintf(("KERNEL32: CreateToolhelp32Snapshot not implemented.\n"));
+  dprintf(("KERNEL32: CreateToolhelp32Snapshot %x %x not implemented, dwFlags, dwProcess"));
   SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
   return INVALID_HANDLE_VALUE;
@@ -49 +48 @@
  */
 ODINFUNCTION2(BOOL,Process32First,HANDLE,        hSnapshot,
-                                  LPPROCESSENTRY,lppe)
+                                  LPPROCESSENTRY32,lppe)
 {
-  dprintf(("KERNEL32: Process32First not implemented.\n"));
+  dprintf(("KERNEL32: Process32First %x %x not implemented", hSnapshot, lppe));
   SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
   return FALSE;
@@ -62 +61 @@
  */
 ODINFUNCTION2(BOOL,Process32Next,HANDLE,        hSnapshot,
-                                 LPPROCESSENTRY,lppe)
+                                 LPPROCESSENTRY32,lppe)
 {
-  dprintf(("KERNEL32: Process32Next not implemented.\n"));
+  dprintf(("KERNEL32: Process32Next %x %x not implemented", hSnapshot, lppe));
   SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
   return FALSE;
@@ -75 +74 @@
  */
 ODINFUNCTION2(BOOL,Module32First,HANDLE,hSnapshot,
-                                 LPVOID,lpme)
+                                 LPMODULEENTRY32,lpme)
 {
-  //                               LPMODULEENTY,lpme)
-  dprintf(("KERNEL32: Module32First not implemented.\n"));
+  dprintf(("KERNEL32: Module32First %x %x not implemented", hSnapshot, lpme));
   SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
   return FALSE;
@@ -89 +87 @@
  */
 ODINFUNCTION2(BOOL,Module32Next,HANDLE,hSnapshot,
-                                LPVOID,lpme)
+                                LPMODULEENTRY32,lpme)
 {
-  //                              LPMODULEENTRY,lpme)
-  dprintf(("KERNEL32: Module32Next not implemented.\n"));
+  dprintf(("KERNEL32: Module32Next %x %x not implemented", hSnapshot, lpme));
   SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
   return FALSE;
 }
 
+
+BOOL WINAPI Thread32First(HANDLE hSnapshot,LPTHREADENTRY32 lpte)
+{
+  dprintf(("KERNEL32: Thread32First %x %x not implemented", hSnapshot, lpte));
+  SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
+  return FALSE;
+}
+
+BOOL WINAPI Thread32Next(HANDLE hSnapshot, LPTHREADENTRY32 lpte)
+{
+  dprintf(("KERNEL32: Thread32Next %x %x not implemented", hSnapshot, lpte));
+  SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
+  return FALSE;
+}