Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 02:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Robert Shearman <rob@codeweavers.com>

Browse source 
- Share version information between DllGetVersion and resource file.

svn path=/trunk/; revision=10968
This commit is contained in:
Gé van Geldorp 2004-09-22 05:08:04 +00:00
parent 9fcfe5a590
commit 2b9416f467
3 changed files with 40 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/lib/shell32/shell32_main.c
View file

@ -41,6 +41,7 @@
#include "undocshell.h" #include "undocshell.h"
#include "pidl.h" #include "pidl.h"
#include "shell32_main.h" #include "shell32_main.h"
#include "version.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h" #include "wine/unicode.h"
@ -897,16 +898,19 @@ HRESULT WINAPI SHELL32_DllGetVersion (DLLVERSIONINFO *pdvi)
if (pdvi->cbSize == sizeof(DLLVERSIONINFO) || if (pdvi->cbSize == sizeof(DLLVERSIONINFO) ||
pdvi->cbSize == sizeof(DLLVERSIONINFO2)) pdvi->cbSize == sizeof(DLLVERSIONINFO2))
{ {
pdvi->dwMajorVersion = 4; pdvi->dwMajorVersion = WINE_FILEVERSION_MAJOR;
pdvi->dwMinorVersion = 72; pdvi->dwMinorVersion = WINE_FILEVERSION_MINOR;
pdvi->dwBuildNumber = 3110; pdvi->dwBuildNumber = WINE_FILEVERSION_BUILD;
pdvi->dwPlatformID = DLLVER_PLATFORM_WINDOWS; pdvi->dwPlatformID = WINE_FILEVERSION_PLATFORMID;
if (pdvi->cbSize == sizeof(DLLVERSIONINFO2)) if (pdvi->cbSize == sizeof(DLLVERSIONINFO2))
{ {
DLLVERSIONINFO2 *pdvi2 = (DLLVERSIONINFO2 *)pdvi; DLLVERSIONINFO2 *pdvi2 = (DLLVERSIONINFO2 *)pdvi;
pdvi2->dwFlags = 0; pdvi2->dwFlags = 0;
pdvi2->ullVersion = MAKEDLLVERULL(4, 72, 3110, 0); pdvi2->ullVersion = MAKEDLLVERULL(WINE_FILEVERSION_MAJOR,
WINE_FILEVERSION_MINOR,
WINE_FILEVERSION_BUILD,
WINE_FILEVERSION_PLATFORMID);
} }
TRACE("%lu.%lu.%lu.%lu\n", TRACE("%lu.%lu.%lu.%lu\n",
pdvi->dwMajorVersion, pdvi->dwMinorVersion, pdvi->dwMajorVersion, pdvi->dwMinorVersion,

28
reactos/lib/shell32/version.h Normal file
View file

@ -0,0 +1,28 @@
/*
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#define WINE_FILEVERSION_MAJOR 4
#define WINE_FILEVERSION_MINOR 72
#define WINE_FILEVERSION_BUILD 3110
#define WINE_FILEVERSION_PLATFORMID 1
/* FIXME: when libs/wpp gets fixed to support concatenation we can remove
* this and define it in version.rc */
#define WINE_FILEVERSION "4.72.3110.1"

5
reactos/lib/shell32/version.rc
View file

@ -18,9 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "version.h"
#define WINE_OLESELFREGISTER #define WINE_OLESELFREGISTER
#define WINE_FILEVERSION 4,0,0,0 #define WINE_FILEVERSION WINE_FILEVERSION_MAJOR,WINE_FILEVERSION_MINOR,WINE_FILEVERSION_BUILD,WINE_FILEVERSION_PLATFORMID
#define WINE_FILEVERSION_STR "4.0"
#define WINE_FILENAME_STR "shell32.dll" #define WINE_FILENAME_STR "shell32.dll"
#include <wine/wine_common_ver.rc> #include <wine/wine_common_ver.rc>