[ACTXPRXY]
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 20 Apr 2013 21:18:05 +0000 (21:18 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 20 Apr 2013 21:18:05 +0000 (21:18 +0000)
* Sync with Wine 1.5.26.

svn path=/trunk/; revision=58795

27 files changed:
reactos/dll/win32/actxprxy/CMakeLists.txt
reactos/dll/win32/actxprxy/actxprxy.rc [new file with mode: 0644]
reactos/dll/win32/actxprxy/actxprxy_activscp.idl
reactos/dll/win32/actxprxy/actxprxy_activscp.rgs [new file with mode: 0644]
reactos/dll/win32/actxprxy/actxprxy_comcat.idl
reactos/dll/win32/actxprxy/actxprxy_comcat.rgs [new file with mode: 0644]
reactos/dll/win32/actxprxy/actxprxy_docobj.idl
reactos/dll/win32/actxprxy/actxprxy_docobj.rgs [new file with mode: 0644]
reactos/dll/win32/actxprxy/actxprxy_hlink.idl
reactos/dll/win32/actxprxy/actxprxy_hlink.rgs [new file with mode: 0644]
reactos/dll/win32/actxprxy/actxprxy_htiface.idl [new file with mode: 0644]
reactos/dll/win32/actxprxy/actxprxy_htiface.rgs [new file with mode: 0644]
reactos/dll/win32/actxprxy/actxprxy_htiframe.idl
reactos/dll/win32/actxprxy/actxprxy_htiframe.rgs [new file with mode: 0644]
reactos/dll/win32/actxprxy/actxprxy_objsafe.idl
reactos/dll/win32/actxprxy/actxprxy_objsafe.rgs [new file with mode: 0644]
reactos/dll/win32/actxprxy/actxprxy_ocmm.idl
reactos/dll/win32/actxprxy/actxprxy_ocmm.rgs [new file with mode: 0644]
reactos/dll/win32/actxprxy/actxprxy_servprov.idl
reactos/dll/win32/actxprxy/actxprxy_servprov.rgs [new file with mode: 0644]
reactos/dll/win32/actxprxy/actxprxy_shldisp.idl
reactos/dll/win32/actxprxy/actxprxy_shldisp.rgs [new file with mode: 0644]
reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl
reactos/dll/win32/actxprxy/actxprxy_shobjidl.rgs [new file with mode: 0644]
reactos/dll/win32/actxprxy/actxprxy_urlhist.idl
reactos/dll/win32/actxprxy/actxprxy_urlhist.rgs [new file with mode: 0644]
reactos/media/doc/README.WINE

index b84ad61..1f4a6d9 100644 (file)
@@ -2,6 +2,8 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+add_definitions(-DWINE_REGISTER_DLL -DPROXY_DELEGATION)
+
 spec2def(actxprxy.dll actxprxy.spec)
 
 add_rpcproxy_files(
@@ -9,6 +11,7 @@ add_rpcproxy_files(
     actxprxy_comcat.idl
     actxprxy_docobj.idl
     actxprxy_hlink.idl
+    actxprxy_htiface.idl
     actxprxy_htiframe.idl
     actxprxy_objsafe.idl
     actxprxy_ocmm.idl
@@ -19,10 +22,12 @@ add_rpcproxy_files(
 
 list(APPEND SOURCE
     usrmarshal.c
+    actxprxy.rc
     ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_activscp_p.c
     ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_comcat_p.c
     ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_docobj_p.c
     ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_hlink_p.c
+    ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_htiface_p.c
     ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_htiframe_p.c
     ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_objsafe_p.c
     ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_ocmm_p.c
@@ -34,22 +39,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def)
 
 add_library(actxprxy SHARED ${SOURCE})
-
 set_module_type(actxprxy win32dll)
-
-target_link_libraries(actxprxy
-    uuid
-    wine
-    ${PSEH_LIB})
-
-add_importlibs(actxprxy
-    rpcrt4
-    ole32
-    oleaut32
-    msvcrt
-    kernel32
-    ntdll)
-
-add_definitions(-DWINE_REGISTER_DLL -DPROXY_DELEGATION)
-
+target_link_libraries(actxprxy uuid wine ${PSEH_LIB})
+add_importlibs(actxprxy rpcrt4 ole32 oleaut32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET actxprxy DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/actxprxy/actxprxy.rc b/reactos/dll/win32/actxprxy/actxprxy.rc
new file mode 100644 (file)
index 0000000..1dc402c
--- /dev/null
@@ -0,0 +1,12 @@
+1 WINE_REGISTRY actxprxy_activscp.rgs
+2 WINE_REGISTRY actxprxy_comcat.rgs
+3 WINE_REGISTRY actxprxy_docobj.rgs
+4 WINE_REGISTRY actxprxy_hlink.rgs
+5 WINE_REGISTRY actxprxy_htiface.rgs
+6 WINE_REGISTRY actxprxy_htiframe.rgs
+7 WINE_REGISTRY actxprxy_objsafe.rgs
+8 WINE_REGISTRY actxprxy_ocmm.rgs
+9 WINE_REGISTRY actxprxy_servprov.rgs
+10 WINE_REGISTRY actxprxy_shldisp.rgs
+11 WINE_REGISTRY actxprxy_shobjidl.rgs
+12 WINE_REGISTRY actxprxy_urlhist.rgs
index 72c558b..3f0fda7 100644 (file)
 
 #include "activscp.idl"
 
-#ifdef __WIDL__
 [
     threading(both),
     uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9)  /* IActiveScriptStats */
 ]
 coclass PSFactoryBuffer { interface IFactoryBuffer; }
-#endif
diff --git a/reactos/dll/win32/actxprxy/actxprxy_activscp.rgs b/reactos/dll/win32/actxprxy/actxprxy_activscp.rgs
new file mode 100644 (file)
index 0000000..12406ef
--- /dev/null
@@ -0,0 +1,98 @@
+HKCR
+{
+    NoRemove Interface
+    {
+        '{EAE1BA61-A4ED-11CF-8F20-00805F2CD064}' = s 'IActiveScriptError'
+        {
+            NumMethods = s 6
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{DB01A1E3-A42B-11CF-8F20-00805F2CD064}' = s 'IActiveScriptSite'
+        {
+            NumMethods = s 11
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{D10F6761-83E9-11CF-8F20-00805F2CD064}' = s 'IActiveScriptSiteWindow'
+        {
+            NumMethods = s 5
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{AEDAE97E-D7EE-4796-B960-7F092AE844AB}' = s 'IActiveScriptSiteUIControl'
+        {
+            NumMethods = s 4
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{539698A0-CDCA-11CF-A5EB-00AA0047A063}' = s 'IActiveScriptSiteInterruptPoll'
+        {
+            NumMethods = s 4
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{BB1A2AE1-A4F9-11CF-8F20-00805F2CD064}' = s 'IActiveScript'
+        {
+            NumMethods = s 16
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{BB1A2AE2-A4F9-11CF-8F20-00805F2CD064}' = s 'IActiveScriptParse32'
+        {
+            NumMethods = s 6
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{C7EF7658-E1EE-480E-97EA-D52CB4D76D17}' = s 'IActiveScriptParse64'
+        {
+            NumMethods = s 6
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{1CFF0050-6FDD-11D0-9328-00A0C90DCAA9}' = s 'IActiveScriptParseProcedureOld32'
+        {
+            NumMethods = s 4
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{21F57128-08C9-4638-BA12-22D15D88DC5C}' = s 'IActiveScriptParseProcedureOld64'
+        {
+            NumMethods = s 4
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{AA5B6A80-B834-11D0-932F-00A0C90DCAA9}' = s 'IActiveScriptParseProcedure32'
+        {
+            NumMethods = s 4
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{C64713B6-E029-4CC5-9200-438B72890B6A}' = s 'IActiveScriptParseProcedure64'
+        {
+            NumMethods = s 4
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{71EE5B20-FB04-11D1-B3A8-00A0C911E8B2}' = s 'IActiveScriptParseProcedure2_32'
+        {
+            NumMethods = s 4
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{FE7C4271-210C-448D-9F54-76DAB7047B28}' = s 'IActiveScriptParseProcedure2_64'
+        {
+            NumMethods = s 4
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{63CDBCB0-C1B1-11D0-9336-00A0C90DCAA9}' = s 'IBindEventHandler'
+        {
+            NumMethods = s 4
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'IActiveScriptStats'
+        {
+            NumMethods = s 6
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{4954E0D0-FBC7-11D1-8410-006008C3FBFC}' = s 'IActiveScriptProperty'
+        {
+            NumMethods = s 5
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+    }
+    NoRemove CLSID
+    {
+        '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+    }
+}
index ea7d62f..548aa0d 100644 (file)
 
 #include "comcat.idl"
 
-#ifdef __WIDL__
 [
     threading(both),
     uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9)  /* IActiveScriptStats */
 ]
 coclass PSFactoryBuffer { interface IFactoryBuffer; }
-#endif
diff --git a/reactos/dll/win32/actxprxy/actxprxy_comcat.rgs b/reactos/dll/win32/actxprxy/actxprxy_comcat.rgs
new file mode 100644 (file)
index 0000000..c458a3c
--- /dev/null
@@ -0,0 +1,33 @@
+HKCR
+{
+    NoRemove Interface
+    {
+        '{0002E000-0000-0000-C000-000000000046}' = s 'IEnumGUID'
+        {
+            NumMethods = s 7
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{0002E011-0000-0000-C000-000000000046}' = s 'IEnumCATEGORYINFO'
+        {
+            NumMethods = s 7
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{0002E013-0000-0000-C000-000000000046}' = s 'ICatInformation'
+        {
+            NumMethods = s 9
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{0002E012-0000-0000-C000-000000000046}' = s 'ICatRegister'
+        {
+            NumMethods = s 9
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+    }
+    NoRemove CLSID
+    {
+        '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+    }
+}
index 245cd89..8b2a83f 100644 (file)
 
 #include "docobj.idl"
 
-#ifdef __WIDL__
 [
     threading(both),
     uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9)  /* IActiveScriptStats */
 ]
 coclass PSFactoryBuffer { interface IFactoryBuffer; }
-#endif
diff --git a/reactos/dll/win32/actxprxy/actxprxy_docobj.rgs b/reactos/dll/win32/actxprxy/actxprxy_docobj.rgs
new file mode 100644 (file)
index 0000000..fef0f9a
--- /dev/null
@@ -0,0 +1,48 @@
+HKCR
+{
+    NoRemove Interface
+    {
+        '{B722BCC5-4E68-101B-A2BC-00AA00404770}' = s 'IOleDocument'
+        {
+            NumMethods = s 6
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{B722BCC7-4E68-101B-A2BC-00AA00404770}' = s 'IOleDocumentSite'
+        {
+            NumMethods = s 4
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{B722BCC6-4E68-101B-A2BC-00AA00404770}' = s 'IOleDocumentView'
+        {
+            NumMethods = s 16
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{B722BCC8-4E68-101B-A2BC-00AA00404770}' = s 'IEnumOleDocumentViews'
+        {
+            NumMethods = s 7
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{B722BCCB-4E68-101B-A2BC-00AA00404770}' = s 'IOleCommandTarget'
+        {
+            NumMethods = s 5
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{B722BCCA-4E68-101B-A2BC-00AA00404770}' = s 'IContinueCallback'
+        {
+            NumMethods = s 5
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{B722BCC9-4E68-101B-A2BC-00AA00404770}' = s 'IPrint'
+        {
+            NumMethods = s 6
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+    }
+    NoRemove CLSID
+    {
+        '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+    }
+}
index 93eab95..479e937 100644 (file)
 
 #include "hlink.idl"
 
-#ifdef __WIDL__
 [
     threading(both),
     uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9)  /* IActiveScriptStats */
 ]
 coclass PSFactoryBuffer { interface IFactoryBuffer; }
-#endif
diff --git a/reactos/dll/win32/actxprxy/actxprxy_hlink.rgs b/reactos/dll/win32/actxprxy/actxprxy_hlink.rgs
new file mode 100644 (file)
index 0000000..112ce48
--- /dev/null
@@ -0,0 +1,38 @@
+HKCR
+{
+    NoRemove Interface
+    {
+        '{79EAC9C3-BAF9-11CE-8C82-00AA004BA90B}' = s 'IHlink'
+        {
+            NumMethods = s 17
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{79EAC9C2-BAF9-11CE-8C82-00AA004BA90B}' = s 'IHlinkSite'
+        {
+            NumMethods = s 7
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{79EAC9C4-BAF9-11CE-8C82-00AA004BA90B}' = s 'IHlinkTarget'
+        {
+            NumMethods = s 8
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{79EAC9C5-BAF9-11CE-8C82-00AA004BA90B}' = s 'IHlinkFrame'
+        {
+            NumMethods = s 8
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{79EAC9CB-BAF9-11CE-8C82-00AA004BA90B}' = s 'IExtensionServices'
+        {
+            NumMethods = s 5
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+    }
+    NoRemove CLSID
+    {
+        '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+    }
+}
diff --git a/reactos/dll/win32/actxprxy/actxprxy_htiface.idl b/reactos/dll/win32/actxprxy/actxprxy_htiface.idl
new file mode 100644 (file)
index 0000000..8ecf7e6
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2011 Jacek Caban for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* just a wrapper for htiface.idl */
+
+#include "htiface.idl"
+
+[
+    threading(both),
+    uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9)  /* IActiveScriptStats */
+]
+coclass PSFactoryBuffer { interface IFactoryBuffer; }
diff --git a/reactos/dll/win32/actxprxy/actxprxy_htiface.rgs b/reactos/dll/win32/actxprxy/actxprxy_htiface.rgs
new file mode 100644 (file)
index 0000000..2276476
--- /dev/null
@@ -0,0 +1,28 @@
+HKCR
+{
+    NoRemove Interface
+    {
+        '{D5F78C80-5252-11CF-90FA-00AA0042106E}' = s 'ITargetFrame'
+        {
+            NumMethods = s 9
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{9216E421-2BF5-11D0-82B4-00A0C90C29C5}' = s 'ITargetFramePriv'
+        {
+            NumMethods = s 9
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{B2C867E6-69D6-46F2-A611-DED9A4BD7FEF}' = s 'ITargetFramePriv2'
+        {
+            NumMethods = s 10
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+    }
+    NoRemove CLSID
+    {
+        '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+    }
+}
index 3b47f2f..e3d5f72 100644 (file)
 
 #include "htiframe.idl"
 
-#ifdef __WIDL__
 [
     threading(both),
     uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9)  /* IActiveScriptStats */
 ]
 coclass PSFactoryBuffer { interface IFactoryBuffer; }
-#endif
diff --git a/reactos/dll/win32/actxprxy/actxprxy_htiframe.rgs b/reactos/dll/win32/actxprxy/actxprxy_htiframe.rgs
new file mode 100644 (file)
index 0000000..6d03b46
--- /dev/null
@@ -0,0 +1,33 @@
+HKCR
+{
+    NoRemove Interface
+    {
+        '{863A99A0-21BC-11D0-82B4-00A0C90C29C5}' = s 'ITargetNotify'
+        {
+            NumMethods = s 5
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{3050F6B1-98B5-11CF-BB82-00AA00BDCE0B}' = s 'ITargetNotify2'
+        {
+            NumMethods = s 6
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{86D52E11-94A8-11D0-82AF-00C04FD5AE38}' = s 'ITargetFrame2'
+        {
+            NumMethods = s 15
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{7847EC01-2BEC-11D0-82B4-00A0C90C29C5}' = s 'ITargetContainer'
+        {
+            NumMethods = s 5
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+    }
+    NoRemove CLSID
+    {
+        '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+    }
+}
index 93803bd..771a4d9 100644 (file)
 
 #include "objsafe.idl"
 
-#ifdef __WIDL__
 [
     threading(both),
     uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9)  /* IActiveScriptStats */
 ]
 coclass PSFactoryBuffer { interface IFactoryBuffer; }
-#endif
diff --git a/reactos/dll/win32/actxprxy/actxprxy_objsafe.rgs b/reactos/dll/win32/actxprxy/actxprxy_objsafe.rgs
new file mode 100644 (file)
index 0000000..b7126f8
--- /dev/null
@@ -0,0 +1,18 @@
+HKCR
+{
+    NoRemove Interface
+    {
+        '{CB5BDC81-93C1-11CF-8F20-00805F2CD064}' = s 'IObjectSafety'
+        {
+            NumMethods = s 5
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+    }
+    NoRemove CLSID
+    {
+        '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+    }
+}
index 29c193a..75e4788 100644 (file)
 
 #include "ocmm.idl"
 
-#ifdef __WIDL__
 [
     threading(both),
     uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9)  /* IActiveScriptStats */
 ]
 coclass PSFactoryBuffer { interface IFactoryBuffer; }
-#endif
diff --git a/reactos/dll/win32/actxprxy/actxprxy_ocmm.rgs b/reactos/dll/win32/actxprxy/actxprxy_ocmm.rgs
new file mode 100644 (file)
index 0000000..333a637
--- /dev/null
@@ -0,0 +1,28 @@
+HKCR
+{
+    NoRemove Interface
+    {
+        '{3050F361-98B5-11CF-BB82-00AA00BDCE0B}' = s 'ITimerSink'
+        {
+            NumMethods = s 4
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{3050F360-98B5-11CF-BB82-00AA00BDCE0B}' = s 'ITimer'
+        {
+            NumMethods = s 7
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{3050F35F-98B5-11CF-BB82-00AA00BDCE0B}' = s 'ITimerService'
+        {
+            NumMethods = s 6
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+    }
+    NoRemove CLSID
+    {
+        '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+    }
+}
index fd9c090..1388f23 100644 (file)
@@ -1,9 +1,7 @@
 #include "servprov.idl"
 
-#ifdef __WIDL__
 [
     threading(both),
     uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9)  /* IActiveScriptStats */
 ]
 coclass PSFactoryBuffer { interface IFactoryBuffer; }
-#endif
diff --git a/reactos/dll/win32/actxprxy/actxprxy_servprov.rgs b/reactos/dll/win32/actxprxy/actxprxy_servprov.rgs
new file mode 100644 (file)
index 0000000..a7b8a7b
--- /dev/null
@@ -0,0 +1,18 @@
+HKCR
+{
+    NoRemove Interface
+    {
+        '{6D5140C1-7436-11CE-8034-00AA006009FA}' = s 'IServiceProvider'
+        {
+            NumMethods = s 4
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+    }
+    NoRemove CLSID
+    {
+        '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+    }
+}
index 4dafed0..e5ddb18 100644 (file)
 
 #include "shldisp.idl"
 
-#ifdef __WIDL__
 [
     threading(both),
     uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9)  /* IActiveScriptStats */
 ]
 coclass PSFactoryBuffer { interface IFactoryBuffer; }
-#endif
diff --git a/reactos/dll/win32/actxprxy/actxprxy_shldisp.rgs b/reactos/dll/win32/actxprxy/actxprxy_shldisp.rgs
new file mode 100644 (file)
index 0000000..66e43da
--- /dev/null
@@ -0,0 +1,18 @@
+HKCR
+{
+    NoRemove Interface
+    {
+        '{3D8B0590-F691-11D2-8EA9-006097DF5BD4}' = s 'IAsyncOperation'
+        {
+            NumMethods = s 8
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+    }
+    NoRemove CLSID
+    {
+        '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+    }
+}
index d25e96a..ccff236 100644 (file)
 
 #include "shobjidl.idl"
 
-#ifdef __WIDL__
 [
     threading(both),
     uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9)  /* IActiveScriptStats */
 ]
 coclass PSFactoryBuffer { interface IFactoryBuffer; }
-#endif
diff --git a/reactos/dll/win32/actxprxy/actxprxy_shobjidl.rgs b/reactos/dll/win32/actxprxy/actxprxy_shobjidl.rgs
new file mode 100644 (file)
index 0000000..f89b508
--- /dev/null
@@ -0,0 +1,268 @@
+HKCR
+{
+    NoRemove Interface
+    {
+        '{000214EA-0000-0000-C000-000000000046}' = s 'IPersistFolder'
+        {
+            NumMethods = s 5
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{1AC3D9F0-175C-11D1-95BE-00609797EA4F}' = s 'IPersistFolder2'
+        {
+            NumMethods = s 6
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{1079ACFC-29BD-11D3-8E0D-00C04F6837D5}' = s 'IPersistIDList'
+        {
+            NumMethods = s 6
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{000214F2-0000-0000-C000-000000000046}' = s 'IEnumIDList'
+        {
+            NumMethods = s 7
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{000214E6-0000-0000-C000-000000000046}' = s 'IShellFolder'
+        {
+            NumMethods = s 13
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{0E700BE1-9DB6-11D1-A1CE-00C04FD75D13}' = s 'IEnumExtraSearch'
+        {
+            NumMethods = s 7
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{93F2F68C-1D1B-11D3-A30E-00C04F79ABD1}' = s 'IShellFolder2'
+        {
+            NumMethods = s 20
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{43826D1E-E718-42EE-BC55-A1E261C37BFE}' = s 'IShellItem'
+        {
+            NumMethods = s 8
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{7E9FB0D3-919F-4307-AB2E-9B1860310C93}' = s 'IShellItem2'
+        {
+            NumMethods = s 21
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{D2BC4C84-3F72-4A52-A604-7BCBF3982CBB}' = s 'INewWindowManager'
+        {
+            NumMethods = s 4
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{70629033-E363-4A28-A567-0DB78006E6D7}' = s 'IEnumShellItems'
+        {
+            NumMethods = s 7
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{B63EA76D-1F85-456F-A19C-48159EFA858B}' = s 'IShellItemArray'
+        {
+            NumMethods = s 10
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{2659B475-EEB8-48B7-8F07-B378810F48CF}' = s 'IShellItemFilter'
+        {
+            NumMethods = s 5
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{000214E5-0000-0000-C000-000000000046}' = s 'IShellIcon'
+        {
+            NumMethods = s 4
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{000214E3-0000-0000-C000-000000000046}' = s 'IShellView'
+        {
+            NumMethods = s 16
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{88E39E80-3578-11CF-AE69-08002B2E1262}' = s 'IShellView2'
+        {
+            NumMethods = s 20
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{CDE725B0-CCC9-4519-917E-325D72FAB4CE}' = s 'IFolderView'
+        {
+            NumMethods = s 17
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{000214E2-0000-0000-C000-000000000046}' = s 'IShellBrowser'
+        {
+            NumMethods = s 18
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{000214EE-0000-0000-C000-000000000046}' = s 'IShellLinkA'
+        {
+            NumMethods = s 21
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{000214F9-0000-0000-C000-000000000046}' = s 'IShellLinkW'
+        {
+            NumMethods = s 21
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{CEF04FDF-FE72-11D2-87A5-00C04F6837CF}' = s 'IPersistFolder3'
+        {
+            NumMethods = s 8
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{000214F1-0000-0000-C000-000000000046}' = s 'ICommDlgBrowser'
+        {
+            NumMethods = s 6
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{10339516-2894-11D2-9039-00C04F8EEB3E}' = s 'ICommDlgBrowser2'
+        {
+            NumMethods = s 9
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{C8AD25A1-3294-41EE-8165-71174BD01C57}' = s 'ICommDlgBrowser3'
+        {
+            NumMethods = s 12
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{012DD920-7B26-11D0-8CA9-00A0C92DBFE8}' = s 'IDockingWindow'
+        {
+            NumMethods = s 8
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{45E2B4AE-B1C3-11D0-B92F-00A0C90312E1}' = s 'IShellLinkDataList'
+        {
+            NumMethods = s 8
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{5CD52983-9449-11D2-963A-00C04F79ADF0}' = s 'IResolveShellLink'
+        {
+            NumMethods = s 4
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{56FDF342-FD6D-11D0-958A-006097C9A090}' = s 'ITaskbarList'
+        {
+            NumMethods = s 8
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{602D4995-B13A-429B-A66E-1935E44F4317}' = s 'ITaskbarList2'
+        {
+            NumMethods = s 9
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{EA1AFB91-9E28-4B86-90E9-9E9F8A5EEFAF}' = s 'ITaskbarList3'
+        {
+            NumMethods = s 21
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{C43DC798-95D1-4BEA-9030-BB99E2983A1A}' = s 'ITaskbarList4'
+        {
+            NumMethods = s 22
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{3CD141F4-3C6A-11D2-BCAA-00C04FD929DB}' = s 'IAutoCompleteDropDown'
+        {
+            NumMethods = s 5
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{CB728B20-F786-11CE-92AD-00AA00A74CD0}' = s 'IProfferService'
+        {
+            NumMethods = s 5
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{361BBDC7-E6EE-4E13-BE58-58E2240C810F}' = s 'IExplorerBrowserEvents'
+        {
+            NumMethods = s 7
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{E07010EC-BC17-44C0-97B0-46C7C95B9EDC}' = s 'IExplorerPaneVisibility'
+        {
+            NumMethods = s 4
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{DFD3B6B5-C10C-4BE9-85F6-A66969F402F6}' = s 'IExplorerBrowser'
+        {
+            NumMethods = s 18
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{028212A3-B627-47E9-8856-C14265554E4F}' = s 'INameSpaceTreeControl'
+        {
+            NumMethods = s 22
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{7CC7AED8-290E-49BC-8945-C1401CC9306C}' = s 'INameSpaceTreeControl2'
+        {
+            NumMethods = s 26
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{973510DB-7D7F-452B-8975-74A85828D354}' = s 'IFileDialogEvents'
+        {
+            NumMethods = s 10
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{B4DB1657-70D7-485E-8E3E-6FCB5A5C1802}' = s 'IModalWindow'
+        {
+            NumMethods = s 4
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{42F85136-DB7E-439C-85F1-E4075D135FC8}' = s 'IFileDialog'
+        {
+            NumMethods = s 27
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{61744FC7-85B5-4791-A9B0-272276309B13}' = s 'IFileDialog2'
+        {
+            NumMethods = s 29
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{04B0F1A7-9490-44BC-96E1-4296A31252E2}' = s 'IFileOperationProgressSink'
+        {
+            NumMethods = s 19
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{84BCCD23-5FDE-4CDB-AEA4-AF64B83D78AB}' = s 'IFileSaveDialog'
+        {
+            NumMethods = s 32
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{D57C7288-D4AD-4768-BE02-9D969532D960}' = s 'IFileOpenDialog'
+        {
+            NumMethods = s 29
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{E6FDD21A-163F-4975-9C8C-A69F1BA37034}' = s 'IFileDialogCustomize'
+        {
+            NumMethods = s 30
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{36116642-D713-4B97-9B83-7484A9D00433}' = s 'IFileDialogControlEvents'
+        {
+            NumMethods = s 7
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{3AA7AF7E-9B36-420C-A8E3-F77D4674A488}' = s 'IKnownFolder'
+        {
+            NumMethods = s 12
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{8BE2D872-86AA-4D47-B776-32CCA40C7018}' = s 'IKnownFolderManager'
+        {
+            NumMethods = s 13
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{4E530B0A-E611-4C77-A3AC-9031D022281B}' = s 'IApplicationAssociationRegistration'
+        {
+            NumMethods = s 9
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{6332DEBF-87B5-4670-90C0-5E57B408A49E}' = s 'ICustomDestinationList'
+        {
+            NumMethods = s 12
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+    }
+    NoRemove CLSID
+    {
+        '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+    }
+}
index b8a70a0..f987752 100644 (file)
 
 #include "urlhist.idl"
 
-#ifdef __WIDL__
 [
     threading(both),
     uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9)  /* IActiveScriptStats */
 ]
 coclass PSFactoryBuffer { interface IFactoryBuffer; }
-#endif
diff --git a/reactos/dll/win32/actxprxy/actxprxy_urlhist.rgs b/reactos/dll/win32/actxprxy/actxprxy_urlhist.rgs
new file mode 100644 (file)
index 0000000..1efa8bd
--- /dev/null
@@ -0,0 +1,33 @@
+HKCR
+{
+    NoRemove Interface
+    {
+        '{3C374A42-BAE4-11CF-BF7D-00AA006946EE}' = s 'IEnumSTATURL'
+        {
+            NumMethods = s 8
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{3C374A41-BAE4-11CF-BF7D-00AA006946EE}' = s 'IUrlHistoryStg'
+        {
+            NumMethods = s 8
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{AFA0DC11-C313-11D0-831A-00C04FD5AE38}' = s 'IUrlHistoryStg2'
+        {
+            NumMethods = s 10
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+        '{BC40BEC1-C493-11D0-831B-00C04FD5AE38}' = s 'IUrlHistoryNotify'
+        {
+            NumMethods = s 5
+            ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}'
+        }
+    }
+    NoRemove CLSID
+    {
+        '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+    }
+}
index ca41c64..85cf11c 100644 (file)
@@ -39,7 +39,7 @@ reactos/dll/directx/msdmo         # Autosync
 reactos/dll/directx/qedit         # Autosync
 reactos/dll/directx/quartz        # Autosync
 reactos/dll/win32/activeds        # Synced to Wine-1.1.43?
-reactos/dll/win32/actxprxy        # Synced to Wine-1.3.29?
+reactos/dll/win32/actxprxy        # Synced to Wine-1.5.26
 reactos/dll/win32/advpack         # Synced to Wine-1.5.19
 reactos/dll/win32/atl             # Synced to Wine-1.5.19
 reactos/dll/win32/atl100          # Synced to Wine-1.5.19