Author: akhaldi
Date: Thu Aug 18 10:19:15 2016
New Revision: 72290
URL: http://svn.reactos.org/svn/reactos?rev=72290&view=rev
Log:
[MSCTF] Sync with Wine Staging 1.9.16. CORE-11866
Modified:
trunk/reactos/dll/win32/msctf/context.c
trunk/reactos/dll/win32/msctf/inputprocessor.c
trunk/reactos/dll/win32/msctf/msctf.c
trunk/reactos/dll/win32/msctf/threadmgr.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/msctf/context.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/context.c?rev=72290&r1=72289&r2=72290&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msctf/context.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/context.c [iso-8859-1] Thu Aug 18
10:19:15 2016
@@ -98,10 +98,7 @@
TRACE("destroying %p\n", This);
if (This->pITextStoreACP)
- {
- ITextStoreACP_UnadviseSink(This->pITextStoreACP,
(IUnknown*)&This->ITextStoreACPSink_iface);
ITextStoreACP_Release(This->pITextStoreACP);
- }
if (This->pITfContextOwnerCompositionSink)
ITfContextOwnerCompositionSink_Release(This->pITfContextOwnerCompositionSink);
Modified: trunk/reactos/dll/win32/msctf/inputprocessor.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/inputprocessor.c?rev=72290&r1=72289&r2=72290&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msctf/inputprocessor.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/inputprocessor.c [iso-8859-1] Thu Aug 18
10:19:15 2016
@@ -72,7 +72,7 @@
} EnumTfInputProcessorProfiles;
static HRESULT ProfilesEnumGuid_Constructor(IEnumGUID **ppOut);
-static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid,
IEnumTfLanguageProfiles **ppOut);
+static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid,
EnumTfLanguageProfiles **out);
static inline EnumTfInputProcessorProfiles
*impl_from_IEnumTfInputProcessorProfiles(IEnumTfInputProcessorProfiles *iface)
{
@@ -595,8 +595,17 @@
IEnumTfLanguageProfiles **ppEnum)
{
InputProcessorProfiles *This = impl_from_ITfInputProcessorProfiles(iface);
+ EnumTfLanguageProfiles *profenum;
+ HRESULT hr;
+
TRACE("(%p) %x %p\n",This,langid,ppEnum);
- return EnumTfLanguageProfiles_Constructor(langid, ppEnum);
+
+ if (!ppEnum)
+ return E_INVALIDARG;
+ hr = EnumTfLanguageProfiles_Constructor(langid, &profenum);
+ *ppEnum = &profenum->IEnumTfLanguageProfiles_iface;
+
+ return hr;
}
static HRESULT WINAPI InputProcessorProfiles_EnableLanguageProfile(
@@ -1267,16 +1276,16 @@
IEnumTfLanguageProfiles **ppenum)
{
EnumTfLanguageProfiles *This = impl_from_IEnumTfLanguageProfiles(iface);
+ EnumTfLanguageProfiles *new_This;
HRESULT res;
TRACE("(%p)\n",This);
if (ppenum == NULL) return E_POINTER;
- res = EnumTfLanguageProfiles_Constructor(This->langid, ppenum);
+ res = EnumTfLanguageProfiles_Constructor(This->langid, &new_This);
if (SUCCEEDED(res))
{
- EnumTfLanguageProfiles *new_This = (EnumTfLanguageProfiles *)*ppenum;
new_This->tip_index = This->tip_index;
lstrcpynW(new_This->szwCurrentClsid,This->szwCurrentClsid,39);
@@ -1289,6 +1298,7 @@
res = RegOpenKeyExW(new_This->tipkey, fullkey, 0, KEY_READ |
KEY_WRITE, &This->langkey);
new_This->lang_index = This->lang_index;
}
+ *ppenum = &new_This->IEnumTfLanguageProfiles_iface;
}
return res;
}
@@ -1304,7 +1314,7 @@
EnumTfLanguageProfiles_Skip
};
-static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid,
IEnumTfLanguageProfiles **ppOut)
+static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid,
EnumTfLanguageProfiles **out)
{
HRESULT hr;
EnumTfLanguageProfiles *This;
@@ -1331,7 +1341,7 @@
return E_FAIL;
}
- *ppOut = &This->IEnumTfLanguageProfiles_iface;
- TRACE("returning %p\n", *ppOut);
- return S_OK;
-}
+ *out = This;
+ TRACE("returning %p\n", *out);
+ return S_OK;
+}
Modified: trunk/reactos/dll/win32/msctf/msctf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.c?rev=72290&r1=72289&r2=72290&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] Thu Aug 18
10:19:15 2016
@@ -370,7 +370,7 @@
list_remove(&ats->entry);
HeapFree(GetProcessHeap(),0,ats->ats);
HeapFree(GetProcessHeap(),0,ats);
- /* we are guarenteeing there is only 1 */
+ /* we are guaranteeing there is only 1 */
break;
}
}
Modified: trunk/reactos/dll/win32/msctf/threadmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/threadmgr.c?rev=72290&r1=72289&r2=72290&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] Thu Aug 18
10:19:15 2016
@@ -1467,8 +1467,8 @@
This->head = head;
This->index = list_head(This->head);
- TRACE("returning %p\n", This);
- *ppOut = (IEnumTfDocumentMgrs*)This;
+ TRACE("returning %p\n", &This->IEnumTfDocumentMgrs_iface);
+ *ppOut = &This->IEnumTfDocumentMgrs_iface;
return S_OK;
}
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=72290&r1=72289&r2=72290&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 10:19:15 2016
@@ -108,7 +108,7 @@
reactos/dll/win32/mscat32 # Synced to WineStaging-1.9.11
reactos/dll/win32/mscms # Synced to WineStaging-1.9.11
reactos/dll/win32/mscoree # Synced to Wine-1.5.4
-reactos/dll/win32/msctf # Synced to WineStaging-1.9.11
+reactos/dll/win32/msctf # Synced to WineStaging-1.9.16
reactos/dll/win32/msftedit # Synced to WineStaging-1.9.11
reactos/dll/win32/msg711.acm # Synced to WineStaging-1.9.11
reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.9.11
