September 2020 - Wine-Commits

Ziqing Hui : d3dx10: Implement D3DX10GetImageInfoFromFileW().
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: d2406ad95e03e10aba4ab720e4a7050dafcee838 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2406ad95e03e10aba4ab720… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Sep 30 12:53:46 2020 +0200 d3dx10: Implement D3DX10GetImageInfoFromFileW(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 4 +-- dlls/d3dx10_43/texture.c | 70 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 69 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 640e83fcd0..e33b832646 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1383,12 +1383,10 @@ static void test_get_image_info(void) check_image_info(&image_info, i, __LINE__); } - todo_wine { hr = D3DX10GetImageInfoFromFileW(NULL, NULL, &image_info, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromFileW(L"deadbeaf", NULL, &image_info, NULL); ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - } for (i = 0; i < ARRAY_SIZE(test_image); ++i) { @@ -1396,7 +1394,7 @@ static void test_get_image_info(void) hr = D3DX10GetImageInfoFromFileW(path, NULL, &image_info, NULL); delete_file(test_filename); - todo_wine + todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_WMP) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); if (hr != S_OK) continue; diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 63e6d71546..b871345148 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -17,6 +17,7 @@ */ #include "wine/debug.h" +#include "wine/heap.h" #define COBJMACROS @@ -96,6 +97,57 @@ static DXGI_FORMAT get_d3dx10_dds_format(DXGI_FORMAT format) return format; } +static HRESULT load_file(const WCHAR *filename, void **buffer, DWORD *size) +{ + HRESULT hr = S_OK; + DWORD bytes_read; + HANDLE file; + BOOL ret; + + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + + *size = GetFileSize(file, NULL); + if (*size == INVALID_FILE_SIZE) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + + *buffer = heap_alloc(*size); + if (!*buffer) + { + hr = E_OUTOFMEMORY; + goto done; + } + + ret = ReadFile(file, *buffer, *size, &bytes_read, NULL); + if (!ret) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + if (bytes_read != *size) + { + hr = E_FAIL; + goto done; + } + +done: + if (FAILED(hr)) + { + heap_free(*buffer); + *buffer = NULL; + } + if (file != INVALID_HANDLE_VALUE) + CloseHandle(file); + return hr; +} + HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { @@ -107,9 +159,23 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPu HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { - FIXME("src_file %s, pump %p, info %p, result %p\n", debugstr_w(src_file), pump, info, result); + void *buffer = NULL; + DWORD size = 0; + HRESULT hr; - return E_NOTIMPL; + TRACE("src_file %s, pump %p, info %p, result %p.\n", debugstr_w(src_file), pump, info, result); + + if (!src_file || !info) + return E_FAIL; + + if (FAILED(load_file(src_file, &buffer, &size))) + return D3D10_ERROR_FILE_NOT_FOUND; + + hr = D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); + + heap_free(buffer); + + return hr; } HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resource, ID3DX10ThreadPump *pump,

1 0

Akihiro Sagawa : kernelbase: Fix copy and paste error.
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: 80acf7e4ae399ecbfc372e23a18a45fd3885997b URL: https://source.winehq.org/git/wine.git/?a=commit;h=80acf7e4ae399ecbfc372e23… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Sep 30 23:18:13 2020 +0900 kernelbase: Fix copy and paste error. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 83dd76e3c0..2cec5f7637 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -4125,7 +4125,7 @@ INT WINAPI DECLSPEC_HOTPATCH GetCalendarInfoEx( const WCHAR *locale, CALID calen static CRITICAL_SECTION tzname_section; static CRITICAL_SECTION_DEBUG tzname_section_debug = { - 0, 0, &locale_section, + 0, 0, &tzname_section, { &tzname_section_debug.ProcessLocksList, &tzname_section_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": tzname_section") } };

1 0

