February 2011 - Wine-commits

Nicholas Niro : winex11.drv: Add proper initialization for border_pixel.
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: 7aff865e8e1890929c15bc91a39f4fb11a46d9eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aff865e8e1890929c15bc91a… Author: Nicholas Niro <nik_89(a)neuroponic.com> Date: Mon Feb 14 23:28:18 2011 -0500 winex11.drv: Add proper initialization for border_pixel. --- dlls/winex11.drv/opengl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 792bc13..4b56c3f 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -311,6 +311,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) attr.override_redirect = True; attr.colormap = None; + attr.border_pixel = 0; wine_tsx11_lock(); @@ -337,7 +338,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) if (vis->visual != DefaultVisual( gdi_display, vis->screen )) attr.colormap = XCreateColormap( gdi_display, root, vis->visual, AllocNone ); if ((win = XCreateWindow( gdi_display, root, -1, -1, 1, 1, 0, vis->depth, InputOutput, - vis->visual, CWOverrideRedirect | CWColormap, &attr ))) + vis->visual, CWBorderPixel | CWOverrideRedirect | CWColormap, &attr ))) XMapWindow( gdi_display, win ); else win = root;

1 0

Austin English : oleaut32/tests: Don't check return values inside of if(0) (LLVM/Clang).
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: 81102327ef48334d1a93726440f578245c7caaa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81102327ef48334d1a9372644… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 16:44:34 2011 -0800 oleaut32/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/oleaut32/tests/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index c817b5f..52dbb73 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -495,7 +495,7 @@ static void test_OleCreatePictureIndirect(void) if (0) { /* crashes on native */ - hr = pOleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, NULL); + pOleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, NULL); } hr = pOleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void**)&pict);

1 0

Austin English : oleaut32/tests: Make sure a return value is used (LLVM/ Clang).
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: d38dfa133e2f83d4f2aa2c1ba4c01c399db19fe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38dfa133e2f83d4f2aa2c1ba… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 16:44:39 2011 -0800 oleaut32/tests: Make sure a return value is used (LLVM/Clang). --- dlls/oleaut32/tests/tmarshal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 42db771..c64c68a 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1001,6 +1001,7 @@ static void test_typelibmarshal(void) IKindaEnumWidget_Release(pKEW); hr = IWidget_QueryInterface(pWidget, &IID_IDispatch, (void **)&pDispatch); + ok_ole_success(hr, IWidget_QueryInterface); /* call put_Name */ VariantInit(&vararg[0]);

1 0

Austin English : oleaut32/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: 3209f23c9d248ff26ff0af03b18ca93f67bfeea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3209f23c9d248ff26ff0af03b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 16:44:41 2011 -0800 oleaut32/tests: Make sure return values are used (LLVM/Clang). --- dlls/oleaut32/tests/typelib.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index acc60f5..c7c0f93 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1112,6 +1112,7 @@ if(use_midl_tlb) { hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p); ok(hr == S_OK, "hr %08x\n", hr); hr = ITypeInfo_GetTypeAttr(pTI_p, &pTA); + ok(hr == S_OK, "got %08x\n", hr); ok(IsEqualGUID(&pTA->guid, &IID_IDispatch), "guid {%08x-....\n", pTA->guid.Data1); ITypeInfo_ReleaseTypeAttr(pTI_p, pTA); ITypeInfo_Release(pTI_p); @@ -1146,6 +1147,7 @@ if(use_midl_tlb) { hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p); ok(hr == S_OK, "hr %08x\n", hr); hr = ITypeInfo_GetTypeAttr(pTI_p, &pTA); + ok(hr == S_OK, "got %08x\n", hr); ok(IsEqualGUID(&pTA->guid, &IID_IDispatch), "guid {%08x-....\n", pTA->guid.Data1); ITypeInfo_ReleaseTypeAttr(pTI_p, pTA); ITypeInfo_Release(pTI_p); @@ -1180,6 +1182,7 @@ if(use_midl_tlb) { hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p); ok(hr == S_OK, "hr %08x\n", hr); hr = ITypeInfo_GetTypeAttr(pTI_p, &pTA); + ok(hr == S_OK, "got %08x\n", hr); ok(IsEqualGUID(&pTA->guid, &IID_IDispatch), "guid {%08x-....\n", pTA->guid.Data1); ITypeInfo_ReleaseTypeAttr(pTI_p, pTA); ITypeInfo_Release(pTI_p); @@ -1209,6 +1212,7 @@ if(use_midl_tlb) { hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p); ok(hr == S_OK, "hr %08x\n", hr); hr = ITypeInfo_GetTypeAttr(pTI_p, &pTA); + ok(hr == S_OK, "got %08x\n", hr); ok(IsEqualGUID(&pTA->guid, &IID_IDispatch), "guid {%08x-....\n", pTA->guid.Data1); ITypeInfo_ReleaseTypeAttr(pTI_p, pTA); ITypeInfo_Release(pTI_p); @@ -1242,6 +1246,7 @@ if(use_midl_tlb) { hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p); ok(hr == S_OK, "hr %08x\n", hr); hr = ITypeInfo_GetTypeAttr(pTI_p, &pTA); + ok(hr == S_OK, "got %08x\n", hr); ok(IsEqualGUID(&pTA->guid, &IID_IDispatch), "guid {%08x-....\n", pTA->guid.Data1); ITypeInfo_ReleaseTypeAttr(pTI_p, pTA); ITypeInfo_Release(pTI_p); @@ -1278,6 +1283,7 @@ if(use_midl_tlb) { hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p); ok(hr == S_OK, "hr %08x\n", hr); hr = ITypeInfo_GetTypeAttr(pTI_p, &pTA); + ok(hr == S_OK, "got %08x\n", hr); ok(IsEqualGUID(&pTA->guid, &IID_IDispatch), "guid {%08x-....\n", pTA->guid.Data1); ITypeInfo_ReleaseTypeAttr(pTI_p, pTA); ITypeInfo_Release(pTI_p); @@ -2757,6 +2763,8 @@ static void test_create_typelib_lcid(LCID lcid) ok(hr == S_OK, "got %08x\n", hr); hr = ICreateTypeLib2_SaveAllChanges(tl); + ok(hr == S_OK, "got %08x\n", hr); + ICreateTypeLib2_Release(tl); file = CreateFileA( filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0 );

1 0

Austin English : oleaut32/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: 35c2ebd673e2f23a9bd6fd4d18ce4d833cf8eda9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c2ebd673e2f23a9bd6fd4d1… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 16:45:10 2011 -0800 oleaut32/tests: Make sure return values are used (LLVM/Clang). --- dlls/oleaut32/tests/vartest.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index a1a3ec5..c14dd91 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -861,6 +861,7 @@ static void test_VariantCopyInd(void) VariantInit(&vDst); hres = VariantCopyInd(&vDst, &vSrc); + ok(hres == S_OK, "VariantCopyInd failed: 0x%08x\n", hres); ok(V_VT(&vDst) == VT_UI1 && V_UI1(&vDst) == 0x77, "CopyInd(deref): expected dst vt = VT_UI1, val 0x77, got %d|0x%X, 0x%2X\n", V_VT(&vDst) & VT_TYPEMASK, V_VT(&vDst) & ~VT_TYPEMASK, V_UI1(&vDst)); @@ -873,6 +874,7 @@ static void test_VariantCopyInd(void) VariantInit(&vDst); hres = VariantCopyInd(&vDst, &vSrc); + ok(hres == S_OK, "VariantCopyInd failed: 0x%08x\n", hres); ok(V_VT(&vDst) == VT_UI1 && V_UI1(&vDst) == 0x88, "CopyInd(deref): expected dst vt = VT_UI1, val 0x77, got %d|0x%X, 0x%2X\n", V_VT(&vDst) & VT_TYPEMASK, V_VT(&vDst) & ~VT_TYPEMASK, V_UI1(&vDst));

1 0

Austin English : oleaut32/tests: Remove dead assignments (LLVM/Clang).
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: fdf24a94062439c1ada9992c1ef769c68fe0d3dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf24a94062439c1ada9992c1… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 16:45:13 2011 -0800 oleaut32/tests: Remove dead assignments (LLVM/Clang). --- dlls/oleaut32/tests/vartest.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index c14dd91..ca1767d 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -449,7 +449,8 @@ static void test_VariantClear(void) IUnknown *punk; /* Crashes: Native does not test input for NULL, so neither does Wine */ - if (0) hres = VariantClear(NULL); + if (0) + VariantClear(NULL); /* Only the type field is set, to VT_EMPTY */ V_VT(&v) = VT_UI4; @@ -2154,7 +2155,6 @@ static void test_VarSub(void) if (rightvt == VT_BSTR) V_BSTR(&right) = rbstr; V_VT(&result) = VT_EMPTY; - resvt = VT_ERROR; /* All extra flags produce errors */ if (ExtraFlags[i] == (VT_VECTOR|VT_BYREF|VT_RESERVED) ||

1 0

Austin English : oleaut32/tests: Don't check return values inside of if(0) (LLVM/Clang).
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: 00b8083b8698047e07774dfd4e5faa018be5f770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b8083b8698047e07774dfd4… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 16:45:15 2011 -0800 oleaut32/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/oleaut32/tests/vartype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index a620eec..484a17f 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5481,7 +5481,7 @@ static void test_VarBstrCat(void) if (0) { /* Crash */ - ret = VarBstrCat(NULL, NULL, NULL); + VarBstrCat(NULL, NULL, NULL); } /* Concatenation of two NULL strings works */

1 0

David Adam : d3dx9_36: Add a few tests for D3DXCreateBox.
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: e57bbaab91436943503e3950ed134ce7b5f9baf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e57bbaab91436943503e3950e… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Thu Feb 10 06:59:35 2011 +0100 d3dx9_36: Add a few tests for D3DXCreateBox. --- dlls/d3dx9_36/tests/mesh.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 5e875bd..5d1425b 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1347,6 +1347,79 @@ static void D3DXCreateMeshFVFTest(void) DestroyWindow(wnd); } +static void D3DXCreateBoxTest(void) +{ + HRESULT hr; + HWND wnd; + WNDCLASS wc={0}; + IDirect3D9* d3d; + IDirect3DDevice9* device; + D3DPRESENT_PARAMETERS d3dpp; + ID3DXMesh* box; + ID3DXBuffer* ppBuffer; + + wc.lpfnWndProc = DefWindowProcA; + wc.lpszClassName = "d3dx9_test_wc"; + if (!RegisterClass(&wc)) + { + skip("RegisterClass failed\n"); + return; + } + + wnd = CreateWindow("d3dx9_test_wc", "d3dx9_test", + WS_SYSMENU | WS_POPUP , 0, 0, 640, 480, 0, 0, 0, 0); + ok(wnd != NULL, "Expected to have a window, received NULL"); + if (!wnd) + { + skip("Couldn't create application window\n"); + return; + } + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) + { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(wnd); + return; + } + + memset(&d3dpp, 0, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + return; + } + + hr = D3DXCreateBuffer(36 * sizeof(DWORD), &ppBuffer); + ok(hr==D3D_OK, "Expected D3D_OK, received %#x", hr); + if (FAILED(hr)) goto end; + + hr = D3DXCreateBox(device,2.0f,20.0f,4.9f,NULL, &ppBuffer); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + + hr = D3DXCreateBox(NULL,22.0f,20.0f,4.9f,&box, &ppBuffer); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + + hr = D3DXCreateBox(device,-2.0f,20.0f,4.9f,&box, &ppBuffer); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + + hr = D3DXCreateBox(device,22.0f,-20.0f,4.9f,&box, &ppBuffer); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + + hr = D3DXCreateBox(device,22.0f,20.0f,-4.9f,&box, &ppBuffer); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + +end: + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); +} + struct sincos_table { float *sin; @@ -2037,6 +2110,7 @@ START_TEST(mesh) D3DXIntersectTriTest(); D3DXCreateMeshTest(); D3DXCreateMeshFVFTest(); + D3DXCreateBoxTest(); D3DXCreateSphereTest(); D3DXCreateCylinderTest(); test_get_decl_length();

1 0

Charles Davis : mountmgr: Use the media kind to fill in the device type field on Mac OS.
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: 9a1fb63840e47c7b98c91f945084100212546b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a1fb63840e47c7b98c91f945… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Tue Feb 8 15:12:54 2011 -0700 mountmgr: Use the media kind to fill in the device type field on Mac OS. --- dlls/mountmgr.sys/device.c | 7 +++++++ dlls/mountmgr.sys/diskarb.c | 10 +++++++--- dlls/mountmgr.sys/mountmgr.c | 1 + dlls/mountmgr.sys/mountmgr.h | 1 + 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 702f3ff..c4b4b72 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -219,6 +219,7 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** format = floppyW; break; case DEVICE_CDROM: + case DEVICE_DVD: format = cdromW; break; case DEVICE_RAMDISK: @@ -258,6 +259,11 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** device->devnum.DeviceNumber = i; device->devnum.PartitionNumber = ~0u; break; + case DEVICE_DVD: + device->devnum.DeviceType = FILE_DEVICE_DVD; + device->devnum.DeviceNumber = i; + device->devnum.PartitionNumber = ~0u; + break; case DEVICE_UNKNOWN: case DEVICE_HARDDISK: case DEVICE_NETWORK: /* FIXME */ @@ -541,6 +547,7 @@ static int add_drive( const char *device, enum device_type type ) last = 2; break; case DEVICE_CDROM: + case DEVICE_DVD: first = 3; last = 26; break; diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 0c188ff..d3912ca 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -64,11 +64,15 @@ static void appeared_callback( DADiskRef disk, void *context ) else mount_point[0] = 0; - if ((ref = CFDictionaryGetValue( dict, CFSTR("DAVolumeKind") ))) + if ((ref = CFDictionaryGetValue( dict, CFSTR("DAMediaKind") ))) { - if (!CFStringCompare( ref, CFSTR("cd9660"), 0 ) || - !CFStringCompare( ref, CFSTR("udf"), 0 )) + if (!CFStringCompare( ref, CFSTR("IOCDMedia"), 0 )) type = DEVICE_CDROM; + if (!CFStringCompare( ref, CFSTR("IODVDMedia"), 0 ) || + !CFStringCompare( ref, CFSTR("IOBDMedia"), 0 )) + type = DEVICE_DVD; + if (!CFStringCompare( ref, CFSTR("IOMedia"), 0 )) + type = DEVICE_HARDDISK; } TRACE( "got mount notification for '%s' on '%s' uuid %s\n", diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 87d9007..4e9900f 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -293,6 +293,7 @@ static NTSTATUS query_unix_drive( const void *in_buff, SIZE_T insize, case DEVICE_HARDDISK_VOL: type = DRIVE_FIXED; break; case DEVICE_FLOPPY: type = DRIVE_REMOVABLE; break; case DEVICE_CDROM: type = DRIVE_CDROM; break; + case DEVICE_DVD: type = DRIVE_CDROM; break; case DEVICE_NETWORK: type = DRIVE_REMOTE; break; case DEVICE_RAMDISK: type = DRIVE_RAMDISK; break; } diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index 3d57ba1..da1312c 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -47,6 +47,7 @@ enum device_type DEVICE_HARDDISK_VOL, DEVICE_FLOPPY, DEVICE_CDROM, + DEVICE_DVD, DEVICE_NETWORK, DEVICE_RAMDISK };

1 0

Andrew Nguyen : dxdiagn: Add code that populates the DxDiag_DisplayDevices container.
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: 5a2cb2114a098e9cc330676bb2e7655a353b8a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2cb2114a098e9cc330676bb… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 15 01:14:27 2011 -0600 dxdiagn: Add code that populates the DxDiag_DisplayDevices container. --- dlls/dxdiagn/provider.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 118 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index ac5f366..02855bb 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -1088,7 +1088,124 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) { - return S_OK; + static const WCHAR szDescription[] = {'s','z','D','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR szDeviceName[] = {'s','z','D','e','v','i','c','e','N','a','m','e',0}; + static const WCHAR szKeyDeviceID[] = {'s','z','K','e','y','D','e','v','i','c','e','I','D',0}; + static const WCHAR szKeyDeviceKey[] = {'s','z','K','e','y','D','e','v','i','c','e','K','e','y',0}; + static const WCHAR szVendorId[] = {'s','z','V','e','n','d','o','r','I','d',0}; + static const WCHAR szDeviceId[] = {'s','z','D','e','v','i','c','e','I','d',0}; + static const WCHAR szDeviceIdentifier[] = {'s','z','D','e','v','i','c','e','I','d','e','n','t','i','f','i','e','r',0}; + static const WCHAR dwWidth[] = {'d','w','W','i','d','t','h',0}; + static const WCHAR dwHeight[] = {'d','w','H','e','i','g','h','t',0}; + static const WCHAR dwBpp[] = {'d','w','B','p','p',0}; + static const WCHAR szDisplayMemoryLocalized[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','L','o','c','a','l','i','z','e','d',0}; + static const WCHAR szDisplayMemoryEnglish[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','E','n','g','l','i','s','h',0}; + + static const WCHAR szAdapterID[] = {'0',0}; + static const WCHAR szEmpty[] = {0}; + + IDxDiagContainerImpl_Container *display_adapter; + HRESULT hr; + IDirectDraw7 *pDirectDraw; + DDSCAPS2 dd_caps; + DISPLAY_DEVICEW disp_dev; + DDSURFACEDESC2 surface_descr; + DWORD tmp; + WCHAR buffer[256]; + + display_adapter = allocate_information_node(szAdapterID); + if (!display_adapter) + return E_OUTOFMEMORY; + + add_subcontainer(node, display_adapter); + + disp_dev.cb = sizeof(disp_dev); + if (EnumDisplayDevicesW( NULL, 0, &disp_dev, 0 )) + { + hr = add_bstr_property(display_adapter, szDeviceName, disp_dev.DeviceName); + if (FAILED(hr)) + return hr; + + hr = add_bstr_property(display_adapter, szDescription, disp_dev.DeviceString); + if (FAILED(hr)) + return hr; + } + + /* For now, silently ignore a failure from DirectDrawCreateEx. */ + hr = DirectDrawCreateEx(NULL, (LPVOID *)&pDirectDraw, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + return S_OK; + + dd_caps.dwCaps = DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; + dd_caps.dwCaps2 = dd_caps.dwCaps3 = dd_caps.dwCaps4 = 0; + hr = IDirectDraw7_GetAvailableVidMem(pDirectDraw, &dd_caps, &tmp, NULL); + if (SUCCEEDED(hr)) + { + static const WCHAR mem_fmt[] = {'%','.','1','f',' ','M','B',0}; + + snprintfW(buffer, sizeof(buffer)/sizeof(buffer[0]), mem_fmt, ((float)tmp) / 1000000.0); + + hr = add_bstr_property(display_adapter, szDisplayMemoryLocalized, buffer); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDisplayMemoryEnglish, buffer); + if (FAILED(hr)) + goto cleanup; + } + + surface_descr.dwSize = sizeof(surface_descr); + hr = IDirectDraw7_GetDisplayMode(pDirectDraw, &surface_descr); + if (SUCCEEDED(hr)) + { + if (surface_descr.dwFlags & DDSD_WIDTH) + { + hr = add_ui4_property(display_adapter, dwWidth, surface_descr.dwWidth); + if (FAILED(hr)) + goto cleanup; + } + + if (surface_descr.dwFlags & DDSD_HEIGHT) + { + hr = add_ui4_property(display_adapter, dwHeight, surface_descr.dwHeight); + if (FAILED(hr)) + goto cleanup; + } + + if (surface_descr.dwFlags & DDSD_PIXELFORMAT) + { + hr = add_ui4_property(display_adapter, dwBpp, surface_descr.u4.ddpfPixelFormat.u1.dwRGBBitCount); + if (FAILED(hr)) + goto cleanup; + } + } + + get_display_device_id(buffer); + + hr = add_bstr_property(display_adapter, szDeviceIdentifier, buffer); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szVendorId, szEmpty); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDeviceId, szEmpty); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szKeyDeviceKey, szEmpty); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szKeyDeviceID, szEmpty); + if (FAILED(hr)) + goto cleanup; + + hr = S_OK; +cleanup: + IDirectDraw7_Release(pDirectDraw); + return hr; } static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node)

1 0