[ros-diffs] [tkreuzer] 49702: [PSDK] Fix HTMLFormElement uuid and add missing retval in IHTMLDocument6 Add back some previously disabled idl files for msvc

Author: tkreuzer
Date: Sun Nov 21 23:51:09 2010
New Revision: 49702

URL: http://svn.reactos.org/svn/reactos?rev=49702&view=rev
Log:
[PSDK]
Fix HTMLFormElement uuid and add missing retval in IHTMLDocument6
Add back some previously disabled idl files for msvc

Modified:
    branches/cmake-bringup/include/psdk/CMakeLists.txt
    branches/cmake-bringup/include/psdk/mshtml.idl

Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMak…
==============================================================================
--- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Sun Nov 21 23:51:09
2010
@@ -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 @@
     mscoree.idl
     msdadc.idl
     mshtmhst.idl
+    mshtml.idl
     msinkaut.idl
     mstask.idl
     msxml.idl
@@ -72,6 +75,7 @@
 #   sesprp.idl
     shdeprecated.idl
     shldisp.idl
+    shobjidl.idl
     shtypes.idl
 #   stdole2.idl
     strmif.idl
@@ -94,14 +98,10 @@
 
 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
 )

Modified: branches/cmake-bringup/include/psdk/mshtml.idl
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/msht…
==============================================================================
--- branches/cmake-bringup/include/psdk/mshtml.idl [iso-8859-1] (original)
+++ branches/cmake-bringup/include/psdk/mshtml.idl [iso-8859-1] Sun Nov 21 23:51:09 2010
@@ -20,6 +20,10 @@
 #include <mshtmdid.h>
 #include <mshtmcid.h>
 #include <olectl.h>
+
+#if defined(_MSC_VER) && (__midl >= 501)
+midl_pragma warning(disable: 2362)
+#endif
 
 import "ocidl.idl";
 import "dimm.idl";
@@ -6909,7 +6913,7 @@
 
 [
     noncreatable,
-    uuid(3050F24D-98B5-11CF-BB82-00AA00BDCE0B)
+    uuid(3050F251-98B5-11CF-BB82-00AA00BDCE0B)
 ]
 coclass HTMLFormElement
 {
@@ -12453,13 +12457,13 @@
     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(