wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Alexandre Julliard : shell32: Delay common controls initialization until needed.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: d80ca173af68add8ef37a92acaa6eac6f7589546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d80ca173af68add8ef37a92ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 17 18:05:28 2013 +0200 shell32: Delay common controls initialization until needed. --- dlls/shell32/Makefile.in | 4 ++-- dlls/shell32/brsfolder.c | 5 +++++ dlls/shell32/shell32_main.c | 1 - dlls/shell32/shlview.c | 5 +++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index dd3f8f4..fb9b2c7 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -1,8 +1,8 @@ EXTRADEFS = -D_SHELL32_ MODULE = shell32.dll IMPORTLIB = shell32 -IMPORTS = uuid shlwapi comctl32 user32 gdi32 advapi32 -DELAYIMPORTS = ole32 oleaut32 shdocvw version +IMPORTS = uuid shlwapi user32 gdi32 advapi32 +DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 EXTRALIBS = @CORESERVICESLIB@ C_SRCS = \ diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index a14c172..9d95293 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -1110,12 +1110,17 @@ LPITEMIDLIST WINAPI SHBrowseForFolderW (LPBROWSEINFOW lpbi) DWORD r; HRESULT hr; const WCHAR * templateName; + INITCOMMONCONTROLSEX icex; info.hWnd = 0; info.pidlRet = NULL; info.lpBrowseInfo = lpbi; info.hwndTreeView = NULL; + icex.dwSize = sizeof( icex ); + icex.dwICC = ICC_TREEVIEW_CLASSES; + InitCommonControlsEx( &icex ); + hr = OleInitialize(NULL); if (lpbi->ulFlags & BIF_NEWDIALOGSTYLE) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 0bc88b0..1e37b47 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1272,7 +1272,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) GetModuleFileNameW(hinstDLL, swShell32Name, MAX_PATH); swShell32Name[MAX_PATH - 1] = '\0'; - InitCommonControlsEx(NULL); InitChangeNotifications(); break; diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 29593f8..c937cce 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2075,10 +2075,15 @@ static HRESULT WINAPI IShellView2_fnCreateViewWindow2(IShellView2 *iface, LPSV2CVW2_PARAMS view_params) { IShellViewImpl *This = impl_from_IShellView2(iface); + INITCOMMONCONTROLSEX icex; WNDCLASSW wc; HRESULT hr; HWND wnd; + icex.dwSize = sizeof( icex ); + icex.dwICC = ICC_LISTVIEW_CLASSES; + InitCommonControlsEx( &icex ); + TRACE("(%p)->(view_params %p)\n", iface, view_params); if (view_params->cbSize != sizeof(*view_params))

1 0

Alexandre Julliard : shell32: Delay initialization of the icon cache until needed.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 116e33d50a3435a539bcf7e9b93ab4adbfbecef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=116e33d50a3435a539bcf7e9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 17 18:01:04 2013 +0200 shell32: Delay initialization of the icon cache until needed. --- dlls/shell32/iconcache.c | 123 +++++++++++++++++++++---------------------- dlls/shell32/shell32_main.c | 2 - dlls/shell32/shell32_main.h | 1 - 3 files changed, 61 insertions(+), 65 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index e2300f1..a2373fa 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -59,7 +59,8 @@ typedef struct DWORD dwAccessTime; } SIC_ENTRY, * LPSIC_ENTRY; -static HDPA sic_hdpa = 0; +static HDPA sic_hdpa; +static INIT_ONCE sic_init_once = INIT_ONCE_STATIC_INIT; static CRITICAL_SECTION SHELL32_SicCS; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -337,54 +338,9 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) return SIC_IconAppend (sSourceFile, dwSourceIndex, hiconSmall, hiconLarge, dwFlags); } /***************************************************************************** - * SIC_GetIconIndex [internal] - * - * Parameters - * sSourceFile [IN] filename of file containing the icon - * index [IN] index/resID (negated) in this file - * - * NOTES - * look in the cache for a proper icon. if not available the icon is taken - * from the file and cached - */ -INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags ) -{ - SIC_ENTRY sice; - INT ret, index = INVALID_INDEX; - WCHAR path[MAX_PATH]; - - TRACE("%s %i\n", debugstr_w(sSourceFile), dwSourceIndex); - - GetFullPathNameW(sSourceFile, MAX_PATH, path, NULL); - sice.sSourceFile = path; - sice.dwSourceIndex = dwSourceIndex; - sice.dwFlags = dwFlags; - - EnterCriticalSection(&SHELL32_SicCS); - - if (NULL != DPA_GetPtr (sic_hdpa, 0)) - { - /* search linear from position 0*/ - index = DPA_Search (sic_hdpa, &sice, 0, SIC_CompareEntries, 0, 0); - } - - if ( INVALID_INDEX == index ) - { - ret = SIC_LoadIcon (sSourceFile, dwSourceIndex, dwFlags); - } - else - { - TRACE("-- found\n"); - ret = ((LPSIC_ENTRY)DPA_GetPtr(sic_hdpa, index))->dwListIndex; - } - - LeaveCriticalSection(&SHELL32_SicCS); - return ret; -} -/***************************************************************************** * SIC_Initialize [internal] */ -BOOL SIC_Initialize(void) +static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context ) { HICON hSm, hLg; int cx_small, cy_small; @@ -397,9 +353,6 @@ BOOL SIC_Initialize(void) TRACE("\n"); - if (sic_hdpa) /* already initialized?*/ - return TRUE; - sic_hdpa = DPA_Create(16); if (!sic_hdpa) @@ -452,17 +405,62 @@ void SIC_Destroy(void) if (sic_hdpa) DPA_DestroyCallback(sic_hdpa, sic_free, NULL ); - sic_hdpa = NULL; ImageList_Destroy(ShellSmallIconList); - ShellSmallIconList = 0; ImageList_Destroy(ShellBigIconList); - ShellBigIconList = 0; LeaveCriticalSection(&SHELL32_SicCS); DeleteCriticalSection(&SHELL32_SicCS); } /***************************************************************************** + * SIC_GetIconIndex [internal] + * + * Parameters + * sSourceFile [IN] filename of file containing the icon + * index [IN] index/resID (negated) in this file + * + * NOTES + * look in the cache for a proper icon. if not available the icon is taken + * from the file and cached + */ +INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags ) +{ + SIC_ENTRY sice; + INT ret, index = INVALID_INDEX; + WCHAR path[MAX_PATH]; + + TRACE("%s %i\n", debugstr_w(sSourceFile), dwSourceIndex); + + GetFullPathNameW(sSourceFile, MAX_PATH, path, NULL); + sice.sSourceFile = path; + sice.dwSourceIndex = dwSourceIndex; + sice.dwFlags = dwFlags; + + InitOnceExecuteOnce( &sic_init_once, SIC_Initialize, NULL, NULL ); + + EnterCriticalSection(&SHELL32_SicCS); + + if (NULL != DPA_GetPtr (sic_hdpa, 0)) + { + /* search linear from position 0*/ + index = DPA_Search (sic_hdpa, &sice, 0, SIC_CompareEntries, 0, 0); + } + + if ( INVALID_INDEX == index ) + { + ret = SIC_LoadIcon (sSourceFile, dwSourceIndex, dwFlags); + } + else + { + TRACE("-- found\n"); + ret = ((LPSIC_ENTRY)DPA_GetPtr(sic_hdpa, index))->dwListIndex; + } + + LeaveCriticalSection(&SHELL32_SicCS); + return ret; +} + +/***************************************************************************** * SIC_LoadOverlayIcon [internal] * * Load a shell overlay icon and return its icon cache index. @@ -509,6 +507,8 @@ static int SIC_LoadOverlayIcon(int icon_idx) RegCloseKey(hKeyShellIcons); } + InitOnceExecuteOnce( &sic_init_once, SIC_Initialize, NULL, NULL ); + return SIC_LoadIcon(iconPath, iconIdx, 0); } @@ -520,15 +520,12 @@ static int SIC_LoadOverlayIcon(int icon_idx) * */ BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList) -{ TRACE("(%p,%p)\n",lpBigList,lpSmallList); - if (lpBigList) - { *lpBigList = ShellBigIconList; - } - if (lpSmallList) - { *lpSmallList = ShellSmallIconList; - } - - return TRUE; +{ + TRACE("(%p,%p)\n",lpBigList,lpSmallList); + InitOnceExecuteOnce( &sic_init_once, SIC_Initialize, NULL, NULL ); + if (lpBigList) *lpBigList = ShellBigIconList; + if (lpSmallList) *lpSmallList = ShellSmallIconList; + return TRUE; } /************************************************************************* * PidlToSicIndex [INTERNAL] @@ -557,6 +554,8 @@ BOOL PidlToSicIndex ( TRACE("sf=%p pidl=%p %s\n", sh, pidl, bBigIcon?"Big":"Small"); + InitOnceExecuteOnce( &sic_init_once, SIC_Initialize, NULL, NULL ); + if (SUCCEEDED (IShellFolder_GetUIObjectOf(sh, 0, 1, &pidl, &IID_IExtractIconW, 0, (void **)&ei))) { if (SUCCEEDED(IExtractIconW_GetIconLocation(ei, uFlags, szIconFile, MAX_PATH, &iSourceIndex, &dwFlags))) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 4c124bd..0bc88b0 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1273,8 +1273,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) swShell32Name[MAX_PATH - 1] = '\0'; InitCommonControlsEx(NULL); - - SIC_Initialize(); InitChangeNotifications(); break; diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index c50330b..ee10756 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -47,7 +47,6 @@ extern HIMAGELIST ShellBigIconList DECLSPEC_HIDDEN; /* Iconcache */ #define INVALID_INDEX -1 -BOOL SIC_Initialize(void) DECLSPEC_HIDDEN; void SIC_Destroy(void) DECLSPEC_HIDDEN; BOOL PidlToSicIndex (IShellFolder * sh, LPCITEMIDLIST pidl, BOOL bBigIcon, UINT uFlags, int * pIndex) DECLSPEC_HIDDEN; INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : explorerframe: Correctly initialize common controls.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 4c6e039aa153aaf3576d52a4106e97bd4d0b1159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6e039aa153aaf3576d52a41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 17 19:21:49 2013 +0200 explorerframe: Correctly initialize common controls. --- dlls/explorerframe/Makefile.in | 2 +- dlls/explorerframe/nstc.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in index dc523a1..03f4a23 100644 --- a/dlls/explorerframe/Makefile.in +++ b/dlls/explorerframe/Makefile.in @@ -1,5 +1,5 @@ MODULE = explorerframe.dll -IMPORTS = uuid ole32 shell32 user32 +IMPORTS = uuid ole32 comctl32 shell32 user32 C_SRCS = \ explorerframe_main.c \ diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index a881cc4..4d977ec 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -869,6 +869,7 @@ static HRESULT WINAPI NSTC2_fnInitialize(INameSpaceTreeControl2* iface, NSTC2Impl *This = impl_from_INameSpaceTreeControl2(iface); WNDCLASSW wc; DWORD window_style, window_ex_style; + INITCOMMONCONTROLSEX icex; RECT rc; static const WCHAR NSTC2_CLASS_NAME[] = {'N','a','m','e','s','p','a','c','e','T','r','e','e', @@ -882,6 +883,10 @@ static HRESULT WINAPI NSTC2_fnInitialize(INameSpaceTreeControl2* iface, This->style = nstcsFlags; + icex.dwSize = sizeof( icex ); + icex.dwICC = ICC_TREEVIEW_CLASSES; + InitCommonControlsEx( &icex ); + if(!GetClassInfoW(explorerframe_hinstance, NSTC2_CLASS_NAME, &wc)) { wc.style = CS_HREDRAW | CS_VREDRAW;

1 0

Alexandre Julliard : ole32: Delay registering the apartment class until needed.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: d67b99aef278e9b632a451ebf6a3c2cf2b85ebe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d67b99aef278e9b632a451ebf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 17 17:55:03 2013 +0200 ole32: Delay registering the apartment class until needed. --- dlls/ole32/compobj.c | 60 +++++++++++++++++++++++++------------------------- 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4d708c4..dbe1b06 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1478,18 +1478,44 @@ static HRESULT apartment_hostobject_in_hostapt( return hr; } +static BOOL WINAPI register_class( INIT_ONCE *once, void *param, void **context ) +{ + WNDCLASSW wclass; + + /* Dispatching to the correct thread in an apartment is done through + * window messages rather than RPC transports. When an interface is + * marshalled into another apartment in the same process, a window of the + * following class is created. The *caller* of CoMarshalInterface (i.e., the + * application) is responsible for pumping the message loop in that thread. + * The WM_USER messages which point to the RPCs are then dispatched to + * apartment_wndproc by the user's code from the apartment in which the + * interface was unmarshalled. + */ + memset(&wclass, 0, sizeof(wclass)); + wclass.lpfnWndProc = apartment_wndproc; + wclass.hInstance = hProxyDll; + wclass.lpszClassName = wszAptWinClass; + RegisterClassW(&wclass); + return TRUE; +} + /* create a window for the apartment or return the current one if one has * already been created */ HRESULT apartment_createwindowifneeded(struct apartment *apt) { + static INIT_ONCE class_init_once = INIT_ONCE_STATIC_INIT; + if (apt->multi_threaded) return S_OK; if (!apt->win) { - HWND hwnd = CreateWindowW(wszAptWinClass, NULL, 0, - 0, 0, 0, 0, - HWND_MESSAGE, 0, hProxyDll, NULL); + HWND hwnd; + + InitOnceExecuteOnce( &class_init_once, register_class, NULL, NULL ); + + hwnd = CreateWindowW(wszAptWinClass, NULL, 0, 0, 0, 0, 0, + HWND_MESSAGE, 0, hProxyDll, NULL); if (!hwnd) { ERR("CreateWindow failed with error %d\n", GetLastError()); @@ -1516,31 +1542,6 @@ void apartment_joinmta(void) COM_CurrentInfo()->apt = MTA; } -static void COMPOBJ_InitProcess( void ) -{ - WNDCLASSW wclass; - - /* Dispatching to the correct thread in an apartment is done through - * window messages rather than RPC transports. When an interface is - * marshalled into another apartment in the same process, a window of the - * following class is created. The *caller* of CoMarshalInterface (i.e., the - * application) is responsible for pumping the message loop in that thread. - * The WM_USER messages which point to the RPCs are then dispatched to - * apartment_wndproc by the user's code from the apartment in which the - * interface was unmarshalled. - */ - memset(&wclass, 0, sizeof(wclass)); - wclass.lpfnWndProc = apartment_wndproc; - wclass.hInstance = hProxyDll; - wclass.lpszClassName = wszAptWinClass; - RegisterClassW(&wclass); -} - -static void COMPOBJ_UninitProcess( void ) -{ - UnregisterClassW(wszAptWinClass, hProxyDll); -} - static void COM_TlsDestroy(void) { struct oletls *info = NtCurrentTeb()->ReservedForOle; @@ -4585,13 +4586,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID reserved) switch(fdwReason) { case DLL_PROCESS_ATTACH: hProxyDll = hinstDLL; - COMPOBJ_InitProcess(); break; case DLL_PROCESS_DETACH: if (reserved) break; release_std_git(); - COMPOBJ_UninitProcess(); + UnregisterClassW( wszAptWinClass, hProxyDll ); RPC_UnregisterAllChannelHooks(); COMPOBJ_DllList_Free(); DeleteCriticalSection(&csRegisteredClassList);

1 0

Alexandre Julliard : mmdevapi/tests: Mark a failing test as broken.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 7eebd74cb2e68ed3e8bbf33d7db869ca8814cc0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eebd74cb2e68ed3e8bbf33d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 17 14:00:17 2013 +0200 mmdevapi/tests: Mark a failing test as broken. --- dlls/mmdevapi/tests/propstore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 2b5f391..bcb5044 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -105,7 +105,7 @@ static void test_getat(IPropertyStore *store) if (IsEqualPropertyKey(pkey, DEVPKEY_Device_DeviceDesc)) found_desc = TRUE; } - ok(found_name == TRUE, "DEVPKEY_Device_FriendlyName not found\n"); + ok(found_name || broken(!found_name), "DEVPKEY_Device_FriendlyName not found\n"); ok(found_desc == TRUE, "DEVPKEY_Device_DeviceDesc not found\n"); }

1 0

Piotr Caban : url: Add support for http protocol handling in FileProtocolHandlerA.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: f5ea78f6a1d67c68fb4cef89e0891933c72b624b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ea78f6a1d67c68fb4cef89e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 17 12:54:31 2013 +0200 url: Add support for http protocol handling in FileProtocolHandlerA. --- dlls/url/url_main.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/url/url_main.c b/dlls/url/url_main.c index b65aa02..8ad413b 100644 --- a/dlls/url/url_main.c +++ b/dlls/url/url_main.c @@ -88,8 +88,7 @@ BOOL WINAPI InetIsOffline(DWORD flags) * int nShowCmd - How to display the operation. */ -HRESULT WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl, - int nShowCmd) +void WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl, int nShowCmd) { CHAR pszPath[MAX_PATH]; DWORD size = MAX_PATH; @@ -97,12 +96,7 @@ HRESULT WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl, TRACE("(%p, %s, %d)\n",hWnd,debugstr_a(pszUrl),nShowCmd); - if(createpath != S_OK) - return E_FAIL; - - ShellExecuteA(hWnd,NULL,pszPath,NULL,NULL,nShowCmd); - - return S_OK; + ShellExecuteA(hWnd, NULL, createpath==S_OK ? pszPath : pszUrl, NULL, NULL, nShowCmd); } /***********************************************************************

1 0

Qian Hong : user32/tests: Skip desktop tests on NT4.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: bd5b865f005ab28b149e3a0e2a6833fc90016fd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5b865f005ab28b149e3a0e2… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Oct 17 03:11:53 2013 +0800 user32/tests: Skip desktop tests on NT4. --- dlls/user32/tests/winstation.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 0bc9966..5fa6fb1 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -542,6 +542,15 @@ todo_wine SetLastError(0xdeadbeef); ret = SendInput(1, inputs, sizeof(INPUT)); + if(broken(GetLastError() == 0xdeadbeef)) + { + SetThreadDesktop(old_thread_desk); + CloseDesktop(old_input_desk); + CloseDesktop(input_desk); + CloseDesktop(new_desk); + win_skip("Skip tests on NT4\n"); + return; + } todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected last error %08x\n", GetLastError()); ok(ret == 1 || broken(ret == 0) /* Win64 */, "unexpected return count %d\n", ret);

