March 2021 - Wine-commits - list.winehq.org

Huw Davies : riched20: The text host should create the text services object.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 9b7261d995f780332389688449f1b6cc3733a4cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b7261d995f7803323896884… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 3 11:29:41 2021 +0000 riched20: The text host should create the text services object. For now, we hold on to the editor too; this will eventually go away. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 3 +++ dlls/riched20/txthost.c | 30 +++++++++++++++++----------- dlls/riched20/txtsrv.c | 53 ++++++++++++++++++++++++++----------------------- 3 files changed, 49 insertions(+), 37 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e226bc02921..38d99f4351a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -377,6 +377,9 @@ BOOL ME_Undo(ME_TextEditor *editor) DECLSPEC_HIDDEN; BOOL ME_Redo(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_EmptyUndoStack(ME_TextEditor *editor) DECLSPEC_HIDDEN; +/* txtsrv.c */ +HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10, ME_TextEditor **editor ) DECLSPEC_HIDDEN; + /* writer.c */ LRESULT ME_StreamOutRange(ME_TextEditor *editor, DWORD dwFormat, const ME_Cursor *start, int nChars, EDITSTREAM *stream) DECLSPEC_HIDDEN; LRESULT ME_StreamOut(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index d0b43add364..1da34555352 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -36,6 +36,8 @@ struct host { ITextHost ITextHost_iface; LONG ref; + ITextServices *text_srv; + ME_TextEditor *editor; /* to be removed */ HWND window; BOOL emulate_10; PARAFORMAT2 para_fmt; @@ -46,7 +48,7 @@ static const ITextHostVtbl textHostVtbl; static BOOL listbox_registered; static BOOL combobox_registered; -static ITextHost *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) +struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) { struct host *texthost; @@ -66,7 +68,7 @@ static ITextHost *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) if (cs->style & ES_CENTER) texthost->para_fmt.wAlignment = PFA_CENTER; - return &texthost->ITextHost_iface; + return texthost; } static inline struct host *impl_from_ITextHost( ITextHost *iface ) @@ -104,6 +106,7 @@ static ULONG WINAPI ITextHostImpl_Release(ITextHost *iface) if (!ref) { SetWindowLongPtrW( host->window, 0, 0 ); + ITextServices_Release( host->text_srv ); CoTaskMemFree( host ); } return ref; @@ -723,24 +726,27 @@ static const char *get_msg_name( UINT msg ) static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emulate_10 ) { - ITextHost *host = host_create( hwnd, create, emulate_10 ); - ME_TextEditor *editor; + struct host *host = host_create( hwnd, create, emulate_10 ); + IUnknown *unk; + HRESULT hr; if (!host) return FALSE; - editor = ME_MakeEditor( host, emulate_10 ); - if (!editor) + hr = create_text_services( NULL, &host->ITextHost_iface, &unk, emulate_10, &host->editor ); + if (FAILED( hr )) { - ITextHost_Release( host ); + ITextHost_Release( &host->ITextHost_iface ); return FALSE; } + IUnknown_QueryInterface( unk, &IID_ITextServices, (void **)&host->text_srv ); + IUnknown_Release( unk ); - editor->exStyleFlags = GetWindowLongW( hwnd, GWL_EXSTYLE ); - editor->styleFlags |= GetWindowLongW( hwnd, GWL_STYLE ) & ES_WANTRETURN; - editor->hWnd = hwnd; /* FIXME: Remove editor's dependence on hWnd */ - editor->hwndParent = create->hwndParent; + host->editor->exStyleFlags = GetWindowLongW( hwnd, GWL_EXSTYLE ); + host->editor->styleFlags |= GetWindowLongW( hwnd, GWL_STYLE ) & ES_WANTRETURN; + host->editor->hWnd = hwnd; /* FIXME: Remove editor's dependence on hWnd */ + host->editor->hwndParent = create->hwndParent; - SetWindowLongPtrW( hwnd, 0, (LONG_PTR)editor ); + SetWindowLongPtrW( hwnd, 0, (LONG_PTR)host->editor ); return TRUE; } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index fc8d6765424..3d0eec6f769 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -368,33 +368,36 @@ static const ITextServicesVtbl textservices_vtbl = THISCALL(fnTextSrv_TxGetCachedSize) }; +HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10, + ME_TextEditor **editor ) +{ + struct text_services *services; + + TRACE( "%p %p --> %p\n", outer, text_host, unk ); + if (text_host == NULL) return E_POINTER; + + services = CoTaskMemAlloc( sizeof(*services) ); + if (services == NULL) return E_OUTOFMEMORY; + InitializeCriticalSection( &services->csTxtSrv ); + services->csTxtSrv.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ITextServicesImpl.csTxtSrv"); + services->ref = 1; + services->host = text_host; /* Don't take a ref of the host - this would lead to a mutual dependency */ + services->IUnknown_inner.lpVtbl = &textservices_inner_vtbl; + services->ITextServices_iface.lpVtbl = &textservices_vtbl; + services->editor = ME_MakeEditor( text_host, emulate_10 ); + if (editor) *editor = services->editor; /* To be removed */ + + if (outer) services->outer_unk = outer; + else services->outer_unk = &services->IUnknown_inner; + + *unk = &services->IUnknown_inner; + return S_OK; +} + /****************************************************************** * CreateTextServices (RICHED20.4) */ -HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, IUnknown **ppUnk) +HRESULT WINAPI CreateTextServices( IUnknown *outer, ITextHost *text_host, IUnknown **unk ) { - struct text_services *ITextImpl; - - TRACE("%p %p --> %p\n", pUnkOuter, pITextHost, ppUnk); - if (pITextHost == NULL) - return E_POINTER; - - ITextImpl = CoTaskMemAlloc(sizeof(*ITextImpl)); - if (ITextImpl == NULL) - return E_OUTOFMEMORY; - InitializeCriticalSection(&ITextImpl->csTxtSrv); - ITextImpl->csTxtSrv.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ITextServicesImpl.csTxtSrv"); - ITextImpl->ref = 1; - ITextImpl->host = pITextHost; /* Don't take a ref of the host - this would lead to a mutual dependency */ - ITextImpl->IUnknown_inner.lpVtbl = &textservices_inner_vtbl; - ITextImpl->ITextServices_iface.lpVtbl = &textservices_vtbl; - ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); - - if (pUnkOuter) - ITextImpl->outer_unk = pUnkOuter; - else - ITextImpl->outer_unk = &ITextImpl->IUnknown_inner; - - *ppUnk = &ITextImpl->IUnknown_inner; - return S_OK; + return create_text_services( outer, text_host, unk, FALSE, NULL ); }

