Rename __WINE__ to __WINESRC__.
This commit is contained in:
parent
b4a4c05aed
commit
8b36681bad
|
@ -171,13 +171,13 @@ $(SUBDIRS:%=%/__man__): dummy
|
|||
cd `dirname $@` && $(MAKE) man
|
||||
|
||||
man: $(C_SRCS) $(SUBDIRS:%=%/__man__)
|
||||
if [ -n "$(C_SRCS)" ]; then $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/man3w; for i in $(C_SRCS); do $(C2MAN) -L -o $(TOPOBJDIR)/documentation/man3w -S3w $(DIVINCL) -D__WINE__ $(MANSPECS) $$i; done; fi
|
||||
if [ -n "$(C_SRCS)" ]; then $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/man3w; for i in $(C_SRCS); do $(C2MAN) -L -o $(TOPOBJDIR)/documentation/man3w -S3w $(DIVINCL) -D__WINESRC__ $(MANSPECS) $$i; done; fi
|
||||
|
||||
$(SUBDIRS:%=%/__doc_html__): dummy
|
||||
cd `dirname $@` && $(MAKE) doc-html
|
||||
|
||||
doc-html: $(C_SRCS) $(SUBDIRS:%=%/__doc_html__)
|
||||
if [ -n "$(C_SRCS)" ]; then $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/html; for i in $(C_SRCS); do $(C2MAN) -L -o $(TOPOBJDIR)/documentation/html -Th -iwindows.h $(DIVINCL) -D__WINE__ $(MANSPECS) $$i; done; fi
|
||||
if [ -n "$(C_SRCS)" ]; then $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/html; for i in $(C_SRCS); do $(C2MAN) -L -o $(TOPOBJDIR)/documentation/html -Th -iwindows.h $(DIVINCL) -D__WINESRC__ $(MANSPECS) $$i; done; fi
|
||||
|
||||
.PHONY: man doc-html $(SUBDIRS:%=%/__man__) $(SUBDIRS:%=%/__doc_html__)
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
# plus all variables required by the global Make.rules.in
|
||||
#
|
||||
|
||||
DEFS = @DLLFLAGS@ -D__WINE__ $(EXTRADEFS)
|
||||
DEFS = @DLLFLAGS@ -D__WINESRC__ $(EXTRADEFS)
|
||||
DLLEXT = @DLLEXT@
|
||||
ALTSPECS = $(ALTNAMES:%.dll=%)
|
||||
SPEC_SRCS = $(ALTSPECS:%=%.spec)
|
||||
|
|
|
@ -79,7 +79,7 @@ typedef struct {
|
|||
#define DRV_QUERYNAME (DRV_RESERVED + 3)
|
||||
#define DRV_QUERYDRIVERIDS (DRV_RESERVED + 4)
|
||||
#define DRV_QUERYMAPPABLE (DRV_RESERVED + 5)
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
#define DRV_QUERYDSOUNDIFACE (DRV_RESERVED + 10)
|
||||
#endif
|
||||
|
||||
|
|
|
@ -228,7 +228,7 @@ LRESULT WINAPI SendDriverMessage(HDRVR hDriver, UINT message,
|
|||
HMODULE WINAPI GetDriverModuleHandle(HDRVR hDriver);
|
||||
|
||||
DWORD WINAPI GetDriverFlags(HDRVR hDriver);
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
/* this call (GetDriverFlags) is not documented, nor the flags returned.
|
||||
* here are Wine only definitions
|
||||
*/
|
||||
|
@ -303,7 +303,7 @@ typedef LPDRVCALLBACK LPWAVECALLBACK;
|
|||
#define WAVE_MAPPED 0x0004
|
||||
#define WAVE_FORMAT_DIRECT 0x0008
|
||||
#define WAVE_FORMAT_DIRECT_QUERY (WAVE_FORMAT_QUERY | WAVE_FORMAT_DIRECT)
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
#define WAVE_DIRECTSOUND 0x0080
|
||||
#endif
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#ifndef __WINE_OAIDL_H
|
||||
#define __WINE_OAIDL_H
|
||||
|
||||
#if defined(__WINE__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OAIDL)
|
||||
#if defined(__WINESRC__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OAIDL)
|
||||
#error DO NOT INCLUDE DIRECTLY
|
||||
#endif
|
||||
|
||||
|
|
|
@ -805,7 +805,7 @@ HRESULT WINAPI StgOpenStorageOnILockBytes(ILockBytes *plkbyt, IStorage *pstgPrio
|
|||
#define ICOM_CALL26(xfn, ptr,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z) ICOM_VTBL(ptr)->xfn(ptr,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z)
|
||||
|
||||
|
||||
#ifndef __WINE__
|
||||
#ifndef __WINESRC__
|
||||
/* These macros are msdev's way of defining COM objects.
|
||||
* They are provided here for use by Winelib developpers.
|
||||
*/
|
||||
|
@ -859,6 +859,6 @@ HRESULT WINAPI StgOpenStorageOnILockBytes(ILockBytes *plkbyt, IStorage *pstgPrio
|
|||
|
||||
#endif /* __cplusplus && !CINTERFACE */
|
||||
|
||||
#endif /* __WINE__ */
|
||||
#endif /* __WINESRC__ */
|
||||
|
||||
#endif /* _OBJBASE_H_ */
|
||||
|
|
|
@ -1711,7 +1711,7 @@ void __RPC_STUB IRunnableObject_SetContainedObject_Stub(
|
|||
PRPC_MESSAGE pRpcMessage,
|
||||
DWORD* pdwStubPhase);
|
||||
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
#undef GetObject
|
||||
#endif
|
||||
typedef IRunningObjectTable *LPRUNNINGOBJECTTABLE;
|
||||
|
|
|
@ -424,10 +424,10 @@ interface IRunnableObject : IUnknown
|
|||
}
|
||||
|
||||
/* GetObject is defined in wingdi.h as WINELIB_NAME_AW(GetObject),
|
||||
* which resolves to a compilation failure if __WINE__ is defined,
|
||||
* which resolves to a compilation failure if __WINESRC__ is defined,
|
||||
* but GetObject is used as a valid method name below, so we have
|
||||
* to undefine it if __WINE__ is defined */
|
||||
cpp_quote("#ifdef __WINE__")
|
||||
* to undefine it if __WINESRC__ is defined */
|
||||
cpp_quote("#ifdef __WINESRC__")
|
||||
cpp_quote("#undef GetObject")
|
||||
cpp_quote("#endif")
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#ifndef __WINE_OCIDL_H
|
||||
#define __WINE_OCIDL_H
|
||||
|
||||
#if defined(__WINE__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OCIDL)
|
||||
#if defined(__WINESRC__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OCIDL)
|
||||
#error DO NOT INCLUDE DIRECTLY
|
||||
#endif
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#ifndef __WINE_OLEIDL_H
|
||||
#define __WINE_OLEIDL_H
|
||||
|
||||
#if defined(__WINE__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OLEIDL)
|
||||
#if defined(__WINESRC__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OLEIDL)
|
||||
#error DO NOT INCLUDE DIRECTLY
|
||||
#endif
|
||||
|
||||
|
|
|
@ -264,7 +264,7 @@ DECL_WINELIB_TYPE_AW(LPFNPSPCALLBACK)
|
|||
#define PSH_WIZARD_LITE 0x00400000
|
||||
#define PSH_WIZARD97_NEW 0x01000000 /* for IE >= 5 */
|
||||
#define PSH_NOCONTEXTHELP 0x02000000
|
||||
#ifndef __WINE__
|
||||
#ifndef __WINESRC__
|
||||
# if _WIN32_IE < 0x0500
|
||||
# define PSH_WIZARD97 PSH_WIZARD97_OLD
|
||||
# else
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#if !defined(RPC_NO_WINDOWS_H) && !defined(__WINE__)
|
||||
#if !defined(RPC_NO_WINDOWS_H) && !defined(__WINESRC__)
|
||||
#include "windows.h"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include "windef.h"
|
||||
|
||||
/* avoid delving into windows.h ifndef __WINE__; this
|
||||
/* avoid delving into windows.h ifndef __WINESRC__; this
|
||||
would pull in rpcndr.h, which needs rpcdcep.h, which
|
||||
needs us, in turn, causing a compile failure */
|
||||
#ifndef RPC_NO_WINDOWS_H
|
||||
|
|
|
@ -195,7 +195,7 @@ ULONG WINAPI CStdStubBuffer_Release(IRpcStubBuffer *This) \
|
|||
|
||||
#define IID_GENERIC_CHECK_IID(name,pIID,index) memcmp(pIID, name##_ProxyVtblList[index]->header.piid, sizeof(IID))
|
||||
|
||||
#if defined(__WINE__) && defined(__WINE_WINE_OBJ_OLEAUT_H)
|
||||
#if defined(__WINESRC__) && defined(__WINE_WINE_OBJ_OLEAUT_H)
|
||||
/* see http://msdn.microsoft.com/library/en-us/dnmsj99/html/com0199.asp?frame=true */
|
||||
|
||||
RPCRTAPI HRESULT RPC_ENTRY
|
||||
|
|
|
@ -715,7 +715,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 __WINE__
|
||||
#ifndef __WINESRC__
|
||||
#ifdef UNICODE
|
||||
#define StrFormatByteSize StrFormatByteSizeW
|
||||
#else
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#ifndef __WINE_TCHAR_H
|
||||
#define __WINE_TCHAR_H
|
||||
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
#error Wine should not include tchar.h internally
|
||||
#endif
|
||||
|
||||
|
|
|
@ -828,7 +828,7 @@ typedef DWORD (CALLBACK *LPPROGRESS_ROUTINE)(LARGE_INTEGER, LARGE_INTEGER, LARGE
|
|||
#define FORMAT_MESSAGE_ARGUMENT_ARRAY 0x00002000
|
||||
#define FORMAT_MESSAGE_MAX_WIDTH_MASK 0x000000FF
|
||||
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
#define CRITICAL_SECTION_INIT(name) { (void *)(__FILE__ ": " name), -1, 0, 0, 0, 0 }
|
||||
#endif
|
||||
|
||||
|
@ -1944,7 +1944,7 @@ static inline PVOID WINAPI InterlockedExchangePointer( PVOID *dest, PVOID val )
|
|||
return (PVOID)InterlockedExchange( (PLONG)dest, (LONG)val );
|
||||
}
|
||||
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
#define GetCurrentProcess() ((HANDLE)0xffffffff)
|
||||
#define GetCurrentThread() ((HANDLE)0xfffffffe)
|
||||
#endif
|
||||
|
|
|
@ -21,9 +21,9 @@
|
|||
#ifndef __WINE_WINDEF_H
|
||||
#define __WINE_WINDEF_H
|
||||
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
# undef UNICODE
|
||||
#endif /* __WINE__ */
|
||||
#endif /* __WINESRC__ */
|
||||
|
||||
#ifndef WINVER
|
||||
#define WINVER 0x0500
|
||||
|
@ -58,7 +58,7 @@ extern "C" {
|
|||
# define __cdecl
|
||||
#endif /* __i386__ */
|
||||
|
||||
#ifndef __WINE__
|
||||
#ifndef __WINESRC__
|
||||
|
||||
#ifndef pascal
|
||||
#define pascal __stdcall
|
||||
|
@ -111,7 +111,7 @@ extern "C" {
|
|||
#define __declspec(x)
|
||||
#endif
|
||||
|
||||
#endif /* __WINE__ */
|
||||
#endif /* __WINESRC__ */
|
||||
|
||||
#define CALLBACK __stdcall
|
||||
#define WINAPI __stdcall
|
||||
|
@ -175,26 +175,26 @@ typedef double DATE;
|
|||
#include "winnt.h"
|
||||
|
||||
/* Macros to map Winelib names to the correct implementation name */
|
||||
/* depending on __WINE__ and UNICODE macros. */
|
||||
/* depending on __WINESRC__ and UNICODE macros. */
|
||||
/* Note that Winelib is purely Win32. */
|
||||
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
# define WINELIB_NAME_AW(func) \
|
||||
func##_must_be_suffixed_with_W_or_A_in_this_context \
|
||||
func##_must_be_suffixed_with_W_or_A_in_this_context
|
||||
#else /* __WINE__ */
|
||||
#else /* __WINESRC__ */
|
||||
# ifdef UNICODE
|
||||
# define WINELIB_NAME_AW(func) func##W
|
||||
# else
|
||||
# define WINELIB_NAME_AW(func) func##A
|
||||
# endif /* UNICODE */
|
||||
#endif /* __WINE__ */
|
||||
#endif /* __WINESRC__ */
|
||||
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
# define DECL_WINELIB_TYPE_AW(type) /* nothing */
|
||||
#else /* __WINE__ */
|
||||
#else /* __WINESRC__ */
|
||||
# define DECL_WINELIB_TYPE_AW(type) typedef WINELIB_NAME_AW(type) type;
|
||||
#endif /* __WINE__ */
|
||||
#endif /* __WINESRC__ */
|
||||
|
||||
|
||||
/* Integer types */
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#ifndef __WINE_WINDOWS_H
|
||||
#define __WINE_WINDOWS_H
|
||||
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
#error Wine should not include windows.h internally
|
||||
#endif
|
||||
|
||||
|
|
|
@ -174,7 +174,7 @@ static inline const char *wine_dbgstr_rect( const RECT *rect )
|
|||
#define WINE_DPRINTF wine_dbg_printf
|
||||
#define WINE_MESSAGE wine_dbg_printf
|
||||
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
/* Wine uses shorter names that are very likely to conflict with other software */
|
||||
|
||||
inline static const char *debugstr_an( const char * s, int n ) { return wine_dbgstr_an( s, n ); }
|
||||
|
@ -203,7 +203,7 @@ inline static const char *debugstr_w( const WCHAR *s ) { return wine_dbgstr_wn(
|
|||
#define DPRINTF WINE_DPRINTF
|
||||
#define MESSAGE WINE_MESSAGE
|
||||
|
||||
#endif /* __WINE__ */
|
||||
#endif /* __WINESRC__ */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
@ -424,7 +424,7 @@ ICOM_DEFINE(IViewObjectEx,IViewObject2)
|
|||
/*****************************************************************************
|
||||
* IProvideClassInfo interface
|
||||
*/
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
#undef GetClassInfo
|
||||
#endif
|
||||
|
||||
|
|
|
@ -425,7 +425,7 @@ ICOM_DEFINE(IOleContainer,IParseDisplayName)
|
|||
/*****************************************************************************
|
||||
* IOleItemContainer interface
|
||||
*/
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
#undef GetObject
|
||||
#endif
|
||||
|
||||
|
|
|
@ -136,7 +136,7 @@
|
|||
|
||||
/* Anonymous union/struct handling */
|
||||
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
# define NONAMELESSSTRUCT
|
||||
# define NONAMELESSUNION
|
||||
#else
|
||||
|
@ -266,7 +266,7 @@
|
|||
# define EXTERN_C extern
|
||||
#endif
|
||||
|
||||
#ifndef __WINE__
|
||||
#ifndef __WINESRC__
|
||||
#define STDMETHODCALLTYPE __stdcall
|
||||
#define STDMETHODVCALLTYPE __cdecl
|
||||
#define STDAPICALLTYPE __stdcall
|
||||
|
@ -328,7 +328,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 __WINE__
|
||||
#ifndef __WINESRC__
|
||||
# ifdef WINE_UNICODE_REWRITE
|
||||
|
||||
/* Use this if your compiler does not provide a 16bit wchar_t type.
|
||||
|
@ -379,7 +379,7 @@ typedef LPCSTR PCTSTR, LPCTSTR;
|
|||
# define __TEXT(string) string
|
||||
# endif /* UNICODE */
|
||||
# define TEXT(quote) __TEXT(quote)
|
||||
#endif /* __WINE__ */
|
||||
#endif /* __WINESRC__ */
|
||||
|
||||
/* Misc common WIN32 types */
|
||||
typedef char CCHAR;
|
||||
|
@ -474,7 +474,7 @@ typedef struct _MEMORY_BASIC_INFORMATION
|
|||
#define MEM_MAPPED 0x00040000
|
||||
#define MEM_RESET 0x00080000
|
||||
#define MEM_TOP_DOWN 0x00100000
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
#define MEM_SYSTEM 0x80000000
|
||||
#endif
|
||||
|
||||
|
@ -1132,7 +1132,7 @@ typedef struct _CONTEXT
|
|||
|
||||
typedef CONTEXT *PCONTEXT;
|
||||
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
|
||||
/* Macros to retrieve the current context */
|
||||
|
||||
|
@ -1269,7 +1269,7 @@ static DWORD __builtin_return_address(int p_iDepth)
|
|||
#error You need to define DEFINE_REGS_ENTRYPOINT macros for your CPU
|
||||
#endif
|
||||
|
||||
#endif /* __WINE__ */
|
||||
#endif /* __WINESRC__ */
|
||||
|
||||
/*
|
||||
* Language IDs
|
||||
|
|
|
@ -20,13 +20,13 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
# ifndef __WINE_WINSOCK2__
|
||||
# error Please use Winsock2 in Wine
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef __WINE__
|
||||
#ifndef __WINESRC__
|
||||
# include "windows.h"
|
||||
#else
|
||||
# include "windef.h"
|
||||
|
@ -720,7 +720,7 @@ typedef struct WS(WSAData)
|
|||
#define FD_CLOSE 0x00000020
|
||||
|
||||
/* internal per-socket flags */
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
#define FD_WINE_LISTENING 0x10000000
|
||||
#define FD_WINE_NONBLOCKING 0x20000000
|
||||
#define FD_WINE_CONNECTED 0x40000000
|
||||
|
@ -936,7 +936,7 @@ u_long WINAPI WS(ntohl)(u_long);
|
|||
u_short WINAPI WS(ntohs)(u_short);
|
||||
#endif
|
||||
|
||||
#if defined(__WINE__) || !defined(__WINE_WINSOCK2__)
|
||||
#if defined(__WINESRC__) || !defined(__WINE_WINSOCK2__)
|
||||
/* Stuff specific to winsock.h */
|
||||
|
||||
#include "mswsock.h"
|
||||
|
|
|
@ -475,7 +475,7 @@ typedef struct _OBJECT_ATTRIBUTES {
|
|||
} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES;
|
||||
|
||||
typedef struct _PROCESS_BASIC_INFORMATION {
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
DWORD ExitStatus;
|
||||
DWORD PebBaseAddress;
|
||||
DWORD AffinityMask;
|
||||
|
@ -556,7 +556,7 @@ typedef struct _RTL_RWLOCK {
|
|||
|
||||
/* System Information Class 0x00 */
|
||||
typedef struct _SYSTEM_BASIC_INFORMATION {
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
DWORD dwUnknown1;
|
||||
ULONG uKeMaximumIncrement;
|
||||
ULONG uPageSize;
|
||||
|
@ -645,7 +645,7 @@ typedef struct _SYSTEM_PERFORMANCE_INFORMATION {
|
|||
|
||||
/* System Information Class 0x02 */
|
||||
typedef struct _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION {
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
LARGE_INTEGER liIdleTime;
|
||||
DWORD dwSpare[76];
|
||||
#else
|
||||
|
@ -659,7 +659,7 @@ typedef struct _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION {
|
|||
|
||||
/* System Information Class 0x05 */
|
||||
typedef struct _SYSTEM_PROCESS_INFORMATION {
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
DWORD dwOffset;
|
||||
DWORD dwThreadCount;
|
||||
DWORD dwUnknown1[6];
|
||||
|
@ -714,7 +714,7 @@ typedef struct _SYSTEM_TIME_ADJUSTMENT {
|
|||
|
||||
/* System Information Class 0x03 */
|
||||
typedef struct _SYSTEM_TIMEOFDAY_INFORMATION {
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
LARGE_INTEGER liKeBootTime;
|
||||
LARGE_INTEGER liKeSystemTime;
|
||||
LARGE_INTEGER liExpTimeZoneBias;
|
||||
|
|
|
@ -59,7 +59,7 @@ typedef enum
|
|||
HANDLE WINAPI WOWHandle32(WORD,WOW_HANDLE_TYPE);
|
||||
WORD WINAPI WOWHandle16(HANDLE,WOW_HANDLE_TYPE);
|
||||
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
/* under Wine use the kernel functions directly so we don't have to import wow32 */
|
||||
HANDLE WINAPI K32WOWHandle32(WORD,WOW_HANDLE_TYPE);
|
||||
WORD WINAPI K32WOWHandle16(HANDLE,WOW_HANDLE_TYPE);
|
||||
|
@ -67,7 +67,7 @@ WORD WINAPI K32WOWHandle16(HANDLE,WOW_HANDLE_TYPE);
|
|||
#define WOWHandle16 K32WOWHandle16
|
||||
#endif
|
||||
|
||||
#ifdef __WINE__
|
||||
#ifdef __WINESRC__
|
||||
/* under Wine we use optimized versions where we can */
|
||||
#define HWND_32(h16) ((HWND) (ULONG_PTR)(h16))
|
||||
#define HMENU_32(h16) ((HMENU) (ULONG_PTR)(h16))
|
||||
|
@ -95,7 +95,7 @@ WORD WINAPI K32WOWHandle16(HANDLE,WOW_HANDLE_TYPE);
|
|||
#define HPEN_16(h32) (LOWORD(h32))
|
||||
#define HACCEL_16(h32) (LOWORD(h32))
|
||||
|
||||
#else /* __WINE__ */
|
||||
#else /* __WINESRC__ */
|
||||
|
||||
#define HWND_32(h16) ((HWND) (WOWHandle32(h16, WOW_TYPE_HWND)))
|
||||
#define HMENU_32(h16) ((HMENU) (WOWHandle32(h16, WOW_TYPE_HMENU)))
|
||||
|
@ -123,7 +123,7 @@ WORD WINAPI K32WOWHandle16(HANDLE,WOW_HANDLE_TYPE);
|
|||
#define HPEN_16(h32) (WOWHandle16(h32, WOW_TYPE_HPEN))
|
||||
#define HACCEL_16(h32) (WOWHandle16(h32, WOW_TYPE_HACCEL))
|
||||
|
||||
#endif /* __WINE__ */
|
||||
#endif /* __WINESRC__ */
|
||||
|
||||
#define HMETAFILE_32(h16) ((HMETAFILE)(WOWHandle32(h16, WOW_TYPE_HMETAFILE)))
|
||||
#define HTASK_32(h16) ((DWORD)(WOWHandle32(h16, WOW_TYPE_HTASK)))
|
||||
|
|
|
@ -151,7 +151,7 @@ typedef OLECHAR *LPOLESTR;
|
|||
|
||||
typedef const OLECHAR *LPCOLESTR;
|
||||
|
||||
#ifndef __WINE__
|
||||
#ifndef __WINESRC__
|
||||
#define OLESTR(str) WINE_UNICODE_TEXT(str)
|
||||
#endif
|
||||
typedef CHAR OLECHAR16;
|
||||
|
|
|
@ -153,7 +153,7 @@ cpp_quote("#endif")
|
|||
typedef WCHAR OLECHAR;
|
||||
typedef [string] OLECHAR *LPOLESTR;
|
||||
typedef [string] const OLECHAR *LPCOLESTR;
|
||||
cpp_quote("#ifndef __WINE__")
|
||||
cpp_quote("#ifndef __WINESRC__")
|
||||
cpp_quote("#define OLESTR(str) WINE_UNICODE_TEXT(str)")
|
||||
cpp_quote("#endif")
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
DEFS = @DLLFLAGS@ -D__WINE__ -DDLLDIR="\"$(dlldir)\""
|
||||
DEFS = @DLLFLAGS@ -D__WINESRC__ -DDLLDIR="\"$(dlldir)\""
|
||||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ..
|
||||
SRCDIR = @srcdir@
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
DEFS = -D__WINE__
|
||||
DEFS = -D__WINESRC__
|
||||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ..
|
||||
SRCDIR = @srcdir@
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
DEFS = @DLLFLAGS@ -D__WINE__
|
||||
DEFS = @DLLFLAGS@ -D__WINESRC__
|
||||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ..
|
||||
SRCDIR = @srcdir@
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
DEFS = -D__WINE__
|
||||
DEFS = -D__WINESRC__
|
||||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ..
|
||||
SRCDIR = @srcdir@
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
DEFS = -D__WINE__
|
||||
DEFS = -D__WINESRC__
|
||||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ../..
|
||||
SRCDIR = @srcdir@
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
DEFS = -D__WINE__
|
||||
DEFS = -D__WINESRC__
|
||||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ../..
|
||||
SRCDIR = @srcdir@
|
||||
|
|
|
@ -673,7 +673,7 @@ sub _generate_dsp {
|
|||
my @includes = ();
|
||||
if($wine) {
|
||||
push @defines2, "_\U${project}\E_";
|
||||
push @defines2, qw(__WINE__) if $project !~ /^(?:wine(?:build|test)|.*?_test)$/;
|
||||
push @defines2, qw(__WINESRC__) if $project !~ /^(?:wine(?:build|test)|.*?_test)$/;
|
||||
push @defines2, qw(__WINE_USE_MSVCRT);
|
||||
my $output_dir2 = $output_dir;
|
||||
$output_dir =~ s/\\/\\\\/g;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
DEFS = -D__WINE__
|
||||
DEFS = -D__WINESRC__
|
||||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ../..
|
||||
SRCDIR = @srcdir@
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
DEFS = -D__WINE__
|
||||
DEFS = -D__WINESRC__
|
||||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ../..
|
||||
SRCDIR = @srcdir@
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
DEFS = -D__WINE__
|
||||
DEFS = -D__WINESRC__
|
||||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ../..
|
||||
SRCDIR = @srcdir@
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
DEFS = -D__WINE__
|
||||
DEFS = -D__WINESRC__
|
||||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ../..
|
||||
SRCDIR = @srcdir@
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
DEFS = -D__WINE__ -DINCLUDEDIR="\"$(includedir)\""
|
||||
DEFS = -D__WINESRC__ -DINCLUDEDIR="\"$(includedir)\""
|
||||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ../..
|
||||
SRCDIR = @srcdir@
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
DEFS = @DLLFLAGS@ -D__WINE__
|
||||
DEFS = @DLLFLAGS@ -D__WINESRC__
|
||||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ..
|
||||
SRCDIR = @srcdir@
|
||||
|
|
Loading…
Reference in New Issue