July 2016 - Wine-commits - list.winehq.org

Aaryaman Vasishta : d3drm: Implement IDirect3DRMDevice{2-3}::InitFromD3D2.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 5fca0a70af285c84d8fd3f6677b2ee69982ee57e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fca0a70af285c84d8fd3f667… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Jul 15 21:13:46 2016 +0530 d3drm: Implement IDirect3DRMDevice{2-3}::InitFromD3D2. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 54 +++------- dlls/d3drm/device.c | 24 ++++- dlls/d3drm/tests/d3drm.c | 276 +++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 301 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fca0a70af285c84d8fd3…

1 0

Alexandre Julliard : server: Add a helper function to create a symlink to an existing object.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: c7f16d62204c86ed66c216125448d6678b5ad42e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f16d62204c86ed66c216125… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 15:34:08 2016 +0900 server: Add a helper function to create a symlink to an existing object. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 5 ++--- server/directory.c | 56 +++++++++++++++++++++++++---------------------------- server/file.h | 6 +++--- server/mailslot.c | 4 ++-- server/named_pipe.c | 4 ++-- server/object.h | 6 +++--- server/symlink.c | 31 ++++++++++++++++++++++++++--- 7 files changed, 66 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7f16d62204c86ed66c21…

1 0

Alexandre Julliard : server: Add a helper function to create session directories and symlinks.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 87bbc84ad538758c777ff1ad9829495c2d1d448e URL: http://source.winehq.org/git/wine.git/?a=commit;h=87bbc84ad538758c777ff1ad9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 15:36:32 2016 +0900 server: Add a helper function to create session directories and symlinks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 133 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 91 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87bbc84ad538758c777ff…

1 0

