Alexandre Julliard : rundll32: Build with msvcrt.
Alexandre Julliard
julliard at winehq.org
Wed May 1 16:37:05 CDT 2019
Module: wine
Branch: master
Commit: b09e18c40d19afeed1793b0553f109fbb1b0a629
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b09e18c40d19afeed1793b0553f109fbb1b0a629
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed May 1 10:39:49 2019 +0200
rundll32: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/rundll32/Makefile.in | 3 ++-
programs/rundll32/rundll32.c | 5 ++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/programs/rundll32/Makefile.in b/programs/rundll32/Makefile.in
index 23671d2..6ab5eda 100644
--- a/programs/rundll32/Makefile.in
+++ b/programs/rundll32/Makefile.in
@@ -1,6 +1,7 @@
MODULE = rundll32.exe
-APPMODE = -mwindows -municode
IMPORTS = user32
+EXTRADLLFLAGS = -mwindows -municode -mno-cygwin
+
C_SRCS = \
rundll32.c
diff --git a/programs/rundll32/rundll32.c b/programs/rundll32/rundll32.c
index ec0ae59..3d4a468 100644
--- a/programs/rundll32/rundll32.c
+++ b/programs/rundll32/rundll32.c
@@ -37,7 +37,6 @@
#define WIN32_LEAN_AND_MEAN
#include "windows.h"
#include "wine/winbase16.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(rundll32);
@@ -123,7 +122,7 @@ static void *get_entry_point32( HMODULE module, LPCWSTR entry, BOOL *unicode )
/* determine if the entry point is an ordinal */
if (entry[0] == '#')
{
- INT_PTR ordinal = atoiW( entry + 1 );
+ INT_PTR ordinal = wcstol( entry + 1, NULL, 10 );
if (ordinal <= 0)
return NULL;
@@ -265,7 +264,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine
if (!szDllName || *szDllName==0)
goto CLEANUP;
WINE_TRACE("DllName=%s\n",wine_dbgstr_w(szDllName));
- if ((szEntryPoint = strchrW(szDllName, ',' )))
+ if ((szEntryPoint = wcschr(szDllName, ',' )))
*szEntryPoint++=0;
else
szEntryPoint = get_next_arg(&szCmdLine);
More information about the wine-cvs
mailing list