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

Nikolay Sivov : wbemprox: Handle __ProviderArchitecture in EnumValues().
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 045c4a5edbef85863db31d78cd62f1403a9f9633 URL: https://source.winehq.org/git/wine.git/?a=commit;h=045c4a5edbef85863db31d78… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:56 2021 +0300 wbemprox: Handle __ProviderArchitecture in EnumValues(). 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 1a963b0754b..59f94abfc4a 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -270,7 +270,8 @@ done: return hr; } -static HRESULT enum_values( HKEY root, const WCHAR *subkey, VARIANT *names, VARIANT *types, VARIANT *retval ) +static HRESULT enum_values( HKEY root, const WCHAR *subkey, VARIANT *names, VARIANT *types, IWbemContext *context, + VARIANT *retval ) { HKEY hkey = NULL; HRESULT hr = S_OK; @@ -281,7 +282,7 @@ static HRESULT enum_values( HKEY root, const WCHAR *subkey, VARIANT *names, VARI TRACE("%p, %s\n", root, debugstr_w(subkey)); - if ((res = RegOpenKeyExW( root, subkey, 0, KEY_QUERY_VALUE, &hkey ))) goto done; + if ((res = RegOpenKeyExW( root, subkey, 0, KEY_QUERY_VALUE | reg_get_access_mask( context ), &hkey ))) goto done; if ((res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, NULL, NULL, NULL, &count, &buflen, NULL, NULL, NULL ))) goto done; @@ -356,7 +357,7 @@ HRESULT reg_enum_values( IWbemClassObject *obj, IWbemContext *context, IWbemClas } VariantInit( &names ); VariantInit( &types ); - hr = enum_values( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), &names, &types, &retval ); + hr = enum_values( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), &names, &types, context, &retval ); if (hr != S_OK) goto done; if (out_params) {

1 0

Nikolay Sivov : wbemprox: Handle __ProviderArchitecture in SetStringValue().
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: bc063aaaa272d342971a1237220e07c2ba4f6f1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc063aaaa272d342971a1237… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:57 2021 +0300 wbemprox: Handle __ProviderArchitecture in SetStringValue(). 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 59f94abfc4a..63870bfc52c 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -476,14 +476,23 @@ done: return hr; } -static void set_stringvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, const WCHAR *value, VARIANT *retval ) +static void set_stringvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, const WCHAR *value, + IWbemContext *context, VARIANT *retval ) { + HKEY hkey; LONG res; TRACE("%p, %s, %s, %s\n", root, debugstr_w(subkey), debugstr_w(name), debugstr_w(value)); - res = RegSetKeyValueW( root, subkey, name, REG_SZ, value, (lstrlenW( value ) + 1) * 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_SZ, value, (lstrlenW( value ) + 1) * sizeof(*value) ); set_variant( VT_UI4, res, NULL, retval ); + RegCloseKey( hkey ); } HRESULT reg_set_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) @@ -524,7 +533,7 @@ HRESULT reg_set_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbem } } - set_stringvalue( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), V_BSTR(&name), V_BSTR(&value), &retval ); + set_stringvalue( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), V_BSTR(&name), V_BSTR(&value), context, &retval ); if (out_params) hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 );

1 0

Nikolay Sivov : wbemprox: Handle __ProviderArchitecture in SetDWORDValue().
by Alexandre Julliard 03 Mar '21

03 Mar '21

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

Paul Gofman : ntdll: Print an ERR for assertion exceptions only.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 66a819ef0c7da6e60fafc794510ffb7e22fbb849 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66a819ef0c7da6e60fafc794… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 3 12:50:35 2021 +0300 ntdll: Print an ERR for assertion exceptions only. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 4 ++-- dlls/ntdll/signal_arm64.c | 4 ++-- dlls/ntdll/signal_i386.c | 4 ++-- dlls/ntdll/signal_x86_64.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 7c1fceb2bf0..8b0004e0df0 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -174,8 +174,8 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } else { - if (rec->ExceptionFlags & EH_NONCONTINUABLE) - ERR( "Fatal %s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + if (rec->ExceptionCode == STATUS_ASSERTION_FAILURE) + ERR( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); else WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 25bb407658f..dc6b072fa6c 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -515,8 +515,8 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } else { - if (rec->ExceptionFlags & EH_NONCONTINUABLE) - ERR( "Fatal %s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + if (rec->ExceptionCode == STATUS_ASSERTION_FAILURE) + ERR( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); else WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 89ef938658c..635b8f4de81 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -206,8 +206,8 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) } else { - if (rec->ExceptionFlags & EH_NONCONTINUABLE) - ERR( "Fatal %s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + if (rec->ExceptionCode == STATUS_ASSERTION_FAILURE) + ERR( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); else WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7e3387ba09e..b5be4f35758 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -552,8 +552,8 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) } else { - if (rec->ExceptionFlags & EH_NONCONTINUABLE) - ERR( "Fatal %s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); + if (rec->ExceptionCode == STATUS_ASSERTION_FAILURE) + ERR( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); else WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode );

1 0

