Changeset 8015 for trunk/src

Timestamp:

Feb 26, 2002, 12:11:17 PM (23 years ago)

Author:

sandervl

Message:

GetCurrentThreadId changes

Location:

trunk/src/kernel32

Files:

• debug.cpp (modified) (3 diffs)
• hmthread.cpp (modified) (2 diffs)
• thread.cpp (modified) (2 diffs)
• wprocess.cpp (modified) (2 diffs)

trunk/src/kernel32/debug.cpp

@@ -1 @@
-/* $Id: debug.cpp,v 1.6 2001-04-05 05:54:51 sandervl Exp $ */
+/* $Id: debug.cpp,v 1.7 2002-02-26 11:11:17 sandervl Exp $ */
 
 /*
@@ -17 +17 @@
 #include <unicode.h>
 #include "oslibdebug.h"
+#include <wprocess.h>
 
 #define DBG_LOCALLOG    DBG_debug
@@ -73 +74 @@
            dwProcessId, dwThreadId, dwContinueStatus));
 
-  return OSLibContinueDebugEvent(dwProcessId, dwThreadId, dwContinueStatus);
+  return OSLibContinueDebugEvent(dwProcessId, ODIN_TO_OS2_THREADID(dwThreadId), dwContinueStatus);
 }
 //******************************************************************************

trunk/src/kernel32/hmthread.cpp

@@ -1 @@
-/* $Id: hmthread.cpp,v 1.9 2001-12-03 12:13:08 sandervl Exp $ */
+/* $Id: hmthread.cpp,v 1.10 2002-02-26 11:11:17 sandervl Exp $ */
 
 /*
@@ -124 +124 @@
         return THREAD_PRIORITY_ERROR_RETURN;
     }
-    DWORD ret = OSLibDosSetPriority(teb->o.odin.threadId, priority);
+    DWORD ret = OSLibDosSetPriority(ODIN_TO_OS2_THREADID(teb->o.odin.threadId), priority);
     if(ret == ERROR_SUCCESS) {
         teb->delta_priority = priority;

trunk/src/kernel32/thread.cpp

@@ -1 @@
-/* $Id: thread.cpp,v 1.42 2002-02-07 11:19:13 sandervl Exp $ */
+/* $Id: thread.cpp,v 1.43 2002-02-26 11:11:17 sandervl Exp $ */
 
 /*
@@ -54 +54 @@
   
 ////  dprintf(("GetCurrentThreadId\n"));
-  return(O32_GetCurrentThreadId());
+  return MAKE_THREADID(O32_GetCurrentProcessId(), O32_GetCurrentThreadId());
 }
 //******************************************************************************

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.148 2002-02-19 12:51:53 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.149 2002-02-26 11:11:17 sandervl Exp $ */
 
 /*
@@ -1866 +1866 @@
         free(cmdline);
 
-    if(lpProcessInfo)
-      dprintf(("KERNEL32:  CreateProcess returned %d hPro:%x hThr:%x pid:%x tid:%x\n",
-               rc, lpProcessInfo->hProcess, lpProcessInfo->hThread,
-                   lpProcessInfo->dwProcessId,lpProcessInfo->dwThreadId));
+    if(lpProcessInfo) 
+    {
+        lpProcessInfo->dwThreadId = MAKE_THREADID(lpProcessInfo->dwProcessId, lpProcessInfo->dwThreadId);
+        dprintf(("KERNEL32:  CreateProcess returned %d hPro:%x hThr:%x pid:%x tid:%x\n",
+                 rc, lpProcessInfo->hProcess, lpProcessInfo->hThread,
+                 lpProcessInfo->dwProcessId,lpProcessInfo->dwThreadId));
+    }
     else
       dprintf(("KERNEL32:  CreateProcess returned %d\n", rc));