Alexandre Julliard : kernel32: Store synchronization objects under the session directory.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 2f514becdb374f793511f8c3b229412fcd2e6c81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f514becdb374f793511f8c3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 15:38:30 2016 +0900 kernel32: Store synchronization objects under the session directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 8 +++++--- dlls/ntdll/tests/om.c | 27 ++++++++++++--------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 13fb0f0..c10fd01 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -57,8 +57,9 @@ static inline BOOL is_version_nt(void) HANDLE get_BaseNamedObjects_handle(void) { static HANDLE handle = NULL; - static const WCHAR basenameW[] = - {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s',0}; + static const WCHAR basenameW[] = {'\\','S','e','s','s','i','o','n','s','\\','%','u', + '\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s',0}; + WCHAR buffer[64]; UNICODE_STRING str; OBJECT_ATTRIBUTES attr; @@ -66,7 +67,8 @@ HANDLE get_BaseNamedObjects_handle(void) { HANDLE dir; - RtlInitUnicodeString(&str, basenameW); + sprintfW( buffer, basenameW, NtCurrentTeb()->Peb->SessionId ); + RtlInitUnicodeString( &str, buffer ); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); NtOpenDirectoryObject(&dir, DIRECTORY_CREATE_OBJECT|DIRECTORY_TRAVERSE, &attr); diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 64a16ab..43c5ee4 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -231,13 +231,14 @@ static HANDLE get_base_dir(void) UNICODE_STRING str; OBJECT_ATTRIBUTES attr; HANDLE dir, h; - unsigned int i; + char name[40]; h = CreateMutexA(NULL, FALSE, objname); ok(h != 0, "CreateMutexA failed got ret=%p (%d)\n", h, GetLastError()); InitializeObjectAttributes(&attr, &str, OBJ_OPENIF, 0, NULL); - pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local"); + sprintf( name, "\\BaseNamedObjects\\Session\\%u", NtCurrentTeb()->Peb->SessionId ); + pRtlCreateUnicodeStringFromAsciiz(&str, name ); status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); pRtlFreeUnicodeString(&str); if (!status && is_correct_dir( dir, objname )) goto done; @@ -249,16 +250,6 @@ static HANDLE get_base_dir(void) if (!status && is_correct_dir( dir, objname )) goto done; if (!status) pNtClose( dir ); - for (i = 0; i < 20; i++) - { - char name[40]; - sprintf( name, "\\BaseNamedObjects\\Session\\%u", i ); - pRtlCreateUnicodeStringFromAsciiz(&str, name ); - status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); - pRtlFreeUnicodeString(&str); - if (!status && is_correct_dir( dir, objname )) goto done; - if (!status) pNtClose( dir ); - } dir = 0; done: @@ -1293,10 +1284,12 @@ static void test_query_object(void) NTSTATUS status; ULONG len, expected_len; OBJECT_ATTRIBUTES attr; - UNICODE_STRING path, *str; + UNICODE_STRING path, session, *str; char dir[MAX_PATH], tmp_path[MAX_PATH], file1[MAX_PATH + 16]; LARGE_INTEGER size; + sprintf( tmp_path, "\\Sessions\\%u", NtCurrentTeb()->Peb->SessionId ); + pRtlCreateUnicodeStringFromAsciiz( &session, tmp_path ); InitializeObjectAttributes( &attr, &path, 0, 0, 0 ); handle = CreateEventA( NULL, FALSE, FALSE, "test_event" ); @@ -1330,8 +1323,11 @@ static void test_query_object(void) ok( str->Length >= sizeof(name), "unexpected len %u\n", str->Length ); ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_event") * sizeof(WCHAR), "name too short %s\n", wine_dbgstr_w(str->Buffer) ); - /* there can be a \\Sessions prefix in the name */ - ok( !memcmp( str->Buffer + (str->Length - sizeof(name)) / sizeof(WCHAR), name, sizeof(name) ), + /* check for \\Sessions prefix in the name */ + ok( (str->Length > session.Length && + !memcmp( str->Buffer, session.Buffer, session.Length ) && + !memcmp( str->Buffer + session.Length / sizeof(WCHAR), name, sizeof(name) )) || + broken( !memcmp( str->Buffer, name, sizeof(name) )), /* winxp */ "wrong name %s\n", wine_dbgstr_w(str->Buffer) ); trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); @@ -1528,6 +1524,7 @@ static void test_query_object(void) trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); pNtClose( handle ); } + pRtlFreeUnicodeString( &session ); } static void test_type_mismatch(void)

1 0

Alexandre Julliard : user32: Store window station objects under the session directory.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 911e59c1333be238cc504bd9c3e06131e1204882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=911e59c1333be238cc504bd9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 15:38:42 2016 +0900 user32: Store window station objects under the session directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winstation.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 61add76..673917c 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -59,8 +59,10 @@ static BOOL CALLBACK enum_names_WtoA( LPWSTR name, LPARAM lparam ) static HANDLE get_winstations_dir_handle(void) { static HANDLE handle = NULL; - static const WCHAR basenameW[] = {'\\','W','i','n','d','o','w','s','\\', + static const WCHAR basenameW[] = {'\\','S','e','s','s','i','o','n','s','\\','%','u', + '\\','W','i','n','d','o','w','s','\\', 'W','i','n','d','o','w','S','t','a','t','i','o','n','s',0}; + WCHAR buffer[64]; UNICODE_STRING str; OBJECT_ATTRIBUTES attr; @@ -68,7 +70,8 @@ static HANDLE get_winstations_dir_handle(void) { HANDLE dir; - RtlInitUnicodeString( &str, basenameW ); + sprintfW( buffer, basenameW, NtCurrentTeb()->Peb->SessionId ); + RtlInitUnicodeString( &str, buffer ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); NtOpenDirectoryObject( &dir, DIRECTORY_CREATE_OBJECT | DIRECTORY_TRAVERSE, &attr ); if (InterlockedCompareExchangePointer( &handle, dir, 0 ) != 0) /* someone beat us here */

1 0

Sebastian Lackner : dmsynth: Fix a module refcounting regression.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: a1ee6fa8dd9506cf2b117aeff080d72e199ecd15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ee6fa8dd9506cf2b117aeff… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jul 16 17:31:16 2016 +0200 dmsynth: Fix a module refcounting regression. Fixes a regression introduced by 165f8d1fff39df4d51599bf31008c962d4867cd9. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/synthsink.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index cb397ef..18ef50f 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -291,6 +291,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(LPCGUID riid, LPVOID* ret_i return hr; } + DMSYNTH_LockModule(); hr = IDirectMusicSynthSink_QueryInterface(&obj->IDirectMusicSynthSink_iface, riid, ret_iface); IDirectMusicSynthSink_Release(&obj->IDirectMusicSynthSink_iface);

1 0

Nikolay Sivov : wbemdisp: Fix a crash on null interface pointer.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 1fda7ca72e4a4d784950c0a4503f34a32d3b987b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fda7ca72e4a4d784950c0a45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 15 23:22:50 2016 +0300 wbemdisp: Fix a crash on null interface pointer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 3 ++- dlls/wbemdisp/tests/wbemdisp.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index d1f2609..a8b1568 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -1224,7 +1224,8 @@ static ULONG WINAPI locator_Release( if (!refs) { TRACE( "destroying %p\n", locator ); - IWbemLocator_Release( locator->locator ); + if (locator->locator) + IWbemLocator_Release( locator->locator ); heap_free( locator ); } return refs; diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index e3d432b..3cc4c86 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -243,9 +243,23 @@ static void test_ParseDisplayName(void) IParseDisplayName_Release( displayname ); } +static void test_locator(void) +{ + IUnknown *locator; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&locator ); + ok( hr == S_OK, "got %x\n", hr ); + + IUnknown_Release( locator ); +} + START_TEST(wbemdisp) { CoInitialize( NULL ); + test_ParseDisplayName(); + test_locator(); + CoUninitialize(); }

1 0

Nikolay Sivov : msscript: Initial support for hosting script engines.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: b22dfdc98ce594e446b9d8e3e4dd6b7303d984da URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22dfdc98ce594e446b9d8e3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 16 22:34:18 2016 +0300 msscript: Initial support for hosting script engines. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 288 ++++++++++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 15 +- 2 files changed, 291 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b22dfdc98ce594e446b9d…

1 0

Nikolay Sivov : dwrite: Use more intuitive naming for layout stages.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 84a36f27b88c4d4598aaa58e8855f59ab829103a URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a36f27b88c4d4598aaa58e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 18 13:03:44 2016 +0300 dwrite: Use more intuitive naming for layout stages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8a736f9..48d0816 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -224,10 +224,10 @@ struct layout_cluster { }; enum layout_recompute_mask { - RECOMPUTE_NOMINAL_RUNS = 1 << 0, - RECOMPUTE_MINIMAL_WIDTH = 1 << 1, - RECOMPUTE_EFFECTIVE_RUNS = 1 << 2, - RECOMPUTE_EVERYTHING = 0xffff + RECOMPUTE_CLUSTERS = 1 << 0, + RECOMPUTE_MINIMAL_WIDTH = 1 << 1, + RECOMPUTE_LINES = 1 << 2, + RECOMPUTE_EVERYTHING = 0xffff }; struct dwrite_textlayout { @@ -1037,7 +1037,7 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) { HRESULT hr; - if (!(layout->recompute & RECOMPUTE_NOMINAL_RUNS)) + if (!(layout->recompute & RECOMPUTE_CLUSTERS)) return S_OK; /* nominal breakpoints are evaluated only once, because string never changes */ @@ -1076,7 +1076,7 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) } } - layout->recompute &= ~RECOMPUTE_NOMINAL_RUNS; + layout->recompute &= ~RECOMPUTE_CLUSTERS; return hr; } @@ -1714,7 +1714,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) UINT32 i, start, line, textpos; HRESULT hr; - if (!(layout->recompute & RECOMPUTE_EFFECTIVE_RUNS)) + if (!(layout->recompute & RECOMPUTE_LINES)) return S_OK; hr = layout_compute(layout); @@ -1910,7 +1910,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) layout->metrics.heightIncludingTrailingWhitespace = layout->metrics.height; /* FIXME: not true for vertical text */ - layout->recompute &= ~RECOMPUTE_EFFECTIVE_RUNS; + layout->recompute &= ~RECOMPUTE_LINES; return hr; } @@ -3765,7 +3765,7 @@ static HRESULT WINAPI dwritetextformat_layout_SetTextAlignment(IDWriteTextFormat return hr; /* if layout is not ready there's nothing to align */ - if (changed && !(This->recompute & RECOMPUTE_EFFECTIVE_RUNS)) + if (changed && !(This->recompute & RECOMPUTE_LINES)) layout_apply_text_alignment(This); return S_OK; @@ -3784,7 +3784,7 @@ static HRESULT WINAPI dwritetextformat_layout_SetParagraphAlignment(IDWriteTextF return hr; /* if layout is not ready there's nothing to align */ - if (changed && !(This->recompute & RECOMPUTE_EFFECTIVE_RUNS)) + if (changed && !(This->recompute & RECOMPUTE_LINES)) layout_apply_par_alignment(This); return S_OK; @@ -3803,7 +3803,7 @@ static HRESULT WINAPI dwritetextformat_layout_SetWordWrapping(IDWriteTextFormat1 return hr; if (changed) - This->recompute |= RECOMPUTE_EFFECTIVE_RUNS; + This->recompute |= RECOMPUTE_LINES; return S_OK; }

1 0

Nikolay Sivov : dwrite: Validate CreateTextFormat() arguments.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: fee64bed4526ffb73fcdc0ba05601ca75a11d44a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee64bed4526ffb73fcdc0ba0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 18 13:03:45 2016 +0300 dwrite: Validate CreateTextFormat() arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 8 ++++++++ dlls/dwrite/tests/layout.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 48d0816..d292764 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -5133,6 +5133,14 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle *format = NULL; + if (size <= 0.0f) + return E_INVALIDARG; + + if (((UINT32)weight > DWRITE_FONT_WEIGHT_ULTRA_BLACK) || + ((UINT32)stretch > DWRITE_FONT_STRETCH_ULTRA_EXPANDED) || + ((UINT32)style > DWRITE_FONT_STYLE_ITALIC)) + return E_INVALIDARG; + This = heap_alloc(sizeof(struct dwrite_textformat)); if (!This) return E_OUTOFMEMORY; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index ddc63d6..689b3b4 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -933,6 +933,7 @@ static void test_CreateGdiCompatibleTextLayout(void) static void test_CreateTextFormat(void) { + static const WCHAR emptyW[] = {0}; IDWriteFontCollection *collection, *syscoll; DWRITE_PARAGRAPH_ALIGNMENT paralign; DWRITE_READING_DIRECTION readdir; @@ -949,6 +950,34 @@ static void test_CreateTextFormat(void) factory = create_factory(); + /* zero/negative font size */ + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 0.0f, enusW, &format); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, -10.0f, enusW, &format); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* invalid font properties */ + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, 1000, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_ITALIC + 1, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_ITALIC, + 10, 10.0f, enusW, &format); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* empty family name */ + hr = IDWriteFactory_CreateTextFormat(factory, emptyW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextFormat_Release(format); + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0