1 0

Paul Gofman : ntdll: Reset YMM state in NtSetContextThread() if that is assumed by the context being set.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 633db76f781cc804c63e9ca68ff6a8327af84d11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=633db76f781cc804c63e9ca6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 3 14:55:00 2021 +0300 ntdll: Reset YMM state in NtSetContextThread() if that is assumed by the context being set. Fixes test failure on testbot where compaction is not supported (resetting YMM state if that is implied by the context being set). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/signal_x86_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 0153f772b6d..9e97fd9e298 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1254,7 +1254,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) xsave->xstate.mask |= XSTATE_MASK_GSSE; memcpy( &xsave->xstate.ymm_high, &xs->YmmContext, sizeof(xsave->xstate.ymm_high) ); } - else if (xs->CompactionMask & XSTATE_MASK_GSSE) + else xsave->xstate.mask &= ~XSTATE_MASK_GSSE; } diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index e62e958b4aa..2a030372fb7 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1864,7 +1864,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) xsave->xstate.Mask |= XSTATE_MASK_GSSE; memcpy( &xsave->xstate.YmmContext, &xs->YmmContext, sizeof(xs->YmmContext) ); } - else if (xs->CompactionMask & XSTATE_MASK_GSSE) + else xsave->xstate.Mask &= ~XSTATE_MASK_GSSE; } return STATUS_SUCCESS;

1 0

