April 2023 - Wine-Commits - list.winehq.org

Rémi Bernon : dwrite: Statically init the system_fallback locale list.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 1004fc2587120a6e9b95a8fd94a716890a90b0eb URL: https://gitlab.winehq.org/wine/wine/-/commit/1004fc2587120a6e9b95a8fd94a716… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 15:34:59 2023 +0100 dwrite: Statically init the system_fallback locale list. To avoid a crash on DLL unload if it wasn't initialized. (cherry picked from commit 17ac4059a586cdfaa7cabf734396905f04ce80af) --- dlls/dwrite/analyzer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 5489efa93b8..4e503eb8b5c 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -551,7 +551,10 @@ struct dwrite_fontfallback_builder size_t mappings_size; }; -static struct fallback_data system_fallback; +static struct fallback_data system_fallback = +{ + .locales = LIST_INIT(system_fallback.locales), +}; static void release_fallback_mapping(struct fallback_mapping *mapping) {

1 0

Tingzhong Luo : evr: Fix crash when clearing input type for the mixer.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 2fa2a5ccdb7ba0d1442111541d0c0c31ecb5dd2e URL: https://gitlab.winehq.org/wine/wine/-/commit/2fa2a5ccdb7ba0d1442111541d0c0c… Author: Tingzhong Luo <luotingzhong(a)uniontech.com> Date: Thu Feb 23 11:56:54 2023 +0800 evr: Fix crash when clearing input type for the mixer. Signed-off-by: Tingzhong Luo <luotingzhong(a)uniontech.com> (cherry picked from commit c56638278cecc1db682af28b16fbdba6c73bbf42) --- dlls/evr/mixer.c | 9 +++++++-- dlls/evr/tests/evr.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 668a97da979..222fc538fec 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -240,7 +240,7 @@ static void video_mixer_clear_types(struct video_mixer *mixer) free(mixer->output.rt_formats); if (mixer->output.media_type) IMFMediaType_Release(mixer->output.media_type); - mixer->output.media_type = NULL; + memset(&mixer->output, 0, sizeof(mixer->output)); } static HRESULT WINAPI video_mixer_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) @@ -855,12 +855,17 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW TRACE("%p, %lu, %p, %#lx.\n", iface, id, media_type, flags); + if (!media_type && (flags & MFT_SET_TYPE_TEST_ONLY)) + return E_INVALIDARG; + EnterCriticalSection(&mixer->cs); if (!(flags & MFT_SET_TYPE_TEST_ONLY)) video_mixer_clear_types(mixer); - if (!mixer->device_manager) + if (!media_type) + hr = S_OK; + else if (!mixer->device_manager) hr = MF_E_NOT_INITIALIZED; else { diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index acfb92f2ea5..4f30dd28570 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1249,6 +1249,11 @@ static void test_default_mixer_type_negotiation(void) goto done; } + hr = IMFTransform_SetInputType(transform, 0, NULL, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_SetInputType(transform, 0, NULL, MFT_SET_TYPE_TEST_ONLY); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -1469,9 +1474,48 @@ static void test_default_mixer_type_negotiation(void) hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(media_type == media_type2, "Unexpected media type instance.\n"); + + IMFMediaType_Release(media_type); + + /* Clear input types */ + hr = IMFTransform_SetInputType(transform, 0, NULL, MFT_SET_TYPE_TEST_ONLY); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + hr = IMFTransform_SetInputType(transform, 0, NULL, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); + + /* Restore types */ + hr = IMFTransform_SetOutputType(transform, 0, media_type2, 0); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); + + hr = IMFTransform_SetInputType(transform, 0, video_type, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(media_type == video_type, "Unexpected media type instance.\n"); + IMFMediaType_Release(media_type); + + hr = IMFTransform_SetOutputType(transform, 0, media_type2, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(media_type2 == media_type, "Unexpected media type instance.\n"); + IMFMediaType_Release(media_type2); IMFMediaType_Release(media_type); + /* Resetting type twice */ + hr = IMFTransform_SetInputType(transform, 0, NULL, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_SetInputType(transform, 0, NULL, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFVideoProcessor_Release(processor); IMFMediaType_Release(video_type);

1 0

