reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-22 22:01:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't link directly to 16-bit APIs for portability reasons (based on a

Browse Source 
patch by Steven Edwards).
This commit is contained in:
Alexandre Julliard 2004-01-21 02:20:29 +00:00
parent 15a4fef9a3
commit 3defd321b2
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/rundll32/Makefile.in
View File

@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = rundll32.exe MODULE = rundll32.exe
APPMODE = cui APPMODE = cui
IMPORTS = shell32 user32 kernel32 IMPORTS = user32 kernel32
C_SRCS = \ C_SRCS = \
rundll32.c rundll32.c

26
programs/rundll32/rundll32.c
View File

@ -43,9 +43,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(rundll32); WINE_DEFAULT_DEBUG_CHANNEL(rundll32);
extern void WINAPI RunDLL_CallEntry16( FARPROC proc, HWND hwnd, HINSTANCE inst,
LPCSTR cmdline, INT cmdshow );
/* /*
* Control_RunDLL has these parameters * Control_RunDLL has these parameters
*/ */
@ -59,6 +56,11 @@ typedef void (WINAPI *EntryPointA)(HWND hWnd, HINSTANCE hInst, LPSTR lpszCmdLine
static TCHAR *szTitle = "rundll32"; static TCHAR *szTitle = "rundll32";
static TCHAR *szWindowClass = "class_rundll32"; static TCHAR *szWindowClass = "class_rundll32";
static HINSTANCE16 (WINAPI *pLoadLibrary16)(LPCSTR libname);
static FARPROC16 (WINAPI *pGetProcAddress16)(HMODULE16 hModule, LPCSTR name);
static void (WINAPI *pRunDLL_CallEntry16)( FARPROC proc, HWND hwnd, HINSTANCE inst,
LPCSTR cmdline, INT cmdshow );
static ATOM MyRegisterClass(HINSTANCE hInstance) static ATOM MyRegisterClass(HINSTANCE hInstance)
{ {
WNDCLASSEX wcex; WNDCLASSEX wcex;
@ -82,22 +84,24 @@ static ATOM MyRegisterClass(HINSTANCE hInstance)
static HINSTANCE16 load_dll16( LPCWSTR dll ) static HINSTANCE16 load_dll16( LPCWSTR dll )
{ {
HINSTANCE16 ret; HINSTANCE16 ret = 0;
DWORD len = WideCharToMultiByte( CP_ACP, 0, dll, -1, NULL, 0, NULL, NULL ); DWORD len = WideCharToMultiByte( CP_ACP, 0, dll, -1, NULL, 0, NULL, NULL );
char *dllA = HeapAlloc( GetProcessHeap(), 0, len ); char *dllA = HeapAlloc( GetProcessHeap(), 0, len );
WideCharToMultiByte( CP_ACP, 0, dll, -1, dllA, len, NULL, NULL ); WideCharToMultiByte( CP_ACP, 0, dll, -1, dllA, len, NULL, NULL );
ret = LoadLibrary16( dllA ); pLoadLibrary16 = (void *)GetProcAddress( GetModuleHandleA("kernel32.dll"), "LoadLibrary16" );
if (pLoadLibrary16) ret = pLoadLibrary16( dllA );
HeapFree( GetProcessHeap(), 0, dllA ); HeapFree( GetProcessHeap(), 0, dllA );
return ret; return ret;
} }
static FARPROC16 get_entry_point16( HINSTANCE16 inst, LPCWSTR entry ) static FARPROC16 get_entry_point16( HINSTANCE16 inst, LPCWSTR entry )
{ {
FARPROC16 ret; FARPROC16 ret = 0;
DWORD len = WideCharToMultiByte( CP_ACP, 0, entry, -1, NULL, 0, NULL, NULL ); DWORD len = WideCharToMultiByte( CP_ACP, 0, entry, -1, NULL, 0, NULL, NULL );
char *entryA = HeapAlloc( GetProcessHeap(), 0, len ); char *entryA = HeapAlloc( GetProcessHeap(), 0, len );
WideCharToMultiByte( CP_ACP, 0, entry, -1, entryA, len, NULL, NULL ); WideCharToMultiByte( CP_ACP, 0, entry, -1, entryA, len, NULL, NULL );
ret = GetProcAddress16( inst, entryA ); pGetProcAddress16 = (void *)GetProcAddress( GetModuleHandleA("kernel32.dll"), "GetProcAddress16" );
if (pGetProcAddress16) ret = pGetProcAddress16( inst, entryA );
HeapFree( GetProcessHeap(), 0, entryA ); HeapFree( GetProcessHeap(), 0, entryA );
return ret; return ret;
} }
@ -295,7 +299,13 @@ int main(int argc, char* argv[])
WINE_TRACE( "Calling %s (%p,%p,%s,%d)\n", wine_dbgstr_w(szEntryPoint), WINE_TRACE( "Calling %s (%p,%p,%s,%d)\n", wine_dbgstr_w(szEntryPoint),
hWnd, instance, wine_dbgstr_a(cmdline), info.wShowWindow ); hWnd, instance, wine_dbgstr_a(cmdline), info.wShowWindow );
if (win16) RunDLL_CallEntry16( entry_point, hWnd, instance, cmdline, info.wShowWindow ); if (win16)
{
HMODULE shell = LoadLibraryA( "shell32.dll" );
if (shell) pRunDLL_CallEntry16 = (void *)GetProcAddress( shell, (LPCSTR)122 );
if (pRunDLL_CallEntry16)
pRunDLL_CallEntry16( entry_point, hWnd, instance, cmdline, info.wShowWindow );
}
else else
{ {
EntryPointA pEntryPointA = entry_point; EntryPointA pEntryPointA = entry_point;