July 2007 - Wine-commits - list.winehq.org

Juan Lang : crypt32: Fix decoding sequences with extra trailing data.
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: 8dcd9e4279ef6601440b92fd94a30e046be589da URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcd9e4279ef6601440b92fd9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 13 10:35:58 2007 -0700 crypt32: Fix decoding sequences with extra trailing data. --- dlls/crypt32/decode.c | 74 +++++++++++++++++++++++++++++++++---------- dlls/crypt32/tests/crl.c | 8 +--- dlls/crypt32/tests/encode.c | 4 +-- 3 files changed, 60 insertions(+), 26 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index d3f3322..3a3a195 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -297,15 +297,21 @@ struct AsnDecodeSequenceItem DWORD size; }; +/* Decodes the items in a sequence, where the items are described in items, + * the encoded data are in pbEncoded with length cbEncoded. Decodes into + * pvStructInfo. nextData is a pointer to the memory location at which the + * first decoded item with a dynamic pointer should point. + * Upon decoding, *cbDecoded is the total number of bytes decoded. + */ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, struct AsnDecodeSequenceItem items[], DWORD cItem, const BYTE *pbEncoded, - DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, BYTE *nextData) + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, BYTE *nextData, + DWORD *cbDecoded) { BOOL ret; - DWORD i; - const BYTE *ptr; + DWORD i, decoded = 0; + const BYTE *ptr = pbEncoded; - ptr = pbEncoded + 1 + GET_LEN_BYTES(pbEncoded[1]); for (i = 0, ret = TRUE; ret && i < cItem; i++) { if (cbEncoded - (ptr - pbEncoded) != 0) @@ -353,6 +359,7 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, items[i].size += sizeof(DWORD) - items[i].size % sizeof(DWORD); ptr += 1 + nextItemLenBytes + nextItemLen; + decoded += 1 + nextItemLenBytes + nextItemLen; } else if (items[i].optional && GetLastError() == CRYPT_E_ASN1_BADTAG) @@ -367,7 +374,10 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, GetLastError()); } else + { + decoded += 1 + nextItemLenBytes + nextItemLen; items[i].size = items[i].minSize; + } } else if (items[i].optional) { @@ -395,13 +405,8 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, ret = FALSE; } } - if (cbEncoded - (ptr - pbEncoded) != 0) - { - TRACE("%d remaining bytes, failing\n", cbEncoded - - (ptr - pbEncoded)); - SetLastError(CRYPT_E_ASN1_CORRUPT); - ret = FALSE; - } + if (ret) + *cbDecoded = decoded; return ret; } @@ -412,7 +417,6 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, * data will be stored. If you know the starting offset, you may pass it * here. Otherwise, pass NULL, and one will be inferred from the items. * Each item decoder is never called with CRYPT_DECODE_ALLOC_FLAG set. - * If any undecoded data are left over, fails with CRYPT_E_ASN1_CORRUPT. */ static BOOL CRYPT_AsnDecodeSequence(DWORD dwCertEncodingType, struct AsnDecodeSequenceItem items[], DWORD cItem, const BYTE *pbEncoded, @@ -431,13 +435,30 @@ static BOOL CRYPT_AsnDecodeSequence(DWORD dwCertEncodingType, if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) { - DWORD i; + DWORD lenBytes = GET_LEN_BYTES(pbEncoded[1]), cbDecoded; + const BYTE *ptr = pbEncoded + 1 + lenBytes; - ret = CRYPT_AsnDecodeSequenceItems(dwFlags, items, cItem, pbEncoded, - cbEncoded, dwFlags, NULL, NULL); + cbEncoded -= 1 + lenBytes; + if (cbEncoded < dataLen) + { + TRACE("dataLen %d exceeds cbEncoded %d, failing\n", dataLen, + cbEncoded); + SetLastError(CRYPT_E_ASN1_CORRUPT); + ret = FALSE; + } + else + ret = CRYPT_AsnDecodeSequenceItems(dwFlags, items, cItem, ptr, + cbEncoded, dwFlags, NULL, NULL, &cbDecoded); + if (ret && cbDecoded != dataLen) + { + TRACE("expected %d decoded, got %d, failing\n", dataLen, + cbDecoded); + SetLastError(CRYPT_E_ASN1_CORRUPT); + ret = FALSE; + } if (ret) { - DWORD bytesNeeded = 0, structSize = 0; + DWORD i, bytesNeeded = 0, structSize = 0; for (i = 0; i < cItem; i++) { @@ -459,7 +480,8 @@ static BOOL CRYPT_AsnDecodeSequence(DWORD dwCertEncodingType, nextData = (BYTE *)pvStructInfo + structSize; memset(pvStructInfo, 0, structSize); ret = CRYPT_AsnDecodeSequenceItems(dwFlags, items, cItem, - pbEncoded, cbEncoded, dwFlags, pvStructInfo, nextData); + ptr, cbEncoded, dwFlags, pvStructInfo, nextData, + &cbDecoded); } } } @@ -872,6 +894,24 @@ static BOOL WINAPI CRYPT_AsnDecodeCertInfo(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); + if (ret && pvStructInfo) + { + CERT_INFO *info; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + info = *(CERT_INFO **)pvStructInfo; + else + info = (CERT_INFO *)pvStructInfo; + if (!info->SerialNumber.cbData || !info->Issuer.cbData || + !info->Subject.cbData) + { + SetLastError(CRYPT_E_ASN1_CORRUPT); + /* Don't need to deallocate, because it should have failed on the + * first pass (and no memory was allocated.) + */ + ret = FALSE; + } + } TRACE("Returning %d (%08x)\n", ret, GetLastError()); return ret; diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 462d89f..7ecf6d4 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -98,14 +98,10 @@ static void testCreateCRL(void) "Expected CRYPT_E_ASN1_EOD or OSS_MORE_INPUT, got %08x\n", GLE); context = CertCreateCRLContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); GLE = GetLastError(); - ok(!context && (GLE == CRYPT_E_ASN1_CORRUPT || GLE == OSS_DATA_ERROR), - "Expected CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08x\n", GLE); + ok(!context, "Expected failure\n"); context = CertCreateCRLContext(X509_ASN_ENCODING, signedCRL, sizeof(signedCRL) - 1); - ok(!context && (GLE == CRYPT_E_ASN1_EOD || GLE == CRYPT_E_ASN1_CORRUPT || - GLE == OSS_DATA_ERROR), - "Expected CRYPT_E_ASN1_EOD or CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08x\n", - GLE); + ok(!context, "Expected failure\n"); context = CertCreateCRLContext(X509_ASN_ENCODING, signedCRL, sizeof(signedCRL)); ok(context != NULL, "CertCreateCRLContext failed: %08x\n", GetLastError()); diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 881f6cb..8173a12 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2765,8 +2765,7 @@ static void test_decodeCertToBeSigned(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, corruptCerts[i], corruptCerts[i][1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT), - "Expected CRYPT_E_ASN1_CORRUPT, got %08x\n", GetLastError()); + ok(!ret, "Expected failure\n"); } /* Now check with serial number, subject and issuer specified */ ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, bigCert, @@ -4642,7 +4641,6 @@ static void test_decodePKCSContentInfo(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, emptyPKCSContentInfoExtraBytes, sizeof(emptyPKCSContentInfoExtraBytes), 0, NULL, NULL, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptDecodeObjectEx(dwEncoding, PKCS_CONTENT_INFO,

1 0

Aric Stewart : user32: Change SetDeskWallPaper spec.
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: 1afbc2c9579a5bce1aebb7628162778468abb411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1afbc2c9579a5bce1aebb7628… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jul 13 08:17:13 2007 -0500 user32: Change SetDeskWallPaper spec. --- dlls/user32/user32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 7e4ce33..8bf9ad1 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -614,7 +614,7 @@ @ stub SetCursorContents @ stdcall SetCursorPos(long long) @ stdcall SetDebugErrorLevel(long) -@ stdcall SetDeskWallPaper(str) +@ stdcall SetDeskWallPaper(ptr) # @ stub SetDeskWallpaper # @ stub SetDesktopBitmap @ stdcall SetDlgItemInt(long long long long)

1 0

Paul Vriens : msi/tests: Don't create a directory that's not needed.
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: 02d14c85e7eae9bf4e3e9cde83fdb417ba89033d URL: http://source.winehq.org/git/wine.git/?a=commit;h=02d14c85e7eae9bf4e3e9cde8… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jul 13 20:56:41 2007 +0200 msi/tests: Don't create a directory that's not needed. --- dlls/msi/tests/install.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 5cc1c7e..0d9d703 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2489,7 +2489,6 @@ static void test_transformprop(void) UINT r; CreateDirectoryA("msitest", NULL); - CreateDirectoryA("msitest\\msitest", NULL); create_file("msitest\\augustus", 500); create_database(msifile, tp_tables, sizeof(tp_tables) / sizeof(msi_table));

1 0

Andrew Talbot : winedump: Cast-qual warnings fix.
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: 2de22f1bf02070307da118a9de80d4e5d79a261d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de22f1bf02070307da118a9d… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jul 13 20:29:53 2007 +0100 winedump: Cast-qual warnings fix. --- tools/winedump/search.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/winedump/search.c b/tools/winedump/search.c index 8ae82de..aa89fc9 100644 --- a/tools/winedump/search.c +++ b/tools/winedump/search.c @@ -243,7 +243,7 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg) { int is_const, is_volatile, is_struct, is_signed, is_unsigned, ptrs = 0; const char *iter, *type_str, *base_type, *catch_unsigned; - char dest_type; + char dest_type, *type_str_tmp; assert (sym && sym->symbol); assert (proto && *proto); @@ -297,13 +297,13 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg) if (!*proto) return NULL; - type_str = str_substring (type_str, proto); + type_str = type_str_tmp = str_substring (type_str, proto); if (iter == base_type || catch_unsigned) { /* 'unsigned' with no type */ char *tmp = str_create (2, type_str, " int"); - free ((char*)type_str); - type_str = tmp; + free (type_str_tmp); + type_str = type_str_tmp = tmp; } symbol_clean_string (type_str); @@ -326,7 +326,7 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg) iter = str_find_set (proto, " ,)"); if (!iter) { - free ((char*)type_str); + free (type_str_tmp); return NULL; } sym->arg_name [arg] = str_substring (proto, iter);

