June 2011 - Wine-commits - list.winehq.org

Francois Gouget : shell32: Fix ellipsis usage in the menu and button labels .
by Alexandre Julliard 15 Jun '11

15 Jun '11

1 0

Andrew Nguyen : dxdiagn: Unconditionally initialize the passed variant in IDxDiagContainer::GetProp .
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: 9d7d35c1eeffcf4529ebb4c77e431d0a187f1c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7d35c1eeffcf4529ebb4c77… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 15 07:10:32 2011 -0500 dxdiagn: Unconditionally initialize the passed variant in IDxDiagContainer::GetProp. --- dlls/dxdiagn/container.c | 5 +---- dlls/dxdiagn/tests/container.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 96ba10a..6de641f 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -222,10 +222,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWS LIST_FOR_EACH_ENTRY(p, &This->cont->properties, IDxDiagContainerImpl_Property, entry) { if (0 == lstrcmpW(p->propName, pwszPropName)) { - HRESULT hr = VariantClear(pvarProp); - if (hr == DISP_E_ARRAYISLOCKED || hr == DISP_E_BADVARTYPE) - VariantInit(pvarProp); - + VariantInit(pvarProp); return VariantCopy(pvarProp, &p->vProp); } } diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index c7bd2bb..dff8701 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -568,6 +568,7 @@ static void test_GetProp(void) VARIANT var; SAFEARRAY *sa; SAFEARRAYBOUND bound; + ULONG ref; static const WCHAR emptyW[] = {0}; static const WCHAR testW[] = {'t','e','s','t',0}; @@ -680,8 +681,21 @@ static void test_GetProp(void) ok(hr == S_OK, "Expected SafeArrayUnlock to return S_OK, got 0x%08x\n", hr); hr = SafeArrayDestroy(sa); ok(hr == S_OK, "Expected SafeArrayDestroy to return S_OK, got 0x%08x\n", hr); - IDxDiagContainer_Release(child); + /* Determine whether GetProp calls VariantClear on the passed variant. */ + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown *)child; + IDxDiagContainer_AddRef(child); + + hr = IDxDiagContainer_GetProp(child, property, &var); + ok(hr == S_OK, "Expected IDxDiagContainer::GetProp to return S_OK, got 0x%08x\n", hr); + ok(V_VT(&var) != VT_UNKNOWN, "Expected the variant to be modified\n"); + + IDxDiagContainer_AddRef(child); + ref = IDxDiagContainer_Release(child); + ok(ref == 2, "Expected reference count to be 2, got %u\n", ref); + + IDxDiagContainer_Release(child); cleanup: IDxDiagContainer_Release(pddc); IDxDiagProvider_Release(pddp);

1 0

