[Wine-patches] Fwd: [eter-2.1] include: Fix MIDL build in mshtml.idl.

[Виталий Липатов]

-------- Перенаправленное сообщение --------
Тема: 	[Wine-patches] [eter-2.1] include: Fix MIDL build in mshtml.idl.
Дата: 	Mon, 17 Apr 2017 17:13:32 +0800
От: 	Dmitry Timoshkov via Wine-patches <wine-patches на lists.etersoft.ru>
Отвечать: 	wine-devel на lists.etersoft.ru
Кому: 	wine-patches на lists.etersoft.ru
Копия: 	Dmitry Timoshkov <dtimoshkov на etersoft.ru>



----------- следущая часть -----------
Вложение в формате HTML было извлечено…
URL: <http://lists.etersoft.ru/pipermail/wine-patches/attachments/20170421/25cc22b2/attachment.html>
----------- следущая часть -----------
From abb7433275df8415fd86606b067f7c1e4c34bda6 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber на reactos.org>
Date: Mon, 6 Apr 2015 16:34:08 +0200
Subject: [eter-2.1] include: Fix MIDL build in mshtml.idl.
Content-Type: text/plain; charset=UTF-8
To: wine-patches на lists.etersoft.ru
Content-Type: text/plain; charset=UTF-8

---
 include/mshtml.idl | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/include/mshtml.idl b/include/mshtml.idl
index 1417a59d86..9c355d3c09 100644
--- a/include/mshtml.idl
+++ b/include/mshtml.idl
@@ -26,6 +26,11 @@ import "dimm.idl";
 import "shtypes.idl";
 import "dispex.idl";
 
+#ifndef __WIDL__
+#define progid(str)
+#define vi_progid(str)
+#endif
+
 cpp_quote("#include <olectl.h>")
 
 cpp_quote("DEFINE_GUID(SID_SEditCommandTarget,  0x3050f4b5,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);")
@@ -7024,7 +7029,7 @@ interface IHTMLLinkElement : IDispatch
     [propput, id(DISPID_IHTMLLINKELEMENT_MEDIA), displaybind, bindable]
     HRESULT media([in] BSTR v);
 
-    [propget, id(DISPID_IHTMLLINKELEMENT_MEDIA), displaybind, bindable]\
+    [propget, id(DISPID_IHTMLLINKELEMENT_MEDIA), displaybind, bindable]
     HRESULT media([out, retval] BSTR *p);
 }
 
@@ -7906,7 +7911,7 @@ methods:
 
 [
     noncreatable,
-    uuid(3050F24D-98B5-11CF-BB82-00AA00BDCE0B)
+    uuid(3050F251-98B5-11CF-BB82-00AA00BDCE0B)
 ]
 coclass HTMLFormElement
 {
@@ -14105,13 +14110,13 @@ interface IHTMLDocument6 : IDispatch
     HRESULT onstorage([in] VARIANT v);
 
     [propget, id(DISPID_IHTMLDOCUMENT6_ONSTORAGE), displaybind, bindable]
-    HRESULT onstorage([out] VARIANT *p);
+    HRESULT onstorage([retval, out] VARIANT *p);
 
     [propput, id(DISPID_IHTMLDOCUMENT6_ONSTORAGECOMMIT), displaybind, bindable]
     HRESULT onstoragecommit([in] VARIANT v);
 
     [propget, id(DISPID_IHTMLDOCUMENT6_ONSTORAGECOMMIT), displaybind, bindable]
-    HRESULT onstoragecommit([out] VARIANT *p);
+    HRESULT onstoragecommit([retval, out] VARIANT *p);
 
     [id(DISPID_IHTMLDOCUMENT6_IE8_GETELEMENTBYID)]
     HRESULT getElementById(
-- 
2.12.2


----------- следущая часть -----------
_______________________________________________
Wine-patches mailing list
Wine-patches на lists.etersoft.ru
http://lists.etersoft.ru/mailman/listinfo/wine-patches