[akhaldi] 74108: [RICHED20] Sync with Wine Staging 2.2. CORE-12823 440b921 riched20: Return proper interface pointers. e63cea5 riched20: A spelling fix in a comment. 9f37f6a riched20: Check for NUL...

Author: akhaldi
Date: Sun Mar  5 21:43:39 2017
New Revision: 74108

URL: http://svn.reactos.org/svn/reactos?rev=74108&view=rev
Log:
[RICHED20] Sync with Wine Staging 2.2. CORE-12823

440b921 riched20: Return proper interface pointers.
e63cea5 riched20: A spelling fix in a comment.
9f37f6a riched20: Check for NULL in fnTextSrv_TxSetText and add test.

Modified:
    trunk/reactos/dll/win32/riched20/clipboard.c
    trunk/reactos/dll/win32/riched20/style.c
    trunk/reactos/dll/win32/riched20/txthost.c
    trunk/reactos/dll/win32/riched20/txtsrv.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/riched20/clipboard.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/clipboar...
==============================================================================
--- trunk/reactos/dll/win32/riched20/clipboard.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/clipboard.c	[iso-8859-1] Sun Mar  5 21:43:39 2017
@@ -64,7 +64,7 @@

if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumFORMATETC)) {
         IEnumFORMATETC_AddRef(iface);
-        *ppvObj = This;
+        *ppvObj = &This->IEnumFORMATETC_iface;
         return S_OK;
     }
     *ppvObj = NULL;
@@ -181,7 +181,7 @@

if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDataObject)) {
         IDataObject_AddRef(iface);
-        *ppvObj = This;
+        *ppvObj = &This->IDataObject_iface;
         return S_OK;
     }
     *ppvObj = NULL;

Modified: trunk/reactos/dll/win32/riched20/style.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/style.c?...
==============================================================================
--- trunk/reactos/dll/win32/riched20/style.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/style.c	[iso-8859-1] Sun Mar  5 21:43:39 2017
@@ -183,7 +183,7 @@
   }

COPY_STYLE_ITEM(CFM_UNDERLINETYPE, bUnderlineType);
-  /* If the CFM_UNDERLINE effect is not specified set it appropiately */
+  /* If the CFM_UNDERLINE effect is not specified, set it appropriately */
   if ((mod->dwMask & CFM_UNDERLINETYPE) && !(mod->dwMask & CFM_UNDERLINE))
   {
       fmt.dwMask |= CFM_UNDERLINE;

Modified: trunk/reactos/dll/win32/riched20/txthost.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txthost....
==============================================================================
--- trunk/reactos/dll/win32/riched20/txthost.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/txthost.c	[iso-8859-1] Sun Mar  5 21:43:39 2017
@@ -65,7 +65,7 @@
     ITextHostImpl *This = impl_from_ITextHost(iface);

if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ITextHost)) {
-        *ppvObject = This;
+        *ppvObject = &This->ITextHost_iface;
         ITextHost_AddRef((ITextHost *)*ppvObject);
         return S_OK;
     }

Modified: trunk/reactos/dll/win32/riched20/txtsrv.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txtsrv.c...
==============================================================================
--- trunk/reactos/dll/win32/riched20/txtsrv.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/txtsrv.c	[iso-8859-1] Sun Mar  5 21:43:39 2017
@@ -274,10 +274,9 @@
    ME_Cursor cursor;

ME_SetCursorToStart(This->editor, &cursor);
-   ME_InternalDeleteText(This->editor, &cursor,
-                         ME_GetTextLength(This->editor), FALSE);
-   ME_InsertTextFromCursor(This->editor, 0, pszText, -1,
-                           This->editor->pBuffer->pDefaultStyle);
+   ME_InternalDeleteText(This->editor, &cursor, ME_GetTextLength(This->editor), FALSE);
+   if(pszText)
+       ME_InsertTextFromCursor(This->editor, 0, pszText, -1, This->editor->pBuffer->pDefaultStyle);
    ME_SetSelection(This->editor, 0, 0);
    This->editor->nModifyStep = 0;
    OleFlushClipboard();

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Mar  5 21:43:39 2017
@@ -158,7 +158,7 @@
 reactos/dll/win32/query               # Synced to WineStaging-1.9.11
 reactos/dll/win32/rasapi32            # Synced to WineStaging-1.9.11
 reactos/dll/win32/resutils            # Synced to WineStaging-1.9.11
-reactos/dll/win32/riched20            # Synced to WineStaging-1.9.23
+reactos/dll/win32/riched20            # Synced to WineStaging-2.2
 reactos/dll/win32/riched32            # Synced to WineStaging-1.9.11
 reactos/dll/win32/rpcrt4              # Synced to WineStaging-2.2
 reactos/dll/win32/rsabase             # Synced to WineStaging-1.9.11