1 0

Jeremy White : gdi32: Do not fill in the color table if lpvBits is NULL.
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: fa239446951f5fb5b2377e0cd99901c74bd838a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa239446951f5fb5b2377e0cd… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Jul 13 15:45:42 2007 -0500 gdi32: Do not fill in the color table if lpvBits is NULL. --- dlls/gdi32/dib.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 2a98efb..ac6c885 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -972,11 +972,15 @@ INT WINAPI GetDIBits( break; case 16: + if (bits) + { + /* Add color only when bits is given, as per MSDN */ + ((PDWORD)info->bmiColors)[0] = 0xf800; + ((PDWORD)info->bmiColors)[1] = 0x07e0; + ((PDWORD)info->bmiColors)[2] = 0x001f; + } info->bmiHeader.biBitCount = 16; info->bmiHeader.biCompression = BI_BITFIELDS; - ((PDWORD)info->bmiColors)[0] = 0xf800; - ((PDWORD)info->bmiColors)[1] = 0x07e0; - ((PDWORD)info->bmiColors)[2] = 0x001f; break; default:

1 0

Jeremy White : gdi32: Added a test for the case where lpvBits in GetDIBits is NULL and the bitcount is 0 .
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: a2c2b602923b62b8e67281e8f7c8aa08a11185a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c2b602923b62b8e67281e8f… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Jul 13 11:32:10 2007 -0500 gdi32: Added a test for the case where lpvBits in GetDIBits is NULL and the bitcount is 0. --- dlls/gdi32/tests/bitmap.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 019bb35..566545d 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1791,6 +1791,46 @@ static void test_bitmapinfoheadersize(void) ReleaseDC(0, hdc); } +static void test_get16dibits(void) +{ + BYTE bits[4 * (16 / sizeof(BYTE))]; + HBITMAP hbmp; + HDC screen_dc = GetDC(NULL); + int ret; + BITMAPINFO * info; + int info_len = sizeof(BITMAPINFOHEADER) + 1024; + BYTE *p; + int overwritten_bytes = 0; + + memset(bits, 0, sizeof(bits)); + hbmp = CreateBitmap(2, 2, 1, 16, bits); + ok(hbmp != NULL, "CreateBitmap failed\n"); + + info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, info_len); + assert(info); + + memset(info, '!', info_len); + memset(info, 0, sizeof(info->bmiHeader)); + + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biWidth = 2; + info->bmiHeader.biHeight = 2; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biCompression = BI_RGB; + + ret = GetDIBits(screen_dc, hbmp, 0, 0, NULL, info, 0); + ok(ret != 0, "GetDIBits failed\n"); + + for (p = ((BYTE *) info) + sizeof(info->bmiHeader); (p - ((BYTE *) info)) < info_len; p++) + if (*p != '!') + overwritten_bytes++; + ok(overwritten_bytes == 0, "GetDIBits wrote past the buffer given\n"); + + DeleteObject(hbmp); + ReleaseDC(NULL, screen_dc); +} + + START_TEST(bitmap) { is_win9x = GetWindowLongPtrW(GetDesktopWindow(), GWLP_WNDPROC) == 0; @@ -1809,4 +1849,5 @@ START_TEST(bitmap) test_select_object(); test_CreateBitmap(); test_bitmapinfoheadersize(); + test_get16dibits(); }

