diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-16 00:44:40 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-16 00:44:40 +0000 |
commit | fda7100c9d34a2c5dccddfd25e87193abe55a152 (patch) | |
tree | ea68f83e11473ea0499af118d30250eff8b37a66 /loader | |
parent | e60d1f045304b8d5746e31d8b23bed06b38cff40 (diff) |
updated
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1545 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader')
-rw-r--r-- | loader/com.h | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/loader/com.h b/loader/com.h index bff7722ffc..a902632549 100644 --- a/loader/com.h +++ b/loader/com.h @@ -1,9 +1,13 @@ +#ifndef AVIFILE_COM_H +#define AVIFILE_COM_H + +#include <inttypes.h> + /** * Internal functions and structures for COM emulation code. */ -#ifndef COM_H -#define COM_H +#ifndef WIN32 #ifdef __cplusplus extern "C" { @@ -12,22 +16,26 @@ extern "C" { void* CoTaskMemAlloc(unsigned long cb); void CoTaskMemFree(void* cb); +#ifndef GUID_TYPE +#define GUID_TYPE typedef struct { - long f1; - short f2; - short f3; - char f4[8]; + uint32_t f1; + uint16_t f2; + uint16_t f3; + uint8_t f4[8]; } GUID; +#endif extern GUID IID_IUnknown; extern GUID IID_IClassFactory; typedef long (*GETCLASSOBJECT) (GUID* clsid, GUID* iid, void** ppv); int RegisterComClass(GUID* clsid, GETCLASSOBJECT gcs); +int UnregisterComClass(GUID* clsid, GETCLASSOBJECT gcs); #ifndef STDCALL -#define STDCALL __attribute__((__stdcall__)) +#define STDCALL __attribute__((__stdcall__)) #endif struct IUnknown; @@ -57,11 +65,12 @@ struct IClassFactory }; long CoCreateInstance(GUID* rclsid, struct IUnknown* pUnkOuter, - long dwClsContext, GUID* riid, void** ppv); + long dwClsContext, GUID* riid, void** ppv); #ifdef __cplusplus }; -#endif +#endif /* __cplusplus */ -#endif +#endif /* WIN32 */ +#endif /* AVIFILE_COM_H */ |