May 2010 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Fall back to other depth stencil formats if D24S8 isn't supported.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: ec3d2ba316994dec3d19337afab00062eef7d829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3d2ba316994dec3d19337af… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 30 16:44:29 2010 +0200 wined3d: Fall back to other depth stencil formats if D24S8 isn't supported. --- dlls/wined3d/swapchain.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 25c04b1..b5d2d70 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -802,6 +802,15 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface if (surface_type == SURFACE_OPENGL) { + WINED3DFORMAT formats[] = + { + WINED3DFMT_D24_UNORM_S8_UINT, + WINED3DFMT_D32_UNORM, + WINED3DFMT_R24_UNORM_X8_TYPELESS, + WINED3DFMT_D16_UNORM, + WINED3DFMT_S1_UINT_D15_UNORM + }; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; /* In WGL both color, depth and stencil are features of a pixel format. In case of D3D they are separate. @@ -815,19 +824,27 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface * Likely a lot of other new bugs will be exposed. For that reason request a depth stencil surface all the * time. It can cause a slight performance hit but fixes a lot of regressions. A fixme reminds of that this * issue needs to be fixed. */ - if (!present_parameters->EnableAutoDepthStencil - || swapchain->presentParms.AutoDepthStencilFormat != WINED3DFMT_D24_UNORM_S8_UINT) + for (i = 0; i < (sizeof(formats) / sizeof(*formats)); i++) { - FIXME("Add OpenGL context recreation support to context_validate_onscreen_formats\n"); + swapchain->ds_format = getFormatDescEntry(formats[i], gl_info); + swapchain->context[0] = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format); + if (swapchain->context[0]) break; + TRACE("Depth stencil format %s is not supported, trying next format\n", + debug_d3dformat(formats[i])); } - swapchain->ds_format = getFormatDescEntry(WINED3DFMT_D24_UNORM_S8_UINT, gl_info); - swapchain->context[0] = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format); + if (!swapchain->context[0]) { WARN("Failed to create context.\n"); hr = WINED3DERR_NOTAVAILABLE; goto err; } + + if (!present_parameters->EnableAutoDepthStencil + || swapchain->presentParms.AutoDepthStencilFormat != swapchain->ds_format->format) + { + FIXME("Add OpenGL context recreation support to context_validate_onscreen_formats\n"); + } context_release(swapchain->context[0]); } else

1 0

Austin English : msvcrt: Fix tests for Windows ME.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: de83c5308575fb227ba3faabed7b3c00015ae55c URL: http://source.winehq.org/git/wine.git/?a=commit;h=de83c5308575fb227ba3faabe… Author: Austin English <austinenglish(a)gmail.com> Date: Mon May 3 18:36:16 2010 -0500 msvcrt: Fix tests for Windows ME. --- dlls/msvcrt/tests/locale.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 23ecbc5..df7d8e7 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -437,23 +437,27 @@ static void test_setlocale(void) if(ret) todo_wine ok((!strcmp( ret, "Norwegian-Nynorsk_Norway.1252")) || broken(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252")) + || broken(!strcmp(ret, "Norwegian_Norway.1252")) || broken(!strcmp(ret, "Norwegian (Nynorsk)_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "nor"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - todo_wine ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252"), "ret = %s\n", ret); + todo_wine ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252") + || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "norwegian-bokmal"); todo_wine ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252"), "ret = %s\n", ret); + ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252") + || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "norwegian-nynorsk"); todo_wine ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Norwegian-Nynorsk_Norway.1252") - || broken(!strcmp( ret, "Norwegian (Nynorsk)_Norway.1252")) + || broken(!strcmp(ret, "Norwegian_Norway.1252")) + || broken(!strcmp(ret, "Norwegian (Nynorsk)_Norway.1252")) || broken(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "plk");

1 0