Nikolay Sivov : dwrite/tests: Add more tests for font sets.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 1aa26bfe94d0b22fd830afdafafd5fd3d544b4a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1aa26bfe94d0b22fd830afda… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 15:30:43 2021 +0300 dwrite/tests: Add more tests for font sets. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 165 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 159 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d7ced109a2f..24ad30bc845 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -124,7 +124,7 @@ static void _expect_ref_broken(IUnknown* obj, ULONG ref, ULONG brokenref, int li static BOOL (WINAPI *pGetFontRealizationInfo)(HDC hdc, void *); -static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; +static const WCHAR test_fontfile[] = L"wine_test_font.ttf"; /* PANOSE is 10 bytes in size, need to pack the structure properly */ #include "pshpack2.h" @@ -9363,10 +9363,15 @@ static void test_AnalyzeContainerType(void) static void test_fontsetbuilder(void) { + IDWriteFontFaceReference *ref, *ref2, *ref3; IDWriteFontCollection1 *collection; + IDWriteFontSetBuilder1 *builder1; IDWriteFontSetBuilder *builder; IDWriteFactory3 *factory; - UINT32 count, i, ref; + UINT32 count, i, refcount; + IDWriteFontSet *fontset; + IDWriteFontFile *file; + WCHAR *path; HRESULT hr; factory = create_factory_iid(&IID_IDWriteFactory3); @@ -9380,6 +9385,40 @@ static void test_fontsetbuilder(void) hr = IDWriteFactory3_CreateFontSetBuilder(factory, &builder); ok(hr == S_OK, "Failed to create font set builder, hr %#x.\n", hr); EXPECT_REF(factory, 2); + + if (SUCCEEDED(hr = IDWriteFontSetBuilder_QueryInterface(builder, &IID_IDWriteFontSetBuilder1, (void **)&builder1))) + { + path = create_testfontfile(test_fontfile); + + hr = IDWriteFactory3_CreateFontFileReference(factory, path, NULL, &file); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + + hr = IDWriteFontSetBuilder1_AddFontFile(builder1, file); + todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + + hr = IDWriteFontSetBuilder1_AddFontFile(builder1, file); + todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + + hr = IDWriteFontSetBuilder1_CreateFontSet(builder1, &fontset); + todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + + if (SUCCEEDED(hr)) + { + /* No attempt to eliminate duplicates. */ + count = IDWriteFontSet_GetFontCount(fontset); + ok(count == 2, "Unexpected font count %u.\n", count); + + IDWriteFontSet_Release(fontset); + } + + IDWriteFontFile_Release(file); + IDWriteFontSetBuilder1_Release(builder1); + } + else + win_skip("IDWriteFontSetBuilder1 is not available.\n"); IDWriteFontSetBuilder_Release(builder); hr = IDWriteFactory3_GetSystemFontCollection(factory, FALSE, &collection, FALSE); @@ -9395,8 +9434,8 @@ static void test_fontsetbuilder(void) ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); fontcount = IDWriteFontFamily1_GetFontCount(family); - for (j = 0; j < fontcount; j++) { - IDWriteFontFaceReference *ref, *ref2; + for (j = 0; j < fontcount; ++j) + { IDWriteFontSet *fontset; UINT32 setcount, id; @@ -9428,6 +9467,12 @@ static void test_fontsetbuilder(void) hr = IDWriteFontSet_GetFontFaceReference(fontset, 0, &ref2); ok(hr == S_OK, "Failed to get font face reference, hr %#x.\n", hr); ok(ref2 != ref, "Unexpected reference.\n"); + + hr = IDWriteFontSet_GetFontFaceReference(fontset, 0, &ref3); + ok(hr == S_OK, "Failed to get font face reference, hr %#x.\n", hr); + ok(ref2 != ref3, "Unexpected reference.\n"); + + IDWriteFontFaceReference_Release(ref3); IDWriteFontFaceReference_Release(ref2); for (id = DWRITE_FONT_PROPERTY_ID_FAMILY_NAME; id < DWRITE_FONT_PROPERTY_ID_TOTAL; ++id) @@ -9499,8 +9544,8 @@ static void test_fontsetbuilder(void) IDWriteFontCollection1_Release(collection); - ref = IDWriteFactory3_Release(factory); - ok(ref == 0, "factory not released, %u\n", ref); + refcount = IDWriteFactory3_Release(factory); + ok(!refcount, "Factory not released, %u.\n", refcount); } static void test_font_resource(void) @@ -9805,6 +9850,112 @@ static void test_GetVerticalGlyphVariants(void) ok(!refcount, "Factory not released, refcount %u.\n", refcount); } +static HANDLE get_collection_expiration_event(IDWriteFontCollection *collection) +{ + IDWriteFontCollection3 *collection3; + HANDLE event; + HRESULT hr; + + hr = IDWriteFontCollection_QueryInterface(collection, &IID_IDWriteFontCollection3, (void **)&collection3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + event = IDWriteFontCollection3_GetExpirationEvent(collection3); + IDWriteFontCollection3_Release(collection3); + + return event; +} + +static void test_expiration_event(void) +{ + IDWriteFontCollection *collection, *collection2; + IDWriteFontCollection3 *collection3; + IDWriteFactory *factory, *factory2; + unsigned int refcount; + HANDLE event, event2; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontCollection_QueryInterface(collection, &IID_IDWriteFontCollection3, (void **)&collection3); + if (FAILED(hr)) + { + win_skip("Expiration events are not supported.\n"); + IDWriteFontCollection_Release(collection); + IDWriteFactory_Release(factory); + return; + } + IDWriteFontCollection3_Release(collection3); + + event = get_collection_expiration_event(collection); +todo_wine + ok(!!event, "Unexpected event handle.\n"); + + /* Compare handles with another isolated factory. */ + factory2 = create_factory(); + + hr = IDWriteFactory_GetSystemFontCollection(factory2, &collection2, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + event2 = get_collection_expiration_event(collection2); +todo_wine { + ok(!!event2, "Unexpected event handle.\n"); + ok(event != event2, "Unexpected event handle.\n"); +} + IDWriteFontCollection_Release(collection2); + + IDWriteFontCollection_Release(collection); + + refcount = IDWriteFactory_Release(factory2); + ok(!refcount, "Unexpected factory refcount %u.\n", refcount); + refcount = IDWriteFactory_Release(factory); + ok(!refcount, "Unexpected factory refcount %u.\n", refcount); +} + +static void test_family_font_set(void) +{ + IDWriteFontCollection *collection; + IDWriteFontFamily2 *family2; + IDWriteFontFamily *family; + IDWriteFactory *factory; + unsigned int refcount; + IDWriteFontSet1 *fontset, *fontset2; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontCollection_GetFontFamily(collection, 0, &family); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + if (SUCCEEDED(IDWriteFontFamily_QueryInterface(family, &IID_IDWriteFontFamily2, (void **)&family2))) + { + hr = IDWriteFontFamily2_GetFontSet(family2, &fontset); + todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IDWriteFontFamily2_GetFontSet(family2, &fontset2); + todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(fontset != fontset2, "Unexpected fontset instance.\n"); + IDWriteFontSet1_Release(fontset2); + IDWriteFontSet1_Release(fontset); + } + IDWriteFontFamily2_Release(family2); + } + else + win_skip("IDWriteFontFamily2 is not supported.\n"); + + IDWriteFontFamily_Release(family); + IDWriteFontCollection_Release(collection); + + refcount = IDWriteFactory_Release(factory); + ok(!refcount, "Unexpected factory refcount %u.\n", refcount); +} + START_TEST(font) { IDWriteFactory *factory; @@ -9875,6 +10026,8 @@ START_TEST(font) test_font_resource(); test_IsColorFont(); test_GetVerticalGlyphVariants(); + test_expiration_event(); + test_family_font_set(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Implement set builder methods that don't specify font properties.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: eac1ca616d7723e19e8c82378c2a1876f27cf7c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eac1ca616d7723e19e8c8237… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 15:30:44 2021 +0300 dwrite: Implement set builder methods that don't specify font properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 93 ++++++++++++++++++++++++++++++++++++++++++++---- dlls/dwrite/tests/font.c | 3 -- 2 files changed, 87 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ac8f5c0a7bb..bbd73f734de 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -250,11 +250,22 @@ struct dwrite_fontresource IDWriteFactory7 *factory; }; +struct dwrite_fontset_entry +{ + IDWriteFontFile *file; + unsigned int face_index; + unsigned int simulations; +}; + struct dwrite_fontset_builder { IDWriteFontSetBuilder2 IDWriteFontSetBuilder2_iface; LONG refcount; IDWriteFactory7 *factory; + + struct dwrite_fontset_entry *entries; + size_t count; + size_t capacity; }; static void dwrite_grab_font_table(void *context, UINT32 table, const BYTE **data, UINT32 *size, void **data_context) @@ -7103,18 +7114,65 @@ static ULONG WINAPI dwritefontsetbuilder_Release(IDWriteFontSetBuilder2 *iface) { struct dwrite_fontset_builder *builder = impl_from_IDWriteFontSetBuilder2(iface); ULONG refcount = InterlockedDecrement(&builder->refcount); + size_t i; TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { IDWriteFactory7_Release(builder->factory); + for (i = 0; i < builder->count; ++i) + IDWriteFontFile_Release(builder->entries[i].file); + heap_free(builder->entries); heap_free(builder); } return refcount; } +static HRESULT fontset_builder_add_entry(struct dwrite_fontset_builder *builder, IDWriteFontFile *file, + unsigned int face_index, unsigned int simulations) +{ + struct dwrite_fontset_entry *entry; + + if (!dwrite_array_reserve((void **)&builder->entries, &builder->capacity, builder->count + 1, + sizeof(*builder->entries))) + { + return E_OUTOFMEMORY; + } + + entry = &builder->entries[builder->count++]; + entry->file = file; + IDWriteFontFile_AddRef(entry->file); + entry->face_index = face_index; + entry->simulations = simulations; + + return S_OK; +} + +static HRESULT fontset_builder_add_file(struct dwrite_fontset_builder *builder, IDWriteFontFile *file) +{ + DWRITE_FONT_FILE_TYPE filetype; + DWRITE_FONT_FACE_TYPE facetype; + unsigned int i, face_count; + BOOL supported = FALSE; + HRESULT hr; + + if (FAILED(hr = IDWriteFontFile_Analyze(file, &supported, &filetype, &facetype, &face_count))) + return hr; + + if (!supported) + return DWRITE_E_FILEFORMAT; + + for (i = 0; i < face_count; ++i) + { + if (FAILED(hr = fontset_builder_add_entry(builder, file, i, DWRITE_FONT_SIMULATIONS_NONE))) + break; + } + + return hr; +} + static HRESULT WINAPI dwritefontsetbuilder_AddFontFaceReference_(IDWriteFontSetBuilder2 *iface, IDWriteFontFaceReference *ref, DWRITE_FONT_PROPERTY const *props, UINT32 prop_count) { @@ -7126,9 +7184,21 @@ static HRESULT WINAPI dwritefontsetbuilder_AddFontFaceReference_(IDWriteFontSetB static HRESULT WINAPI dwritefontsetbuilder_AddFontFaceReference(IDWriteFontSetBuilder2 *iface, IDWriteFontFaceReference *ref) { - FIXME("%p, %p.\n", iface, ref); + struct dwrite_fontset_builder *builder = impl_from_IDWriteFontSetBuilder2(iface); + unsigned int face_index, simulations; + IDWriteFontFile *file; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, ref); + + if (FAILED(hr = IDWriteFontFaceReference_GetFontFile(ref, &file))) return hr; + + face_index = IDWriteFontFaceReference_GetFontFaceIndex(ref); + simulations = IDWriteFontFaceReference_GetSimulations(ref); + hr = fontset_builder_add_entry(builder, file, face_index, simulations); + IDWriteFontFile_Release(file); + + return hr; } static HRESULT WINAPI dwritefontsetbuilder_AddFontSet(IDWriteFontSetBuilder2 *iface, IDWriteFontSet *fontset) @@ -7147,9 +7217,11 @@ static HRESULT WINAPI dwritefontsetbuilder_CreateFontSet(IDWriteFontSetBuilder2 static HRESULT WINAPI dwritefontsetbuilder1_AddFontFile(IDWriteFontSetBuilder2 *iface, IDWriteFontFile *file) { - FIXME("%p, %p.\n", iface, file); + struct dwrite_fontset_builder *builder = impl_from_IDWriteFontSetBuilder2(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, file); + + return fontset_builder_add_file(builder, file); } static HRESULT WINAPI dwritefontsetbuilder2_AddFont(IDWriteFontSetBuilder2 *iface, IDWriteFontFile *file, @@ -7165,9 +7237,18 @@ static HRESULT WINAPI dwritefontsetbuilder2_AddFont(IDWriteFontSetBuilder2 *ifac static HRESULT WINAPI dwritefontsetbuilder2_AddFontFile(IDWriteFontSetBuilder2 *iface, const WCHAR *filepath) { - FIXME("%p, %s.\n", iface, debugstr_w(filepath)); + struct dwrite_fontset_builder *builder = impl_from_IDWriteFontSetBuilder2(iface); + IDWriteFontFile *file; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_w(filepath)); + + if (FAILED(hr = IDWriteFactory7_CreateFontFileReference(builder->factory, filepath, NULL, &file))) + return hr; + + hr = fontset_builder_add_file(builder, file); + IDWriteFontFile_Release(file); + return hr; } static const IDWriteFontSetBuilder2Vtbl fontsetbuildervtbl = diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 24ad30bc845..c377f20556b 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9394,11 +9394,9 @@ static void test_fontsetbuilder(void) ok(hr == S_OK, "Unexpected hr %#x.\n",hr); hr = IDWriteFontSetBuilder1_AddFontFile(builder1, file); - todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n",hr); hr = IDWriteFontSetBuilder1_AddFontFile(builder1, file); - todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n",hr); hr = IDWriteFontSetBuilder1_CreateFontSet(builder1, &fontset); @@ -9451,7 +9449,6 @@ static void test_fontsetbuilder(void) EXPECT_REF(ref, 1); hr = IDWriteFontSetBuilder_AddFontFaceReference(builder, ref); - todo_wine ok(hr == S_OK, "Failed to add fontface reference, hr %#x.\n", hr); EXPECT_REF(ref, 1);

1 0

Giovanni Mascellani : dwrite: Do not segfault when there are no typographic features to return.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 65f5033702780ce355749b09644df57c5305db33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65f5033702780ce355749b09… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Mar 3 15:25:28 2021 +0100 dwrite: Do not segfault when there are no typographic features to return. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/shape.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 6428bf6ceb0..abeb7eeac79 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -372,6 +372,12 @@ HRESULT shape_get_typographic_features(struct scriptshaping_context *context, co shape_get_script_lang_index(context, scripts, MS_GPOS_TAG, &script_index, &language_index); opentype_get_typographic_features(&context->cache->gpos, script_index, language_index, &t); + if (t.count == 0) + { + *actual_tagcount = 0; + return S_OK; + } + /* Sort and remove duplicates. */ qsort(t.tags, t.count, sizeof(*t.tags), tag_array_sorting_compare);

1 0

Alexandre Julliard : dbgeng: Use the correct machine type for ARM.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: fa23ffd26a91d62bd44c49ea39aa8cb15a8ab1a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa23ffd26a91d62bd44c49ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 12:04:19 2021 +0100 dbgeng: Use the correct machine type for ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index f24b04d0864..c857456b51c 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -3035,7 +3035,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_IsPointer64Bit(IDebugControl2 *ifa switch (target->cpu_type) { case IMAGE_FILE_MACHINE_I386: - case IMAGE_FILE_MACHINE_ARM: + case IMAGE_FILE_MACHINE_ARMNT: hr = S_FALSE; break; case IMAGE_FILE_MACHINE_IA64:

1 0

Alexandre Julliard : kernelbase: Use the correct machine type for ARM.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 40e1000fc5cfdb002173e9380e791e4cbb8e6d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40e1000fc5cfdb002173e938… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 12:04:34 2021 +0100 kernelbase: Use the correct machine type for ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 4 ++-- dlls/kernelbase/process.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index ea9cde5facc..0c514f816c1 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2187,9 +2187,9 @@ static void test_IsWow64Process2(void) #elif defined __x86_64__ USHORT expect_native = IMAGE_FILE_MACHINE_AMD64; #elif defined __arm__ - USHORT expect_native = IMAGE_FILE_MACHINE_ARM; + USHORT expect_native = IMAGE_FILE_MACHINE_ARMNT; #elif defined __aarch64__ - USHORT expect_native = IMAGE_FILE_MACHINE_ARM; + USHORT expect_native = IMAGE_FILE_MACHINE_ARM64; #else USHORT expect_native = 0; #endif diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 98cefc717da..44bf0606c7a 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1002,7 +1002,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsWow64Process2( HANDLE process, USHORT *machine, *native_machine = IMAGE_FILE_MACHINE_I386; break; case PROCESSOR_ARCHITECTURE_ARM: - *native_machine = IMAGE_FILE_MACHINE_ARM; + *native_machine = IMAGE_FILE_MACHINE_ARMNT; break; case PROCESSOR_ARCHITECTURE_AMD64: *native_machine = IMAGE_FILE_MACHINE_AMD64;

1 0

Alexandre Julliard : ntdll: Fetch locale information from the Unix side in resource loading.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 46fd718ec7f330793a7f142f326eabe311c8d70b URL: https://source.winehq.org/git/wine.git/?a=commit;h=46fd718ec7f330793a7f142f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 16:13:09 2021 +0100 ntdll: Fetch locale information from the Unix side in resource loading. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50769 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 2 -- dlls/ntdll/ntdll_misc.h | 3 --- dlls/ntdll/resource.c | 4 ++++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 19626a48b72..b3a225a30c3 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -100,8 +100,6 @@ struct norm_table /* WORD[] composition character sequences */ }; -LCID user_lcid = 0, system_lcid = 0; - static NLSTABLEINFO nls_info; static HMODULE kernel32_handle; static struct norm_table *norm_tables[16]; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 72340a171c9..b69ad762300 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -85,9 +85,6 @@ extern const struct unix_funcs *unix_funcs DECLSPEC_HIDDEN; extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; -/* locale */ -extern LCID user_lcid, system_lcid; - extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, __ms_va_list args ) DECLSPEC_HIDDEN; extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_va_list args ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 981c538a8e0..58a0fc7d2e2 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -175,6 +175,7 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_name( const IMAGE_RESOURCE_ static NTSTATUS find_entry( HMODULE hmod, const LDR_RESOURCE_INFO *info, ULONG level, const void **ret, int want_dir ) { + static LCID user_lcid, system_lcid; ULONG size; const void *root; const IMAGE_RESOURCE_DIRECTORY *resdirptr; @@ -212,6 +213,8 @@ static NTSTATUS find_entry( HMODULE hmod, const LDR_RESOURCE_INFO *info, /* user defaults, unless SYS_DEFAULT sublanguage specified */ if (SUBLANGID(info->Language) != SUBLANG_SYS_DEFAULT) { + if (!user_lcid) NtQueryDefaultLocale( TRUE, &user_lcid ); + /* 4. current thread locale language */ pos = push_language( list, pos, LANGIDFROMLCID(NtCurrentTeb()->CurrentLocale) ); @@ -223,6 +226,7 @@ static NTSTATUS find_entry( HMODULE hmod, const LDR_RESOURCE_INFO *info, } /* now system defaults */ + if (!system_lcid) NtQueryDefaultLocale( FALSE, &system_lcid ); /* 7. system locale language */ pos = push_language( list, pos, LANGIDFROMLCID( system_lcid ) );

1 0

Alexandre Julliard : configure: Don't override the specified TARGETFLAGS.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: c08ffc6537727c3f8d0f0ddea803f5406f7b1d8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c08ffc6537727c3f8d0f0dde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 15:38:44 2021 +0100 configure: Don't override the specified TARGETFLAGS. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 9 ++++----- configure.ac | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 2b20133cd65..13eecaf05d7 100755 --- a/configure +++ b/configure @@ -5647,7 +5647,6 @@ case $host in ;; esac -TARGETFLAGS="" case $host in x86_64*|amd64*) @@ -5685,7 +5684,7 @@ $as_echo "$wine_cv_cc_m32" >&6; } test $wine_cv_cc_m32 != no || as_fn_error $? "Cannot build a 32-bit program, you need to install 32-bit development libraries." "$LINENO" 5 host_cpu="i386" notice_platform="32-bit " - TARGETFLAGS="-m32" + TARGETFLAGS="$TARGETFLAGS -m32" PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} @@ -5724,7 +5723,7 @@ $as_echo "$wine_cv_builtin_ms_va_list" >&6; } CXX="$CXX -m64" host_cpu="x86_64" notice_platform="64-bit " - TARGETFLAGS="-m64" + TARGETFLAGS="$TARGETFLAGS -m64" enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; @@ -5758,10 +5757,10 @@ $as_echo "$wine_cv_thumb2" >&6; } if test x"$wine_cv_thumb2" = xyes then CFLAGS="$CFLAGS -mthumb" - TARGETFLAGS="-mthumb" + TARGETFLAGS="$TARGETFLAGS -mthumb" else CFLAGS="$CFLAGS -marm" - TARGETFLAGS="-marm" + TARGETFLAGS="$TARGETFLAGS -marm" fi case $with_float_abi in soft|softfp|hard) diff --git a/configure.ac b/configure.ac index 24f5c8847d6..6a4e9568c40 100644 --- a/configure.ac +++ b/configure.ac @@ -140,7 +140,7 @@ case $host in ;; esac -AC_SUBST(TARGETFLAGS,"") +AC_SUBST(TARGETFLAGS) case $host in x86_64*|amd64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" @@ -152,7 +152,7 @@ case $host in test $wine_cv_cc_m32 != no || AC_MSG_ERROR([Cannot build a 32-bit program, you need to install 32-bit development libraries.]) host_cpu="i386" notice_platform="32-bit " - TARGETFLAGS="-m32" + TARGETFLAGS="$TARGETFLAGS -m32" PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} @@ -169,7 +169,7 @@ case $host in CXX="$CXX -m64" host_cpu="x86_64" notice_platform="64-bit " - TARGETFLAGS="-m64" + TARGETFLAGS="$TARGETFLAGS -m64" enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; @@ -180,10 +180,10 @@ case $host in if test x"$wine_cv_thumb2" = xyes then CFLAGS="$CFLAGS -mthumb" - TARGETFLAGS="-mthumb" + TARGETFLAGS="$TARGETFLAGS -mthumb" else CFLAGS="$CFLAGS -marm" - TARGETFLAGS="-marm" + TARGETFLAGS="$TARGETFLAGS -marm" fi case $with_float_abi in soft|softfp|hard)

1 0

Nikolay Sivov : wbemdisp: Implement GetObjectText_().
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 67f32df2ba7772f6379749eeb183e012682f92a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67f32df2ba7772f6379749ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:04:26 2021 +0300 wbemdisp: Implement GetObjectText_(). 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 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 0ef73bdbd56..dcec47faa6e 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -1534,11 +1534,14 @@ static HRESULT WINAPI object_Clone_( static HRESULT WINAPI object_GetObjectText_( ISWbemObject *iface, - LONG iFlags, - BSTR *strObjectText ) + LONG flags, + BSTR *text ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct object *object = impl_from_ISWbemObject( iface ); + + TRACE( "%p, %#x, %p\n", object, flags, text ); + + return IWbemClassObject_GetObjectText( object->object, flags, text ); } static HRESULT WINAPI object_SpawnDerivedClass_(

1 0