Module: wine Branch: master Commit: 8e71504e7695d518a886224729a8df1dee08cc13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e71504e7695d518a886224729...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Feb 6 23:20:01 2009 +0100
programs: Don't make apps Unicode if they don't use the command line.
---
programs/lodctr/Makefile.in | 2 +- programs/lodctr/lodctr_main.c | 2 +- programs/oleview/Makefile.in | 2 +- programs/oleview/oleview.c | 3 +-- programs/unlodctr/Makefile.in | 2 +- programs/unlodctr/unlodctr_main.c | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/programs/lodctr/Makefile.in b/programs/lodctr/Makefile.in index 5446a88..572b99a 100644 --- a/programs/lodctr/Makefile.in +++ b/programs/lodctr/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = lodctr.exe -APPMODE = -mconsole -municode +APPMODE = -mconsole IMPORTS = loadperf kernel32
C_SRCS = lodctr_main.c diff --git a/programs/lodctr/lodctr_main.c b/programs/lodctr/lodctr_main.c index de5d242..e683873 100644 --- a/programs/lodctr/lodctr_main.c +++ b/programs/lodctr/lodctr_main.c @@ -19,7 +19,7 @@ #include <windows.h> #include <loadperf.h>
-int wmain(int argc, WCHAR *argv[]) +int main( int argc, char *argv[] ) { return LoadPerfCounterTextStringsW(GetCommandLineW(), FALSE); } diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in index 2bd6b4c..2c69eda 100644 --- a/programs/oleview/Makefile.in +++ b/programs/oleview/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = oleview.exe -APPMODE = -mwindows -municode +APPMODE = -mwindows IMPORTS = uuid comdlg32 comctl32 shell32 oleaut32 ole32 user32 advapi32 kernel32 EXTRADEFS = -DUNICODE
diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 096a625..e56342c 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -534,8 +534,7 @@ static BOOL InitInstance(HINSTANCE hInst, int nCmdShow) return TRUE; }
-int APIENTRY wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, - LPWSTR lpCmdLine, int nCmdShow) +int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nCmdShow) { MSG msg; HANDLE hAccelTable; diff --git a/programs/unlodctr/Makefile.in b/programs/unlodctr/Makefile.in index 4e284a5..b67ce79 100644 --- a/programs/unlodctr/Makefile.in +++ b/programs/unlodctr/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = unlodctr.exe -APPMODE = -mconsole -municode +APPMODE = -mconsole IMPORTS = loadperf kernel32
C_SRCS = unlodctr_main.c diff --git a/programs/unlodctr/unlodctr_main.c b/programs/unlodctr/unlodctr_main.c index 1e33b1c..bc6a966 100644 --- a/programs/unlodctr/unlodctr_main.c +++ b/programs/unlodctr/unlodctr_main.c @@ -19,7 +19,7 @@ #include <windows.h> #include <loadperf.h>
-int wmain(int argc, WCHAR *argv[]) +int main( int argc, char *argv[] ) { return UnloadPerfCounterTextStringsW(GetCommandLineW(), FALSE); }