Henri Verbeet : d3drm: Avoid LPDIRECT3DRMVIEWPORT.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 24acd7c82a5098ab02d374c44f4daba110dae176
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=24acd7c82a5098ab02d374c44f...

Author: Henri Verbeet 
Date:   Fri Apr 19 08:34:14 2013 +0200

d3drm: Avoid LPDIRECT3DRMVIEWPORT.

---

dlls/d3drm/tests/d3drm.c |   14 +++++++-------
 include/d3drmobj.h       |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index 039881c..663137d 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -1008,7 +1008,7 @@ static void test_Viewport(void)
     IDirect3DRM *d3drm;
     IDirect3DRMDevice *device;
     LPDIRECT3DRMFRAME pFrame;
-    LPDIRECT3DRMVIEWPORT pViewport;
+    IDirect3DRMViewport *viewport;
     GUID driver;
     HWND window;
     RECT rc;
@@ -1034,23 +1034,23 @@ static void test_Viewport(void)
     hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrame);
     ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);

-    hr = IDirect3DRM_CreateViewport(d3drm, device, pFrame, rc.left, rc.top, rc.right, rc.bottom, &pViewport);
+    hr = IDirect3DRM_CreateViewport(d3drm, device, pFrame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
     ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr);

-    hr = IDirect3DRMViewport_GetClassName(pViewport, NULL, cname);
+    hr = IDirect3DRMViewport_GetClassName(viewport, NULL, cname);
     ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr);
-    hr = IDirect3DRMViewport_GetClassName(pViewport, NULL, NULL);
+    hr = IDirect3DRMViewport_GetClassName(viewport, NULL, NULL);
     ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr);
     size = 1;
-    hr = IDirect3DRMViewport_GetClassName(pViewport, &size, cname);
+    hr = IDirect3DRMViewport_GetClassName(viewport, &size, cname);
     ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr);
     size = sizeof(cname);
-    hr = IDirect3DRMViewport_GetClassName(pViewport, &size, cname);
+    hr = IDirect3DRMViewport_GetClassName(viewport, &size, cname);
     ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr);
     ok(size == sizeof("Viewport"), "wrong size: %u\n", size);
     ok(!strcmp(cname, "Viewport"), "Expected cname to be "Viewport", but got "%s"\n", cname);

-    IDirect3DRMViewport_Release(pViewport);
+    IDirect3DRMViewport_Release(viewport);
     IDirect3DRMFrame_Release(pFrame);
     IDirect3DRMDevice_Release(device);
     IDirectDrawClipper_Release(pClipper);
diff --git a/include/d3drmobj.h b/include/d3drmobj.h
index fa3559e..4e90368 100644
--- a/include/d3drmobj.h
+++ b/include/d3drmobj.h
@@ -4293,7 +4293,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewportArray, IDirect3DRMArray)
     /*** IDirect3DRMArray methods ***/
     STDMETHOD_(DWORD, GetSize)(THIS) PURE;
     /*** IDirect3DRMViewportArray methods ***/
-    STDMETHOD(GetElement)(THIS_ DWORD index, LPDIRECT3DRMVIEWPORT *) PURE;
+    STDMETHOD(GetElement)(THIS_ DWORD index, IDirect3DRMViewport **element) PURE;
 };
 #undef INTERFACE