mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-05 20:19:29 +00:00
Changed LoadImage16 to take an LPCSTR instead of a SEGPTR.
This commit is contained in:
parent
bf67259a41
commit
a67369ea00
|
@ -372,7 +372,7 @@ owner user32
|
||||||
383 stub GetWindowContextHelpID
|
383 stub GetWindowContextHelpID
|
||||||
384 pascal16 SetMenuContextHelpId(word word) SetMenuContextHelpId16
|
384 pascal16 SetMenuContextHelpId(word word) SetMenuContextHelpId16
|
||||||
385 pascal16 GetMenuContextHelpId(word) GetMenuContextHelpId16
|
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
|
390 pascal16 CopyImage(word word word word word) CopyImage16
|
||||||
391 pascal16 SignalProc32(long long long word) UserSignalProc
|
391 pascal16 SignalProc32(long long long word) UserSignalProc
|
||||||
394 pascal16 DrawIconEx(word word word word word word word word word) DrawIconEx16
|
394 pascal16 DrawIconEx(word word word word word word word word word) DrawIconEx16
|
||||||
|
|
|
@ -305,9 +305,7 @@ HRSRC16 NE_FindResource( NE_MODULE *pModule, LPCSTR name, LPCSTR type )
|
||||||
|
|
||||||
if (!pModule || !pModule->res_table) return 0;
|
if (!pModule || !pModule->res_table) return 0;
|
||||||
|
|
||||||
TRACE("module=%04x name=%s type=%s\n",
|
TRACE("module=%04x name=%s type=%s\n", pModule->self, debugres_a(name), debugres_a(type) );
|
||||||
pModule->self, debugres_a(PTR_SEG_TO_LIN(name)),
|
|
||||||
debugres_a(PTR_SEG_TO_LIN(type)) );
|
|
||||||
|
|
||||||
if (HIWORD(name)) /* Check for '#xxx' name */
|
if (HIWORD(name)) /* Check for '#xxx' name */
|
||||||
{
|
{
|
||||||
|
|
|
@ -2144,9 +2144,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance,LPCWSTR name, UINT loadflags )
|
||||||
HANDLE16 WINAPI LoadImage16( HINSTANCE16 hinst, LPCSTR name, UINT16 type,
|
HANDLE16 WINAPI LoadImage16( HINSTANCE16 hinst, LPCSTR name, UINT16 type,
|
||||||
INT16 desiredx, INT16 desiredy, UINT16 loadflags)
|
INT16 desiredx, INT16 desiredy, UINT16 loadflags)
|
||||||
{
|
{
|
||||||
LPCSTR nameStr = HIWORD(name)? PTR_SEG_TO_LIN(name) : (LPCSTR)name;
|
return LoadImageA( hinst, name, type, desiredx, desiredy, loadflags );
|
||||||
return LoadImageA( hinst, nameStr, type,
|
|
||||||
desiredx, desiredy, loadflags );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
|
|
Loading…
Reference in a new issue