October 2013 - Wine-Commits

Jacek Caban : crypt32: Store list entry directly in context_t.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 06f5ee4b2cc7fca44dd32bc1b6d5db1dd11b92f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f5ee4b2cc7fca44dd32bc1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 15 16:53:11 2013 +0200 crypt32: Store list entry directly in context_t. --- dlls/crypt32/collectionstore.c | 1 - dlls/crypt32/context.c | 65 ++++++++++++--------------------------- dlls/crypt32/crl.c | 2 +- dlls/crypt32/crypt32_private.h | 5 +++ dlls/crypt32/provstore.c | 1 - dlls/crypt32/regstore.c | 1 - dlls/crypt32/store.c | 1 - 7 files changed, 26 insertions(+), 50 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index dbcf21b..284519f 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -20,7 +20,6 @@ #include "winbase.h" #include "wincrypt.h" #include "wine/debug.h" -#include "wine/list.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index b2b2282..527eb79 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -21,7 +21,6 @@ #include "winbase.h" #include "wincrypt.h" #include "wine/debug.h" -#include "wine/list.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(context); @@ -163,50 +162,30 @@ struct ContextList *ContextList_Create( return list; } -static inline struct list *ContextList_ContextToEntry(const struct ContextList *list, - const void *context) -{ - struct list *ret; - - if (context) - ret = Context_GetExtra(context, list->contextSize); - else - ret = NULL; - return ret; -} - -static inline void *ContextList_EntryToContext(const struct ContextList *list, - struct list *entry) -{ - return (LPBYTE)entry - list->contextSize; -} - void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace) { context_t *context; TRACE("(%p, %p, %p)\n", list, toLink, toReplace); - context = Context_CreateLinkContext(list->contextSize, context_from_ptr(toLink), sizeof(struct list)); + context = Context_CreateLinkContext(list->contextSize, context_from_ptr(toLink), 0); if (context) { - struct list *entry = ContextList_ContextToEntry(list, CONTEXT_FROM_BASE_CONTEXT(context)); - TRACE("adding %p\n", context); EnterCriticalSection(&list->cs); if (toReplace) { - struct list *existing = ContextList_ContextToEntry(list, toReplace); + context_t *existing = context_from_ptr(toReplace); - entry->prev = existing->prev; - entry->next = existing->next; - entry->prev->next = entry; - entry->next->prev = entry; - existing->prev = existing->next = 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(context_from_ptr(toReplace)); } else - list_add_head(&list->contexts, entry); + list_add_head(&list->contexts, &context->u.entry); LeaveCriticalSection(&list->cs); } return CONTEXT_FROM_BASE_CONTEXT(context); @@ -220,9 +199,7 @@ void *ContextList_Enum(struct ContextList *list, void *pPrev) EnterCriticalSection(&list->cs); if (pPrev) { - struct list *prevEntry = ContextList_ContextToEntry(list, pPrev); - - listNext = list_next(&list->contexts, prevEntry); + listNext = list_next(&list->contexts, &context_from_ptr(pPrev)->u.entry); Context_Release(context_from_ptr(pPrev)); } else @@ -231,7 +208,7 @@ void *ContextList_Enum(struct ContextList *list, void *pPrev) if (listNext) { - ret = ContextList_EntryToContext(list, listNext); + ret = CONTEXT_FROM_BASE_CONTEXT(LIST_ENTRY(listNext, context_t, u.entry)); Context_AddRef(context_from_ptr(ret)); } else @@ -239,35 +216,33 @@ void *ContextList_Enum(struct ContextList *list, void *pPrev) return ret; } -BOOL ContextList_Remove(struct ContextList *list, void *context) +BOOL ContextList_Remove(struct ContextList *list, void *ctx) { - struct list *entry = ContextList_ContextToEntry(list, context); + context_t *context = context_from_ptr(ctx); BOOL inList = FALSE; EnterCriticalSection(&list->cs); - if (!list_empty(entry)) + if (!list_empty(&context->u.entry)) { - list_remove(entry); + list_remove(&context->u.entry); + list_init(&context->u.entry); inList = TRUE; } LeaveCriticalSection(&list->cs); - if (inList) - list_init(entry); + return inList; } static void ContextList_Empty(struct ContextList *list) { - struct list *entry, *next; + context_t *context, *next; EnterCriticalSection(&list->cs); - LIST_FOR_EACH_SAFE(entry, next, &list->contexts) + LIST_FOR_EACH_ENTRY_SAFE(context, next, &list->contexts, context_t, u.entry) { - const void *context = ContextList_EntryToContext(list, entry); - TRACE("removing %p\n", context); - list_remove(entry); - Context_Release(context_from_ptr(context)); + list_remove(&context->u.entry); + Context_Release(context); } LeaveCriticalSection(&list->cs); } diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 9ecc23f..2e3a58f 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -343,7 +343,7 @@ PCCRL_CONTEXT WINAPI CertDuplicateCRLContext(PCCRL_CONTEXT pCrlContext) return pCrlContext; } -BOOL WINAPI CertFreeCRLContext( PCCRL_CONTEXT pCrlContext) +BOOL WINAPI CertFreeCRLContext(PCCRL_CONTEXT pCrlContext) { BOOL ret = TRUE; diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 287e0c2..20ba276 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -19,6 +19,8 @@ #ifndef __CRYPT32_PRIVATE_H__ #define __CRYPT32_PRIVATE_H__ +#include "wine/list.h" + /* a few asn.1 tags we need */ #define ASN_BOOL (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x01) #define ASN_BITSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x03) @@ -170,6 +172,9 @@ typedef struct _context_t { LONG ref; struct _context_t *linked; CONTEXT_PROPERTY_LIST *properties; + union { + struct list entry; + } u; } BASE_CONTEXT; static inline context_t *context_from_ptr(const void *ptr) diff --git a/dlls/crypt32/provstore.c b/dlls/crypt32/provstore.c index 97b5454..ce9c145 100644 --- a/dlls/crypt32/provstore.c +++ b/dlls/crypt32/provstore.c @@ -20,7 +20,6 @@ #include "winbase.h" #include "wincrypt.h" #include "wine/debug.h" -#include "wine/list.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index 8fb7eeb..b79387f 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -23,7 +23,6 @@ #include "winreg.h" #include "winuser.h" #include "wine/debug.h" -#include "wine/list.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 5bd19eb..3dfb850 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -35,7 +35,6 @@ #include "winuser.h" #include "wincrypt.h" #include "wine/debug.h" -#include "wine/list.h" #include "wine/exception.h" #include "crypt32_private.h"

