[STI]
authorAmine Khaldi <amine.khaldi@reactos.org>
Wed, 30 Apr 2014 13:07:53 +0000 (13:07 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Wed, 30 Apr 2014 13:07:53 +0000 (13:07 +0000)
* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=63078

reactos/dll/win32/sti/sti.rc
reactos/dll/win32/sti/sti_wia.idl
reactos/dll/win32/sti/sti_wia.rgs [moved from reactos/dll/win32/sti/sti.rgs with 100% similarity]
reactos/media/doc/README.WINE

index 2fef127..8efbfde 100644 (file)
@@ -1 +1 @@
-1 WINE_REGISTRY "sti.rgs"
+1 WINE_REGISTRY sti_wia.rgs
index f7744a1..1aef544 100644 (file)
@@ -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"
 
 [
index f9204df..09aa549 100644 (file)
@@ -187,7 +187,7 @@ reactos/dll/win32/softpub             # Synced to Wine-1.7.1
 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