June 2008 - Wine-Commits - list.winehq.org

Alexandre Julliard : Revert "wpp: config.h and wine/port. h should be included first."
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 8e729245412e6b1e24b9871a0252b7e660fd24ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e729245412e6b1e24b9871a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 30 16:17:35 2008 +0200 Revert "wpp: config.h and wine/port.h should be included first." This reverts commit 33017b0d936597d55025e006a6dc2bbf4ef733c4. Some distros still ship flex 2.5.4 unfortunately. --- libs/wpp/ppl.l | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index d500aef..4bb928c 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -121,11 +121,6 @@ * */ -%top{ -#include "config.h" -#include "wine/port.h" -} - /* * Special flex options and exclusive scanner start-conditions */ @@ -161,6 +156,8 @@ cident [a-zA-Z_][0-9a-zA-Z_]* ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] %{ +#include "config.h" +#include "wine/port.h" #include <stdio.h> #include <stdlib.h> #include <string.h>

1 0

Michael Karcher : crypt32: Remove duplicate MS test root key.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 0ed076ab5c9b779bc09a490918d17b9ebadb1d75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed076ab5c9b779bc09a49091… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Jun 29 13:29:31 2008 +0200 crypt32: Remove duplicate MS test root key. --- dlls/crypt32/chain.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index a13a896..77032ac 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1578,12 +1578,6 @@ static BYTE msTestPubKey1[] = { 0x42,0xb6,0x9d,0x23,0x36,0x0b,0xde,0x54,0x0f,0xcd,0xbd,0x1f,0x99,0x2a,0x10, 0x58,0x11,0xcb,0x40,0xcb,0xb5,0xa7,0x41,0x02,0x03,0x01,0x00,0x01 }; static BYTE msTestPubKey2[] = { -0x30,0x48,0x02,0x41,0x00,0x81,0x55,0x22,0xb9,0x8a,0xa4,0x6f,0xed,0xd6,0xe7, -0xd9,0x66,0x0f,0x55,0xbc,0xd7,0xcd,0xd5,0xbc,0x4e,0x40,0x02,0x21,0xa2,0xb1, -0xf7,0x87,0x30,0x85,0x5e,0xd2,0xf2,0x44,0xb9,0xdc,0x9b,0x75,0xb6,0xfb,0x46, -0x5f,0x42,0xb6,0x9d,0x23,0x36,0x0b,0xde,0x54,0x0f,0xcd,0xbd,0x1f,0x99,0x2a, -0x10,0x58,0x11,0xcb,0x40,0xcb,0xb5,0xa7,0x41,0x02,0x03,0x01,0x00,0x01 }; -static BYTE msTestPubKey3[] = { 0x30,0x47,0x02,0x40,0x9c,0x50,0x05,0x1d,0xe2,0x0e,0x4c,0x53,0xd8,0xd9,0xb5, 0xe5,0xfd,0xe9,0xe3,0xad,0x83,0x4b,0x80,0x08,0xd9,0xdc,0xe8,0xe8,0x35,0xf8, 0x11,0xf1,0xe9,0x9b,0x03,0x7a,0x65,0x64,0x76,0x35,0xce,0x38,0x2c,0xf2,0xb6, @@ -1608,7 +1602,6 @@ static BOOL WINAPI verify_authenticode_policy(LPCSTR szPolicyOID, CRYPT_DATA_BLOB keyBlobs[] = { { sizeof(msTestPubKey1), msTestPubKey1 }, { sizeof(msTestPubKey2), msTestPubKey2 }, - { sizeof(msTestPubKey3), msTestPubKey3 }, }; /* Check whether the root is an MS test root */

1 0

Michael Karcher : crypt32: ComparePublicKeyInfo must ignore the leading zero.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: c235656aeb87d084d85159b222891a62541cadd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c235656aeb87d084d85159b22… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Jun 29 12:33:48 2008 +0200 crypt32: ComparePublicKeyInfo must ignore the leading zero. --- dlls/crypt32/cert.c | 61 +++++++++++++++++++++++++++++++++++++++------ dlls/crypt32/tests/cert.c | 32 +++++++++++++++++++++++ 2 files changed, 85 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b916ce3..2ab147a 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -788,17 +788,62 @@ BOOL WINAPI CertComparePublicKeyInfo(DWORD dwCertEncodingType, TRACE("(%08x, %p, %p)\n", dwCertEncodingType, pPublicKey1, pPublicKey2); - if (pPublicKey1->PublicKey.cbData == pPublicKey2->PublicKey.cbData && - pPublicKey1->PublicKey.cUnusedBits == pPublicKey2->PublicKey.cUnusedBits) + switch (GET_CERT_ENCODING_TYPE(dwCertEncodingType)) { - if (pPublicKey2->PublicKey.cbData) - ret = !memcmp(pPublicKey1->PublicKey.pbData, - pPublicKey2->PublicKey.pbData, pPublicKey1->PublicKey.cbData); + case 0: /* Seems to mean "raw binary bits" */ + if (pPublicKey1->PublicKey.cbData == pPublicKey2->PublicKey.cbData && + pPublicKey1->PublicKey.cUnusedBits == pPublicKey2->PublicKey.cUnusedBits) + { + if (pPublicKey2->PublicKey.cbData) + ret = !memcmp(pPublicKey1->PublicKey.pbData, + pPublicKey2->PublicKey.pbData, pPublicKey1->PublicKey.cbData); + else + ret = TRUE; + } else - ret = TRUE; - } - else + ret = FALSE; + break; + default: + WARN("Unknown encoding type %08x\n", dwCertEncodingType); + /* FALLTHROUGH */ + case X509_ASN_ENCODING: + { + BLOBHEADER *pblob1, *pblob2; + DWORD length; ret = FALSE; + if (CryptDecodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, + pPublicKey1->PublicKey.pbData, pPublicKey1->PublicKey.cbData, + 0, NULL, &length)) + { + pblob1 = CryptMemAlloc(length); + if (CryptDecodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, + pPublicKey1->PublicKey.pbData, pPublicKey1->PublicKey.cbData, + 0, pblob1, &length)) + { + if (CryptDecodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, + pPublicKey2->PublicKey.pbData, pPublicKey2->PublicKey.cbData, + 0, NULL, &length)) + { + pblob2 = CryptMemAlloc(length); + if (CryptDecodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, + pPublicKey2->PublicKey.pbData, pPublicKey2->PublicKey.cbData, + 0, pblob2, &length)) + { + /* The RSAPUBKEY structure directly follows the BLOBHEADER */ + RSAPUBKEY *pk1 = (LPVOID)(pblob1 + 1), + *pk2 = (LPVOID)(pblob2 + 1); + ret = (pk1->bitlen == pk2->bitlen) && (pk1->pubexp == pk2->pubexp) + && !memcmp(pk1 + 1, pk2 + 1, pk1->bitlen/8); + } + CryptMemFree(pblob2); + } + } + CryptMemFree(pblob1); + } + + break; + } + } return ret; } diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 64aba83..37cea10 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2437,6 +2437,9 @@ static void testComparePublicKeyInfo(void) static BYTE bits1[] = { 1, 0 }; static BYTE bits2[] = { 0 }; static BYTE bits3[] = { 1 }; + static BYTE bits4[] = { 0x30,8, 2,1,0x81, 2,3,1,0,1 }; + static BYTE bits5[] = { 0x30,9, 2,2,0,0x81, 2,3,1,0,1 }; + static BYTE bits6[] = { 0x30,9, 2,2,0,0x82, 2,3,1,0,1 }; /* crashes ret = CertComparePublicKeyInfo(0, NULL, NULL); @@ -2460,6 +2463,26 @@ static void testComparePublicKeyInfo(void) info2.PublicKey.cUnusedBits = 0; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + info2.Algorithm.pszObjId = oid_rsa_rsa; + info1.PublicKey.cbData = sizeof(bits4); + info1.PublicKey.pbData = bits4; + info1.PublicKey.cUnusedBits = 0; + info2.PublicKey.cbData = sizeof(bits5); + info2.PublicKey.pbData = bits5; + info2.PublicKey.cUnusedBits = 0; + ret = CertComparePublicKeyInfo(0, &info1, &info2); + ok(!ret, "CertComparePublicKeyInfo: as raw binary: keys should be unequal\n"); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); + ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); + info1.PublicKey.cUnusedBits = 1; + info2.PublicKey.cUnusedBits = 5; + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); + ok(ret, "CertComparePublicKeyInfo: ASN.1 encoding should ignore cUnusedBits\n"); + info1.PublicKey.cUnusedBits = 0; + info2.PublicKey.cUnusedBits = 0; + info1.PublicKey.cbData--; /* kill one byte, make ASN.1 encoded data invalid */ + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); + ok(!ret, "CertComparePublicKeyInfo: comparing bad ASN.1 encoded key should fail\n"); /* Even though they compare in their used bits, these do not compare */ info1.PublicKey.cbData = sizeof(bits2); info1.PublicKey.pbData = bits2; @@ -2475,6 +2498,15 @@ static void testComparePublicKeyInfo(void) info2.PublicKey.cUnusedBits = 0; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(!ret, "Expected keys not to compare\n"); + /* ASN.1 encoded non-comparing case */ + info1.PublicKey.cbData = sizeof(bits5); + info1.PublicKey.pbData = bits5; + info1.PublicKey.cUnusedBits = 0; + info2.PublicKey.cbData = sizeof(bits6); + info2.PublicKey.pbData = bits6; + info2.PublicKey.cUnusedBits = 0; + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); + ok(!ret, "CertComparePublicKeyInfo: different keys should be unequal\n"); } static void testHashPublicKeyInfo(void)

