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

Autosyncing with Wine HEAD

Browse source 
svn path=/trunk/; revision=30890
This commit is contained in:
The Wine Synchronizer 2007-11-29 11:26:23 +00:00
parent a1e248d5f0
commit 2ffe4fd798
5 changed files with 35 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

12
reactos/dll/win32/version/info.c
View file

@ -247,11 +247,9 @@ static DWORD VERSION_GetFileVersionInfo_PE( LPCWSTR filename, DWORD datasize, LP
TRACE("%s\n", debugstr_w(filename)); TRACE("%s\n", debugstr_w(filename));
hModule = GetModuleHandleW(filename); if (!GetModuleHandleExW(0, filename, &hModule))
if(!hModule)
hModule = LoadLibraryExW(filename, 0, LOAD_LIBRARY_AS_DATAFILE); hModule = LoadLibraryExW(filename, 0, LOAD_LIBRARY_AS_DATAFILE);
else
hModule = LoadLibraryExW(filename, 0, 0);
if(!hModule) if(!hModule)
{ {
WARN("Could not load %s\n", debugstr_w(filename)); WARN("Could not load %s\n", debugstr_w(filename));
@ -775,7 +773,7 @@ static BOOL WINAPI VersionInfo32_QueryValue( const VS_VERSION_INFO_STRUCT32 *inf
* VerQueryValueA [VERSION.@] * VerQueryValueA [VERSION.@]
*/ */
BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock,
LPVOID *lplpBuffer, UINT *puLen ) LPVOID *lplpBuffer, PUINT puLen )
{ {
static const char rootA[] = "\\"; static const char rootA[] = "\\";
static const char varfileinfoA[] = "\\VarFileInfo\\Translation"; static const char varfileinfoA[] = "\\VarFileInfo\\Translation";
@ -784,7 +782,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock,
TRACE("(%p,%s,%p,%p)\n", TRACE("(%p,%s,%p,%p)\n",
pBlock, debugstr_a(lpSubBlock), lplpBuffer, puLen ); pBlock, debugstr_a(lpSubBlock), lplpBuffer, puLen );
if (!pBlock) if (!pBlock)
return FALSE; return FALSE;
if ( !VersionInfoIs16( info ) ) if ( !VersionInfoIs16( info ) )
@ -828,7 +826,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock,
* VerQueryValueW [VERSION.@] * VerQueryValueW [VERSION.@]
*/ */
BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock,
LPVOID *lplpBuffer, UINT *puLen ) LPVOID *lplpBuffer, PUINT puLen )
{ {
static const WCHAR rootW[] = { '\\', 0 }; static const WCHAR rootW[] = { '\\', 0 };
static const WCHAR varfileinfoW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o', static const WCHAR varfileinfoW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o',

24
reactos/dll/win32/version/install.c
View file

@ -123,13 +123,13 @@ static int testFileExistenceW( const WCHAR *path, const WCHAR *file, BOOL excl )
*/ */
DWORD WINAPI VerFindFileA( DWORD WINAPI VerFindFileA(
DWORD flags, DWORD flags,
LPSTR lpszFilename, LPCSTR lpszFilename,
LPSTR lpszWinDir, LPCSTR lpszWinDir,
LPSTR lpszAppDir, LPCSTR lpszAppDir,
LPSTR lpszCurDir, LPSTR lpszCurDir,
UINT *lpuCurDirLen, PUINT lpuCurDirLen,
LPSTR lpszDestDir, LPSTR lpszDestDir,
UINT *lpuDestDirLen ) PUINT lpuDestDirLen )
{ {
DWORD retval = 0; DWORD retval = 0;
const char *curDir; const char *curDir;
@ -220,9 +220,9 @@ DWORD WINAPI VerFindFileA(
/***************************************************************************** /*****************************************************************************
* VerFindFileW [VERSION.@] * VerFindFileW [VERSION.@]
*/ */
DWORD WINAPI VerFindFileW( DWORD flags,LPWSTR lpszFilename,LPWSTR lpszWinDir, DWORD WINAPI VerFindFileW( DWORD flags,LPCWSTR lpszFilename,LPCWSTR lpszWinDir,
LPWSTR lpszAppDir, LPWSTR lpszCurDir,UINT *lpuCurDirLen, LPCWSTR lpszAppDir, LPWSTR lpszCurDir,PUINT lpuCurDirLen,
LPWSTR lpszDestDir,UINT *lpuDestDirLen ) LPWSTR lpszDestDir,PUINT lpuDestDirLen )
{ {
static const WCHAR emptyW; static const WCHAR emptyW;
DWORD retval = 0; DWORD retval = 0;
@ -361,8 +361,8 @@ _error2vif(DWORD error) {
* VerInstallFileA [VERSION.@] * VerInstallFileA [VERSION.@]
*/ */
DWORD WINAPI VerInstallFileA( DWORD WINAPI VerInstallFileA(
DWORD flags,LPSTR srcfilename,LPSTR destfilename,LPSTR srcdir, DWORD flags,LPCSTR srcfilename,LPCSTR destfilename,LPCSTR srcdir,
LPSTR destdir,LPSTR curdir,LPSTR tmpfile,UINT *tmpfilelen ) LPCSTR destdir,LPCSTR curdir,LPSTR tmpfile,PUINT tmpfilelen )
{ {
LPCSTR pdest; LPCSTR pdest;
char destfn[260],tmpfn[260],srcfn[260]; char destfn[260],tmpfn[260],srcfn[260];
@ -529,8 +529,8 @@ DWORD WINAPI VerInstallFileA(
* VerInstallFileW [VERSION.@] * VerInstallFileW [VERSION.@]
*/ */
DWORD WINAPI VerInstallFileW( DWORD WINAPI VerInstallFileW(
DWORD flags,LPWSTR srcfilename,LPWSTR destfilename,LPWSTR srcdir, DWORD flags,LPCWSTR srcfilename,LPCWSTR destfilename,LPCWSTR srcdir,
LPWSTR destdir,LPWSTR curdir,LPWSTR tmpfile,UINT *tmpfilelen ) LPCWSTR destdir,LPCWSTR curdir,LPWSTR tmpfile,PUINT 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;

3
reactos/dll/win32/version/resource.c
View file

@ -39,7 +39,6 @@
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "wine/debug.h" #include "wine/debug.h"
@ -295,7 +294,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid,
pehdoffset = LZSeek( lzfd, 0, SEEK_CUR ); pehdoffset = LZSeek( lzfd, 0, SEEK_CUR );
if ( sizeof(pehd) != LZRead( lzfd, (LPSTR)&pehd, sizeof(pehd) ) ) return 0; if ( sizeof(pehd) != LZRead( lzfd, (LPSTR)&pehd, sizeof(pehd) ) ) return 0;
resDataDir = pehd.OptionalHeader.DataDirectory+IMAGE_FILE_RESOURCE_DIRECTORY; resDataDir = pehd.OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_RESOURCE;
if ( !resDataDir->Size ) if ( !resDataDir->Size )
{ {
TRACE("No resources in PE dll\n" ); TRACE("No resources in PE dll\n" );

9
reactos/dll/win32/version/version.rbuild
View file

@ -1,13 +1,12 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="version" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_VERSION}" installbase="system32" installname="version.dll" allowwarnings="true"> <module name="version" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_VERSION}" installbase="system32" installname="version.dll" allowwarnings="true">
<importlibrary definition="version.spec.def" /> <importlibrary definition="version.spec.def" />
<include base="version">.</include> <include base="version">.</include>
<include base="ReactOS">include/reactos/wine</include> <include base="ReactOS">include/reactos/wine</include>
<define name="__REACTOS__" />
<define name="__WINESRC__" /> <define name="__WINESRC__" />
<define name="__USE_W32API" /> <define name="WINVER">0x600</define>
<define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x600</define>
<define name="_WIN32_WINNT">0x501</define>
<define name="WINVER">0x501</define>
<library>wine</library> <library>wine</library>
<library>lz32</library> <library>lz32</library>
<library>kernel32</library> <library>kernel32</library>

82
reactos/dll/win32/version/version_ros.diff
View file

@ -10,7 +10,7 @@ Index: info.c
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "winerror.h" #include "winerror.h"
@@ -304,6 +305,7 @@ @@ -302,6 +303,7 @@
return len; return len;
} }
@ -18,7 +18,7 @@ Index: info.c
/*********************************************************************** /***********************************************************************
* VERSION_GetFileVersionInfo_16 [internal] * VERSION_GetFileVersionInfo_16 [internal]
* *
@@ -437,6 +440,7 @@ @@ -435,6 +438,7 @@
return len; return len;
} }
@ -26,7 +26,7 @@ Index: info.c
/*********************************************************************** /***********************************************************************
* GetFileVersionInfoSizeW [VERSION.@] * GetFileVersionInfoSizeW [VERSION.@]
@@ -470,6 +473,10 @@ @@ -468,6 +471,10 @@
if (!len) if (!len)
{ {
@ -37,7 +37,7 @@ Index: info.c
LPSTR filenameA; LPSTR filenameA;
len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL ); len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL );
@@ -501,6 +508,7 @@ @@ -499,6 +506,7 @@
* doesn't seem to be a problem (len is bigger than info->wLength). * doesn't seem to be a problem (len is bigger than info->wLength).
*/ */
len = (len - sizeof(VS_FIXEDFILEINFO)) * 4; len = (len - sizeof(VS_FIXEDFILEINFO)) * 4;
@ -45,7 +45,7 @@ Index: info.c
} }
else else
{ {
@@ -565,6 +573,10 @@ @@ -563,6 +571,10 @@
if (!len) if (!len)
{ {
@ -56,7 +56,7 @@ Index: info.c
LPSTR filenameA; LPSTR filenameA;
len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL ); len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL );
@@ -580,6 +592,7 @@ @@ -578,6 +590,7 @@
return FALSE; return FALSE;
} }
/* We have a 16bit resource. */ /* We have a 16bit resource. */
@ -64,71 +64,11 @@ Index: info.c
} }
else else
{ {
@@ -784,6 +784,9 @@
TRACE("(%p,%s,%p,%p)\n",
pBlock, debugstr_a(lpSubBlock), lplpBuffer, puLen );
+ if (!pBlock)
+ return FALSE;
+
if ( !VersionInfoIs16( info ) )
{
BOOL ret;
@@ -836,6 +839,9 @@
TRACE("(%p,%s,%p,%p)\n",
pBlock, debugstr_w(lpSubBlock), lplpBuffer, puLen );
+ if (!pBlock)
+ return FALSE;
+
if ( VersionInfoIs16( info ) )
{
BOOL ret;
Index: install.c
===================================================================
--- install.c (revision 23123)
+++ install.c (working copy)
@@ -122,7 +122,7 @@
* Reimplementation of VerFindFile from original stub.
*/
DWORD WINAPI VerFindFileA(
- UINT flags,
+ DWORD flags,
LPSTR lpszFilename,
LPSTR lpszWinDir,
LPSTR lpszAppDir,
@@ -220,7 +220,7 @@
/*****************************************************************************
* VerFindFileW [VERSION.@]
*/
-DWORD WINAPI VerFindFileW( UINT flags,LPWSTR lpszFilename,LPWSTR lpszWinDir,
+DWORD WINAPI VerFindFileW( DWORD flags,LPWSTR lpszFilename,LPWSTR lpszWinDir,
LPWSTR lpszAppDir, LPWSTR lpszCurDir,UINT *lpuCurDirLen,
LPWSTR lpszDestDir,UINT *lpuDestDirLen )
{
@@ -361,7 +361,7 @@
* VerInstallFileA [VERSION.@]
*/
DWORD WINAPI VerInstallFileA(
- UINT flags,LPSTR srcfilename,LPSTR destfilename,LPSTR srcdir,
+ DWORD flags,LPSTR srcfilename,LPSTR destfilename,LPSTR srcdir,
LPSTR destdir,LPSTR curdir,LPSTR tmpfile,UINT *tmpfilelen )
{
LPCSTR pdest;
@@ -529,7 +529,7 @@
* VerInstallFileW [VERSION.@]
*/
DWORD WINAPI VerInstallFileW(
- UINT flags,LPWSTR srcfilename,LPWSTR destfilename,LPWSTR srcdir,
+ DWORD flags,LPWSTR srcfilename,LPWSTR destfilename,LPWSTR srcdir,
LPWSTR destdir,LPWSTR curdir,LPWSTR tmpfile,UINT *tmpfilelen )
{
LPSTR wsrcf = NULL, wsrcd = NULL, wdestf = NULL, wdestd = NULL, wtmpf = NULL, wcurd = NULL;
Index: resource.c Index: resource.c
=================================================================== ===================================================================
--- resource.c (revision 23123) --- resource.c (revision 23123)
+++ resource.c (working copy) +++ resource.c (working copy)
@@ -43,6 +43,9 @@ @@ -42,6 +42,9 @@
#include "wine/debug.h" #include "wine/debug.h"
@ -138,7 +78,7 @@ Index: resource.c
WINE_DEFAULT_DEBUG_CHANNEL(ver); WINE_DEFAULT_DEBUG_CHANNEL(ver);
@@ -169,6 +172,7 @@ @@ -168,6 +171,7 @@
return 0; return 0;
} }
@ -146,7 +86,7 @@ Index: resource.c
/*********************************************************************** /***********************************************************************
* load_ne_resource [internal] * load_ne_resource [internal]
*/ */
@@ -267,6 +272,7 @@ @@ -266,6 +271,7 @@
HeapFree( GetProcessHeap(), 0, resTab ); HeapFree( GetProcessHeap(), 0, resTab );
return TRUE; return TRUE;
} }
@ -154,7 +94,7 @@ Index: resource.c
/*********************************************************************** /***********************************************************************
* load_pe_resource [internal] * load_pe_resource [internal]
@@ -412,8 +417,13 @@ @@ -411,8 +416,13 @@
switch ( read_xx_header( lzfd ) ) switch ( read_xx_header( lzfd ) )
{ {
case IMAGE_OS2_SIGNATURE: case IMAGE_OS2_SIGNATURE:
@ -168,7 +108,7 @@ Index: resource.c
break; break;
case IMAGE_NT_SIGNATURE: case IMAGE_NT_SIGNATURE:
@@ -451,8 +461,13 @@ @@ -450,8 +460,13 @@
switch ( read_xx_header( lzfd ) ) switch ( read_xx_header( lzfd ) )
{ {
case IMAGE_OS2_SIGNATURE: case IMAGE_OS2_SIGNATURE: