Finish win32s separation.

dlls/win32s/win32s16.c

@@ -52,3 +52,62 @@ SEGPTR WINAPI UTLinearToSelectorOffset16(LPVOID lptr)
 {
     return (SEGPTR)lptr;
 }
+
+/***********************************************************************
+ *           ContinueDebugEvent       (WIN32S16.5)
+ */
+BOOL WINAPI ContinueDebugEvent16(DWORD pid, DWORD tid, DWORD status)
+{
+    return ContinueDebugEvent(pid, tid, status);
+}
+
+/***********************************************************************
+ *           ReadProcessMemory       (WIN32S16.6)
+ */
+BOOL WINAPI ReadProcessMemory16(HANDLE process, LPCVOID addr, LPVOID buffer,
+				DWORD size, LPDWORD bytes_read)
+{
+    return ReadProcessMemory(process, addr, buffer, size, bytes_read);
+}
+
+/***********************************************************************
+ *           GetLastError       (WIN32S16.10)
+ */
+DWORD WINAPI GetLastError16(void)
+{
+    return GetLastError();
+}
+
+/***********************************************************************
+ *           CloseHandle	(WIN32S16.11)
+ */
+BOOL WINAPI CloseHandle16(HANDLE handle)
+{
+    return CloseHandle(handle);
+}
+
+/***********************************************************************
+ *           GetExitCodeThread	(WIN32S16.13)
+ */
+BOOL WINAPI GetExitCodeThread16(HANDLE hthread, LPDWORD exitcode)
+{
+    return GetExitCodeThread(hthread, exitcode);
+}
+
+/***********************************************************************
+ *           VirtualQueryEx	(WIN32S16.18)
+ */
+DWORD WINAPI VirtualQueryEx16(HANDLE handle, LPCVOID addr,
+			      LPMEMORY_BASIC_INFORMATION info, DWORD len)
+{
+    return VirtualQueryEx(handle, addr, info, len);
+}
+
+/***********************************************************************
+ *           VirtualProtectEx	(WIN32S16.19)
+ */
+BOOL WINAPI VirtualProtectEx16(HANDLE handle, LPVOID addr, DWORD size,
+			       DWORD new_prot, LPDWORD old_prot)
+{
+    return VirtualProtectEx(handle, addr, size, new_prot, old_prot);
+}

dlls/win32s/win32s16.spec

@@ -6,21 +6,21 @@ owner	w32skrnl
 2 pascal16 BootTask() BootTask16
 3 stub CREATEPROCESS
 4 stub WAITFORDEBUGEVENT
-5 pascal ContinueDebugEvent(long long long) ContinueDebugEvent
-6 pascal ReadProcessMemory(long ptr ptr long ptr) ReadProcessMemory
+5 pascal ContinueDebugEvent(long long long) ContinueDebugEvent16
+6 pascal ReadProcessMemory(long ptr ptr long ptr) ReadProcessMemory16
 7 stub WRITEPROCESSMEMORY
 8 stub GETTHREADCONTEXT
 9 stub SETTHREADCONTEXT
-10 pascal GETLASTERROR() GetLastError
-11 pascal CloseHandle(long) CloseHandle
+10 pascal GetLastError() GetLastError16
+11 pascal CloseHandle(long) CloseHandle16
 12 stub ALLOCCLBKTO32BDLL
-13 pascal GetExitCodeThread(long ptr) GetExitCodeThread
+13 pascal GetExitCodeThread(long ptr) GetExitCodeThread16
 14 stub GETEXITCODEPROCESS
 15 stub OPENPROCESS
 16 stub OPENTHREAD
 17 stub GETTHREADSELECTORENTRY
-18 pascal VIRTUALQUERYEX(long ptr ptr long) VirtualQueryEx
-19 pascal VIRTUALPROTECTEX(long ptr long long ptr) VirtualProtectEx
+18 pascal VirtualQueryEx(long ptr ptr long) VirtualQueryEx16
+19 pascal VirtualProtectEx(long ptr long long ptr) VirtualProtectEx16
 20 stub KGETTASKPPDB
 21 stub KGETTHREADPTDB
 22 stub FREECALLBACK