November 2020 - Wine-devel - list.winehq.org

[PATCH] ntdll: Add a timezone mapping rule for North Korea Standard Time.
by Akihiro Sagawa 30 Nov '20

30 Nov '20

Otherwise, another UTC+9 timezone matches to the timezone. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50213 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ntdll/unix/system.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)

1 0

[PATCH] mfplat/mediatype: Store extra format data as MF_MT_USER_DATA when initializing from WAVEFORMATEX.
by Nikolay Sivov 30 Nov '20

30 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 13 ++++++++++--- dlls/mfplat/tests/mfplat.c | 28 +++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index f3895ca4d49..62d75e80146 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2943,6 +2943,13 @@ static void mediatype_set_guid(IMFMediaType *mediatype, const GUID *attr, const *hr = IMFMediaType_SetGUID(mediatype, attr, value); } +static void mediatype_set_blob(IMFMediaType *mediatype, const GUID *attr, const UINT8 *data, + unsigned int size, HRESULT *hr) +{ + if (SUCCEEDED(*hr)) + *hr = IMFMediaType_SetBlob(mediatype, attr, data, size); +} + /*********************************************************************** * MFInitMediaTypeFromWaveFormatEx (mfplat.@) */ @@ -2957,9 +2964,6 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA if (!mediatype || !format) return E_POINTER; - if (format->cbSize && format->cbSize < sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) - return E_INVALIDARG; - if (format->cbSize + sizeof(*format) > size) return E_INVALIDARG; @@ -3007,6 +3011,9 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA mediatype_set_uint32(mediatype, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1, &hr); } + if (format->cbSize) + mediatype_set_blob(mediatype, &MF_MT_USER_DATA, (const UINT8 *)(format + 1), format->cbSize, &hr); + return hr; } diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 474d6281f5f..38e8acb966e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5600,9 +5600,12 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void) { WAVE_FORMAT_WMAUDIO_LOSSLESS }, { WAVE_FORMAT_WMASPDIF }, }; + + UINT8 buff[MPEGLAYER3_WFX_EXTRA_BYTES]; WAVEFORMATEXTENSIBLE waveformatext; + MPEGLAYER3WAVEFORMAT mp3format; IMFMediaType *mediatype; - unsigned int i; + unsigned int i, size; HRESULT hr; hr = MFCreateMediaType(&mediatype); @@ -5628,6 +5631,29 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void) validate_media_type(mediatype, &waveformatext.Format); } + /* MPEGLAYER3WAVEFORMAT */ + mp3format.wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3; + mp3format.wfx.nChannels = 2; + mp3format.wfx.nSamplesPerSec = 44100; + mp3format.wfx.nAvgBytesPerSec = 16000; + mp3format.wfx.nBlockAlign = 1; + mp3format.wfx.wBitsPerSample = 0; + mp3format.wfx.cbSize = MPEGLAYER3_WFX_EXTRA_BYTES; + mp3format.wID = MPEGLAYER3_ID_MPEG; + mp3format.fdwFlags = 0; + mp3format.nBlockSize = 417; + mp3format.nFramesPerBlock = 0; + mp3format.nCodecDelay = 0; + + hr = MFInitMediaTypeFromWaveFormatEx(mediatype, (WAVEFORMATEX *)&mp3format, sizeof(mp3format)); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + validate_media_type(mediatype, &mp3format.wfx); + hr = IMFMediaType_GetBlob(mediatype, &MF_MT_USER_DATA, buff, sizeof(buff), &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size == mp3format.wfx.cbSize, "Unexpected size %u.\n", size); + ok(!memcmp(buff, (WAVEFORMATEX *)&mp3format + 1, size), "Unexpected user data.\n"); + IMFMediaType_Release(mediatype); } -- 2.29.2

2 1

[PATCH 1/5] dwrite/layout: Keep automatic axes property.
by Nikolay Sivov 30 Nov '20