Dmitry Timoshkov : win32u: Give full access rights to the thread desktop.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: ed67f0985df2000dd2aeb081e0482cceb27bab7d URL: https://gitlab.winehq.org/wine/wine/-/commit/ed67f0985df2000dd2aeb081e0482c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Dec 3 21:33:42 2022 +0300 win32u: Give full access rights to the thread desktop. Fix CEF applications crash at start without --no-sandbox option. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53981 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> (cherry picked from commit 02e3e17b4dd62eb71d867d0140d3061de683ba29) --- dlls/user32/tests/winstation.c | 1 - dlls/win32u/winstation.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 40105dd0f33..e33a3252494 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -279,7 +279,6 @@ static void test_handles(void) status = NtQueryObject( d1, ObjectBasicInformation, &info, sizeof(info), NULL ); ok( !status, "NtQueryObject failed, status %#lx\n", status ); - todo_wine ok( info.GrantedAccess == (STANDARD_RIGHTS_REQUIRED | DESKTOP_ALL_ACCESS), "Got unexpected access %#lx\n", info.GrantedAccess ); diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index a6b35090223..d7300774a56 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -628,7 +628,7 @@ void winstation_init(void) InitializeObjectAttributes( &attr, &str, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, dir, NULL ); - handle = NtUserCreateDesktopEx( &attr, NULL, NULL, 0, DESKTOP_ALL_ACCESS, 0 ); + handle = NtUserCreateDesktopEx( &attr, NULL, NULL, 0, STANDARD_RIGHTS_REQUIRED | DESKTOP_ALL_ACCESS, 0 ); if (handle) NtUserSetThreadDesktop( handle ); } NtClose( dir );

1 0

Dmitry Timoshkov : win32u: Give full access rights to the process window station.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 047b4d0ea79c9a132fa0a869870d2867d5e51756 URL: https://gitlab.winehq.org/wine/wine/-/commit/047b4d0ea79c9a132fa0a869870d28… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Dec 3 21:11:00 2022 +0300 win32u: Give full access rights to the process window station. Fix CEF applications crash at start without --no-sandbox option. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53981 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> (cherry picked from commit b99c67569f8ca939fba84dc3c8d448570daa753e) --- dlls/user32/tests/winstation.c | 1 - dlls/win32u/winstation.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index fc775546502..40105dd0f33 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -137,7 +137,6 @@ static void test_handles(void) status = NtQueryObject( w1, ObjectBasicInformation, &info, sizeof(info), NULL ); ok( !status, "NtQueryObject failed, status %#lx\n", status ); - todo_wine ok( info.GrantedAccess == (STANDARD_RIGHTS_REQUIRED | WINSTA_ALL_ACCESS), "Got unexpected access %#lx\n", info.GrantedAccess ); diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 145e12a8e1f..a6b35090223 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -604,7 +604,7 @@ void winstation_init(void) InitializeObjectAttributes( &attr, &str, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, dir, NULL ); - handle = NtUserCreateWindowStation( &attr, WINSTA_ALL_ACCESS, 0, 0, 0, 0, 0 ); + handle = NtUserCreateWindowStation( &attr, STANDARD_RIGHTS_REQUIRED | WINSTA_ALL_ACCESS, 0, 0, 0, 0, 0 ); if (handle) { NtUserSetProcessWindowStation( handle );

1 0