1 0

Qian Hong : atl110: Trace ATL version.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 37a8e0c2f243fb7cc2913c798844a1186e47b9d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37a8e0c2f243fb7cc2913c798… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Oct 17 02:42:41 2013 +0800 atl110: Trace ATL version. --- dlls/atl110/atl110.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/atl110/atl110.c b/dlls/atl110/atl110.c index f704bd9..707b43b 100644 --- a/dlls/atl110/atl110.c +++ b/dlls/atl110/atl110.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); */ DWORD WINAPI AtlGetVersion(void *pReserved) { + TRACE("version %04x (%p)\n", _ATL_VER, pReserved); return _ATL_VER; } @@ -65,7 +66,7 @@ BOOL WINAPI AtlAxWinInit(void) const WCHAR AtlAxWin110[] = {'A','t','l','A','x','W','i','n','1','1','0',0}; const WCHAR AtlAxWinLic110[] = {'A','t','l','A','x','W','i','n','L','i','c','1','1','0',0}; - FIXME("semi-stub\n"); + FIXME("version %04x semi-stub\n", _ATL_VER); if ( FAILED( OleInitialize(NULL) ) ) return FALSE;

1 0

Qian Hong : atl100: Trace ATL version and keep debug channel consistent.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 6c8a2ba7c6acd68a51b42772a64673810410203a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8a2ba7c6acd68a51b42772a… Author: Qian Hong <qhong(a)codeweavers.com> 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;

1 0

Qian Hong : atl90: Trace ATL version.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 8c33b912a3c2b19ac59e58c5145e2dc03a352b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c33b912a3c2b19ac59e58c51… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Oct 17 02:42:12 2013 +0800 atl90: Trace ATL version. --- dlls/atl90/atl90.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/atl90/atl90.c b/dlls/atl90/atl90.c index 1b46dcb..06e8066 100644 --- a/dlls/atl90/atl90.c +++ b/dlls/atl90/atl90.c @@ -37,7 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); */ DWORD WINAPI AtlGetVersion(void *reserved) { - return _ATL_VER; + TRACE("version %04x (%p)\n", _ATL_VER, reserved); + return _ATL_VER; } /********************************************************************** @@ -65,7 +66,7 @@ BOOL WINAPI AtlAxWinInit(void) const WCHAR AtlAxWin90[] = {'A','t','l','A','x','W','i','n','9','0',0}; const WCHAR AtlAxWinLic90[] = {'A','t','l','A','x','W','i','n','L','i','c','9','0',0}; - FIXME("semi-stub\n"); + FIXME("version %04x semi-stub\n", _ATL_VER); if ( FAILED( OleInitialize(NULL) ) ) return FALSE;

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013