Akihiro Sagawa : configure: Fix a typo in comparison.
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: e16018f621e93de37f5b85b29bafe44cfa6c1b3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e16018f621e93de37f5b85b2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Sep 30 23:18:15 2020 +0900 configure: Fix a typo in comparison. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 296e476779..a3fc757c7e 100755 --- a/configure +++ b/configure @@ -17439,7 +17439,7 @@ else *arm*) wine_cv_64bit_compare_swap="-march=armv7-a" ;; *) wine_cv_64bit_compare_swap="unknown" ;; esac - if test "x$wine_cv_64bit_compare_swap" != unknown + if test "x$wine_cv_64bit_compare_swap" != xunknown then CFLAGS="$CFLAGS $wine_cv_64bit_compare_swap" cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/configure.ac b/configure.ac index 1072f16f09..865aa924d0 100644 --- a/configure.ac +++ b/configure.ac @@ -2063,7 +2063,7 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= *arm*) wine_cv_64bit_compare_swap="-march=armv7-a" ;; *) wine_cv_64bit_compare_swap="unknown" ;; esac - if test "x$wine_cv_64bit_compare_swap" != unknown + if test "x$wine_cv_64bit_compare_swap" != xunknown then dnl try with the new flags CFLAGS="$CFLAGS $wine_cv_64bit_compare_swap"

1 0

