Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove winver.h and fix the errors.

Browse source 
svn path=/trunk/; revision=7462
This commit is contained in:
Filip Navara 2004-01-05 18:12:18 +00:00
parent 94ecbd89db
commit 2556727beb
3 changed files with 27 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

179
reactos/include/winver.h
View file

@ -1,179 +0,0 @@
/* Definitions for the VERsion infolibrary (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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 16
#define VS_VERSION_INFO 1
#define VS_USER_DEFINED 100
#define VS_FFI_SIGNATURE 0xfeef04bdL /* FileInfo Magic */
#define VS_FFI_STRUCVERSION 0x00010000L /* struc version 1.0 */
#define VS_FFI_FILEFLAGSMASK 0x0000003fL /* valid flags */
/* VS_VERSION.dwFileFlags */
#define VS_FF_DEBUG 0x01L
#define VS_FF_PRERELEASE 0x02L
#define VS_FF_PATCHED 0x04L
#define VS_FF_PRIVATEBUILD 0x08L
#define VS_FF_INFOINFERRED 0x10L
#define VS_FF_SPECIALBUILD 0x20L
/* VS_VERSION.dwFileOS */
/* major os version */
#define VOS_UNKNOWN 0x00000000L
#define VOS_DOS 0x00010000L
#define VOS_OS216 0x00020000L
#define VOS_OS232 0x00030000L
#define VOS_NT 0x00040000L
/* minor os version */
#define VOS__BASE 0x00000000L
#define VOS__WINDOWS16 0x00000001L
#define VOS__PM16 0x00000002L
#define VOS__PM32 0x00000003L
#define VOS__WINDOWS32 0x00000004L
/* 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 0x00000000L
#define VFT_APP 0x00000001L
#define VFT_DLL 0x00000002L
#define VFT_DRV 0x00000003L
#define VFT_FONT 0x00000004L
#define VFT_VXD 0x00000005L
/* ??one type missing?? 0x00000006L -Marcus */
#define VFT_STATIC_LIB 0x00000007L
/* VS_VERSION.dwFileSubtype for VFT_DRV */
#define VFT2_UNKNOWN 0x00000000L
#define VFT2_DRV_PRINTER 0x00000001L
#define VFT2_DRV_KEYBOARD 0x00000002L
#define VFT2_DRV_LANGUAGE 0x00000003L
#define VFT2_DRV_DISPLAY 0x00000004L
#define VFT2_DRV_MOUSE 0x00000005L
#define VFT2_DRV_NETWORK 0x00000006L
#define VFT2_DRV_SYSTEM 0x00000007L
#define VFT2_DRV_INSTALLABLE 0x00000008L
#define VFT2_DRV_SOUND 0x00000009L
#define VFT2_DRV_COMM 0x0000000aL
#define VFT2_DRV_INPUTMETHOD 0x0000000bL
/* VS_VERSION.dwFileSubtype for VFT_FONT */
#define VFT2_FONT_RASTER 0x00000001L
#define VFT2_FONT_VECTOR 0x00000002L
#define VFT2_FONT_TRUETYPE 0x00000003L
/* 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 0x00000001L
#define VIF_MISMATCH 0x00000002L
#define VIF_SRCOLD 0x00000004L
#define VIF_DIFFLANG 0x00000008L
#define VIF_DIFFCODEPG 0x00000010L
#define VIF_DIFFTYPE 0x00000020L
#define VIF_WRITEPROT 0x00000040L
#define VIF_FILEINUSE 0x00000080L
#define VIF_OUTOFSPACE 0x00000100L
#define VIF_ACCESSVIOLATION 0x00000200L
#define VIF_SHARINGVIOLATION 0x00000400L
#define VIF_CANNOTCREATE 0x00000800L
#define VIF_CANNOTDELETE 0x00001000L
#define VIF_CANNOTRENAME 0x00002000L
#define VIF_CANNOTDELETECUR 0x00004000L
#define VIF_OUTOFMEMORY 0x00008000L
#define VIF_CANNOTREADSRC 0x00010000L
#define VIF_CANNOTREADDST 0x00020000L
#define VIF_BUFFTOOSMALL 0x00040000L
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(UINT,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT*,LPSTR,UINT*);
DWORD WINAPI VerFindFileW(UINT,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT*,LPWSTR,UINT*);
#define VerFindFile WINELIB_NAME_AW(VerFindFile)
DWORD WINAPI VerInstallFileA(UINT,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT*);
DWORD WINAPI VerInstallFileW(UINT,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT*);
#define VerInstallFile WINELIB_NAME_AW(VerInstallFile)
DWORD WINAPI VerLanguageNameA(UINT,LPSTR,UINT);
DWORD WINAPI VerLanguageNameW(UINT,LPWSTR,UINT);
#define VerLanguageName WINELIB_NAME_AW(VerLanguageName)
DWORD WINAPI VerQueryValueA(LPVOID,LPCSTR,LPVOID*,UINT*);
DWORD WINAPI VerQueryValueW(LPVOID,LPCWSTR,LPVOID*,UINT*);
#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)
/* 20 GETFILEVERSIONINFORAW */
#endif /* RC_INVOKED */
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_WINVER_H */