André Hentschel : include: Fix error define in winerror.h.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: b5faada67fe0e62ba88f75709302413d251fc1db URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5faada67fe0e62ba88f75709… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 3 17:01:51 2010 +0200 include: Fix error define in winerror.h. --- include/winerror.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index 516379d..97a58cb 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -139,8 +139,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_SHARING_VIOLATION 32 #define ERROR_LOCK_VIOLATION 33 #define ERROR_WRONG_DISK 34 -/* FIXME: 35 gets returned for some unsuccessful DeviceIoControl calls */ -#define ERROR_UNKNOWN_NAME_01 35 +#define ERROR_FCB_UNAVAILABLE 35 #define ERROR_SHARING_BUFFER_EXCEEDED 36 #define ERROR_HANDLE_EOF 38 #define ERROR_HANDLE_DISK_FULL 39

1 0

Jacek Caban : urlmon: Set BINF_NEEDFILE flag for synchronous binding of builtin protocols.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 9ba1ccf55bea69e4de7c8945b0e5893e24da0cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba1ccf55bea69e4de7c8945b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 3 18:15:25 2010 +0200 urlmon: Set BINF_NEEDFILE flag for synchronous binding of builtin protocols. --- dlls/urlmon/binding.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 8c05dbd..b566265 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1431,7 +1431,7 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, if(to_obj) ret->bindinfo.dwOptions |= 0x100000; - if(!is_urlmon_protocol(url)) + if(!(ret->bindf & BINDF_ASYNCHRONOUS) || !is_urlmon_protocol(url)) ret->bindf |= BINDF_NEEDFILE; ret->url = heap_strdupW(url);

1 0

Aurimas Fišeras : wine.desktop: Add Lithuanian translation.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 55cb1a1256ce3309eac76ae8cb185c65f1abd18e URL: http://source.winehq.org/git/wine.git/?a=commit;h=55cb1a1256ce3309eac76ae8c… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon May 3 08:35:15 2010 +0300 wine.desktop: Add Lithuanian translation. --- tools/wine.desktop | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index e369af9..2048f9d 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -3,6 +3,7 @@ Type=Application Name=Wine Windows Program Loader Name[de]=Wine Windows-Programmstarter Name[es]=Wine Cargador de programas de Windows +Name[lt]=Wine Windows programų paleidyklė Name[nl]=Wine Windows programmalader Name[sv]=Wine Windows Programstartare Name[ru]=Wine - загрузчик Windows программ

1 0

Maarten Lankhorst : msvcrt: Add float functions based on their double versions.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: af9f9cb361fa9a238d8ce46ba81d11d586a7a08f URL: http://source.winehq.org/git/wine.git/?a=commit;h=af9f9cb361fa9a238d8ce46ba… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat May 1 16:32:19 2010 +0200 msvcrt: Add float functions based on their double versions. --- dlls/msvcrt/math.c | 207 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 22 +++++ 2 files changed, 229 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af9f9cb361fa9a238d8ce…

1 0