Andrew Nguyen : dxdiagn/tests: Add tests for some DxDiag_DisplayDevices subcontainer properties.
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: 55296f6edbf90309c8e9752efcdd2dcdd8311581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55296f6edbf90309c8e9752ef… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 15 07:10:43 2011 -0500 dxdiagn/tests: Add tests for some DxDiag_DisplayDevices subcontainer properties. --- dlls/dxdiagn/tests/container.c | 155 +++++++++++++++++++++++++++++++++------ 1 files changed, 131 insertions(+), 24 deletions(-) diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index dff8701..9805b94 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -25,10 +25,17 @@ #include "oleauto.h" #include "wine/test.h" +struct property_test +{ + const WCHAR *prop; + VARTYPE vt; +}; + static IDxDiagProvider *pddp; static IDxDiagContainer *pddc; static const WCHAR DxDiag_SystemInfo[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','I','n','f','o',0}; +static const WCHAR DxDiag_DisplayDevices[] = {'D','x','D','i','a','g','_','D','i','s','p','l','a','y','D','e','v','i','c','e','s',0}; /* Based on debugstr_variant in dlls/jscript/jsutils.c. */ static const char *debugstr_variant(const VARIANT *var) @@ -703,7 +710,6 @@ cleanup: static void test_root_children(void) { - static const WCHAR DxDiag_DisplayDevices[] = {'D','x','D','i','a','g','_','D','i','s','p','l','a','y','D','e','v','i','c','e','s',0}; static const WCHAR DxDiag_DirectSound[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','S','o','u','n','d',0}; static const WCHAR DxDiag_DirectMusic[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','M','u','s','i','c',0}; static const WCHAR DxDiag_DirectInput[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','I','n','p','u','t',0}; @@ -777,6 +783,45 @@ cleanup: IDxDiagProvider_Release(pddp); } +static void test_container_properties(IDxDiagContainer *container, const struct property_test *property_tests, size_t len) +{ + HRESULT hr; + + /* Check that the container has no properties if there are no properties to examine. */ + if (len == 0) + { + DWORD prop_count; + + hr = IDxDiagContainer_GetNumberOfProps(container, &prop_count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfProps to return S_OK, got 0x%08x\n", hr); + if (hr == S_OK) + ok(prop_count == 0, "Expected container property count to be zero, got %u\n", prop_count); + } + else + { + VARIANT var; + int i; + + VariantInit(&var); + + /* Examine the variant types of obtained property values. */ + for (i = 0; i < len; i++) + { + hr = IDxDiagContainer_GetProp(container, property_tests[i].prop, &var); + ok(hr == S_OK, "[%d] Expected IDxDiagContainer::GetProp to return S_OK for %s, got 0x%08x\n", + i, wine_dbgstr_w(property_tests[i].prop), hr); + + if (hr == S_OK) + { + ok(V_VT(&var) == property_tests[i].vt, + "[%d] Expected variant type %d, got %d\n", i, property_tests[i].vt, V_VT(&var)); + trace("%s = %s\n", wine_dbgstr_w(property_tests[i].prop), debugstr_variant(&var)); + VariantClear(&var); + } + } + } +} + static void test_DxDiag_SystemInfo(void) { static const WCHAR dwOSMajorVersion[] = {'d','w','O','S','M','a','j','o','r','V','e','r','s','i','o','n',0}; @@ -812,11 +857,7 @@ static void test_DxDiag_SystemInfo(void) static const WCHAR szOSExEnglish[] = {'s','z','O','S','E','x','E','n','g','l','i','s','h',0}; static const WCHAR szOSExLongEnglish[] = {'s','z','O','S','E','x','L','o','n','g','E','n','g','l','i','s','h',0}; - static const struct - { - const WCHAR *prop; - VARTYPE vt; - } property_tests[] = + static const struct property_test property_tests[] = { {dwOSMajorVersion, VT_UI4}, {dwOSMinorVersion, VT_UI4}, @@ -852,8 +893,8 @@ static void test_DxDiag_SystemInfo(void) {szOSExLongEnglish, VT_BSTR}, }; + IDxDiagContainer *container; HRESULT hr; - IDxDiagContainer *child = NULL; if (!create_root_IDxDiagContainer()) { @@ -861,33 +902,98 @@ static void test_DxDiag_SystemInfo(void) return; } - hr = IDxDiagContainer_GetChildContainer(pddc, DxDiag_SystemInfo, &child); + hr = IDxDiagContainer_GetChildContainer(pddc, DxDiag_SystemInfo, &container); ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); if (hr == S_OK) { - int i; - VARIANT var; + trace("Testing container DxDiag_SystemInfo\n"); + test_container_properties(container, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); + IDxDiagContainer_Release(container); + } - VariantInit(&var); + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} - /* Examine the variant types of obtained property values. */ - for (i = 0; i < sizeof(property_tests)/sizeof(property_tests[0]); i++) - { - hr = IDxDiagContainer_GetProp(child, property_tests[i].prop, &var); - ok(hr == S_OK, "[%d] Expected IDxDiagContainer::GetProp to return S_OK, got 0x%08x\n", i, hr); +static void test_DxDiag_DisplayDevices(void) +{ + 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 struct property_test property_tests[] = + { + {szDescription, VT_BSTR}, + {szDeviceName, VT_BSTR}, + {szKeyDeviceID, VT_BSTR}, + {szKeyDeviceKey, VT_BSTR}, + {szVendorId, VT_BSTR}, + {szDeviceId, VT_BSTR}, + {szDeviceIdentifier, VT_BSTR}, + {dwWidth, VT_UI4}, + {dwHeight, VT_UI4}, + {dwBpp, VT_UI4}, + {szDisplayMemoryLocalized, VT_BSTR}, + {szDisplayMemoryEnglish, VT_BSTR}, + }; - if (hr == S_OK) - { - ok(V_VT(&var) == property_tests[i].vt, - "[%d] Expected variant type %d, got %d\n", i, property_tests[i].vt, V_VT(&var)); - trace("%s = %s\n", wine_dbgstr_w(property_tests[i].prop), debugstr_variant(&var)); - VariantClear(&var); - } + IDxDiagContainer *display_cont = NULL; + DWORD count, i; + HRESULT hr; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + hr = IDxDiagContainer_GetChildContainer(pddc, DxDiag_DisplayDevices, &display_cont); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (hr != S_OK) + goto cleanup; + + hr = IDxDiagContainer_GetNumberOfProps(display_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfProps to return S_OK, got 0x%08x\n", hr); + if (hr == S_OK) + ok(count == 0, "Expected count to be 0, got %u\n", count); + + hr = IDxDiagContainer_GetNumberOfChildContainers(display_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr); + + if (hr != S_OK) + goto cleanup; + + for (i = 0; i < count; i++) + { + WCHAR child_container[256]; + IDxDiagContainer *child; + + hr = IDxDiagContainer_EnumChildContainerNames(display_cont, i, child_container, sizeof(child_container)/sizeof(WCHAR)); + ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetChildContainer(display_cont, child_container, &child); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (hr == S_OK) + { + trace("Testing container %s\n", wine_dbgstr_w(child_container)); + test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); } } - IDxDiagContainer_Release(child); +cleanup: + if (display_cont) IDxDiagContainer_Release(display_cont); IDxDiagContainer_Release(pddc); IDxDiagProvider_Release(pddp); } @@ -905,5 +1011,6 @@ START_TEST(container) test_root_children(); test_DxDiag_SystemInfo(); + test_DxDiag_DisplayDevices(); CoUninitialize(); }