1 0

appdb/include objectManager.php
by WineHQ 16 Jul '07

16 Jul '07

ChangeSet ID: 31253 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/15 22:04:54 Modified files: include : objectManager.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> objectManager::display_table() should exit out only if the user isn't logged in AND the table is a queue Patch: http://cvs.winehq.org/patch.py?id=31253 Old revision New revision Changes Path 1.35 1.36 +1 -1 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.35 appdb/include/objectManager.php:1.36 --- appdb/include/objectManager.php:1.35 16 Jul 2007 3: 4:54 -0000 +++ appdb/include/objectManager.php 16 Jul 2007 3: 4:54 -0000 @@ -85,7 +85,7 @@ class ObjectManager "objectGetTableRow", "objectGetId", "canEdit")); /* We cannot process a queue if we are not logged in */ - if(!$_SESSION['current']->isLoggedIn()) + if(!$_SESSION['current']->isLoggedIn() && $this->bIsQueue) { $sQueueText = $this->bIsRejected ? "rejected" : "queued"; echo '<div align="center">You need to <a href="'.login_url().'">';

1 0

appdb/ ./objectManager.php include/sidebar.php ...
by WineHQ 16 Jul '07

16 Jul '07

ChangeSet ID: 31252 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/15 22:04:07 Modified files: . : objectManager.php include : sidebar.php unit_test : test_om_objects.php Added files: include : browse_newest_apps.php Removed files: . : browse_newest_apps.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Implement browsing of newest apps in the object manager infrastructure Patch: http://cvs.winehq.org/patch.py?id=31252 Old revision New revision Changes Path 1.15 1.16 +1 -0 appdb/objectManager.php 1.4 Removed +0 -0 appdb/browse_newest_apps.php 1.33 1.34 +2 -1 appdb/include/sidebar.php Added 1.1 +0 -0 appdb/include/browse_newest_apps.php 1.16 1.17 +7 -0 appdb/unit_test/test_om_objects.php

