Hans Leidekker : msi: Improve some traces.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e60bf536eba17726465b10e33590362c5d5723e4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e60bf536eba17726465b10e335...

Author: Hans Leidekker 
Date:   Wed May 12 14:19:04 2010 +0200

msi: Improve some traces.

---

dlls/msi/files.c |    8 +++-----
 dlls/msi/media.c |    6 +-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index bea1837..f66d815 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -121,8 +121,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source)
 {
     UINT gle;

-    TRACE("Copying %s to %s\n", debugstr_w(source),
-          debugstr_w(file->TargetPath));
+    TRACE("Copying %s to %s\n", debugstr_w(source), debugstr_w(file->TargetPath));

gle = copy_file(file, source);
     if (gle == ERROR_SUCCESS)
@@ -248,7 +247,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
             rc = ready_media(package, file, mi);
             if (rc != ERROR_SUCCESS)
             {
-                ERR("Failed to ready media\n");
+                ERR("Failed to ready media for %s\n", debugstr_w(file->File));
                 break;
             }

@@ -288,8 +287,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
         }
         else if (file->state != msifs_installed)
         {
-            ERR("compressed file wasn't extracted (%s)\n",
-                debugstr_w(file->TargetPath));
+            ERR("compressed file wasn't installed (%s)\n", debugstr_w(file->TargetPath));
             rc = ERROR_INSTALL_FAILURE;
             break;
         }
diff --git a/dlls/msi/media.c b/dlls/msi/media.c
index 7cf9836..7cac9e7 100644
--- a/dlls/msi/media.c
+++ b/dlls/msi/media.c
@@ -471,8 +471,6 @@ static INT_PTR cabinet_close_file_info(FDINOTIFICATIONTYPE fdint,

static INT_PTR CDECL cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin)
 {
-    TRACE("(%d)\n", fdint);
-
     switch (fdint)
     {
     case fdintPARTIAL_FILE:
@@ -494,8 +492,6 @@ static INT_PTR CDECL cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION

static INT_PTR CDECL cabinet_notify_stream( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin )
 {
-    TRACE("(%d)\n", fdint);
-
     switch (fdint)
     {
     case fdintCOPY_FILE:
@@ -774,7 +770,7 @@ UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi)
     rc = msi_load_media_info(package, file, mi);
     if (rc != ERROR_SUCCESS)
     {
-        ERR("Unable to load media info\n");
+        ERR("Unable to load media info %u\n", rc);
         return ERROR_FUNCTION_FAILED;
     }