projects / reactos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: b13aa99)
[SHFOLDER]
authorAmine Khaldi <amine.khaldi@reactos.org>
Thu, 26 Sep 2013 16:49:51 +0000 (16:49 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Thu, 26 Sep 2013 16:49:51 +0000 (16:49 +0000)
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60379

reactos/dll/win32/shfolder/version.rc patch | blob | history
reactos/media/doc/README.WINE patch | blob | history

diff --git a/reactos/dll/win32/shfolder/version.rc b/reactos/dll/win32/shfolder/version.rc
index 63251fe..714bef7 100644 (file)
--- a/reactos/dll/win32/shfolder/version.rc
+++ b/reactos/dll/win32/shfolder/version.rc
@@ -14,12 +14,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine Shell Folder Service"
 #define WINE_FILENAME_STR "shfolder.dll"
 #define WINE_FILEVERSION 6,00,2800,1106
 #define WINE_FILEVERSION_STR "6,00,2800,1106"
 #define WINE_PRODUCTVERSION 6,00,2800,1106
 #define WINE_PRODUCTVERSION_STR "6,00,2800,1106"
 #define WINE_FILEDESCRIPTION_STR "Wine Shell Folder Service"
 #define WINE_FILENAME_STR "shfolder.dll"
 #define WINE_FILEVERSION 6,00,2800,1106
 #define WINE_FILEVERSION_STR "6,00,2800,1106"
 #define WINE_PRODUCTVERSION 6,00,2800,1106
 #define WINE_PRODUCTVERSION_STR "6,00,2800,1106"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include <wine/wine_common_ver.rc>
 
 #include <wine/wine_common_ver.rc>
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index facfc37..9e8d8bf 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -176,7 +176,7 @@ reactos/dll/win32/setupapi        # Forked at Wine-20050524
 reactos/dll/win32/shdoclc         # Synced to Wine-1.5.19
 reactos/dll/win32/shdocvw         # Synced to Wine-1.7.1
 reactos/dll/win32/shell32         # Forked at Wine-20071011
 reactos/dll/win32/shdoclc         # Synced to Wine-1.5.19
 reactos/dll/win32/shdocvw         # Synced to Wine-1.7.1
 reactos/dll/win32/shell32         # Forked at Wine-20071011
-reactos/dll/win32/shfolder        # Autosync
+reactos/dll/win32/shfolder        # Synced to Wine-1.7.1
 reactos/dll/win32/shlwapi         # Synced to Wine-1.5.26
 reactos/dll/win32/slbcsp          # Synced to Wine-1.5.19
 reactos/dll/win32/snmpapi         # Synced to Wine-1.5.19
 reactos/dll/win32/shlwapi         # Synced to Wine-1.5.26
 reactos/dll/win32/slbcsp          # Synced to Wine-1.5.19
 reactos/dll/win32/snmpapi         # Synced to Wine-1.5.19
A free Windows-compatible Operating System