October 2013 - Wine-commits

Jacek Caban : crypt32: Share more code between memory store deleteContext implementations.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: bf464f81a8e71ddc6659b8776c4d4827896606f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf464f81a8e71ddc6659b8776… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:10:05 2013 +0200 crypt32: Share more code between memory store deleteContext implementations. --- dlls/crypt32/context.c | 16 ---------------- dlls/crypt32/crypt32_private.h | 6 ------ dlls/crypt32/store.c | 32 ++++++++++++++++++++++---------- 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 6a96943..82b1021 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -110,22 +110,6 @@ void Context_CopyProperties(const void *to, const void *from) ContextPropertyList_Copy(toProperties, fromProperties); } -BOOL ContextList_Remove(ContextList *list, CRITICAL_SECTION *cs, context_t *context) -{ - BOOL inList = FALSE; - - EnterCriticalSection(cs); - if (!list_empty(&context->u.entry)) - { - list_remove(&context->u.entry); - list_init(&context->u.entry); - inList = TRUE; - } - LeaveCriticalSection(cs); - - return inList; -} - void ContextList_Free(ContextList *list) { context_t *context, *next; diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 3a6d9d5..dc66ebf 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -438,12 +438,6 @@ void ContextPropertyList_Free(CONTEXT_PROPERTY_LIST *list) DECLSPEC_HIDDEN; */ typedef struct list ContextList; -/* 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.) - */ -BOOL ContextList_Remove(ContextList *list, CRITICAL_SECTION *cs, context_t *context) DECLSPEC_HIDDEN; - void ContextList_Free(ContextList *list) DECLSPEC_HIDDEN; extern WINECRYPT_CERTSTORE empty_store; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index bf9c88e..76ba944 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -198,6 +198,22 @@ static context_t *MemStore_enumContext(WINE_MEMSTORE *store, struct list *list, return ret; } +static BOOL MemStore_deleteContext(WINE_MEMSTORE *store, context_t *context) +{ + BOOL in_list = FALSE; + + EnterCriticalSection(&store->cs); + if (!list_empty(&context->u.entry)) { + list_remove(&context->u.entry); + list_init(&context->u.entry); + in_list = TRUE; + } + LeaveCriticalSection(&store->cs); + + if(in_list) + Context_Release(context); + return TRUE; +} static BOOL MemStore_addCert(WINECRYPT_CERTSTORE *store, context_t *cert, context_t *toReplace, context_t **ppStoreContext, BOOL use_link) @@ -205,7 +221,6 @@ static BOOL MemStore_addCert(WINECRYPT_CERTSTORE *store, context_t *cert, 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); } @@ -222,10 +237,9 @@ static BOOL MemStore_deleteCert(WINECRYPT_CERTSTORE *store, context_t *context) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; - if (ContextList_Remove(&ms->certs, &ms->cs, context)) - Context_Release(context); + TRACE("(%p, %p)\n", store, context); - return TRUE; + return MemStore_deleteContext(ms, context); } static BOOL MemStore_addCRL(WINECRYPT_CERTSTORE *store, context_t *crl, @@ -251,10 +265,9 @@ static BOOL MemStore_deleteCRL(WINECRYPT_CERTSTORE *store, context_t *context) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; - if (!ContextList_Remove(&ms->crls, &ms->cs, context)) - Context_Release(context); + TRACE("(%p, %p)\n", store, context); - return TRUE; + return MemStore_deleteContext(ms, context); } static BOOL MemStore_addCTL(WINECRYPT_CERTSTORE *store, context_t *ctl, @@ -280,10 +293,9 @@ static BOOL MemStore_deleteCTL(WINECRYPT_CERTSTORE *store, context_t *context) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; - if (!ContextList_Remove(&ms->ctls, &ms->cs, context)) - Context_Release(context); + TRACE("(%p, %p)\n", store, context); - return TRUE; + return MemStore_deleteContext(ms, context); } static void MemStore_addref(WINECRYPT_CERTSTORE *store)

1 0

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

17 Oct '13

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