Giovanni Mascellani : wbemprox: Do not call Release() inside wbemprox_cf_CreateInstance().
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 7c0da27bd1d653ae8a29754de70eb6010c4a851e URL: https://gitlab.winehq.org/wine/wine/-/commit/7c0da27bd1d653ae8a29754de70eb6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Dec 20 15:41:19 2022 +0100 wbemprox: Do not call Release() inside wbemprox_cf_CreateInstance(). The Ubisoft overlay version 135 hot patches and hooks wbem_locator_Release(), but crashes if Release() is called inside CoCreateInstance(), a condition that doesn't appear to happen on Windows. So we try to exhibit the same behavior. (cherry picked from commit 798fbd420540310a8c853ec9676cf3490fc880ca) --- dlls/wbemprox/main.c | 12 ++---------- dlls/wbemprox/services.c | 8 ++++++-- dlls/wbemprox/wbemlocator.c | 6 +++++- dlls/wbemprox/wbemprox_private.h | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index 20ca1a08530..30363658636 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -37,7 +37,7 @@ static HINSTANCE instance; struct list *table_list[WBEMPROX_NAMESPACE_LAST]; -typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj ); +typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj, REFIID riid ); typedef struct { @@ -77,8 +77,6 @@ static HRESULT WINAPI wbemprox_cf_CreateInstance( IClassFactory *iface, LPUNKNOW REFIID riid, LPVOID *ppobj ) { wbemprox_cf *This = impl_from_IClassFactory( iface ); - HRESULT r; - IUnknown *punk; TRACE("%p %s %p\n", pOuter, debugstr_guid(riid), ppobj); @@ -87,13 +85,7 @@ static HRESULT WINAPI wbemprox_cf_CreateInstance( IClassFactory *iface, LPUNKNOW if (pOuter) return CLASS_E_NOAGGREGATION; - r = This->pfnCreateInstance( (LPVOID *)&punk ); - if (FAILED(r)) - return r; - - r = IUnknown_QueryInterface( punk, riid, ppobj ); - IUnknown_Release( punk ); - return r; + return This->pfnCreateInstance( ppobj, riid ); } static HRESULT WINAPI wbemprox_cf_LockServer( IClassFactory *iface, BOOL dolock ) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 6fc05be9f3c..203b0e90784 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -1058,7 +1058,7 @@ static HRESULT WINAPI wbem_context_Clone( TRACE("%p, %p\n", iface, newcopy); - if (SUCCEEDED(hr = WbemContext_create( (void **)&cloned_context ))) + if (SUCCEEDED(hr = WbemContext_create( (void **)&cloned_context, &IID_IWbemContext ))) { LIST_FOR_EACH_ENTRY( value, &context->values, struct wbem_context_value, entry ) { @@ -1225,12 +1225,16 @@ static const IWbemContextVtbl wbem_context_vtbl = wbem_context_DeleteAll, }; -HRESULT WbemContext_create( void **obj ) +HRESULT WbemContext_create( void **obj, REFIID riid ) { struct wbem_context *context; TRACE("(%p)\n", obj); + if ( !IsEqualGUID( riid, &IID_IWbemContext ) && + !IsEqualGUID( riid, &IID_IUnknown ) ) + return E_NOINTERFACE; + if (!(context = malloc( sizeof(*context) ))) return E_OUTOFMEMORY; context->IWbemContext_iface.lpVtbl = &wbem_context_vtbl; diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 32408cf6a90..6e5bddea156 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -202,12 +202,16 @@ static const IWbemLocatorVtbl wbem_locator_vtbl = wbem_locator_ConnectServer }; -HRESULT WbemLocator_create( LPVOID *ppObj ) +HRESULT WbemLocator_create( LPVOID *ppObj, REFIID riid ) { wbem_locator *wl; TRACE("(%p)\n", ppObj); + if ( !IsEqualGUID( riid, &IID_IWbemLocator ) && + !IsEqualGUID( riid, &IID_IUnknown ) ) + return E_NOINTERFACE; + if (!(wl = malloc( sizeof(*wl) ))) return E_OUTOFMEMORY; wl->IWbemLocator_iface.lpVtbl = &wbem_locator_vtbl; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 328840e9dfe..4f23a8b8451 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -246,9 +246,9 @@ void set_variant( VARTYPE, LONGLONG, void *, VARIANT * ) DECLSPEC_HIDDEN; HRESULT create_signature( enum wbm_namespace ns, const WCHAR *, const WCHAR *, enum param_direction, IWbemClassObject ** ) DECLSPEC_HIDDEN; -HRESULT WbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemLocator_create(LPVOID *, REFIID) DECLSPEC_HIDDEN; HRESULT WbemServices_create(const WCHAR *, IWbemContext *, LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemContext_create(void **) DECLSPEC_HIDDEN; +HRESULT WbemContext_create(void **, REFIID) DECLSPEC_HIDDEN; HRESULT create_class_object(enum wbm_namespace ns, const WCHAR *, IEnumWbemClassObject *, UINT, struct record *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT EnumWbemClassObject_create(struct query *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Alex Henrie : wldap32: Add ldap_set_dbg_flags stub.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: b9dfdaf051ff4c8543fed7aa6b4a7ef819e17bd8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9dfdaf051ff4c8543fed7aa6b4a7e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Mar 11 15:17:18 2023 -0700 wldap32: Add ldap_set_dbg_flags stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54663 (cherry picked from commit 6ed4a2e40e6d40d0569bbd9c57e17dca5ed12007) --- dlls/wldap32/misc.c | 9 +++++++++ dlls/wldap32/wldap32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wldap32/misc.c b/dlls/wldap32/misc.c index edf1f196353..5d49c412805 100644 --- a/dlls/wldap32/misc.c +++ b/dlls/wldap32/misc.c @@ -422,6 +422,15 @@ ULONG CDECL WLDAP32_ldap_result( LDAP *ld, ULONG msgid, ULONG all, struct l_time return ret; } +/*********************************************************************** + * ldap_set_dbg_flags (WLDAP32.@) + */ +ULONG CDECL ldap_set_dbg_flags( ULONG flags ) +{ + FIXME( "(0x%lx) stub\n", flags ); + return 0; +} + /*********************************************************************** * LdapUnicodeToUTF8 (WLDAP32.@) */ diff --git a/dlls/wldap32/wldap32.spec b/dlls/wldap32/wldap32.spec index 33e630dea87..7a23a1b0f22 100644 --- a/dlls/wldap32/wldap32.spec +++ b/dlls/wldap32/wldap32.spec @@ -185,7 +185,7 @@ 195 cdecl ldap_search_ext_s(ptr str long str ptr long ptr ptr ptr long ptr) ldap_search_ext_sA 196 cdecl ldap_search_ext_sA(ptr str long str ptr long ptr ptr ptr long ptr) 197 cdecl ldap_escape_filter_element(str long ptr long) ldap_escape_filter_elementA -198 stub ldap_set_dbg_flags +198 cdecl ldap_set_dbg_flags(long) 199 stub ldap_set_dbg_routine 200 cdecl ldap_memfree(ptr) ldap_memfreeA 201 cdecl ldap_startup(ptr ptr)

