kernel32: Move the 16-bit thread and process functions to kernel16.c.

dlls/kernel32/kernel16.c

@@ -327,6 +327,48 @@ DWORD WINAPI WaitForMultipleObjects16( DWORD count, const HANDLE *handles,
 }
 
 /***********************************************************************
+ *		GetCurrentThreadId (KERNEL.462)
+ */
+DWORD WINAPI GetCurrentThreadId16(void)
+{
+    return GetCurrentThreadId();
+}
+
+/***********************************************************************
+ *           ExitProcess   (KERNEL.466)
+ */
+void WINAPI ExitProcess16( WORD status )
+{
+    DWORD count;
+    ReleaseThunkLock( &count );
+    ExitProcess( status );
+}
+
+/***********************************************************************
+ *		GetCurrentProcessId (KERNEL.471)
+ */
+DWORD WINAPI GetCurrentProcessId16(void)
+{
+    return GetCurrentProcessId();
+}
+
+/*********************************************************************
+ *           MapProcessHandle   (KERNEL.483)
+ */
+DWORD WINAPI MapProcessHandle( HANDLE hProcess )
+{
+    return GetProcessId( hProcess );
+}
+
+/***********************************************************************
+ *		RegisterServiceProcess (KERNEL.491)
+ */
+DWORD WINAPI RegisterServiceProcess16( DWORD dwProcessId, DWORD dwType )
+{
+    return 1; /* success */
+}
+
+/***********************************************************************
  *           WaitForMultipleObjectsEx   (KERNEL.495)
  */
 DWORD WINAPI WaitForMultipleObjectsEx16( DWORD count, const HANDLE *handles,
@@ -340,6 +382,23 @@ DWORD WINAPI WaitForMultipleObjectsEx16( DWORD count, const HANDLE *handles,
     return retval;
 }
 
+/**********************************************************************
+ * VWin32_BoostThreadGroup   (KERNEL.535)
+ */
+VOID WINAPI VWin32_BoostThreadGroup( DWORD threadId, INT boost )
+{
+    FIXME("(0x%08x,%d): stub\n", threadId, boost);
+}
+
+
+/**********************************************************************
+ * VWin32_BoostThreadStatic   (KERNEL.536)
+ */
+VOID WINAPI VWin32_BoostThreadStatic( DWORD threadId, INT boost )
+{
+    FIXME("(0x%08x,%d): stub\n", threadId, boost);
+}
+
 /***********************************************************************
  *		EnableDos (KERNEL.41)
  *		DisableDos (KERNEL.42)

dlls/kernel32/krnl386.exe.spec

@@ -364,7 +364,7 @@
 459 pascal ResetW32Event(long) ResetW32Event
 460 pascal WaitForSingleObject(long long) WaitForSingleObject16
 461 pascal WaitForMultipleObjects(long ptr long long) WaitForMultipleObjects16
-462 pascal GetCurrentThreadId() GetCurrentThreadId
+462 pascal GetCurrentThreadId() GetCurrentThreadId16
 463 pascal SetThreadQueue(long word) SetThreadQueue16
 464 pascal GetThreadQueue(long) GetThreadQueue16
 465 stub NukeProcess
@@ -373,7 +373,7 @@
 468 stub WOASpawnConApp
 469 stub WOAGimmeTitle
 470 stub WOADestroyConsole
-471 pascal GetCurrentProcessId() GetCurrentProcessId
+471 pascal GetCurrentProcessId() GetCurrentProcessId16
 472 pascal -register MapHInstLS() MapHInstLS16
 473 pascal -register MapHInstSL() MapHInstSL16
 474 pascal CloseW32Handle(long) CloseHandle
@@ -385,7 +385,7 @@
 480 pascal -ret16 _EnterWin16Lock() _EnterWin16Lock
 481 pascal -ret16 _LeaveWin16Lock() _LeaveWin16Lock
 482 pascal LoadSystemLibrary32(str) LoadLibrary32_16   # FIXME!
-483 pascal MapProcessHandle(long) GetProcessId
+483 pascal MapProcessHandle(long) MapProcessHandle
 484 pascal SetProcessDword(long s_word long) SetProcessDword
 485 pascal GetProcessDword(long s_word) GetProcessDword
 486 pascal FreeLibrary32(long) FreeLibrary
@@ -393,7 +393,7 @@
 488 pascal GetModuleHandle32(str) GetModuleHandleA
 489 stub KERNEL_489  # VWin32_BoostWithDecay
 490 pascal -ret16 KERNEL_490(word) KERNEL_490
-491 pascal RegisterServiceProcess(long long) RegisterServiceProcess
+491 pascal RegisterServiceProcess(long long) RegisterServiceProcess16
 492 stub WOAAbort
 493 pascal -ret16 UTInit(long long long long) UTInit16
 494 stub KERNEL_494

dlls/kernel32/process.c

@@ -2648,17 +2648,6 @@ void WINAPI SetProcessDword( DWORD dwProcessID, INT offset, DWORD value )
 }
 
 
-/***********************************************************************
- *           ExitProcess   (KERNEL.466)
- */
-void WINAPI ExitProcess16( WORD status )
-{
-    DWORD count;
-    ReleaseThunkLock( &count );
-    ExitProcess( status );
-}
-
-
 /*********************************************************************
  *           OpenProcess   (KERNEL32.@)
  *
@@ -2703,7 +2692,6 @@ HANDLE WINAPI OpenProcess( DWORD access, BOOL inherit, DWORD id )
 
 
 /*********************************************************************
- *           MapProcessHandle   (KERNEL.483)
  *           GetProcessId       (KERNEL32.@)
  *
  * Gets the a unique identifier of a process.
@@ -3296,7 +3284,6 @@ BOOL WINAPI ProcessIdToSessionId( DWORD procid, DWORD *sessionid_ptr )
 
 
 /***********************************************************************
- *		RegisterServiceProcess (KERNEL.491)
  *		RegisterServiceProcess (KERNEL32.@)
  *
  * A service process calls this function to ensure that it continues to run

dlls/kernel32/thread.c

@@ -554,24 +554,6 @@ DWORD WINAPI GetThreadId(HANDLE Thread)
 }
 
 
-/**********************************************************************
- * VWin32_BoostThreadGroup [KERNEL.535]
- */
-VOID WINAPI VWin32_BoostThreadGroup( DWORD threadId, INT boost )
-{
-    FIXME("(0x%08x,%d): stub\n", threadId, boost);
-}
-
-
-/**********************************************************************
- * VWin32_BoostThreadStatic [KERNEL.536]
- */
-VOID WINAPI VWin32_BoostThreadStatic( DWORD threadId, INT boost )
-{
-    FIXME("(0x%08x,%d): stub\n", threadId, boost);
-}
-
-
 /***********************************************************************
  * GetCurrentThread [KERNEL32.@]  Gets pseudohandle for current thread
  *
@@ -604,14 +586,12 @@ __ASM_STDCALL_FUNC( SetLastError, 4,
 __ASM_STDCALL_FUNC( GetLastError, 0, ".byte 0x64\n\tmovl 0x34,%eax\n\tret" )
 
 /***********************************************************************
- *		GetCurrentProcessId (KERNEL.471)
  *		GetCurrentProcessId (KERNEL32.@)
  */
 /* DWORD WINAPI GetCurrentProcessId(void) */
 __ASM_STDCALL_FUNC( GetCurrentProcessId, 0, ".byte 0x64\n\tmovl 0x20,%eax\n\tret" )
 
 /***********************************************************************
- *		GetCurrentThreadId (KERNEL.462)
  *		GetCurrentThreadId (KERNEL32.@)
  */
 /* DWORD WINAPI GetCurrentThreadId(void) */
@@ -646,7 +626,6 @@ DWORD WINAPI GetLastError(void)
 }
 
 /***********************************************************************
- *		GetCurrentProcessId (KERNEL.471)
  *		GetCurrentProcessId (KERNEL32.@)
  *
  * Get the current process identifier.
@@ -660,7 +639,6 @@ DWORD WINAPI GetCurrentProcessId(void)
 }
 
 /***********************************************************************
- *		GetCurrentThreadId (KERNEL.462)
  *		GetCurrentThreadId (KERNEL32.@)
  *
  * Get the current thread identifier.