October 2013 - Wine-Commits

Qian Hong : atl: Trace ATL version.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 0fb6b350c2380b7292faa78e35dca9e8130e5b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb6b350c2380b7292faa78e3… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Oct 17 02:41:44 2013 +0800 atl: Trace ATL version. --- dlls/atl/atl_main.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 985d706..509d4bb 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -146,7 +146,7 @@ HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULEW *pM, _ATL_TERMFUNC *pFunc, DWOR { _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); if (pM->cbSize > ATLVer1Size) { @@ -590,7 +590,8 @@ HRESULT WINAPI DllCanUnloadNow(void) */ DWORD WINAPI AtlGetVersion(void *pReserved) { - return _ATL_VER; + TRACE("version %04x (%p)\n", _ATL_VER, pReserved); + return _ATL_VER; } /********************************************************************** @@ -617,7 +618,7 @@ BOOL WINAPI AtlAxWinInit(void) WNDCLASSEXW wcex; const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n',0}; - FIXME("semi-stub\n"); + FIXME("version %04x semi-stub\n", _ATL_VER); if ( FAILED( OleInitialize(NULL) ) ) return FALSE;

1 0

Jacek Caban : crypt32: Moved ContextList freeing to store. c and get rid of ContextList.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: fa37b63517563460a10ac863ac9526106b939bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa37b63517563460a10ac863a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:10:18 2013 +0200 crypt32: Moved ContextList freeing to store.c and get rid of ContextList. --- dlls/crypt32/context.c | 12 ------------ dlls/crypt32/crypt32_private.h | 7 ------- dlls/crypt32/store.c | 18 +++++++++++++++--- 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 82b1021..4809eea 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -109,15 +109,3 @@ void Context_CopyProperties(const void *to, const void *from) assert(toProperties && fromProperties); ContextPropertyList_Copy(toProperties, fromProperties); } - -void ContextList_Free(ContextList *list) -{ - context_t *context, *next; - - LIST_FOR_EACH_ENTRY_SAFE(context, next, list, context_t, u.entry) - { - TRACE("removing %p\n", context); - list_remove(&context->u.entry); - Context_Release(context); - } -} diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index dc66ebf..dbb9ee5 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -433,13 +433,6 @@ void ContextPropertyList_Copy(CONTEXT_PROPERTY_LIST *to, void ContextPropertyList_Free(CONTEXT_PROPERTY_LIST *list) DECLSPEC_HIDDEN; -/** - * Context list functions. A context list is a simple list of link contexts. - */ -typedef struct list ContextList; - -void ContextList_Free(ContextList *list) DECLSPEC_HIDDEN; - extern WINECRYPT_CERTSTORE empty_store; void init_empty_store(void) DECLSPEC_HIDDEN; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 76ba944..07613ec 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -215,6 +215,18 @@ static BOOL MemStore_deleteContext(WINE_MEMSTORE *store, context_t *context) return TRUE; } +static void free_contexts(struct list *list) +{ + context_t *context, *next; + + LIST_FOR_EACH_ENTRY_SAFE(context, next, list, context_t, u.entry) + { + TRACE("freeing %p\n", context); + list_remove(&context->u.entry); + Context_Release(context); + } +} + static BOOL MemStore_addCert(WINECRYPT_CERTSTORE *store, context_t *cert, context_t *toReplace, context_t **ppStoreContext, BOOL use_link) { @@ -317,9 +329,9 @@ static DWORD MemStore_release(WINECRYPT_CERTSTORE *cert_store, DWORD flags) if(ref) return (flags & CERT_CLOSE_STORE_CHECK_FLAG) ? CRYPT_E_PENDING_CLOSE : ERROR_SUCCESS; - ContextList_Free(&store->certs); - ContextList_Free(&store->crls); - ContextList_Free(&store->ctls); + free_contexts(&store->certs); + free_contexts(&store->crls); + free_contexts(&store->ctls); store->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&store->cs); CRYPT_FreeStore(&store->hdr);