1 0

Alex Henrie : wldap32: Handle null LDAPMessage in ldap_count_entries.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: c807811038de7cafd1ec646742f873924fc399b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/c807811038de7cafd1ec646742f873… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Mar 15 22:30:50 2023 -0600 wldap32: Handle null LDAPMessage in ldap_count_entries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54690 (cherry picked from commit 65323a6b967b8e214aec8d97a88c7f1dbf17cbca) --- dlls/wldap32/misc.c | 1 + dlls/wldap32/tests/parse.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wldap32/misc.c b/dlls/wldap32/misc.c index 5d49c412805..bf9afcf64b7 100644 --- a/dlls/wldap32/misc.c +++ b/dlls/wldap32/misc.c @@ -98,6 +98,7 @@ ULONG CDECL WLDAP32_ldap_count_entries( LDAP *ld, WLDAP32_LDAPMessage *res ) { TRACE( "(%p, %p)\n", ld, res ); + if (!res) return 0; if (!ld) return ~0u; return ldap_count_entries( CTX(ld), MSG(res) ); } diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 8394d5eeeff..161a0672cdc 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -252,7 +252,13 @@ static void test_ldap_paged_search(void) ok( res != NULL, "expected res != NULL\n" ); ok( count == 0, "got %lu\n", count ); - count = ldap_count_entries( ld, res); + count = ldap_count_entries( NULL, NULL ); + ok( count == 0, "got %lu\n", count ); + count = ldap_count_entries( ld, NULL ); + ok( count == 0, "got %lu\n", count ); + count = ldap_count_entries( NULL, res ); + todo_wine ok( count == 1, "got %lu\n", count ); + count = ldap_count_entries( ld, res ); ok( count == 1, "got %lu\n", count ); entry = ldap_first_entry( ld, res);

1 0

