October 2013 - Wine-Commits

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

Oct. 17, 2013

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

Oct. 17, 2013

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 : atl110: Trace ATL version.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

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 : atl80: Trace ATL version.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

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

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

Oct. 17, 2013

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

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

Oct. 17, 2013

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: Use context_t in ContextList_Add.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

Module: wine Branch: master Commit: 8d4b288f590f8d1acb241d166e7da015a7fbd37b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4b288f590f8d1acb241d166… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:07:38 2013 +0200 crypt32: Use context_t in ContextList_Add. --- dlls/crypt32/context.c | 14 ++++++-------- dlls/crypt32/crypt32_private.h | 2 +- dlls/crypt32/store.c | 30 ++++++++++++++++++------------ 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 0dbf934..3b34463 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -137,33 +137,31 @@ struct ContextList *ContextList_Create( return list; } -void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace, struct WINE_CRYPTCERTSTORE *store, BOOL use_link) +context_t *ContextList_Add(struct ContextList *list, context_t *toLink, context_t *existing, struct WINE_CRYPTCERTSTORE *store, BOOL use_link) { context_t *context; - TRACE("(%p, %p, %p)\n", list, toLink, toReplace); + TRACE("(%p, %p, %p)\n", list, toLink, existing); - context = context_from_ptr(toLink)->vtbl->clone(BASE_CONTEXT_FROM_CONTEXT(toLink), store, use_link); + context = toLink->vtbl->clone(toLink, store, use_link); if (context) { TRACE("adding %p\n", context); EnterCriticalSection(&list->cs); - if (toReplace) + if (existing) { - context_t *existing = context_from_ptr(toReplace); - 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(context_from_ptr(toReplace)); + Context_Release(existing); } else list_add_head(&list->contexts, &context->u.entry); LeaveCriticalSection(&list->cs); } - return CONTEXT_FROM_BASE_CONTEXT(context); + return context; } void *ContextList_Enum(struct ContextList *list, void *pPrev) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 1c8eae8..1d7b287 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -444,7 +444,7 @@ struct ContextList; struct ContextList *ContextList_Create( const WINE_CONTEXT_INTERFACE *contextInterface, size_t contextSize) DECLSPEC_HIDDEN; -void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace, +context_t *ContextList_Add(struct ContextList *list, context_t *toLink, context_t *toReplace, struct WINE_CRYPTCERTSTORE *store, BOOL use_link) DECLSPEC_HIDDEN; void *ContextList_Enum(struct ContextList *list, void *pPrev) DECLSPEC_HIDDEN; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 08c2a30..3381194 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -146,16 +146,18 @@ static BOOL MemStore_addCert(WINECRYPT_CERTSTORE *store, void *cert, void *toReplace, const void **ppStoreContext, BOOL use_link) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; - PCERT_CONTEXT context; + context_t *context; TRACE("(%p, %p, %p, %p)\n", store, cert, toReplace, ppStoreContext); - context = ContextList_Add(ms->certs, cert, toReplace, store, use_link); + context = ContextList_Add(ms->certs, context_from_ptr(cert), toReplace ? context_from_ptr(toReplace) : NULL, store, use_link); if (!context) return FALSE; - if (ppStoreContext) - *ppStoreContext = CertDuplicateCertificateContext(context); + if (ppStoreContext) { + Context_AddRef(context); + *ppStoreContext = context_ptr(context); + } return TRUE; } @@ -188,16 +190,18 @@ static BOOL MemStore_addCRL(WINECRYPT_CERTSTORE *store, void *crl, void *toReplace, const void **ppStoreContext, BOOL use_link) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; - PCRL_CONTEXT context; + context_t *context; TRACE("(%p, %p, %p, %p)\n", store, crl, toReplace, ppStoreContext); - context = ContextList_Add(ms->crls, crl, toReplace, store, use_link); + context = ContextList_Add(ms->crls, context_from_ptr(crl), toReplace ? context_from_ptr(toReplace) : NULL, store, use_link); if (!context) return FALSE; - if (ppStoreContext) - *ppStoreContext = CertDuplicateCRLContext(context); + if (ppStoreContext) { + Context_AddRef(context); + *ppStoreContext = context_ptr(context); + } return TRUE; } @@ -230,16 +234,18 @@ static BOOL MemStore_addCTL(WINECRYPT_CERTSTORE *store, void *ctl, void *toReplace, const void **ppStoreContext, BOOL use_link) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; - PCTL_CONTEXT context; + context_t *context; TRACE("(%p, %p, %p, %p)\n", store, ctl, toReplace, ppStoreContext); - context = ContextList_Add(ms->ctls, ctl, toReplace, store, use_link); + context = ContextList_Add(ms->ctls, context_from_ptr(ctl), toReplace ? context_from_ptr(toReplace) : NULL, store, use_link); if (!context) return FALSE; - if (ppStoreContext) - *ppStoreContext = CertDuplicateCTLContext(context); + if (ppStoreContext) { + Context_AddRef(context); + *ppStoreContext = context_ptr(context); + } return TRUE; }

1 0

Alexandre Julliard : shell32: Delay common controls initialization until needed.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

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 : explorerframe: Correctly initialize common controls.
by Alexandre Julliard Oct. 17, 2013

Oct. 17, 2013

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

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

Oct. 17, 2013

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