Maarten Lankhorst : mmdevapi: Try to detect openal 1.11, and do not blacklist pulseaudio on it.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: d440eb7ff2bf0ab8be8d7f0d224dd93f530d393e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d440eb7ff2bf0ab8be8d7f0d2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon May 3 19:36:51 2010 +0200 mmdevapi: Try to detect openal 1.11, and do not blacklist pulseaudio on it. --- dlls/mmdevapi/devenum.c | 44 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 281faf5..85eeb5e 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -759,24 +759,50 @@ static int blacklist(const char *dev) { return 0; } -static void pulse_fixup(const char *devstr, const char **defstr) { +static void pulse_fixup(const char *devstr, const char **defstr, int render) { static int warned; + int default_pulse; - if (!blacklist_pulse && !local_contexts) + if (render && !blacklist_pulse && !local_contexts) blacklist_pulse = 1; - if (!blacklist_pulse || !devstr || strncmp(*defstr, "PulseAudio ", 11)) + if (!blacklist_pulse || !devstr || !*devstr) return; + default_pulse = !strncmp(*defstr, "PulseAudio ", 11); + + while (*devstr && !strncmp(devstr, "PulseAudio ", 11)) + devstr += strlen(devstr) + 1; + + /* Could still be a newer version, so check for 1.11 if more devices are enabled */ + if (render && *devstr) { + ALCdevice *dev = palcOpenDevice(devstr); + ALCcontext *ctx = palcCreateContext(dev, NULL); + if (ctx) { + const char *ver; + + setALContext(ctx); + ver = palGetString(AL_VERSION); + popALContext(); + palcDestroyContext(ctx); + + if (!strcmp(ver, "1.1 ALSOFT 1.11.753")) { + blacklist_pulse = 0; + palcCloseDevice(dev); + return; + } + } + if (dev) + palcCloseDevice(dev); + } + if (!warned++) { ERR("Disabling pulseaudio because of old openal version\n"); ERR("Please upgrade to openal-soft v1.12 or newer\n"); } - while (*devstr && !strncmp(devstr, "PulseAudio ", 11)) { - devstr += strlen(devstr) + 1; - } TRACE("New default: %s\n", devstr); - *defstr = devstr; + if (default_pulse) + *defstr = devstr; } static void openal_scanrender(void) @@ -793,7 +819,7 @@ static void openal_scanrender(void) defaultstr = palcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER); devstr = palcGetString(NULL, ALC_DEVICE_SPECIFIER); } - pulse_fixup(devstr, &defaultstr); + pulse_fixup(devstr, &defaultstr, 1); defblacklisted = blacklist(defaultstr); if (defblacklisted) WARN("Disabling blacklist because %s is blacklisted\n", defaultstr); @@ -834,7 +860,7 @@ static void openal_scancapture(void) EnterCriticalSection(&openal_crst); devstr = palcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER); defaultstr = palcGetString(NULL, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER); - pulse_fixup(devstr, &defaultstr); + pulse_fixup(devstr, &defaultstr, 0); defblacklisted = blacklist(defaultstr); if (defblacklisted) WARN("Disabling blacklist because %s is blacklisted\n", defaultstr);

1 0

