marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

atl100: Trace ATL version and keep debug channel consistent.

oldstable
Qian Hong 2013-10-17 02:42:27 +08:00 committed by Alexandre Julliard
parent 8c33b912a3
commit 6c8a2ba7c6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/atl100/atl.c
View File

@ -24,7 +24,7 @@
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h" #include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(atl100); WINE_DEFAULT_DEBUG_CHANNEL(atl);
typedef unsigned char cpp_bool; typedef unsigned char cpp_bool;
@ -299,7 +299,7 @@ HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD
{ {
_ATL_TERMFUNC_ELEM *termfunc_elem; _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 = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM));
termfunc_elem->pFunc = pFunc; termfunc_elem->pFunc = pFunc;
@ -784,7 +784,8 @@ HRESULT WINAPI AtlGetPerUserRegistration(cpp_bool *pbEnabled)
*/ */
DWORD WINAPI AtlGetVersion(void *pReserved) 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) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

2
dlls/atl100/atl_ax.c
View File

@ -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 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}; 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) ) ) if ( FAILED( OleInitialize(NULL) ) )
return FALSE; return FALSE;