Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 15:46:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Autosyncing with Wine HEAD

Browse source 
svn path=/trunk/; revision=27927
This commit is contained in:
The Wine Synchronizer 2007-07-27 11:36:07 +00:00
parent 660c29094c
commit 7cf2fea853
2 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -784,6 +784,9 @@ 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)
return FALSE;
if ( !VersionInfoIs16( info ) ) if ( !VersionInfoIs16( info ) )
{ {
BOOL ret; BOOL ret;
@ -836,6 +839,9 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock,
TRACE("(%p,%s,%p,%p)\n", TRACE("(%p,%s,%p,%p)\n",
pBlock, debugstr_w(lpSubBlock), lplpBuffer, puLen ); pBlock, debugstr_w(lpSubBlock), lplpBuffer, puLen );
if (!pBlock)
return FALSE;
if ( VersionInfoIs16( info ) ) if ( VersionInfoIs16( info ) )
{ {
BOOL ret; BOOL ret;

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

@ -64,6 +64,26 @@ 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 Index: install.c
=================================================================== ===================================================================
--- install.c (revision 23123) --- install.c (revision 23123)