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

Zhiyi Zhang : comctl32/ipaddress: Do not open theme data in IPADDRESS_Draw().
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: 79516685817d5d0f1004c37260b8ba330c316d98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79516685817d5d0f1004c372… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 3 14:49:00 2021 +0800 comctl32/ipaddress: Do not open theme data in IPADDRESS_Draw(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/ipaddress.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index c7b9ada1f6a..b6302a89ba6 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -145,7 +145,7 @@ static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) GetClientRect (infoPtr->Self, &rect); - theme = OpenThemeData(infoPtr->Self, WC_EDITW); + theme = GetWindowTheme (infoPtr->Self); if (theme) { DWORD dwStyle = GetWindowLongW (infoPtr->Self, GWL_STYLE); @@ -193,9 +193,6 @@ static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) DrawTextW(hdc, L".", 1, &rect, DT_SINGLELINE | DT_CENTER | DT_BOTTOM); } - if (theme) - CloseThemeData(theme); - return 0; } @@ -255,6 +252,7 @@ static LRESULT IPADDRESS_Create (HWND hwnd, const CREATESTRUCTA *lpCreate) } IPADDRESS_UpdateText (infoPtr); + OpenThemeData (infoPtr->Self, WC_EDITW); return 0; } @@ -262,6 +260,7 @@ static LRESULT IPADDRESS_Create (HWND hwnd, const CREATESTRUCTA *lpCreate) static LRESULT IPADDRESS_Destroy (IPADDRESS_INFO *infoPtr) { + HTHEME theme; int i; TRACE("\n"); @@ -272,6 +271,8 @@ static LRESULT IPADDRESS_Destroy (IPADDRESS_INFO *infoPtr) } SetWindowLongPtrW (infoPtr->Self, 0, 0); + theme = GetWindowTheme (infoPtr->Self); + CloseThemeData (theme); heap_free (infoPtr); return 0; } @@ -456,6 +457,13 @@ static BOOL IPADDRESS_GotoNextField (const IPADDRESS_INFO *infoPtr, int cur, int return FALSE; } +static LRESULT IPADDRESS_ThemeChanged (const IPADDRESS_INFO *infoPtr) +{ + HTHEME theme = GetWindowTheme (infoPtr->Self); + CloseThemeData (theme); + theme = OpenThemeData (theme, WC_EDITW); + return 0; +} /* * period: move and select the text in the next field to the right if @@ -618,6 +626,9 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) COMCTL32_RefreshSysColors(); return 0; + case WM_THEMECHANGED: + return IPADDRESS_ThemeChanged (infoPtr); + case IPM_CLEARADDRESS: return IPADDRESS_ClearAddress (infoPtr);

1 0

Zhiyi Zhang : comctl32/edit: Call GetWindowTheme() only when necessary.
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: 31fab6705a0425654c620bfd1682480c817905cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=31fab6705a0425654c620bfd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 3 14:49:08 2021 +0800 comctl32/edit: Call GetWindowTheme() only when necessary. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 05920893c93..639443bc338 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -4597,7 +4597,6 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW(hwnd, 0); - HTHEME theme = GetWindowTheme(hwnd); LRESULT result = 0; RECT *rect; @@ -4905,7 +4904,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_ENABLE: es->bEnableState = (BOOL) wParam; EDIT_UpdateText(es, NULL, TRUE); - if (theme) + if (GetWindowTheme(hwnd)) RedrawWindow(hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); break; @@ -4935,7 +4934,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_KILLFOCUS: - result = EDIT_WM_KillFocus(theme, es); + result = EDIT_WM_KillFocus(GetWindowTheme(hwnd), es); break; case WM_LBUTTONDBLCLK: @@ -4972,7 +4971,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_SETFOCUS: - EDIT_WM_SetFocus(theme, es); + EDIT_WM_SetFocus(GetWindowTheme(hwnd), es); break; case WM_SETFONT: @@ -5096,7 +5095,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_THEMECHANGED: - CloseThemeData (theme); + CloseThemeData(GetWindowTheme(hwnd)); OpenThemeData(hwnd, WC_EDITW); break;

1 0

Arkadiusz Hiler : kernelbase: Fix GetFileVersionInfo*() crashes with malformed resources.
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: e51ae86937c547124c906fb1d5db7a142af60686 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e51ae86937c547124c906fb1… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Mar 2 19:22:38 2021 +0200 kernelbase: Fix GetFileVersionInfo*() crashes with malformed resources. Some Unity games ship with an encrypted Assembly-CSharp.dll, including the resources directory, yet the engine still calls GetFileVersionInfoSizeW() on those files. This may results in a page fault when trying to find the version resource and takes the whole process down. The change fixes crashes when launching Home Behind 2 and Crown Trick. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50075 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/version.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 58c49aa148b..d5bfa081939 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -240,7 +240,8 @@ done: * Copied from loader/pe_resource.c */ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_id( const IMAGE_RESOURCE_DIRECTORY *dir, - WORD id, const void *root ) + WORD id, const void *root, + DWORD root_size ) { const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; int min, max, pos; @@ -248,11 +249,19 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_id( const IMAGE_RESOURCE_DI entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); min = dir->NumberOfNamedEntries; max = min + dir->NumberOfIdEntries - 1; + + if (max >= (root_size - ((INT_PTR)dir - (INT_PTR)root) - sizeof(*dir)) / sizeof(*entry)) + return NULL; + while (min <= max) { pos = (min + max) / 2; if (entry[pos].u.Id == id) - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s2.OffsetToDirectory); + { + DWORD offset = entry[pos].u2.s2.OffsetToDirectory; + if (offset > root_size - sizeof(*dir)) return NULL; + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + offset); + } if (entry[pos].u.Id > id) max = pos - 1; else min = pos + 1; } @@ -294,7 +303,8 @@ static inline int push_language( WORD *list, int pos, WORD lang ) * find_entry_language */ static const IMAGE_RESOURCE_DIRECTORY *find_entry_language( const IMAGE_RESOURCE_DIRECTORY *dir, - const void *root, DWORD flags ) + const void *root, DWORD root_size, + DWORD flags ) { const IMAGE_RESOURCE_DIRECTORY *ret; WORD list[9]; @@ -319,7 +329,7 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_language( const IMAGE_RESOURCE pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); } - for (i = 0; i < pos; i++) if ((ret = find_entry_by_id( dir, list[i], root ))) return ret; + for (i = 0; i < pos; i++) if ((ret = find_entry_by_id( dir, list[i], root, root_size ))) return ret; return find_entry_default( dir, root ); } @@ -413,7 +423,7 @@ static BOOL find_pe_resource( HANDLE handle, DWORD *resLen, DWORD *resOff, DWORD PIMAGE_DATA_DIRECTORY resDataDir; PIMAGE_SECTION_HEADER sections; LPBYTE resSection; - DWORD len, section_size, data_size; + DWORD len, section_size, data_size, resDirSize; const void *resDir; const IMAGE_RESOURCE_DIRECTORY *resPtr; const IMAGE_RESOURCE_DATA_ENTRY *resData; @@ -486,21 +496,22 @@ static BOOL find_pe_resource( HANDLE handle, DWORD *resLen, DWORD *resOff, DWORD /* Find resource */ resDir = resSection + (resDataDir->VirtualAddress - sections[i].VirtualAddress); + resDirSize = section_size - (resDataDir->VirtualAddress - sections[i].VirtualAddress); resPtr = resDir; - resPtr = find_entry_by_id( resPtr, VS_FILE_INFO, resDir ); + resPtr = find_entry_by_id( resPtr, VS_FILE_INFO, resDir, resDirSize ); if ( !resPtr ) { TRACE("No typeid entry found\n" ); goto done; } - resPtr = find_entry_by_id( resPtr, VS_VERSION_INFO, resDir ); + resPtr = find_entry_by_id( resPtr, VS_VERSION_INFO, resDir, resDirSize ); if ( !resPtr ) { TRACE("No resid entry found\n" ); goto done; } - resPtr = find_entry_language( resPtr, resDir, flags ); + resPtr = find_entry_language( resPtr, resDir, resDirSize, flags ); if ( !resPtr ) { TRACE("No default language entry found\n" );

1 0

Huw Davies : winecoreaudio: Undefine a few more items to prevent macro redefinition warnings.
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: 0c2defd9cc3461e2a956a8e1840d5a224fb4d396 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c2defd9cc3461e2a956a8e1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 3 14:49:04 2021 +0000 winecoreaudio: Undefine a few more items to prevent macro redefinition warnings. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/audiounit.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index 5f20b3dcb25..a3c190870ad 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -30,6 +30,23 @@ #undef ULONG #undef HRESULT #undef STDMETHODCALLTYPE +#undef SUCCEEDED +#undef FAILED +#undef IS_ERROR +#undef HRESULT_FACILITY +#undef MAKE_HRESULT +#undef S_OK +#undef S_FALSE +#undef E_UNEXPECTED +#undef E_NOTIMPL +#undef E_OUTOFMEMORY +#undef E_INVALIDARG +#undef E_NOINTERFACE +#undef E_POINTER +#undef E_HANDLE +#undef E_ABORT +#undef E_FAIL +#undef E_ACCESSDENIED #include "coreaudio.h" #include "wine/debug.h"

1 0

Giovanni Mascellani : dwrite: Do not segfault when there are no typographic features to return.
by Alexandre Julliard March 3, 2021

March 3, 2021

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

Nikolay Sivov : wbemprox: Handle __ProviderArchitecture in SetDWORDValue().
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: 225f9eb38b92d95d4a6b9ec441740670eb0c40ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=225f9eb38b92d95d4a6b9ec4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:58 2021 +0300 wbemprox: Handle __ProviderArchitecture in SetDWORDValue(). 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/wbemprox/reg.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 63870bfc52c..edcdb1902f1 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -550,14 +550,23 @@ HRESULT reg_set_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbem return hr; } -static void set_dwordvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, DWORD value, VARIANT *retval ) +static void set_dwordvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, DWORD value, IWbemContext *context, + VARIANT *retval ) { + HKEY hkey; LONG res; TRACE("%p, %s, %s, %#x\n", root, debugstr_w(subkey), debugstr_w(name), value); - res = RegSetKeyValueW( root, subkey, name, REG_DWORD, &value, sizeof(value) ); + if ((res = RegOpenKeyExW( root, subkey, 0, KEY_SET_VALUE | reg_get_access_mask( context ), &hkey ))) + { + set_variant( VT_UI4, res, NULL, retval ); + return; + } + + res = RegSetKeyValueW( hkey, NULL, name, REG_DWORD, &value, sizeof(value) ); set_variant( VT_UI4, res, NULL, retval ); + RegCloseKey( hkey ); } HRESULT reg_set_dwordvalue( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) @@ -595,7 +604,7 @@ HRESULT reg_set_dwordvalue( IWbemClassObject *obj, IWbemContext *context, IWbemC return hr; } } - set_dwordvalue( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), V_BSTR(&name), V_UI4(&value), &retval ); + set_dwordvalue( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), V_BSTR(&name), V_UI4(&value), context, &retval ); if (out_params) hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 );