25
reactos/lib/version/info.c
View file

@ -38,6 +38,14 @@
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#ifdef __REACTOS__
DWORD WINAPI GetFileResourceSize16( LPCSTR lpszFileName, LPCSTR lpszResType,
LPCSTR lpszResId, LPDWORD lpdwFileOffset );
DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType,
LPCSTR lpszResId, DWORD dwFileOffset,
DWORD dwResLen, LPVOID lpvData )
#endif
WINE_DEFAULT_DEBUG_CHANNEL(ver); WINE_DEFAULT_DEBUG_CHANNEL(ver);
@ -436,13 +444,14 @@ END:
return len; return len;
#else /* __MINGW32__ */ #else /* __MINGW32__ */
FIXME("No Support for 16bit version information on ReactOS\n"); FIXME("No Support for 16bit version information on ReactOS\n");
return 0;
#endif /* __MINGW32__ */ #endif /* __MINGW32__ */
} }
/*********************************************************************** /***********************************************************************
* GetFileVersionInfoSizeA [VERSION.@] * GetFileVersionInfoSizeA [VERSION.@]
*/ */
DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle ) DWORD WINAPI GetFileVersionInfoSizeA( LPSTR filename, LPDWORD handle )
{ {
VS_FIXEDFILEINFO *vffi; VS_FIXEDFILEINFO *vffi;
DWORD len, ret, offset; DWORD len, ret, offset;
@ -505,7 +514,7 @@ DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle )
/*********************************************************************** /***********************************************************************
* GetFileVersionInfoSizeW [VERSION.@] * GetFileVersionInfoSizeW [VERSION.@]
*/ */
DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) DWORD WINAPI GetFileVersionInfoSizeW( LPWSTR filename, LPDWORD handle )
{ {
DWORD ret, len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL ); DWORD ret, len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL );
LPSTR fn = HeapAlloc( GetProcessHeap(), 0, len ); LPSTR fn = HeapAlloc( GetProcessHeap(), 0, len );
@ -518,7 +527,7 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle )
/*********************************************************************** /***********************************************************************
* GetFileVersionInfoA [VERSION.@] * GetFileVersionInfoA [VERSION.@]
*/ */
BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, BOOL WINAPI GetFileVersionInfoA( LPSTR filename, DWORD handle,
DWORD datasize, LPVOID data ) DWORD datasize, LPVOID data )
{ {
DWORD len; DWORD len;
@ -557,7 +566,7 @@ DO_CONVERT:
/*********************************************************************** /***********************************************************************
* GetFileVersionInfoW [VERSION.@] * GetFileVersionInfoW [VERSION.@]
*/ */
BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, BOOL WINAPI GetFileVersionInfoW( LPWSTR filename, DWORD handle,
DWORD datasize, LPVOID data ) DWORD datasize, LPVOID data )
{ {
DWORD len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL ); DWORD len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL );
@ -634,7 +643,7 @@ static VS_VERSION_INFO_STRUCT32 *VersionInfo32_FindChild( VS_VERSION_INFO_STRUCT
/*********************************************************************** /***********************************************************************
* VerQueryValueA [VERSION.@] * VerQueryValueA [VERSION.@]
*/ */
DWORD WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock, BOOL WINAPI VerQueryValueA( const LPVOID pBlock, LPSTR lpSubBlock,
LPVOID *lplpBuffer, UINT *puLen ) LPVOID *lplpBuffer, UINT *puLen )
{ {
VS_VERSION_INFO_STRUCT16 *info = (VS_VERSION_INFO_STRUCT16 *)pBlock; VS_VERSION_INFO_STRUCT16 *info = (VS_VERSION_INFO_STRUCT16 *)pBlock;
@ -661,7 +670,7 @@ DWORD WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock,
while ( *lpSubBlock ) while ( *lpSubBlock )
{ {
/* Find next path component */ /* Find next path component */
LPCSTR lpNextSlash; LPSTR lpNextSlash;
for ( lpNextSlash = lpSubBlock; *lpNextSlash; lpNextSlash++ ) for ( lpNextSlash = lpSubBlock; *lpNextSlash; lpNextSlash++ )
if ( *lpNextSlash == '\\' ) if ( *lpNextSlash == '\\' )
break; break;
@ -691,7 +700,7 @@ DWORD WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock,
/*********************************************************************** /***********************************************************************
* VerQueryValueW [VERSION.@] * VerQueryValueW [VERSION.@]
*/ */
DWORD WINAPI VerQueryValueW( LPVOID pBlock, LPCWSTR lpSubBlock, BOOL WINAPI VerQueryValueW( const LPVOID pBlock, LPWSTR lpSubBlock,
LPVOID *lplpBuffer, UINT *puLen ) LPVOID *lplpBuffer, UINT *puLen )
{ {
VS_VERSION_INFO_STRUCT32 *info = (VS_VERSION_INFO_STRUCT32 *)pBlock; VS_VERSION_INFO_STRUCT32 *info = (VS_VERSION_INFO_STRUCT32 *)pBlock;
@ -707,7 +716,7 @@ DWORD WINAPI VerQueryValueW( LPVOID pBlock, LPCWSTR lpSubBlock,
while ( *lpSubBlock ) while ( *lpSubBlock )
{ {
/* Find next path component */ /* Find next path component */
LPCWSTR lpNextSlash; LPWSTR lpNextSlash;
for ( lpNextSlash = lpSubBlock; *lpNextSlash; lpNextSlash++ ) for ( lpNextSlash = lpSubBlock; *lpNextSlash; lpNextSlash++ )
if ( *lpNextSlash == '\\' ) if ( *lpNextSlash == '\\' )
break; break;

20
reactos/lib/version/install.c
View file

@ -131,10 +131,10 @@ static int testFileExistenceW( const WCHAR *path, const WCHAR *file, BOOL excl )
* Reimplementation of VerFindFile from original stub. * Reimplementation of VerFindFile from original stub.
*/ */
DWORD WINAPI VerFindFileA( DWORD WINAPI VerFindFileA(
UINT flags, DWORD flags,
LPCSTR lpszFilename, LPSTR lpszFilename,
LPCSTR lpszWinDir, LPSTR lpszWinDir,
LPCSTR lpszAppDir, LPSTR lpszAppDir,
LPSTR lpszCurDir, LPSTR lpszCurDir,
UINT *lpuCurDirLen, UINT *lpuCurDirLen,
LPSTR lpszDestDir, LPSTR lpszDestDir,
@ -226,8 +226,8 @@ DWORD WINAPI VerFindFileA(
/***************************************************************************** /*****************************************************************************
* VerFindFileW [VERSION.@] * VerFindFileW [VERSION.@]
*/ */
DWORD WINAPI VerFindFileW( UINT flags,LPCWSTR lpszFilename,LPCWSTR lpszWinDir, DWORD WINAPI VerFindFileW( DWORD flags,LPWSTR lpszFilename,LPWSTR lpszWinDir,
LPCWSTR lpszAppDir, LPWSTR lpszCurDir,UINT *lpuCurDirLen, LPWSTR lpszAppDir, LPWSTR lpszCurDir,UINT *lpuCurDirLen,
LPWSTR lpszDestDir,UINT *lpuDestDirLen ) LPWSTR lpszDestDir,UINT *lpuDestDirLen )
{ {
static const WCHAR emptyW; static const WCHAR emptyW;
@ -367,8 +367,8 @@ _error2vif(DWORD error) {
* VerInstallFileA [VERSION.@] * VerInstallFileA [VERSION.@]
*/ */
DWORD WINAPI VerInstallFileA( DWORD WINAPI VerInstallFileA(
UINT flags,LPCSTR srcfilename,LPCSTR destfilename,LPCSTR srcdir, DWORD flags,LPSTR srcfilename,LPSTR destfilename,LPSTR srcdir,
LPCSTR destdir,LPCSTR curdir,LPSTR tmpfile,UINT *tmpfilelen ) LPSTR destdir,LPSTR curdir,LPSTR tmpfile,UINT *tmpfilelen )
{ {
LPCSTR pdest; LPCSTR pdest;
char destfn[260],tmpfn[260],srcfn[260]; char destfn[260],tmpfn[260],srcfn[260];
@ -534,8 +534,8 @@ DWORD WINAPI VerInstallFileA(
* VerInstallFileW [VERSION.@] * VerInstallFileW [VERSION.@]
*/ */
DWORD WINAPI VerInstallFileW( DWORD WINAPI VerInstallFileW(
UINT flags,LPCWSTR srcfilename,LPCWSTR destfilename,LPCWSTR srcdir, DWORD flags,LPWSTR srcfilename,LPWSTR destfilename,LPWSTR srcdir,
LPCWSTR destdir,LPCWSTR curdir,LPWSTR tmpfile,UINT *tmpfilelen ) LPWSTR destdir,LPWSTR curdir,LPWSTR tmpfile,UINT *tmpfilelen )
{ {
LPSTR wsrcf = NULL, wsrcd = NULL, wdestf = NULL, wdestd = NULL, wtmpf = NULL, wcurd = NULL; LPSTR wsrcf = NULL, wsrcd = NULL, wdestf = NULL, wdestd = NULL, wtmpf = NULL, wcurd = NULL;
DWORD ret; DWORD ret;