MSI: handle deformatting of null strings by returining null

[Mike McCormack]

ChangeLog:
* handle deformatting of null strings by returining null
-------------- next part --------------
Index: dlls/msi/action.c
===================================================================
RCS file: /home/wine/wine/dlls/msi/action.c,v
retrieving revision 1.46
diff -u -r1.46 action.c
--- dlls/msi/action.c	22 Dec 2004 18:46:17 -0000	1.46
+++ dlls/msi/action.c	23 Dec 2004 01:33:36 -0000
@@ -2866,6 +2866,11 @@
                     DeleteFileW(file->SourcePath);
                     rc = 0;
                 }
+                else if (rc == ERROR_FILE_NOT_FOUND)
+                {
+                    ERR("Source File Not Found!  Continueing\n");
+                    rc = 0;
+                }
                 else
                     break;
             }
@@ -3303,6 +3308,12 @@
     DWORD sz;
     UINT rc;
 
+    if (ptr==NULL)
+    {
+        TRACE("Deformatting NULL string\n");
+        *data = NULL;
+        return 0;
+    }
     /* scan for special characters */
     if (!strchrW(ptr,'[') || (strchrW(ptr,'[') && !strchrW(ptr,']')))
     {