1 0

Jacek Caban : crypt32: Moved CertAddCertificateContextToStore to cert.c.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 988e8a78c2deda0463c8bad9734fa6fd8d4ec543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=988e8a78c2deda0463c8bad97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 15 16:52:57 2013 +0200 crypt32: Moved CertAddCertificateContextToStore to cert.c. --- dlls/crypt32/cert.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/store.c | 128 -------------------------------------------------- 2 files changed, 128 insertions(+), 128 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 9016d8c..2c96419 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -121,6 +121,134 @@ static const context_vtbl_t cert_vtbl = { Cert_free }; +BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, + PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, + PCCERT_CONTEXT *ppStoreContext) +{ + WINECRYPT_CERTSTORE *store = hCertStore; + BOOL ret = TRUE; + PCCERT_CONTEXT toAdd = NULL, existing = NULL; + + TRACE("(%p, %p, %08x, %p)\n", hCertStore, pCertContext, + dwAddDisposition, ppStoreContext); + + switch (dwAddDisposition) + { + case CERT_STORE_ADD_ALWAYS: + break; + case CERT_STORE_ADD_NEW: + case CERT_STORE_ADD_REPLACE_EXISTING: + case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: + case CERT_STORE_ADD_USE_EXISTING: + case CERT_STORE_ADD_NEWER: + case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: + { + BYTE hashToAdd[20]; + DWORD size = sizeof(hashToAdd); + + ret = CertGetCertificateContextProperty(pCertContext, CERT_HASH_PROP_ID, + hashToAdd, &size); + if (ret) + { + CRYPT_HASH_BLOB blob = { sizeof(hashToAdd), hashToAdd }; + + existing = CertFindCertificateInStore(hCertStore, + pCertContext->dwCertEncodingType, 0, CERT_FIND_SHA1_HASH, &blob, + NULL); + } + break; + } + default: + FIXME("Unimplemented add disposition %d\n", dwAddDisposition); + SetLastError(E_INVALIDARG); + ret = FALSE; + } + + switch (dwAddDisposition) + { + case CERT_STORE_ADD_ALWAYS: + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + case CERT_STORE_ADD_NEW: + if (existing) + { + TRACE("found matching certificate, not adding\n"); + SetLastError(CRYPT_E_EXISTS); + ret = FALSE; + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + case CERT_STORE_ADD_REPLACE_EXISTING: + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: + toAdd = CertDuplicateCertificateContext(pCertContext); + if (existing) + Context_CopyProperties(toAdd, existing); + break; + case CERT_STORE_ADD_USE_EXISTING: + if (existing) + { + Context_CopyProperties(existing, pCertContext); + if (ppStoreContext) + *ppStoreContext = CertDuplicateCertificateContext(existing); + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + case CERT_STORE_ADD_NEWER: + if (existing) + { + if (CompareFileTime(&existing->pCertInfo->NotBefore, + &pCertContext->pCertInfo->NotBefore) >= 0) + { + TRACE("existing certificate is newer, not adding\n"); + SetLastError(CRYPT_E_EXISTS); + ret = FALSE; + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: + if (existing) + { + if (CompareFileTime(&existing->pCertInfo->NotBefore, + &pCertContext->pCertInfo->NotBefore) >= 0) + { + TRACE("existing certificate is newer, not adding\n"); + SetLastError(CRYPT_E_EXISTS); + ret = FALSE; + } + else + { + toAdd = CertDuplicateCertificateContext(pCertContext); + Context_CopyProperties(toAdd, existing); + } + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + } + + if (toAdd) + { + if (store) + ret = store->vtbl->certs.addContext(store, (void *)toAdd, + (void *)existing, (const void **)ppStoreContext); + else if (ppStoreContext) + *ppStoreContext = CertDuplicateCertificateContext(toAdd); + CertFreeCertificateContext(toAdd); + } + CertFreeCertificateContext(existing); + + TRACE("returning %d\n", ret); + return ret; +} + BOOL WINAPI CertAddCertificateLinkToStore(HCERTSTORE hCertStore, PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, PCCERT_CONTEXT *ppCertContext) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index f11279c..5bd19eb 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -892,134 +892,6 @@ HCERTSTORE WINAPI CertOpenSystemStoreW(HCRYPTPROV_LEGACY hProv, CERT_SYSTEM_STORE_CURRENT_USER, szSubSystemProtocol); } -BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, - PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, - PCCERT_CONTEXT *ppStoreContext) -{ - WINECRYPT_CERTSTORE *store = hCertStore; - BOOL ret = TRUE; - PCCERT_CONTEXT toAdd = NULL, existing = NULL; - - TRACE("(%p, %p, %08x, %p)\n", hCertStore, pCertContext, - dwAddDisposition, ppStoreContext); - - switch (dwAddDisposition) - { - case CERT_STORE_ADD_ALWAYS: - break; - case CERT_STORE_ADD_NEW: - case CERT_STORE_ADD_REPLACE_EXISTING: - case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: - case CERT_STORE_ADD_USE_EXISTING: - case CERT_STORE_ADD_NEWER: - case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: - { - BYTE hashToAdd[20]; - DWORD size = sizeof(hashToAdd); - - ret = CertGetCertificateContextProperty(pCertContext, CERT_HASH_PROP_ID, - hashToAdd, &size); - if (ret) - { - CRYPT_HASH_BLOB blob = { sizeof(hashToAdd), hashToAdd }; - - existing = CertFindCertificateInStore(hCertStore, - pCertContext->dwCertEncodingType, 0, CERT_FIND_SHA1_HASH, &blob, - NULL); - } - break; - } - default: - FIXME("Unimplemented add disposition %d\n", dwAddDisposition); - SetLastError(E_INVALIDARG); - ret = FALSE; - } - - switch (dwAddDisposition) - { - case CERT_STORE_ADD_ALWAYS: - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - case CERT_STORE_ADD_NEW: - if (existing) - { - TRACE("found matching certificate, not adding\n"); - SetLastError(CRYPT_E_EXISTS); - ret = FALSE; - } - else - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - case CERT_STORE_ADD_REPLACE_EXISTING: - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: - toAdd = CertDuplicateCertificateContext(pCertContext); - if (existing) - Context_CopyProperties(toAdd, existing); - break; - case CERT_STORE_ADD_USE_EXISTING: - if (existing) - { - Context_CopyProperties(existing, pCertContext); - if (ppStoreContext) - *ppStoreContext = CertDuplicateCertificateContext(existing); - } - else - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - case CERT_STORE_ADD_NEWER: - if (existing) - { - if (CompareFileTime(&existing->pCertInfo->NotBefore, - &pCertContext->pCertInfo->NotBefore) >= 0) - { - TRACE("existing certificate is newer, not adding\n"); - SetLastError(CRYPT_E_EXISTS); - ret = FALSE; - } - else - toAdd = CertDuplicateCertificateContext(pCertContext); - } - else - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: - if (existing) - { - if (CompareFileTime(&existing->pCertInfo->NotBefore, - &pCertContext->pCertInfo->NotBefore) >= 0) - { - TRACE("existing certificate is newer, not adding\n"); - SetLastError(CRYPT_E_EXISTS); - ret = FALSE; - } - else - { - toAdd = CertDuplicateCertificateContext(pCertContext); - Context_CopyProperties(toAdd, existing); - } - } - else - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - } - - if (toAdd) - { - if (store) - ret = store->vtbl->certs.addContext(store, (void *)toAdd, - (void *)existing, (const void **)ppStoreContext); - else if (ppStoreContext) - *ppStoreContext = CertDuplicateCertificateContext(toAdd); - CertFreeCertificateContext(toAdd); - } - CertFreeCertificateContext(existing); - - TRACE("returning %d\n", ret); - return ret; -} - PCCERT_CONTEXT WINAPI CertEnumCertificatesInStore(HCERTSTORE hCertStore, PCCERT_CONTEXT pPrev) {

1 0

Piotr Caban : comctl32: Ignore tooltip position passed in TTM_TRACKPOSITION if TTF_TRACK flag is not set .
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 26c751ea2968cb1ec63025a4f19567e7cafe86de URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c751ea2968cb1ec63025a4f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 15 15:52:30 2013 +0200 comctl32: Ignore tooltip position passed in TTM_TRACKPOSITION if TTF_TRACK flag is not set. --- dlls/comctl32/tests/tooltips.c | 57 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 2 +- 2 files changed, 58 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 71c66a5..87e1d9b 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -758,6 +758,62 @@ static void test_longtextW(void) DestroyWindow(hwnd); } +static BOOL almost_eq(int a, int b) +{ + return a-5<b && a+5>b; +} + +static void test_track(void) +{ + WCHAR textW[] = {'t','e','x','t',0}; + TTTOOLINFOW info = { 0 }; + HWND parent, tt; + LRESULT res; + RECT pos; + + parent = CreateWindowExW(0, WC_STATICW, NULL, WS_CAPTION | WS_VISIBLE, + 50, 50, 300, 300, NULL, NULL, NULL, 0); + ok(parent != NULL, "creation of parent window failed\n"); + + ShowWindow(parent, SW_SHOWNORMAL); + flush_events(100); + + tt = CreateWindowExW(WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, TTS_NOPREFIX | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + parent, NULL, GetModuleHandleW(NULL), 0); + ok(tt != NULL, "creation of tooltip window failed\n"); + + info.cbSize = TTTOOLINFO_V1_SIZE; + info.uFlags = TTF_IDISHWND | TTF_TRACK | TTF_ABSOLUTE; + info.hwnd = parent; + info.hinst = GetModuleHandleW(NULL); + info.lpszText = textW; + info.uId = (UINT_PTR)parent; + GetClientRect(parent, &info.rect); + + res = SendMessageW(tt, TTM_ADDTOOLW, 0, (LPARAM)&info); + ok(res, "adding the tool to the tooltip failed\n"); + + SendMessageW(tt, TTM_SETDELAYTIME, TTDT_INITIAL, MAKELPARAM(1,0)); + SendMessageW(tt, TTM_TRACKACTIVATE, (WPARAM)TRUE, (LPARAM)&info); + SendMessageW(tt, TTM_TRACKPOSITION, 0, MAKELPARAM(10, 10)); + + GetWindowRect(tt, &pos); + ok(almost_eq(pos.left, 10), "pos.left = %d\n", pos.left); + ok(almost_eq(pos.top, 10), "pos.top = %d\n", pos.top); + + info.uFlags = TTF_IDISHWND | TTF_ABSOLUTE; + SendMessageW(tt, TTM_SETTOOLINFO, 0, (LPARAM)&info); + SendMessageW(tt, TTM_TRACKPOSITION, 0, MAKELPARAM(10, 10)); + + GetWindowRect(tt, &pos); + ok(!almost_eq(pos.left, 10), "pos.left = %d\n", pos.left); + ok(!almost_eq(pos.top, 10), "pos.top = %d\n", pos.top); + + DestroyWindow(tt); + DestroyWindow(parent); +} + START_TEST(tooltips) { InitCommonControls(); @@ -768,4 +824,5 @@ START_TEST(tooltips) test_ttm_gettoolinfo(); test_longtextA(); test_longtextW(); + test_track(); } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 2cc7e47..a325bcc 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -626,7 +626,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) TOOLTIPS_CalcTipSize (infoPtr, &size); TRACE("size %d x %d\n", size.cx, size.cy); - if (track_activate) + if (track_activate && (toolPtr->uFlags & TTF_TRACK)) { rect.left = infoPtr->xTrackPos; rect.top = infoPtr->yTrackPos;

1 0

Zhenbo Li : atl90: Added new dll.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 7003bbdfd41b8dd690b41aa1d367927e75ad781f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7003bbdfd41b8dd690b41aa1d… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat Oct 12 12:11:58 2013 +0800 atl90: Added new dll. --- configure | 2 + configure.ac | 1 + dlls/atl90/Makefile.in | 7 ++++ dlls/atl90/atl90.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/atl90/atl90.spec | 52 ++++++++++++++++++++++++++ include/atlbase.h | 1 + tools/make_specfiles | 1 + 7 files changed, 158 insertions(+), 0 deletions(-) diff --git a/configure b/configure index bfde1af..b523d82 100755 --- a/configure +++ b/configure @@ -881,6 +881,7 @@ enable_atl enable_atl100 enable_atl110 enable_atl80 +enable_atl90 enable_authz enable_avicap32 enable_avifil32 @@ -16679,6 +16680,7 @@ wine_fn_config_test dlls/atl100/tests atl100_test wine_fn_config_dll atl110 enable_atl110 wine_fn_config_dll atl80 enable_atl80 implib wine_fn_config_test dlls/atl80/tests atl80_test +wine_fn_config_dll atl90 enable_atl90 wine_fn_config_dll authz enable_authz wine_fn_config_dll avicap32 enable_avicap32 implib wine_fn_config_dll avifil32 enable_avifil32 clean,implib,po diff --git a/configure.ac b/configure.ac index a2e1874..4f6e263 100644 --- a/configure.ac +++ b/configure.ac @@ -2716,6 +2716,7 @@ WINE_CONFIG_TEST(dlls/atl100/tests) WINE_CONFIG_DLL(atl110) WINE_CONFIG_DLL(atl80,,[implib]) WINE_CONFIG_TEST(dlls/atl80/tests) +WINE_CONFIG_DLL(atl90) WINE_CONFIG_DLL(authz) WINE_CONFIG_DLL(avicap32,,[implib]) WINE_CONFIG_DLL(avifil32,,[clean,implib,po]) diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in new file mode 100644 index 0000000..92b5d44 --- /dev/null +++ b/dlls/atl90/Makefile.in @@ -0,0 +1,7 @@ +MODULE = atl90.dll +IMPORTS = atl100 oleaut32 user32 ole32 +EXTRADEFS = -D_ATL_VER=_ATL_VER_90 + +C_SRCS = atl90.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/atl90/atl90.c b/dlls/atl90/atl90.c new file mode 100644 index 0000000..1b46dcb --- /dev/null +++ b/dlls/atl90/atl90.c @@ -0,0 +1,94 @@ +/* + * Copyright 2013 Zhenbo Li + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winuser.h" +#include "atlbase.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(atl); + +/*********************************************************************** + * AtlGetVersion [atl90.@] + */ +DWORD WINAPI AtlGetVersion(void *reserved) +{ + return _ATL_VER; +} + +/********************************************************************** + * AtlAxWin class window procedure + */ +static LRESULT CALLBACK AtlAxWin_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + if ( msg == WM_CREATE ) + { + DWORD len = GetWindowTextLengthW( hwnd ) + 1; + WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + if (!ptr) + return 1; + GetWindowTextW( hwnd, ptr, len ); + AtlAxCreateControlEx( ptr, hwnd, NULL, NULL, NULL, NULL, NULL ); + HeapFree( GetProcessHeap(), 0, ptr ); + return 0; + } + return DefWindowProcW( hwnd, msg, wparam, lparam ); +} + +BOOL WINAPI AtlAxWinInit(void) +{ + WNDCLASSEXW wcex; + 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"); + + if ( FAILED( OleInitialize(NULL) ) ) + return FALSE; + + wcex.cbSize = sizeof(wcex); + wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = GetModuleHandleW( NULL ); + wcex.hIcon = NULL; + wcex.hCursor = NULL; + wcex.hbrBackground = NULL; + wcex.lpszMenuName = NULL; + wcex.hIconSm = 0; + + wcex.lpfnWndProc = AtlAxWin_wndproc; + wcex.lpszClassName = AtlAxWin90; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + wcex.lpszClassName = AtlAxWinLic90; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + return TRUE; +} diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec new file mode 100644 index 0000000..aed22bd --- /dev/null +++ b/dlls/atl90/atl90.spec @@ -0,0 +1,52 @@ +10 stdcall AtlAdvise(ptr ptr ptr ptr) atl100.AtlAdvise +11 stdcall AtlUnadvise(ptr ptr long) atl100.AtlUnadvise +12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr +15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject +17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects +20 stub AtlComModuleRevokeClassObjects +22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD +24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop +25 stub AtlSetErrorInfo +26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC +27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel +28 stdcall AtlPixelToHiMetric(ptr ptr) atl100.AtlPixelToHiMetric +29 stub AtlDevModeW2A +30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface +34 stdcall AtlGetVersion(ptr) +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW +36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW +38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx +41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl +42 stdcall AtlAxWinInit() +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData +44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData +45 stub AtlWinModuleRegisterWndClassInfoW +46 stub AtlWinModuleRegisterWndClassInfoA +47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl +48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load +53 stub AtlIPersistPropertyBag_Save +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface +56 stdcall AtlLoadTypeLib(long wstr ptr ptr) atl100.AtlLoadTypeLib +58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc +59 stub AtlAxCreateControlLic +60 stub AtlAxCreateControlLicEx +61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar +62 stub AtlWinModuleRegisterClassExW +63 stub AtlWinModuleRegisterClassExA +64 stdcall AtlCallTermFunc(ptr) atl100.AtlCallTermFunc +65 stdcall AtlWinModuleInit(ptr) atl100.AtlWinModuleInit +66 stub AtlWinModuleTerm +67 stdcall AtlSetPerUserRegistration(long) atl100.AtlSetPerUserRegistration +68 stdcall AtlGetPerUserRegistration(ptr) atl100.AtlGetPerUserRegistration diff --git a/include/atlbase.h b/include/atlbase.h index 660fbf5..bcd634e 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -28,6 +28,7 @@ #define _ATL_VER_30 0x0300 #define _ATL_VER_70 0x0700 #define _ATL_VER_80 0x0800 +#define _ATL_VER_90 0x0900 #define _ATL_VER_100 0x0a00 #define _ATL_VER_110 0x0b00 diff --git a/tools/make_specfiles b/tools/make_specfiles index 5314c41..dbfa5e3 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -123,6 +123,7 @@ my @dll_groups = "atl110", "atl", "atl80", + "atl90", ], [ "advapi32",

1 0

Jacek Caban : crypt32: Pass contexts as context_t to CONTEXT_FUNCS->delete.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 05f248e968c40374886251565bde57fe30f5f01e URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f248e968c40374886251565… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 15 16:53:38 2013 +0200 crypt32: Pass contexts as context_t to CONTEXT_FUNCS->delete. --- dlls/crypt32/collectionstore.c | 27 ++++++++++++++----------- dlls/crypt32/context.c | 3 +- dlls/crypt32/crypt32_private.h | 6 +--- dlls/crypt32/ctl.c | 3 +- dlls/crypt32/provstore.c | 20 +++++++++--------- dlls/crypt32/store.c | 42 +++++++++++++++++---------------------- 6 files changed, 48 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05f248e968c4037488625…

1 0

Nikolay Sivov : cabinet/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 947977f614579d8baff58648e77628c0183a8326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=947977f614579d8baff58648e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 15:45:47 2013 +0400 cabinet/tests: Compile with -D__WINESRC__. --- dlls/cabinet/tests/Makefile.in | 1 - dlls/cabinet/tests/extract.c | 10 +++++----- dlls/cabinet/tests/fdi.c | 6 +++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/cabinet/tests/Makefile.in b/dlls/cabinet/tests/Makefile.in index 34c2479..4525d60 100644 --- a/dlls/cabinet/tests/Makefile.in +++ b/dlls/cabinet/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = cabinet.dll IMPORTS = cabinet -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ extract.c \ diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index aedbdd4..849d612 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -240,8 +240,8 @@ static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, DWORD attrs; BOOL res; - handle = CreateFile(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); + handle = CreateFileA(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName); @@ -251,7 +251,7 @@ static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); FileTimeToDosDateTime(&filetime, pdate, ptime); - attrs = GetFileAttributes(pszName); + attrs = GetFileAttributesA(pszName); ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n"); return (INT_PTR)handle; @@ -623,7 +623,7 @@ static void test_Extract(void) /* first file exists */ createTestFile("dest\\a.txt"); - SetFileAttributes("dest\\a.txt", FILE_ATTRIBUTE_READONLY); + SetFileAttributesA("dest\\a.txt", FILE_ATTRIBUTE_READONLY); ZeroMemory(&session, sizeof(SESSION)); lstrcpyA(session.Destination, "dest"); session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; @@ -665,7 +665,7 @@ static void test_Extract(void) /* third file exists */ createTestFile("dest\\testdir\\c.txt"); - SetFileAttributes("dest\\testdir\\c.txt", FILE_ATTRIBUTE_READONLY); + SetFileAttributesA("dest\\testdir\\c.txt", FILE_ATTRIBUTE_READONLY); ZeroMemory(&session, sizeof(SESSION)); lstrcpyA(session.Destination, "dest"); session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 4e1c9e0..919fdbf 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -440,8 +440,8 @@ static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, DWORD attrs; BOOL res; - handle = CreateFile(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); + handle = CreateFileA(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName); @@ -451,7 +451,7 @@ static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); FileTimeToDosDateTime(&filetime, pdate, ptime); - attrs = GetFileAttributes(pszName); + attrs = GetFileAttributesA(pszName); ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n"); /* fixme: should convert attrs to *pattribs, make sure * have a test that catches the fact that we don't?

1 0

Andrew Eikum : advapi32: Attempt to open WOW64 key before the lowest level key, too.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 8cb7f877d7406065074183ae8541355f0090e6db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb7f877d7406065074183ae8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 4 09:44:21 2013 -0500 advapi32: Attempt to open WOW64 key before the lowest level key, too. Without this, we'll fail to open the correct key for e.g. <Machine\Software\Classes> with KEY_WOW64_32KEY, which should resolve to <Machine\Software\Wow6432Node\Classes>. --- dlls/advapi32/registry.c | 43 +++++++++++++++++++++++++------------------ 1 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 11e7500..c4113fb 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -140,10 +140,9 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES if (i == len && !force_wow32) return status; attrs = attr->Attributes; - attr->Attributes &= ~OBJ_OPENLINK; attr->ObjectName = &str; - while (i < len) + for (;;) { str.Buffer = buffer + pos; str.Length = (i - pos) * sizeof(WCHAR); @@ -157,20 +156,25 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES force_wow32 = FALSE; } } - status = NtCreateKey( &subkey, access, attr, 0, class, - options & ~REG_OPTION_CREATE_LINK, dispos ); + if (i == len) + { + attr->Attributes = attrs; + status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, class, options, dispos ); + } + else + { + attr->Attributes = attrs & ~OBJ_OPENLINK; + status = NtCreateKey( &subkey, access, attr, 0, class, + options & ~REG_OPTION_CREATE_LINK, dispos ); + } if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); if (status) return status; + if (i == len) break; attr->RootDirectory = subkey; while (i < len && buffer[i] == '\\') i++; pos = i; while (i < len && buffer[i] != '\\') i++; } - str.Buffer = buffer + pos; - str.Length = (i - pos) * sizeof(WCHAR); - attr->Attributes = attrs; - status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, class, options, dispos ); - if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); } return status; } @@ -190,10 +194,9 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a if (len && buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID; while (i < len && buffer[i] != '\\') i++; attrs = attr->Attributes; - attr->Attributes &= ~OBJ_OPENLINK; attr->ObjectName = &str; - while (i < len) + for (;;) { str.Buffer = buffer + pos; str.Length = (i - pos) * sizeof(WCHAR); @@ -207,21 +210,25 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a force_wow32 = FALSE; } } - status = NtOpenKey( &subkey, access, attr ); + if (i == len) + { + attr->Attributes = attrs; + status = NtOpenKey( (PHANDLE)retkey, access, attr ); + } + else + { + attr->Attributes = attrs & ~OBJ_OPENLINK; + status = NtOpenKey( &subkey, access, attr ); + } if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); if (status) return status; + if (i == len) break; attr->RootDirectory = subkey; while (i < len && buffer[i] == '\\') i++; pos = i; while (i < len && buffer[i] != '\\') i++; } - str.Buffer = buffer + pos; - str.Length = (i - pos) * sizeof(WCHAR); - attr->Attributes = attrs; - status = NtOpenKey( (PHANDLE)retkey, access, attr ); - if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); return status; - } /* create one of the HKEY_* special root keys */

1 0

Aric Stewart : tools: Add new Explicit Formatting types for Unicode 6.3.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: b5d9fc323d4a8414819443a966511de3f22c8a5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d9fc323d4a8414819443a96… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 7 10:18:31 2013 -0500 tools: Add new Explicit Formatting types for Unicode 6.3. --- tools/make_unicode | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/make_unicode b/tools/make_unicode index 1acc424..cae3547 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -279,13 +279,8 @@ my %special_categories = my %directions = ( "L" => 1, # Left-to-Right - "LRE" => 15, # Left-to-Right Embedding - "LRO" => 15, # Left-to-Right Override "R" => 2, # Right-to-Left "AL" => 12, # Right-to-Left Arabic - "RLE" => 15, # Right-to-Left Embedding - "RLO" => 15, # Right-to-Left Override - "PDF" => 15, # Pop Directional Format "EN" => 3, # European Number "ES" => 4, # European Number Separator "ET" => 5, # European Number Terminator @@ -296,7 +291,16 @@ my %directions = "B" => 8, # Paragraph Separator "S" => 9, # Segment Separator "WS" => 10, # Whitespace - "ON" => 11 # Other Neutrals + "ON" => 11, # Other Neutrals + "LRE" => 15, # Left-to-Right Embedding + "LRO" => 15, # Left-to-Right Override + "RLE" => 15, # Right-to-Left Embedding + "RLO" => 15, # Right-to-Left Override + "PDF" => 15, # Pop Directional Format + "LRI" => 15, # Left-to-Right Isolate + "RLI" => 15, # Right-to-Left Isolate + "FSI" => 15, # First Strong Isolate + "PDI" => 15 # Pop Directional Isolate ); my %joining_types =

1 0

Hans Leidekker : msi/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 1d124f8869edf916caf2206be1e32975bd7541a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d124f8869edf916caf2206be… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 15 10:35:01 2013 +0200 msi/tests: Compile with -D__WINESRC__. --- dlls/msi/tests/Makefile.in | 1 - dlls/msi/tests/action.c | 10 +++- dlls/msi/tests/automation.c | 10 +++- dlls/msi/tests/db.c | 139 ++++++++++++++++++++++--------------------- dlls/msi/tests/format.c | 12 +++- dlls/msi/tests/install.c | 59 +++++++++++------- dlls/msi/tests/msi.c | 12 +++- dlls/msi/tests/package.c | 30 ++++++---- dlls/msi/tests/patch.c | 31 ++++++---- dlls/msi/tests/record.c | 2 +- dlls/msi/tests/suminfo.c | 4 +- 11 files changed, 182 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d124f8869edf916caf22…

1 0

Qian Hong : user32/tests: Skip winstation tests when no enough privileges.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: a0637a7f52f4a40499d9689a6f71d6e957694afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0637a7f52f4a40499d9689a6… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Oct 15 17:01:27 2013 +0800 user32/tests: Skip winstation tests when no enough privileges. --- dlls/user32/tests/winstation.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 9525902..fd6bcc0 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -662,8 +662,16 @@ static void test_inputdesktop2(void) ok(thread_desk != NULL, "GetThreadDesktop failed!\n"); w1 = GetProcessWindowStation(); ok(w1 != NULL, "GetProcessWindowStation failed!\n"); + SetLastError(0xdeadbeef); w2 = CreateWindowStation("winsta_test", 0, WINSTA_ALL_ACCESS, NULL); - ok(w2 != NULL, "CreateWindowStation failed!\n"); + ret = GetLastError(); + ok(w2 != NULL || ret == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%u)\n", ret); + if (!w2) + { + win_skip("Not enough privileges for CreateWindowStation\n"); + return; + } + ret = EnumDesktopsA(GetProcessWindowStation(), desktop_callbackA, 0); ok(!ret, "EnumDesktopsA failed!\n"); input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); @@ -804,8 +812,15 @@ static void test_foregroundwindow(void) hdesks[0] = GetThreadDesktop(GetCurrentThreadId()); ok(hdesks[0] != NULL, "OpenDesktop failed!\n"); + SetLastError(0xdeadbeef); hdesks[1] = CreateDesktop("desk2", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); - ok(hdesks[1] != NULL, "CreateDesktop failed!\n"); + ret = GetLastError(); + ok(hdesks[1] != NULL || ret == ERROR_ACCESS_DENIED, "CreateDesktop failed (%u)\n", ret); + if(!hdesks[1]) + { + win_skip("Not enough privileges for CreateDesktop\n"); + return; + } for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++) {

1 0