Skip to content
Snippets Groups Projects
Commit c6516740 authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files

Share version information between DllGetVersion and resource file.

parent 4521ea6e
No related branches found
No related tags found
No related merge requests found
......@@ -41,6 +41,7 @@
#include "undocshell.h"
#include "pidl.h"
#include "shell32_main.h"
#include "version.h"
#include "wine/debug.h"
#include "wine/unicode.h"
......@@ -897,16 +898,19 @@ HRESULT WINAPI SHELL32_DllGetVersion (DLLVERSIONINFO *pdvi)
if (pdvi->cbSize == sizeof(DLLVERSIONINFO) ||
pdvi->cbSize == sizeof(DLLVERSIONINFO2))
{
pdvi->dwMajorVersion = 4;
pdvi->dwMinorVersion = 72;
pdvi->dwBuildNumber = 3110;
pdvi->dwPlatformID = DLLVER_PLATFORM_WINDOWS;
pdvi->dwMajorVersion = WINE_FILEVERSION_MAJOR;
pdvi->dwMinorVersion = WINE_FILEVERSION_MINOR;
pdvi->dwBuildNumber = WINE_FILEVERSION_BUILD;
pdvi->dwPlatformID = WINE_FILEVERSION_PLATFORMID;
if (pdvi->cbSize == sizeof(DLLVERSIONINFO2))
{
DLLVERSIONINFO2 *pdvi2 = (DLLVERSIONINFO2 *)pdvi;
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",
pdvi->dwMajorVersion, pdvi->dwMinorVersion,
......
/*
* 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"
......@@ -18,9 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "version.h"
#define WINE_OLESELFREGISTER
#define WINE_FILEVERSION 4,0,0,0
#define WINE_FILEVERSION_STR "4.0"
#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>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment