[ros-diffs] [akhaldi] 63078: [STI] * Sync with Wine 1.7.17. CORE-8080

Author: akhaldi
Date: Wed Apr 30 13:07:53 2014
New Revision: 63078

URL: http://svn.reactos.org/svn/reactos?rev=63078&view=rev
Log:
[STI]
* Sync with Wine 1.7.17.
CORE-8080

Added:
    trunk/reactos/dll/win32/sti/sti_wia.rgs
      - copied unchanged from r63057, trunk/reactos/dll/win32/sti/sti.rgs
Removed:
    trunk/reactos/dll/win32/sti/sti.rgs
Modified:
    trunk/reactos/dll/win32/sti/sti.rc
    trunk/reactos/dll/win32/sti/sti_wia.idl
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/sti/sti.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti.rc?rev=6…
==============================================================================
--- trunk/reactos/dll/win32/sti/sti.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/sti/sti.rc	[iso-8859-1] Wed Apr 30 13:07:53 2014
@@ -1 +1 @@
-1 WINE_REGISTRY "sti.rgs"
+1 WINE_REGISTRY sti_wia.rgs

Removed: trunk/reactos/dll/win32/sti/sti.rgs
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti.rgs?rev=…
==============================================================================
--- trunk/reactos/dll/win32/sti/sti.rgs	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/sti/sti.rgs	(removed)
@@ -1,37 +0,0 @@
-HKCR
-{
-    NoRemove Interface
-    {
-        '{5EB2502A-8CF1-11D1-BF92-0060081ED811}' = s 'IWiaDevMgr'
-        {
-            NumMethods = s 12
-            ProxyStubClsid32 = s '{4DB1AD10-3391-11D2-9A33-00C04FA36145}'
-        }
-        '{5E38B83C-8CF1-11D1-BF92-0060081ED811}' = s 'IEnumWIA_DEV_INFO'
-        {
-            NumMethods = s 3
-            ProxyStubClsid32 = s '{4DB1AD10-3391-11D2-9A33-00C04FA36145}'
-        }
-        '{4DB1AD10-3391-11D2-9A33-00C04FA36145}' = s 'IWiaItem'
-        {
-            NumMethods = s 3
-            ProxyStubClsid32 = s '{4DB1AD10-3391-11D2-9A33-00C04FA36145}'
-        }
-        '{AE6287B0-0084-11D2-973B-00A0C9068F2E}' = s 'IWiaEventCallback'
-        {
-            NumMethods = s 4
-            ProxyStubClsid32 = s '{4DB1AD10-3391-11D2-9A33-00C04FA36145}'
-        }
-    }
-    NoRemove CLSID
-    {
-        '{4DB1AD10-3391-11D2-9A33-00C04FA36145}' = s 'PSFactoryBuffer'
-        {
-            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both'
}
-        }
-        '{B323F8E0-2E68-11D0-90EA-00AA0060F86C}' = s 'StillImage'
-        {
-            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both'
}
-        }
-    }
-}

Modified: trunk/reactos/dll/win32/sti/sti_wia.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti_wia.idl?…
==============================================================================
--- trunk/reactos/dll/win32/sti/sti_wia.idl	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/sti/sti_wia.idl	[iso-8859-1] Wed Apr 30 13:07:53 2014
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma makedep proxy
+#pragma makedep register
+
 #include "wia_lh.idl"
 
 [

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Wed Apr 30 13:07:53 2014
@@ -187,7 +187,7 @@
 reactos/dll/win32/spoolss             # Synced to Wine-1.7.1
 reactos/dll/win32/stdole2.tlb         # Synced to Wine-1.7.17
 reactos/dll/win32/stdole32.tlb        # Synced to Wine-1.7.17
-reactos/dll/win32/sti                 # Synced to Wine-1.7.1
+reactos/dll/win32/sti                 # Synced to Wine-1.7.17
 reactos/dll/win32/sxs                 # Synced to Wine-1.7.1
 reactos/dll/win32/tapi32              # Synced to Wine-1.7.17
 reactos/dll/win32/traffic             # Synced to Wine-1.7.1