From: Jacek Caban jacek@codeweavers.com
--- dlls/scrrun/scrrun.idl | 4 ---- dlls/scrrun/tests/scrrun.idl | 4 ---- include/winbase.h | 20 +++++++++++++------- 3 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/dlls/scrrun/scrrun.idl b/dlls/scrrun/scrrun.idl index f369f2d985a..b803fd2df12 100644 --- a/dlls/scrrun/scrrun.idl +++ b/dlls/scrrun/scrrun.idl @@ -22,10 +22,6 @@ import "unknwn.idl"; import "objidl.idl"; import "oaidl.idl";
-cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") -cpp_quote("#undef CopyFile") -cpp_quote("#undef MoveFile") -cpp_quote("#endif") /* this is not defined in public headers */ cpp_quote("#define CTL_E_ENDOFFILE STD_CTL_SCODE(62)") cpp_quote("#define CTL_E_KEY_ALREADY_EXISTS STD_CTL_SCODE(457)") diff --git a/dlls/scrrun/tests/scrrun.idl b/dlls/scrrun/tests/scrrun.idl index 9b65aff1d5b..d615de71854 100644 --- a/dlls/scrrun/tests/scrrun.idl +++ b/dlls/scrrun/tests/scrrun.idl @@ -22,10 +22,6 @@ import "unknwn.idl"; import "objidl.idl"; import "oaidl.idl";
-cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") -cpp_quote("#undef CopyFile") -cpp_quote("#undef MoveFile") -cpp_quote("#endif") /* this is not defined in public headers */ cpp_quote("#define CTL_E_ENDOFFILE STD_CTL_SCODE(62)") cpp_quote("#define CTL_E_KEY_ALREADY_EXISTS STD_CTL_SCODE(457)") diff --git a/include/winbase.h b/include/winbase.h index 692c13ed13a..6f609176148 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1898,7 +1898,12 @@ WINBASEAPI HANDLE WINAPI ConvertToGlobalHandle(HANDLE hSrc); WINBASEAPI BOOL WINAPI CopyContext(CONTEXT*, DWORD, CONTEXT*); WINBASEAPI BOOL WINAPI CopyFileA(LPCSTR,LPCSTR,BOOL); WINBASEAPI BOOL WINAPI CopyFileW(LPCWSTR,LPCWSTR,BOOL); -#define CopyFile WINELIB_NAME_AW(CopyFile) +#ifndef WINE_NO_UNICODE_MACROS +static inline BOOL CopyFile( LPCTSTR source, LPCTSTR dest, BOOL fail_if_exists ) +{ + return WINELIB_NAME_AW(CopyFile)( source, dest, fail_if_exists ); +} +#endif WINBASEAPI HRESULT WINAPI CopyFile2(PCWSTR,PCWSTR,COPYFILE2_EXTENDED_PARAMETERS*); WINBASEAPI BOOL WINAPI CopyFileExA(LPCSTR, LPCSTR, LPPROGRESS_ROUTINE, LPVOID, LPBOOL, DWORD); WINBASEAPI BOOL WINAPI CopyFileExW(LPCWSTR, LPCWSTR, LPPROGRESS_ROUTINE, LPVOID, LPBOOL, DWORD); @@ -2017,11 +2022,7 @@ WINBASEAPI BOOL WINAPI DeleteFileW(LPCWSTR); #ifndef WINE_NO_UNICODE_MACROS static inline BOOL DeleteFile( LPCTSTR file_name ) { -#ifdef UNICODE - return DeleteFileW( file_name ); -#else - return DeleteFileA( file_name ); -#endif + return WINELIB_NAME_AW(DeleteFile)( file_name ); } #endif WINBASEAPI void WINAPI DeleteProcThreadAttributeList(struct _PROC_THREAD_ATTRIBUTE_LIST*); @@ -2570,7 +2571,12 @@ WINBASEAPI LPVOID WINAPI MapViewOfFileEx(HANDLE,DWORD,DWORD,DWORD,SIZE_T,LP WINBASEAPI LPVOID WINAPI MapViewOfFileFromApp(HANDLE,ULONG,ULONG64,SIZE_T); WINBASEAPI BOOL WINAPI MoveFileA(LPCSTR,LPCSTR); WINBASEAPI BOOL WINAPI MoveFileW(LPCWSTR,LPCWSTR); -#define MoveFile WINELIB_NAME_AW(MoveFile) +#ifndef WINE_NO_UNICODE_MACROS +static inline BOOL MoveFile( LPCTSTR source, LPCTSTR dest) +{ + return WINELIB_NAME_AW(MoveFile)( source, dest ); +} +#endif WINBASEAPI BOOL WINAPI MoveFileExA(LPCSTR,LPCSTR,DWORD); WINBASEAPI BOOL WINAPI MoveFileExW(LPCWSTR,LPCWSTR,DWORD); #define MoveFileEx WINELIB_NAME_AW(MoveFileEx)