From d10208e863aeaab95490a09ca221e7bfbe8c468b Mon Sep 17 00:00:00 2001
From: Hans Leidekker <hans@codeweavers.com>
Date: Wed, 21 Jul 2010 09:47:39 +0200
Subject: [PATCH] msi: Improve traces in db_get_raw_stream.

---
 dlls/msi/database.c | 5 +++--
 dlls/msi/msipriv.h  | 1 +
 dlls/msi/streams.c  | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/msi/database.c b/dlls/msi/database.c
index b77b6fa8436..01c32497a37 100644
--- a/dlls/msi/database.c
+++ b/dlls/msi/database.c
@@ -126,8 +126,10 @@ static UINT clone_open_stream( MSIDATABASE *db, LPCWSTR name, IStream **stm )
 UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm )
 {
     HRESULT r;
+    WCHAR decoded[MAX_STREAM_NAME_LEN];
 
-    TRACE("%s\n", debugstr_w(stname));
+    decode_streamname( stname, decoded );
+    TRACE("%s -> %s\n", debugstr_w(stname), debugstr_w(decoded));
 
     if (clone_open_stream( db, stname, stm ) == ERROR_SUCCESS)
         return ERROR_SUCCESS;
@@ -140,7 +142,6 @@ UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm )
 
         LIST_FOR_EACH_ENTRY( transform, &db->transforms, MSITRANSFORM, entry )
         {
-            TRACE("looking for %s in transform storage\n", debugstr_w(stname) );
             r = IStorage_OpenStream( transform->stg, stname, NULL,
                                      STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm );
             if (SUCCEEDED(r))
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index df9f0453e38..bdb1884f605 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -44,6 +44,7 @@
 #define MSITYPE_KEY      0x2000
 #define MSITYPE_TEMPORARY 0x4000
 
+#define MAX_STREAM_NAME_LEN     62
 
 /* Install UI level mask for AND operation to exclude flags */
 #define INSTALLUILEVEL_MASK             0x0007
diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c
index 59e845df82d..44c4e67718b 100644
--- a/dlls/msi/streams.c
+++ b/dlls/msi/streams.c
@@ -37,7 +37,6 @@
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 
 #define NUM_STREAMS_COLS    2
-#define MAX_STREAM_NAME_LEN 62
 
 typedef struct tabSTREAM
 {
-- 
2.11.4.GIT