Author: akhaldi Date: Thu Sep 26 16:49:51 2013 New Revision: 60379
URL: http://svn.reactos.org/svn/reactos?rev=60379&view=rev Log: [SHFOLDER] * Sync with Wine 1.7.1. CORE-7469
Modified: trunk/reactos/dll/win32/shfolder/version.rc trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/shfolder/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shfolder/version.... ============================================================================== --- trunk/reactos/dll/win32/shfolder/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shfolder/version.rc [iso-8859-1] Thu Sep 26 16:49:51 2013 @@ -14,12 +14,12 @@ * 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_EXTRAVALUES VALUE "OLESelfRegister",""
#include <wine/wine_common_ver.rc>
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 26 16:49:51 2013 @@ -176,7 +176,7 @@ 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