Changeset 21493 for trunk/include


Ignore:
Timestamp:
Dec 2, 2010, 1:18:49 AM (15 years ago)
Author:
dmik
Message:

Fixed broken build after r21492 by sorting out a huuuuge wagon of duplicates, wrong include order and other dirty mess.

Location:
trunk/include/win
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/guiddef.h

    r21360 r21493  
    1616 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    1717 */
     18
     19#ifndef _GUIDDEF_H_
     20#define _GUIDDEF_H_
    1821
    1922#ifndef GUID_DEFINED
    … …  
    3740#ifdef INITGUID
    3841#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
    39         const GUID name = \
     42    extern const GUID name = \
    4043        { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
    4144#else
    … …  
    4447#endif
    4548
    46 #define DEFINE_OLEGUID(name, l, w1, w2) \
    47         DEFINE_GUID(name, l, w1, w2, 0xC0,0,0,0,0,0,0,0x46)
    48 
    49 #ifndef _GUIDDEF_H_
    50 #define _GUIDDEF_H_
     49#define DEFINE_OLEGUID(name, l, w1, w2) DEFINE_GUID(name, l, w1, w2, 0xC0,0,0,0,0,0,0,0x46)
    5150
    5251#ifndef __LPGUID_DEFINED__
    … …  
    8786#define IsEqualIID(riid1, riid2) IsEqualGUID(riid1, riid2)
    8887#define IsEqualCLSID(rclsid1, rclsid2) IsEqualGUID(rclsid1, rclsid2)
    89 #if 0
     88
    9089#if defined(__cplusplus) && !defined(CINTERFACE)
    9190#include <string.h>
    92 inline bool operator==(const GUID& guidOne, const GUID& guidOther)
     91inline BOOL operator==(const GUID& guidOne, const GUID& guidOther)
    9392{
    9493    return !memcmp(&guidOne,&guidOther,sizeof(GUID));
    9594}
    96 inline bool operator!=(const GUID& guidOne, const GUID& guidOther)
     95inline BOOL operator!=(const GUID& guidOne, const GUID& guidOther)
    9796{
    9897    return !(guidOne == guidOther);
    9998}
    10099#endif
    101 #endif
     100
    102101extern const IID GUID_NULL;
     102
    103103#define IID_NULL            GUID_NULL
    104 #define CLSID_NULL GUID_NULL
     104#define CLSID_NULL          GUID_NULL
    105105#define FMTID_NULL          GUID_NULL
    106106

  • trunk/include/win/objbase.h

    r21492 r21493  
    33
    44#define _OBJBASE_H_
    5 
    6 #include "rpc.h"
    75
    86#include "wine/obj_base.h"
    … …  
    2725
    2826
    29 /*    These macros are msdev's way of defining COM objects. They are provided 
     27/*    These macros are msdev's way of defining COM objects. They are provided
    3028 * here for use by winelib users.
    3129 */

  • trunk/include/win/rpcdce.h

    r5598 r21493  
    1414#define RPCRTAPI DECLSPEC_IMPORT
    1515#define RPCNSAPI DECLSPEC_IMPORT
    16 
    17 #include <rpc.h>
    1816
    1917/*typedef char small;*/
    … …  
    11791177#endif /* RPC_UNICODE_SUPPORTED */
    11801178
    1181 #ifndef __WINE_WTYPES_H
    11821179typedef void __RPC_FAR * RPC_AUTH_IDENTITY_HANDLE;
    11831180typedef void __RPC_FAR * RPC_AUTHZ_HANDLE;
    1184 #endif
    11851181
    11861182#define RPC_C_AUTHN_LEVEL_DEFAULT       0

  • trunk/include/win/windef.h

    r21478 r21493  
    1212# undef UNICODE
    1313#endif  /* __WINE__ */
     14
     15#ifdef __WIN32OS2__
     16#if defined (__IBMC__) || (defined(__IBMCPP__) && (__IBMCPP__ < 400))
     17#define CINTERFACE
     18#endif
     19#endif
    1420
    1521#define WINVER 0x0500

  • trunk/include/win/windows.h

    r21488 r21493  
    1010#ifdef __WIN32OS2__
    1111#include <odin.h>
    12 #if defined (__IBMC__) || (defined(__IBMCPP__) && (__IBMCPP__ < 400))
    13 #define CINTERFACE 1
    14 #endif
    1512#endif
    1613

  • trunk/include/win/wine/obj_base.h

    r21486 r21493  
    33 * and the three most basic COM interfaces: IUnknown, IMalloc and IClassFactory.
    44 */
     5
     6#ifndef RC_INVOKED
     7#include "rpc.h"
     8#include "rpcndr.h"
     9#endif
    510
    611#ifndef __WINE_WINE_OBJ_BASE_H
    … …  
    3035#include <string.h>
    3136#endif
     37
    3238#include "wtypes.h"
    33 
    3439
    3540#define LISet32(li, v)   ((li).HighPart = (v) < 0 ? -1 : 0, (li).LowPart = (v))
    3641#define ULISet32(li, v)  ((li).HighPart = 0, (li).LowPart = (v))
    37 
    38 /*****************************************************************************
    39  * Macros to declare the GUIDs
    40  */
    41 #ifdef INITGUID
    42 #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
    43         extern const GUID name = \
    44         { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
    45 #else
    46 #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
    47     extern const GUID name
    48 #endif
    49 
    50 #define DEFINE_OLEGUID(name, l, w1, w2) \
    51         DEFINE_GUID(name, l, w1, w2, 0xC0,0,0,0,0,0,0,0x46)
    52 
    53 #define DEFINE_SHLGUID(name, l, w1, w2) DEFINE_OLEGUID(name,l,w1,w2)
    54 
    55 
    56 /*****************************************************************************
    57  * GUID API
    58  */
    59 HRESULT WINAPI StringFromCLSID16(REFCLSID id, LPOLESTR16*);
    60 HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR*);
    61 
    62 HRESULT WINAPI CLSIDFromString16(LPCOLESTR16, CLSID *);
    63 HRESULT WINAPI CLSIDFromString(LPCOLESTR, CLSID *);
    64 HRESULT WINAPI CLSIDFromStringA(LPCSTR, CLSID *);
    65 
    66 HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid);
    67 HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID riid);
    68 
    69 HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID);
    70 
    71 INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax);
    72 
    73 BOOL16 WINAPI IsEqualGUID16(GUID* g1,GUID* g2);
    74 BOOL WINAPI IsEqualGUID32(REFGUID rguid1,REFGUID rguid2);
    75 /*#define IsEqualGUID WINELIB_NAME(IsEqualGUID)*/
    76 #if defined(__cplusplus) && !defined(CINTERFACE)
    77 #define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID)))
    78 #else /* defined(__cplusplus) && !defined(CINTERFACE) */
    79 #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))
    80 #endif /* defined(__cplusplus) && !defined(CINTERFACE) */
    81 #define IsEqualIID(riid1, riid2) IsEqualGUID(riid1, riid2)
    82 #define IsEqualCLSID(rclsid1, rclsid2) IsEqualGUID(rclsid1, rclsid2)
    83 
    84 #if defined(__cplusplus) && !defined(CINTERFACE)
    85 inline BOOL operator==(const GUID& guidOne, const GUID& guidOther)
    86 {
    87     return !memcmp(&guidOne,&guidOther,sizeof(GUID));
    88 }
    89 inline BOOL operator!=(const GUID& guidOne, const GUID& guidOther)
    90 {
    91     return !(guidOne == guidOther);
    92 }
    93 #endif
    94 
    9542
    9643/*****************************************************************************
    … …  
    908855LPVOID WINAPI CoTaskMemRealloc(LPVOID ptr, ULONG size);
    909856
     857/*****************************************************************************
     858 * GUID API
     859 */
     860
     861HRESULT WINAPI StringFromCLSID16(REFCLSID id, LPOLESTR16*);
     862HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR*);
     863
     864HRESULT WINAPI CLSIDFromString16(LPCOLESTR16, CLSID *);
     865HRESULT WINAPI CLSIDFromString(LPCOLESTR, CLSID *);
     866HRESULT WINAPI CLSIDFromStringA(LPCSTR, CLSID *);
     867
     868HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid);
     869HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID riid);
     870
     871HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID);
     872
     873INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax);
     874
     875BOOL16 WINAPI IsEqualGUID16(GUID* g1,GUID* g2);
     876BOOL WINAPI IsEqualGUID32(REFGUID rguid1,REFGUID rguid2);
    910877
    911878/*****************************************************************************

  • trunk/include/win/wine/obj_oleobj.h

    r4833 r21493  
    22/*
    33 * Defines IOleObject COM and other oleidl.h interfaces
    4  * 
     4 *
    55 * Depends on 'obj_base.h'.
    66 */
    … …  
    3232        DWORD dwSrcOfCopy;
    3333} OBJECTDESCRIPTOR, *LPOBJECTDESCRIPTOR;
    34        
     34
    3535typedef enum tagOLEMISC
    3636{
    … …  
    6969 */
    7070DEFINE_OLEGUID(IID_IOleObject,  0x00000112L, 0, 0);
    71 //#if defined(__WINE_OLE_H) && !defined(NO_LPOLEOBJECT)
    72 //typedef struct IOleObject IOleObject, *LPOLEOBJECT;
    73 //#else
    7471#if !defined(__WINE_OLE_H)
    7572typedef struct IOleObject IOleObject, *LPOLEOBJECT;
    … …  
    7774typedef struct IOleObject IOleObject;
    7875#endif
    79 //#endif
    8076
    8177DEFINE_OLEGUID(IID_IOleAdviseHolder,  0x00000111L, 0, 0);
    … …  
    8480DEFINE_OLEGUID(IID_IEnumOLEVERB,  0x00000104L, 0, 0);
    8581typedef struct IEnumOLEVERB IEnumOLEVERB, *LPENUMOLEVERB;
    86  
     82
    8783/*****************************************************************************
    8884 * IOleObject interface
    … …  
    116112ICOM_DEFINE(IOleObject,IUnknown)
    117113#undef ICOM_INTERFACE
    118                                  
     114
    119115#ifdef ICOM_CINTERFACE
    120116/*** IUnknwon methods ***/
    … …  
    145141#define IOleObject_SetColorScheme(p,a,b)    ICOM_CALL1(SetColorScheme,p,a)
    146142#endif
    147                                  
     143
    148144
    149145/*****************************************************************************
    … …  
    177173#define IOleAdviseHolder_SendOnClose(p)             ICOM_CALL (SendOnClose,p)
    178174#endif
    179                                  
     175
    180176
    181177/*****************************************************************************
    … …  
    209205} /* extern "C" */
    210206#endif /* defined(__cplusplus) */
    211                                  
     207
    212208#endif /* __WINE_WINE_OBJ_OLEOBJ_H */
    213209

  • trunk/include/win/wtypes.h

    r21360 r21493  
    88
    99#include "windef.h"
    10 
    11 /* FIXME: this line should be in rpcndr.h */
    12 typedef unsigned char byte;
    13 
    14 /* FIXME: and the following group should be in rpcdce.h */
    15 typedef void* RPC_AUTH_IDENTITY_HANDLE;
    16 typedef void* RPC_AUTHZ_HANDLE;
    17 
     10#include "guiddef.h"
    1811
    1912typedef WORD CLIPFORMAT, *LPCLIPFORMAT;
    … …  
    3730#define OLESTR(x) L##x
    3831
    39 #ifndef GUID_DEFINED
    40 #define GUID_DEFINED
    41 typedef struct _GUID
    42 {
    43     DWORD Data1;
    44     WORD  Data2;
    45     WORD  Data3;
    46     BYTE  Data4[8];
    47 } GUID;
    48 #endif
    49 
    50 #ifndef __LPGUID_DEFINED__
    51 #define __LPGUID_DEFINED__
    52 typedef GUID  *LPGUID;
    53 typedef GUID  CLSID, *LPCLSID;
    54 typedef GUID    IID,*LPIID;
    55 typedef GUID    FMTID,*LPFMTID;
    56 
    57 #endif
    58 
    59 
    60 #if defined(__cplusplus) && !defined(CINTERFACE)
    61 #define REFGUID             const GUID &
    62 #define REFCLSID            const CLSID &
    63 #define REFIID              const IID &
    64 #define REFFMTID            const FMTID &
    65 #else /* !defined(__cplusplus) && !defined(CINTERFACE) */
    66 #define REFGUID             const GUID* const
    67 #define REFCLSID            const CLSID* const
    68 #define REFIID              const IID* const
    69 #define REFFMTID            const FMTID* const
    70 //#define REFGUID             const GUID*
    71 //#define REFCLSID            const CLSID*
    72 //#define REFIID              const IID*
    73 //#define REFFMTID            const FMTID*
    74 
    75 #endif /* !defined(__cplusplus) && !defined(CINTERFACE) */
    76 
    77 extern const IID GUID_NULL;
    78 #define IID_NULL            GUID_NULL
    79 #define CLSID_NULL GUID_NULL
    80 #define FMTID_NULL          GUID_NULL
    81    
    8232typedef enum tagDVASPECT
    83 { 
     33{
    8434       DVASPECT_CONTENT   = 1,
    8535       DVASPECT_THUMBNAIL = 2,
    86        DVASPECT_ICON      = 4,   
     36       DVASPECT_ICON      = 4,
    8737       DVASPECT_DOCPRINT  = 8
    8838} DVASPECT;
    … …  
    258208
    259209
    260 /* 
    261  * ACL 
     210/*
     211 * ACL
    262212 */
    263213
    … …  
    333283} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR;
    334284
    335 #define SECURITY_DESCRIPTOR_MIN_LENGTH   (sizeof(SECURITY_DESCRIPTOR)) 
     285#define SECURITY_DESCRIPTOR_MIN_LENGTH   (sizeof(SECURITY_DESCRIPTOR))
    336286
    337287#include "poppack.h"
Note: See TracChangeset for help on using the changeset viewer.