1 0

Alexandre Julliard : ntdll: Only recompose Unicode on Mac OS when using utf-8.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: d45677788e87e5e3c5182ca1bd60c084f109bf44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d45677788e87e5e3c5182ca1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 30 15:10:25 2008 +0200 ntdll: Only recompose Unicode on Mac OS when using utf-8. --- dlls/ntdll/rtlstr.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index deec931..608857a 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -66,7 +66,8 @@ void __wine_init_codepages( const union cptable *ansi, const union cptable *oem, int ntdll_umbstowcs(DWORD flags, const char* src, int srclen, WCHAR* dst, int dstlen) { #ifdef __APPLE__ - flags |= MB_COMPOSITE; /* work around broken Mac OS X filesystem that enforces decomposed Unicode */ + /* work around broken Mac OS X filesystem that enforces decomposed Unicode */ + if (!unix_table) flags |= MB_COMPOSITE; #endif return (unix_table) ? wine_cp_mbstowcs( unix_table, flags, src, srclen, dst, dstlen ) :

1 0

Alexandre Julliard : ntdll: Don' t bother to check the file name against the mask if stat() succeeded.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: d350998cec9243c9adc7c3d81254927a3591f391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d350998cec9243c9adc7c3d81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 30 15:10:50 2008 +0200 ntdll: Don't bother to check the file name against the mask if stat() succeeded. --- dlls/ntdll/directory.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 2b53245..0e99c4f 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1508,7 +1508,7 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG ret = stat( unix_name, &st ); if (!ret) { - FILE_BOTH_DIR_INFORMATION *info = append_entry( buffer, &io->Information, length, unix_name, NULL, mask ); + FILE_BOTH_DIR_INFORMATION *info = append_entry( buffer, &io->Information, length, unix_name, NULL, NULL ); if (info) { info->NextEntryOffset = 0; @@ -1517,6 +1517,7 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG else lseek( fd, 1, SEEK_CUR ); } + else io->u.Status = STATUS_NO_MORE_FILES; } } else ret = -1;

1 0

Jon Griffiths : oleaut32: Null doc string params return E_INVALIDARG.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: a1852086804d8b1d22193530072f6a76e4fcb909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1852086804d8b1d221935300… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Sun Jun 29 05:52:23 2008 -0700 oleaut32: Null doc string params return E_INVALIDARG. --- dlls/oleaut32/typelib2.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 653e881..de8c7db 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1275,6 +1275,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetDocString( int offset; TRACE("(%p,%s)\n", iface, debugstr_w(pStrDoc)); + if (!pStrDoc) + return E_INVALIDARG; offset = ctl2_alloc_string(This->typelib, pStrDoc); if (offset == -1) return E_OUTOFMEMORY; @@ -3154,6 +3156,8 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetDocString(ICreateTypeLib2 * iface, LP int offset; TRACE("(%p,%s)\n", iface, debugstr_w(szDoc)); + if (!szDoc) + return E_INVALIDARG; offset = ctl2_alloc_string(This, szDoc); if (offset == -1) return E_OUTOFMEMORY;

1 0

Jon Griffiths : oleaut32: Use users default LCID for type libraries.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 72607b89a7d1eb2befc05191e8de1843b4c4f682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72607b89a7d1eb2befc05191e… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Sun Jun 29 04:50:23 2008 -0700 oleaut32: Use users default LCID for type libraries. --- dlls/oleaut32/typelib2.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 00c79ce..f68390c 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -214,8 +214,7 @@ static void ctl2_init_header( This->typelib_header.magic1 = 0x5446534d; This->typelib_header.magic2 = 0x00010002; This->typelib_header.posguid = -1; - This->typelib_header.lcid = 0x0409; /* or do we use the current one? */ - This->typelib_header.lcid2 = 0x0409; + This->typelib_header.lcid = This->typelib_header.lcid2 = GetUserDefaultLCID(); This->typelib_header.varflags = 0x40; This->typelib_header.version = 0; This->typelib_header.flags = 0;

1 0

Jon Griffiths : oleaut32: ICreateTypeLib2_SetLcid sets both LCID's.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 04912d26b9acce4bb7c86791899a531c5ce23275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04912d26b9acce4bb7c867918… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Sun Jun 29 05:09:33 2008 -0700 oleaut32: ICreateTypeLib2_SetLcid sets both LCID's. --- dlls/oleaut32/typelib2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index f68390c..653e881 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3203,7 +3203,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 * iface, LCID lc TRACE("(%p,%d)\n", iface, lcid); - This->typelib_header.lcid2 = lcid; + This->typelib_header.lcid = This->typelib_header.lcid2 = lcid; return S_OK; }

1 0

Hans Leidekker : shlwapi: Add a couple of tests for UrlUnescape.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 96b89623afb36a867e3cb9a1830d7eb1b53089e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96b89623afb36a867e3cb9a18… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Sun Jun 29 16:03:55 2008 +0200 shlwapi: Add a couple of tests for UrlUnescape. --- dlls/shlwapi/tests/url.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 970b7fb..3b0633a 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -801,8 +801,8 @@ static void test_UrlUnescape(void) DWORD dwEscaped; size_t i; static char inplace[] = "file:///C:/Program%20Files"; - static WCHAR inplaceW[] = {'f','i','l','e',':','/','/','/','C',':','/', - 'P','r','o','g','r','a','m','%','2','0','F','i','l','e','s',0}; + static const char expected[] = "file:///C:/Program Files"; + static WCHAR inplaceW[] = {'f','i','l','e',':','/','/','/','C',':','/','P','r','o','g','r','a','m',' ','F','i','l','e','s',0}; for(i=0; i<sizeof(TEST_URL_UNESCAPE)/sizeof(TEST_URL_UNESCAPE[0]); i++) { dwEscaped=INTERNET_MAX_URL_LENGTH; @@ -821,9 +821,12 @@ static void test_UrlUnescape(void) dwEscaped = sizeof(inplace); ok(UrlUnescapeA(inplace, NULL, &dwEscaped, URL_UNESCAPE_INPLACE) == S_OK, "UrlUnescapeA failed unexpectedly\n"); + ok(!strcmp(inplace, expected), "got %s expected %s\n", inplace, expected); + ok(dwEscaped == 27, "got %d expected 27\n", dwEscaped); dwEscaped = sizeof(inplaceW); ok(UrlUnescapeW(inplaceW, NULL, &dwEscaped, URL_UNESCAPE_INPLACE) == S_OK, "UrlUnescapeW failed unexpectedly\n"); + ok(dwEscaped == 50, "got %d expected 50\n", dwEscaped); } /* ########################### */

1 0

Hans Leidekker : msi: Correct spec file entry for MsiGetFileVersion{A, W}.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: c9969780bcd3444f17e5eeecd9f7092109fcf6df URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9969780bcd3444f17e5eeecd… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Sun Jun 29 16:03:51 2008 +0200 msi: Correct spec file entry for MsiGetFileVersion{A, W}. --- dlls/msi/msi.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 1bba6d4..fd1ff55 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -187,8 +187,8 @@ 191 stub MsiInvalidateFeatureCache 192 stdcall MsiUseFeatureExA(str str long long) 193 stdcall MsiUseFeatureExW(wstr wstr long long) -194 stdcall MsiGetFileVersionA(str str ptr str ptr) -195 stdcall MsiGetFileVersionW(wstr wstr ptr wstr ptr) +194 stdcall MsiGetFileVersionA(str ptr ptr ptr ptr) +195 stdcall MsiGetFileVersionW(wstr ptr ptr ptr ptr) 196 stdcall MsiLoadStringA(long long long long long) 197 stdcall MsiLoadStringW(long long long long long) 198 stdcall MsiMessageBoxA(long long long long long long)

1 0