Commit 62dbe211 authored by Martin Fuchs's avatar Martin Fuchs Committed by Alexandre Julliard

- remove <tchar.h> and <wchar.h> header usage by switching to WIN32

API string manipulation functions as far as possible - switch to UNICODE compilaton - remove launch_fileA() and tcscpyn - don't crash in set_curdir() for NULL in the 'entry' pointer
parent f278f124
EXTRADEFS = -D__WINE__ EXTRADEFS = -D__WINE__ -DUNICODE
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
......
...@@ -36,14 +36,13 @@ ...@@ -36,14 +36,13 @@
#ifdef UNICODE #ifdef UNICODE
#define _UNICODE #define _UNICODE
#include <wchar.h>
#endif #endif
#include <tchar.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <locale.h> #include <locale.h>
#include <time.h>
#ifndef __WINE__ #ifndef __WINE__
#include <malloc.h> /* for alloca() */ #include <malloc.h> /* for alloca() */
...@@ -145,12 +144,23 @@ typedef struct ...@@ -145,12 +144,23 @@ typedef struct
extern WINEFILE_GLOBALS Globals; extern WINEFILE_GLOBALS Globals;
#ifdef __WINE__ #ifdef __WINE__
extern void WineLicense(HWND hwnd); extern void WineLicense(HWND hwnd);
extern void WineWarranty(HWND hwnd); extern void WineWarranty(HWND hwnd);
#ifdef UNICODE #ifdef UNICODE
extern void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); extern void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext);
#define _tsplitpath _wsplitpath
#define _stprintf msvcrt_swprintf
#else #else
extern void _splitpath(const CHAR* path, CHAR* drv, CHAR* dir, CHAR* name, CHAR* ext); extern void _splitpath(const CHAR* path, CHAR* drv, CHAR* dir, CHAR* name, CHAR* ext);
#define _tsplitpath _splitpath
#define _stprintf sprintf
#endif #endif
#else
#include <tchar.h> /* for _tsplitpath() */
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment