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

Aaryaman Vasishta : d3drm: GetDirect3DDevice2 returns D3DRM_OK when IDirect3DDevice2 is not available.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: c453cb7023fc111e0dc2bbf463695cdb31e41ba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c453cb7023fc111e0dc2bbf46… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Aug 20 20:34:41 2015 +0530 d3drm: GetDirect3DDevice2 returns D3DRM_OK when IDirect3DDevice2 is not available. --- dlls/d3drm/device.c | 4 +++- dlls/d3drm/tests/d3drm.c | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 50d8b72..9c814fb 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1351,7 +1351,9 @@ static HRESULT WINAPI d3drm_device3_GetDirect3DDevice2(IDirect3DRMDevice3 *iface TRACE("iface %p, d3d_device %p.\n", iface, d3d_device); - return IDirect3DDevice_QueryInterface(device->device, &IID_IDirect3DDevice2, (void**)d3d_device); + IDirect3DDevice_QueryInterface(device->device, &IID_IDirect3DDevice2, (void**)d3d_device); + + return D3DRM_OK; } static HRESULT WINAPI d3drm_device3_FindPreferredTextureFormat(IDirect3DRMDevice3 *iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 4e5845c..50ba4c1 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -3118,7 +3118,10 @@ static void test_create_device_from_d3d1(void) IDirect3D *d3d1 = NULL; IDirect3DRM *d3drm1 = NULL; IDirect3DRMDevice *device1 = (IDirect3DRMDevice *)0xdeadbeef; + IDirect3DRMDevice2 *device2; + IDirect3DRMDevice3 *device3; IDirect3DDevice *d3ddevice1 = NULL, *d3drm_d3ddevice1 = NULL; + IDirect3DDevice2 *d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef; IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_ds = NULL; DWORD expected_flags; DDSCAPS caps = { DDSCAPS_ZBUFFER }; @@ -3167,6 +3170,21 @@ static void test_create_device_from_d3d1(void) device_ref2 = get_refcount((IUnknown *)d3ddevice1); ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2); + hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)&device2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface (hr = %x).\n", hr); + hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); + ok(SUCCEEDED(hr), "Expected hr == DD_OK, got %x).\n", hr); + ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2); + IDirect3DRMDevice2_Release(device2); + + d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef; + hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)&device3); + ok(hr == DD_OK, "Cannot get IDirect3DRMDevice2 Interface (hr = %x).\n", hr); + hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2); + ok(hr == DD_OK, "Expected hr == DD_OK, got %x).\n", hr); + ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2); + IDirect3DRMDevice3_Release(device3); + hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST, NULL, &surface, surface_callback); ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);

1 0

Aaryaman Vasishta : d3drm: Add IDirect3DRMObject to be queried from IDirect3DRMDevice*.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: d8329ecfa887dd80228ce38843d12c1943dc8284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8329ecfa887dd80228ce3884… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Aug 20 20:34:42 2015 +0530 d3drm: Add IDirect3DRMObject to be queried from IDirect3DRMDevice*. --- dlls/d3drm/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 9c814fb..5e62347 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -997,6 +997,7 @@ static HRESULT WINAPI d3drm_device3_QueryInterface(IDirect3DRMDevice3 *iface, RE TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DRMDevice3) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) || IsEqualGUID(riid, &IID_IUnknown)) { *out = &device->IDirect3DRMDevice3_iface;

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRM{2-3}:: CreateDeviceFromD3D.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: ed1d4f86c3d0e55e59992f062e8dd33d12253bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed1d4f86c3d0e55e59992f062… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Aug 20 20:34:40 2015 +0530 d3drm: Implement IDirect3DRM{2-3}::CreateDeviceFromD3D. --- dlls/d3drm/d3drm.c | 67 ++++++++++++++++++++++++++++++++++++++++-------- dlls/d3drm/device.c | 15 +++-------- dlls/d3drm/tests/d3drm.c | 46 +++++++++++++++++---------------- 3 files changed, 84 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed1d4f86c3d0e55e59992…

1 0

Sebastian Lackner : ntdll/tests: Add additional tests for calling NtOpenFile with file object as RootDirectory.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 84d2610aafb3c8b49f5ff8da71f024dc0cea615a URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d2610aafb3c8b49f5ff8da7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 21 07:25:45 2015 +0200 ntdll/tests: Add additional tests for calling NtOpenFile with file object as RootDirectory. --- dlls/ntdll/tests/file.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ad844b1..4f58788 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -297,7 +297,8 @@ static void create_file_test(void) static void open_file_test(void) { - static const WCHAR fooW[] = {'f','o','o',0}; + static const char testdata[] = "Hello World"; + static WCHAR fooW[] = {'f','o','o',0}; NTSTATUS status; HANDLE dir, root, handle, file; WCHAR path[MAX_PATH], tmpfile[MAX_PATH]; @@ -306,7 +307,8 @@ static void open_file_test(void) IO_STATUS_BLOCK io; UNICODE_STRING nameW; UINT i, len; - BOOL restart = TRUE; + BOOL ret, restart = TRUE; + DWORD numbytes; len = GetWindowsDirectoryW( path, MAX_PATH ); pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); @@ -432,6 +434,14 @@ static void open_file_test(void) GetTempFileNameW( path, fooW, 0, tmpfile ); pRtlDosPathNameToNtPathName_U( tmpfile, &nameW, NULL, NULL ); + file = CreateFileW( tmpfile, FILE_WRITE_DATA, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError() ); + numbytes = 0xdeadbeef; + ret = WriteFile( file, testdata, sizeof(testdata) - 1, &numbytes, NULL ); + ok( ret, "WriteFile failed with error %u\n", GetLastError() ); + ok( numbytes == sizeof(testdata) - 1, "failed to write all data\n" ); + CloseHandle( file ); + attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = &nameW; @@ -443,6 +453,22 @@ static void open_file_test(void) ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlFreeUnicodeString( &nameW ); + numbytes = 0xdeadbeef; + memset( data, 0, sizeof(data) ); + ret = ReadFile( file, data, sizeof(data), &numbytes, NULL ); + ok( ret, "ReadFile failed with error %u\n", GetLastError() ); + ok( numbytes == sizeof(testdata) - 1, "failed to read all data\n" ); + ok( !memcmp( data, testdata, sizeof(testdata) - 1 ), "testdata doesn't match\n" ); + + nameW.Length = sizeof(fooW) - sizeof(WCHAR); + nameW.Buffer = fooW; + attr.RootDirectory = file; + attr.ObjectName = &nameW; + status = pNtOpenFile( &root, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT ); + todo_wine ok( status == STATUS_OBJECT_PATH_NOT_FOUND, + "expected STATUS_OBJECT_PATH_NOT_FOUND, got %08x\n", status ); + nameW.Length = 0; nameW.Buffer = NULL; attr.RootDirectory = file; @@ -451,6 +477,23 @@ static void open_file_test(void) FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT ); todo_wine ok( !status, "open %s failed %x\n", wine_dbgstr_w(tmpfile), status ); + numbytes = SetFilePointer( file, 0, 0, FILE_CURRENT ); + ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); + numbytes = SetFilePointer( root, 0, 0, FILE_CURRENT ); + todo_wine ok( numbytes == 0, "SetFilePointer returned %u\n", numbytes ); + + numbytes = 0xdeadbeef; + memset( data, 0, sizeof(data) ); + ret = ReadFile( root, data, sizeof(data), &numbytes, NULL ); + todo_wine ok( ret, "ReadFile failed with error %u\n", GetLastError() ); + todo_wine ok( numbytes == sizeof(testdata) - 1, "failed to read all data\n" ); + todo_wine ok( !memcmp( data, testdata, sizeof(testdata) - 1 ), "testdata doesn't match\n" ); + + numbytes = SetFilePointer( file, 0, 0, FILE_CURRENT ); + ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); + numbytes = SetFilePointer( root, 0, 0, FILE_CURRENT ); + todo_wine ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); + CloseHandle( file ); CloseHandle( root ); DeleteFileW( tmpfile );

1 0

Sebastian Lackner : server: Implement support for FileLinkInformation class in NtSetInformationFile.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 1f2a443cb4bc42b7f1934e351feff84679e3ae2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2a443cb4bc42b7f1934e351… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 21 07:25:12 2015 +0200 server: Implement support for FileLinkInformation class in NtSetInformationFile. --- dlls/ntdll/file.c | 44 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/tests/file.c | 50 +++++++++++++++++++++--------------------- include/wine/server_protocol.h | 4 ++-- server/fd.c | 33 +++++++++++++++++++++++----- server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + 7 files changed, 101 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f2a443cb4bc42b7f1934…

1 0

Hugh McMaster : uninstaller: Add help switch and usage information.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: fb01bc0428c9331ad3bcc53467a5a9f52058c4f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb01bc0428c9331ad3bcc5346… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 21 16:00:23 2015 +1000 uninstaller: Add help switch and usage information. --- po/ar.po | 22 ++++++++++++++++++++++ po/bg.po | 22 ++++++++++++++++++++++ po/ca.po | 22 ++++++++++++++++++++++ po/cs.po | 22 ++++++++++++++++++++++ po/da.po | 22 ++++++++++++++++++++++ po/de.po | 22 ++++++++++++++++++++++ po/el.po | 22 ++++++++++++++++++++++ po/en.po | 36 ++++++++++++++++++++++++++++++++++++ po/en_US.po | 36 ++++++++++++++++++++++++++++++++++++ po/eo.po | 22 ++++++++++++++++++++++ po/es.po | 22 ++++++++++++++++++++++ po/fa.po | 22 ++++++++++++++++++++++ po/fi.po | 22 ++++++++++++++++++++++ po/fr.po | 22 ++++++++++++++++++++++ po/he.po | 22 ++++++++++++++++++++++ po/hi.po | 22 ++++++++++++++++++++++ po/hr.po | 22 ++++++++++++++++++++++ po/hu.po | 22 ++++++++++++++++++++++ po/it.po | 22 ++++++++++++++++++++++ po/ja.po | 22 ++++++++++++++++++++++ po/ko.po | 22 ++++++++++++++++++++++ po/lt.po | 22 ++++++++++++++++++++++ po/ml.po | 22 ++++++++++++++++++++++ po/nb_NO.po | 22 ++++++++++++++++++++++ po/nl.po | 22 ++++++++++++++++++++++ po/or.po | 22 ++++++++++++++++++++++ po/pa.po | 22 ++++++++++++++++++++++ po/pl.po | 25 ++++++++++++++++++++++++- po/pt_BR.po | 22 ++++++++++++++++++++++ po/pt_PT.po | 22 ++++++++++++++++++++++ po/rm.po | 22 ++++++++++++++++++++++ po/ro.po | 22 ++++++++++++++++++++++ po/ru.po | 22 ++++++++++++++++++++++ po/sk.po | 22 ++++++++++++++++++++++ po/sl.po | 22 ++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 22 ++++++++++++++++++++++ po/sr_RS(a)latin.po | 22 ++++++++++++++++++++++ po/sv.po | 22 ++++++++++++++++++++++ po/te.po | 22 ++++++++++++++++++++++ po/th.po | 22 ++++++++++++++++++++++ po/tr.po | 22 ++++++++++++++++++++++ po/uk.po | 22 ++++++++++++++++++++++ po/wa.po | 22 ++++++++++++++++++++++ po/wine.pot | 22 ++++++++++++++++++++++ po/zh_CN.po | 22 ++++++++++++++++++++++ po/zh_TW.po | 22 ++++++++++++++++++++++ programs/uninstaller/main.c | 10 ++++++++-- programs/uninstaller/resource.h | 2 ++ programs/uninstaller/uninstaller.rc | 10 ++++++++++ 49 files changed, 1062 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb01bc0428c9331ad3bcc…

1 0

Józef Kucia : d3d11: Move d3d10core to d3d11.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: a9cb14dd715470760b959873e91d128d44a325ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9cb14dd715470760b959873e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 21 00:07:53 2015 +0200 d3d11: Move d3d10core to d3d11. --- configure | 2 +- configure.ac | 2 +- dlls/d3d10core/Makefile.in | 13 +-- dlls/d3d10core/d3d10core_main.c | 96 ++++-------------- dlls/d3d11/Makefile.in | 13 ++- dlls/{d3d10core => d3d11}/async.c | 4 +- dlls/{d3d10core => d3d11}/buffer.c | 4 +- dlls/d3d11/d3d11.spec | 4 +- dlls/d3d11/d3d11_main.c | 109 ++++++++++++++++++++- .../d3d10core_private.h => d3d11/d3d11_private.h} | 8 +- dlls/{d3d10core => d3d11}/device.c | 4 +- dlls/{d3d10core => d3d11}/inputlayout.c | 4 +- dlls/{d3d10core => d3d11}/shader.c | 4 +- dlls/{d3d10core => d3d11}/state.c | 4 +- dlls/{d3d10core => d3d11}/texture.c | 4 +- dlls/{d3d10core => d3d11}/utils.c | 4 +- dlls/{d3d10core => d3d11}/view.c | 4 +- dlls/dxgi/dxgi_main.c | 8 +- 18 files changed, 168 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9cb14dd715470760b959…

1 0

