September 2009 - Wine-commits

Nikolay Sivov : comctl32/updown: Skip thousands separation on hex mode.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 963b7b5766595865c5af9a5f9184a81303499708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=963b7b5766595865c5af9a5f9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 19 19:40:10 2009 +0400 comctl32/updown: Skip thousands separation on hex mode. --- dlls/comctl32/updown.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index a4b9271..149de29 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -328,7 +328,7 @@ static BOOL UPDOWN_SetBuddyInt (const UPDOWN_INFO *infoPtr) /* Do thousands separation if necessary */ - if (!(infoPtr->dwStyle & UDS_NOTHOUSANDS) && (len > 3)) { + if ((infoPtr->Base == 10) && !(infoPtr->dwStyle & UDS_NOTHOUSANDS) && (len > 3)) { WCHAR tmp[COUNT_OF(txt)], *src = tmp, *dst = txt; WCHAR sep = UPDOWN_GetThousandSep(); int start = len % 3;

1 0

Detlef Riekenberg : advapi32: Don't use -1 as dstlen in MultiByteToWideChar .
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 655478075f234bad08bf0c878136b3cb0ddf9fbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=655478075f234bad08bf0c878… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Sep 19 00:51:06 2009 +0200 advapi32: Don't use -1 as dstlen in MultiByteToWideChar. --- dlls/advapi32/cred.c | 64 +++++++++++++++++++++++++++++++------------------ 1 files changed, 40 insertions(+), 24 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 4f31fcf..d978b43 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -1010,40 +1010,54 @@ static INT convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, return needed; } -static void convert_PCREDENTIALA_to_PCREDENTIALW(const CREDENTIALA *CredentialA, PCREDENTIALW CredentialW, DWORD *len) +/****************************************************************************** + * convert_PCREDENTIALA_to_PCREDENTIALW [internal] + * + * convert a Credential struct from ANSI to UNICODE and return the needed size in Bytes + * + */ +static INT convert_PCREDENTIALA_to_PCREDENTIALW(const CREDENTIALA *CredentialA, PCREDENTIALW CredentialW, INT len) { - char *buffer = (char *)CredentialW + sizeof(CREDENTIALW); + char *buffer; INT string_len; + INT needed = sizeof(CREDENTIALW); - *len += sizeof(CREDENTIALW); if (!CredentialW) { - if (CredentialA->TargetName) *len += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetName, -1, NULL, 0); - if (CredentialA->Comment) *len += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->Comment, -1, NULL, 0); - *len += CredentialA->CredentialBlobSize; - if (CredentialA->TargetAlias) *len += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetAlias, -1, NULL, 0); - if (CredentialA->UserName) *len += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->UserName, -1, NULL, 0); + if (CredentialA->TargetName) + needed += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetName, -1, NULL, 0); + if (CredentialA->Comment) + needed += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->Comment, -1, NULL, 0); + needed += CredentialA->CredentialBlobSize; + if (CredentialA->TargetAlias) + needed += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetAlias, -1, NULL, 0); + if (CredentialA->UserName) + needed += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->UserName, -1, NULL, 0); - return; + return needed; } + buffer = (char *)CredentialW + sizeof(CREDENTIALW); + len -= sizeof(CREDENTIALW); CredentialW->Flags = CredentialA->Flags; CredentialW->Type = CredentialA->Type; if (CredentialA->TargetName) { CredentialW->TargetName = (LPWSTR)buffer; - string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetName, -1, CredentialW->TargetName, -1); + string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetName, -1, CredentialW->TargetName, len / sizeof(WCHAR)); buffer += sizeof(WCHAR) * string_len; - *len += sizeof(WCHAR) * string_len; + needed += sizeof(WCHAR) * string_len; + len -= sizeof(WCHAR) * string_len; } else CredentialW->TargetName = NULL; if (CredentialA->Comment) { CredentialW->Comment = (LPWSTR)buffer; - string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->Comment, -1, CredentialW->Comment, -1); + string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->Comment, -1, CredentialW->Comment, len / sizeof(WCHAR)); buffer += sizeof(WCHAR) * string_len; - *len += sizeof(WCHAR) * string_len; + needed += sizeof(WCHAR) * string_len; + len -= sizeof(WCHAR) * string_len; } else CredentialW->Comment = NULL; @@ -1055,7 +1069,8 @@ static void convert_PCREDENTIALA_to_PCREDENTIALW(const CREDENTIALA *CredentialA, memcpy(CredentialW->CredentialBlob, CredentialA->CredentialBlob, CredentialA->CredentialBlobSize); buffer += CredentialA->CredentialBlobSize; - *len += CredentialA->CredentialBlobSize; + needed += CredentialA->CredentialBlobSize; + len -= CredentialA->CredentialBlobSize; } else CredentialW->CredentialBlob = NULL; @@ -1065,21 +1080,23 @@ static void convert_PCREDENTIALA_to_PCREDENTIALW(const CREDENTIALA *CredentialA, if (CredentialA->TargetAlias) { CredentialW->TargetAlias = (LPWSTR)buffer; - string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetAlias, -1, CredentialW->TargetAlias, -1); + string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetAlias, -1, CredentialW->TargetAlias, len / sizeof(WCHAR)); buffer += sizeof(WCHAR) * string_len; - *len += sizeof(WCHAR) * string_len; + needed += sizeof(WCHAR) * string_len; + len -= sizeof(WCHAR) * string_len; } else CredentialW->TargetAlias = NULL; if (CredentialA->UserName) { CredentialW->UserName = (LPWSTR)buffer; - string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->UserName, -1, CredentialW->UserName, -1); - buffer += sizeof(WCHAR) * string_len; - *len += sizeof(WCHAR) * string_len; + string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->UserName, -1, CredentialW->UserName, len / sizeof(WCHAR)); + needed += sizeof(WCHAR) * string_len; } else CredentialW->UserName = NULL; + + return needed; } /****************************************************************************** @@ -1730,7 +1747,7 @@ BOOL WINAPI CredReadDomainCredentialsW(PCREDENTIAL_TARGET_INFORMATIONW TargetInf BOOL WINAPI CredWriteA(PCREDENTIALA Credential, DWORD Flags) { BOOL ret; - DWORD len; + INT len; PCREDENTIALW CredentialW; TRACE("(%p, 0x%x)\n", Credential, Flags); @@ -1741,16 +1758,15 @@ BOOL WINAPI CredWriteA(PCREDENTIALA Credential, DWORD Flags) return FALSE; } - len = 0; - convert_PCREDENTIALA_to_PCREDENTIALW(Credential, NULL, &len); + len = convert_PCREDENTIALA_to_PCREDENTIALW(Credential, NULL, 0); CredentialW = HeapAlloc(GetProcessHeap(), 0, len); if (!CredentialW) { SetLastError(ERROR_OUTOFMEMORY); return FALSE; } - len = 0; - convert_PCREDENTIALA_to_PCREDENTIALW(Credential, CredentialW, &len); + + convert_PCREDENTIALA_to_PCREDENTIALW(Credential, CredentialW, len); ret = CredWriteW(CredentialW, Flags);

1 0

Detlef Riekenberg : advapi32: Don't use -1 as dstlen in WideCharToMultiByte .
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 224d33b2c9add04c4a1f3b7a9640225054044fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=224d33b2c9add04c4a1f3b7a9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Sep 19 00:45:07 2009 +0200 advapi32: Don't use -1 as dstlen in WideCharToMultiByte. --- dlls/advapi32/cred.c | 92 +++++++++++++++++++++++++++++++------------------- 1 files changed, 57 insertions(+), 35 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 0fb36e6..4f31fcf 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -918,52 +918,70 @@ static DWORD mac_delete_credential(LPCWSTR TargetName) } #endif -static void convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, PCREDENTIALA CredentialA, DWORD *len) +/****************************************************************************** + * convert_PCREDENTIALW_to_PCREDENTIALA [internal] + * + * convert a Credential struct from UNICODE to ANSI and return the needed size in Bytes + * + */ + +static INT convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, PCREDENTIALA CredentialA, INT len) { - char *buffer = (char *)CredentialA + sizeof(CREDENTIALA); + char *buffer; INT string_len; + INT needed = sizeof(CREDENTIALA); - *len += sizeof(CREDENTIALA); if (!CredentialA) { - if (CredentialW->TargetName) *len += WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1, NULL, 0, NULL, NULL); - if (CredentialW->Comment) *len += WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1, NULL, 0, NULL, NULL); - *len += CredentialW->CredentialBlobSize; - if (CredentialW->TargetAlias) *len += WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1, NULL, 0, NULL, NULL); - if (CredentialW->UserName) *len += WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1, NULL, 0, NULL, NULL); + if (CredentialW->TargetName) + needed += WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1, NULL, 0, NULL, NULL); + if (CredentialW->Comment) + needed += WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1, NULL, 0, NULL, NULL); + needed += CredentialW->CredentialBlobSize; + if (CredentialW->TargetAlias) + needed += WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1, NULL, 0, NULL, NULL); + if (CredentialW->UserName) + needed += WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1, NULL, 0, NULL, NULL); - return; + return needed; } + + buffer = (char *)CredentialA + sizeof(CREDENTIALA); + len -= sizeof(CREDENTIALA); CredentialA->Flags = CredentialW->Flags; CredentialA->Type = CredentialW->Type; + if (CredentialW->TargetName) { CredentialA->TargetName = buffer; - string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1, CredentialA->TargetName, -1, NULL, NULL); + string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1, buffer, len, NULL, NULL); buffer += string_len; - *len += string_len; + needed += string_len; + len -= string_len; } else CredentialA->TargetName = NULL; if (CredentialW->Comment) { CredentialA->Comment = buffer; - string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1, CredentialA->Comment, -1, NULL, NULL); + string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1, buffer, len, NULL, NULL); buffer += string_len; - *len += string_len; + needed += string_len; + len -= string_len; } else CredentialA->Comment = NULL; CredentialA->LastWritten = CredentialW->LastWritten; CredentialA->CredentialBlobSize = CredentialW->CredentialBlobSize; - if (CredentialW->CredentialBlobSize) + if (CredentialW->CredentialBlobSize && (CredentialW->CredentialBlobSize <= len)) { CredentialA->CredentialBlob =(LPBYTE)buffer; memcpy(CredentialA->CredentialBlob, CredentialW->CredentialBlob, CredentialW->CredentialBlobSize); buffer += CredentialW->CredentialBlobSize; - *len += CredentialW->CredentialBlobSize; + needed += CredentialW->CredentialBlobSize; + len -= CredentialW->CredentialBlobSize; } else CredentialA->CredentialBlob = NULL; @@ -973,21 +991,23 @@ static void convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, if (CredentialW->TargetAlias) { CredentialA->TargetAlias = buffer; - string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1, CredentialA->TargetAlias, -1, NULL, NULL); + string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1, buffer, len, NULL, NULL); buffer += string_len; - *len += string_len; + needed += string_len; + len -= string_len; } else CredentialA->TargetAlias = NULL; if (CredentialW->UserName) { CredentialA->UserName = buffer; - string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1, CredentialA->UserName, -1, NULL, NULL); - buffer += string_len; - *len += string_len; + string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1, buffer, len, NULL, NULL); + needed += string_len; } else CredentialA->UserName = NULL; + + return needed; } static void convert_PCREDENTIALA_to_PCREDENTIALW(const CREDENTIALA *CredentialA, PCREDENTIALW CredentialW, DWORD *len) @@ -1165,7 +1185,8 @@ BOOL WINAPI CredEnumerateA(LPCSTR Filter, DWORD Flags, DWORD *Count, LPWSTR FilterW; PCREDENTIALW *CredentialsW; DWORD i; - DWORD len; + INT len; + INT needed; char *buffer; TRACE("(%s, 0x%x, %p, %p)\n", debugstr_a(Filter), Flags, Count, Credentials); @@ -1193,7 +1214,7 @@ BOOL WINAPI CredEnumerateA(LPCSTR Filter, DWORD Flags, DWORD *Count, len = *Count * sizeof(PCREDENTIALA); for (i = 0; i < *Count; i++) - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, &len); + len += convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, 0); *Credentials = HeapAlloc(GetProcessHeap(), 0, len); if (!*Credentials) @@ -1204,12 +1225,13 @@ BOOL WINAPI CredEnumerateA(LPCSTR Filter, DWORD Flags, DWORD *Count, } buffer = (char *)&(*Credentials)[*Count]; + len -= *Count * sizeof(PCREDENTIALA); for (i = 0; i < *Count; i++) { - len = 0; (*Credentials)[i] = (PCREDENTIALA)buffer; - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], (*Credentials)[i], &len); - buffer += len; + needed = convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], (*Credentials)[i], len); + buffer += needed; + len -= needed; } CredFree(CredentialsW); @@ -1338,7 +1360,7 @@ BOOL WINAPI CredReadA(LPCSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALA * { LPWSTR TargetNameW; PCREDENTIALW CredentialW; - DWORD len; + INT len; TRACE("(%s, %d, 0x%x, %p)\n", debugstr_a(TargetName), Type, Flags, Credential); @@ -1364,16 +1386,14 @@ BOOL WINAPI CredReadA(LPCSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALA * } HeapFree(GetProcessHeap(), 0, TargetNameW); - len = 0; - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialW, NULL, &len); + len = convert_PCREDENTIALW_to_PCREDENTIALA(CredentialW, NULL, 0); *Credential = HeapAlloc(GetProcessHeap(), 0, len); if (!*Credential) { SetLastError(ERROR_OUTOFMEMORY); return FALSE; } - len = 0; - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialW, *Credential, &len); + convert_PCREDENTIALW_to_PCREDENTIALA(CredentialW, *Credential, len); CredFree(CredentialW); @@ -1545,7 +1565,7 @@ BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInf DWORD Flags, DWORD *Size, PCREDENTIALA **Credentials) { PCREDENTIAL_TARGET_INFORMATIONW TargetInformationW; - DWORD len, i; + INT len, i; WCHAR *buffer, *end; BOOL ret; PCREDENTIALW* CredentialsW; @@ -1654,10 +1674,11 @@ BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInf if (ret) { char *buf; + INT needed; len = *Size * sizeof(PCREDENTIALA); for (i = 0; i < *Size; i++) - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, &len); + len += convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, 0); *Credentials = HeapAlloc(GetProcessHeap(), 0, len); if (!*Credentials) @@ -1668,12 +1689,13 @@ BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInf } buf = (char *)&(*Credentials)[*Size]; + len -= *Size * sizeof(PCREDENTIALA); for (i = 0; i < *Size; i++) { - len = 0; (*Credentials)[i] = (PCREDENTIALA)buf; - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], (*Credentials)[i], &len); - buf += len; + needed = convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], (*Credentials)[i], len); + buf += needed; + len -= needed; } CredFree(CredentialsW);

1 0

Hans Leidekker : crypt32: CertGetCertificateChain does not validate the size of the CERT_CHAIN_PARA structure .
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 2f112cf5ee3957aabf8209672a7c60f4cc1dc113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f112cf5ee3957aabf8209672… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 22 12:04:56 2009 +0200 crypt32: CertGetCertificateChain does not validate the size of the CERT_CHAIN_PARA structure. --- dlls/crypt32/chain.c | 7 +----- dlls/crypt32/tests/chain.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index b22cb5b..fa9fdf0 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1567,12 +1567,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, SetLastError(ERROR_INVALID_DATA); return FALSE; } - if (pChainPara->cbSize != sizeof(CERT_CHAIN_PARA_NO_EXTRA_FIELDS) && - pChainPara->cbSize != sizeof(CERT_CHAIN_PARA)) - { - SetLastError(E_INVALIDARG); - return FALSE; - } + if (!hChainEngine) hChainEngine = CRYPT_GetDefaultChainEngine(); /* FIXME: what about HCCE_LOCAL_MACHINE? */ diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 8b4d36f..a2f537c 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1680,6 +1680,15 @@ static void testGetCertChain(void) ok(GetLastError() == ERROR_INVALID_DATA || GetLastError() == CRYPT_E_ASN1_BADTAG /* Vista */, "Expected ERROR_INVALID_DATA or CRYPT_E_ASN1_BADTAG, got %d\n", GetLastError()); + + para.cbSize = 0; + SetLastError(0xdeadbeef); + ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, + &chain); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_DATA, + "Expected ERROR_INVALID_DATA, got %u\n", GetLastError()); + CertFreeCertificateContext(cert); for (i = 0; i < sizeof(chainCheck) / sizeof(chainCheck[0]); i++) @@ -1707,6 +1716,41 @@ static void testGetCertChain(void) } } +static void test_CERT_CHAIN_PARA_cbSize(void) +{ + BOOL ret; + PCCERT_CONTEXT cert; + CERT_CHAIN_PARA para = { 0 }; + PCCERT_CHAIN_CONTEXT chain; + HCERTSTORE store; + DWORD i; + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + + ret = CertAddEncodedCertificateToStore(store, + X509_ASN_ENCODING, chain0_0, sizeof(chain0_0), + CERT_STORE_ADD_ALWAYS, NULL); + ret = CertAddEncodedCertificateToStore(store, + X509_ASN_ENCODING, chain0_1, sizeof(chain0_1), + CERT_STORE_ADD_ALWAYS, &cert); + + for (i = 0; i < sizeof(CERT_CHAIN_PARA) + 2; i++) + { + FILETIME fileTime; + + SystemTimeToFileTime(&oct2007, &fileTime); + + para.cbSize = i; + ret = pCertGetCertificateChain(NULL, cert, &fileTime, + NULL, &para, 0, NULL, &chain); + ok(ret, "CertGetCertificateChain failed %u\n", GetLastError()); + pCertFreeCertificateChain(chain); + } + + CertCloseStore(store, 0); +} + typedef struct _ChainPolicyCheck { CONST_BLOB_ARRAY certs; @@ -2016,5 +2060,6 @@ START_TEST(chain) { testVerifyCertChainPolicy(); testGetCertChain(); + test_CERT_CHAIN_PARA_cbSize(); } }

