Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-21 02:43:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace DECL_WINELIB_TYPE_AW macros with typedefs

Browse source 
thnx to Greatlord for reviewing patch

svn path=/trunk/; revision=22528
This commit is contained in:
Johannes Anderwald 2006-06-23 17:39:04 +00:00
parent 3a721c0824
commit a37b36dfc4
2 changed files with 67 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/include/objsel.h
View file

@ -21,6 +21,9 @@
extern "C" { extern "C" {
#endif #endif
#include <objidl.h>
#include <oaidl.h>
/* the PSDK headers defines it as EXTERN_C const GUID CLSID_DsObjectPicker = {...}, /* the PSDK headers defines it as EXTERN_C const GUID CLSID_DsObjectPicker = {...},
* but that's not a good idea when EXTERN_C is extern... */ * but that's not a good idea when EXTERN_C is extern... */
#ifndef DEFINE_GUID #ifndef DEFINE_GUID
@ -164,7 +167,7 @@ DECLARE_INTERFACE_(IDsObjectPicker,IUnknown)
STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE;
/*** IDsObjectPicker methods ***/ /*** IDsObjectPicker methods ***/
STDMETHOD_(HRESULT,Initialize)(THIS_ PDSOP_INIT_INFO pInitInfo) PURE; STDMETHOD_(HRESULT,Initialize)(THIS_ PDSOP_INIT_INFO pInitInfo) PURE;
STDMETHOD_(HRESULT,InvokeDialog)(THIS_ HWND hwndParent, IDataObject** ppdoSelections) PURE; STDMETHOD_(HRESULT,InvokeDialog)(THIS_ HWND hwndParent, IDataObject ** ppdoSelections) PURE;
}; };
#undef INTERFACE #undef INTERFACE

84
reactos/include/reactos/wine/msacm.h
View file

