Hans Leidekker : msi: Improve traces in db_get_raw_stream.
Alexandre Julliard
julliard at winehq.org
Wed Jul 21 10:54:58 CDT 2010
Module: wine
Branch: master
Commit: d10208e863aeaab95490a09ca221e7bfbe8c468b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10208e863aeaab95490a09ca221e7bfbe8c468b
Author: Hans Leidekker <hans at codeweavers.com>
Date: Wed Jul 21 09:47:39 2010 +0200
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 b77b6fa..01c3249 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 df9f045..bdb1884 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 59e845d..44c4e67 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
{
More information about the wine-cvs
mailing list