1 0

Andrew Nguyen : dxdiagn: Start using Direct3D to obtain better reported adapter information for DxDiag_DisplayDevices .
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: 2d75211bd258bc6fc7dea31bb3dc68c005e8c7a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d75211bd258bc6fc7dea31bb… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 15 07:10:52 2011 -0500 dxdiagn: Start using Direct3D to obtain better reported adapter information for DxDiag_DisplayDevices. --- dlls/dxdiagn/Makefile.in | 2 +- dlls/dxdiagn/provider.c | 177 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 165 insertions(+), 14 deletions(-) diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index b522547..6276e74 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -1,5 +1,5 @@ MODULE = dxdiagn.dll -IMPORTS = strmiids dxguid uuid ddraw version ole32 oleaut32 psapi user32 advapi32 +IMPORTS = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 psapi user32 advapi32 C_SRCS = \ container.c \ diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 9d19558..9cfa483 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -48,6 +48,19 @@ static const WCHAR szEmpty[] = {0}; static HRESULT build_information_tree(IDxDiagContainerImpl_Container **pinfo_root); static void free_information_tree(IDxDiagContainerImpl_Container *node); +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}; + /* IDxDiagProvider IUnknown parts follow: */ static HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(PDXDIAGPROVIDER iface, REFIID riid, LPVOID *ppobj) { @@ -738,21 +751,154 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) return S_OK; } -static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) +/* The logic from pixelformat_for_depth() in dlls/wined3d/utils.c is reversed. */ +static DWORD depth_for_pixelformat(D3DFORMAT format) +{ + switch (format) + { + case D3DFMT_P8: return 8; + case D3DFMT_X1R5G5B5: return 15; + case D3DFMT_R5G6B5: return 16; + /* This case will fail to distinguish an original bpp of 24. */ + case D3DFMT_X8R8G8B8: return 32; + default: + FIXME("Unknown D3DFORMAT %d, returning 32 bpp\n", format); + return 32; + } +} + +static BOOL get_texture_memory(GUID *adapter, DWORD *available_mem) { - 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}; + IDirectDraw7 *pDirectDraw; + HRESULT hr; + DDSCAPS2 dd_caps; + + hr = DirectDrawCreateEx(adapter, (void **)&pDirectDraw, &IID_IDirectDraw7, NULL); + if (SUCCEEDED(hr)) + { + dd_caps.dwCaps = DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; + dd_caps.dwCaps2 = dd_caps.dwCaps3 = dd_caps.dwCaps4 = 0; + hr = IDirectDraw7_GetAvailableVidMem(pDirectDraw, &dd_caps, available_mem, NULL); + IDirectDraw7_Release(pDirectDraw); + if (SUCCEEDED(hr)) + return TRUE; + } + + return FALSE; +} + +static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node) +{ + IDxDiagContainerImpl_Container *display_adapter; + HRESULT hr; + IDirect3D9 *pDirect3D9; + WCHAR buffer[256]; + UINT index, count; + + pDirect3D9 = Direct3DCreate9(D3D_SDK_VERSION); + if (!pDirect3D9) + return E_FAIL; + + count = IDirect3D9_GetAdapterCount(pDirect3D9); + for (index = 0; index < count; index++) + { + static const WCHAR adapterid_fmtW[] = {'%','u',0}; + static const WCHAR id_fmtW[] = {'0','x','%','0','4','x',0}; + static const WCHAR mem_fmt[] = {'%','.','1','f',' ','M','B',0}; + + D3DADAPTER_IDENTIFIER9 adapter_info; + D3DDISPLAYMODE adapter_mode; + DWORD available_mem = 0; + + snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), adapterid_fmtW, index); + display_adapter = allocate_information_node(buffer); + if (!display_adapter) + { + hr = E_OUTOFMEMORY; + goto cleanup; + } + + add_subcontainer(node, display_adapter); + + hr = IDirect3D9_GetAdapterIdentifier(pDirect3D9, index, 0, &adapter_info); + if (SUCCEEDED(hr)) + { + WCHAR devicenameW[sizeof(adapter_info.DeviceName)]; + WCHAR descriptionW[sizeof(adapter_info.Description)]; + + MultiByteToWideChar(CP_ACP, 0, adapter_info.DeviceName, -1, devicenameW, sizeof(devicenameW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, adapter_info.Description, -1, descriptionW, sizeof(descriptionW)/sizeof(WCHAR)); + + hr = add_bstr_property(display_adapter, szDeviceName, devicenameW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDescription, descriptionW); + if (FAILED(hr)) + goto cleanup; + + StringFromGUID2(&adapter_info.DeviceIdentifier, buffer, 39); + hr = add_bstr_property(display_adapter, szDeviceIdentifier, buffer); + if (FAILED(hr)) + goto cleanup; + + snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), id_fmtW, adapter_info.VendorId); + hr = add_bstr_property(display_adapter, szVendorId, buffer); + if (FAILED(hr)) + goto cleanup; + + snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), id_fmtW, adapter_info.DeviceId); + hr = add_bstr_property(display_adapter, szDeviceId, buffer); + if (FAILED(hr)) + goto cleanup; + } + + hr = IDirect3D9_GetAdapterDisplayMode(pDirect3D9, index, &adapter_mode); + if (SUCCEEDED(hr)) + { + hr = add_ui4_property(display_adapter, dwWidth, adapter_mode.Width); + if (FAILED(hr)) + goto cleanup; + hr = add_ui4_property(display_adapter, dwHeight, adapter_mode.Height); + if (FAILED(hr)) + goto cleanup; + + hr = add_ui4_property(display_adapter, dwBpp, depth_for_pixelformat(adapter_mode.Format)); + 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; + + if (!get_texture_memory(&adapter_info.DeviceIdentifier, &available_mem)) + WARN("get_texture_memory helper failed\n"); + + snprintfW(buffer, sizeof(buffer)/sizeof(buffer[0]), mem_fmt, available_mem / 1000000.0f); + + 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; + } + + hr = S_OK; +cleanup: + IDirect3D9_Release(pDirect3D9); + return hr; +} + +static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) +{ static const WCHAR szAdapterID[] = {'0',0}; IDxDiagContainerImpl_Container *display_adapter; @@ -764,6 +910,11 @@ static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) DWORD tmp; WCHAR buffer[256]; + /* Try to use Direct3D to obtain the required information first. */ + hr = fill_display_information_d3d(node); + if (hr != E_FAIL) + return hr; + display_adapter = allocate_information_node(szAdapterID); if (!display_adapter) return E_OUTOFMEMORY;

