marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wineconsole: Switch the rest to use the explicit W-forms. 

And compile with -DWINE_NO_UNICODE_MACROS.
oldstable
Michael Stefaniuc 2010-04-28 01:10:42 +02:00 committed by Alexandre Julliard
parent fe0c5cb68a
commit b3350899f2
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/wineconsole/Makefile.in
View File

@ -1,4 +1,4 @@
EXTRADEFS = -DUNICODE
EXTRADEFS = -DWINE_NO_UNICODE_MACROS
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@

2
programs/wineconsole/curses.c
View File

@ -882,7 +882,7 @@ static DWORD CALLBACK input_thread( void *arg )
else
numEvent = WCCURSES_FillSimpleChar(ir, inchar);
if (numEvent) WriteConsoleInput(data->hConIn, ir, numEvent, &n);
if (numEvent) WriteConsoleInputW(data->hConIn, ir, numEvent, &n);
}
close( PRIVATE(data)->sync_pipe[0] );
return 0;

14
programs/wineconsole/winecon_user.h
View File

@ -45,13 +45,13 @@ struct inner_data_user {
/* from user.c */
extern const COLORREF WCUSER_ColorMap[16];
extern BOOL WCUSER_GetProperties(struct inner_data*, BOOL);
extern BOOL WCUSER_ValidateFont(const struct inner_data* data, const LOGFONT* lf);
extern BOOL WCUSER_ValidateFont(const struct inner_data* data, const LOGFONTW* lf);
extern BOOL WCUSER_ValidateFontMetric(const struct inner_data* data,
const TEXTMETRIC* tm, DWORD fontType);
extern HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONT* lf,
LONG* el);
extern void WCUSER_FillLogFont(LOGFONT* lf, const WCHAR* name,
const TEXTMETRICW* tm, DWORD fontType);
extern HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd,
const LOGFONTW* lf, LONG* el);
extern void WCUSER_FillLogFont(LOGFONTW* lf, const WCHAR* name,
UINT height, UINT weight);
extern void WCUSER_DumpLogFont(const char* pfx, const LOGFONT* lf, DWORD ft);
extern void WCUSER_DumpTextMetric(const TEXTMETRIC* tm, DWORD ft);
extern void WCUSER_DumpLogFont(const char* pfx, const LOGFONTW* lf, DWORD ft);
extern void WCUSER_DumpTextMetric(const TEXTMETRICW* tm, DWORD ft);

12
programs/wineconsole/wineconsole.c
View File

@ -45,7 +45,7 @@ static void printf_res(UINT uResId, ...)
va_list args;
va_start(args, uResId);
LoadStringW(GetModuleHandle(NULL), uResId, buffer, sizeof(buffer)/sizeof(WCHAR));
LoadStringW(GetModuleHandleW(NULL), uResId, buffer, sizeof(buffer)/sizeof(buffer[0]));
WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, ansi, sizeof(ansi), NULL, NULL);
vprintf(ansi, args);
va_end(args);
@ -561,7 +561,7 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna
data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data));
if (!data) return 0;
GetStartupInfo(&si);
GetStartupInfoW(&si);
if (pid == 0)
{
@ -672,9 +672,9 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna
*/
static BOOL WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine)
{
PROCESS_INFORMATION info;
STARTUPINFO startup;
BOOL done;
PROCESS_INFORMATION info;
STARTUPINFOW startup;
BOOL done;
/* we're in the case wineconsole <exe> <options>... spawn the new process */
memset(&startup, 0, sizeof(startup));
@ -696,7 +696,7 @@ static BOOL WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine)
return FALSE;
}
done = CreateProcess(NULL, cmdLine, NULL, NULL, TRUE, 0L, NULL, NULL, &startup, &info);
done = CreateProcessW(NULL, cmdLine, NULL, NULL, TRUE, 0L, NULL, NULL, &startup, &info);
/* we no longer need the handles passed to the child for the console */
CloseHandle(startup.hStdInput);