Commit Graph

475 Commits

Author SHA1 Message Date
Aaryaman Vasishta 3987417688 d3drm: Store reference to render target in IDirect3DRM*::CreateDeviceFromD3D.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-12 12:31:04 +09:00
Aaryaman Vasishta 17f80954e3 d3drm: Implement IDirect3DRMViewport*::GetDevice.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-01 09:57:01 -05:00
Aaryaman Vasishta 364713804b d3drm/tests: Add QueryInterface tests for IDirect3DRMViewport*.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-01 09:56:59 -05:00
Aaryaman Vasishta 071951711b d3drm/tests: Add viewport validation tests.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-01 09:56:56 -05:00
Aaryaman Vasishta c17fd6a859 d3drm: Implement IDirect3DRMViewport::GetDirect3DViewport.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-01 09:56:53 -05:00
Aaryaman Vasishta 202df3e1ec d3drm: Implement IDirect3DRM*::CreateViewport.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-01 09:56:50 -05:00
Aaryaman Vasishta 74b27abb63 d3drm: Implement IDirect3DRMViewport*::Init.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-01 09:56:46 -05:00
Francois Gouget 429e5325f3 d3drm/tests: Spelling fixes for a couple of ok() messages.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-27 22:21:14 +09:00
Francois Gouget 43cf833c5d d3drm: Make d3drm_device_set_ddraw_device_d3d() static.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-27 22:21:13 +09:00
Aaryaman Vasishta 3fa736e978 d3drm: Fix IDirect3DRMViewport*::QueryInterface returning wrong HRESULT for invalid interfaces.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-25 23:15:48 +09:00
Henri Verbeet fe3a78ba99 d3drm/tests: Fix some IDirect3D2 reference leaks.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-21 23:36:06 +09:00
Aaryaman Vasishta 5fca0a70af d3drm: Implement IDirect3DRMDevice{2-3}::InitFromD3D2.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-19 19:59:31 +09:00
Aaryaman Vasishta 3d343d6eee d3drm: Implement IDirect3DRMDevice*::InitFromD3D.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-19 19:59:31 +09:00
Aaryaman Vasishta 88fc3a3ef5 d3drm: Fix IDirect3DRMDevice{2-3}::GetDirect3DDevice2 return values on failure.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-15 21:34:51 +09:00
Aaryaman Vasishta ce64ef51e2 d3drm: Implement IDirect3DRMDevice*::Add/DeleteDestroyCallback.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Stefan Dösinger <stefandoesinger@gmx.at>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-14 17:40:12 +09:00
Aaryaman Vasishta 474b6e3e0e d3drm: Rearrange version 1, 2 functions after version 3 for IDirect3DRMDevice*.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Stefan Dösinger <stefandoesinger@gmx.at>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-14 17:40:11 +09:00
Aaryaman Vasishta 90d97a9346 d3drm: Move struct d3drm_device to d3drm_private.h.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-14 17:40:11 +09:00
Aaryaman Vasishta 44af0bb81b d3drm: Store reference to IDirect3DRM in d3drm_device_create().
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-14 17:40:11 +09:00
Aaryaman Vasishta 9729d15a1a d3drm: Fix device not assigning width and height after creation.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-06 00:26:49 +09:00
Francois Gouget 4046616efd d3drm/tests: Fix typos in a couple of ok() messages.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-04 23:05:46 +09:00
Aaryaman Vasishta e81d495357 d3drm: Move IUnknown methods of viewports from version 1->2.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-03 10:18:52 +09:00
Aaryaman Vasishta 49f37796d5 d3drm: Rearrange version 1 functions after version 2 for IDirect3DRMViewport*.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-03 10:18:50 +09:00
Aaryaman Vasishta be7bca55e3 d3drm: Introduce d3drm_viewport_destroy().
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-03 10:18:47 +09:00
Aaryaman Vasishta 94bab100a4 d3drm: Use a table in d3drm3_CreateObject() to create objects in a generic manner.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-03 10:18:44 +09:00
Aaryaman Vasishta 88f6c2aa2e d3drm/tests: Modify all QI tests to compare vtables.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-21 00:23:55 +09:00
Aaryaman Vasishta f585faff6b d3drm: Fix viewport object creation.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-21 00:23:55 +09:00
Aaryaman Vasishta e6feb9b031 d3drm: Fix frame object creation method.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-21 00:23:55 +09:00
Aaryaman Vasishta e6f11af272 d3drm: Add stubs for IDirect3DRMFrame interface.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-21 00:23:55 +09:00
Aaryaman Vasishta ad1d0f4f15 d3drm: Rearrange version 2 functions after version 3 for IDirect3DRMFrame*.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-21 00:23:54 +09:00
Aaryaman Vasishta 431f613beb d3drm/tests: Fix some missing HRESULT returns in test_frame_qi.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-09 21:57:23 +09:00
Aaryaman Vasishta c4aaf35d2b d3drm: Implement IDirect3DRMTexture*_GetImage.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-23 14:08:37 +09:00
Aaryaman Vasishta 07d0804603 d3drm: Implement IDirect3DRM*_CreateTexture.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-23 14:08:33 +09:00
Aaryaman Vasishta 9511d09852 d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-23 14:08:30 +09:00
Aaryaman Vasishta 07c038c2b4 d3drm: Introduce d3drm_texture_destroy helper.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-23 14:08:26 +09:00
Aaryaman Vasishta bebe679d51 d3drm: Keep a reference to IDirect3DRM in d3drm_texture.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-23 14:08:17 +09:00
Aaryaman Vasishta 2fe8e29140 d3drm/tests: Add tests for IDirect3DRMTexture{2-3}_InitFromImage.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-26 21:35:50 +09:00
Aaryaman Vasishta c64ce8cdbb d3drm/tests: Replace test_Texture.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-26 21:35:46 +09:00
Aaryaman Vasishta e5e499d399 d3drm: Use ref and appdata from d3drm_object in d3drm_texture.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-25 18:48:19 +09:00
Aaryaman Vasishta 93c2196189 d3drm: Use sizeof instead of strlen in d3drm_texture3_GetClassName.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-25 18:48:19 +09:00
Aaryaman Vasishta c44d9dad3f d3drm: Implement IDirect3DRM*::CreateObject.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-21 19:02:59 +09:00
Aaryaman Vasishta 460af458fd d3drm: Implement Add/Delete destroy callbacks for IDirect3DRMTexture*.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-19 21:25:42 +09:00
Aaryaman Vasishta e62475b0f1 d3drm/tests: Add tests for IDirect3DRMObject::Add/DeleteDestroyCallback.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-12 22:22:35 +09:00
Aaryaman Vasishta 0e6578d16b d3drm/tests: Add tests for IDirect3DRM*::CreateObject.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-12 22:22:31 +09:00
Bernhard Übelacker 82f59928d4 d3drm/tests: Release two retrieved interfaces to allow proper cleanup.
Signed-off-by: Bernhard Übelacker <bernhardu@vr-web.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-31 19:48:55 +09:00
Aaryaman Vasishta b05b96a0e2 d3drm: Move struct d3drm_texture to header for global access.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 23:51:30 +09:00
Henri Verbeet d868f85ee8 d3drm/tests: Properly initialise context.obj in test_Viewport().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 12:19:45 +09:00
Michael Stefaniuc 62277fb777 d3drm: Use debugstr_a to print a string that can be NULL.
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-14 22:24:50 +09:00
Nikolay Sivov d5d1a288e9 d3drm: Remove first found callback, not all of them.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 20:54:42 +09:00
Nikolay Sivov 45743b4d9f d3drm: Implement AddDestroyCallback/DeleteDestroyCallback for a viewport.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-03 22:29:01 +09:00
Nikolay Sivov b54afbc3a1 d3drm: Support IDirect3DRMObject in viewport QI.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-03 21:36:03 +09:00