1 0

Andrew Nguyen : dxdiagn: Extract the fallback display information code to a separate function.
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: f750cf33062415fae38660a674acc833bf054ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f750cf33062415fae38660a67… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 15 07:10:58 2011 -0500 dxdiagn: Extract the fallback display information code to a separate function. --- dlls/dxdiagn/provider.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 9cfa483..26a6916 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -897,7 +897,7 @@ cleanup: return hr; } -static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) +static HRESULT fill_display_information_fallback(IDxDiagContainerImpl_Container *node) { static const WCHAR szAdapterID[] = {'0',0}; @@ -910,11 +910,6 @@ static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) DWORD tmp; WCHAR buffer[256]; - /* Try to use Direct3D to obtain the required information first. */ - hr = fill_display_information_d3d(node); - if (hr != E_FAIL) - return hr; - display_adapter = allocate_information_node(szAdapterID); if (!display_adapter) return E_OUTOFMEMORY; @@ -933,8 +928,8 @@ static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) return hr; } - /* For now, silently ignore a failure from DirectDrawCreateEx. */ - hr = DirectDrawCreateEx(NULL, (LPVOID *)&pDirectDraw, &IID_IDirectDraw7, NULL); + /* Silently ignore a failure from DirectDrawCreateEx. */ + hr = DirectDrawCreateEx(NULL, (void **)&pDirectDraw, &IID_IDirectDraw7, NULL); if (FAILED(hr)) return S_OK; @@ -945,7 +940,7 @@ static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) { static const WCHAR mem_fmt[] = {'%','.','1','f',' ','M','B',0}; - snprintfW(buffer, sizeof(buffer)/sizeof(buffer[0]), mem_fmt, ((float)tmp) / 1000000.0); + snprintfW(buffer, sizeof(buffer)/sizeof(buffer[0]), mem_fmt, tmp / 1000000.0f); hr = add_bstr_property(display_adapter, szDisplayMemoryLocalized, buffer); if (FAILED(hr)) @@ -1010,6 +1005,18 @@ cleanup: return hr; } +static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) +{ + HRESULT hr; + + /* Try to use Direct3D to obtain the required information first. */ + hr = fill_display_information_d3d(node); + if (hr != E_FAIL) + return hr; + + return fill_display_information_fallback(node); +} + static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node) { static const WCHAR DxDiag_SoundDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','D','e','v','i','c','e','s',0};

1 0

Andrew Nguyen : dxdiagn: Remove the Direct3D usage in the fallback display information code.
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: 77c194fff8aff897cf113195c022884212d661e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c194fff8aff897cf113195c… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 15 07:11:04 2011 -0500 dxdiagn: Remove the Direct3D usage in the fallback display information code. --- dlls/dxdiagn/provider.c | 35 +---------------------------------- 1 files changed, 1 insertions(+), 34 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 26a6916..f01c0ea 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -171,37 +171,6 @@ HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, R return IDxDiagProviderImpl_QueryInterface ((PDXDIAGPROVIDER)provider, riid, ppobj); } -static void get_display_device_id(WCHAR *szIdentifierBuffer) -{ - static const WCHAR szNA[] = {'n','/','a',0}; - - HRESULT hr = E_FAIL; - - HMODULE d3d9_handle; - IDirect3D9 *(WINAPI *pDirect3DCreate9)(UINT) = NULL; - IDirect3D9 *pD3d = NULL; - D3DADAPTER_IDENTIFIER9 adapter_ident; - - /* Retrieves the display device identifier from the d3d9 implementation. */ - d3d9_handle = LoadLibraryA("d3d9.dll"); - if(d3d9_handle) - pDirect3DCreate9 = (void *)GetProcAddress(d3d9_handle, "Direct3DCreate9"); - if(pDirect3DCreate9) - pD3d = pDirect3DCreate9(D3D_SDK_VERSION); - if(pD3d) - hr = IDirect3D9_GetAdapterIdentifier(pD3d, D3DADAPTER_DEFAULT, 0, &adapter_ident); - if(SUCCEEDED(hr)) { - StringFromGUID2(&adapter_ident.DeviceIdentifier, szIdentifierBuffer, 39); - } else { - memcpy(szIdentifierBuffer, szNA, sizeof(szNA)); - } - - if (pD3d) - IDirect3D9_Release(pD3d); - if (d3d9_handle) - FreeLibrary(d3d9_handle); -} - static void free_property_information(IDxDiagContainerImpl_Property *prop) { VariantClear(&prop->vProp); @@ -977,9 +946,7 @@ static HRESULT fill_display_information_fallback(IDxDiagContainerImpl_Container } } - get_display_device_id(buffer); - - hr = add_bstr_property(display_adapter, szDeviceIdentifier, buffer); + hr = add_bstr_property(display_adapter, szDeviceIdentifier, szEmpty); if (FAILED(hr)) goto cleanup;

