Define COM-Interfaces for IDirectDrawKernel and SurfaceKernel and add a little typedef.

svn path=/trunk/; revision=18841

diff --git a/reactos/w32api/include/ddk/ddkernel.h b/reactos/w32api/include/ddk/ddkernel.h
index e46e54f..8062ac6 100644 (file)
--- a/reactos/w32api/include/ddk/ddkernel.h
+++ b/reactos/w32api/include/ddk/ddkernel.h
@@ -51,6 +51,33 @@ typedef struct _DDKERNELCAPS
 #define DDIRQ_VPORT9_VSYNC                              0x00010000\r
 #define DDIRQ_VPORT9_LINE                               0x00020000\r
 \r
 #define DDIRQ_VPORT9_VSYNC                              0x00010000\r
 #define DDIRQ_VPORT9_LINE                               0x00020000\r
 \r

+#if defined(_WIN32) && !defined(_NO_COM)\r
+\r
+#undef INTERFACE\r
+#define INTERFACE IDirectDrawKernel\r
+DECLARE_INTERFACE_ (IDirectDrawKernel, IUnknown)\r
+{\r
+    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID* ppvObj) PURE;\r
+    STDMETHOD_(ULONG,AddRef) (THIS) PURE;\r
+    STDMETHOD_(ULONG,Release) (THIS) PURE;\r
+       STDMETHOD(GetKernelHandle) (THIS_ ULONG*) PURE;\r
+       STDMETHOD(ReleaseKernelHandle) (THIS) PURE;\r
+};\r
+\r
+#undef INTERFACE\r
+#define INTERFACE IDirectDrawSurfaceKernel\r
+DECLARE_INTERFACE_ (IDirectDrawSurfaceKernel, IUnknown)\r
+{\r
+    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID* ppvObj) PURE;\r
+    STDMETHOD_(ULONG,AddRef) (THIS) PURE;\r
+    STDMETHOD_(ULONG,Release) (THIS) PURE;\r
+       STDMETHOD(GetKernelHandle) (THIS_ ULONG*) PURE;\r
+       STDMETHOD(ReleaseKernelHandle) (THIS) PURE;\r
+};\r
+\r
+#undef INTERFACE\r
+#endif // defined(_WIN32) && !defined(_NO_COM)\r
+\r

 #ifdef __cplusplus\r
 };\r
 #endif\r
 #ifdef __cplusplus\r
 };\r
 #endif\r

diff --git a/reactos/w32api/include/ddk/dvp.h b/reactos/w32api/include/ddk/dvp.h
index a729fab..6c0507a 100644 (file)
--- a/reactos/w32api/include/ddk/dvp.h
+++ b/reactos/w32api/include/ddk/dvp.h
@@ -209,6 +209,7 @@ typedef struct _DDVIDEOPORTNOTIFY    *LPDDVIDEOPORTNOTIFY;
 
 typedef struct IDirectDrawVideoPort* LPDIRECTDRAWVIDEOPORT;
 typedef struct IDDVideoPortContainer* LPDDVIDEOPORTCONTAINER;
 
 typedef struct IDirectDrawVideoPort* LPDIRECTDRAWVIDEOPORT;
 typedef struct IDDVideoPortContainer* LPDDVIDEOPORTCONTAINER;

+typedef struct IDirectDrawVideoPortNotify* LPDIRECTDRAWVIDEOPORTNOTIFY;

 
 typedef HRESULT (FAR PASCAL * LPDDENUMVIDEOCALLBACK)(LPDDVIDEOPORTCAPS, LPVOID);
 
 
 typedef HRESULT (FAR PASCAL * LPDDENUMVIDEOCALLBACK)(LPDDVIDEOPORTCAPS, LPVOID);