Module: wine Branch: master Commit: d47770e5031c2baaf111950fc321dd6a57c57263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d47770e5031c2baaf111950fc...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Apr 29 10:49:15 2019 +0200
iexplore: Build with msvcrt.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
programs/iexplore/Makefile.in | 3 ++- programs/iexplore/main.c | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 7e74867..b965b5b 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -1,8 +1,9 @@ MODULE = iexplore.exe -APPMODE = -mwindows -municode -Wl,--large-address-aware IMPORTS = ieframe DELAYIMPORTS = advpack version user32
+EXTRADLLFLAGS = -mwindows -municode -mno-cygwin -Wl,--large-address-aware + C_SRCS = \ main.c
diff --git a/programs/iexplore/main.c b/programs/iexplore/main.c index b881443..01ad9d0 100644 --- a/programs/iexplore/main.c +++ b/programs/iexplore/main.c @@ -23,7 +23,6 @@ #include <ole2.h> #include <rpcproxy.h>
-#include "wine/unicode.h" #include "wine/debug.h"
extern DWORD WINAPI IEWinMain(const WCHAR*, int); @@ -57,7 +56,7 @@ static BOOL check_native_ie(void) if (VerQueryValueW(buf, translationW, (void **)&translation, &bytes)) { wsprintfW(file_desc_strW, file_desc_fmtW, translation[0], translation[1]); - ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !strstrW(file_desc, wineW); + ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !wcsstr(file_desc, wineW); }
HeapFree(GetProcessHeap(), 0, buf); @@ -83,9 +82,9 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE prev, WCHAR *cmdline, int sho static const WCHAR unregserverW[] = {'u','n','r','e','g','s','e','r','v','e','r',0};
if(*cmdline == '-' || *cmdline == '/') { - if(!strcmpiW(cmdline+1, regserverW)) + if(!wcsicmp(cmdline+1, regserverW)) return register_iexplore(TRUE); - if(!strcmpiW(cmdline+1, unregserverW)) + if(!wcsicmp(cmdline+1, unregserverW)) return register_iexplore(FALSE); }