1 0

Andrew Nguyen : dxdiagn: Add additional adapter identifier properties for DxDiag_DisplayDevices subcontainers .
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: 7664adb2159e27975b4521ffb88dc30032d8ddb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7664adb2159e27975b4521ffb… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 15 07:11:07 2011 -0500 dxdiagn: Add additional adapter identifier properties for DxDiag_DisplayDevices subcontainers. --- dlls/dxdiagn/provider.c | 106 ++++++++++++++++++++++++++++++++-------- dlls/dxdiagn/tests/container.c | 12 +++++ 2 files changed, 97 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7664adb2159e27975b452…

1 0

Andrew Nguyen : dxdiag: Avoid C99 list initialization constructs.
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: 6b48a9e7c61eaa517738c27957a0b3935f5fc77e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b48a9e7c61eaa517738c2795… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 15 07:11:11 2011 -0500 dxdiag: Avoid C99 list initialization constructs. --- programs/dxdiag/information.c | 161 +++++++++++++++++++++++------------------ programs/dxdiag/output.c | 150 ++++++++++++++++++++++++-------------- 2 files changed, 185 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b48a9e7c61eaa517738c…

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirect3DVertexBuffer7 iface .
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: d7768739ecd9ba7d77e5cea9d6e46c3e65d2323e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7768739ecd9ba7d77e5cea9d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 15 12:48:18 2011 +0200 ddraw: COM cleanup for the IDirect3DVertexBuffer7 iface. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 3 +- dlls/ddraw/device.c | 5 ++- dlls/ddraw/vertexbuffer.c | 77 ++++++++++++++++++++----------------------- 4 files changed, 41 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7768739ecd9ba7d77e5c…