Jinoh Kang : riched20: Implement ITextDocument::Freeze and ITextDocument::Unfreeze.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 1f5a64a59db353c6f7320c1f58497bcabe508a7a URL: https://gitlab.winehq.org/wine/wine/-/commit/1f5a64a59db353c6f7320c1f58497b… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Mar 4 23:12:16 2023 +0900 riched20: Implement ITextDocument::Freeze and ITextDocument::Unfreeze. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54617 (cherry picked from commit 3fe15349d39ccf31026a92eae30f83f65c91cb1f) --- dlls/riched20/editor.c | 1 + dlls/riched20/editstr.h | 1 + dlls/riched20/paint.c | 6 ++++-- dlls/riched20/richole.c | 15 +++++++++++---- dlls/riched20/tests/richole.c | 16 ---------------- dlls/riched20/tests/txtsrv.c | 5 ----- dlls/riched20/txthost.c | 6 +++++- dlls/riched20/txtsrv.c | 2 ++ 8 files changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7b4f4b3cdf3..2c7176f09c1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2986,6 +2986,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->mode |= (ed->props & TXTBIT_RICHTEXT) ? TM_RICHTEXT : TM_PLAINTEXT; ed->AutoURLDetect_bEnable = FALSE; ed->bHaveFocus = FALSE; + ed->freeze_count = 0; ed->bMouseCaptured = FALSE; ed->caret_hidden = FALSE; ed->caret_height = 0; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index db219d7e4df..cc577de14db 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -429,6 +429,7 @@ typedef struct tagME_TextEditor BOOL AutoURLDetect_bEnable; WCHAR password_char; BOOL bHaveFocus; + DWORD freeze_count; /*for IME */ int imeStartIndex; DWORD selofs; /* The size of the selection bar on the left side of control */ diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 245afff77dc..8bc1b8bcd2f 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -123,7 +123,8 @@ void ME_Repaint(ME_TextEditor *editor) ME_UpdateScrollBar(editor); FIXME("ME_Repaint had to call ME_WrapMarkedParagraphs\n"); } - ITextHost_TxViewChange(editor->texthost, TRUE); + if (!editor->freeze_count) + ITextHost_TxViewChange(editor->texthost, TRUE); } void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) @@ -140,7 +141,8 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) update_caret( editor ); - ITextHost_TxViewChange(editor->texthost, update_now); + if (!editor->freeze_count) + ITextHost_TxViewChange(editor->texthost, update_now); ME_SendSelChange(editor); diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 8190a4e2753..90496742e36 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -4217,15 +4217,22 @@ static HRESULT WINAPI ITextDocument2Old_fnSave(ITextDocument2Old *iface, VARIANT static HRESULT WINAPI ITextDocument2Old_fnFreeze(ITextDocument2Old *iface, LONG *pCount) { struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n", services); - return E_NOTIMPL; + + if (services->editor->freeze_count < LONG_MAX) services->editor->freeze_count++; + + if (pCount) *pCount = services->editor->freeze_count; + return services->editor->freeze_count != 0 ? S_OK : S_FALSE; } static HRESULT WINAPI ITextDocument2Old_fnUnfreeze(ITextDocument2Old *iface, LONG *pCount) { struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n", services); - return E_NOTIMPL; + + if (services->editor->freeze_count && !--services->editor->freeze_count) + ME_RewrapRepaint(services->editor); + + if (pCount) *pCount = services->editor->freeze_count; + return services->editor->freeze_count == 0 ? S_OK : S_FALSE; } static HRESULT WINAPI ITextDocument2Old_fnBeginEditCollection(ITextDocument2Old *iface) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 529291b5fd1..16c6481691f 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -5466,9 +5466,7 @@ static void test_freeze(void) count = 0xdeadbeef; hr = ITextDocument_Freeze(doc, &count); - todo_wine ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); - todo_wine ok(count == 1, "expected count to be %d, got %ld\n", 1, count); style2 = GetWindowLongW(hwnd, GWL_STYLE); @@ -5476,54 +5474,40 @@ static void test_freeze(void) count = 0xdeadbeef; hr = ITextDocument_Freeze(doc, &count); - todo_wine ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); - todo_wine ok(count == 2, "expected count to be %d, got %ld\n", 2, count); count = 0xdeadbeef; hr = ITextDocument_Unfreeze(doc, &count); - todo_wine ok(hr == S_FALSE, "ITextDocument_Unfreeze returned %#lx\n", hr); - todo_wine ok(count == 1, "expected count to be %d, got %ld\n", 1, count); count = 0xdeadbeef; hr = ITextDocument_Unfreeze(doc, &count); - todo_wine ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); - todo_wine ok(count == 0, "expected count to be %d, got %ld\n", 0, count); count = 0xdeadbeef; hr = ITextDocument_Unfreeze(doc, &count); - todo_wine ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); - todo_wine ok(count == 0, "expected count to be %d, got %ld\n", 0, count); count = 0xdeadbeef; hr = ITextDocument_Freeze(doc, &count); - todo_wine ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); - todo_wine ok(count == 1, "expected count to be %d, got %ld\n", 1, count); count = 0xdeadbeef; hr = ITextDocument_Unfreeze(doc, &count); - todo_wine ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); - todo_wine ok(count == 0, "expected count to be %d, got %ld\n", 0, count); count = 0xdeadbeef; hr = ITextDocument_Freeze(doc, NULL); - todo_wine ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); count = 0xdeadbeef; hr = ITextDocument_Unfreeze(doc, NULL); - todo_wine ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); release_interfaces(&hwnd, &reole, &doc, &selection); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 2777f4eea21..da8e9da5ea6 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -863,9 +863,7 @@ static void test_TxDraw(void) freeze_count = 0xdeadbeef; hr = ITextDocument_Freeze( txtdoc, &freeze_count ); - todo_wine ok( hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr ); - todo_wine ok( freeze_count == 1, "expected count to be %d, got %ld\n", 1, freeze_count ); hr = ITextServices_TxDraw( txtserv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, (RECTL *)&client, NULL, @@ -873,14 +871,11 @@ static void test_TxDraw(void) ok( hr == S_OK, "got %08lx\n", hr ); hr = ITextServices_TxDraw( txtserv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, (RECTL *)&client, NULL, NULL, NULL, 0, TXTVIEW_ACTIVE ); - todo_wine ok( hr == E_UNEXPECTED, "got %08lx\n", hr ); freeze_count = 0xdeadbeef; hr = ITextDocument_Unfreeze( txtdoc, &freeze_count ); - todo_wine ok( hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr ); - todo_wine ok( freeze_count == 0, "expected count to be %d, got %ld\n", 0, freeze_count ); hr = ITextServices_OnTxInPlaceDeactivate( txtserv ); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index ec6f8e52fa5..412733edaeb 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1313,18 +1313,22 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, RECT rc, client, update; PAINTSTRUCT ps; HBRUSH brush, old_brush; + LONG view_id; ITextHost_TxGetClientRect( &host->ITextHost_iface, &client ); if (msg == WM_PAINT) { + /* TODO retrieve if the text document is frozen */ hdc = BeginPaint( hwnd, &ps ); update = ps.rcPaint; + view_id = TXTVIEW_ACTIVE; } else { hdc = (HDC)wparam; update = client; + view_id = TXTVIEW_INACTIVE; } brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); @@ -1361,7 +1365,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, } ITextServices_TxDraw( host->text_srv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, NULL, NULL, - &update, NULL, 0, TXTVIEW_ACTIVE ); + &update, NULL, 0, view_id ); SelectObject( hdc, old_brush ); DeleteObject( brush ); if (msg == WM_PAINT) EndPaint( hwnd, &ps ); diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 809bb5ac3ae..55e0c7e64bb 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -168,6 +168,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD if (aspect != DVASPECT_CONTENT || aspect_info || td || target || mf_bounds || continue_fn ) FIXME( "Many arguments are ignored\n" ); + if (view_id == TXTVIEW_ACTIVE && services->editor->freeze_count) return E_UNEXPECTED; + hr = update_client_rect( services, (RECT *)bounds ); if (FAILED( hr )) return hr; if (hr == S_OK) rewrap = TRUE;

