Alexandre Julliard : kernel32: Move the 16-bit error functions to error16.c .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fe2c157fe9ef92a735978e3d73af04aac237f82a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fe2c157fe9ef92a735978e3d73...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Oct  7 17:17:00 2009 +0200

kernel32: Move the 16-bit error functions to error16.c.

---

 dlls/kernel32/error16.c        |   18 ++++++++++++++++++
 dlls/kernel32/krnl386.exe.spec |    4 ++--
 dlls/kernel32/thread.c         |    4 ----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/dlls/kernel32/error16.c b/dlls/kernel32/error16.c
index ce8935d..48b38df 100644
--- a/dlls/kernel32/error16.c
+++ b/dlls/kernel32/error16.c
@@ -243,6 +243,24 @@ static const char *GetParamErrorString(UINT16 uErr) {
 
 
 /***********************************************************************
+ *		SetLastError (KERNEL.147)
+ */
+void WINAPI SetLastError16( DWORD error )
+{
+    SetLastError( error );
+}
+
+
+/***********************************************************************
+ *		GetLastError (KERNEL.148)
+ */
+DWORD WINAPI GetLastError16(void)
+{
+    return GetLastError();
+}
+
+
+/***********************************************************************
 *	LogError (KERNEL.324)
 */
 VOID WINAPI LogError16(UINT16 uErr, LPVOID lpvInfo)
diff --git a/dlls/kernel32/krnl386.exe.spec b/dlls/kernel32/krnl386.exe.spec
index 8b91b5d..09d42f1 100644
--- a/dlls/kernel32/krnl386.exe.spec
+++ b/dlls/kernel32/krnl386.exe.spec
@@ -148,8 +148,8 @@
 144 pascal -ret16 CreateDirectory(ptr ptr) CreateDirectory16
 145 pascal -ret16 RemoveDirectory(ptr) RemoveDirectory16
 146 pascal -ret16 DeleteFile(ptr) DeleteFile16
-147 pascal -ret16 SetLastError(long) SetLastError
-148 pascal   GetLastError() GetLastError
+147 pascal -ret16 SetLastError(long) SetLastError16
+148 pascal GetLastError() GetLastError16
 149 pascal -ret16 GetVersionEx(ptr) GetVersionEx16
 150 pascal -ret16 DirectedYield(word) DirectedYield16
 151 stub WinOldApCall
diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c
index 3115a60..db95841 100644
--- a/dlls/kernel32/thread.c
+++ b/dlls/kernel32/thread.c
@@ -588,7 +588,6 @@ HANDLE WINAPI GetCurrentThread(void)
 #ifdef __i386__
 
 /***********************************************************************
- *		SetLastError (KERNEL.147)
  *		SetLastError (KERNEL32.@)
  */
 /* void WINAPI SetLastError( DWORD error ); */
@@ -599,7 +598,6 @@ __ASM_STDCALL_FUNC( SetLastError, 4,
                    "ret $4" )
 
 /***********************************************************************
- *		GetLastError (KERNEL.148)
  *		GetLastError (KERNEL32.@)
  */
 /* DWORD WINAPI GetLastError(void); */
@@ -622,7 +620,6 @@ __ASM_STDCALL_FUNC( GetCurrentThreadId, 0, ".byte 0x64\n\tmovl 0x24,%eax\n\tret"
 #else  /* __i386__ */
 
 /**********************************************************************
- *		SetLastError (KERNEL.147)
  *		SetLastError (KERNEL32.@)
  *
  * Sets the last-error code.
@@ -636,7 +633,6 @@ void WINAPI SetLastError( DWORD error ) /* [in] Per-thread error code */
 }
 
 /**********************************************************************
- *		GetLastError (KERNEL.148)
  *              GetLastError (KERNEL32.@)
  *
  * Get the last-error code.