25 Feb
2012
25 Feb
'12
6:52 p.m.
Author: akhaldi
Date: Sat Feb 25 18:52:16 2012
New Revision: 55859
URL: http://svn.reactos.org/svn/reactos?rev=55859&view=rev
Log:
[SHELL32]
* Prefix the local version.h and version.rc with shell32_.
* Include the rgs resource files in a portable way.
Added:
trunk/reactos/dll/win32/shell32/shell32_version.h
- copied unchanged from r55853, trunk/reactos/dll/win32/shell32/version.h
trunk/reactos/dll/win32/shell32/shell32_version.rc
- copied unchanged from r55853, trunk/reactos/dll/win32/shell32/version.rc
Removed:
trunk/reactos/dll/win32/shell32/version.h
trunk/reactos/dll/win32/shell32/version.rc
Modified:
trunk/reactos/dll/win32/shell32/rgs_res.rc
trunk/reactos/dll/win32/shell32/shell32_main.cpp
Modified: trunk/reactos/dll/win32/shell32/rgs_res.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/rgs_res.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] Sat Feb 25 18:52:16 2012
@@ -2,24 +2,24 @@
//
// REGISTRY
//
-IDR_ADMINFOLDERSHORTCUT REGISTRY
"res\\rgs\\adminfoldershortcut.rgs"
-IDR_AUTOCOMPLETE REGISTRY "res\\rgs\\autocomplete.rgs"
-IDR_CONTROLPANEL REGISTRY "res\\rgs\\controlpanel.rgs"
-IDR_DRAGDROPHELPER REGISTRY
"res\\rgs\\dragdrophelper.rgs"
-IDR_FOLDEROPTIONS REGISTRY "res\\rgs\\folderoptions.rgs"
-IDR_FOLDERSHORTCUT REGISTRY
"res\\rgs\\foldershortcut.rgs"
-IDR_FONTSFOLDERSHORTCUT REGISTRY
"res\\rgs\\fontsfoldershortcut.rgs"
-IDR_MENUBANDSITE REGISTRY "res\\rgs\\menubandsite.rgs"
-IDR_MYCOMPUTER REGISTRY "res\\rgs\\mycomputer.rgs"
-IDR_MYDOCUMENTS REGISTRY "res\\rgs\\mydocuments.rgs"
-IDR_NETWORKPLACES REGISTRY "res\\rgs\\networkplaces.rgs"
-IDR_NEWMENU REGISTRY "res\\rgs\\newmenu.rgs"
-IDR_PRINTERS REGISTRY "res\\rgs\\printers.rgs"
-IDR_RECYCLEBIN REGISTRY "res\\rgs\\recyclebin.rgs"
-IDR_SHELLDESKTOP REGISTRY "res\\rgs\\shelldesktop.rgs"
-IDR_SHELLFSFOLDER REGISTRY "res\\rgs\\shellfsfolder.rgs"
-IDR_SHELLLINK REGISTRY "res\\rgs\\shelllink.rgs"
-IDR_STARTMENU REGISTRY "res\\rgs\\startmenu.rgs"
-IDR_OPENWITHMENU REGISTRY "res\\rgs\\openwithmenu.rgs"
-IDR_FILEDEFEXT REGISTRY
"res\\rgs\\shellfiledefext.rgs"
-IDR_DRVDEFEXT REGISTRY
"res\\rgs\\shelldrvdefext.rgs"
+IDR_ADMINFOLDERSHORTCUT REGISTRY
"res/rgs/adminfoldershortcut.rgs"
+IDR_AUTOCOMPLETE REGISTRY "res/rgs/autocomplete.rgs"
+IDR_CONTROLPANEL REGISTRY "res/rgs/controlpanel.rgs"
+IDR_DRAGDROPHELPER REGISTRY "res/rgs/dragdrophelper.rgs"
+IDR_FOLDEROPTIONS REGISTRY "res/rgs/folderoptions.rgs"
+IDR_FOLDERSHORTCUT REGISTRY "res/rgs/foldershortcut.rgs"
+IDR_FONTSFOLDERSHORTCUT REGISTRY
"res/rgs/fontsfoldershortcut.rgs"
+IDR_MENUBANDSITE REGISTRY "res/rgs/menubandsite.rgs"
+IDR_MYCOMPUTER REGISTRY "res/rgs/mycomputer.rgs"
+IDR_MYDOCUMENTS REGISTRY "res/rgs/mydocuments.rgs"
+IDR_NETWORKPLACES REGISTRY "res/rgs/networkplaces.rgs"
+IDR_NEWMENU REGISTRY "res/rgs/newmenu.rgs"
+IDR_PRINTERS REGISTRY "res/rgs/printers.rgs"
+IDR_RECYCLEBIN REGISTRY "res/rgs/recyclebin.rgs"
+IDR_SHELLDESKTOP REGISTRY "res/rgs/shelldesktop.rgs"
+IDR_SHELLFSFOLDER REGISTRY "res/rgs/shellfsfolder.rgs"
+IDR_SHELLLINK REGISTRY "res/rgs/shelllink.rgs"
+IDR_STARTMENU REGISTRY "res/rgs/startmenu.rgs"
+IDR_OPENWITHMENU REGISTRY "res/rgs/openwithmenu.rgs"
+IDR_FILEDEFEXT REGISTRY "res/rgs/shellfiledefext.rgs"
+IDR_DRVDEFEXT REGISTRY "res/rgs/shelldrvdefext.rgs"
Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Sat Feb 25 18:52:16
2012
@@ -20,7 +20,7 @@
*/
#include <precomp.h>
-#include "version.h"
+#include "shell32_version.h"
#include <reactos/version.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);
Removed: trunk/reactos/dll/win32/shell32/version.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/version.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/version.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/version.h (removed)
@@ -1,28 +1,0 @@
-/*
- * Shared Resource/DllGetVersion version information
- *
- * Copyright (C) 2004 Robert Shearman
- *
- * 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
- */
-
-#define WINE_FILEVERSION_MAJOR 5
-#define WINE_FILEVERSION_MINOR 0
-#define WINE_FILEVERSION_BUILD 3900
-#define WINE_FILEVERSION_PLATFORMID 6975
-
-/* FIXME: when libs/wpp gets fixed to support concatenation we can remove
- * this and define it in version.rc */
-#define WINE_FILEVERSION_STR "5.0.3900.6975"
Removed: trunk/reactos/dll/win32/shell32/version.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/version.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/version.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/version.rc (removed)
@@ -1,27 +1,0 @@
-/*
- * version information for shell32.dll
- *
- * Copyright (C) 2003 John K. Hohm
- *
- * 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
- */
-
-#include "version.h"
-
-#define WINE_OLESELFREGISTER
-#define WINE_FILEVERSION
WINE_FILEVERSION_MAJOR,WINE_FILEVERSION_MINOR,WINE_FILEVERSION_BUILD,WINE_FILEVERSION_PLATFORMID
-#define WINE_FILENAME_STR "shell32.dll"
-
-#include <wine/wine_common_ver.rc>