August 2015 - Wine-commits - list.winehq.org

Jacek Caban : ieframe: Fixed and improved navigation command state tests.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: cfbc37c699e3b3b27df4c566014e6dde9c7194b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfbc37c699e3b3b27df4c5660… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 18 14:01:21 2015 +0200 ieframe: Fixed and improved navigation command state tests. --- dlls/ieframe/navigate.c | 13 +-- dlls/ieframe/tests/webbrowser.c | 219 ++++++++++++++++++++++++---------------- 2 files changed, 132 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cfbc37c699e3b3b27df4c…

1 0

Hugh McMaster : uninstaller: Add WriteConsoleW support.
by Alexandre Julliard 18 Aug '15

18 Aug '15

1 0

Hugh McMaster : uninstaller: Output Unicode program names in CLI mode.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 4335c464c358d15024e76c918efb7721ff0d9cce URL: http://source.winehq.org/git/wine.git/?a=commit;h=4335c464c358d15024e76c918… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 17 18:39:41 2015 +1000 uninstaller: Output Unicode program names in CLI mode. --- programs/uninstaller/main.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 50efdcd..899337d 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -21,7 +21,6 @@ * */ -#include <stdio.h> #include <string.h> #include <windows.h> #include <shlwapi.h> @@ -92,30 +91,27 @@ static void __cdecl output_message(unsigned int id, ...) __ms_va_end(va_args); } +static void __cdecl output_array(WCHAR *fmt, ...) +{ + __ms_va_list va_args; + + __ms_va_start(va_args, fmt); + output_formatstring(fmt, va_args); + __ms_va_end(va_args); +} + /** * Used to output program list when used with --list */ static void ListUninstallPrograms(void) { unsigned int i; - int lenDescr, lenKey; - char *descr; - char *key; + static WCHAR fmtW[] = {'%','1','|','|','|','%','2','\n',0}; FetchUninstallInformation(); for (i=0; i < numentries; i++) - { - lenDescr = WideCharToMultiByte(CP_UNIXCP, 0, entries[i].descr, -1, NULL, 0, NULL, NULL); - lenKey = WideCharToMultiByte(CP_UNIXCP, 0, entries[i].key, -1, NULL, 0, NULL, NULL); - descr = HeapAlloc(GetProcessHeap(), 0, lenDescr); - key = HeapAlloc(GetProcessHeap(), 0, lenKey); - WideCharToMultiByte(CP_UNIXCP, 0, entries[i].descr, -1, descr, lenDescr, NULL, NULL); - WideCharToMultiByte(CP_UNIXCP, 0, entries[i].key, -1, key, lenKey, NULL, NULL); - printf("%s|||%s\n", key, descr); - HeapFree(GetProcessHeap(), 0, descr); - HeapFree(GetProcessHeap(), 0, key); - } + output_array(fmtW, entries[i].key, entries[i].descr); }

1 0

Aaryaman Vasishta : d3drm: Change signature of d3drm_device_create.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: f421e78bc5c5b4aa2733142621e694046d30d2d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f421e78bc5c5b4aa273314262… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Aug 7 03:35:51 2015 +0530 d3drm: Change signature of d3drm_device_create. --- dlls/d3drm/d3drm.c | 126 +++++++++++++++++++++++++++++++++++++++------ dlls/d3drm/d3drm_private.h | 7 ++- dlls/d3drm/device.c | 25 ++++++--- 3 files changed, 136 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f421e78bc5c5b4aa27331…

1 0

