[Wine-patches] mshtml: correct order of functions in vtbl's (for eterbug #2105)

[Konstantin Kondratyuk]

-- 
Best regards,
Konstantin Kondratyuk.
----------- следующая часть -----------
From b43bdb899cb01efa81eec86edaddd044f9d6599a Mon Sep 17 00:00:00 2001
From: Konstantin Kondratyuk <kondratyuk на etersoft.ru>
Date: Fri, 5 Dec 2008 18:11:39 +0300
Subject: [PATCH] mshtml: correct order of functions in vtbl's (for eterbug #2105)

---
 dlls/mshtml/service.c |   66 +++++++++++++++++++++++++++++--------------------
 1 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c
index 641ee90..82f1e07 100644
--- a/dlls/mshtml/service.c
+++ b/dlls/mshtml/service.c
@@ -276,6 +276,14 @@ static HRESULT WINAPI HTMLEditServices_AddDesigner(
     return E_NOTIMPL;
 }
 
+static HRESULT WINAPI HTMLEditServices_RemoveDesigner(
+        IHTMLEditServices* iface,
+        IHTMLEditDesigner *pIDesigner)
+{
+    FIXME("is not implemented\n");
+    return E_NOTIMPL;
+}
+
 static HRESULT WINAPI HTMLEditServices_GetSelectionServices(
         IHTMLEditServices* iface,
         IMarkupContainer *pIContainer,
@@ -289,6 +297,7 @@ static HRESULT WINAPI HTMLEditServices_GetSelectionServices(
         This->selsrv = create_selectionsrv();
 
     ISelectionServices_AddRef(This->selsrv);
+    if(!ppSelSvc) return E_FAIL;
     *ppSelSvc = This->selsrv;
     return S_OK;
 }
@@ -309,9 +318,11 @@ static HRESULT WINAPI HTMLEditServices_MoveToSelectionEnd(
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI HTMLEditServices_RemoveDesigner(
-        IHTMLEditServices* iface,
-        IHTMLEditDesigner *pIDesigner)
+static HRESULT WINAPI HTMLEditServices_SelectRange(
+        IHTMLEditServices* This,
+        IMarkupPointer *pStart,
+        IMarkupPointer *pEnd,
+        SELECTION_TYPE eType)
 {
     FIXME("is not implemented\n");
     return E_NOTIMPL;
@@ -324,10 +335,11 @@ static const IHTMLEditServicesVtbl HTMLEditServicesVtbl = {
     HTMLEditServices_AddRef,
     HTMLEditServices_Release,
     HTMLEditServices_AddDesigner,
+    HTMLEditServices_RemoveDesigner,
     HTMLEditServices_GetSelectionServices,
     HTMLEditServices_MoveToSelectionAnchor,
     HTMLEditServices_MoveToSelectionEnd,
-    HTMLEditServices_RemoveDesigner
+    HTMLEditServices_SelectRange
 };
 
 static IHTMLEditServices *create_htmleditsrv(void)
@@ -400,53 +412,53 @@ static ULONG WINAPI SelectionServices_Release(ISelectionServices *iface)
     return ref;
 }
 
-static HRESULT WINAPI SelectionServices_AddElementSegment(
-             ISelectionServices* iface,
-             IHTMLElement *pIElement,
-             IElementSegment **ppISegmentAdded)
+static HRESULT WINAPI SelectionServices_SetSelectionType(
+        ISelectionServices* iface,
+        SELECTION_TYPE eType,
+        ISelectionServicesListener *pIListener)
 {
     FIXME("is not implemented\n");
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI SelectionServices_AddSegment(
-             ISelectionServices* iface,
-             IMarkupPointer *pIStart,
-             IMarkupPointer *pIEnd,
-             ISegment **ppISegmentAdded)
+static HRESULT WINAPI SelectionServices_GetMarkupContainer(
+        ISelectionServices* iface,
+        IMarkupContainer **ppIContainer)
 {
     FIXME("is not implemented\n");
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI SelectionServices_GetMarkupContainer(
+static HRESULT WINAPI SelectionServices_AddSegment(
              ISelectionServices* iface,
-             IMarkupContainer **ppIContainer)
+             IMarkupPointer *pIStart,
+             IMarkupPointer *pIEnd,
+             ISegment **ppISegmentAdded)
 {
     FIXME("is not implemented\n");
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI SelectionServices_GetSelectionServicesListener(
-             ISelectionServices* iface,
-             ISelectionServicesListener **ppISelectionServicesListener)
+static HRESULT WINAPI SelectionServices_AddElementSegment(
+        ISelectionServices* iface,
+        IHTMLElement *pIElement,
+        IElementSegment **ppISegmentAdded)
 {
     FIXME("is not implemented\n");
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI SelectionServices_RemoveSegment(
-             ISelectionServices* iface,
-             ISegment *pISegment)
+        ISelectionServices* iface,
+        ISegment *pISegment)
 {
     FIXME("is not implemented\n");
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI SelectionServices_SetSelectionType(
+static HRESULT WINAPI SelectionServices_GetSelectionServicesListener(
              ISelectionServices* iface,
-             SELECTION_TYPE eType,
-             ISelectionServicesListener *pIListener)
+             ISelectionServicesListener **ppISelectionServicesListener)
 {
     FIXME("is not implemented\n");
     return E_NOTIMPL;
@@ -458,12 +470,12 @@ static const ISelectionServicesVtbl SelectionServicesVtbl = {
     SelectionServices_QueryInterface,
     SelectionServices_AddRef,
     SelectionServices_Release,
-    SelectionServices_AddElementSegment,
-    SelectionServices_AddSegment,
+    SelectionServices_SetSelectionType,
     SelectionServices_GetMarkupContainer,
-    SelectionServices_GetSelectionServicesListener,
+    SelectionServices_AddSegment,
+    SelectionServices_AddElementSegment,
     SelectionServices_RemoveSegment,
-    SelectionServices_SetSelectionType
+    SelectionServices_GetSelectionServicesListener
 };
 
 static ISelectionServices *create_selectionsrv(void)
-- 
1.6.0.2.GIT