[ros-diffs] [winesync] 27927: Autosyncing with Wine HEAD

[winesync at svn.reactos.org]

Author: winesync
Date: Fri Jul 27 15:36:07 2007
New Revision: 27927

URL: http://svn.reactos.org/svn/reactos?rev=27927&view=rev
Log:
Autosyncing with Wine HEAD

Modified:
    trunk/reactos/dll/win32/version/info.c
    trunk/reactos/dll/win32/version/version_ros.diff

Modified: trunk/reactos/dll/win32/version/info.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/info.c?rev=27927&r1=27926&r2=27927&view=diff
==============================================================================
--- trunk/reactos/dll/win32/version/info.c (original)
+++ trunk/reactos/dll/win32/version/info.c Fri Jul 27 15:36:07 2007
@@ -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;
@@ -835,6 +838,9 @@
 
     TRACE("(%p,%s,%p,%p)\n",
                 pBlock, debugstr_w(lpSubBlock), lplpBuffer, puLen );
+
+    if (!pBlock)
+        return FALSE;
 
     if ( VersionInfoIs16( info ) )
     {

Modified: trunk/reactos/dll/win32/version/version_ros.diff
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/version_ros.diff?rev=27927&r1=27926&r2=27927&view=diff
==============================================================================
--- trunk/reactos/dll/win32/version/version_ros.diff (original)
+++ trunk/reactos/dll/win32/version/version_ros.diff Fri Jul 27 15:36:07 2007
@@ -64,6 +64,26 @@
      }
      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)