Hans Leidekker : msi: Move some traces from implementations to entry points .

[Alexandre Julliard]

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

Author: Hans Leidekker 
Date:   Tue Dec 13 13:18:42 2011 +0100

msi: Move some traces from implementations to entry points.

---

dlls/msi/msi.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c
index ce08940..3727560 100644
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -2685,6 +2685,8 @@ UINT WINAPI MsiVerifyPackageW( LPCWSTR szPackage )
 static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent,
                                          awstring* lpPathBuf, LPDWORD pcchBuf)
 {
+    static const WCHAR wininstaller[] =
+        {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0};
     WCHAR squished_pc[GUID_SIZE];
     WCHAR squished_comp[GUID_SIZE];
     HKEY hkey;
@@ -2692,12 +2694,6 @@ static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent,
     INSTALLSTATE state;
     DWORD version;

-    static const WCHAR wininstaller[] = {
-        'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0};
-
-    TRACE("%s %s %p %p\n", debugstr_w(szProduct),
-           debugstr_w(szComponent), lpPathBuf->str.w, pcchBuf);
-
     if (!szProduct || !szComponent)
         return INSTALLSTATE_INVALIDARG;

@@ -2772,6 +2768,8 @@ INSTALLSTATE WINAPI MsiGetComponentPathW(LPCWSTR szProduct, LPCWSTR szComponent,
 {
     awstring path;

+    TRACE("%s %s %p %p\n", debugstr_w(szProduct), debugstr_w(szComponent), lpPathBuf, pcchBuf);
+
     path.unicode = TRUE;
     path.str.w = lpPathBuf;

@@ -2788,6 +2786,8 @@ INSTALLSTATE WINAPI MsiGetComponentPathA(LPCSTR szProduct, LPCSTR szComponent,
     INSTALLSTATE r = INSTALLSTATE_UNKNOWN;
     awstring path;

+    TRACE("%s %s %p %p\n", debugstr_a(szProduct), debugstr_a(szComponent), lpPathBuf, pcchBuf);
+
     szwProduct = strdupAtoW( szProduct );
     if( szProduct && !szwProduct)
         goto end;
@@ -3243,10 +3243,6 @@ static UINT MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent,
     DWORD sz;
     UINT rc;

-    TRACE("%s %s %i %s %i %i %p %p\n", debugstr_w(szComponent),
-          debugstr_w(szQualifier), dwInstallMode, debugstr_w(szProduct),
-          Unused1, Unused2, lpPathBuf, pcchPathBuf);
-
     rc = MSIREG_OpenUserComponentsKey(szComponent, &hkey, FALSE);
     if (rc != ERROR_SUCCESS)
         return ERROR_INDEX_ABSENT;
@@ -3282,6 +3278,10 @@ UINT WINAPI MsiProvideQualifiedComponentExW(LPCWSTR szComponent,
 {
     awstring path;

+    TRACE("%s %s %u %s %u %u %p %p\n", debugstr_w(szComponent),
+          debugstr_w(szQualifier), dwInstallMode, debugstr_w(szProduct),
+          Unused1, Unused2, lpPathBuf, pcchPathBuf);
+
     path.unicode = TRUE;
     path.str.w = lpPathBuf;