Huw Davies : riched20: Remove an unused critsec.
Alexandre Julliard
julliard at winehq.org
Tue Mar 9 14:55:18 CST 2021
Module: wine
Branch: master
Commit: 115c3ab2a254088d14d928404f5d166dd260c5cb
URL: https://source.winehq.org/git/wine.git/?a=commit;h=115c3ab2a254088d14d928404f5d166dd260c5cb
Author: Huw Davies <huw at codeweavers.com>
Date: Mon Mar 8 13:45:48 2021 +0000
riched20: Remove an unused critsec.
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/riched20/txtsrv.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c
index 3d0eec6f769..49d1c706076 100644
--- a/dlls/riched20/txtsrv.c
+++ b/dlls/riched20/txtsrv.c
@@ -34,14 +34,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit);
struct text_services
{
- IUnknown IUnknown_inner;
- ITextServices ITextServices_iface;
- IUnknown *outer_unk;
- LONG ref;
- ITextHost *host;
- CRITICAL_SECTION csTxtSrv;
- ME_TextEditor *editor;
- char spare[256];
+ IUnknown IUnknown_inner;
+ ITextServices ITextServices_iface;
+ IUnknown *outer_unk;
+ LONG ref;
+ ITextHost *host;
+ ME_TextEditor *editor;
+ char spare[256]; /* for bug #12179 */
};
static inline struct text_services *impl_from_IUnknown( IUnknown *iface )
@@ -95,8 +94,6 @@ static ULONG WINAPI ITextServicesImpl_Release(IUnknown *iface)
if (!ref)
{
ME_DestroyEditor( services->editor );
- services->csTxtSrv.DebugInfo->Spare[0] = 0;
- DeleteCriticalSection( &services->csTxtSrv );
CoTaskMemFree( services );
}
return ref;
@@ -378,8 +375,6 @@ HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **
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;
More information about the wine-cvs
mailing list