1 0

Jacek Caban : crypt32: Get rid of no longer needed fields in ContextList.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 6b6ad98277e809c3420df818a210a37e900d2428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6ad98277e809c3420df818a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:08:35 2013 +0200 crypt32: Get rid of no longer needed fields in ContextList. --- dlls/crypt32/context.c | 7 +------ dlls/crypt32/crypt32_private.h | 3 +-- dlls/crypt32/store.c | 9 +++------ 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 65a906b..4704154 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -112,21 +112,16 @@ void Context_CopyProperties(const void *to, const void *from) struct ContextList { - const WINE_CONTEXT_INTERFACE *contextInterface; - size_t contextSize; CRITICAL_SECTION cs; struct list contexts; }; -struct ContextList *ContextList_Create( - const WINE_CONTEXT_INTERFACE *contextInterface, size_t contextSize) +struct ContextList *ContextList_Create(void) { struct ContextList *list = CryptMemAlloc(sizeof(struct ContextList)); if (list) { - list->contextInterface = contextInterface; - list->contextSize = contextSize; InitializeCriticalSection(&list->cs); list->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ContextList.cs"); list_init(&list->contexts); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index f02a333..d9f2400 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -438,8 +438,7 @@ void ContextPropertyList_Free(CONTEXT_PROPERTY_LIST *list) DECLSPEC_HIDDEN; */ struct ContextList; -struct ContextList *ContextList_Create( - const WINE_CONTEXT_INTERFACE *contextInterface, size_t contextSize) DECLSPEC_HIDDEN; +struct ContextList *ContextList_Create(void) DECLSPEC_HIDDEN; context_t *ContextList_Add(struct ContextList *list, context_t *toLink, context_t *toReplace, struct WINE_CRYPTCERTSTORE *store, BOOL use_link) DECLSPEC_HIDDEN; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 902b02c..7fc6acd 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -345,12 +345,9 @@ static WINECRYPT_CERTSTORE *CRYPT_MemOpenStore(HCRYPTPROV hCryptProv, { memset(store, 0, sizeof(WINE_MEMSTORE)); CRYPT_InitStore(&store->hdr, dwFlags, StoreTypeMem, &MemStoreVtbl); - store->certs = ContextList_Create(pCertInterface, - sizeof(CERT_CONTEXT)); - store->crls = ContextList_Create(pCRLInterface, - sizeof(CRL_CONTEXT)); - store->ctls = ContextList_Create(pCTLInterface, - sizeof(CTL_CONTEXT)); + store->certs = ContextList_Create(); + store->crls = ContextList_Create(); + store->ctls = ContextList_Create(); /* Mem store doesn't need crypto provider, so close it */ if (hCryptProv && !(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG)) CryptReleaseContext(hCryptProv, 0);

1 0

Jacek Caban : crypt32: Get rid of no longer needed BASE_CONTEXT.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 619bbe5d29efe925ce39307a94c32ec9a022d989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=619bbe5d29efe925ce39307a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:08:25 2013 +0200 crypt32: Get rid of no longer needed BASE_CONTEXT. --- dlls/crypt32/context.c | 9 +++------ dlls/crypt32/crypt32_private.h | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 9108ada..65a906b 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -25,14 +25,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(context); -#define CONTEXT_FROM_BASE_CONTEXT(p) (void*)(p+1) -#define BASE_CONTEXT_FROM_CONTEXT(p) ((BASE_CONTEXT*)(p)-1) - void *Context_CreateDataContext(size_t contextSize, const context_vtbl_t *vtbl) { - BASE_CONTEXT *context; + context_t *context; - context = CryptMemAlloc(contextSize + sizeof(BASE_CONTEXT)); + context = CryptMemAlloc(sizeof(context_t) + contextSize); if (!context) return NULL; @@ -47,7 +44,7 @@ void *Context_CreateDataContext(size_t contextSize, const context_vtbl_t *vtbl) } TRACE("returning %p\n", context); - return CONTEXT_FROM_BASE_CONTEXT(context); + return context_ptr(context); } context_t *Context_CreateLinkContext(unsigned int contextSize, context_t *linked) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 3ccd279..f02a333 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -171,7 +171,7 @@ typedef struct { struct _context_t *(*clone)(context_t*,struct WINE_CRYPTCERTSTORE*,BOOL); } context_vtbl_t; -typedef struct _context_t { +struct _context_t { const context_vtbl_t *vtbl; LONG ref; struct _context_t *linked; @@ -180,7 +180,7 @@ typedef struct _context_t { struct list entry; void *ptr; } u; -} BASE_CONTEXT; +}; static inline context_t *context_from_ptr(const void *ptr) {

1 0

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

Oct. 17, 2013

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 : ole32: Delay registering the apartment class until needed.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

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

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

Oct. 17, 2013

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 Oct. 17, 2013

Oct. 17, 2013

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

Jacek Caban : crypt32: Share more code between memory store enumContext implementations.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 4d28e14acb270ad7266ce720c4a8473ccb6ebe6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d28e14acb270ad7266ce720c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:09:50 2013 +0200 crypt32: Share more code between memory store enumContext implementations. --- dlls/crypt32/context.c | 25 -------------------- dlls/crypt32/crypt32_private.h | 2 - dlls/crypt32/store.c | 49 ++++++++++++++++++++++----------------- 3 files changed, 28 insertions(+), 48 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 60c82ec..6a96943 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -110,31 +110,6 @@ void Context_CopyProperties(const void *to, const void *from) ContextPropertyList_Copy(toProperties, fromProperties); } -context_t *ContextList_Enum(ContextList *list, CRITICAL_SECTION *cs, context_t *prev) -{ - struct list *listNext; - context_t *ret; - - EnterCriticalSection(cs); - if (prev) - { - listNext = list_next(list, &prev->u.entry); - Context_Release(prev); - } - else - listNext = list_next(list, list); - LeaveCriticalSection(cs); - - if (listNext) - { - ret = LIST_ENTRY(listNext, context_t, u.entry); - Context_AddRef(ret); - } - else - ret = NULL; - return ret; -} - BOOL ContextList_Remove(ContextList *list, CRITICAL_SECTION *cs, context_t *context) { BOOL inList = FALSE; diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 0dd76fc..3a6d9d5 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -438,8 +438,6 @@ void ContextPropertyList_Free(CONTEXT_PROPERTY_LIST *list) DECLSPEC_HIDDEN; */ typedef struct list ContextList; -context_t *ContextList_Enum(ContextList *list, CRITICAL_SECTION *cs, context_t *prev) DECLSPEC_HIDDEN; - /* Removes a context from the list. Returns TRUE if the context was removed, * or FALSE if not. (The context may have been duplicated, so subsequent * removes have no effect.) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 660219d..bf9c88e 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -174,6 +174,31 @@ static BOOL MemStore_addContext(WINE_MEMSTORE *store, struct list *list, context return TRUE; } +static context_t *MemStore_enumContext(WINE_MEMSTORE *store, struct list *list, context_t *prev) +{ + struct list *next; + context_t *ret; + + EnterCriticalSection(&store->cs); + if (prev) { + next = list_next(list, &prev->u.entry); + Context_Release(prev); + }else { + next = list_next(list, list); + } + LeaveCriticalSection(&store->cs); + + if (!next) { + SetLastError(CRYPT_E_NOT_FOUND); + return NULL; + } + + ret = LIST_ENTRY(next, context_t, u.entry); + Context_AddRef(ret); + return ret; +} + + static BOOL MemStore_addCert(WINECRYPT_CERTSTORE *store, context_t *cert, context_t *toReplace, context_t **ppStoreContext, BOOL use_link) { @@ -187,16 +212,10 @@ static BOOL MemStore_addCert(WINECRYPT_CERTSTORE *store, context_t *cert, static context_t *MemStore_enumCert(WINECRYPT_CERTSTORE *store, context_t *prev) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; - context_t *ret; TRACE("(%p, %p)\n", store, prev); - ret = ContextList_Enum(&ms->certs, &ms->cs, prev); - if (!ret) - SetLastError(CRYPT_E_NOT_FOUND); - - TRACE("returning %p\n", ret); - return ret; + return MemStore_enumContext(ms, &ms->certs, prev); } static BOOL MemStore_deleteCert(WINECRYPT_CERTSTORE *store, context_t *context) @@ -222,16 +241,10 @@ static BOOL MemStore_addCRL(WINECRYPT_CERTSTORE *store, context_t *crl, static context_t *MemStore_enumCRL(WINECRYPT_CERTSTORE *store, context_t *prev) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; - context_t *ret; TRACE("(%p, %p)\n", store, prev); - ret = ContextList_Enum(&ms->crls, &ms->cs, prev); - if (!ret) - SetLastError(CRYPT_E_NOT_FOUND); - - TRACE("returning %p\n", ret); - return ret; + return MemStore_enumContext(ms, &ms->crls, prev); } static BOOL MemStore_deleteCRL(WINECRYPT_CERTSTORE *store, context_t *context) @@ -257,16 +270,10 @@ static BOOL MemStore_addCTL(WINECRYPT_CERTSTORE *store, context_t *ctl, static context_t *MemStore_enumCTL(WINECRYPT_CERTSTORE *store, context_t *prev) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; - context_t *ret; TRACE("(%p, %p)\n", store, prev); - ret = ContextList_Enum(&ms->ctls, &ms->cs, prev); - if (!ret) - SetLastError(CRYPT_E_NOT_FOUND); - - TRACE("returning %p\n", ret); - return ret; + return MemStore_enumContext(ms, &ms->ctls, prev); } static BOOL MemStore_deleteCTL(WINECRYPT_CERTSTORE *store, context_t *context)

1 0

Jacek Caban : crypt32: Share more code between memory store addContext implementations.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 63eed79d25ba63fdbc0aca45e2055ceb40e661f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63eed79d25ba63fdbc0aca45e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:09:37 2013 +0200 crypt32: Share more code between memory store addContext implementations. --- dlls/crypt32/context.c | 28 ------------------ dlls/crypt32/crypt32_private.h | 3 -- dlls/crypt32/store.c | 60 +++++++++++++++++++++------------------ 3 files changed, 32 insertions(+), 59 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index d6d67d1..60c82ec 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -110,34 +110,6 @@ void Context_CopyProperties(const void *to, const void *from) ContextPropertyList_Copy(toProperties, fromProperties); } -context_t *ContextList_Add(ContextList *list, CRITICAL_SECTION *cs, context_t *toLink, - context_t *existing, struct WINE_CRYPTCERTSTORE *store, BOOL use_link) -{ - context_t *context; - - TRACE("(%p, %p, %p)\n", list, toLink, existing); - - context = toLink->vtbl->clone(toLink, store, use_link); - if (context) - { - TRACE("adding %p\n", context); - EnterCriticalSection(cs); - if (existing) - { - context->u.entry.prev = existing->u.entry.prev; - context->u.entry.next = existing->u.entry.next; - context->u.entry.prev->next = &context->u.entry; - context->u.entry.next->prev = &context->u.entry; - list_init(&existing->u.entry); - Context_Release(existing); - } - else - list_add_head(list, &context->u.entry); - LeaveCriticalSection(cs); - } - return context; -} - context_t *ContextList_Enum(ContextList *list, CRITICAL_SECTION *cs, context_t *prev) { struct list *listNext; diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index a0f96c5..0dd76fc 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -438,9 +438,6 @@ void ContextPropertyList_Free(CONTEXT_PROPERTY_LIST *list) DECLSPEC_HIDDEN; */ typedef struct list ContextList; -context_t *ContextList_Add(ContextList *list, CRITICAL_SECTION *cs, context_t *toLink, context_t *toReplace, - struct WINE_CRYPTCERTSTORE *store, BOOL use_link) DECLSPEC_HIDDEN; - context_t *ContextList_Enum(ContextList *list, CRITICAL_SECTION *cs, context_t *prev) DECLSPEC_HIDDEN; /* Removes a context from the list. Returns TRUE if the context was removed, diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 8222d24..660219d 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -143,25 +143,47 @@ BOOL WINAPI I_CertUpdateStore(HCERTSTORE store1, HCERTSTORE store2, DWORD unk0, return TRUE; } -static BOOL MemStore_addCert(WINECRYPT_CERTSTORE *store, context_t *cert, - context_t *toReplace, context_t **ppStoreContext, BOOL use_link) +static BOOL MemStore_addContext(WINE_MEMSTORE *store, struct list *list, context_t *orig_context, + context_t *existing, context_t **ret_context, BOOL use_link) { - WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; context_t *context; - TRACE("(%p, %p, %p, %p)\n", store, cert, toReplace, ppStoreContext); - - context = ContextList_Add(&ms->certs, &ms->cs, cert, toReplace, store, use_link); + context = orig_context->vtbl->clone(orig_context, &store->hdr, use_link); if (!context) return FALSE; - if (ppStoreContext) { + TRACE("adding %p\n", context); + EnterCriticalSection(&store->cs); + if (existing) { + context->u.entry.prev = existing->u.entry.prev; + context->u.entry.next = existing->u.entry.next; + context->u.entry.prev->next = &context->u.entry; + context->u.entry.next->prev = &context->u.entry; + list_init(&existing->u.entry); + Context_Release(existing); + }else { + list_add_head(list, &context->u.entry); + } + LeaveCriticalSection(&store->cs); + + if(ret_context) { Context_AddRef(context); - *ppStoreContext = context; + *ret_context = context; } + return TRUE; } +static BOOL MemStore_addCert(WINECRYPT_CERTSTORE *store, context_t *cert, + context_t *toReplace, context_t **ppStoreContext, BOOL use_link) +{ + WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; + + TRACE("(%p, %p, %p, %p)\n", store, cert, toReplace, ppStoreContext); + + return MemStore_addContext(ms, &ms->certs, cert, toReplace, ppStoreContext, use_link); +} + static context_t *MemStore_enumCert(WINECRYPT_CERTSTORE *store, context_t *prev) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; @@ -191,19 +213,10 @@ static BOOL MemStore_addCRL(WINECRYPT_CERTSTORE *store, context_t *crl, context_t *toReplace, context_t **ppStoreContext, BOOL use_link) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; - context_t *context; TRACE("(%p, %p, %p, %p)\n", store, crl, toReplace, ppStoreContext); - context = ContextList_Add(&ms->crls, &ms->cs, crl, toReplace, store, use_link); - if (!context) - return FALSE; - - if (ppStoreContext) { - Context_AddRef(context); - *ppStoreContext = context; - } - return TRUE; + return MemStore_addContext(ms, &ms->crls, crl, toReplace, ppStoreContext, use_link); } static context_t *MemStore_enumCRL(WINECRYPT_CERTSTORE *store, context_t *prev) @@ -235,19 +248,10 @@ static BOOL MemStore_addCTL(WINECRYPT_CERTSTORE *store, context_t *ctl, context_t *toReplace, context_t **ppStoreContext, BOOL use_link) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; - context_t *context; TRACE("(%p, %p, %p, %p)\n", store, ctl, toReplace, ppStoreContext); - context = ContextList_Add(&ms->ctls, &ms->cs, ctl, toReplace, store, use_link); - if (!context) - return FALSE; - - if (ppStoreContext) { - Context_AddRef(context); - *ppStoreContext = context; - } - return TRUE; + return MemStore_addContext(ms, &ms->ctls, ctl, toReplace, ppStoreContext, use_link); } static context_t *MemStore_enumCTL(WINECRYPT_CERTSTORE *store, context_t *prev)

1 0