msi: fixes for appsearch

Aric Stewart aric at codeweavers.com
Wed Feb 2 00:38:56 CST 2005


A few fixes i found and Juan approves of.
Fix a copy and paste error, check for a null value and discard unneeded 
errors.
-------------- next part --------------
Index: dlls/msi/appsearch.c
===================================================================
RCS file: /home/wine/wine/dlls/msi/appsearch.c,v
retrieving revision 1.1
diff -u -u -r1.1 appsearch.c
--- dlls/msi/appsearch.c	1 Feb 2005 14:22:31 -0000	1.1
+++ dlls/msi/appsearch.c	2 Feb 2005 06:30:41 -0000
@@ -127,7 +127,7 @@
         maxVersion = load_dynamic_stringW(row,4);
         if (maxVersion)
         {
-            ACTION_VerStrToInteger(minVersion, &sig->MaxVersionMS,
+            ACTION_VerStrToInteger(maxVersion, &sig->MaxVersionMS,
              &sig->MaxVersionLS);
             HeapFree(GetProcessHeap(), 0, maxVersion);
         }
@@ -610,6 +610,9 @@
     }
     else
         rc = ERROR_OUTOFMEMORY;
+
+    if (rc != ERROR_OUTOFMEMORY )
+        rc = ERROR_SUCCESS;
     return rc;
 }
 
@@ -689,7 +692,10 @@
             ERR("Error is %x\n",rc);
             goto end;
         }
-        depth = MSI_RecordGetInteger(row,4);
+        if (MSI_RecordIsNull(row,4))
+            depth = 0;
+        else
+            depth = MSI_RecordGetInteger(row,4);
         ACTION_ExpandAnyPath(package, buffer, expanded,
          sizeof(expanded) / sizeof(expanded[0]));
         if (sig->File)


More information about the wine-patches mailing list