1 0

Hans Leidekker : msi: Add tests to show that the condition table is ignored when there are overrides .
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 4086ff62483d20001bcbf2d5a3f79182de70b9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=4086ff62483d20001bcbf2d5a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 22 09:50:43 2009 +0200 msi: Add tests to show that the condition table is ignored when there are overrides. --- dlls/msi/tests/install.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 26c804b..9a33b79 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -174,6 +174,10 @@ static const CHAR environment_dat[] = "Environment\tName\tValue\tComponent_\n" "Var3\t=-MSITESTVAR3\t1\tOne\n" "Var4\tMSITESTVAR4\t1\tOne\n"; +static const CHAR condition_dat[] = "Feature_\tLevel\tCondition\n" + "s38\ti2\tS255\n" + "Condition\tFeature_\tLevel\n" + "One\t4\t1\n"; static const CHAR up_property_dat[] = "Property\tValue\n" "s72\tl0\n" @@ -919,6 +923,19 @@ static const msi_table sc_tables[] = ADD_TABLE(shortcut) }; +static const msi_table ps_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property), + ADD_TABLE(condition) +}; + static const msi_table env_tables[] = { ADD_TABLE(component), @@ -6542,6 +6559,47 @@ static void test_envvar(void) delete_test_files(); } +static void test_preselected(void) +{ + UINT r; + + create_test_files(); + create_database(msifile, ps_tables, sizeof(ps_tables) / sizeof(msi_table)); + + r = MsiInstallProductA(msifile, "ADDLOCAL=One"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\cabout\\new", FALSE), "File installed\n"); + ok(!delete_pf("msitest\\cabout\\four.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\cabout", FALSE), "File installed\n"); + ok(!delete_pf("msitest\\changed\\three.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\changed", FALSE), "File installed\n"); + ok(!delete_pf("msitest\\first\\two.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\first", FALSE), "File installed\n"); + ok(!delete_pf("msitest\\filename", TRUE), "File installed\n"); + todo_wine ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); + ok(!delete_pf("msitest\\service.exe", TRUE), "File installed\n"); + todo_wine ok(delete_pf("msitest", FALSE), "File not installed\n"); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\changed", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\first", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(!delete_pf("msitest\\one.txt", TRUE), "File installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -6626,6 +6684,7 @@ START_TEST(install) test_shortcut(); test_envvar(); test_lastusedsource(); + test_preselected(); DeleteFileA(log_file);

1 0

Hans Leidekker : msi: Test last used source property in combination with cabinet storage.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: ae3418fdd90b137ddc1567882a316b2b43ad8a87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae3418fdd90b137ddc1567882… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 22 09:50:34 2009 +0200 msi: Test last used source property in combination with cabinet storage. --- dlls/msi/tests/install.c | 206 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 206 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a2b2dca..26c804b 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -407,6 +407,11 @@ static const CHAR rofc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\ "Media\tDiskId\n" "1\t1\t\ttest1.cab\tDISK1\t\n"; +static const CHAR lus2_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t1\t\t#test1.cab\tDISK1\t\n"; + static const CHAR sdp_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" "InstallExecuteSequence\tAction\n" @@ -1230,6 +1235,42 @@ static const msi_table ppc_tables[] = ADD_TABLE(property), }; +static const msi_table lus0_tables[] = +{ + ADD_TABLE(ci_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rof_file), + ADD_TABLE(pp_install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), +}; + +static const msi_table lus1_tables[] = +{ + ADD_TABLE(ci_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rof_file), + ADD_TABLE(pp_install_exec_seq), + ADD_TABLE(rofc_media), + ADD_TABLE(property), +}; + +static const msi_table lus2_tables[] = +{ + ADD_TABLE(ci_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rof_file), + ADD_TABLE(pp_install_exec_seq), + ADD_TABLE(lus2_media), + ADD_TABLE(property), +}; + static const msi_table tp_tables[] = { ADD_TABLE(tp_component), @@ -2691,6 +2732,170 @@ static void test_readonlyfile_cab(void) DeleteFile(msifile); } +static BOOL add_cabinet_storage(LPCSTR db, LPCSTR cabinet) +{ + WCHAR dbW[MAX_PATH], cabinetW[MAX_PATH]; + IStorage *stg; + IStream *stm; + HRESULT hr; + HANDLE handle; + + MultiByteToWideChar(CP_ACP, 0, db, -1, dbW, MAX_PATH); + hr = StgOpenStorage(dbW, NULL, STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, NULL, 0, &stg); + if (FAILED(hr)) + return FALSE; + + MultiByteToWideChar(CP_ACP, 0, cabinet, -1, cabinetW, MAX_PATH); + hr = IStorage_CreateStream(stg, cabinetW, STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + if (FAILED(hr)) + { + IStorage_Release(stg); + return FALSE; + } + + handle = CreateFileW(cabinetW, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (handle != INVALID_HANDLE_VALUE) + { + DWORD count; + char buffer[1024]; + if (ReadFile(handle, buffer, sizeof(buffer), &count, NULL)) + IStream_Write(stm, buffer, count, &count); + CloseHandle(handle); + } + + IStream_Release(stm); + IStorage_Release(stg); + + return TRUE; +} + +static void test_lastusedsource(void) +{ + static char prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; + + UINT r; + char value[MAX_PATH], path[MAX_PATH]; + DWORD size; + + if (!pMsiSourceListGetInfoA) + { + win_skip("MsiSourceListGetInfoA is not available\n"); + return; + } + + CreateDirectoryA("msitest", NULL); + create_file("maximus", 500); + create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); + DeleteFile("maximus"); + + create_database("msifile0.msi", lus0_tables, sizeof(lus0_tables) / sizeof(msi_table)); + create_database("msifile1.msi", lus1_tables, sizeof(lus1_tables) / sizeof(msi_table)); + create_database("msifile2.msi", lus2_tables, sizeof(lus2_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + /* no cabinet file */ + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %u\n", r); + ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); + + r = MsiInstallProductA("msifile0.msi", "PUBLISH_PRODUCT=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + lstrcpyA(path, CURR_DIR); + lstrcatA(path, "\\"); + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + todo_wine + { + ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); + ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); + } + + r = MsiInstallProductA("msifile0.msi", "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + /* seperate cabinet file */ + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %u\n", r); + ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); + + r = MsiInstallProductA("msifile1.msi", "PUBLISH_PRODUCT=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + lstrcpyA(path, CURR_DIR); + lstrcatA(path, "\\"); + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + todo_wine + { + ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); + ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); + } + + r = MsiInstallProductA("msifile1.msi", "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %u\n", r); + ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); + + /* embedded cabinet stream */ + + add_cabinet_storage("msifile2.msi", "test1.cab"); + + r = MsiInstallProductA("msifile2.msi", "PUBLISH_PRODUCT=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + todo_wine + { + ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); + ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); + } + + r = MsiInstallProductA("msifile2.msi", "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %u\n", r); + ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); + + /* Delete the files in the temp (current) folder */ + delete_cab_files(); + DeleteFile("msitest\\maximus"); + RemoveDirectory("msitest"); + DeleteFile("msifile0.msi"); + DeleteFile("msifile1.msi"); + DeleteFile("msifile2.msi"); +} + static void test_setdirproperty(void) { UINT r; @@ -6420,6 +6625,7 @@ START_TEST(install) test_int_widths(); test_shortcut(); test_envvar(); + test_lastusedsource(); DeleteFileA(log_file);

1 0

André Hentschel : winex11: Add alternative header for xf86vm.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 7b285a4ebd63eab428e968968ca398cc1076324a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b285a4ebd63eab428e968968… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Sep 19 19:08:09 2009 +0200 winex11: Add alternative header for xf86vm. --- configure | 7 ++++--- configure.ac | 7 ++++--- dlls/winex11.drv/xvidmode.c | 3 +++ include/config.h.in | 3 +++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/configure b/configure index e32773b..ae5beac 100755 --- a/configure +++ b/configure @@ -2724,7 +2724,7 @@ fi # Check whether --with-xxf86vm was given. if test "${with_xxf86vm+set}" = set; then : - withval=$with_xxf86vm; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; fi + withval=$with_xxf86vm; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi fi @@ -8024,7 +8024,8 @@ fi X11/extensions/Xinerama.h \ X11/extensions/Xrandr.h \ X11/extensions/Xrender.h \ - X11/extensions/xf86vmode.h + X11/extensions/xf86vmode.h \ + X11/extensions/xf86vmproto.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_X11_XLIB_H @@ -8323,7 +8324,7 @@ This is an error since --with-xshape was requested." "$LINENO" 5 ;; esac fi - if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes" + if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes" -o "$ac_cv_header_X11_extensions_xf86vmproto_h" = "yes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lXxf86vm" >&5 $as_echo_n "checking for -lXxf86vm... " >&6; } diff --git a/configure.ac b/configure.ac index ac5a861..0f37bc7 100644 --- a/configure.ac +++ b/configure.ac @@ -84,7 +84,7 @@ AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi]) AC_ARG_WITH(xslt, AS_HELP_STRING([--without-xslt],[do not use XSLT])) AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]), - [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; fi]) + [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi]) AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR])) AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build])) @@ -810,7 +810,8 @@ then X11/extensions/Xinerama.h \ X11/extensions/Xrandr.h \ X11/extensions/Xrender.h \ - X11/extensions/xf86vmode.h],,, + X11/extensions/xf86vmode.h \ + X11/extensions/xf86vmproto.h],,, [#ifdef HAVE_X11_XLIB_H # include <X11/Xlib.h> #endif @@ -863,7 +864,7 @@ then [XShape ${notice_platform}development files not found, XShape won't be supported.]) dnl *** Check for XFree86 VMODE extension - if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes" + if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes" -o "$ac_cv_header_X11_extensions_xf86vmproto_h" = "yes" then WINE_CHECK_SONAME(Xxf86vm,XF86VidModeQueryExtension,,,[$X_LIBS $XLIB $X_EXTRA_LIBS]) fi diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index b178d26..abc8a30 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -30,6 +30,9 @@ #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H #include <X11/extensions/xf86vmode.h> #endif +#ifdef HAVE_X11_EXTENSIONS_XF86VMPROTO_H +#include <X11/extensions/xf86vmproto.h> +#endif #include "xvidmode.h" diff --git a/include/config.h.in b/include/config.h.in index d072380..d4bbce6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1029,6 +1029,9 @@ /* Define to 1 if you have the <X11/extensions/xf86vmode.h> header file. */ #undef HAVE_X11_EXTENSIONS_XF86VMODE_H +/* Define to 1 if you have the <X11/extensions/xf86vmproto.h> header file. */ +#undef HAVE_X11_EXTENSIONS_XF86VMPROTO_H + /* Define to 1 if you have the <X11/extensions/Xinerama.h> header file. */ #undef HAVE_X11_EXTENSIONS_XINERAMA_H

1 0

Huw Davies : oledb32: Implement CanConvert.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 681b08b0feadc94fbcc40582d542ce47f34c8ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=681b08b0feadc94fbcc40582d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 21 13:50:51 2009 +0100 oledb32: Implement CanConvert. --- dlls/oledb32/convert.c | 231 +++++++++++++++++++++++++++++++++++++++++- dlls/oledb32/tests/convert.c | 10 -- 2 files changed, 228 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=681b08b0feadc94fbcc40…

1 0

Huw Davies : oledb32/tests: Add CanConvert tests for DBTYPE_BYREF, DBTYPE_ARRAY and DBTYPE_VECTOR.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: fb68974dcd6056552a88cc2dc43026655f44e93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb68974dcd6056552a88cc2dc… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 21 13:38:15 2009 +0100 oledb32/tests: Add CanConvert tests for DBTYPE_BYREF, DBTYPE_ARRAY and DBTYPE_VECTOR. --- dlls/oledb32/tests/convert.c | 113 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 111 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 8ff1609..2cfbdc3 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -190,6 +190,11 @@ struct can_convert }; +static inline BOOL array_type(DBTYPE type) +{ + return (type >= DBTYPE_I2 && type <= DBTYPE_UI4); +} + static void test_canconvert(void) { IDataConvert *convert; @@ -226,14 +231,118 @@ static void test_canconvert(void) for(src_idx = 0; src_idx < sizeof(simple_convert) / sizeof(simple_convert[0]); src_idx++) for(dst_idx = 0; dst_idx < sizeof(simple_convert) / sizeof(simple_convert[0]); dst_idx++) { - BOOL expect; + BOOL expect, simple_expect; + simple_expect = (simple_convert[src_idx].can_convert_to >> dst_idx) & 1; + hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type, simple_convert[dst_idx].type); - expect = (simple_convert[src_idx].can_convert_to >> dst_idx) & 1; + expect = simple_expect; todo_wine ok((hr == S_OK && expect == TRUE) || (hr == S_FALSE && expect == FALSE), "%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type, simple_convert[dst_idx].type, hr, expect ? "" : "not "); + + /* src DBTYPE_BYREF */ + hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type | DBTYPE_BYREF, simple_convert[dst_idx].type); + expect = simple_expect; +todo_wine + ok((hr == S_OK && expect == TRUE) || + (hr == S_FALSE && expect == FALSE), + "%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type | DBTYPE_BYREF, + simple_convert[dst_idx].type, hr, expect ? "" : "not "); + + /* dst DBTYPE_BYREF */ + hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type, simple_convert[dst_idx].type | DBTYPE_BYREF); + expect = FALSE; + if(simple_expect && + (simple_convert[dst_idx].type == DBTYPE_BYTES || + simple_convert[dst_idx].type == DBTYPE_STR || + simple_convert[dst_idx].type == DBTYPE_WSTR)) + expect = TRUE; +todo_wine + ok((hr == S_OK && expect == TRUE) || + (hr == S_FALSE && expect == FALSE), + "%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type, + simple_convert[dst_idx].type | DBTYPE_BYREF, hr, expect ? "" : "not "); + + /* src & dst DBTYPE_BYREF */ + hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type | DBTYPE_BYREF, simple_convert[dst_idx].type | DBTYPE_BYREF); + expect = FALSE; + if(simple_expect && + (simple_convert[dst_idx].type == DBTYPE_BYTES || + simple_convert[dst_idx].type == DBTYPE_STR || + simple_convert[dst_idx].type == DBTYPE_WSTR)) + expect = TRUE; +todo_wine + ok((hr == S_OK && expect == TRUE) || + (hr == S_FALSE && expect == FALSE), + "%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type | DBTYPE_BYREF, + simple_convert[dst_idx].type | DBTYPE_BYREF, hr, expect ? "" : "not "); + + /* src DBTYPE_ARRAY */ + hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type | DBTYPE_ARRAY, simple_convert[dst_idx].type); + expect = FALSE; + if(array_type(simple_convert[src_idx].type) && simple_convert[dst_idx].type == DBTYPE_VARIANT) + expect = TRUE; +todo_wine + ok((hr == S_OK && expect == TRUE) || + (hr == S_FALSE && expect == FALSE), + "%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type | DBTYPE_ARRAY, + simple_convert[dst_idx].type, hr, expect ? "" : "not "); + + /* dst DBTYPE_ARRAY */ + hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type, simple_convert[dst_idx].type | DBTYPE_ARRAY); + expect = FALSE; + if(array_type(simple_convert[dst_idx].type) && + (simple_convert[src_idx].type == DBTYPE_IDISPATCH || + simple_convert[src_idx].type == DBTYPE_VARIANT)) + expect = TRUE; +todo_wine + ok((hr == S_OK && expect == TRUE) || + (hr == S_FALSE && expect == FALSE), + "%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type, + simple_convert[dst_idx].type | DBTYPE_ARRAY, hr, expect ? "" : "not "); + + /* src & dst DBTYPE_ARRAY */ + hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type | DBTYPE_ARRAY, simple_convert[dst_idx].type | DBTYPE_ARRAY); + expect = FALSE; + if(array_type(simple_convert[src_idx].type) && + simple_convert[src_idx].type == simple_convert[dst_idx].type) + expect = TRUE; +todo_wine + ok((hr == S_OK && expect == TRUE) || + (hr == S_FALSE && expect == FALSE), + "%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type | DBTYPE_ARRAY, + simple_convert[dst_idx].type | DBTYPE_ARRAY, hr, expect ? "" : "not "); + + /* src DBTYPE_VECTOR */ + hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type | DBTYPE_VECTOR, simple_convert[dst_idx].type); + expect = FALSE; +todo_wine + ok((hr == S_OK && expect == TRUE) || + (hr == S_FALSE && expect == FALSE), + "%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type | DBTYPE_VECTOR, + simple_convert[dst_idx].type, hr, expect ? "" : "not "); + + /* dst DBTYPE_VECTOR */ + hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type, simple_convert[dst_idx].type | DBTYPE_VECTOR); + expect = FALSE; +todo_wine + ok((hr == S_OK && expect == TRUE) || + (hr == S_FALSE && expect == FALSE), + "%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type, + simple_convert[dst_idx].type | DBTYPE_VECTOR, hr, expect ? "" : "not "); + + /* src & dst DBTYPE_VECTOR */ + hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type | DBTYPE_VECTOR, simple_convert[dst_idx].type | DBTYPE_VECTOR); + expect = FALSE; +todo_wine + ok((hr == S_OK && expect == TRUE) || + (hr == S_FALSE && expect == FALSE), + "%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type | DBTYPE_VECTOR, + simple_convert[dst_idx].type | DBTYPE_VECTOR, hr, expect ? "" : "not "); + + } IDataConvert_Release(convert);