Alexandre Julliard : gdi32: Determine the virtual resolution dynamically if it hasn't been set.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 3e88582a78427f33c55ac0d3b2e6c917c6fef916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e88582a78427f33c55ac0d3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 17 12:12:48 2013 +0200 gdi32: Determine the virtual resolution dynamically if it hasn't been set. --- dlls/gdi32/mapping.c | 90 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 54 insertions(+), 36 deletions(-) diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 2699ca1..665042a 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -29,6 +29,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(dc); +static SIZE get_dc_virtual_size( DC *dc ) +{ + SIZE ret = dc->virtual_size; + + if (!ret.cx) + { + ret.cx = GetDeviceCaps( dc->hSelf, HORZSIZE ); + ret.cy = GetDeviceCaps( dc->hSelf, VERTSIZE ); + } + return ret; +} + +static SIZE get_dc_virtual_res( DC *dc ) +{ + SIZE ret = dc->virtual_res; + + if (!ret.cx) + { + ret.cx = GetDeviceCaps( dc->hSelf, HORZRES ); + ret.cy = GetDeviceCaps( dc->hSelf, VERTRES ); + } + return ret; +} + /*********************************************************************** * MAPPING_FixIsotropic * @@ -36,10 +60,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dc); */ static void MAPPING_FixIsotropic( DC * dc ) { - double xdim = fabs((double)dc->vportExtX * dc->virtual_size.cx / - (dc->virtual_res.cx * dc->wndExtX)); - double ydim = fabs((double)dc->vportExtY * dc->virtual_size.cy / - (dc->virtual_res.cy * dc->wndExtY)); + SIZE virtual_size = get_dc_virtual_size( dc ); + SIZE virtual_res = get_dc_virtual_res( dc ); + double xdim = fabs((double)dc->vportExtX * virtual_size.cx / (virtual_res.cx * dc->wndExtX)); + double ydim = fabs((double)dc->vportExtY * virtual_size.cy / (virtual_res.cy * dc->wndExtY)); if (xdim > ydim) { @@ -136,14 +160,12 @@ INT nulldrv_SetMapMode( PHYSDEV dev, INT mode ) { DC *dc = get_nulldrv_dc( dev ); INT ret = dc->MapMode; - INT horzSize, vertSize, horzRes, vertRes; + SIZE virtual_size, virtual_res; if (mode == dc->MapMode && (mode == MM_ISOTROPIC || mode == MM_ANISOTROPIC)) return ret; - horzSize = dc->virtual_size.cx; - vertSize = dc->virtual_size.cy; - horzRes = dc->virtual_res.cx; - vertRes = dc->virtual_res.cy; + virtual_size = get_dc_virtual_size( dc ); + virtual_res = get_dc_virtual_res( dc ); switch (mode) { case MM_TEXT: @@ -154,34 +176,34 @@ INT nulldrv_SetMapMode( PHYSDEV dev, INT mode ) break; case MM_LOMETRIC: case MM_ISOTROPIC: - dc->wndExtX = horzSize * 10; - dc->wndExtY = vertSize * 10; - dc->vportExtX = horzRes; - dc->vportExtY = -vertRes; + dc->wndExtX = virtual_size.cx * 10; + dc->wndExtY = virtual_size.cy * 10; + dc->vportExtX = virtual_res.cx; + dc->vportExtY = -virtual_res.cy; break; case MM_HIMETRIC: - dc->wndExtX = horzSize * 100; - dc->wndExtY = vertSize * 100; - dc->vportExtX = horzRes; - dc->vportExtY = -vertRes; + dc->wndExtX = virtual_size.cx * 100; + dc->wndExtY = virtual_size.cy * 100; + dc->vportExtX = virtual_res.cx; + dc->vportExtY = -virtual_res.cy; break; case MM_LOENGLISH: - dc->wndExtX = MulDiv(1000, horzSize, 254); - dc->wndExtY = MulDiv(1000, vertSize, 254); - dc->vportExtX = horzRes; - dc->vportExtY = -vertRes; + dc->wndExtX = MulDiv(1000, virtual_size.cx, 254); + dc->wndExtY = MulDiv(1000, virtual_size.cy, 254); + dc->vportExtX = virtual_res.cx; + dc->vportExtY = -virtual_res.cy; break; case MM_HIENGLISH: - dc->wndExtX = MulDiv(10000, horzSize, 254); - dc->wndExtY = MulDiv(10000, vertSize, 254); - dc->vportExtX = horzRes; - dc->vportExtY = -vertRes; + dc->wndExtX = MulDiv(10000, virtual_size.cx, 254); + dc->wndExtY = MulDiv(10000, virtual_size.cy, 254); + dc->vportExtX = virtual_res.cx; + dc->vportExtY = -virtual_res.cy; break; case MM_TWIPS: - dc->wndExtX = MulDiv(14400, horzSize, 254); - dc->wndExtY = MulDiv(14400, vertSize, 254); - dc->vportExtX = horzRes; - dc->vportExtY = -vertRes; + dc->wndExtX = MulDiv(14400, virtual_size.cx, 254); + dc->wndExtY = MulDiv(14400, virtual_size.cy, 254); + dc->vportExtX = virtual_res.cx; + dc->vportExtY = -virtual_res.cy; break; case MM_ANISOTROPIC: break; @@ -596,15 +618,11 @@ BOOL WINAPI SetVirtualResolution(HDC hdc, DWORD horz_res, DWORD vert_res, DC * dc; TRACE("(%p %d %d %d %d)\n", hdc, horz_res, vert_res, horz_size, vert_size); - if(horz_res == 0 && vert_res == 0 && horz_size == 0 && vert_size == 0) + if (!horz_res || !vert_res || !horz_size || !vert_size) { - horz_res = GetDeviceCaps(hdc, HORZRES); - vert_res = GetDeviceCaps(hdc, VERTRES); - horz_size = GetDeviceCaps(hdc, HORZSIZE); - vert_size = GetDeviceCaps(hdc, VERTSIZE); + /* they must be all zero */ + if (horz_res || vert_res || horz_size || vert_size) return FALSE; } - else if(horz_res == 0 || vert_res == 0 || horz_size == 0 || vert_size == 0) - return FALSE; dc = get_dc_ptr( hdc ); if (!dc) return FALSE;

1 0

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

17 Oct '13

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

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

17 Oct '13

Module: wine Branch: master Commit: 6611068b5b37b77033583fb68df3c3f31347f9b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6611068b5b37b77033583fb68… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Oct 17 02:41:58 2013 +0800 atl80: Trace ATL version. --- dlls/atl80/atl80.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c index b5d571b..487ee49 100644 --- a/dlls/atl80/atl80.c +++ b/dlls/atl80/atl80.c @@ -95,7 +95,8 @@ HRESULT WINAPI AtlRegisterTypeLib(HINSTANCE inst, const WCHAR *index) */ DWORD WINAPI AtlGetVersion(void *pReserved) { - return _ATL_VER; + TRACE("version %04x (%p)\n", _ATL_VER, pReserved); + return _ATL_VER; } /********************************************************************** @@ -123,7 +124,7 @@ BOOL WINAPI AtlAxWinInit(void) const WCHAR AtlAxWin80[] = {'A','t','l','A','x','W','i','n','8','0',0}; const WCHAR AtlAxWinLic80[] = {'A','t','l','A','x','W','i','n','L','i','c','8','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

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 : 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 : 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

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