Cleanup of properties cleanup

Vincent Béron vberon at mecano.gme.usherb.ca
Sun Jul 18 20:36:06 CDT 2004


Changelog:
Cleanup of the properties last space removal, since it can be used not
only with Install.

Vincent
-------------- next part --------------
--- wine/programs/msiexec/msiexec.c-orig	2004-07-18 21:22:02.000000000 -0400
+++ wine/programs/msiexec/msiexec.c	2004-07-18 21:24:55.000000000 -0400
@@ -283,19 +283,20 @@
 		}
 	}
 
-	if(FunctionInstall)
+	if(Properties[strlen(Properties)-1] == ' ')
 	{
-		if(Properties[strlen(Properties)-1] == ' ')
+		Properties[strlen(Properties)-1] = 0;
+		TempStr = HeapReAlloc(GetProcessHeap(), 0, Properties, HeapSize(GetProcessHeap(), 0, Properties)-1);
+		if(!TempStr)
 		{
-			Properties[strlen(Properties)-1] = 0;
-			TempStr = HeapReAlloc(GetProcessHeap(), 0, Properties, HeapSize(GetProcessHeap(), 0, Properties)-1);
-			if(!TempStr)
-			{
-				fprintf(stderr, "Out of memory!\n");
-				ExitProcess(1);
-			}
-			Properties = TempStr;
+			fprintf(stderr, "Out of memory!\n");
+			ExitProcess(1);
 		}
+		Properties = TempStr;
+	}
+
+	if(FunctionInstall)
+	{
 		if(GotProductCode)
 		{
 			WINE_FIXME("Product code treatment not implemented yet\n");


More information about the wine-patches mailing list