1 0

lostwages/ include/winehq.conf news/2007071301.xml
by Alexandre Julliard 13 Jul '07

13 Jul '07

ChangeSet ID: 31251 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2007/07/13 12:59:34 Modified files: include : winehq.conf Added files: news : 2007071301.xml Log message: Release 0.9.41 Patch: http://cvs.winehq.org/patch.py?id=31251 Old revision New revision Changes Path 1.63 1.64 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2007071301.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.63 lostwages/include/winehq.conf:1.64 --- lostwages/include/winehq.conf:1.63 13 Jul 2007 17:59:34 -0000 +++ lostwages/include/winehq.conf 13 Jul 2007 17:59:34 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.40 +snapshot_date: 0.9.41 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2007071301.xml diff -u -p /dev/null lostwages/news/2007071301.xml:1.1 --- /dev/null 13 Jul 2007 17:59:34 -0000 +++ lostwages/news/2007071301.xml 13 Jul 2007 17:59:34 -0000 @@ -0,0 +1,25 @@ +<news> +<date>July 13, 2007</date> +<title>Wine 0.9.41 Released</title> +<body> +<p>Wine 0.9.41 was released today, with the following main changes:</p> + +<ul> +<li>A number of gdiplus functions.</li> +<li>More complete pdh.dll implementation.</li> +<li>Support for MSI remote calls.</li> +<li>Messaging support in crypt32.dll.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.41.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.41">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Alexandre Julliard : Release 0.9.41.
by Alexandre Julliard 13 Jul '07

13 Jul '07

Module: wine Branch: master Commit: 96fbd6175dec504515221cee3b819a10338fb771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96fbd6175dec504515221cee3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 13 19:46:16 2007 +0200 Release 0.9.41. --- ANNOUNCE | 872 ++++++++++++++++++------------------ ChangeLog | 1503 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 1945 insertions(+), 450 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96fbd6175dec504515221…

1 0