msi: some error messages and changed suggested by Dmitry

Aric Stewart aric at codeweavers.com
Tue May 17 10:03:03 CDT 2005


some Error messages and strcmp changes suggested by Dmitry

-------------- next part --------------
Index: dlls/msi/action.c
===================================================================
RCS file: /home/wine/wine/dlls/msi/action.c,v
retrieving revision 1.114
diff -u -r1.114 action.c
--- dlls/msi/action.c	16 May 2005 21:37:35 -0000	1.114
+++ dlls/msi/action.c	17 May 2005 15:01:48 -0000
@@ -2744,6 +2744,7 @@
 
     if (the_file == INVALID_HANDLE_VALUE)
     {
+        ERR("Unable to create file %s\n",debugstr_w(source));
         rc = ERROR_FUNCTION_FAILED;
         goto end;
     }
@@ -2846,7 +2847,7 @@
         LPWSTR tracknametmp;
         static const WCHAR tmpprefix[] = {'C','A','B','T','M','P','_',0};
        
-        if (data->file_name && strcmp(data->file_name,pfdin->psz1))
+        if (data->file_name && lstrcmpiA(data->file_name,pfdin->psz1))
                 return 0;
         
         file = cabinet_alloc((len+1)*sizeof(char));
@@ -3189,7 +3190,10 @@
                       rc);
                 if (rc == ERROR_ALREADY_EXISTS && file->State == 2)
                 {
-                    CopyFileW(file->SourcePath,file->TargetPath,FALSE);
+                    if (!CopyFileW(file->SourcePath,file->TargetPath,FALSE))
+                        ERR("Unable to copy file (%s -> %s) (error %ld)\n",
+                            debugstr_w(file->SourcePath), 
+                            debugstr_w(file->TargetPath), GetLastError());
                     if (!(file->Attributes & msidbFileAttributesNoncompressed))
                         DeleteFileW(file->SourcePath);
                     rc = 0;
@@ -5767,7 +5771,10 @@
     snprintfW(path,sizeof(path)/sizeof(path[0]),installerPathFmt,windir);
     create_full_pathW(path);
     TRACE("Copying to local package %s\n",debugstr_w(packagefile));
-    CopyFileW(package->PackagePath,packagefile,FALSE);
+    if (!CopyFileW(package->PackagePath,packagefile,FALSE))
+        ERR("Unable to copy package (%s -> %s) (error %ld)\n",
+            debugstr_w(package->PackagePath), debugstr_w(packagefile),
+            GetLastError());
     size = strlenW(packagefile)*sizeof(WCHAR);
     RegSetValueExW(hkey,szLocalPackage,0,REG_SZ,(LPSTR)packagefile,size);
     
@@ -6329,6 +6336,8 @@
         }
         CloseHandle(handle);
     }
+    else
+        ERR("Unable to open font file %s\n", debugstr_w(filename));
 
     TRACE("Returning fontname %s\n",debugstr_w(ret));
     return ret;
@@ -6798,7 +6807,7 @@
     HeapFree(GetProcessHeap(),0,folder->Property);
     folder->Property = build_directory_name(2, szFolderPath, NULL);
 
-    if (strcmpiW(path, folder->Property) == 0)
+    if (lstrcmpiW(path, folder->Property) == 0)
     {
         /*
          *  Resolved Target has not really changed, so just 


More information about the wine-patches mailing list