- 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

- remove <tchar.h> and <wchar.h> header usage by switching to WIN32
62dbe211 · Martin Fuchs · Alexandre Julliard · f278f124 · 62dbe211 · 62dbe211
Commit 62dbe211 authored Jul 07, 2005 by Martin Fuchs Committed by Alexandre Julliard Jul 07, 2005
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 163 additions and 89 deletions

Makefile.in programs/winefile/Makefile.in +1 -1

winefile.c programs/winefile/winefile.c +150 -86

winefile.h programs/winefile/winefile.h +12 -2

No files found.
--- a/programs/winefile/Makefile.in
+++ b/programs/winefile/Makefile.in
-EXTRADEFS = -D__WINE__
+EXTRADEFS = -D__WINE__ -DUNICODE
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

--- a/programs/winefile/winefile.c
+++ b/programs/winefile/winefile.c
--- a/programs/winefile/winefile.h
+++ b/programs/winefile/winefile.h
@@ -36,14 +36,13 @@

 #ifdef UNICODE
 #define _UNICODE
-#include <wchar.h>
 #endif
-#include <tchar.h>

 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <locale.h>
+#include <time.h>

 #ifndef __WINE__
 #include <malloc.h> /* for alloca() */
@@ -145,12 +144,23 @@ typedef struct
 extern WINEFILE_GLOBALS Globals;

 #ifdef __WINE__
+
 extern void WineLicense(HWND hwnd);
 extern void WineWarranty(HWND hwnd);

+
 #ifdef UNICODE
 extern void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext);
+#define _tsplitpath _wsplitpath
+#define _stprintf msvcrt_swprintf
 #else
 extern void _splitpath(const CHAR* path, CHAR* drv, CHAR* dir, CHAR* name, CHAR* ext);
+#define _tsplitpath _splitpath
+#define _stprintf sprintf
 #endif
+
+#else
+
+#include <tchar.h>	/* for _tsplitpath() */
+
 #endif