1 0

Piotr Caban : gdiplus: Use transparency instead of background color if transparent color flag is set in GIF GCE.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 207bae2ca5a168b849ec613815c02c37afeaff47 URL: https://gitlab.winehq.org/wine/wine/-/commit/207bae2ca5a168b849ec613815c02c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 3 15:56:29 2023 +0100 gdiplus: Use transparency instead of background color if transparent color flag is set in GIF GCE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54563 (cherry picked from commit 333a63c456fec24f249a7096b1d858252c9a6bf4) --- dlls/gdiplus/image.c | 16 +++--------- dlls/gdiplus/tests/image.c | 65 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 101e7ae1c93..3b9ce3c14f1 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3881,20 +3881,10 @@ static DWORD get_gif_background_color(GpBitmap *bitmap) UINT i; for(i=0; i<bitmap->prop_count; i++) { - if(bitmap->prop_item[i].id == PropertyTagIndexBackground) { + if(bitmap->prop_item[i].id == PropertyTagIndexBackground) bgcolor_idx = *(BYTE*)bitmap->prop_item[i].value; - break; - } - } - - for(i=0; i<bitmap->prop_count; i++) { - if(bitmap->prop_item[i].id == PropertyTagIndexTransparent) { - BYTE transparent_idx; - transparent_idx = *(BYTE*)bitmap->prop_item[i].value; - - if(transparent_idx == bgcolor_idx) - return 0; - } + else if(bitmap->prop_item[i].id == PropertyTagIndexTransparent) + return 0; } for(i=0; i<bitmap->prop_count; i++) { diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 9e35cf33eb4..e32b4c81240 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2899,10 +2899,11 @@ static const unsigned char gifanimation[72] = { * -dispose previous -page +4+0 -size 2x2 xc:green \ * -dispose undefined -page +6+0 -size 2x2 xc:gray \ * test.gif + * Background color index changed to 1. */ static const unsigned char gifanimation2[] = { 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x08, 0x00, - 0x02, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0xf9, 0x04, 0x01, 0x64, 0x00, 0x00, 0x00, 0x21, 0xff, 0x0b, 0x4e, 0x45, 0x54, 0x53, 0x43, 0x41, 0x50, 0x45, 0x32, 0x2e, @@ -2937,6 +2938,43 @@ static ARGB gifanimation2_pixels[5][4] = { {0xffff0000, 0, 0, 0xff7e7e7e} }; +static const unsigned char gifanimation3[] = { + 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x08, 0x00, + 0x02, 0x00, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x21, 0xf9, 0x04, 0x00, 0x64, + 0x00, 0x00, 0x00, 0x21, 0xff, 0x0b, 0x4e, 0x45, + 0x54, 0x53, 0x43, 0x41, 0x50, 0x45, 0x32, 0x2e, + 0x30, 0x03, 0x01, 0x00, 0x00, 0x00, 0x2c, 0x00, + 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, + 0x02, 0x04, 0x84, 0x8f, 0x09, 0x05, 0x00, 0x21, + 0xf9, 0x04, 0x05, 0x64, 0x00, 0x10, 0x00, 0x2c, + 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, + 0x81, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, + 0x00, 0x00, 0xff, 0x00, 0x00, 0x02, 0x03, 0x44, + 0x34, 0x05, 0x00, 0x21, 0xf9, 0x04, 0x09, 0x64, + 0x00, 0x10, 0x00, 0x2c, 0x02, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, 0x81, 0x00, 0x00, 0xff, + 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, + 0xff, 0x02, 0x03, 0x44, 0x34, 0x05, 0x00, 0x21, + 0xf9, 0x04, 0x0d, 0x64, 0x00, 0x10, 0x00, 0x2c, + 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, + 0x81, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x80, 0x00, 0x02, 0x03, 0x44, + 0x34, 0x05, 0x00, 0x21, 0xf9, 0x04, 0x01, 0x64, + 0x00, 0x10, 0x00, 0x2c, 0x06, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, 0x80, 0x7e, 0x7e, 0x7e, + 0x00, 0x00, 0x00, 0x02, 0x02, 0x84, 0x51, 0x00, + 0x3b +}; + +static ARGB gifanimation3_pixels[5][4] = { + {0xff000000, 0xff000000, 0xff000000, 0xff000000}, + {0xffff0000, 0xff000000, 0xff000000, 0xff000000}, + {0xffff0000, 0xff0000ff, 0xff000000, 0xff000000}, + {0xffff0000, 0xff000000, 0xff008000, 0xff000000}, + {0xffff0000, 0xff000000, 0xff000000, 0xff7e7e7e} +}; + static void test_multiframegif(void) { LPSTREAM stream; @@ -3185,6 +3223,31 @@ static void test_multiframegif(void) } GdipDisposeImage((GpImage*)bmp); + + hglob = GlobalAlloc (0, sizeof(gifanimation3)); + data = GlobalLock (hglob); + memcpy(data, gifanimation3, sizeof(gifanimation3)); + GlobalUnlock(hglob); + + hres = CreateStreamOnHGlobal(hglob, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream\n"); + + stat = GdipCreateBitmapFromStream(stream, &bmp); + ok(stat == Ok, "Failed to create a Bitmap\n"); + IStream_Release(stream); + + for(i=0; i<6; i++) { + stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, i%5); + expect(Ok, stat); + + for(j=0; j<4; j++) { + stat = GdipBitmapGetPixel(bmp, j*2, 0, &color); + expect(Ok, stat); + ok(gifanimation3_pixels[i%5][j] == color, "at %d,%d got %lx, expected %lx\n", i, j, color, gifanimation3_pixels[i%5][j]); + } + } + + GdipDisposeImage((GpImage*)bmp); } static void test_rotateflip(void)

