Update of /cvsroot/mplayer/main/loader In directory mplayer:/var/tmp.root/cvs-serv15243 Modified Files: com.h Log Message: updated Index: com.h =================================================================== RCS file: /cvsroot/mplayer/main/loader/com.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- com.h 7 Apr 2001 16:59:35 -0000 1.2 +++ com.h 16 Aug 2001 00:44:40 -0000 1.3 @@ -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 @@ 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; @@ -56,12 +64,13 @@ struct IClassFactory_vt* vt; }; -long CoCreateInstance(GUID* rclsid, struct IUnknown* pUnkOuter, - long dwClsContext, GUID* riid, void** ppv); +long CoCreateInstance(GUID* rclsid, struct IUnknown* pUnkOuter, + long dwClsContext, GUID* riid, void** ppv); #ifdef __cplusplus }; -#endif +#endif /* __cplusplus */ -#endif +#endif /* WIN32 */ +#endif /* AVIFILE_COM_H */