30 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/layout.c | 53 +++++++++++++++------- dlls/dwrite/tests/layout.c | 91 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index b9321157a91..25d3bcb4ad0 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -32,7 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); -struct dwrite_textformat_data { +struct dwrite_textformat_data +{ WCHAR *family_name; UINT32 family_len; WCHAR *locale; @@ -51,6 +52,7 @@ struct dwrite_textformat_data { DWRITE_VERTICAL_GLYPH_ORIENTATION vertical_orientation; DWRITE_OPTICAL_ALIGNMENT optical_alignment; DWRITE_LINE_SPACING spacing; + DWRITE_AUTOMATIC_FONT_AXES automatic_axes; FLOAT fontsize; FLOAT tabstop; @@ -4144,17 +4146,25 @@ static HRESULT WINAPI dwritetextlayout4_GetFontAxisValues(IDWriteTextLayout4 *if static DWRITE_AUTOMATIC_FONT_AXES WINAPI dwritetextlayout4_GetAutomaticFontAxes(IDWriteTextLayout4 *iface) { - FIXME("%p.\n", iface); + struct dwrite_textlayout *layout = impl_from_IDWriteTextLayout4(iface); + + TRACE("%p.\n", iface); - return DWRITE_AUTOMATIC_FONT_AXES_NONE; + return layout->format.automatic_axes; } static HRESULT WINAPI dwritetextlayout4_SetAutomaticFontAxes(IDWriteTextLayout4 *iface, DWRITE_AUTOMATIC_FONT_AXES axes) { - FIXME("%p, %d.\n", iface, axes); + struct dwrite_textlayout *layout = impl_from_IDWriteTextLayout4(iface); - return E_NOTIMPL; + TRACE("%p, %d.\n", iface, axes); + + if ((unsigned int)axes > DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE) + return E_INVALIDARG; + + layout->format.automatic_axes = axes; + return S_OK; } static const IDWriteTextLayout4Vtbl dwritetextlayoutvtbl = @@ -4702,17 +4712,15 @@ static HRESULT WINAPI dwritetextformat3_layout_GetFontAxisValues(IDWriteTextForm static DWRITE_AUTOMATIC_FONT_AXES WINAPI dwritetextformat3_layout_GetAutomaticFontAxes(IDWriteTextFormat3 *iface) { - FIXME("%p.\n", iface); - - return DWRITE_AUTOMATIC_FONT_AXES_NONE; + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); + return IDWriteTextLayout4_GetAutomaticFontAxes(&layout->IDWriteTextLayout4_iface); } static HRESULT WINAPI dwritetextformat3_layout_SetAutomaticFontAxes(IDWriteTextFormat3 *iface, DWRITE_AUTOMATIC_FONT_AXES axes) { - FIXME("%p, %d.\n", iface, axes); - - return E_NOTIMPL; + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); + return IDWriteTextLayout4_SetAutomaticFontAxes(&layout->IDWriteTextLayout4_iface, axes); } static const IDWriteTextFormat3Vtbl dwritetextformat3_layout_vtbl = @@ -5036,6 +5044,7 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I { struct dwrite_textformat *textformat; IDWriteTextFormat1 *format1; + IDWriteTextFormat3 *format3; UINT32 len; HRESULT hr; @@ -5125,6 +5134,13 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I layout->format.optical_alignment = DWRITE_OPTICAL_ALIGNMENT_NONE; } + hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat3, (void **)&format3); + if (hr == S_OK) + { + layout->format.automatic_axes = IDWriteTextFormat3_GetAutomaticFontAxes(format3); + IDWriteTextFormat3_Release(format3); + } + return IDWriteTextFormat_GetFontCollection(format, &layout->format.collection); } @@ -5833,16 +5849,22 @@ static HRESULT WINAPI dwritetextformat3_GetFontAxisValues(IDWriteTextFormat3 *if static DWRITE_AUTOMATIC_FONT_AXES WINAPI dwritetextformat3_GetAutomaticFontAxes(IDWriteTextFormat3 *iface) { - FIXME("%p.\n", iface); + struct dwrite_textformat *format = impl_from_IDWriteTextFormat3(iface); - return DWRITE_AUTOMATIC_FONT_AXES_NONE; + TRACE("%p.\n", iface); + + return format->format.automatic_axes; } static HRESULT WINAPI dwritetextformat3_SetAutomaticFontAxes(IDWriteTextFormat3 *iface, DWRITE_AUTOMATIC_FONT_AXES axes) { - FIXME("%p, %d.\n", iface, axes); + struct dwrite_textformat *format = impl_from_IDWriteTextFormat3(iface); - return E_NOTIMPL; + TRACE("%p, %d.\n", iface, axes); + + format->format.automatic_axes = axes; + + return S_OK; } static const IDWriteTextFormat3Vtbl dwritetextformatvtbl = @@ -5948,6 +5970,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.trimmingsign = NULL; This->format.collection = collection; This->format.fallback = NULL; + This->format.automatic_axes = DWRITE_AUTOMATIC_FONT_AXES_NONE; IDWriteFontCollection_AddRef(collection); *format = (IDWriteTextFormat *)&This->IDWriteTextFormat3_iface; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 2e309f14b73..beb09f400f9 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -5732,6 +5732,96 @@ todo_wine { IDWriteFactory_Release(factory); } +static void test_automatic_font_axes(void) +{ + DWRITE_AUTOMATIC_FONT_AXES axes; + IDWriteTextLayout4 *layout4 = NULL; + IDWriteTextFormat3 *format3; + IDWriteTextLayout *layout; + IDWriteTextFormat *format; + IDWriteFactory *factory; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 16.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, L"a", 1, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %x.\n", hr); + + IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout4, (void **)&layout4); + + IDWriteTextLayout_Release(layout); + + if (!layout4) + { + win_skip("Text layout does not support variable fonts.\n"); + IDWriteFactory_Release(factory); + IDWriteTextFormat_Release(format); + return; + } + + hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat3, (void **)&format3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + axes = IDWriteTextFormat3_GetAutomaticFontAxes(format3); + ok(axes == DWRITE_AUTOMATIC_FONT_AXES_NONE, "Unexpected automatic axes %u.\n", axes); + + hr = IDWriteTextFormat3_SetAutomaticFontAxes(format3, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextFormat3_SetAutomaticFontAxes(format3, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE + 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDWriteTextFormat3_Release(format3); + + axes = IDWriteTextLayout4_GetAutomaticFontAxes(layout4); + ok(axes == DWRITE_AUTOMATIC_FONT_AXES_NONE, "Unexpected automatic axes %u.\n", axes); + + hr = IDWriteTextLayout4_SetAutomaticFontAxes(layout4, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE + 1); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextLayout4_SetAutomaticFontAxes(layout4, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDWriteTextLayout4_Release(layout4); + + /* Out of range values allow for formats, but not for layouts. */ + hr = IDWriteFactory_CreateTextLayout(factory, L"a", 1, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %x.\n", hr); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout4, (void **)&layout4); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + axes = IDWriteTextLayout4_GetAutomaticFontAxes(layout4); + ok(axes == DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE + 1, "Unexpected automatic axes %u.\n", axes); + + hr = IDWriteTextLayout4_QueryInterface(layout4, &IID_IDWriteTextFormat3, (void **)&format3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + axes = IDWriteTextFormat3_GetAutomaticFontAxes(format3); + ok(axes == DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE + 1, "Unexpected automatic axes %u.\n", axes); + + hr = IDWriteTextLayout4_SetAutomaticFontAxes(layout4, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + axes = IDWriteTextFormat3_GetAutomaticFontAxes(format3); + ok(axes == DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE, "Unexpected automatic axes %u.\n", axes); + + hr = IDWriteTextFormat3_SetAutomaticFontAxes(format3, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE + 1); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + IDWriteTextFormat3_Release(format3); + + IDWriteTextLayout_Release(layout); + + IDWriteTextLayout4_Release(layout4); + IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -5783,6 +5873,7 @@ START_TEST(layout) test_line_spacing(); test_GetOverhangMetrics(); test_tab_stops(); + test_automatic_font_axes(); IDWriteFactory_Release(factory); } -- 2.29.2

1 4

[PATCH] ntdll: Initialize local variable (valgrind).
by Rémi Bernon 30 Nov '20

30 Nov '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- ==1164948== Conditional jump or move depends on uninitialised value(s) ==1164948== at 0x46D1C1E: open_dll_file (loader.c:1187) ==1164948== by 0x46D2343: open_builtin_file (loader.c:1230) ==1164948== by 0x46D32CF: load_ntdll (loader.c:1453) ==1164948== by 0x46D32CF: start_main_thread (loader.c:1602) ==1164948== by 0x46D32CF: __wine_main (loader.c:1838) ==1164948== by 0x7D001258: main (main.c:157) ==1164948== ==1164948== Conditional jump or move depends on uninitialised value(s) ==1164948== at 0x47073A9: find_view (virtual.c:937) ==1164948== by 0x47073A9: NtUnmapViewOfSection (virtual.c:4065) ==1164948== by 0x46D1C2A: open_dll_file (loader.c:1189) ==1164948== by 0x46D2343: open_builtin_file (loader.c:1230) ==1164948== by 0x46D32CF: load_ntdll (loader.c:1453) ==1164948== by 0x46D32CF: start_main_thread (loader.c:1602) ==1164948== by 0x46D32CF: __wine_main (loader.c:1838) ==1164948== by 0x7D001258: main (main.c:157) dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c8a5410a30a..08f8128e0f5 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1446,7 +1446,7 @@ static void load_ntdll(void) { NTSTATUS status; SECTION_IMAGE_INFORMATION info; - void *module; + void *module = NULL; char *name = build_path( dll_dir, "ntdll.dll.so" ); name[strlen(name) - 3] = 0; /* remove .so */ -- 2.29.2

1 0

[PATCH 5/5] msvcr120/tests: Use wide-char string literals.
by Piotr Caban 30 Nov '20

30 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr120/tests/msvcr120.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)

1 0

[PATCH 4/5] msvcr100/tests: Use wide-char string literals.
by Piotr Caban 30 Nov '20

30 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr100/tests/msvcr100.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 3/5] msvcr90/tests: Use wide-char string literals.
by Piotr Caban 30 Nov '20

