Qian Hong : atl100: Trace ATL version and keep debug channel consistent.

[Alexandre Julliard]

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

Author: Qian Hong 
Date:   Thu Oct 17 02:42:27 2013 +0800

atl100: Trace ATL version and keep debug channel consistent.

---

dlls/atl100/atl.c    |    7 ++++---
 dlls/atl100/atl_ax.c |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c
index 0aae80b..726a855 100644
--- a/dlls/atl100/atl.c
+++ b/dlls/atl100/atl.c
@@ -24,7 +24,7 @@
 #include "wine/debug.h"
 #include "wine/unicode.h"

-WINE_DEFAULT_DEBUG_CHANNEL(atl100);
+WINE_DEFAULT_DEBUG_CHANNEL(atl);

typedef unsigned char cpp_bool;

@@ -299,7 +299,7 @@ HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD
 {
     _ATL_TERMFUNC_ELEM *termfunc_elem;

-    TRACE("(%p %p %ld)\n", pM, pFunc, dw);
+    TRACE("version %04x (%p %p %ld)\n", _ATL_VER, pM, pFunc, dw);

termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM));
     termfunc_elem->pFunc = pFunc;
@@ -784,7 +784,8 @@ HRESULT WINAPI AtlGetPerUserRegistration(cpp_bool *pbEnabled)
  */
 DWORD WINAPI AtlGetVersion(void *pReserved)
 {
-   return _ATL_VER;
+    TRACE("version %04x (%p)\n", _ATL_VER, pReserved);
+    return _ATL_VER;
 }

BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c
index 319b3e8..50ebe3b 100644
--- a/dlls/atl100/atl_ax.c
+++ b/dlls/atl100/atl_ax.c
@@ -89,7 +89,7 @@ BOOL WINAPI AtlAxWinInit(void)
     const WCHAR AtlAxWin100[] = {'A','t','l','A','x','W','i','n','1','0','0',0};
     const WCHAR AtlAxWinLic100[] = {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0};

-    FIXME("semi-stub\n");
+    FIXME("version %04x semi-stub\n", _ATL_VER);

if ( FAILED( OleInitialize(NULL) ) )
         return FALSE;