1 0

Jinoh Kang : riched20/tests: Test for ITextDocument::Freeze and ITextDocument::Unfreeze.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 7b360c9c08da82571f8c2149d59bb02d15880253 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b360c9c08da82571f8c2149d59bb0… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Mar 4 21:58:40 2023 +0900 riched20/tests: Test for ITextDocument::Freeze and ITextDocument::Unfreeze. (cherry picked from commit 3105fad82b9bae390fcd710a2fc10a18988b4622) --- dlls/riched20/tests/richole.c | 86 +++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/tests/txtsrv.c | 28 ++++++++++++++ 2 files changed, 114 insertions(+) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index d648354729e..529291b5fd1 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -31,6 +31,8 @@ #include <richedit.h> #include <richole.h> #include <tom.h> +#include <imm.h> +#include <textserv.h> #include <wine/test.h> #define EXPECT_TODO_WINE 0x80000000UL @@ -605,6 +607,7 @@ static HRESULT testoleobj_Create( struct testoleobj **objptr ) static HMODULE hmoduleRichEdit; DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); +DEFINE_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5); static const WCHAR sysW[] = {'S','y','s','t','e','m',0}; @@ -5444,6 +5447,88 @@ static void test_undo_control(void) release_interfaces(&inst.hwnd, &reole, &inst.doc, &selection); } +static void test_freeze(void) +{ + ITextSelection *selection = NULL; + DWORD lasterr, style1, style2; + IRichEditOle *reole = NULL; + ITextDocument *doc = NULL; + HRESULT hr; + LONG count; + HWND hwnd; + + create_interfaces(&hwnd, &reole, &doc, &selection); + + SetLastError(0xdeadbeef); + style1 = GetWindowLongW(hwnd, GWL_STYLE); + lasterr = GetLastError(); + ok(lasterr == 0xdeadbeefUL, "GetLastError() returned %#lx\n", lasterr); + + count = 0xdeadbeef; + hr = ITextDocument_Freeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); + todo_wine + ok(count == 1, "expected count to be %d, got %ld\n", 1, count); + + style2 = GetWindowLongW(hwnd, GWL_STYLE); + ok(style2 == style1, "expected window style to not change from %#lx, got %#lx\n", style1, style2); + + count = 0xdeadbeef; + hr = ITextDocument_Freeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); + todo_wine + ok(count == 2, "expected count to be %d, got %ld\n", 2, count); + + count = 0xdeadbeef; + hr = ITextDocument_Unfreeze(doc, &count); + todo_wine + ok(hr == S_FALSE, "ITextDocument_Unfreeze returned %#lx\n", hr); + todo_wine + ok(count == 1, "expected count to be %d, got %ld\n", 1, count); + + count = 0xdeadbeef; + hr = ITextDocument_Unfreeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); + todo_wine + ok(count == 0, "expected count to be %d, got %ld\n", 0, count); + + count = 0xdeadbeef; + hr = ITextDocument_Unfreeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); + todo_wine + ok(count == 0, "expected count to be %d, got %ld\n", 0, count); + + count = 0xdeadbeef; + hr = ITextDocument_Freeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); + todo_wine + ok(count == 1, "expected count to be %d, got %ld\n", 1, count); + + count = 0xdeadbeef; + hr = ITextDocument_Unfreeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); + todo_wine + ok(count == 0, "expected count to be %d, got %ld\n", 0, count); + + count = 0xdeadbeef; + hr = ITextDocument_Freeze(doc, NULL); + todo_wine + ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); + + count = 0xdeadbeef; + hr = ITextDocument_Unfreeze(doc, NULL); + todo_wine + ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); + + release_interfaces(&hwnd, &reole, &doc, &selection); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -5487,4 +5572,5 @@ START_TEST(richole) test_clipboard(); test_undo(); test_undo_control(); + test_freeze(); } diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 16904347919..2777f4eea21 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -815,15 +815,20 @@ static void test_TxGetNaturalSize(void) static void test_TxDraw(void) { ITextServices *txtserv; + ITextDocument *txtdoc; ITextHost *host; HRESULT hr; RECT client = {0, 0, 100, 100}; ITextHostTestImpl *host_impl; + LONG freeze_count; HDC hdc; if (!init_texthost(&txtserv, &host)) return; + hr = ITextServices_QueryInterface( txtserv, &IID_ITextDocument, (void **)&txtdoc ); + ok( hr == S_OK, "ITextServices_QueryInterface (ITextDocument) returned %#lx\n", hr ); + host_impl = impl_from_ITextHost( host ); host_impl->window = CreateWindowExA( 0, "static", NULL, WS_POPUP | WS_VISIBLE, 0, 0, 400, 400, 0, 0, 0, NULL ); @@ -856,9 +861,32 @@ static void test_TxDraw(void) NULL, NULL, 0, TXTVIEW_INACTIVE ); ok( hr == S_OK, "got %08lx\n", hr ); + freeze_count = 0xdeadbeef; + hr = ITextDocument_Freeze( txtdoc, &freeze_count ); + todo_wine + ok( hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr ); + todo_wine + ok( freeze_count == 1, "expected count to be %d, got %ld\n", 1, freeze_count ); + + hr = ITextServices_TxDraw( txtserv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, (RECTL *)&client, NULL, + NULL, NULL, 0, TXTVIEW_INACTIVE ); + ok( hr == S_OK, "got %08lx\n", hr ); + hr = ITextServices_TxDraw( txtserv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, (RECTL *)&client, NULL, + NULL, NULL, 0, TXTVIEW_ACTIVE ); + todo_wine + ok( hr == E_UNEXPECTED, "got %08lx\n", hr ); + + freeze_count = 0xdeadbeef; + hr = ITextDocument_Unfreeze( txtdoc, &freeze_count ); + todo_wine + ok( hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr ); + todo_wine + ok( freeze_count == 0, "expected count to be %d, got %ld\n", 0, freeze_count ); + hr = ITextServices_OnTxInPlaceDeactivate( txtserv ); ReleaseDC( host_impl->window, hdc ); + ITextDocument_Release(txtdoc); ITextServices_Release(txtserv); DestroyWindow( host_impl->window ); ITextHost_Release(host);

1 0