Module: wine Branch: master Commit: a2ba7dcf7b6dd0ddc3571c4f034510f6060aa5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2ba7dcf7b6dd0ddc3571c4f03...
Author: Alexandre Julliard julliard@winehq.org Date: Fri May 30 10:02:42 2008 +0200
include: Use WINE_NO_UNICODE_MACROS instead of __WINESRC__ where appropriate.
---
include/dbt.h | 6 +++--- include/dxdiag.h | 2 +- include/mapidefs.h | 2 +- include/msiquery.h | 2 +- include/setupapi.h | 6 +++--- include/shlwapi.h | 2 +- include/winbase.h | 3 +-- include/winnt.h | 4 ++-- include/winuser.h | 3 +-- 9 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/include/dbt.h b/include/dbt.h index 7ae8498..0110e6c 100644 --- a/include/dbt.h +++ b/include/dbt.h @@ -20,11 +20,11 @@ #define __WINE_DBT_H
/* dbt.h doesn't use the normal convention, it adds an underscore before A/W */ -#ifdef __WINESRC__ +#ifdef WINE_NO_UNICODE_MACROS # define DECL_WINELIB_DBT_TYPE_AW(type) /* nothing */ -#else /* __WINESRC__ */ +#else # define DECL_WINELIB_DBT_TYPE_AW(type) typedef WINELIB_NAME_AW(type##_) type; -#endif /* __WINESRC__ */ +#endif
#define DBT_NO_DISK_SPACE 0x0047 #define DBT_LOW_DISK_SPACE 0x0048 diff --git a/include/dxdiag.h b/include/dxdiag.h index f080ec8..47cd36e 100644 --- a/include/dxdiag.h +++ b/include/dxdiag.h @@ -67,7 +67,7 @@ typedef struct IDxDiagContainer *LPDXDIAGCONTAINER, *PDXDIAGCONTAINER; /***************************************************************************** * IDxDiagContainer interface */ -#ifdef __WINESRC__ +#ifdef WINE_NO_UNICODE_MACROS #undef GetProp #endif
diff --git a/include/mapidefs.h b/include/mapidefs.h index 4f7cbd4..2744427 100644 --- a/include/mapidefs.h +++ b/include/mapidefs.h @@ -218,7 +218,7 @@ typedef struct _MAPIUID #define MVI_FLAG (MV_FLAG|MV_INSTANCE) #define MVI_PROP(t) ((t)|MVI_FLAG)
-#ifndef __WINESRC__ +#ifndef WINE_NO_UNICODE_MACROS # ifdef UNICODE # define PT_TSTRING PT_UNICODE # define PT_MV_TSTRING (MV_FLAG|PT_UNICODE) diff --git a/include/msiquery.h b/include/msiquery.h index 1c52a76..1358033 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -61,7 +61,7 @@ typedef enum tagMSIMODIFY MSIMODIFY_VALIDATE_DELETE = 11 } MSIMODIFY;
-#ifndef __WINESRC__ +#ifndef WINE_NO_UNICODE_MACROS #define MSIDBOPEN_READONLY (LPCTSTR)0 #define MSIDBOPEN_TRANSACT (LPCTSTR)1 #define MSIDBOPEN_DIRECT (LPCTSTR)2 diff --git a/include/setupapi.h b/include/setupapi.h index 927de6b..cb680d2 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -27,11 +27,11 @@ extern "C" { #endif
/* setupapi doesn't use the normal convention, it adds an underscore before A/W */ -#ifdef __WINESRC__ +#ifdef WINE_NO_UNICODE_MACROS # define DECL_WINELIB_SETUPAPI_TYPE_AW(type) /* nothing */ -#else /* __WINESRC__ */ +#else # define DECL_WINELIB_SETUPAPI_TYPE_AW(type) typedef WINELIB_NAME_AW(type##_) type; -#endif /* __WINESRC__ */ +#endif
#ifdef __cplusplus extern "C" { diff --git a/include/shlwapi.h b/include/shlwapi.h index 94d98c8..e4100fc 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -782,7 +782,7 @@ LPSTR WINAPI StrFormatByteSizeA (DWORD,LPSTR,UINT); /* A/W Pairing is broken for this function */ LPSTR WINAPI StrFormatByteSize64A (LONGLONG,LPSTR,UINT); LPWSTR WINAPI StrFormatByteSizeW (LONGLONG,LPWSTR,UINT); -#ifndef __WINESRC__ +#ifndef WINE_NO_UNICODE_MACROS #ifdef UNICODE #define StrFormatByteSize StrFormatByteSizeW #else diff --git a/include/winbase.h b/include/winbase.h index 03e3bbc..433b985 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -467,8 +467,7 @@ typedef struct _PROCESS_HEAP_ENTRY
#define INVALID_ATOM ((ATOM)0) #define MAXINTATOM 0xc000 -#ifdef __WINESRC__ -/* force using a cast when inside Wine */ +#ifdef WINE_NO_UNICODE_MACROS /* force using a cast */ #define MAKEINTATOM(atom) ((ULONG_PTR)((WORD)(atom))) #else #define MAKEINTATOM(atom) ((LPTSTR)((ULONG_PTR)((WORD)(atom)))) diff --git a/include/winnt.h b/include/winnt.h index 9d6e05d..7085363 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -385,7 +385,7 @@ typedef const WCHAR *PCWSTR, *LPCWSTR; * the emulator. The reason is they depend on the UNICODE * macro which only exists in the user's code. */ -#ifndef __WINESRC__ +#ifndef WINE_NO_UNICODE_MACROS # ifdef UNICODE # ifndef _TCHAR_DEFINED typedef WCHAR TCHAR, *PTCHAR; @@ -404,7 +404,7 @@ typedef LPCSTR PCTSTR, LPCTSTR; # define __TEXT(string) string # endif /* UNICODE */ # define TEXT(quote) __TEXT(quote) -#endif /* __WINESRC__ */ +#endif /* WINE_NO_UNICODE_MACROS */
/* Misc common WIN32 types */ typedef char CCHAR; diff --git a/include/winuser.h b/include/winuser.h index 366ab9f..c569f31 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -652,8 +652,7 @@ typedef struct tagWINDOWPLACEMENT #define MAKEINTRESOURCEA(i) (LPSTR)((ULONG_PTR)((WORD)(i))) #define MAKEINTRESOURCEW(i) (LPWSTR)((ULONG_PTR)((WORD)(i)))
-#ifdef __WINESRC__ -/* force using a cast when inside Wine */ +#ifdef WINE_NO_UNICODE_MACROS /* force using a cast */ #define MAKEINTRESOURCE(i) ((ULONG_PTR)((WORD)(i))) #else #define MAKEINTRESOURCE WINELIB_NAME_AW(MAKEINTRESOURCE)