From 350c04b51673f6bb80b62957f7b0161d08e51ca4 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 25 Aug 2000 22:00:06 +0000
Subject: [PATCH] Fixed a couple of WINAPI issues with 16-bit spec files
 (thanks to Marcus Meissner).

---
 dlls/kernel/kernel.spec | 4 ++--
 dlls/user/lstr.c        | 9 +++++++++
 dlls/user/user.spec     | 2 +-
 memory/string.c         | 9 +++++++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/dlls/kernel/kernel.spec b/dlls/kernel/kernel.spec
index b4802ba2733..c39384abb00 100644
--- a/dlls/kernel/kernel.spec
+++ b/dlls/kernel/kernel.spec
@@ -93,7 +93,7 @@ owner	kernel32
 84  pascal   _llseek(word long word) _llseek16
 85  pascal16 _lopen(str word) _lopen16
 86  pascal16 _lwrite(word ptr word) _lwrite16
-87  pascal16 Reserved5(str str) strcmp
+87  stub Reserved5 #lstrcmp16
 88  pascal   lstrcpy(segptr str) lstrcpy16
 89  pascal   lstrcat(segstr str) lstrcat16
 90  pascal16 lstrlen(str) lstrlen16
@@ -291,7 +291,7 @@ owner	kernel32
 345 pascal16 IsSharedSelector(word) IsSharedSelector16
 346 pascal16 IsBadHugeReadPtr(segptr long) IsBadHugeReadPtr16
 347 pascal16 IsBadHugeWritePtr(segptr long) IsBadHugeWritePtr16
-348 pascal16 hmemcpy(ptr ptr long) memcpy
+348 pascal16 hmemcpy(ptr ptr long) hmemcpy16
 349 pascal   _hread(word segptr long) WIN16_hread
 350 pascal   _hwrite(word ptr long) _hwrite16
 351 pascal16 BUNNY_351() KERNEL_nop
diff --git a/dlls/user/lstr.c b/dlls/user/lstr.c
index 07325a85778..158e7552aa8 100644
--- a/dlls/user/lstr.c
+++ b/dlls/user/lstr.c
@@ -62,6 +62,15 @@ void WINAPI OemToAnsiBuff16( LPCSTR s, LPSTR d, UINT16 len )
 }
 
 
+/***********************************************************************
+ *           lstrcmp16   (USER.430)
+ */
+INT16 WINAPI lstrcmp16( LPCSTR str1, LPCSTR str2 )
+{
+    return (INT16)strcmp( str1, str2 );
+}
+
+
 /***********************************************************************
  *           AnsiUpper16   (USER.431)
  */
diff --git a/dlls/user/user.spec b/dlls/user/user.spec
index 9ce08cb2533..175f481387f 100644
--- a/dlls/user/user.spec
+++ b/dlls/user/user.spec
@@ -405,7 +405,7 @@ owner	user32
 427 pascal16 FindWindowEx(word word str str) FindWindowEx16
 428 stub TileWindows
 429 stub CascadeWindows
-430 pascal16 lstrcmp(str str) strcmp
+430 pascal16 lstrcmp(str str) lstrcmp16
 431 pascal   AnsiUpper(segstr) AnsiUpper16
 432 pascal   AnsiLower(segstr) AnsiLower16
 433 pascal16 IsCharAlpha(word) IsCharAlphaA
diff --git a/memory/string.c b/memory/string.c
index 49dac0100ab..1ae11356649 100644
--- a/memory/string.c
+++ b/memory/string.c
@@ -29,6 +29,15 @@ static WINE_EXCEPTION_FILTER(page_fault)
 }
 
 
+/***********************************************************************
+ *           hmemcpy16   (KERNEL.348)
+ */
+void WINAPI hmemcpy16( LPVOID dst, LPCVOID src, LONG count )
+{
+    memcpy( dst, src, count );
+}
+
+
 /***********************************************************************
  *           lstrcat16   (KERNEL.89)
  */