Damjan Jovanovic : winemenubuilder: Read the registry in the unix codepage when cleaning up menus.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 228e5f1ac383c7bba1c66d63c60e46858685f5ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=228e5f1ac383c7bba1c66d63c… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon May 3 20:58:16 2010 +0200 winemenubuilder: Read the registry in the unix codepage when cleaning up menus. --- programs/winemenubuilder/winemenubuilder.c | 48 +++++++++++++++++++++------- 1 files changed, 36 insertions(+), 12 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 9532a2e..51f0adb 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1434,6 +1434,16 @@ static char* wchars_to_utf8_chars(LPCWSTR string) return ret; } +static char* wchars_to_unix_chars(LPCWSTR string) +{ + char *ret; + INT size = WideCharToMultiByte(CP_UNIXCP, 0, string, -1, NULL, 0, NULL, NULL); + ret = HeapAlloc(GetProcessHeap(), 0, size); + if (ret) + WideCharToMultiByte(CP_UNIXCP, 0, string, -1, ret, size, NULL, NULL); + return ret; +} + static char *slashes_to_minuses(const char *string) { int i; @@ -2660,20 +2670,20 @@ static void cleanup_menus(void) LSTATUS lret = ERROR_SUCCESS; for (i = 0; lret == ERROR_SUCCESS; ) { - char *value = NULL; - char *data = NULL; + WCHAR *value = NULL; + WCHAR *data = NULL; DWORD valueSize = 4096; DWORD dataSize = 4096; while (1) { lret = ERROR_OUTOFMEMORY; - value = HeapAlloc(GetProcessHeap(), 0, valueSize); + value = HeapAlloc(GetProcessHeap(), 0, valueSize * sizeof(WCHAR)); if (value == NULL) break; - data = HeapAlloc(GetProcessHeap(), 0, dataSize); + data = HeapAlloc(GetProcessHeap(), 0, dataSize * sizeof(WCHAR)); if (data == NULL) break; - lret = RegEnumValueA(hkey, i, value, &valueSize, NULL, NULL, (BYTE*)data, &dataSize); + lret = RegEnumValueW(hkey, i, value, &valueSize, NULL, NULL, (BYTE*)data, &dataSize); if (lret == ERROR_SUCCESS || lret != ERROR_MORE_DATA) break; valueSize *= 2; @@ -2684,18 +2694,32 @@ static void cleanup_menus(void) } if (lret == ERROR_SUCCESS) { - struct stat filestats; - if (stat(data, &filestats) < 0 && errno == ENOENT) + char *unix_file; + char *windows_file; + unix_file = wchars_to_unix_chars(value); + windows_file = wchars_to_unix_chars(data); + if (unix_file != NULL && windows_file != NULL) { - WINE_TRACE("removing menu related file %s\n", value); - remove(value); - RegDeleteValueA(hkey, value); + struct stat filestats; + if (stat(windows_file, &filestats) < 0 && errno == ENOENT) + { + WINE_TRACE("removing menu related file %s\n", unix_file); + remove(unix_file); + RegDeleteValueW(hkey, value); + } + else + i++; } else - i++; + { + WINE_ERR("out of memory enumerating menus\n"); + lret = ERROR_OUTOFMEMORY; + } + HeapFree(GetProcessHeap(), 0, unix_file); + HeapFree(GetProcessHeap(), 0, windows_file); } else if (lret != ERROR_NO_MORE_ITEMS) - WINE_WARN("error %d reading registry\n", lret); + WINE_ERR("error %d reading registry\n", lret); HeapFree(GetProcessHeap(), 0, value); HeapFree(GetProcessHeap(), 0, data); }

1 0

Andrew Nguyen : rundll32: Check more heap allocation failure paths for consistency.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: e6bd6d120167068acffe55794498502cb149b320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6bd6d120167068acffe55794… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon May 3 14:22:17 2010 -0500 rundll32: Check more heap allocation failure paths for consistency. --- programs/rundll32/rundll32.c | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/programs/rundll32/rundll32.c b/programs/rundll32/rundll32.c index f3105c4..e26f5de 100644 --- a/programs/rundll32/rundll32.c +++ b/programs/rundll32/rundll32.c @@ -87,10 +87,14 @@ static HINSTANCE16 load_dll16( LPCWSTR dll ) HINSTANCE16 ret = 0; DWORD len = WideCharToMultiByte( CP_ACP, 0, dll, -1, NULL, 0, NULL, NULL ); char *dllA = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, dll, -1, dllA, len, NULL, NULL ); - pLoadLibrary16 = (void *)GetProcAddress( GetModuleHandleA("kernel32.dll"), (LPCSTR)35 ); - if (pLoadLibrary16) ret = pLoadLibrary16( dllA ); - HeapFree( GetProcessHeap(), 0, dllA ); + + if (dllA) + { + WideCharToMultiByte( CP_ACP, 0, dll, -1, dllA, len, NULL, NULL ); + pLoadLibrary16 = (void *)GetProcAddress( GetModuleHandleA("kernel32.dll"), (LPCSTR)35 ); + if (pLoadLibrary16) ret = pLoadLibrary16( dllA ); + HeapFree( GetProcessHeap(), 0, dllA ); + } return ret; } @@ -99,10 +103,14 @@ static FARPROC16 get_entry_point16( HINSTANCE16 inst, LPCWSTR entry ) FARPROC16 ret = 0; DWORD len = WideCharToMultiByte( CP_ACP, 0, entry, -1, NULL, 0, NULL, NULL ); char *entryA = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, entry, -1, entryA, len, NULL, NULL ); - pGetProcAddress16 = (void *)GetProcAddress( GetModuleHandleA("kernel32.dll"), (LPCSTR)37 ); - if (pGetProcAddress16) ret = pGetProcAddress16( inst, entryA ); - HeapFree( GetProcessHeap(), 0, entryA ); + + if (entryA) + { + WideCharToMultiByte( CP_ACP, 0, entry, -1, entryA, len, NULL, NULL ); + pGetProcAddress16 = (void *)GetProcAddress( GetModuleHandleA("kernel32.dll"), (LPCSTR)37 ); + if (pGetProcAddress16) ret = pGetProcAddress16( inst, entryA ); + HeapFree( GetProcessHeap(), 0, entryA ); + } return ret; } @@ -111,6 +119,10 @@ static void *get_entry_point32( HMODULE module, LPCWSTR entry, BOOL *unicode ) void *ret; DWORD len = WideCharToMultiByte( CP_ACP, 0, entry, -1, NULL, 0, NULL, NULL ); char *entryA = HeapAlloc( GetProcessHeap(), 0, len + 1 ); + + if (!entryA) + return NULL; + WideCharToMultiByte( CP_ACP, 0, entry, -1, entryA, len, NULL, NULL ); /* first try the W version */ @@ -217,7 +229,7 @@ int WINAPI WinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPSTR szCmdArgs, LPWSTR szCmdLine; LPWSTR szDllName,szEntryPoint; void *entry_point; - BOOL unicode, win16; + BOOL unicode = FALSE, win16; STARTUPINFOW info; HMODULE hDll; @@ -295,6 +307,10 @@ int WINAPI WinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPSTR szCmdArgs, { DWORD len = WideCharToMultiByte( CP_ACP, 0, szCmdLine, -1, NULL, 0, NULL, NULL ); char *cmdline = HeapAlloc( GetProcessHeap(), 0, len ); + + if (!cmdline) + goto CLEANUP; + WideCharToMultiByte( CP_ACP, 0, szCmdLine, -1, cmdline, len, NULL, NULL ); WINE_TRACE( "Calling %s (%p,%p,%s,%d)\n", wine_dbgstr_w(szEntryPoint),

1 0

Andrew Nguyen : rundll32: Convert rundll32 to Unicode.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: b8b1a565e04dd3a3653cff50d5ae2a6dcc940526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8b1a565e04dd3a3653cff50d… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon May 3 14:22:25 2010 -0500 rundll32: Convert rundll32 to Unicode. --- programs/rundll32/Makefile.in | 3 ++- programs/rundll32/rundll32.c | 36 +++++++++++++++--------------------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/programs/rundll32/Makefile.in b/programs/rundll32/Makefile.in index c7798a3..6e2eddb 100644 --- a/programs/rundll32/Makefile.in +++ b/programs/rundll32/Makefile.in @@ -3,8 +3,9 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = rundll32.exe -APPMODE = -mwindows +APPMODE = -mwindows -municode IMPORTS = user32 kernel32 +EXTRADEFS = -DWINE_NO_UNICODE_MACROS C_SRCS = \ rundll32.c diff --git a/programs/rundll32/rundll32.c b/programs/rundll32/rundll32.c index e26f5de..e8ac8a5 100644 --- a/programs/rundll32/rundll32.c +++ b/programs/rundll32/rundll32.c @@ -53,8 +53,10 @@ typedef void (WINAPI *EntryPointA)(HWND hWnd, HINSTANCE hInst, LPSTR lpszCmdLine * Control_RunDLL needs to have a window. So lets make us a very * simple window class. */ -static const TCHAR *szTitle = "rundll32"; -static const TCHAR *szWindowClass = "class_rundll32"; +static const WCHAR szTitle[] = {'r','u','n','d','l','l','3','2',0}; +static const WCHAR szWindowClass[] = {'c','l','a','s','s','_','r','u','n','d','l','l','3','2',0}; +static const WCHAR kernel32[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; +static const WCHAR shell32[] = {'s','h','e','l','l','3','2','.','d','l','l',0}; static HINSTANCE16 (WINAPI *pLoadLibrary16)(LPCSTR libname); static FARPROC16 (WINAPI *pGetProcAddress16)(HMODULE16 hModule, LPCSTR name); @@ -63,23 +65,23 @@ static void (WINAPI *pRunDLL_CallEntry16)( FARPROC proc, HWND hwnd, HINSTANCE in static ATOM register_class(void) { - WNDCLASSEX wcex; + WNDCLASSEXW wcex; - wcex.cbSize = sizeof(WNDCLASSEX); + wcex.cbSize = sizeof(WNDCLASSEXW); wcex.style = CS_HREDRAW | CS_VREDRAW; - wcex.lpfnWndProc = DefWindowProc; + wcex.lpfnWndProc = DefWindowProcW; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = NULL; wcex.hIcon = NULL; - wcex.hCursor = LoadCursor(NULL, IDC_ARROW); + wcex.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); wcex.lpszMenuName = NULL; wcex.lpszClassName = szWindowClass; wcex.hIconSm = NULL; - return RegisterClassEx(&wcex); + return RegisterClassExW(&wcex); } static HINSTANCE16 load_dll16( LPCWSTR dll ) @@ -91,7 +93,7 @@ static HINSTANCE16 load_dll16( LPCWSTR dll ) if (dllA) { WideCharToMultiByte( CP_ACP, 0, dll, -1, dllA, len, NULL, NULL ); - pLoadLibrary16 = (void *)GetProcAddress( GetModuleHandleA("kernel32.dll"), (LPCSTR)35 ); + pLoadLibrary16 = (void *)GetProcAddress( GetModuleHandleW(kernel32), (LPCSTR)35 ); if (pLoadLibrary16) ret = pLoadLibrary16( dllA ); HeapFree( GetProcessHeap(), 0, dllA ); } @@ -107,7 +109,7 @@ static FARPROC16 get_entry_point16( HINSTANCE16 inst, LPCWSTR entry ) if (entryA) { WideCharToMultiByte( CP_ACP, 0, entry, -1, entryA, len, NULL, NULL ); - pGetProcAddress16 = (void *)GetProcAddress( GetModuleHandleA("kernel32.dll"), (LPCSTR)37 ); + pGetProcAddress16 = (void *)GetProcAddress( GetModuleHandleW(kernel32), (LPCSTR)37 ); if (pGetProcAddress16) ret = pGetProcAddress16( inst, entryA ); HeapFree( GetProcessHeap(), 0, entryA ); } @@ -223,10 +225,9 @@ static LPWSTR get_next_arg(LPWSTR *cmdline) return arg; } -int WINAPI WinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPSTR szCmdArgs, int nCmdShow) +int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine, int nCmdShow) { HWND hWnd; - LPWSTR szCmdLine; LPWSTR szDllName,szEntryPoint; void *entry_point; BOOL unicode = FALSE, win16; @@ -239,19 +240,12 @@ int WINAPI WinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPSTR szCmdArgs, /* Initialize the rundll32 class */ register_class(); - hWnd = CreateWindow(szWindowClass, szTitle, + hWnd = CreateWindowW(szWindowClass, szTitle, WS_OVERLAPPEDWINDOW|WS_VISIBLE, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, NULL, NULL); - /* Skip the rundll32.exe path */ - szCmdLine=GetCommandLineW(); - WINE_TRACE("CmdLine=%s\n",wine_dbgstr_w(szCmdLine)); - szDllName = get_next_arg(&szCmdLine); - if (!szDllName || *szDllName==0) - goto CLEANUP; - HeapFree(GetProcessHeap(),0,szDllName); - /* Get the dll name and API EntryPoint */ + WINE_TRACE("CmdLine=%s\n",wine_dbgstr_w(szCmdLine)); szDllName = get_next_arg(&szCmdLine); if (!szDllName || *szDllName==0) goto CLEANUP; @@ -318,7 +312,7 @@ int WINAPI WinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPSTR szCmdArgs, if (win16) { - HMODULE shell = LoadLibraryA( "shell32.dll" ); + HMODULE shell = LoadLibraryW( shell32 ); if (shell) pRunDLL_CallEntry16 = (void *)GetProcAddress( shell, (LPCSTR)122 ); if (pRunDLL_CallEntry16) pRunDLL_CallEntry16( entry_point, hWnd, instance, cmdline, info.wShowWindow );

1 0