Aaryaman Vasishta : d3drm: Add helper for destroying device.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: b6f197c7a8a76bf3004fabf2cb8fb200afccd1a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f197c7a8a76bf3004fabf2c… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Aug 7 03:35:52 2015 +0530 d3drm: Add helper for destroying device. --- dlls/d3drm/d3drm_private.h | 2 ++ dlls/d3drm/device.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 9538de0..e1b37f8 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -42,6 +42,8 @@ HRESULT Direct3DRMTexture_create(REFIID riid, IUnknown** ret_iface) DECLSPEC_HID HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *data, D3DRMLOADTEXTURECALLBACK load_texture_proc, void *arg) DECLSPEC_HIDDEN; +void d3drm_device_destroy(struct d3drm_device *device) DECLSPEC_HIDDEN; + struct d3drm_file_header { WORD major; diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 9b6407e..9f56c2e 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -75,6 +75,11 @@ IDirect3DRMDevice3 *IDirect3DRMDevice3_from_impl(struct d3drm_device *device) return &device->IDirect3DRMDevice3_iface; } +void d3drm_device_destroy(struct d3drm_device *device) +{ + HeapFree(GetProcessHeap(), 0, device); +} + static inline struct d3drm_device *impl_from_IDirect3DRMWinDevice(IDirect3DRMWinDevice *iface) { return CONTAINING_RECORD(iface, struct d3drm_device, IDirect3DRMWinDevice_iface); @@ -871,7 +876,7 @@ static ULONG WINAPI d3drm_device3_Release(IDirect3DRMDevice3 *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) - HeapFree(GetProcessHeap(), 0, device); + d3drm_device_destroy(device); return refcount; }

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRM::CreateDeviceFromClipper.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 1075d711358132b32a61f2be3fa2ac5a670110f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1075d711358132b32a61f2be3… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Aug 7 03:35:53 2015 +0530 d3drm: Implement IDirect3DRM::CreateDeviceFromClipper. --- dlls/d3drm/Makefile.in | 2 +- dlls/d3drm/d3drm.c | 37 +++++++++++- dlls/d3drm/d3drm_private.h | 5 ++ dlls/d3drm/device.c | 140 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/tests/d3drm.c | 18 +++--- 5 files changed, 189 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1075d711358132b32a61f…

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRMDevice*:: GetDirect3DDevice.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 0041c560048ff9b851d3ad4418f4b093ea5be5ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=0041c560048ff9b851d3ad441… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Aug 7 03:35:54 2015 +0530 d3drm: Implement IDirect3DRMDevice*::GetDirect3DDevice. --- dlls/d3drm/device.c | 10 +++++++++- dlls/d3drm/tests/d3drm.c | 26 ++++++++------------------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 1ea4695..4d08e6e 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1273,7 +1273,15 @@ static D3DRMTEXTUREQUALITY WINAPI d3drm_device3_GetTextureQuality(IDirect3DRMDev static HRESULT WINAPI d3drm_device3_GetDirect3DDevice(IDirect3DRMDevice3 *iface, IDirect3DDevice **d3d_device) { - FIXME("iface %p, d3d_device %p stub!\n", iface, d3d_device); + struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); + TRACE("iface %p, d3d_device %p!\n", iface, d3d_device); + + if (device->device) + { + *d3d_device = device->device; + IDirect3DDevice_AddRef(*d3d_device); + return D3DRM_OK; + } return E_NOTIMPL; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0e99229..93a8b73 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2012,9 +2012,7 @@ static void test_create_device_from_clipper1(void) /* Fetch immediate mode device in order to access render target */ hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1); - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr); - if (FAILED(hr)) - goto cleanup; + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr); hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface); ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); @@ -2088,7 +2086,7 @@ static void test_create_device_from_clipper1(void) ref2 = get_refcount((IUnknown *)d3drm1); ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2); cref2 = get_refcount((IUnknown *)clipper); - todo_wine ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2); + ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2); /* Test if render target format follows the screen format */ hr = IDirectDraw_GetDisplayMode(ddraw, &desc); @@ -2104,9 +2102,7 @@ static void test_create_device_from_clipper1(void) ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr); hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1); - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr); - if (FAILED(hr)) - goto cleanup; + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr); hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface); ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); @@ -2120,20 +2116,14 @@ static void test_create_device_from_clipper1(void) hr = IDirectDraw2_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); -cleanup: if (ds) IDirectDrawSurface_Release(ds); - if (surface) - IDirectDrawSurface_Release(surface); - if (d3ddevice1) - IDirect3DDevice_Release(d3ddevice1); + IDirectDrawSurface_Release(surface); + IDirect3DDevice_Release(d3ddevice1); IDirect3DRMDevice_Release(device1); - if (d3drm1) - IDirect3DRM_Release(d3drm1); - if (clipper) - IDirectDrawClipper_Release(clipper); - if (ddraw) - IDirectDraw_Release(ddraw); + IDirect3DRM_Release(d3drm1); + IDirectDrawClipper_Release(clipper); + IDirectDraw_Release(ddraw); DestroyWindow(window); }

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRM{2-3}:: CreateDeviceFromClipper.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 27cc84d143ef320d6c651e457649bb5771f66d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27cc84d143ef320d6c651e457… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Aug 7 03:35:55 2015 +0530 d3drm: Implement IDirect3DRM{2-3}::CreateDeviceFromClipper. --- dlls/d3drm/d3drm.c | 54 +++++++++++++++++++++++++++++++++++++++++------- dlls/d3drm/tests/d3drm.c | 36 ++++++++++++++++---------------- 2 files changed, 64 insertions(+), 26 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index e4cc4fa..61d0a25 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -697,18 +697,24 @@ static HRESULT WINAPI d3drm2_CreateDeviceFromClipper(IDirect3DRM2 *iface, IDirectDrawClipper *clipper, GUID *guid, int width, int height, IDirect3DRMDevice2 **device) { - struct d3drm_device *object; + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + IDirect3DRMDevice3 *device3; HRESULT hr; - FIXME("iface %p, clipper %p, guid %s, width %d, height %d, device %p.\n", + + TRACE("iface %p, clipper %p, guid %s, width %d, height %d, device %p.\n", iface, clipper, debugstr_guid(guid), width, height, device); - hr = d3drm_device_create(&object); + if (!device) + return D3DRMERR_BADVALUE; + *device = NULL; + hr = IDirect3DRM3_CreateDeviceFromClipper(&d3drm->IDirect3DRM3_iface, clipper, guid, width, height, &device3); if (FAILED(hr)) return hr; - *device = IDirect3DRMDevice2_from_impl(object); + hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IDirect3DRMDevice2, (void**)device); + IDirect3DRMDevice3_Release(device3); - return D3DRM_OK; + return hr; } static HRESULT WINAPI d3drm2_CreateTextureFromSurface(IDirect3DRM2 *iface, @@ -1103,18 +1109,50 @@ static HRESULT WINAPI d3drm3_CreateDeviceFromClipper(IDirect3DRM3 *iface, IDirectDrawClipper *clipper, GUID *guid, int width, int height, IDirect3DRMDevice3 **device) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); struct d3drm_device *object; + IDirectDraw *ddraw; + IDirectDrawSurface *render_target; HRESULT hr; - FIXME("iface %p, clipper %p, guid %s, width %d, height %d, device %p.\n", + + TRACE("iface %p, clipper %p, guid %s, width %d, height %d, device %p.\n", iface, clipper, debugstr_guid(guid), width, height, device); + if (!device) + return D3DRMERR_BADVALUE; + *device = NULL; + + if (!clipper || !width || !height) + return D3DRMERR_BADVALUE; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + if (FAILED(hr)) + return hr; + hr = d3drm_device_create(&object); if (FAILED(hr)) + { + IDirectDraw_Release(ddraw); return hr; + } - *device = IDirect3DRMDevice3_from_impl(object); + hr = d3drm_device_create_surfaces_from_clipper(object, ddraw, clipper, width, height, &render_target); + if (FAILED(hr)) + { + IDirectDraw_Release(ddraw); + d3drm_device_destroy(object); + return hr; + } - return D3DRM_OK; + hr = d3drm_device_init(object, 3, &d3drm->IDirect3DRM_iface, ddraw, render_target); + IDirectDraw_Release(ddraw); + IDirectDrawSurface_Release(render_target); + if (FAILED(hr)) + d3drm_device_destroy(object); + else + *device = IDirect3DRMDevice3_from_impl(object); + + return hr; } static HRESULT WINAPI d3drm3_CreateShadow(IDirect3DRM3 *iface, IUnknown *object, IDirect3DRMLight *light, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 93a8b73..7790f02 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2134,7 +2134,7 @@ static void test_create_device_from_clipper2(void) IDirect3DRM2 *d3drm2 = NULL; IDirectDraw *ddraw = NULL; IUnknown *unknown = NULL; - IDirect3DRMDevice2 *device2 = NULL; + IDirect3DRMDevice2 *device2 = (IDirect3DRMDevice2 *)0xdeadbeef; IDirect3DDevice2 *d3ddevice2 = NULL; IDirectDrawClipper *clipper = NULL, *d3drm_clipper = NULL; IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_primary = NULL; @@ -2164,24 +2164,24 @@ static void test_create_device_from_clipper2(void) ref2 = get_refcount((IUnknown *)d3drm2); hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 0, 0, &device2); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); - if (SUCCEEDED(hr)) - IDirect3DRMDevice2_Release(device2); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2); /* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */ hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, NULL, &driver, 300, 200, &device2); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); - if (SUCCEEDED(hr)) - IDirect3DRMDevice2_Release(device2); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, &device2); ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr); ref3 = get_refcount((IUnknown *)d3drm1); - todo_wine ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); + ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); ref3 = get_refcount((IUnknown *)d3drm2); ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); cref2 = get_refcount((IUnknown *)clipper); - todo_wine ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2); + ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2); /* Fetch immediate mode device in order to access render target */ hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); @@ -2322,7 +2322,7 @@ static void test_create_device_from_clipper3(void) IDirect3DRM3 *d3drm3 = NULL; IDirectDraw *ddraw = NULL; IUnknown *unknown = NULL; - IDirect3DRMDevice3 *device3 = NULL; + IDirect3DRMDevice3 *device3 = (IDirect3DRMDevice3 *)0xdeadbeef; IDirect3DDevice2 *d3ddevice2 = NULL; IDirectDrawClipper *clipper = NULL, *d3drm_clipper = NULL; IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_primary = NULL; @@ -2352,24 +2352,24 @@ static void test_create_device_from_clipper3(void) ref2 = get_refcount((IUnknown *)d3drm3); hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 0, 0, &device3); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); - if (SUCCEEDED(hr)) - IDirect3DRMDevice3_Release(device3); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3); /* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */ hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, NULL, &driver, 300, 200, &device3); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); - if (SUCCEEDED(hr)) - IDirect3DRMDevice3_Release(device3); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + + hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 300, 200, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 300, 200, &device3); ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr); ref3 = get_refcount((IUnknown *)d3drm1); - todo_wine ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); + ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); ref3 = get_refcount((IUnknown *)d3drm3); ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); cref2 = get_refcount((IUnknown *)clipper); - todo_wine ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2); + ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2); /* Fetch immediate mode device in order to access render target */ hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRMDevice{2-3}:: GetDirect3DDevice2.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: a5d09b6bd79f7e11c1c1772b3e3ad330338293c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d09b6bd79f7e11c1c1772b3… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Aug 7 04:08:37 2015 +0530 d3drm: Implement IDirect3DRMDevice{2-3}::GetDirect3DDevice2. --- dlls/d3drm/device.c | 7 ++++- dlls/d3drm/tests/d3drm.c | 68 ++++++++++++++---------------------------------- 2 files changed, 26 insertions(+), 49 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 4d08e6e..4024ead 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1325,7 +1325,12 @@ static DWORD WINAPI d3drm_device3_GetRenderMode(IDirect3DRMDevice3 *iface) static HRESULT WINAPI d3drm_device3_GetDirect3DDevice2(IDirect3DRMDevice3 *iface, IDirect3DDevice2 **d3d_device) { - FIXME("iface %p, d3d_device %p stub!\n", iface, d3d_device); + struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); + + TRACE("iface %p, d3d_device %p.\n", iface, d3d_device); + + if (device->device) + return IDirect3DDevice_QueryInterface(device->device, &IID_IDirect3DDevice2, (void**)d3d_device); return E_NOTIMPL; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 7790f02..981590d 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2185,9 +2185,7 @@ static void test_create_device_from_clipper2(void) /* Fetch immediate mode device in order to access render target */ hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); - if (FAILED(hr)) - goto cleanup; + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); @@ -2263,7 +2261,7 @@ static void test_create_device_from_clipper2(void) ref3 = get_refcount((IUnknown *)d3drm2); ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); cref2 = get_refcount((IUnknown *)clipper); - todo_wine ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2); + ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2); /* Test if render target format follows the screen format */ hr = IDirectDraw_GetDisplayMode(ddraw, &desc); @@ -2279,9 +2277,7 @@ static void test_create_device_from_clipper2(void) ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr); hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); - if (FAILED(hr)) - goto cleanup; + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); @@ -2295,23 +2291,13 @@ static void test_create_device_from_clipper2(void) hr = IDirectDraw2_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); -cleanup: - if (ds) - IDirectDrawSurface_Release(ds); - if (surface) - IDirectDrawSurface_Release(surface); - if (d3ddevice2) - IDirect3DDevice2_Release(d3ddevice2); - if (device2) - IDirect3DRMDevice2_Release(device2); - if (d3drm2) - IDirect3DRM2_Release(d3drm2); - if (d3drm1) - IDirect3DRM_Release(d3drm1); - if (clipper) - IDirectDrawClipper_Release(clipper); - if (ddraw) - IDirectDraw_Release(ddraw); + IDirectDrawSurface_Release(surface); + IDirect3DDevice2_Release(d3ddevice2); + IDirect3DRMDevice2_Release(device2); + IDirect3DRM2_Release(d3drm2); + IDirect3DRM_Release(d3drm1); + IDirectDrawClipper_Release(clipper); + IDirectDraw_Release(ddraw); DestroyWindow(window); } @@ -2373,9 +2359,7 @@ static void test_create_device_from_clipper3(void) /* Fetch immediate mode device in order to access render target */ hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2); - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); - if (FAILED(hr)) - goto cleanup; + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); @@ -2451,7 +2435,7 @@ static void test_create_device_from_clipper3(void) ref3 = get_refcount((IUnknown *)d3drm3); ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); cref2 = get_refcount((IUnknown *)clipper); - todo_wine ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2); + ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2); /* Test if render target format follows the screen format */ hr = IDirectDraw_GetDisplayMode(ddraw, &desc); @@ -2467,9 +2451,7 @@ static void test_create_device_from_clipper3(void) ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr); hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2); - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); - if (FAILED(hr)) - goto cleanup; + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); @@ -2483,23 +2465,13 @@ static void test_create_device_from_clipper3(void) hr = IDirectDraw2_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); -cleanup: - if (ds) - IDirectDrawSurface_Release(ds); - if (surface) - IDirectDrawSurface_Release(surface); - if (d3ddevice2) - IDirect3DDevice2_Release(d3ddevice2); - if (device3) - IDirect3DRMDevice3_Release(device3); - if (d3drm3) - IDirect3DRM3_Release(d3drm3); - if (d3drm1) - IDirect3DRM_Release(d3drm1); - if (clipper) - IDirectDrawClipper_Release(clipper); - if (ddraw) - IDirectDraw_Release(ddraw); + IDirectDrawSurface_Release(surface); + IDirect3DDevice2_Release(d3ddevice2); + IDirect3DRMDevice3_Release(device3); + IDirect3DRM3_Release(d3drm3); + IDirect3DRM_Release(d3drm1); + IDirectDrawClipper_Release(clipper); + IDirectDraw_Release(ddraw); DestroyWindow(window); }

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRM::CreateDeviceFromSurface.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 35b17f50f1c9602c13168974d4bc2367fc403e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b17f50f1c9602c13168974d… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Aug 7 03:35:57 2015 +0530 d3drm: Implement IDirect3DRM::CreateDeviceFromSurface. --- dlls/d3drm/d3drm.c | 23 ++++++++++++++----- dlls/d3drm/d3drm_private.h | 3 ++- dlls/d3drm/device.c | 46 ++++++++++++++++++++++++------------- dlls/d3drm/tests/d3drm.c | 56 ++++++++++++++++++++-------------------------- 4 files changed, 75 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35b17f50f1c9602c13168…

1 0