marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3drm: Avoid LPDIRECT3DRMVIEWPORT.

oldstable
Henri Verbeet 2013-04-19 08:34:14 +02:00 committed by Alexandre Julliard
parent 2e7add90c0
commit 24acd7c82a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/d3drm/tests/d3drm.c
View File

@ -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);

2
include/d3drmobj.h
View File

@ -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