Matteo Bruni : winex11: Fix monitor_id_fmtW variable name typo.
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: 830f2191896e6d453da9417706386cba282cad13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=830f2191896e6d453da94177… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 30 12:56:00 2020 +0200 winex11: Fix monitor_id_fmtW variable name typo. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 3e9e4474d4..47e4733dba 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -57,7 +57,7 @@ static const WCHAR pciW[] = {'P','C','I',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; -static const WCHAR mointor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR monitor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; static const WCHAR adapter_name_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { @@ -547,7 +547,7 @@ static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, /* Write all monitor instances paths under this adapter */ for (i = 0; i < monitor_count; i++) { - sprintfW(key_nameW, mointor_id_fmtW, i); + sprintfW(key_nameW, monitor_id_fmtW, i); sprintfW(bufferW, monitor_instance_fmtW, video_index, i); if (RegSetValueExW(hkey, key_nameW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto done;

1 0

Zebediah Figura : d3d11: Report D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW in CheckFormatSupport().
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: 8130475d1475314786774bea0dd0bfd6ae474417 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8130475d1475314786774bea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 29 16:06:18 2020 -0500 d3d11: Report D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW in CheckFormatSupport(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index dd0a67ebc8..2a08d2b1e6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3318,6 +3318,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_LEGACY_CUBEMAP, D3D11_FORMAT_SUPPORT_TEXTURECUBE}, {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, 0, D3D11_FORMAT_SUPPORT_RENDER_TARGET}, {WINED3D_RTYPE_NONE, WINED3D_BIND_DEPTH_STENCIL, 0, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL}, + {WINED3D_RTYPE_NONE, WINED3D_BIND_UNORDERED_ACCESS, 0, D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_QUERY_WRAPANDMIP, D3D11_FORMAT_SUPPORT_MIP}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_QUERY_GENMIPMAP, D3D11_FORMAT_SUPPORT_MIP_AUTOGEN}, {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING, D3D11_FORMAT_SUPPORT_BLENDABLE},

1 0

Nikolay Sivov : mfreadwrite/tests: Add return value test (Coverity).
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: 82584160d42ebf0fd60eefe738d6a9e4fbf0223e URL: https://source.winehq.org/git/wine.git/?a=commit;h=82584160d42ebf0fd60eefe7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 30 13:55:06 2020 +0300 mfreadwrite/tests: Add return value test (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/tests/mfplat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 8ed9428970..84581f9be9 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -438,11 +438,13 @@ static struct test_media_stream *create_test_stream(DWORD stream_index, IMFMedia struct test_media_stream *stream; IMFPresentationDescriptor *pd; BOOL selected; + HRESULT hr; stream = heap_alloc_zero(sizeof(*stream)); stream->IMFMediaStream_iface.lpVtbl = &test_media_stream_vtbl; stream->refcount = 1; - MFCreateEventQueue(&stream->event_queue); + hr = MFCreateEventQueue(&stream->event_queue); + ok(hr == S_OK, "Failed to create event queue, hr %#x.\n", hr); stream->source = source; IMFMediaSource_AddRef(stream->source); stream->is_new = TRUE;

1 0

Rémi Bernon : wbemprox: Report 4095MiB video memory if it overflows.
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: 3c63029180bd86011b34b530e754dffdf532752d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c63029180bd86011b34b530… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 30 12:37:40 2020 +0200 wbemprox: Report 4095MiB video memory if it overflows. That's what Windows do apparently. Anything with more than 4GiB of VRAM would report less otherwise, confusing the VRAM detection in some games. The Mafia III launcher is trying to open a warning popup with a 8GiB VRAM GPU for instance, as the reported value overflows to 0. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4326822193..8daa55eaeb 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3878,8 +3878,9 @@ static enum fill_status fill_videocontroller( struct table *table, const struct hr = IDXGIAdapter_GetDesc( adapter, &desc ); if (SUCCEEDED(hr)) { - vidmem = desc.DedicatedVideoMemory; - name = desc.Description; + if (desc.DedicatedVideoMemory > UINT_MAX) vidmem = 0xfff00000; + else vidmem = desc.DedicatedVideoMemory; + name = desc.Description; } done:

1 0

Ziqing Hui : d3dx10/tests: Add tests for D3DX10GetImageInfoFromFileA().
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: a0fa7810e1b331799d746df99476fe6d2af789b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0fa7810e1b331799d746df9… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Sep 30 12:53:47 2020 +0200 d3dx10/tests: Add tests for D3DX10GetImageInfoFromFileA(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index e33b832646..02de73865f 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -558,6 +558,14 @@ static BOOL compare_float(float f, float g, unsigned int ulps) return TRUE; } +static char *get_str_a(const WCHAR *wstr) +{ + static char buffer[MAX_PATH]; + + WideCharToMultiByte(CP_ACP, 0, wstr, -1, buffer, sizeof(buffer), NULL, NULL); + return buffer; +} + static BOOL create_file(const WCHAR *filename, const void *data, unsigned int size, WCHAR *out_path) { WCHAR path[MAX_PATH]; @@ -1387,19 +1395,30 @@ static void test_get_image_info(void) ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromFileW(L"deadbeaf", NULL, &image_info, NULL); ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + todo_wine { + hr = D3DX10GetImageInfoFromFileA(NULL, NULL, &image_info, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = D3DX10GetImageInfoFromFileA("deadbeaf", NULL, &image_info, NULL); + ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + } for (i = 0; i < ARRAY_SIZE(test_image); ++i) { create_file(test_filename, test_image[i].data, test_image[i].size, path); - hr = D3DX10GetImageInfoFromFileW(path, NULL, &image_info, NULL); - delete_file(test_filename); + hr = D3DX10GetImageInfoFromFileW(path, NULL, &image_info, NULL); todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_WMP) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - if (hr != S_OK) - continue; + if (hr == S_OK) + check_image_info(&image_info, i, __LINE__); - check_image_info(&image_info, i, __LINE__); + hr = D3DX10GetImageInfoFromFileA(get_str_a(path), NULL, &image_info, NULL); + todo_wine + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (hr == S_OK) + check_image_info(&image_info, i, __LINE__); + + delete_file(test_filename); } CoUninitialize();

1 0

Rémi Bernon : wbemprox: Set variant type to VT_NULL if BSTR is NULL.
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: 4b9d3909b841c1ca919e25a37838c1cd9b3445f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b9d3909b841c1ca919e25a3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 30 12:37:39 2020 +0200 wbemprox: Set variant type to VT_NULL if BSTR is NULL. Mafia III launcher crashes when querying video controllers when it passes the NULL __PATH value through COM marshalling. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 12 ++++++++---- dlls/wbemprox/tests/query.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 6ac5ad5b77..525381d88d 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -946,22 +946,24 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_SINT32; return S_OK; } - else if (!wcsicmp( name, L"__NAMESPACE" )) + if (!wcsicmp( name, L"__NAMESPACE" )) { if (ret) { V_VT( ret ) = VT_BSTR; V_BSTR( ret ) = view->proplist ? NULL : build_namespace(); + if (!V_BSTR( ret )) V_VT( ret ) = VT_NULL; } if (type) *type = CIM_STRING; return S_OK; } - else if (!wcsicmp( name, L"__PATH" )) + if (!wcsicmp( name, L"__PATH" )) { if (ret) { V_VT( ret ) = VT_BSTR; V_BSTR( ret ) = build_path( view, table_index, result_index, name ); + if (!V_BSTR( ret )) V_VT( ret ) = VT_NULL; } if (type) *type = CIM_STRING; return S_OK; @@ -976,22 +978,24 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_SINT32; return S_OK; } - else if (!wcsicmp( name, L"__RELPATH" )) + if (!wcsicmp( name, L"__RELPATH" )) { if (ret) { V_VT( ret ) = VT_BSTR; V_BSTR( ret ) = build_relpath( view, table_index, result_index, name ); + if (!V_BSTR( ret )) V_VT( ret ) = VT_NULL; } if (type) *type = CIM_STRING; return S_OK; } - else if (!wcsicmp( name, L"__SERVER" )) + if (!wcsicmp( name, L"__SERVER" )) { if (ret) { V_VT( ret ) = VT_BSTR; V_BSTR( ret ) = view->proplist ? NULL : build_servername(); + if (!V_BSTR( ret )) V_VT( ret ) = VT_NULL; } if (type) *type = CIM_STRING; return S_OK; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 74fdfaa9bc..d1ce42d64c 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1414,6 +1414,13 @@ static void test_Win32_VideoController( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; + check_property( obj, L"__CLASS", VT_BSTR, CIM_STRING ); + check_property( obj, L"__GENUS", VT_I4, CIM_SINT32 ); + check_property( obj, L"__NAMESPACE", VT_BSTR, CIM_STRING ); + check_property( obj, L"__PATH", VT_BSTR, CIM_STRING ); + check_property( obj, L"__PROPERTY_COUNT", VT_I4, CIM_SINT32 ); + check_property( obj, L"__RELPATH", VT_BSTR, CIM_STRING ); + check_property( obj, L"__SERVER", VT_BSTR, CIM_STRING ); check_property( obj, L"AdapterCompatibility", VT_BSTR, CIM_STRING ); check_property( obj, L"Availability", VT_I4, CIM_UINT16 ); check_property( obj, L"ConfigManagerErrorCode", VT_I4, CIM_UINT32 ); @@ -1432,6 +1439,31 @@ static void test_Win32_VideoController( IWbemServices *services ) IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + + query = SysAllocString( L"SELECT AdapterRAM FROM Win32_VideoController" ); + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_VideoController not available\n" ); + return; + } + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + check_property( obj, L"__CLASS", VT_BSTR, CIM_STRING ); + check_property( obj, L"__GENUS", VT_I4, CIM_SINT32 ); + check_property( obj, L"__NAMESPACE", VT_NULL, CIM_STRING ); + check_property( obj, L"__PATH", VT_NULL, CIM_STRING ); + check_property( obj, L"__PROPERTY_COUNT", VT_I4, CIM_SINT32 ); + check_property( obj, L"__RELPATH", VT_NULL, CIM_STRING ); + check_property( obj, L"__SERVER", VT_NULL, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql );

1 0

Michael Stefaniuc : d2d1/tests:Use wide-char string literals.
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: 141ff5f4f5c042d4809597983cd4ade2baf29282 URL: https://source.winehq.org/git/wine.git/?a=commit;h=141ff5f4f5c042d480959798… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Sep 29 23:29:33 2020 +0200 d2d1/tests:Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f52a34514e..166cdfccda 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4870,9 +4870,6 @@ static void test_draw_text_layout(void) { D2D1_TEXT_ANTIALIAS_MODE_ALIASED, DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL, E_INVALIDARG }, { D2D1_TEXT_ANTIALIAS_MODE_ALIASED, DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC, E_INVALIDARG }, }; - static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; - static const WCHAR textW[] = {'t','e','x','t',0}; - static const WCHAR emptyW[] = {0}; D2D1_RENDER_TARGET_PROPERTIES desc; IDXGISwapChain *swapchain; ID2D1Factory *factory, *factory2; @@ -4926,11 +4923,11 @@ static void test_draw_text_layout(void) hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory, (IUnknown **)&dwrite_factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextFormat(dwrite_factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0f, emptyW, &text_format); + hr = IDWriteFactory_CreateTextFormat(dwrite_factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"", &text_format); ok(SUCCEEDED(hr), "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextLayout(dwrite_factory, textW, 4, text_format, 100.0f, 100.0f, &text_layout); + hr = IDWriteFactory_CreateTextLayout(dwrite_factory, L"text", 4, text_format, 100.0f, 100.0f, &text_layout); ok(SUCCEEDED(hr), "Failed to create text layout, hr %#x.\n", hr); set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f);

1 0