30 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr90/tests/msvcr90.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-)

1 0

[PATCH 2/5] msvcp140/tests: Use wide-char string literals.
by Piotr Caban 30 Nov '20

30 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/tests/msvcp140.c | 358 +++++++++++++-------------------- 1 file changed, 142 insertions(+), 216 deletions(-)

1 0

[PATCH 1/5] msvcp120/tests: Use wide-char string literals.
by Piotr Caban 30 Nov '20

30 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp120/tests/msvcp120.c | 62 +++++++++++----------------------- 1 file changed, 20 insertions(+), 42 deletions(-)

1 0

[PATCH] wbemdisp: Use wide-char string literals.
by Michael Stefaniuc 30 Nov '20

30 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemdisp/locator.c | 16 ++++------ dlls/wbemdisp/main.c | 5 ++- dlls/wbemdisp/tests/wbemdisp.c | 58 ++++++++++------------------------ 3 files changed, 25 insertions(+), 54 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index a9ef1618882..28c8e5b4120 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -436,14 +436,13 @@ static HRESULT WINAPI propertyset_Item( ISWbemPropertySet *iface, BSTR name, static HRESULT WINAPI propertyset_get_Count( ISWbemPropertySet *iface, LONG *count ) { - static const WCHAR propcountW[] = {'_','_','P','R','O','P','E','R','T','Y','_','C','O','U','N','T',0}; struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); HRESULT hr; VARIANT val; TRACE( "%p, %p\n", propertyset, count ); - hr = IWbemClassObject_Get( propertyset->object, propcountW, 0, &val, NULL, NULL ); + hr = IWbemClassObject_Get( propertyset->object, L"__PROPERTY_COUNT", 0, &val, NULL, NULL ); if (SUCCEEDED(hr)) { *count = V_I4( &val ); @@ -1701,12 +1700,11 @@ static HRESULT WINAPI services_DeleteAsync( static BSTR build_query_string( const WCHAR *class ) { - static const WCHAR selectW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; - UINT len = lstrlenW(class) + ARRAY_SIZE(selectW); + UINT len = lstrlenW(class) + ARRAY_SIZE(L"SELECT * FROM "); BSTR ret; if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; - lstrcpyW( ret, selectW ); + lstrcpyW( ret, L"SELECT * FROM " ); lstrcatW( ret, class ); return ret; } @@ -1718,8 +1716,7 @@ static HRESULT WINAPI services_InstancesOf( IDispatch *objWbemNamedValueSet, ISWbemObjectSet **objWbemObjectSet ) { - static const WCHAR wqlW[] = {'W','Q','L',0}; - BSTR query, wql = SysAllocString( wqlW ); + BSTR query, wql = SysAllocString( L"WQL" ); HRESULT hr; TRACE( "%p, %s, %x, %p, %p\n", iface, debugstr_w(strClass), iFlags, objWbemNamedValueSet, @@ -2128,14 +2125,13 @@ static HRESULT WINAPI locator_Invoke( static BSTR build_resource_string( BSTR server, BSTR namespace ) { - static const WCHAR defaultW[] = {'r','o','o','t','\\','d','e','f','a','u','l','t',0}; ULONG len, len_server = 0, len_namespace = 0; BSTR ret; if (server && *server) len_server = lstrlenW( server ); else len_server = 1; if (namespace && *namespace) len_namespace = lstrlenW( namespace ); - else len_namespace = ARRAY_SIZE(defaultW) - 1; + else len_namespace = ARRAY_SIZE(L"root\\default") - 1; if (!(ret = SysAllocStringLen( NULL, 2 + len_server + 1 + len_namespace ))) return NULL; @@ -2147,7 +2143,7 @@ static BSTR build_resource_string( BSTR server, BSTR namespace ) ret[len++] = '\\'; if (namespace && *namespace) lstrcpyW( ret + len, namespace ); - else lstrcpyW( ret + len, defaultW ); + else lstrcpyW( ret + len, L"root\\default" ); return ret; } diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index b3ee4de30cc..cfaf7d787eb 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -129,8 +129,7 @@ done: static HRESULT WINAPI WinMGMTS_ParseDisplayName(IParseDisplayName *iface, IBindCtx *pbc, LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) { - static const WCHAR prefixW[] = {'w','i','n','m','g','m','t','s',':',0}; - const DWORD prefix_len = ARRAY_SIZE(prefixW) - 1; + const DWORD prefix_len = ARRAY_SIZE(L"winmgmts:") - 1; ISWbemLocator *locator = NULL; ISWbemServices *services = NULL; ISWbemObject *obj = NULL; @@ -140,7 +139,7 @@ static HRESULT WINAPI WinMGMTS_ParseDisplayName(IParseDisplayName *iface, IBindC TRACE( "%p, %p, %s, %p, %p\n", iface, pbc, debugstr_w(pszDisplayName), pchEaten, ppmkOut ); - if (wcsnicmp( pszDisplayName, prefixW, prefix_len )) return MK_E_SYNTAX; + if (wcsnicmp( pszDisplayName, L"winmgmts:", prefix_len )) return MK_E_SYNTAX; p = pszDisplayName + prefix_len; if (*p == '{') diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 2bca6f9da67..fa51ce6d756 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -34,26 +34,10 @@ static const LCID english = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US) static void test_ParseDisplayName(void) { - static const WCHAR biosW[] = {'W','i','n','3','2','_','B','i','o','s',0}; - static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; - static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; - static const WCHAR nosuchW[] = {'N','o','S','u','c','h',0}; - static const WCHAR name1[] = - {'w','i','n','m','g','m','t','s',':',0}; - static const WCHAR name2[] = - {'w','i','n','m','g','m','t','s',':','\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',0}; - static const WCHAR name3[] = - {'w','i','n','m','g','m','t','s',':','\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':', - 'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k','.', - 'D','e','v','i','c','e','I','D','=','\'','C',':','\'',0}; - static const WCHAR name4[] = - {'w','i','n','m','g','m','t','s',':','\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':', - 'W','i','n','3','2','_','S','e','r','v','i','c','e',0}; - static const WCHAR stdregprovW[] = - {'w','i','n','m','g','m','t','s',':','\\','\\','.','\\','r','o','o','t','\\','d','e','f','a','u','l','t',':', - 'S','t','d','R','e','g','P','r','o','v',0}; - static const WCHAR getstringvalueW[] = - {'G','e','t','S','t','r','i','n','g','V','a','l','u','e',0}; + static const WCHAR name1[] = L"winmgmts:"; + static const WCHAR name2[] = L"winmgmts:\\\\.\\root\\cimv2"; + static const WCHAR name3[] = L"winmgmts:\\\\.\\root\\cimv2:Win32_LogicalDisk.DeviceID='C:'"; + static const WCHAR name4[] = L"winmgmts:\\\\.\\root\\cimv2:Win32_Service"; static const struct { const WCHAR *name; @@ -130,7 +114,7 @@ static void test_ParseDisplayName(void) { ISWbemObjectSet *objectset = NULL; - str = SysAllocString( biosW ); + str = SysAllocString( L"Win32_Bios" ); hr = ISWbemServices_InstancesOf( services, str, 0, NULL, &objectset ); SysFreeString( str ); ok( hr == S_OK, "got %x\n", hr ); @@ -174,28 +158,28 @@ static void test_ParseDisplayName(void) ok( hr == S_OK, "got %x\n", hr ); ok( count == 1, "got %u\n", count ); - str = SysAllocString( manufacturerW ); + str = SysAllocString( L"Manufacturer" ); dispid = 0xdeadbeef; hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); SysFreeString( str ); ok( hr == S_OK, "got %x\n", hr ); ok( dispid == 0x1800001 || dispid == 0x10b /* win2k */, "got %x\n", dispid ); - str = SysAllocString( versionW ); + str = SysAllocString( L"version" ); dispid = 0xdeadbeef; hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); SysFreeString( str ); ok( hr == S_OK, "got %x\n", hr ); ok( dispid == 0x1800002 || dispid == 0x119 /* win2k */, "got %x\n", dispid ); - str = SysAllocString( nosuchW ); + str = SysAllocString( L"NoSuch" ); dispid = 0xdeadbeef; hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); SysFreeString( str ); ok( hr == DISP_E_UNKNOWNNAME, "got %x\n", hr ); ok( dispid == DISPID_UNKNOWN, "got %x\n", dispid ); - str = SysAllocString( manufacturerW ); + str = SysAllocString( L"Manufacturer" ); dispid = 0xdeadbeef; hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); SysFreeString( str ); @@ -261,7 +245,7 @@ static void test_ParseDisplayName(void) hr = CreateBindCtx( 0, &ctx ); ok( hr == S_OK, "got %x\n", hr ); - str = SysAllocString( stdregprovW ); + str = SysAllocString( L"winmgmts:\\\\.\\root\\default:StdRegProv" ); hr = IParseDisplayName_ParseDisplayName( displayname, NULL, str, &eaten, &moniker ); ok( hr == S_OK, "got %x\n", hr ); SysFreeString( str ); @@ -280,7 +264,7 @@ static void test_ParseDisplayName(void) { DISPID dispid = 0xdeadbeef; - str = SysAllocString( getstringvalueW ); + str = SysAllocString( L"GetStringValue" ); hr = ISWbemObject_GetIDsOfNames( sobj, &IID_NULL, &str, 1, english, &dispid ); ok( hr == S_OK, "got %x\n", hr ); ok( dispid == 0x1000001, "got %x\n", dispid ); @@ -295,14 +279,6 @@ static void test_ParseDisplayName(void) IParseDisplayName_Release( displayname ); } -static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; -static const WCHAR root[] = {'r','o','o','t','\\','C','I','M','V','2',0}; -static const WCHAR query[] = {'S','e','l','e','c','t',' ','P','r','o','c','e','s','s','o','r','I','d',' ','f','r','o','m', - ' ','W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; -static const WCHAR lang[] = {'W','Q','L',0}; -static const WCHAR props[] = {'P','r','o','p','e','r','t','i','e','s','_',0}; -static const WCHAR procid[] = {'P','r','o','c','e','s','s','o','r','I','d',0}; - static void test_locator(void) { HRESULT hr; @@ -324,15 +300,15 @@ static void test_locator(void) hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemLocator, (void **)&locator ); ok( hr == S_OK, "got %x\n", hr ); - host_bstr = SysAllocString(localhost); - root_bstr = SysAllocString(root); + host_bstr = SysAllocString( L"localhost" ); + root_bstr = SysAllocString( L"root\\CIMV2" ); hr = ISWbemLocator_ConnectServer( locator, host_bstr, root_bstr, NULL, NULL, NULL, NULL, 0, NULL, &services); ok( hr == S_OK, "got %x\n", hr ); SysFreeString( root_bstr ); SysFreeString( host_bstr ); - query_bstr = SysAllocString(query); - lang_bstr = SysAllocString(lang); + query_bstr = SysAllocString( L"Select ProcessorId from Win32_Processor" ); + lang_bstr = SysAllocString( L"WQL" ); hr = ISWbemServices_ExecQuery( services, query_bstr, lang_bstr, wbemFlagForwardOnly, NULL, &object_set); ok( hr == S_OK, "got %x\n", hr ); SysFreeString( lang_bstr ); @@ -374,7 +350,7 @@ static void test_locator(void) ok( hr == S_OK, "got %x\n", hr ); ok( V_VT(&var) == VT_DISPATCH, "got %x\n", V_VT(&var)); - props_bstr = SysAllocString( props ); + props_bstr = SysAllocString( L"Properties_" ); hr = IDispatch_GetIDsOfNames( V_DISPATCH(&var), &IID_NULL, &props_bstr, 1, english, &id ); ok( hr == S_OK, "got %x\n", hr ); ok( id == 21, "got %d\n", id ); @@ -390,7 +366,7 @@ static void test_locator(void) ok( hr == WBEM_E_NOT_FOUND, "got %x\n", hr ); SysFreeString( props_bstr ); - procid_bstr = SysAllocString( procid ); + procid_bstr = SysAllocString( L"ProcessorId" ); hr = ISWbemPropertySet_Item( prop_set, procid_bstr, 0, &prop ); ok( hr == S_OK, "got %x\n", hr ); SysFreeString( procid_bstr ); -- 2.26.2

2 1