Dmitry Timoshkov : kernel32/tests: Add a test for calling QueueUserAPC() on a terminated thread.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 816b588e0438f94a3769612739abc9d8d9980537 URL: https://source.winehq.org/git/wine.git/?a=commit;h=816b588e0438f94a37696127… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 3 12:27:44 2021 +0300 kernel32/tests: Add a test for calling QueueUserAPC() on a terminated thread. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 2a47abf342c..7d6ac030299 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -21,6 +21,9 @@ #include <stdarg.h> #include <stdlib.h> #include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <winternl.h> @@ -60,6 +63,7 @@ static PSLIST_ENTRY (__fastcall *pRtlInterlockedPushListSList)(PSLIST_HEADER lis PSLIST_ENTRY last, ULONG count); static PSLIST_ENTRY (WINAPI *pRtlInterlockedPushListSListEx)(PSLIST_HEADER list, PSLIST_ENTRY first, PSLIST_ENTRY last, ULONG count); +static NTSTATUS (WINAPI *pNtQueueApcThread)(HANDLE,PNTAPCFUNC,ULONG_PTR,ULONG_PTR,ULONG_PTR); #ifdef __i386__ @@ -2702,6 +2706,49 @@ static void test_crit_section(void) ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); } +static DWORD WINAPI thread_proc(LPVOID unused) +{ + Sleep(INFINITE); + return 0; +} + +static void CALLBACK user_apc(ULONG_PTR unused) +{ +} + +static void CALLBACK call_user_apc(ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3) +{ + PAPCFUNC func = (PAPCFUNC)arg1; + func(arg2); +} + +static void test_QueueUserAPC(void) +{ + HANDLE thread; + DWORD tid, ret; + + thread = CreateThread(NULL, 0, thread_proc, NULL, CREATE_SUSPENDED, &tid); + ok(thread != NULL, "CreateThread error %u\n", GetLastError()); + + ret = TerminateThread(thread, 0xdeadbeef); + ok(ret, "TerminateThread error %u\n", GetLastError()); + + ret = WaitForSingleObject(thread, 1000); + 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); +} + START_TEST(sync) { char **argv; @@ -2732,6 +2779,7 @@ START_TEST(sync) pNtWaitForMultipleObjects = (void *)GetProcAddress(hntdll, "NtWaitForMultipleObjects"); pRtlInterlockedPushListSList = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSList"); pRtlInterlockedPushListSListEx = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSListEx"); + pNtQueueApcThread = (void *)GetProcAddress(hntdll, "NtQueueApcThread"); argc = winetest_get_mainargs( &argv ); if (argc >= 3) @@ -2744,6 +2792,8 @@ START_TEST(sync) } init_fastcall_thunk(); + + test_QueueUserAPC(); test_signalandwait(); test_mutex(); test_slist();

1 0

Dmitry Timoshkov : server: Set error to STATUS_UNSUCCESSFUL when the server fails to queue APC for a thread.
by Alexandre Julliard 03 Mar '21

03 Mar '21

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

Huw Davies : riched20: Move the window procs to txthost.c .
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 732aec2af24ef73443128fdc3a73f2886b09d487 URL: https://source.winehq.org/git/wine.git/?a=commit;h=732aec2af24ef73443128fdc… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 3 11:29:37 2021 +0000 riched20: Move the window procs to txthost.c . Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 477 +----------------------------------------------- dlls/riched20/editor.h | 2 +- dlls/riched20/txthost.c | 372 ++++++++++++++++++++++++++++++++++++- 3 files changed, 378 insertions(+), 473 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=732aec2af24ef7344312…

1 0

Huw Davies : riched20: Remove the host structure's typedef.
by Alexandre Julliard 03 Mar '21

03 Mar '21

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: Remove the text services structure's typedef.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 83254bb31817886009155d8fa0f5c145a6884091 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83254bb31817886009155d8f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 3 11:29:39 2021 +0000 riched20: Remove the text services structure's typedef. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txtsrv.c | 350 ++++++++++++++++++++++++------------------------- 1 file changed, 169 insertions(+), 181 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=83254bb3181788600915…

1 0

Huw Davies : riched20: Don't take a ref on the text host.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 68523af9b0970ca5b1829186ff081aba2a8c997a URL: https://source.winehq.org/git/wine.git/?a=commit;h=68523af9b0970ca5b1829186… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 3 11:29:40 2021 +0000 riched20: Don't take a ref on the text host. This would result in the host and services objects holding refs on each other. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 1 - dlls/riched20/tests/txtsrv.c | 1 + dlls/riched20/txtsrv.c | 5 ++--- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 487d4137391..516cd104d31 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3221,7 +3221,6 @@ void ME_DestroyEditor(ME_TextEditor *editor) DeleteObject(editor->hbrBackground); if(editor->lpOleCallback) IRichEditOleCallback_Release(editor->lpOleCallback); - ITextHost_Release(editor->texthost); if (editor->reOle) { IUnknown_Release(editor->reOle); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 1528bef5238..f41375d871a 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -602,6 +602,7 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) ITextServices object. */ result = pCreateTextServices(NULL, &dummyTextHost->ITextHost_iface, &init); ok(result == S_OK, "Did not return S_OK when created (result = %x)\n", result); + ok(dummyTextHost->refCount == 1, "host ref %d\n", dummyTextHost->refCount); if (result != S_OK) { CoTaskMemFree(dummyTextHost); win_skip("CreateTextServices failed.\n"); diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 6f8e3cd3fa3..fc8d6765424 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -38,7 +38,7 @@ struct text_services ITextServices ITextServices_iface; IUnknown *outer_unk; LONG ref; - ITextHost *pMyHost; + ITextHost *host; CRITICAL_SECTION csTxtSrv; ME_TextEditor *editor; char spare[256]; @@ -385,8 +385,7 @@ HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, I InitializeCriticalSection(&ITextImpl->csTxtSrv); ITextImpl->csTxtSrv.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ITextServicesImpl.csTxtSrv"); ITextImpl->ref = 1; - ITextHost_AddRef(pITextHost); - ITextImpl->pMyHost = pITextHost; + 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);

1 0