@ -318,9 +318,15 @@ typedef struct _ACMDRIVERDETAILSW
WCHAR szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS]; WCHAR szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
} ACMDRIVERDETAILSW, *PACMDRIVERDETAILSW, *LPACMDRIVERDETAILSW; } ACMDRIVERDETAILSW, *PACMDRIVERDETAILSW, *LPACMDRIVERDETAILSW;
DECL_WINELIB_TYPE_AW(ACMDRIVERDETAILS) #if defined(UNICODE) || defined (_UNICODE)
DECL_WINELIB_TYPE_AW(PACMDRIVERDETAILS) typedef struct ACMDRIVERDETAILSW ACMDRIVERDETAILS;
DECL_WINELIB_TYPE_AW(LPACMDRIVERDETAILS) typedef PACMDRIVERDETAILSW PACMDRIVERDETAILS;
typedef LPACMDRIVERDETAILSW LPACMDRIVERDETAILS;
#else
typedef struct ACMDRIVERDETAILSA ACMDRIVERDETAILS;
typedef PACMDRIVERDETAILSA PACMDRIVERDETAILS;
typedef LPACMDRIVERDETAILSA LPACMDRIVERDETAILS;
#endif
typedef struct _ACMFILTERCHOOSEA typedef struct _ACMFILTERCHOOSEA
{ {
@ -374,9 +380,15 @@ typedef struct _ACMFILTERCHOOSEW
ACMFILTERCHOOSEHOOKPROCW pfnHook; ACMFILTERCHOOSEHOOKPROCW pfnHook;
} ACMFILTERCHOOSEW, *PACMFILTERCHOOSEW, *LPACMFILTERCHOOSEW; } ACMFILTERCHOOSEW, *PACMFILTERCHOOSEW, *LPACMFILTERCHOOSEW;
DECL_WINELIB_TYPE_AW(ACMFILTERCHOOSE) #if defined(UNICODE) || defined (_UNICODE)
DECL_WINELIB_TYPE_AW(PACMFILTERCHOOSE) typedef struct ACMFILTERCHOOSEW ACMFILTERCHOOSE;
DECL_WINELIB_TYPE_AW(LPACMFILTERCHOOSE) typedef PACMFILTERCHOOSEW PACMFILTERCHOOSE;
typedef LPACMFILTERCHOOSEW LPACMFILTERCHOOSE;
#else
typedef struct ACMFILTERCHOOSEA ACMFILTERCHOOSE;
typedef PACMFILTERCHOOSEA PACMFILTERCHOOSE;
typedef LPACMFILTERCHOOSEA LPACMFILTERCHOOSE;
#endif
typedef struct _ACMFILTERDETAILSA typedef struct _ACMFILTERDETAILSA
{ {
@ -400,9 +412,15 @@ typedef struct _ACMFILTERDETAILSW
WCHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS]; WCHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS];
} ACMFILTERDETAILSW, *PACMFILTERDETAILSW, *LPACMFILTERDETAILSW; } ACMFILTERDETAILSW, *PACMFILTERDETAILSW, *LPACMFILTERDETAILSW;
DECL_WINELIB_TYPE_AW(ACMFILTERDETAILS) #if defined(UNICODE) || defined (_UNICODE)
DECL_WINELIB_TYPE_AW(PACMFILTERDETAILS) typedef struct ACMFILTERDETAILSW ACMFILTERDETAILS;
DECL_WINELIB_TYPE_AW(LPACMFILTERDETAILS) typedef PACMFILTERDETAILSW PACMFILTERDETAILS;
typedef LPACMFILTERDETAILSW LPACMFILTERDETAILS;
#else
typedef struct ACMFILTERDETAILSA ACMFILTERDETAILS;
typedef PACMFILTERDETAILSA PACMFILTERDETAILS;
typedef LPACMFILTERDETAILSA LPACMFILTERDETAILS;
#endif
typedef struct _ACMFILTERTAGDETAILSA typedef struct _ACMFILTERTAGDETAILSA
{ {
@ -426,9 +444,15 @@ typedef struct _ACMFILTERTAGDETAILSW
WCHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS]; WCHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
} ACMFILTERTAGDETAILSW, *PACMFILTERTAGDETAILSW, *LPACMFILTERTAGDETAILSW; } ACMFILTERTAGDETAILSW, *PACMFILTERTAGDETAILSW, *LPACMFILTERTAGDETAILSW;
DECL_WINELIB_TYPE_AW(ACMFILTERTAGDETAILS) #if defined(UNICODE) || defined (_UNICODE)
DECL_WINELIB_TYPE_AW(PACMFILTERTAGDETAILS) typedef struct ACMFILTERTAGDETAILSW ACMFILTERTAGDETAILS;
DECL_WINELIB_TYPE_AW(LPACMFILTERTAGDETAILS) typedef PACMFILTERTAGDETAILSW PACMFILTERTAGDETAILS;
typedef LPACMFILTERTAGDETAILSW LPACMFILTERTAGDETAILS;
#else
typedef struct ACMFILTERTAGDETAILSA ACMFILTERTAGDETAILS;
typedef PACMFILTERTAGDETAILSA PACMFILTERTAGDETAILS;
typedef LPACMFILTERTAGDETAILSA LPACMFILTERTAGDETAILS;
#endif
typedef struct _ACMFORMATCHOOSEA typedef struct _ACMFORMATCHOOSEA
{ {
@ -482,9 +506,15 @@ typedef struct _ACMFORMATCHOOSEW
ACMFORMATCHOOSEHOOKPROCW pfnHook; ACMFORMATCHOOSEHOOKPROCW pfnHook;
} ACMFORMATCHOOSEW, *PACMFORMATCHOOSEW, *LPACMFORMATCHOOSEW; } ACMFORMATCHOOSEW, *PACMFORMATCHOOSEW, *LPACMFORMATCHOOSEW;
DECL_WINELIB_TYPE_AW(ACMFORMATCHOOSE) #if defined(UNICODE) || defined (_UNICODE)
DECL_WINELIB_TYPE_AW(PACMFORMATCHOOSE) typedef struct ACMFORMATCHOOSEW ACMFORMATCHOOSE;
DECL_WINELIB_TYPE_AW(LPACMFORMATCHOOSE) typedef PACMFORMATCHOOSEW PACMFORMATCHOOSE;
typedef LPACMFORMATCHOOSEW LPACMFORMATCHOOSE;
#else
typedef struct ACMFORMATCHOOSEA ACMFORMATCHOOSE;
typedef PACMFORMATCHOOSEA PACMFORMATCHOOSE;
typedef LPACMFORMATCHOOSEA LPACMFORMATCHOOSE;
#endif
typedef struct _ACMFORMATDETAILSA typedef struct _ACMFORMATDETAILSA
{ {
@ -508,9 +538,15 @@ typedef struct _ACMFORMATDETAILSW
WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
} ACMFORMATDETAILSW, *PACMFORMATDETAILSW, *LPACMFORMATDETAILSW; } ACMFORMATDETAILSW, *PACMFORMATDETAILSW, *LPACMFORMATDETAILSW;
DECL_WINELIB_TYPE_AW(ACMFORMATDETAILS) #if defined(UNICODE) || defined (_UNICODE)
DECL_WINELIB_TYPE_AW(PACMFORMATDETAILS) typedef struct ACMFORMATDETAILSW ACMFORMATDETAILS;
DECL_WINELIB_TYPE_AW(LPACMFORMATDETAILS) typedef PACMFORMATDETAILSW PACMFORMATDETAILS;
typedef LPACMFORMATDETAILSW LPACMFORMATDETAILS;
#else
typedef struct ACMFORMATDETAILSA ACMFORMATDETAILS;
typedef PACMFORMATDETAILSA PACMFORMATDETAILS;
typedef LPACMFORMATDETAILSA LPACMFORMATDETAILS;
#endif
typedef struct _ACMFORMATTAGDETAILSA typedef struct _ACMFORMATTAGDETAILSA
{ {
@ -534,9 +570,15 @@ typedef struct _ACMFORMATTAGDETAILSW
WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
} ACMFORMATTAGDETAILSW, *PACMFORMATTAGDETAILSW, *LPACMFORMATTAGDETAILSW; } ACMFORMATTAGDETAILSW, *PACMFORMATTAGDETAILSW, *LPACMFORMATTAGDETAILSW;
DECL_WINELIB_TYPE_AW(ACMFORMATTAGDETAILS) #if defined(UNICODE) || defined (_UNICODE)
DECL_WINELIB_TYPE_AW(PACMFORMATTAGDETAILS) typedef struct ACMFORMATTAGDETAILSW ACMFORMATTAGDETAILS;
DECL_WINELIB_TYPE_AW(LPACMFORMATTAGDETAILS) typedef PACMFORMATTAGDETAILSW PACMFORMATTAGDETAILS;
typedef LPACMFORMATTAGDETAILSW LPACMFORMATTAGDETAILS;
#else
typedef struct ACMFORMATTAGDETAILSA ACMFORMATTAGDETAILS;
typedef PACMFORMATTAGDETAILSA PACMFORMATTAGDETAILS;
typedef LPACMFORMATTAGDETAILSA LPACMFORMATTAGDETAILS;
#endif
typedef struct _ACMSTREAMHEADER typedef struct _ACMSTREAMHEADER
{ {