summaryrefslogtreecommitdiffstats
path: root/loader/dshow/iunk.h
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-08-16 00:50:02 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-08-16 00:50:02 +0000
commitbda27f2adc68d6065d7a7df1e6558c062efe41f1 (patch)
tree4077a416a09134894f71166eef48f9f39782fc9d /loader/dshow/iunk.h
parentfda7100c9d34a2c5dccddfd25e87193abe55a152 (diff)
downloadmpv-bda27f2adc68d6065d7a7df1e6558c062efe41f1.tar.bz2
mpv-bda27f2adc68d6065d7a7df1e6558c062efe41f1.tar.xz
big avifile sync - from now we have common code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1546 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader/dshow/iunk.h')
-rw-r--r--loader/dshow/iunk.h20
1 files changed, 11 insertions, 9 deletions
diff --git a/loader/dshow/iunk.h b/loader/dshow/iunk.h
index cf07e9cea5..e87d80ba6d 100644
--- a/loader/dshow/iunk.h
+++ b/loader/dshow/iunk.h
@@ -1,20 +1,22 @@
-#ifndef _iunk_h
-#define _iunk_h
+#ifndef DS_IUNK_H
+#define DS_IUNK_H
+
#include "interfaces.h"
#include "guids.h"
+
#define DECLARE_IUNKNOWN(CLASSNAME) \
int refcount; \
- static long STDCALL QueryInterface (IUnknown * This, GUID* riid, void **ppvObject); \
+ static long STDCALL QueryInterface(IUnknown * This, GUID* riid, void **ppvObject); \
static long STDCALL AddRef (IUnknown * This); \
static long STDCALL Release (IUnknown * This);
#define IMPLEMENT_IUNKNOWN(CLASSNAME) \
-long STDCALL CLASSNAME ::QueryInterface (IUnknown * This, GUID* riid, void **ppvObject) \
+long STDCALL CLASSNAME ::QueryInterface(IUnknown * This, GUID* riid, void **ppvObject) \
{ \
Debug printf(#CLASSNAME "::QueryInterface() called\n");\
- if(!ppvObject)return 0x80004003; \
- CLASSNAME * me=( CLASSNAME *)This; \
- int i=0; \
+ if (!ppvObject) return 0x80004003; \
+ CLASSNAME * me = (CLASSNAME *)This; \
+ unsigned int i = 0; \
for(const GUID* r=me->interfaces; i<sizeof(CLASSNAME ::interfaces)/sizeof(CLASSNAME ::interfaces[0]); r++, i++) \
if(!memcmp(r, riid, 16)) \
{ \
@@ -23,7 +25,7 @@ long STDCALL CLASSNAME ::QueryInterface (IUnknown * This, GUID* riid, void **ppv
return 0; \
} \
Debug printf("Failed\n"); \
- return 0x80004002; \
+ return E_NOINTERFACE; \
} \
\
long STDCALL CLASSNAME ::AddRef ( \
@@ -44,4 +46,4 @@ long STDCALL CLASSNAME ::Release ( \
return 0; \
}
-#endif
+#endif /* DS_IUNK_H */