Commit a2ba7dcf authored by Alexandre Julliard's avatar Alexandre Julliard

include: Use WINE_NO_UNICODE_MACROS instead of __WINESRC__ where appropriate.

parent 471f80d6
......@@ -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
......
......@@ -67,7 +67,7 @@ typedef struct IDxDiagContainer *LPDXDIAGCONTAINER, *PDXDIAGCONTAINER;
/*****************************************************************************
* IDxDiagContainer interface
*/
#ifdef __WINESRC__
#ifdef WINE_NO_UNICODE_MACROS
#undef GetProp
#endif
......
......@@ -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)
......
......@@ -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
......
......@@ -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" {
......
......@@ -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
......
......@@ -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))))
......
......@@ -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;
......
......@@ -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)
......
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