1 0

Francois Gouget : msvfw32: Fix ellipsis usage in the menu and button labels .
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: 11529e1c9f9ac9c31a0058819b597d9d4289e226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11529e1c9f9ac9c31a0058819… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 15 12:37:21 2011 +0200 msvfw32: Fix ellipsis usage in the menu and button labels. --- dlls/msvfw32/msvfw32_En.rc | 2 +- dlls/msvfw32/msvfw32_Hu.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvfw32/msvfw32_En.rc b/dlls/msvfw32/msvfw32_En.rc index 527f4a6..88c55d1 100644 --- a/dlls/msvfw32/msvfw32_En.rc +++ b/dlls/msvfw32/msvfw32_En.rc @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_COMP_LIST,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP PUSHBUTTON "Con&figure...",IDC_CONFIGURE,129,36,49,14 - PUSHBUTTON "&About...",IDC_ABOUT,129,52,49,14 + PUSHBUTTON "&About",IDC_ABOUT,129,52,49,14 SCROLLBAR IDC_QUALITY_SCROLL,9,44,111,9,WS_TABSTOP diff --git a/dlls/msvfw32/msvfw32_Hu.rc b/dlls/msvfw32/msvfw32_Hu.rc index e910f93..244aa7b 100644 --- a/dlls/msvfw32/msvfw32_Hu.rc +++ b/dlls/msvfw32/msvfw32_Hu.rc @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_COMP_LIST,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP PUSHBUTTON "Be�ll�&t�s...",IDC_CONFIGURE,129,36,49,14 - PUSHBUTTON "&About...",IDC_ABOUT,129,52,49,14 + PUSHBUTTON "&About",IDC_ABOUT,129,52,49,14 SCROLLBAR IDC_QUALITY_SCROLL,9,44,111,9,WS_TABSTOP

1 0