Józef Kucia : d3d11: Implement D3D11CreateDevice.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: b2f5fad4b640e178a1d9d04bec5a7c218045b9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f5fad4b640e178a1d9d04be… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 21 00:07:54 2015 +0200 d3d11: Implement D3D11CreateDevice. --- dlls/d3d11/d3d11_main.c | 113 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 108 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 577391a..d56b35a 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -146,12 +146,115 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device, - D3D_FEATURE_LEVEL *feature_level, ID3D11DeviceContext **context) + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context) { - FIXME("adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %#x, sdk_version %u, " - "device %p, feature_level %p, context %p stub!\n", adapter, debug_d3d_driver_type(driver_type), swrast, - flags, feature_levels, levels, sdk_version, device, feature_level, context); - return E_OUTOFMEMORY; + IDXGIFactory *factory; + HRESULT hr; + + TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %u, sdk_version %u, " + "device %p, obtained_feature_level %p, immediate_context %p.\n", + adapter, debug_d3d_driver_type(driver_type), swrast, flags, feature_levels, levels, sdk_version, + device, obtained_feature_level, immediate_context); + + if (adapter) + { + IDXGIAdapter_AddRef(adapter); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + if (FAILED(hr)) + { + WARN("Failed to get dxgi factory, returning %#x.\n", hr); + return hr; + } + } + else + { + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); + if (FAILED(hr)) + { + WARN("Failed to create dxgi factory, returning %#x.\n", hr); + return hr; + } + + switch(driver_type) + { + case D3D_DRIVER_TYPE_HARDWARE: + { + hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); + if (FAILED(hr)) + { + WARN("No adapters found, returning %#x.\n", hr); + IDXGIFactory_Release(factory); + return hr; + } + break; + } + + case D3D_DRIVER_TYPE_NULL: + FIXME("NULL device not implemented, falling back to refrast.\n"); + /* fall through, for now */ + case D3D_DRIVER_TYPE_REFERENCE: + { + HMODULE refrast = LoadLibraryA("d3d11ref.dll"); + if (!refrast) + { + WARN("Failed to load refrast, returning E_FAIL.\n"); + IDXGIFactory_Release(factory); + return E_FAIL; + } + hr = IDXGIFactory_CreateSoftwareAdapter(factory, refrast, &adapter); + FreeLibrary(refrast); + if (FAILED(hr)) + { + WARN("Failed to create a software adapter, returning %#x.\n", hr); + IDXGIFactory_Release(factory); + return hr; + } + break; + } + + case D3D_DRIVER_TYPE_SOFTWARE: + { + if (!swrast) + { + WARN("Software device requested, but NULL swrast passed, returning E_FAIL.\n"); + IDXGIFactory_Release(factory); + return E_FAIL; + } + hr = IDXGIFactory_CreateSoftwareAdapter(factory, swrast, &adapter); + if (FAILED(hr)) + { + WARN("Failed to create a software adapter, returning %#x.\n", hr); + IDXGIFactory_Release(factory); + return hr; + } + break; + } + + default: + FIXME("Unhandled driver type %#x.\n", driver_type); + IDXGIFactory_Release(factory); + return E_FAIL; + } + } + + hr = D3D11CoreCreateDevice(factory, adapter, flags, feature_levels, levels, device); + IDXGIAdapter_Release(adapter); + IDXGIFactory_Release(factory); + if (FAILED(hr)) + { + WARN("Failed to create a device, returning %#x.\n", hr); + return hr; + } + + TRACE("Created ID3D11Device %p.\n", *device); + + if (obtained_feature_level) + *obtained_feature_level = ID3D11Device_GetFeatureLevel(*device); + + if (immediate_context) + ID3D11Device_GetImmediateContext(*device, immediate_context); + + return hr; } HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type,

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRM::CreateDeviceFromD3D.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 9603125efc4f65b29be9a581b615da5d05a5cee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9603125efc4f65b29be9a581b… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Aug 20 20:34:39 2015 +0530 d3drm: Implement IDirect3DRM::CreateDeviceFromD3D. --- dlls/d3drm/d3drm.c | 14 +++++++++++++- dlls/d3drm/d3drm_private.h | 2 ++ dlls/d3drm/device.c | 10 ++++++++++ dlls/d3drm/tests/d3drm.c | 22 +++++++++++----------- 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index aeb1f86..6372cce 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -279,13 +279,25 @@ static HRESULT WINAPI d3drm1_CreateDeviceFromD3D(IDirect3DRM *iface, { struct d3drm_device *object; HRESULT hr; - FIXME("iface %p, d3d %p, d3d_device %p, device %p partial stub.\n", + TRACE("iface %p, d3d %p, d3d_device %p, device %p.\n", iface, d3d, d3d_device, device); + if (!device) + return D3DRMERR_BADVALUE; + *device = NULL; + if (!d3d || !d3d_device) + return D3DRMERR_BADVALUE; + hr = d3drm_device_create(&object); if (FAILED(hr)) return hr; + hr = d3drm_device_set_ddraw_device_d3d(object, iface, d3d, d3d_device); + if (FAILED(hr)) + { + d3drm_device_destroy(object); + return hr; + } *device = IDirect3DRMDevice_from_impl(object); return D3DRM_OK; diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 9e2b3bd..5df83a7 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -50,6 +50,8 @@ HRESULT d3drm_device_create_surfaces_from_clipper(struct d3drm_device *object, I HRESULT d3drm_device_init(struct d3drm_device *device, UINT version, IDirect3DRM *d3drm, IDirectDraw *ddraw, IDirectDrawSurface *surface, BOOL create_z_surface) DECLSPEC_HIDDEN; +HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, IDirect3DRM *d3drm, IDirect3D *d3d, IDirect3DDevice *d3d_device) DECLSPEC_HIDDEN; + struct d3drm_file_header { WORD major; diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 03caa36..3cf6791 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -241,6 +241,16 @@ HRESULT d3drm_device_init(struct d3drm_device *device, UINT version, IDirect3DRM return hr; } +HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, IDirect3DRM *d3drm, IDirect3D *d3d, IDirect3DDevice *d3d_device) +{ + device->d3drm = d3drm; + IDirect3DRM_AddRef(d3drm); + device->device = d3d_device; + IDirect3DDevice_AddRef(d3d_device); + + return IDirect3D_QueryInterface(d3d, &IID_IDirectDraw, (void **)&device->ddraw); +} + static HRESULT WINAPI d3drm_device1_QueryInterface(IDirect3DRMDevice *iface, REFIID riid, void **out) { struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 65472cd..b971938 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -3117,7 +3117,7 @@ static void test_create_device_from_d3d1(void) IDirectDraw *ddraw1 = NULL; IDirect3D *d3d1 = NULL; IDirect3DRM *d3drm1 = NULL; - IDirect3DRMDevice *device1 = NULL; + IDirect3DRMDevice *device1 = (IDirect3DRMDevice *)0xdeadbeef; IDirect3DDevice *d3ddevice1 = NULL, *d3drm_d3ddevice1 = NULL; IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_ds = NULL; DWORD expected_flags; @@ -3152,13 +3152,20 @@ static void test_create_device_from_d3d1(void) ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr); ref1 = get_refcount((IUnknown *)d3drm1); + hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, NULL, d3ddevice1, &device1); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1); + hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, NULL, &device1); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, d3ddevice1, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, d3ddevice1, &device1); ok(hr == DD_OK, "Failed to create IDirect3DRMDevice interface (hr = %x)\n", hr); ref2 = get_refcount((IUnknown *)d3drm1); - todo_wine ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2); + ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2); device_ref2 = get_refcount((IUnknown *)d3ddevice1); - todo_wine ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2); + ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2); hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST, NULL, &surface, surface_callback); @@ -3166,9 +3173,7 @@ static void test_create_device_from_d3d1(void) ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface); hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3drm_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); ok(d3ddevice1 == d3drm_d3ddevice1, "Expected Immediate Mode deivce created == %p, got %p.\n", d3ddevice1, d3drm_d3ddevice1); /* Check properties of render target and depth surfaces */ @@ -3203,13 +3208,8 @@ static void test_create_device_from_d3d1(void) IDirectDrawSurface_Release(d3drm_ds); IDirectDrawSurface_Release(ds); - ds = NULL; IDirectDrawSurface_Release(surface); IDirect3DDevice_Release(d3drm_d3ddevice1); -cleanup: - if (ds) - IDirectDrawSurface_Release(ds); - IDirect3DRMDevice_Release(device1); ref2 = get_refcount((IUnknown *)d3drm1); ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);

1 0

Józef Kucia : d3d11: Rename d3d10_device to d3d_device.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: e29a0cf41729afd89bfd098d9a2bac76d83f96c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e29a0cf41729afd89bfd098d9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 21 00:07:56 2015 +0200 d3d11: Rename d3d10_device to d3d_device. --- dlls/d3d11/async.c | 2 +- dlls/d3d11/buffer.c | 2 +- dlls/d3d11/d3d11_main.c | 4 +- dlls/d3d11/d3d11_private.h | 40 ++++----- dlls/d3d11/device.c | 206 ++++++++++++++++++++++----------------------- dlls/d3d11/inputlayout.c | 2 +- dlls/d3d11/shader.c | 6 +- dlls/d3d11/state.c | 16 ++-- dlls/d3d11/texture.c | 4 +- dlls/d3d11/view.c | 6 +- 10 files changed, 144 insertions(+), 144 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e29a0cf41729afd89bfd0…

1 0