From a67369ea00bbc78d292d9f3a6d847acba70e7b87 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 12 Dec 2000 00:48:06 +0000
Subject: [PATCH] Changed LoadImage16 to take an LPCSTR instead of a SEGPTR.

---
 dlls/user/user.spec  | 2 +-
 loader/ne/resource.c | 4 +---
 windows/cursoricon.c | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dlls/user/user.spec b/dlls/user/user.spec
index 66df95f4655..ecebb8dcefc 100644
--- a/dlls/user/user.spec
+++ b/dlls/user/user.spec
@@ -372,7 +372,7 @@ owner	user32
 383 stub GetWindowContextHelpID
 384 pascal16 SetMenuContextHelpId(word word) SetMenuContextHelpId16
 385 pascal16 GetMenuContextHelpId(word) GetMenuContextHelpId16
-389 pascal   LoadImage(word segstr word word word word) LoadImage16
+389 pascal   LoadImage(word str word word word word) LoadImage16
 390 pascal16 CopyImage(word word word word word) CopyImage16
 391 pascal16 SignalProc32(long long long word) UserSignalProc
 394 pascal16 DrawIconEx(word word word word word word word word word) DrawIconEx16
diff --git a/loader/ne/resource.c b/loader/ne/resource.c
index f904a107b58..779bc49b358 100644
--- a/loader/ne/resource.c
+++ b/loader/ne/resource.c
@@ -305,9 +305,7 @@ HRSRC16 NE_FindResource( NE_MODULE *pModule, LPCSTR name, LPCSTR type )
 
     if (!pModule || !pModule->res_table) return 0;
 
-    TRACE("module=%04x name=%s type=%s\n", 
-           pModule->self, debugres_a(PTR_SEG_TO_LIN(name)),
-           debugres_a(PTR_SEG_TO_LIN(type)) );
+    TRACE("module=%04x name=%s type=%s\n", pModule->self, debugres_a(name), debugres_a(type) );
 
     if (HIWORD(name))  /* Check for '#xxx' name */
     {
diff --git a/windows/cursoricon.c b/windows/cursoricon.c
index e52adea9f2c..6c9b4ff50fb 100644
--- a/windows/cursoricon.c
+++ b/windows/cursoricon.c
@@ -2144,9 +2144,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance,LPCWSTR name, UINT loadflags )
 HANDLE16 WINAPI LoadImage16( HINSTANCE16 hinst, LPCSTR name, UINT16 type,
                              INT16 desiredx, INT16 desiredy, UINT16 loadflags)
 {
-    LPCSTR nameStr = HIWORD(name)? PTR_SEG_TO_LIN(name) : (LPCSTR)name;
-    return LoadImageA( hinst, nameStr, type, 
-                       desiredx, desiredy, loadflags );
+    return LoadImageA( hinst, name, type, desiredx, desiredy, loadflags );
 }
 
 /**********************************************************************
-- 
2.11.4.GIT