February 2008 - Wine-commits

Andrew Talbot : crypt32: Assign to structs instead of using memcpy.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 70c4b66781093e9062b977f206a5e7d9bd52301b URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c4b66781093e9062b977f20… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 13 21:16:19 2008 +0000 crypt32: Assign to structs instead of using memcpy. --- dlls/crypt32/chain.c | 6 ++---- dlls/crypt32/msg.c | 4 ++-- dlls/crypt32/sip.c | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 65ca674..362eddc 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -986,8 +986,7 @@ static BOOL CRYPT_BuildCandidateChainFromCert(HCERTCHAINENGINE hChainEngine, chain->ref = 1; chain->world = world; chain->context.cbSize = sizeof(CERT_CHAIN_CONTEXT); - memcpy(&chain->context.TrustStatus, &simpleChain->TrustStatus, - sizeof(CERT_TRUST_STATUS)); + chain->context.TrustStatus = simpleChain->TrustStatus; chain->context.cChain = 1; chain->context.rgpChain = CryptMemAlloc(sizeof(PCERT_SIMPLE_CHAIN)); chain->context.rgpChain[0] = simpleChain; @@ -1029,8 +1028,7 @@ static PCERT_SIMPLE_CHAIN CRYPT_CopySimpleChainToElement( if (element) { - memcpy(element, chain->rgpElement[i], - sizeof(CERT_CHAIN_ELEMENT)); + *element = *chain->rgpElement[i]; element->pCertContext = CertDuplicateCertificateContext( chain->rgpElement[i]->pCertContext); /* Reset the trust status of the copied element, it'll get diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 94e1df8..f06b8ea 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -78,7 +78,7 @@ static inline void CryptMsgBase_Init(CryptMsgBase *msg, DWORD dwFlags, if (pStreamInfo) { msg->streamed = TRUE; - memcpy(&msg->stream_info, pStreamInfo, sizeof(msg->stream_info)); + msg->stream_info = *pStreamInfo; } else { @@ -1124,7 +1124,7 @@ static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, CRYPT_SIGNED_INFO info; char oid_rsa_data[] = szOID_RSA_data; - memcpy(&info, msg->msg_data.info, sizeof(info)); + info = *msg->msg_data.info; /* Quirk: OID is only encoded messages if an update has happened */ if (msg->base.state != MsgStateInit) info.content.pszObjId = oid_rsa_data; diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 6a56021..869e2a9 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -325,7 +325,7 @@ BOOL WINAPI CryptSIPRetrieveSubjectGuid dos = (IMAGE_DOS_HEADER *)pMapped; if (dos->e_magic == IMAGE_DOS_SIGNATURE) { - memcpy(pgSubject, &unknown, sizeof(GUID)); + *pgSubject = unknown; SetLastError(S_OK); bRet = TRUE; goto cleanup1; @@ -435,8 +435,8 @@ static void CRYPT_CacheSIP(const GUID *pgSubject, SIP_DISPATCH_INFO *info) if (prov) { - memcpy(&prov->subject, pgSubject, sizeof(prov->subject)); - memcpy(&prov->info, info, sizeof(prov->info)); + prov->subject = *pgSubject; + prov->info = *info; EnterCriticalSection(&providers_cs); list_add_tail(&providers, &prov->entry); LeaveCriticalSection(&providers_cs);

1 0

Alexandre Julliard : libwine: Abstract part of the utf8 char decoding to a separate function.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: dbefd038ac437a8f5ffae9bb170b0eb67040873b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbefd038ac437a8f5ffae9bb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 15 12:06:42 2008 +0100 libwine: Abstract part of the utf8 char decoding to a separate function. --- libs/wine/utf8.c | 95 +++++++++++++++++++++++------------------------------ 1 files changed, 41 insertions(+), 54 deletions(-) diff --git a/libs/wine/utf8.c b/libs/wine/utf8.c index fcbbeb0..fcb4e23 100644 --- a/libs/wine/utf8.c +++ b/libs/wine/utf8.c @@ -155,10 +155,38 @@ int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *dst, int return dstlen - len; } +/* helper for the various utf8 mbstowcs functions */ +static inline unsigned int decode_utf8_char( unsigned char ch, const char **str, const char *strend ) +{ + unsigned int len = utf8_length[ch-0x80]; + unsigned int res = ch & utf8_mask[len]; + const char *end = *str + len; + + if (end > strend) return ~0; + switch(len) + { + case 3: + if ((ch = end[-3] ^ 0x80) >= 0x40) break; + res = (res << 6) | ch; + (*str)++; + case 2: + if ((ch = end[-2] ^ 0x80) >= 0x40) break; + res = (res << 6) | ch; + (*str)++; + case 1: + if ((ch = end[-1] ^ 0x80) >= 0x40) break; + res = (res << 6) | ch; + (*str)++; + if (res < utf8_minval[len]) break; + return res; + } + return ~0; +} + /* query necessary dst length for src string */ static inline int get_length_mbs_utf8( int flags, const char *src, int srclen ) { - int len, ret = 0; + int ret = 0; unsigned int res; const char *srcend = src + srclen; @@ -170,32 +198,12 @@ static inline int get_length_mbs_utf8( int flags, const char *src, int srclen ) ret++; continue; } - len = utf8_length[ch-0x80]; - if (src + len > srcend) goto bad; - res = ch & utf8_mask[len]; - - switch(len) + if ((res = decode_utf8_char( ch, &src, srcend )) <= 0x10ffff) { - case 3: - if ((ch = *src ^ 0x80) >= 0x40) goto bad; - res = (res << 6) | ch; - src++; - case 2: - if ((ch = *src ^ 0x80) >= 0x40) goto bad; - res = (res << 6) | ch; - src++; - case 1: - if ((ch = *src ^ 0x80) >= 0x40) goto bad; - res = (res << 6) | ch; - src++; - if (res < utf8_minval[len]) goto bad; - if (res > 0x10ffff) goto bad; if (res > 0xffff) ret++; ret++; - continue; } - bad: - if (flags & MB_ERR_INVALID_CHARS) return -2; /* bad char */ + else if (flags & MB_ERR_INVALID_CHARS) return -2; /* bad char */ /* otherwise ignore it */ } return ret; @@ -205,7 +213,6 @@ static inline int get_length_mbs_utf8( int flags, const char *src, int srclen ) /* return -1 on dst buffer overflow, -2 on invalid input char */ int wine_utf8_mbstowcs( int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) { - int len; unsigned int res; const char *srcend = src + srclen; WCHAR *dstend = dst + dstlen; @@ -220,38 +227,18 @@ int wine_utf8_mbstowcs( int flags, const char *src, int srclen, WCHAR *dst, int *dst++ = ch; continue; } - len = utf8_length[ch-0x80]; - if (src + len > srcend) goto bad; - res = ch & utf8_mask[len]; - - switch(len) + if ((res = decode_utf8_char( ch, &src, srcend )) <= 0xffff) { - case 3: - if ((ch = *src ^ 0x80) >= 0x40) goto bad; - res = (res << 6) | ch; - src++; - case 2: - if ((ch = *src ^ 0x80) >= 0x40) goto bad; - res = (res << 6) | ch; - src++; - case 1: - if ((ch = *src ^ 0x80) >= 0x40) goto bad; - res = (res << 6) | ch; - src++; - if (res < utf8_minval[len]) goto bad; - if (res > 0x10ffff) goto bad; - if (res <= 0xffff) *dst++ = res; - else /* we need surrogates */ - { - if (dst == dstend - 1) return -1; /* overflow */ - res -= 0x10000; - *dst++ = 0xd800 | (res >> 10); - *dst++ = 0xdc00 | (res & 0x3ff); - } - continue; + *dst++ = res; + } + else if (res <= 0x10ffff) /* we need surrogates */ + { + if (dst == dstend - 1) return -1; /* overflow */ + res -= 0x10000; + *dst++ = 0xd800 | (res >> 10); + *dst++ = 0xdc00 | (res & 0x3ff); } - bad: - if (flags & MB_ERR_INVALID_CHARS) return -2; /* bad char */ + else if (flags & MB_ERR_INVALID_CHARS) return -2; /* bad char */ /* otherwise ignore it */ } if (src < srcend) return -1; /* overflow */

1 0

Francois Gouget : advapi32: Add some missing CRED_TYPE_XXX constants.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 8edfee18ccd410d9c92a87d83c2a2a395e56cb9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8edfee18ccd410d9c92a87d83… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 13 22:05:49 2008 +0100 advapi32: Add some missing CRED_TYPE_XXX constants. --- include/wincred.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/wincred.h b/include/wincred.h index 34c4f35..2b606a4 100644 --- a/include/wincred.h +++ b/include/wincred.h @@ -147,7 +147,9 @@ DECL_WINELIB_TYPE_AW(PCREDUI_INFO) #define CRED_TYPE_DOMAIN_PASSWORD 2 #define CRED_TYPE_DOMAIN_CERTIFICATE 3 #define CRED_TYPE_DOMAIN_VISIBLE_PASSWORD 4 -#define CRED_TYPE_MAXIMUM 5 +#define CRED_TYPE_GENERIC_CERTIFICATE 5 +#define CRED_TYPE_MAXIMUM 6 +#define CRED_TYPE_MAXIMUM_EX (CRED_TYPE_MAXIMUM+1000) /* values for CREDENTIAL::Persist */ #define CRED_PERSIST_NONE 0

1 0

Francois Gouget : advapi32: Add a rudimentary implementation of CredGetSessionTypes().
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: ddab29b7d16bc0184f33cf63887dd8c74c0ad201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddab29b7d16bc0184f33cf638… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 13 22:06:44 2008 +0100 advapi32: Add a rudimentary implementation of CredGetSessionTypes(). --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/cred.c | 20 ++++++++++++++++++++ include/wincred.h | 1 + 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 738b4df..17dac6d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -107,7 +107,7 @@ @ stdcall CredEnumerateA(str long ptr ptr) @ stdcall CredEnumerateW(wstr long ptr ptr) @ stdcall CredFree(ptr) -# @ stub CredGetSessionTypes +@ stdcall CredGetSessionTypes(long ptr) # @ stub CredGetTargetInfoA # @ stub CredGetTargetInfoW # @ stub CredIsMarshaledCredentialA diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index e81a171..ab988da 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -1670,3 +1670,23 @@ BOOL WINAPI CredWriteW(PCREDENTIALW Credential, DWORD Flags) } return TRUE; } + +/****************************************************************************** + * CredGetSessionTypes [ADVAPI32.@] + */ +WINADVAPI BOOL WINAPI CredGetSessionTypes(DWORD persistCount, LPDWORD persists) +{ + TRACE("(%u, %p)\n", persistCount, persists); + + memset(persists, CRED_PERSIST_NONE, persistCount*sizeof(*persists)); + if (CRED_TYPE_GENERIC < persistCount) + { + persists[CRED_TYPE_GENERIC] = CRED_PERSIST_ENTERPRISE; + + if (CRED_TYPE_DOMAIN_PASSWORD < persistCount) + { + persists[CRED_TYPE_DOMAIN_PASSWORD] = CRED_PERSIST_ENTERPRISE; + } + } + return TRUE; +} diff --git a/include/wincred.h b/include/wincred.h index 2b606a4..5865063 100644 --- a/include/wincred.h +++ b/include/wincred.h @@ -185,6 +185,7 @@ WINADVAPI BOOL WINAPI CredEnumerateA(LPCSTR,DWORD,DWORD *,PCREDENTIALA **); WINADVAPI BOOL WINAPI CredEnumerateW(LPCWSTR,DWORD,DWORD *,PCREDENTIALW **); #define CredEnumerate WINELIB_NAME_AW(CredEnumerate) WINADVAPI VOID WINAPI CredFree(PVOID); +WINADVAPI BOOL WINAPI CredGetSessionTypes(DWORD,LPDWORD); WINADVAPI BOOL WINAPI CredReadA(LPCSTR,DWORD,DWORD,PCREDENTIALA *); WINADVAPI BOOL WINAPI CredReadW(LPCWSTR,DWORD,DWORD,PCREDENTIALW *); #define CredRead WINELIB_NAME_AW(CredRead)

1 0

Francois Gouget : advapi32/tests: Factorize the password constants.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 6552f86ff98ba8458ae07b9c04d415001b1bad7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6552f86ff98ba8458ae07b9c0… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 13 22:07:08 2008 +0100 advapi32/tests: Factorize the password constants. --- dlls/advapi32/tests/cred.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 2fbd1c7..7e9a9a3 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -36,6 +36,7 @@ static BOOL (WINAPI *pCredWriteA)(PCREDENTIALA,DWORD); #define TEST_TARGET_NAME "credtest.winehq.org" #define TEST_TARGET_NAME2 "credtest2.winehq.org" +static const WCHAR TEST_PASSWORD[] = {'p','4','$','$','w','0','r','d','!',0}; static void test_CredReadA(void) { @@ -130,15 +131,14 @@ static void test_generic(void) PCREDENTIALA *creds; CREDENTIALA new_cred; PCREDENTIALA cred; - static const WCHAR password[] = {'p','4','$','$','w','0','r','d','!',0}; BOOL found = FALSE; new_cred.Flags = 0; new_cred.Type = CRED_TYPE_GENERIC; new_cred.TargetName = (char *)TEST_TARGET_NAME; new_cred.Comment = (char *)"Comment"; - new_cred.CredentialBlobSize = sizeof(password); - new_cred.CredentialBlob = (LPBYTE)password; + new_cred.CredentialBlobSize = sizeof(TEST_PASSWORD); + new_cred.CredentialBlob = (LPBYTE)TEST_PASSWORD; new_cred.Persist = CRED_PERSIST_ENTERPRISE; new_cred.AttributeCount = 0; new_cred.Attributes = NULL; @@ -158,10 +158,10 @@ static void test_generic(void) ok(creds[i]->Type == CRED_TYPE_GENERIC, "expected creds[%d]->Type CRED_TYPE_GENERIC but got %d\n", i, creds[i]->Type); ok(!creds[i]->Flags, "expected creds[%d]->Flags 0 but got 0x%x\n", i, creds[i]->Flags); ok(!strcmp(creds[i]->Comment, "Comment"), "expected creds[%d]->Comment \"Comment\" but got \"%s\"\n", i, creds[i]->Comment); - ok(creds[i]->CredentialBlobSize == sizeof(password), "wrong CredentialBlobSize %d\n", creds[i]->CredentialBlobSize); + ok(creds[i]->CredentialBlobSize == sizeof(TEST_PASSWORD), "wrong CredentialBlobSize %d\n", creds[i]->CredentialBlobSize); ok(creds[i]->CredentialBlob != NULL, "CredentialBlob should be present\n"); if (creds[i]->CredentialBlob) - ok(!memcmp(creds[i]->CredentialBlob, password, sizeof(password)), "credentials don't match\n"); + ok(!memcmp(creds[i]->CredentialBlob, TEST_PASSWORD, sizeof(TEST_PASSWORD)), "credentials don't match\n"); ok(creds[i]->Persist, "expected creds[%d]->Persist CRED_PERSIST_ENTERPRISE but got %d\n", i, creds[i]->Persist); ok(!strcmp(creds[i]->UserName, "winetest"), "expected creds[%d]->UserName \"winetest\" but got \"%s\"\n", i, creds[i]->UserName); found = TRUE; @@ -185,15 +185,14 @@ static void test_domain_password(void) PCREDENTIALA *creds; CREDENTIALA new_cred; PCREDENTIALA cred; - static const WCHAR password[] = {'p','4','$','$','w','0','r','d','!',0}; BOOL found = FALSE; new_cred.Flags = 0; new_cred.Type = CRED_TYPE_DOMAIN_PASSWORD; new_cred.TargetName = (char *)TEST_TARGET_NAME; new_cred.Comment = (char *)"Comment"; - new_cred.CredentialBlobSize = sizeof(password); - new_cred.CredentialBlob = (LPBYTE)password; + new_cred.CredentialBlobSize = sizeof(TEST_PASSWORD); + new_cred.CredentialBlob = (LPBYTE)TEST_PASSWORD; new_cred.Persist = CRED_PERSIST_ENTERPRISE; new_cred.AttributeCount = 0; new_cred.Attributes = NULL;

1 0

Francois Gouget : advapi32/tests: Check that a credential type is supported before testing it. Test CRED_TYPE_DOMAIN_VISIBLE_PASSWORD credentials. Factorize the CredentialBlob checks.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 79333bd1c0f64e471514677fd0fce690215eca64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79333bd1c0f64e471514677fd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 13 22:10:55 2008 +0100 advapi32/tests: Check that a credential type is supported before testing it. Test CRED_TYPE_DOMAIN_VISIBLE_PASSWORD credentials. Factorize the CredentialBlob checks. --- dlls/advapi32/tests/cred.c | 80 +++++++++++++++++++++++++++++++++----------- 1 files changed, 60 insertions(+), 20 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 7e9a9a3..6d7b758 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -30,6 +30,7 @@ static BOOL (WINAPI *pCredDeleteA)(LPCSTR,DWORD,DWORD); static BOOL (WINAPI *pCredEnumerateA)(LPCSTR,DWORD,DWORD *,PCREDENTIALA **); static VOID (WINAPI *pCredFree)(PVOID); +static BOOL (WINAPI *pCredGetSessionTypes)(DWORD,LPDWORD); static BOOL (WINAPI *pCredReadA)(LPCSTR,DWORD,DWORD,PCREDENTIALA *); static BOOL (WINAPI *pCredRenameA)(LPCSTR,LPCSTR,DWORD,DWORD); static BOOL (WINAPI *pCredWriteA)(PCREDENTIALA,DWORD); @@ -124,6 +125,25 @@ static void test_CredDeleteA(void) GetLastError()); } +static void check_blob(int line, DWORD cred_type, PCREDENTIALA cred) +{ + if (cred_type == CRED_TYPE_DOMAIN_PASSWORD) + { + todo_wine + ok_(__FILE__, line)(cred->CredentialBlobSize == 0, "expected CredentialBlobSize of 0 but got %d\n", cred->CredentialBlobSize); + todo_wine + ok_(__FILE__, line)(!cred->CredentialBlob, "expected NULL credentials but got %p\n", cred->CredentialBlob); + } + else + { + DWORD size=sizeof(TEST_PASSWORD); + ok_(__FILE__, line)(cred->CredentialBlobSize == size, "expected CredentialBlobSize of %u but got %u\n", size, cred->CredentialBlobSize); + ok_(__FILE__, line)(cred->CredentialBlob != NULL, "CredentialBlob should be present\n"); + if (cred->CredentialBlob) + ok_(__FILE__, line)(!memcmp(cred->CredentialBlob, TEST_PASSWORD, size), "wrong CredentialBlob\n"); + } +} + static void test_generic(void) { BOOL ret; @@ -158,10 +178,7 @@ static void test_generic(void) ok(creds[i]->Type == CRED_TYPE_GENERIC, "expected creds[%d]->Type CRED_TYPE_GENERIC but got %d\n", i, creds[i]->Type); ok(!creds[i]->Flags, "expected creds[%d]->Flags 0 but got 0x%x\n", i, creds[i]->Flags); ok(!strcmp(creds[i]->Comment, "Comment"), "expected creds[%d]->Comment \"Comment\" but got \"%s\"\n", i, creds[i]->Comment); - ok(creds[i]->CredentialBlobSize == sizeof(TEST_PASSWORD), "wrong CredentialBlobSize %d\n", creds[i]->CredentialBlobSize); - ok(creds[i]->CredentialBlob != NULL, "CredentialBlob should be present\n"); - if (creds[i]->CredentialBlob) - ok(!memcmp(creds[i]->CredentialBlob, TEST_PASSWORD, sizeof(TEST_PASSWORD)), "credentials don't match\n"); + check_blob(__LINE__, CRED_TYPE_GENERIC, creds[i]); ok(creds[i]->Persist, "expected creds[%d]->Persist CRED_PERSIST_ENTERPRISE but got %d\n", i, creds[i]->Persist); ok(!strcmp(creds[i]->UserName, "winetest"), "expected creds[%d]->UserName \"winetest\" but got \"%s\"\n", i, creds[i]->UserName); found = TRUE; @@ -178,7 +195,7 @@ static void test_generic(void) ok(ret, "CredDeleteA failed with error %d\n", GetLastError()); } -static void test_domain_password(void) +static void test_domain_password(DWORD cred_type) { BOOL ret; DWORD count, i; @@ -188,7 +205,7 @@ static void test_domain_password(void) BOOL found = FALSE; new_cred.Flags = 0; - new_cred.Type = CRED_TYPE_DOMAIN_PASSWORD; + new_cred.Type = cred_type; new_cred.TargetName = (char *)TEST_TARGET_NAME; new_cred.Comment = (char *)"Comment"; new_cred.CredentialBlobSize = sizeof(TEST_PASSWORD); @@ -208,13 +225,10 @@ static void test_domain_password(void) { if (!strcmp(creds[i]->TargetName, TEST_TARGET_NAME)) { - ok(creds[i]->Type == CRED_TYPE_DOMAIN_PASSWORD, "expected creds[%d]->Type CRED_TYPE_DOMAIN_PASSWORD but got %d\n", i, creds[i]->Type); + ok(creds[i]->Type == cred_type, "expected creds[%d]->Type CRED_TYPE_DOMAIN_PASSWORD but got %d\n", i, creds[i]->Type); ok(!creds[i]->Flags, "expected creds[%d]->Flags 0 but got 0x%x\n", i, creds[i]->Flags); ok(!strcmp(creds[i]->Comment, "Comment"), "expected creds[%d]->Comment \"Comment\" but got \"%s\"\n", i, creds[i]->Comment); - todo_wine - ok(creds[i]->CredentialBlobSize == 0, "expected CredentialBlobSize of 0 but got %d\n", creds[i]->CredentialBlobSize); - todo_wine - ok(!creds[i]->CredentialBlob, "expected NULL credentials but got %p\n", creds[i]->CredentialBlob); + check_blob(__LINE__, cred_type, creds[i]); ok(creds[i]->Persist, "expected creds[%d]->Persist CRED_PERSIST_ENTERPRISE but got %d\n", i, creds[i]->Persist); ok(!strcmp(creds[i]->UserName, "test\\winetest"), "expected creds[%d]->UserName \"winetest\" but got \"%s\"\n", i, creds[i]->UserName); found = TRUE; @@ -223,25 +237,25 @@ static void test_domain_password(void) pCredFree(creds); ok(found, "credentials not found\n"); - ret = pCredReadA(TEST_TARGET_NAME, CRED_TYPE_DOMAIN_PASSWORD, 0, &cred); + ret = pCredReadA(TEST_TARGET_NAME, cred_type, 0, &cred); ok(ret, "CredReadA failed with error %d\n", GetLastError()); if (ret) /* don't check the values of cred, if CredReadA failed. */ { - todo_wine - ok(cred->CredentialBlobSize == 0, "expected CredentialBlobSize of 0 but got %d\n", cred->CredentialBlobSize); - todo_wine - ok(!cred->CredentialBlob, "expected NULL credentials but got %p\n", cred->CredentialBlob); + check_blob(__LINE__, cred_type, cred); pCredFree(cred); } - ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_DOMAIN_PASSWORD, 0); + ret = pCredDeleteA(TEST_TARGET_NAME, cred_type, 0); ok(ret, "CredDeleteA failed with error %d\n", GetLastError()); } START_TEST(cred) { + DWORD persists[CRED_TYPE_MAXIMUM]; + pCredEnumerateA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredEnumerateA"); pCredFree = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredFree"); + pCredGetSessionTypes = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredGetSessionTypes"); pCredWriteA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredWriteA"); pCredDeleteA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredDeleteA"); pCredReadA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredReadA"); @@ -254,12 +268,38 @@ START_TEST(cred) return; } + if (pCredGetSessionTypes) + { + BOOL ret; + DWORD i; + ret = pCredGetSessionTypes(CRED_TYPE_MAXIMUM, persists); + ok(ret, "CredGetSessionTypes failed with error %d\n", GetLastError()); + ok(persists[0] == CRED_PERSIST_NONE, "persists[0] = %u instead of CRED_PERSIST_NONE\n", persists[0]); + for (i=0; i < CRED_TYPE_MAXIMUM; i++) + ok(persists[i] <= CRED_PERSIST_ENTERPRISE, "bad value for persists[%u]: %u\n", i, persists[i]); + } + else + memset(persists, CRED_PERSIST_ENTERPRISE, sizeof(persists)); + test_CredReadA(); test_CredWriteA(); test_CredDeleteA(); trace("generic:\n"); - test_generic(); - trace("domain password:\n"); - test_domain_password(); + if (persists[CRED_TYPE_GENERIC] == CRED_PERSIST_NONE) + skip("CRED_TYPE_GENERIC credentials are not supported or are disabled. Skipping\n"); + else + test_generic(); + + trace("domain password:\n"); + if (persists[CRED_TYPE_DOMAIN_PASSWORD] == CRED_PERSIST_NONE) + skip("CRED_TYPE_DOMAIN_PASSWORD credentials are not supported or are disabled. Skipping\n"); + else + test_domain_password(CRED_TYPE_DOMAIN_PASSWORD); + + trace("domain visible password:\n"); + if (persists[CRED_TYPE_DOMAIN_VISIBLE_PASSWORD] == CRED_PERSIST_NONE) + skip("CRED_TYPE_DOMAIN_VISIBLE_PASSWORD credentials are not supported or are disabled. Skipping\n"); + else + test_domain_password(CRED_TYPE_DOMAIN_VISIBLE_PASSWORD); }

