From b66685cdd8e537e20b2c527e61a3c315efaef905 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 3 Sep 2008 11:30:44 +0200 Subject: [PATCH] programs: Build the programs that support it with -DWINE_NO_UNICODE_MACROS. --- programs/control/Makefile.in | 1 + programs/control/control.c | 4 ++-- programs/eject/Makefile.in | 1 + programs/expand/Makefile.in | 1 + programs/expand/expand.c | 4 ++-- programs/explorer/Makefile.in | 1 + programs/explorer/systray.c | 12 ++++++------ programs/hh/Makefile.in | 1 + programs/hh/main.c | 2 +- programs/icinfo/Makefile.in | 1 + programs/iexplore/Makefile.in | 1 + programs/msiexec/Makefile.in | 1 + programs/msiexec/msiexec.c | 4 ++-- programs/msiexec/service.c | 6 +++--- programs/reg/Makefile.in | 1 + programs/regsvr32/Makefile.in | 1 + programs/regsvr32/regsvr32.c | 2 +- programs/rpcss/Makefile.in | 1 + programs/secedit/Makefile.in | 1 + programs/services/Makefile.in | 1 + programs/spoolsv/Makefile.in | 1 + programs/start/Makefile.in | 1 + programs/start/start.c | 6 +++--- programs/svchost/Makefile.in | 1 + programs/uninstaller/Makefile.in | 1 + programs/wineboot/Makefile.in | 1 + programs/wineboot/shutdown.c | 2 +- programs/winebrowser/Makefile.in | 1 + programs/winebrowser/main.c | 6 +++--- programs/winedevice/Makefile.in | 1 + programs/winemenubuilder/Makefile.in | 1 + programs/winepath/Makefile.in | 1 + programs/winepath/winepath.c | 4 ++-- programs/winevdm/Makefile.in | 1 + programs/winevdm/winevdm.c | 2 +- programs/winver/Makefile.in | 1 + programs/winver/winver.c | 6 +----- programs/write/Makefile.in | 1 + programs/write/write.c | 4 ++-- 39 files changed, 55 insertions(+), 34 deletions(-) diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in index c734f5958c..dff63bb111 100644 --- a/programs/control/Makefile.in +++ b/programs/control/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/control/control.c b/programs/control/control.c index 8975436047..095d221c25 100644 --- a/programs/control/control.c +++ b/programs/control/control.c @@ -35,8 +35,8 @@ static void launch(const char *what) int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpszCmdLine, INT nCmdShow) { char szParams[255]; - lstrcpy(szParams, lpszCmdLine); - CharUpper(szParams); + strcpy(szParams, lpszCmdLine); + CharUpperA(szParams); /* no parameters - pop up whole "Control Panel" by default */ if (!*szParams) { diff --git a/programs/eject/Makefile.in b/programs/eject/Makefile.in index d4f1b0089e..505e23b528 100644 --- a/programs/eject/Makefile.in +++ b/programs/eject/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/expand/Makefile.in b/programs/expand/Makefile.in index 7e4f98250c..f3b817ffa5 100644 --- a/programs/expand/Makefile.in +++ b/programs/expand/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/expand/expand.c b/programs/expand/expand.c index a8736b125b..bbdb546e0e 100644 --- a/programs/expand/expand.c +++ b/programs/expand/expand.c @@ -155,12 +155,12 @@ int main(int argc, char *argv[]) OFSTRUCT ofin, ofout; LONG error; - if ((hin = LZOpenFile( infile, &ofin, OF_READ )) < 0) + if ((hin = LZOpenFileA( infile, &ofin, OF_READ )) < 0) { fprintf( stderr, "%s: can't open input file %s\n", argv[0], infile ); return 1; } - if ((hout = LZOpenFile( outfile, &ofout, OF_CREATE | OF_WRITE )) < 0) + if ((hout = LZOpenFileA( outfile, &ofout, OF_CREATE | OF_WRITE )) < 0) { LZClose( hin ); fprintf( stderr, "%s: can't open output file %s\n", argv[0], outfile ); diff --git a/programs/explorer/Makefile.in b/programs/explorer/Makefile.in index 97b2c74318..b52ba94f6b 100644 --- a/programs/explorer/Makefile.in +++ b/programs/explorer/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 07e683a8aa..37f3551937 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -109,7 +109,7 @@ static void create_tooltip(struct icon *icon) tooltips_initialized = TRUE; } - icon->tooltip = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, NULL, + icon->tooltip = CreateWindowExW(WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, WS_POPUP | TTS_ALWAYSTIP, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, @@ -351,7 +351,7 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) int ret = FALSE; if (cds->cbData < NOTIFYICONDATAW_V1_SIZE) return FALSE; - cbSize = ((PNOTIFYICONDATA)cds->lpData)->cbSize; + cbSize = ((PNOTIFYICONDATAW)cds->lpData)->cbSize; if (cbSize < NOTIFYICONDATAW_V1_SIZE) return FALSE; ZeroMemory(&nid, sizeof(nid)); @@ -544,7 +544,7 @@ void initialize_systray(void) { HMODULE x11drv; SIZE size; - WNDCLASSEX class; + WNDCLASSEXW class; static const WCHAR classname[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; static const WCHAR winname[] = {'W','i','n','e',' ','S','y','s','t','e','m',' ','T','r','a','y',0}; @@ -561,12 +561,12 @@ void initialize_systray(void) class.style = CS_DBLCLKS; class.lpfnWndProc = tray_wndproc; class.hInstance = NULL; - class.hIcon = LoadIcon(0, IDI_WINLOGO); - class.hCursor = LoadCursor(0, IDC_ARROW); + class.hIcon = LoadIconW(0, (LPCWSTR)IDI_WINLOGO); + class.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); class.hbrBackground = (HBRUSH) COLOR_WINDOW; class.lpszClassName = (WCHAR *) &classname; - if (!RegisterClassEx(&class)) + if (!RegisterClassExW(&class)) { WINE_ERR("Could not register SysTray window class\n"); return; diff --git a/programs/hh/Makefile.in b/programs/hh/Makefile.in index ed6bf92f9d..0f230e34cf 100644 --- a/programs/hh/Makefile.in +++ b/programs/hh/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/hh/main.c b/programs/hh/main.c index 91506927fd..8a00e608c5 100644 --- a/programs/hh/main.c +++ b/programs/hh/main.c @@ -28,7 +28,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmds HMODULE hModule; DOWINMAIN *doWinMain; - hModule = LoadLibrary("hhctrl.ocx"); + hModule = LoadLibraryA("hhctrl.ocx"); doWinMain = (DOWINMAIN*) GetProcAddress(hModule, "doWinMain"); return doWinMain(hInst, cmdline); diff --git a/programs/icinfo/Makefile.in b/programs/icinfo/Makefile.in index 01c77014c2..a1da6e492e 100644 --- a/programs/icinfo/Makefile.in +++ b/programs/icinfo/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 219369c8f1..522af7d5d6 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index 1ab23c50ee..ef0af91d5c 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 6577c789a6..9f20b5b163 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -344,14 +344,14 @@ static DWORD DoRegServer(void) CHAR path[MAX_PATH+12]; DWORD ret = 0; - scm = OpenSCManager(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_CREATE_SERVICE); + scm = OpenSCManagerA(NULL, SERVICES_ACTIVE_DATABASEA, SC_MANAGER_CREATE_SERVICE); if (!scm) { fprintf(stderr, "Failed to open the service control manager.\n"); return 1; } - GetSystemDirectory(path, MAX_PATH); + GetSystemDirectoryA(path, MAX_PATH); lstrcatA(path, "\\msiexec.exe /V"); service = CreateServiceA(scm, "MSIServer", "MSIServer", GENERIC_ALL, diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c index 64618b852f..da552a712e 100644 --- a/programs/msiexec/service.c +++ b/programs/msiexec/service.c @@ -132,7 +132,7 @@ static void WINAPI ServiceMain(DWORD argc, LPSTR *argv) UpdateSCMStatus(SERVICE_START_PENDING, NO_ERROR, 0); - kill_event = CreateEvent(0, TRUE, FALSE, 0); + kill_event = CreateEventW(0, TRUE, FALSE, 0); if (!kill_event) { fprintf(stderr, "Failed to create event\n"); @@ -156,7 +156,7 @@ DWORD DoService(void) { char service_name[] = "MSIServer"; - const SERVICE_TABLE_ENTRY service[] = + const SERVICE_TABLE_ENTRYA service[] = { {service_name, ServiceMain}, {NULL, NULL}, @@ -164,7 +164,7 @@ DWORD DoService(void) WINE_TRACE("Starting MSIServer service\n"); - if (!StartServiceCtrlDispatcher(service)) + if (!StartServiceCtrlDispatcherA(service)) { fprintf(stderr, "Failed to start MSIServer service\n"); return 1; diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index 8b3534480e..3dc79feac8 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in index 9b26b18614..8b8dce415d 100644 --- a/programs/regsvr32/Makefile.in +++ b/programs/regsvr32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 690529f842..75cc9c9945 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -86,7 +86,7 @@ static VOID *LoadProc(const char* strDll, const char* procName, HMODULE* DllHand { VOID* (*proc)(void); - *DllHandle = LoadLibraryEx(strDll, 0, LOAD_WITH_ALTERED_SEARCH_PATH); + *DllHandle = LoadLibraryExA(strDll, 0, LOAD_WITH_ALTERED_SEARCH_PATH); if(!*DllHandle) { if(!Silent) diff --git a/programs/rpcss/Makefile.in b/programs/rpcss/Makefile.in index 2afb6f70c2..48c63b76b6 100644 --- a/programs/rpcss/Makefile.in +++ b/programs/rpcss/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/secedit/Makefile.in b/programs/secedit/Makefile.in index ddebe86891..58fa913bc6 100644 --- a/programs/secedit/Makefile.in +++ b/programs/secedit/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/services/Makefile.in b/programs/services/Makefile.in index 8bbd0ad438..257489bd55 100644 --- a/programs/services/Makefile.in +++ b/programs/services/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/spoolsv/Makefile.in b/programs/spoolsv/Makefile.in index 4ebf189ba4..4e4b169e74 100644 --- a/programs/spoolsv/Makefile.in +++ b/programs/spoolsv/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in index d7deed00ed..976766f352 100644 --- a/programs/start/Makefile.in +++ b/programs/start/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/start/start.c b/programs/start/start.c index 2b4a70e02a..2009e78db7 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -96,7 +96,7 @@ static void fatal_string_error(int which, DWORD error_code) { WCHAR msg[2048]; - if (!LoadStringW(GetModuleHandle(NULL), which, + if (!LoadStringW(GetModuleHandleW(NULL), which, msg, sizeof(msg)/sizeof(WCHAR))) WINE_ERR("LoadString failed, error %d\n", GetLastError()); @@ -107,7 +107,7 @@ static void fatal_string(int which) { WCHAR msg[2048]; - if (!LoadStringW(GetModuleHandle(NULL), which, + if (!LoadStringW(GetModuleHandleW(NULL), which, msg, sizeof(msg)/sizeof(WCHAR))) WINE_ERR("LoadString failed, error %d\n", GetLastError()); @@ -262,7 +262,7 @@ int wmain (int argc, WCHAR *argv[]) char* multibyte_unixpath; int multibyte_unixpath_len; - wine_get_dos_file_name_ptr = (void*)GetProcAddress(GetModuleHandle("KERNEL32"), "wine_get_dos_file_name"); + wine_get_dos_file_name_ptr = (void*)GetProcAddress(GetModuleHandleA("KERNEL32"), "wine_get_dos_file_name"); if (!wine_get_dos_file_name_ptr) fatal_string(STRING_UNIXFAIL); diff --git a/programs/svchost/Makefile.in b/programs/svchost/Makefile.in index df1685fad5..5cf61742a2 100644 --- a/programs/svchost/Makefile.in +++ b/programs/svchost/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index 7783efaa9c..3b151a7de1 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index cdbab2e81e..63c6fd86fe 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index b9705d8012..49c03c2413 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -227,7 +227,7 @@ static LRESULT send_messages_with_timeout_dialog( } else if ((ret == WAIT_TIMEOUT) && !hwnd_endtask) { - hwnd_endtask = CreateDialogParamW( GetModuleHandle(NULL), + hwnd_endtask = CreateDialogParamW( GetModuleHandleW(NULL), MAKEINTRESOURCEW(IDD_ENDTASK), NULL, endtask_dlg_proc, (LPARAM)&dlg_data ); diff --git a/programs/winebrowser/Makefile.in b/programs/winebrowser/Makefile.in index 3fc720292c..4b2b69e5c7 100644 --- a/programs/winebrowser/Makefile.in +++ b/programs/winebrowser/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 3ad24ae940..9e56cf5fb6 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -284,9 +284,9 @@ static WCHAR *get_url_from_dde(void) while (!ddeString) { MSG msg; - if (!GetMessage(&msg, NULL, 0, 0)) break; + if (!GetMessageW(&msg, NULL, 0, 0)) break; if (msg.message == WM_TIMER) break; - DispatchMessage(&msg); + DispatchMessageW(&msg); } if (ddeString) @@ -381,7 +381,7 @@ int wmain(int argc, WCHAR *argv[]) /* check if the argument is a local file */ wine_get_unix_file_name_ptr = (wine_get_unix_file_name_t) - GetProcAddress( GetModuleHandle( "KERNEL32" ), "wine_get_unix_file_name" ); + GetProcAddress( GetModuleHandleA( "KERNEL32" ), "wine_get_unix_file_name" ); if (wine_get_unix_file_name_ptr == NULL) { diff --git a/programs/winedevice/Makefile.in b/programs/winedevice/Makefile.in index 7effe56c63..c644b7a860 100644 --- a/programs/winedevice/Makefile.in +++ b/programs/winedevice/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in index 4894b6e92f..e4c6ca174c 100644 --- a/programs/winemenubuilder/Makefile.in +++ b/programs/winemenubuilder/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/winepath/Makefile.in b/programs/winepath/Makefile.in index 947e338385..1ced54e9e8 100644 --- a/programs/winepath/Makefile.in +++ b/programs/winepath/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index 7179214baf..f4430d31eb 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -155,7 +155,7 @@ int wmain(int argc, const WCHAR *argv[]) if (outputformats & UNIXFORMAT) { wine_get_unix_file_name_ptr = (void*) - GetProcAddress(GetModuleHandle("KERNEL32"), + GetProcAddress(GetModuleHandleA("KERNEL32"), "wine_get_unix_file_name"); if (wine_get_unix_file_name_ptr == NULL) { fprintf(stderr, "%s: cannot get the address of " @@ -166,7 +166,7 @@ int wmain(int argc, const WCHAR *argv[]) if (outputformats & WINDOWSFORMAT) { wine_get_dos_file_name_ptr = (void*) - GetProcAddress(GetModuleHandle("KERNEL32"), + GetProcAddress(GetModuleHandleA("KERNEL32"), "wine_get_dos_file_name"); if (wine_get_dos_file_name_ptr == NULL) { fprintf(stderr, "%s: cannot get the address of " diff --git a/programs/winevdm/Makefile.in b/programs/winevdm/Makefile.in index 0da674ae12..b2bc317ac8 100644 --- a/programs/winevdm/Makefile.in +++ b/programs/winevdm/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 5491384a95..ea6a4946d1 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -218,7 +218,7 @@ static VOID pif_cmd( char *filename, char *cmdline) if( (p = strrchr( progname, '.')) && !strcasecmp( p, ".bat")) WINE_FIXME(".bat programs in pif files are not supported.\n"); /* first change dir, so the search below can start from there */ - if( startdir[0] && !SetCurrentDirectory( startdir)) { + if( startdir[0] && !SetCurrentDirectoryA( startdir)) { WINE_ERR("Cannot change directory %s\n", wine_dbgstr_a( startdir)); sprintf( buf, "%s\nInvalid startup directory. Check your pif file.", filename); diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in index 8d6942dbd3..62571d3e05 100644 --- a/programs/winver/Makefile.in +++ b/programs/winver/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/winver/winver.c b/programs/winver/winver.c index bf1d791d2c..acb5d61d86 100644 --- a/programs/winver/winver.c +++ b/programs/winver/winver.c @@ -23,9 +23,5 @@ int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) { - return ShellAbout(NULL, PACKAGE_NAME, PACKAGE_STRING, 0); + return ShellAboutA(NULL, PACKAGE_NAME, PACKAGE_STRING, 0); } - -/* Local Variables: */ -/* c-files style: "GNU" */ -/* End: */ diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in index 1e877ef75b..eb9e0cafb3 100644 --- a/programs/write/Makefile.in +++ b/programs/write/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/write/write.c b/programs/write/write.c index 0f2aca07d7..f60d40c2f0 100644 --- a/programs/write/write.c +++ b/programs/write/write.c @@ -40,7 +40,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar lstrcatW(path, SZ_BACKSLASH); lstrcatW(path, SZ_WORDPAD); - stinf.cb = sizeof(STARTUPINFO); + stinf.cb = sizeof(STARTUPINFOW); GetStartupInfoW(&stinf); if (!CreateProcessW(path, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &stinf, &info)) @@ -48,7 +48,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar return 0; failed: - LoadStringW(GetModuleHandle(NULL), IDS_FAILED, path, MAX_PATH); + LoadStringW(GetModuleHandleW(NULL), IDS_FAILED, path, MAX_PATH); MessageBoxW(NULL, path, NULL, MB_OK|MB_ICONERROR); return 1; }