1 0

Hans Leidekker : rpcrt4: Add stub implementations of NdrMesTypeDecode2 and NdrMesTypeFree2.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: ee7755511bb3d9db5f1f86528293969a412b492a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee7755511bb3d9db5f1f86528… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 21 13:07:01 2009 +0200 rpcrt4: Add stub implementations of NdrMesTypeDecode2 and NdrMesTypeFree2. --- dlls/rpcrt4/ndr_es.c | 12 ++++++++++++ dlls/rpcrt4/rpcrt4.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index dc50ad8..52200dc 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -439,3 +439,15 @@ void WINAPIV NdrMesProcEncodeDecode(handle_t Handle, const MIDL_STUB_DESC * pStu if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR) NdrFullPointerXlatFree(pEsMsg->StubMsg.FullPtrXlatTables); } + +void RPC_ENTRY NdrMesTypeDecode2(handle_t Handle, const MIDL_TYPE_PICKLING_INFO *pPicklingInfo, + const MIDL_STUB_DESC *pStubDesc, PFORMAT_STRING pFormatString, void *pObject) +{ + FIXME("(%p, %p, %p, %p, %p)\n", Handle, pPicklingInfo, pStubDesc, pFormatString, pObject); +} + +void RPC_ENTRY NdrMesTypeFree2(handle_t Handle, const MIDL_TYPE_PICKLING_INFO *pPicklingInfo, + const MIDL_STUB_DESC *pStubDesc, PFORMAT_STRING pFormatString, void *pObject) +{ + FIXME("(%p, %p, %p, %p, %p)\n", Handle, pPicklingInfo, pStubDesc, pFormatString, pObject); +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index b8349be..0a04769 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -225,11 +225,11 @@ @ stub NdrMesSimpleTypeEncode @ stub NdrMesTypeAlignSize2 @ stub NdrMesTypeAlignSize -@ stub NdrMesTypeDecode2 +@ stdcall NdrMesTypeDecode2(ptr ptr ptr ptr ptr) @ stub NdrMesTypeDecode @ stub NdrMesTypeEncode2 @ stub NdrMesTypeEncode -@ stub NdrMesTypeFree2 +@ stdcall NdrMesTypeFree2(ptr ptr ptr ptr ptr) @ stdcall NdrNonConformantStringBufferSize(ptr ptr ptr) @ stdcall NdrNonConformantStringMarshall(ptr ptr ptr) @ stdcall NdrNonConformantStringMemorySize(ptr ptr)

1 0