1 0

Andrew Talbot : comdlg32: Rename some identifiers to reflect their width.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 649d8b52983c54f26f66fcd2de37150a24da80b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=649d8b52983c54f26f66fcd2d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 13 21:16:22 2008 +0000 comdlg32: Rename some identifiers to reflect their width. --- dlls/comdlg32/printdlg.c | 152 +++++++++++++++++++++++----------------------- 1 files changed, 76 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=649d8b52983c54f26f66f…

1 0

Christian Authmann : explorer: Add meaningful titles to virtual desktop windows.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 2da848428fd0629618b687f9af6bbd50e6e0be78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da848428fd0629618b687f9a… Author: Christian Authmann <christian(a)authmann.de> Date: Wed Feb 13 14:43:17 2008 +0100 explorer: Add meaningful titles to virtual desktop windows. --- programs/explorer/desktop.c | 45 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 224f0de..ddca914 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -19,6 +19,7 @@ */ #include <stdio.h> +#include "wine/unicode.h" #define OEMRESOURCE @@ -143,6 +144,40 @@ static void initialize_display_settings( HWND desktop ) } } +static void set_desktop_window_title( HWND hwnd, const char *name ) +{ + static const WCHAR desktop_nameW[] = {'W','i','n','e',' ','d','e','s','k','t','o','p',0}; + static const WCHAR desktop_name_separatorW[] = {' ', '-', ' ', 0}; + WCHAR *window_titleW = NULL; + int window_title_len; + int name_len; + + if (!name[0]) + { + SetWindowTextW( hwnd, desktop_nameW ); + return; + } + + name_len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); + window_title_len = name_len * sizeof(WCHAR) + + sizeof(desktop_name_separatorW) + + sizeof(desktop_nameW); + window_titleW = HeapAlloc( GetProcessHeap(), 0, window_title_len ); + if (!window_titleW) + { + SetWindowTextW( hwnd, desktop_nameW ); + return; + } + + MultiByteToWideChar( CP_ACP, 0, name, -1, + window_titleW, name_len ); + strcatW( window_titleW, desktop_name_separatorW ); + strcatW( window_titleW, desktop_nameW ); + + SetWindowTextW( hwnd, window_titleW ); + HeapFree( GetProcessHeap(), 0, window_titleW ); +} + /* main desktop management function */ void manage_desktop( char *arg ) { @@ -152,7 +187,7 @@ void manage_desktop( char *arg ) unsigned int width, height; char *cmdline = NULL; char *p = arg; - static const WCHAR desktop_nameW[] = {'W','i','n','e',' ','d','e','s','k','t','o','p',0}; + const char *name = NULL; /* get the rest of the command line (if any) */ while (*p && !isspace(*p)) p++; @@ -174,11 +209,13 @@ void manage_desktop( char *arg ) width = 800; height = 600; } - xwin = create_desktop( arg, width, height ); + name = arg; + xwin = create_desktop( name, width, height ); } else if (get_default_desktop_size( &width, &height )) { - xwin = create_desktop( "Default", width, height ); + name = "Default"; + xwin = create_desktop( name, width, height ); } if (!xwin) using_root = TRUE; /* using the root window */ @@ -193,7 +230,7 @@ void manage_desktop( char *arg ) { SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); - SetWindowTextW( hwnd, desktop_nameW ); + if (name) set_desktop_window_title( hwnd, name ); SystemParametersInfoA( SPI_SETDESKPATTERN, -1, NULL, FALSE ); SetDeskWallPaper( (LPSTR)-1 ); initialize_display_settings( hwnd );