1 0

Huw Davies : riched20: Remove the host structure's typedef.
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: d188686b166222fc0adbed86a46554ae8ad8f682 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d188686b166222fc0adbed86… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 3 11:29:38 2021 +0000 riched20: Remove the host structure's typedef. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txthost.c | 269 +++++++++++++++++++++++------------------------- 1 file changed, 130 insertions(+), 139 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d188686b166222fc0adb…

1 0

Huw Davies : riched20: The text host should create the text services object.
by Alexandre Julliard March 3, 2021

March 3, 2021

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

Nikolay Sivov : dwrite/tests: Add more tests for font sets.
by Alexandre Julliard March 3, 2021

March 3, 2021

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

Dmitry Timoshkov : server: Set error to STATUS_UNSUCCESSFUL when the server fails to queue APC for a thread.
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: 050dc49b3850a9cf807d995c2c8e8c3f244b9f11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=050dc49b3850a9cf807d995c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 3 12:27:47 2021 +0300 server: Set error to STATUS_UNSUCCESSFUL when the server fails to queue APC for a thread. I've left another case of returning STATUS_PROCESS_IS_TERMINATING since that's not covered by the tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50704 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 2 -- server/thread.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 7d6ac030299..f1c5f01fa84 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2737,13 +2737,11 @@ static void test_QueueUserAPC(void) ok(ret == WAIT_OBJECT_0, "got %u\n", ret); ret = pNtQueueApcThread(thread, call_user_apc, (ULONG_PTR)user_apc, 0, 0); -todo_wine ok(ret == STATUS_UNSUCCESSFUL, "got %#x\n", ret); SetLastError(0xdeadbeef); ret = QueueUserAPC(user_apc, thread, 0); ok(!ret, "QueueUserAPC should fail\n"); -todo_wine ok(GetLastError() == ERROR_GEN_FAILURE, "got %u\n", GetLastError()); CloseHandle(thread); diff --git a/server/thread.c b/server/thread.c index d544970f3c1..dc02a1a9de3 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1763,7 +1763,7 @@ DECL_HANDLER(queue_apc) if (thread) { - if (!queue_apc( NULL, thread, apc )) set_error( STATUS_THREAD_IS_TERMINATING ); + if (!queue_apc( NULL, thread, apc )) set_error( STATUS_UNSUCCESSFUL ); release_object( thread ); } else if (process)

1 0