From 90535924560c6f3371c1c4530373c08218171dd7 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sun, 21 Nov 2010 23:51:09 +0000
Subject: [PATCH] [PSDK] Fix HTMLFormElement uuid and add missing retval in
 IHTMLDocument6 Add back some previously disabled idl files for msvc

svn path=/branches/cmake-bringup/; revision=49702
---
 include/psdk/CMakeLists.txt |  8 ++++----
 include/psdk/mshtml.idl     | 10 +++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/include/psdk/CMakeLists.txt b/include/psdk/CMakeLists.txt
index 75317801bdf..92d298702ca 100644
--- a/include/psdk/CMakeLists.txt
+++ b/include/psdk/CMakeLists.txt
@@ -2,6 +2,8 @@
 LIST(APPEND SOURCE
 #   access.idl
     activaut.idl
+    activscp.idl
+    asptlb.idl
 #   asynot.idl
 #   asysta.idl
     bdaiface.idl
@@ -41,6 +43,7 @@ LIST(APPEND SOURCE
     mscoree.idl
     msdadc.idl
     mshtmhst.idl
+    mshtml.idl
     msinkaut.idl
     mstask.idl
     msxml.idl
@@ -72,6 +75,7 @@ LIST(APPEND SOURCE
 #   sesprp.idl
     shdeprecated.idl
     shldisp.idl
+    shobjidl.idl
     shtypes.idl
 #   stdole2.idl
     strmif.idl
@@ -94,14 +98,10 @@ LIST(APPEND SOURCE
 
 if(NOT MSVC)
   LIST(APPEND SOURCE
-    activscp.idl
     activdbg.idl
-    asptlb.idl
     ctfutb.idl
     mlang.idl
     msctf.idl
-    mshtml.idl
-    shobjidl.idl
     wincodec.idl
     wuapi.idl
 )
diff --git a/include/psdk/mshtml.idl b/include/psdk/mshtml.idl
index 1941b923b9e..1a1d6dd7a43 100644
--- a/include/psdk/mshtml.idl
+++ b/include/psdk/mshtml.idl
@@ -21,6 +21,10 @@
 #include <mshtmcid.h>
 #include <olectl.h>
 
+#if defined(_MSC_VER) && (__midl >= 501)
+midl_pragma warning(disable: 2362)
+#endif
+
 import "ocidl.idl";
 import "dimm.idl";
 import "shtypes.idl";
@@ -6909,7 +6913,7 @@ methods:
 
 [
     noncreatable,
-    uuid(3050F24D-98B5-11CF-BB82-00AA00BDCE0B)
+    uuid(3050F251-98B5-11CF-BB82-00AA00BDCE0B)
 ]
 coclass HTMLFormElement
 {
@@ -12453,13 +12457,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(