1 0

Mikołaj Zalewski : browseui/tests: make the ACLMulti test pass under Windows Vista.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: c9492a5bf400f47bce5de6a3e48bb7ae121e188c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9492a5bf400f47bce5de6a3e… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Feb 13 18:24:19 2008 +0100 browseui/tests: make the ACLMulti test pass under Windows Vista. --- dlls/browseui/tests/autocomplete.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index ba52b66..bddaa52 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -273,7 +273,8 @@ static void test_ACLMulti(void) ole_ok(acl->lpVtbl->Expand(acl, exp)); ok(acl1->expcount == 1, "expcount - expected 1, got %d\n", acl1->expcount); - ok(acl2->expcount == 0, "expcount - expected 0, got %d\n", acl2->expcount); + ok(acl2->expcount == 0 /* XP */ || acl2->expcount == 1 /* Vista */, + "expcount - expected 0 or 1, got %d\n", acl2->expcount); ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); ok(i == 1, "Expected i == 1, got %d\n", i); @@ -282,15 +283,18 @@ static void test_ACLMulti(void) ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); ole_ok(acl->lpVtbl->Expand(acl, exp)); ok(acl1->expcount == 2, "expcount - expected 1, got %d\n", acl1->expcount); - ok(acl2->expcount == 0, "expcount - expected 0, got %d\n", acl2->expcount); + ok(acl2->expcount == 0 /* XP */ || acl2->expcount == 2 /* Vista */, + "expcount - expected 0 or 2, got %d\n", acl2->expcount); acl1->expret = S_FALSE; ole_ok(acl->lpVtbl->Expand(acl, exp)); ok(acl1->expcount == 3, "expcount - expected 1, got %d\n", acl1->expcount); - ok(acl2->expcount == 1, "expcount - expected 0, got %d\n", acl2->expcount); + ok(acl2->expcount == 1 /* XP */ || acl2->expcount == 3 /* Vista */, + "expcount - expected 0 or 3, got %d\n", acl2->expcount); acl1->expret = E_NOTIMPL; ole_ok(acl->lpVtbl->Expand(acl, exp)); ok(acl1->expcount == 4, "expcount - expected 1, got %d\n", acl1->expcount); - ok(acl2->expcount == 2, "expcount - expected 0, got %d\n", acl2->expcount); + ok(acl2->expcount == 2 /* XP */ || acl2->expcount == 4 /* Vista */, + "expcount - expected 0 or 4, got %d\n", acl2->expcount); acl2->expret = E_OUTOFMEMORY; ok(acl->lpVtbl->Expand(acl, exp) == E_OUTOFMEMORY, "Unexpected Expand return\n"); acl2->expret = E_FAIL;

1 0

Mikołaj Zalewski : browseui: aclmulti: Follow the Windows Vista behavious in Expand.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: a17e222d025559831b518ae669036b0dbdaa7bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17e222d025559831b518ae66… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Feb 13 18:24:55 2008 +0100 browseui: aclmulti: Follow the Windows Vista behavious in Expand. --- dlls/browseui/aclmulti.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index 3fb49b8..b0a0ec8 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -257,8 +257,7 @@ static HRESULT WINAPI ACLMulti_Expand(IACList *iface, LPCWSTR wstr) if (!This->objs[i].pACL) continue; res = IACList_Expand(This->objs[i].pACL, wstr); - if (res == S_OK) - break; + /* Vista behaviour - XP would break out of the loop if res == S_OK (usually calling Expand only once) */ } return res; }

1 0