Create Stubs for IDirectDrawVideoPortNotify and fix return values of IUnknown Stubs.

svn path=/trunk/; revision=18842

diff --git a/reactos/lib/ddraw/main/clipper.c b/reactos/lib/ddraw/main/clipper.c
index f4de6de..d8d45a8 100644 (file)
--- a/reactos/lib/ddraw/main/clipper.c
+++ b/reactos/lib/ddraw/main/clipper.c
@@ -58,7 +58,7 @@ HRESULT WINAPI Main_DirectDrawClipper_SetClipList(
 HRESULT WINAPI Main_DirectDrawClipper_QueryInterface(
     LPDIRECTDRAWCLIPPER iface, REFIID riid, LPVOID* ppvObj) 
 {
-       DX_STUB;
+       return E_NOINTERFACE;
 }
 
 HRESULT WINAPI Main_DirectDrawClipper_GetHWnd(

diff --git a/reactos/lib/ddraw/main/color.c b/reactos/lib/ddraw/main/color.c
index e544af9..ba36a71 100644 (file)
--- a/reactos/lib/ddraw/main/color.c
+++ b/reactos/lib/ddraw/main/color.c
@@ -35,7 +35,7 @@ HRESULT WINAPI
 Main_DirectDrawColorControl_QueryInterface(LPDIRECTDRAWCOLORCONTROL iface, 
                                                                                   REFIID riid, LPVOID* ppvObj) 
 {
-       DX_STUB;
+       return E_NOINTERFACE;
 }
 
 HRESULT WINAPI

diff --git a/reactos/lib/ddraw/main/gamma.c b/reactos/lib/ddraw/main/gamma.c
index 4ad1a32..7d95cc9 100644 (file)
--- a/reactos/lib/ddraw/main/gamma.c
+++ b/reactos/lib/ddraw/main/gamma.c
@@ -35,7 +35,7 @@ HRESULT WINAPI
 Main_DirectDrawGammaControl_QueryInterface(LPDIRECTDRAWGAMMACONTROL iface, REFIID riid,
                                      LPVOID *ppObj)
 {
-       DX_STUB;
+       return E_NOINTERFACE;
 }
 
 HRESULT WINAPI

diff --git a/reactos/lib/ddraw/main/palette.c b/reactos/lib/ddraw/main/palette.c
index 7fa14f4..f3ffc8a 100644 (file)
--- a/reactos/lib/ddraw/main/palette.c
+++ b/reactos/lib/ddraw/main/palette.c
@@ -63,7 +63,7 @@ HRESULT WINAPI
 Main_DirectDrawPalette_QueryInterface(LPDIRECTDRAWPALETTE iface,
                                      REFIID refiid, LPVOID *obj)
 {
-    DX_STUB;
+       return E_NOINTERFACE;
 }
 
 IDirectDrawPaletteVtbl DirectDrawPalette_Vtable =

diff --git a/reactos/lib/ddraw/main/surface.c b/reactos/lib/ddraw/main/surface.c
index e026d7e..982c713 100644 (file)
--- a/reactos/lib/ddraw/main/surface.c
+++ b/reactos/lib/ddraw/main/surface.c
@@ -117,7 +117,7 @@ HRESULT WINAPI
 Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid,
                                      LPVOID* ppObj)
 {
-    DX_STUB;
+       return E_NOINTERFACE;
 }
 
 HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst,

diff --git a/reactos/lib/ddraw/main/videoport.c b/reactos/lib/ddraw/main/videoport.c
index a1fa4a2..c1d4118 100644 (file)
--- a/reactos/lib/ddraw/main/videoport.c
+++ b/reactos/lib/ddraw/main/videoport.c
@@ -3,7 +3,7 @@
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS
  * FILE:                 lib/ddraw/main/videoport.c
- * PURPOSE:              IDirectDrawVideoPort and DDVideoPortContainer Implementation 
+ * PURPOSE:              IDirectDrawVideoPort, DDVideoPortContainer and IDirectDrawVideoPortNotify Implementation 
  * PROGRAMMER:           Maarten Bosma
  *
  */
@@ -16,19 +16,19 @@
 HRESULT WINAPI 
 Main_DirectDrawVideoPort_QueryInterface (LPDIRECTDRAWVIDEOPORT iface, REFIID riid, LPVOID* ppvObj)
 {
-       DX_STUB;
+       return E_NOINTERFACE;
 }
 
 ULONG WINAPI 
 Main_DirectDrawVideoPort_AddRef (LPDIRECTDRAWVIDEOPORT iface) 
 {
-       DX_STUB;
+       return 1;
 }
 
 ULONG WINAPI 
 Main_DirectDrawVideoPort_Release (LPDIRECTDRAWVIDEOPORT iface)
 {
-       DX_STUB;
+       return 0;
 }
 
 HRESULT WINAPI 
@@ -113,17 +113,17 @@ HRESULT WINAPI Main_DirectDrawVideoPort_WaitForSync (LPDIRECTDRAWVIDEOPORT iface
 
 HRESULT WINAPI Main_DDVideoPortContainer_QueryInterface (LPDDVIDEOPORTCONTAINER iface, REFIID riid, LPVOID* ppvObj)
 {
-    DX_STUB;
+       return E_NOINTERFACE;
 }
 
 ULONG WINAPI Main_DDVideoPortContainer_AddRef (LPDDVIDEOPORTCONTAINER iface) 
 {
-    DX_STUB;
+       return 1;
 }
 
 ULONG WINAPI Main_DDVideoPortContainer_Release (LPDDVIDEOPORTCONTAINER iface)
 {
-    DX_STUB;
+       return 0;
 }
 
 HRESULT WINAPI Main_DDVideoPortContainer_CreateVideoPort (LPDDVIDEOPORTCONTAINER iface, DWORD dwFlags, LPDDVIDEOPORTDESC pPortDesc, 
@@ -149,6 +149,33 @@ HRESULT WINAPI Main_DDVideoPortContainer_QueryVideoPortStatus (LPDDVIDEOPORTCONT
     DX_STUB;
 }
 
+/************* IDirectDrawVideoPortNotify *************/ 
+
+HRESULT WINAPI Main_DDVideoPortNotify_QueryInterface (LPDIRECTDRAWVIDEOPORTNOTIFY iface, REFIID riid, LPVOID* ppvObj)
+{
+       return E_NOINTERFACE;
+}
+
+ULONG WINAPI Main_DDVideoPortNotify_AddRef (LPDIRECTDRAWVIDEOPORTNOTIFY iface)
+{
+       return 1;
+}
+
+ULONG WINAPI Main_DDVideoPortNotify_Release (LPDIRECTDRAWVIDEOPORTNOTIFY iface)
+{
+       return 0;
+}
+
+HRESULT WINAPI Main_DDVideoPortNotify_AcquireNotification (LPDIRECTDRAWVIDEOPORTNOTIFY iface, HANDLE* h, LPDDVIDEOPORTNOTIFY pVideoPortNotify)
+{
+    DX_STUB;
+}
+
+HRESULT WINAPI Main_DDVideoPortNotify_ReleaseNotification (LPDIRECTDRAWVIDEOPORTNOTIFY iface, HANDLE h)
+{
+    DX_STUB;
+}
+
 IDirectDrawVideoPortVtbl DirectDrawVideoPort_Vtable =
 {
        Main_DirectDrawVideoPort_QueryInterface,
@@ -180,3 +207,12 @@ IDDVideoPortContainerVtbl DDVideoPortContainer_Vtable =
     Main_DDVideoPortContainer_GetVideoPortConnectInfo,
     Main_DDVideoPortContainer_QueryVideoPortStatus
 };
+
+IDirectDrawVideoPortNotifyVtbl DDVideoPortNotify_Vtable =
+{
+   Main_DDVideoPortNotify_QueryInterface,
+   Main_DDVideoPortNotify_AddRef,
+   Main_DDVideoPortNotify_Release,
+   Main_DDVideoPortNotify_AcquireNotification,
+   Main_DDVideoPortNotify_ReleaseNotification 
+};