From 17d6f08381f5c8b63371a25b976b427915b30d6d Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Mon, 7 Nov 2011 12:21:30 +0100 Subject: [PATCH] version: Add verrsrc.h and make it so it does not need other headers to be used in resource files. --- include/Makefile.in | 1 + include/{winver.h => verrsrc.h} | 64 ++++------ include/winver.h | 252 +++++++++++----------------------------- 3 files changed, 91 insertions(+), 226 deletions(-) copy include/{winver.h => verrsrc.h} (77%) rewrite include/winver.h (64%) diff --git a/include/Makefile.in b/include/Makefile.in index 8533775f074..e8212362b26 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -506,6 +506,7 @@ SRCDIR_INCLUDES = \ uxtheme.h \ vdmdbg.h \ ver.h \ + verrsrc.h \ vfw.h \ vfwmsgs.h \ vmrender.idl \ diff --git a/include/winver.h b/include/verrsrc.h similarity index 77% copy from include/winver.h copy to include/verrsrc.h index 48a2d5b86ba..fa5c26c94fd 100644 --- a/include/winver.h +++ b/include/verrsrc.h @@ -17,12 +17,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_WINVER_H -#define __WINE_WINVER_H - -#ifdef __cplusplus -extern "C" { -#endif /* defined(__cplusplus) */ +#ifndef __WINE_VERRSRC_H +#define __WINE_VERRSRC_H + +/* Macro to deal with LP64 <=> LLP64 differences in numeric constants with 'l' modifier */ +#ifndef __MSABI_LONG +# if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) +# define __MSABI_LONG(x) x ## l +# else +# define __MSABI_LONG(x) x +# endif +#endif /* resource ids for different version infos */ #define VS_FILE_INFO RT_VERSION @@ -132,6 +137,17 @@ extern "C" { #define VIF_CANNOTLOADLZ32 __MSABI_LONG(0x00080000) #define VIF_CANNOTLOADCABINET __MSABI_LONG(0x00100000) + +#ifndef RC_INVOKED + +#ifdef __cplusplus +extern "C" { +#endif /* defined(__cplusplus) */ + +#define FILE_VER_GET_LOCALISED 0x01 +#define FILE_VER_GET_NEUTRAL 0x02 +#define FILE_VER_GET_PREFETCHED 0x04 + typedef struct tagVS_FIXEDFILEINFO { DWORD dwSignature; DWORD dwStrucVersion; @@ -148,40 +164,10 @@ typedef struct tagVS_FIXEDFILEINFO { DWORD dwFileDateLS; } VS_FIXEDFILEINFO; - -#ifndef RC_INVOKED - -/* function prototypes */ - -DWORD WINAPI VerFindFileA(DWORD,LPCSTR,LPCSTR,LPCSTR,LPSTR,PUINT,LPSTR,PUINT); -DWORD WINAPI VerFindFileW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,PUINT,LPWSTR,PUINT); -#define VerFindFile WINELIB_NAME_AW(VerFindFile) -DWORD WINAPI VerInstallFileA(DWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,PUINT); -DWORD WINAPI VerInstallFileW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,PUINT); -#define VerInstallFile WINELIB_NAME_AW(VerInstallFile) -DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD); -DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD); -#define VerLanguageName WINELIB_NAME_AW(VerLanguageName) -BOOL WINAPI VerQueryValueA(LPCVOID,LPCSTR,LPVOID*,PUINT); -BOOL WINAPI VerQueryValueW(LPCVOID,LPCWSTR,LPVOID*,PUINT); -#define VerQueryValue WINELIB_NAME_AW(VerQueryValue) -DWORD WINAPI GetFileVersionInfoSizeA(LPCSTR,LPDWORD); -DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,LPDWORD); -#define GetFileVersionInfoSize WINELIB_NAME_AW(GetFileVersionInfoSize) -BOOL WINAPI GetFileVersionInfoA(LPCSTR,DWORD,DWORD,LPVOID); -BOOL WINAPI GetFileVersionInfoW(LPCWSTR,DWORD,DWORD,LPVOID); -#define GetFileVersionInfo WINELIB_NAME_AW(GetFileVersionInfo) -DWORD WINAPI GetFileVersionInfoSizeExA(DWORD,LPCSTR,LPDWORD); -DWORD WINAPI GetFileVersionInfoSizeExW(DWORD,LPCWSTR,LPDWORD); -#define GetFileVersionInfoSizeEx WINELIB_NAME_AW(GetFileVersionInfoSizeEx) -BOOL WINAPI GetFileVersionInfoExA(DWORD,LPCSTR,DWORD,DWORD,LPVOID); -BOOL WINAPI GetFileVersionInfoExW(DWORD,LPCWSTR,DWORD,DWORD,LPVOID); -#define GetFileVersionInfoEx WINELIB_NAME_AW(GetFileVersionInfoEx) - -#endif /* RC_INVOKED */ - #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */ -#endif /* __WINE_WINVER_H */ +#endif /* RC_INVOKED */ + +#endif /* __WINE_VERRSRC_H */ diff --git a/include/winver.h b/include/winver.h dissimilarity index 64% index 48a2d5b86ba..b40a566ea4a 100644 --- a/include/winver.h +++ b/include/winver.h @@ -1,187 +1,65 @@ -/* Definitions for the VERsion info library (VER.DLL) - * - * Copyright 1996 Marcus Meissner - * - * 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 - */ - -#ifndef __WINE_WINVER_H -#define __WINE_WINVER_H - -#ifdef __cplusplus -extern "C" { -#endif /* defined(__cplusplus) */ - -/* resource ids for different version infos */ -#define VS_FILE_INFO RT_VERSION -#define VS_VERSION_INFO 1 -#define VS_USER_DEFINED 100 - -#define VS_FFI_SIGNATURE __MSABI_LONG(0xfeef04bd) /* FileInfo Magic */ -#define VS_FFI_STRUCVERSION __MSABI_LONG(0x00010000) /* struc version 1.0 */ -#define VS_FFI_FILEFLAGSMASK __MSABI_LONG(0x0000003f) /* valid flags */ - -/* VS_VERSION.dwFileFlags */ -#define VS_FF_DEBUG __MSABI_LONG(0x01) -#define VS_FF_PRERELEASE __MSABI_LONG(0x02) -#define VS_FF_PATCHED __MSABI_LONG(0x04) -#define VS_FF_PRIVATEBUILD __MSABI_LONG(0x08) -#define VS_FF_INFOINFERRED __MSABI_LONG(0x10) -#define VS_FF_SPECIALBUILD __MSABI_LONG(0x20) - -/* VS_VERSION.dwFileOS */ - -/* major os version */ -#define VOS_UNKNOWN __MSABI_LONG(0x00000000) -#define VOS_DOS __MSABI_LONG(0x00010000) -#define VOS_OS216 __MSABI_LONG(0x00020000) -#define VOS_OS232 __MSABI_LONG(0x00030000) -#define VOS_NT __MSABI_LONG(0x00040000) -#define VOS_WINCE __MSABI_LONG(0x00050000) - -/* minor os version */ -#define VOS__BASE __MSABI_LONG(0x00000000) -#define VOS__WINDOWS16 __MSABI_LONG(0x00000001) -#define VOS__PM16 __MSABI_LONG(0x00000002) -#define VOS__PM32 __MSABI_LONG(0x00000003) -#define VOS__WINDOWS32 __MSABI_LONG(0x00000004) - -/* possible versions */ -#define VOS_DOS_WINDOWS16 (VOS_DOS|VOS__WINDOWS16) -#define VOS_DOS_WINDOWS32 (VOS_DOS|VOS__WINDOWS32) -#define VOS_OS216_PM16 (VOS_OS216|VOS__PM16) -#define VOS_OS232_PM32 (VOS_OS232|VOS__PM32) -#define VOS_NT_WINDOWS32 (VOS_NT|VOS__WINDOWS32) - -/* VS_VERSION.dwFileType */ -#define VFT_UNKNOWN __MSABI_LONG(0x00000000) -#define VFT_APP __MSABI_LONG(0x00000001) -#define VFT_DLL __MSABI_LONG(0x00000002) -#define VFT_DRV __MSABI_LONG(0x00000003) -#define VFT_FONT __MSABI_LONG(0x00000004) -#define VFT_VXD __MSABI_LONG(0x00000005) -/* ??one type missing?? __MSABI_LONG(0x00000006) -Marcus */ -#define VFT_STATIC_LIB __MSABI_LONG(0x00000007) - -/* VS_VERSION.dwFileSubtype for VFT_DRV */ -#define VFT2_UNKNOWN __MSABI_LONG(0x00000000) -#define VFT2_DRV_PRINTER __MSABI_LONG(0x00000001) -#define VFT2_DRV_KEYBOARD __MSABI_LONG(0x00000002) -#define VFT2_DRV_LANGUAGE __MSABI_LONG(0x00000003) -#define VFT2_DRV_DISPLAY __MSABI_LONG(0x00000004) -#define VFT2_DRV_MOUSE __MSABI_LONG(0x00000005) -#define VFT2_DRV_NETWORK __MSABI_LONG(0x00000006) -#define VFT2_DRV_SYSTEM __MSABI_LONG(0x00000007) -#define VFT2_DRV_INSTALLABLE __MSABI_LONG(0x00000008) -#define VFT2_DRV_SOUND __MSABI_LONG(0x00000009) -#define VFT2_DRV_COMM __MSABI_LONG(0x0000000a) -#define VFT2_DRV_INPUTMETHOD __MSABI_LONG(0x0000000b) -#define VFT2_DRV_VERSIONED_PRINTER __MSABI_LONG(0x0000000c) - -/* VS_VERSION.dwFileSubtype for VFT_FONT */ -#define VFT2_FONT_RASTER __MSABI_LONG(0x00000001) -#define VFT2_FONT_VECTOR __MSABI_LONG(0x00000002) -#define VFT2_FONT_TRUETYPE __MSABI_LONG(0x00000003) - -/* VerFindFile Flags */ - /* input */ -#define VFFF_ISSHAREDFILE 0x0001 - - /* output (returned) */ -#define VFF_CURNEDEST 0x0001 -#define VFF_FILEINUSE 0x0002 -#define VFF_BUFFTOOSMALL 0x0004 - -/* VerInstallFile Flags */ - /* input */ -#define VIFF_FORCEINSTALL 0x0001 -#define VIFF_DONTDELETEOLD 0x0002 - - /* output (return) */ -#define VIF_TEMPFILE __MSABI_LONG(0x00000001) -#define VIF_MISMATCH __MSABI_LONG(0x00000002) -#define VIF_SRCOLD __MSABI_LONG(0x00000004) -#define VIF_DIFFLANG __MSABI_LONG(0x00000008) -#define VIF_DIFFCODEPG __MSABI_LONG(0x00000010) -#define VIF_DIFFTYPE __MSABI_LONG(0x00000020) -#define VIF_WRITEPROT __MSABI_LONG(0x00000040) -#define VIF_FILEINUSE __MSABI_LONG(0x00000080) -#define VIF_OUTOFSPACE __MSABI_LONG(0x00000100) -#define VIF_ACCESSVIOLATION __MSABI_LONG(0x00000200) -#define VIF_SHARINGVIOLATION __MSABI_LONG(0x00000400) -#define VIF_CANNOTCREATE __MSABI_LONG(0x00000800) -#define VIF_CANNOTDELETE __MSABI_LONG(0x00001000) -#define VIF_CANNOTRENAME __MSABI_LONG(0x00002000) -#define VIF_CANNOTDELETECUR __MSABI_LONG(0x00004000) -#define VIF_OUTOFMEMORY __MSABI_LONG(0x00008000) -#define VIF_CANNOTREADSRC __MSABI_LONG(0x00010000) -#define VIF_CANNOTREADDST __MSABI_LONG(0x00020000) -#define VIF_BUFFTOOSMALL __MSABI_LONG(0x00040000) -#define VIF_CANNOTLOADLZ32 __MSABI_LONG(0x00080000) -#define VIF_CANNOTLOADCABINET __MSABI_LONG(0x00100000) - -typedef struct tagVS_FIXEDFILEINFO { - DWORD dwSignature; - DWORD dwStrucVersion; - DWORD dwFileVersionMS; - DWORD dwFileVersionLS; - DWORD dwProductVersionMS; - DWORD dwProductVersionLS; - DWORD dwFileFlagsMask; - DWORD dwFileFlags; - DWORD dwFileOS; - DWORD dwFileType; - DWORD dwFileSubtype; - DWORD dwFileDateMS; - DWORD dwFileDateLS; -} VS_FIXEDFILEINFO; - - -#ifndef RC_INVOKED - -/* function prototypes */ - -DWORD WINAPI VerFindFileA(DWORD,LPCSTR,LPCSTR,LPCSTR,LPSTR,PUINT,LPSTR,PUINT); -DWORD WINAPI VerFindFileW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,PUINT,LPWSTR,PUINT); -#define VerFindFile WINELIB_NAME_AW(VerFindFile) -DWORD WINAPI VerInstallFileA(DWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,PUINT); -DWORD WINAPI VerInstallFileW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,PUINT); -#define VerInstallFile WINELIB_NAME_AW(VerInstallFile) -DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD); -DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD); -#define VerLanguageName WINELIB_NAME_AW(VerLanguageName) -BOOL WINAPI VerQueryValueA(LPCVOID,LPCSTR,LPVOID*,PUINT); -BOOL WINAPI VerQueryValueW(LPCVOID,LPCWSTR,LPVOID*,PUINT); -#define VerQueryValue WINELIB_NAME_AW(VerQueryValue) -DWORD WINAPI GetFileVersionInfoSizeA(LPCSTR,LPDWORD); -DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,LPDWORD); -#define GetFileVersionInfoSize WINELIB_NAME_AW(GetFileVersionInfoSize) -BOOL WINAPI GetFileVersionInfoA(LPCSTR,DWORD,DWORD,LPVOID); -BOOL WINAPI GetFileVersionInfoW(LPCWSTR,DWORD,DWORD,LPVOID); -#define GetFileVersionInfo WINELIB_NAME_AW(GetFileVersionInfo) -DWORD WINAPI GetFileVersionInfoSizeExA(DWORD,LPCSTR,LPDWORD); -DWORD WINAPI GetFileVersionInfoSizeExW(DWORD,LPCWSTR,LPDWORD); -#define GetFileVersionInfoSizeEx WINELIB_NAME_AW(GetFileVersionInfoSizeEx) -BOOL WINAPI GetFileVersionInfoExA(DWORD,LPCSTR,DWORD,DWORD,LPVOID); -BOOL WINAPI GetFileVersionInfoExW(DWORD,LPCWSTR,DWORD,DWORD,LPVOID); -#define GetFileVersionInfoEx WINELIB_NAME_AW(GetFileVersionInfoEx) - -#endif /* RC_INVOKED */ - -#ifdef __cplusplus -} /* extern "C" */ -#endif /* defined(__cplusplus) */ - -#endif /* __WINE_WINVER_H */ +/* Definitions for the VERsion info library (VER.DLL) + * + * Copyright 1996 Marcus Meissner + * + * 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 + */ + +#ifndef __WINE_WINVER_H +#define __WINE_WINVER_H + +/* FIXME: #include */ +#include + +#ifdef __cplusplus +extern "C" { +#endif /* defined(__cplusplus) */ + +#ifndef RC_INVOKED + +/* function prototypes */ + +DWORD WINAPI VerFindFileA(DWORD,LPCSTR,LPCSTR,LPCSTR,LPSTR,PUINT,LPSTR,PUINT); +DWORD WINAPI VerFindFileW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,PUINT,LPWSTR,PUINT); +#define VerFindFile WINELIB_NAME_AW(VerFindFile) +DWORD WINAPI VerInstallFileA(DWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,PUINT); +DWORD WINAPI VerInstallFileW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,PUINT); +#define VerInstallFile WINELIB_NAME_AW(VerInstallFile) +DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD); +DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD); +#define VerLanguageName WINELIB_NAME_AW(VerLanguageName) +BOOL WINAPI VerQueryValueA(LPCVOID,LPCSTR,LPVOID*,PUINT); +BOOL WINAPI VerQueryValueW(LPCVOID,LPCWSTR,LPVOID*,PUINT); +#define VerQueryValue WINELIB_NAME_AW(VerQueryValue) +DWORD WINAPI GetFileVersionInfoSizeA(LPCSTR,LPDWORD); +DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,LPDWORD); +#define GetFileVersionInfoSize WINELIB_NAME_AW(GetFileVersionInfoSize) +BOOL WINAPI GetFileVersionInfoA(LPCSTR,DWORD,DWORD,LPVOID); +BOOL WINAPI GetFileVersionInfoW(LPCWSTR,DWORD,DWORD,LPVOID); +#define GetFileVersionInfo WINELIB_NAME_AW(GetFileVersionInfo) +DWORD WINAPI GetFileVersionInfoSizeExA(DWORD,LPCSTR,LPDWORD); +DWORD WINAPI GetFileVersionInfoSizeExW(DWORD,LPCWSTR,LPDWORD); +#define GetFileVersionInfoSizeEx WINELIB_NAME_AW(GetFileVersionInfoSizeEx) +BOOL WINAPI GetFileVersionInfoExA(DWORD,LPCSTR,DWORD,DWORD,LPVOID); +BOOL WINAPI GetFileVersionInfoExW(DWORD,LPCWSTR,DWORD,DWORD,LPVOID); +#define GetFileVersionInfoEx WINELIB_NAME_AW(GetFileVersionInfoEx) + +#endif /* RC_INVOKED */ + +#ifdef __cplusplus +} /* extern "C" */ +#endif /* defined(__cplusplus) */ + +#endif /* __WINE_WINVER_H */ -- 2.11.4.GIT