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

Alexandre Julliard : configure: Add a few more notices for missing packages .
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 7f674966e774f083d7cae6e5bcfaa6a32a62a898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f674966e774f083d7cae6e5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 10 15:22:18 2007 +0200 configure: Add a few more notices for missing packages. --- configure | 20 ++++++++++++++++++++ configure.ac | 8 ++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 270564b..8567e53 100755 --- a/configure +++ b/configure @@ -14442,6 +14442,11 @@ _ACEOF fi fi +if test "x$ac_cv_lib_soname_fontconfig" = "x"; then + wine_notices="$wine_notices|fontconfig development files not found. +Wine will be built without fontconfig support." +fi + if test "$ac_cv_header_openssl_err_h" = "yes" -a "$ac_cv_header_openssl_ssl_h" = "yes" then @@ -14602,6 +14607,11 @@ _ACEOF fi fi +if test "x$ac_cv_lib_soname_ssl" = "x"; then + wine_notices="$wine_notices|OpenSSL development files not found. +Wine will be built without SSL support. (wininet.dll)" +fi + if test "$ac_cv_header_jpeglib_h" = "yes" then @@ -14684,6 +14694,11 @@ _ACEOF fi fi +if test "x$ac_cv_lib_soname_jpeg" = "x"; then + wine_notices="$wine_notices|libjpeg development files not found. +Wine will be built without JPEG support. (oleaut32.dll)" +fi + if test "$ac_cv_header_png_h" = "yes" then @@ -14766,6 +14781,11 @@ _ACEOF fi fi +if test "x$ac_cv_lib_soname_png" = "x"; then + wine_notices="$wine_notices|libpng development files not found. +Wine will be built without PNG support. (oleaut32.dll)" +fi + if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \ "$ac_cv_header_sys_soundcard_h" != "yes" -a \ diff --git a/configure.ac b/configure.ac index a5010c0..227e410 100644 --- a/configure.ac +++ b/configure.ac @@ -1032,6 +1032,8 @@ if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes" then WINE_CHECK_SONAME(fontconfig,FcInit) fi +WINE_NOTICE_IF([test "x$ac_cv_lib_soname_fontconfig" = "x"],[fontconfig development files not found. +Wine will be built without fontconfig support.]) dnl **** Check for SSL **** if test "$ac_cv_header_openssl_err_h" = "yes" -a "$ac_cv_header_openssl_ssl_h" = "yes" @@ -1039,18 +1041,24 @@ then WINE_CHECK_SONAME(ssl,SSL_library_init) WINE_CHECK_SONAME(crypto,BIO_new_socket) fi +WINE_NOTICE_IF([test "x$ac_cv_lib_soname_ssl" = "x"],[OpenSSL development files not found. +Wine will be built without SSL support. (wininet.dll)]) dnl **** Check for libjpeg **** if test "$ac_cv_header_jpeglib_h" = "yes" then WINE_CHECK_SONAME(jpeg,jpeg_start_decompress) fi +WINE_NOTICE_IF([test "x$ac_cv_lib_soname_jpeg" = "x"],[libjpeg development files not found. +Wine will be built without JPEG support. (oleaut32.dll)]) dnl **** Check for libpng **** if test "$ac_cv_header_png_h" = "yes" then WINE_CHECK_SONAME(png,png_create_read_struct,,,,[[libpng[[0-9]]*]]) fi +WINE_NOTICE_IF([test "x$ac_cv_lib_soname_png" = "x"],[libpng development files not found. +Wine will be built without PNG support. (oleaut32.dll)]) dnl **** Check for any sound system **** WINE_WARNING_IF([test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \

1 0

Bernd Buschinski : gdiplus: Fix test typo/compile error.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: ace2749010f7dfac53cc4f33fa9562e3fa3766d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace2749010f7dfac53cc4f33f… Author: Bernd Buschinski <b.buschinski(a)web.de> Date: Tue Jul 10 15:27:20 2007 +0200 gdiplus: Fix test typo/compile error. --- dlls/gdiplus/tests/graphicspath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index f7cfedb..e5fe592 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -21,7 +21,7 @@ #include "windows.h" #include "gdiplus.h" #include "wine/test.h" -#include "math.h" +#include <math.h> #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) #define POINT_TYPE_MAX_LEN (75)

1 0

Evan Stade : gdiplus: Added a test for GdipAddPathLine2.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: da23ed6e0f95893b069f0f0ede16002a0970c31c URL: http://source.winehq.org/git/wine.git/?a=commit;h=da23ed6e0f95893b069f0f0ed… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 9 20:54:47 2007 -0700 gdiplus: Added a test for GdipAddPathLine2. --- dlls/gdiplus/tests/graphicspath.c | 146 +++++++++++++++++++++++++++++++++++++ 1 files changed, 146 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 8dd9adf..f7cfedb 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -21,8 +21,116 @@ #include "windows.h" #include "gdiplus.h" #include "wine/test.h" +#include "math.h" #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define POINT_TYPE_MAX_LEN (75) + +static void stringify_point_type(PathPointType type, char * name) +{ + *name = '\0'; + + switch(type & PathPointTypePathTypeMask){ + case PathPointTypeStart: + strcat(name, "PathPointTypeStart"); + break; + case PathPointTypeLine: + strcat(name, "PathPointTypeLine"); + break; + case PathPointTypeBezier: + strcat(name, "PathPointTypeBezier"); + break; + default: + strcat(name, "Unknown type"); + return; + } + + type &= ~PathPointTypePathTypeMask; + if(type & ~((PathPointTypePathMarker | PathPointTypeCloseSubpath))){ + *name = '\0'; + strcat(name, "Unknown type"); + return; + } + + if(type & PathPointTypePathMarker) + strcat(name, " | PathPointTypePathMarker"); + if(type & PathPointTypeCloseSubpath) + strcat(name, " | PathPointTypeCloseSubpath"); +} + +/* this helper structure and function modeled after gdi path.c test */ +typedef struct +{ + REAL X, Y; + BYTE type; + + /* How many extra entries before this one only on wine + * but not on native? */ + int wine_only_entries_preceding; + + /* 0 - This entry matches on wine. + * 1 - This entry corresponds to a single entry on wine that does not match the native entry. + * 2 - This entry is currently skipped on wine but present on native. */ + int todo; +} path_test_t; + +static void ok_path(GpPath* path, const path_test_t *expected, INT expected_size, BOOL todo_size) +{ + BYTE * types; + INT size, idx = 0, eidx = 0, numskip; + GpPointF * points; + char ename[POINT_TYPE_MAX_LEN], name[POINT_TYPE_MAX_LEN]; + + if(GdipGetPointCount(path, &size) != Ok){ + skip("Cannot perform path comparisons due to failure to retrieve path.\n"); + return; + } + + if(todo_size) todo_wine + ok(size == expected_size, "Path size %d does not match expected size %d\n", + size, expected_size); + else + ok(size == expected_size, "Path size %d does not match expected size %d\n", + size, expected_size); + + points = HeapAlloc(GetProcessHeap(), 0, size * sizeof(GpPointF)); + types = HeapAlloc(GetProcessHeap(), 0, size); + + if(GdipGetPathPoints(path, points, size) != Ok || GdipGetPathTypes(path, types, size) != Ok){ + skip("Cannot perform path comparisons due to failure to retrieve path.\n"); + goto end; + } + + numskip = expected_size ? expected[eidx].wine_only_entries_preceding : 0; + while (idx < size && eidx < expected_size){ + /* We allow a few pixels fudge in matching X and Y coordinates to account for imprecision in + * floating point to integer conversion */ + BOOL match = (types[idx] == expected[eidx].type) && + fabs(points[idx].X - expected[eidx].X) <= 2.0 && + fabs(points[idx].Y - expected[eidx].Y) <= 2.0; + + stringify_point_type(expected[eidx].type, ename); + stringify_point_type(types[idx], name); + + if (expected[eidx].todo || numskip) todo_wine + ok(match, "Expected #%d: %s (%.1f,%.1f) but got %s (%.1f,%.1f)\n", eidx, + ename, expected[eidx].X, expected[eidx].Y, + name, points[idx].X, points[idx].Y); + else + ok(match, "Expected #%d: %s (%.1f,%.1f) but got %s (%.1f,%.1f)\n", eidx, + ename, expected[eidx].X, expected[eidx].Y, + name, points[idx].X, points[idx].Y); + + if (match || expected[eidx].todo != 2) + idx++; + if (match || !numskip--) + numskip = expected[++eidx].wine_only_entries_preceding; + } + +end: + HeapFree(GetProcessHeap(), 0, types); + HeapFree(GetProcessHeap(), 0, points); +} static void test_constructor_destructor(void) { @@ -40,6 +148,43 @@ static void test_constructor_destructor(void) expect(Ok, status); } +static path_test_t line2_path[] = { + {0.0, 50.0, PathPointTypeStart, 0, 0}, /*0*/ + {5.0, 45.0, PathPointTypeLine, 0, 0}, /*1*/ + {0.0, 40.0, PathPointTypeLine, 0, 0}, /*2*/ + {15.0, 35.0, PathPointTypeLine, 0, 0}, /*3*/ + {0.0, 30.0, PathPointTypeLine, 0, 0}, /*4*/ + {25.0, 25.0, PathPointTypeLine | PathPointTypeCloseSubpath, 0, 0}, /*5*/ + {0.0, 20.0, PathPointTypeStart, 0, 0}, /*6*/ + {35.0, 15.0, PathPointTypeLine, 0, 0}, /*7*/ + {0.0, 10.0, PathPointTypeLine, 0, 0} /*8*/ + }; + +static void test_line2(void) +{ + GpStatus status; + GpPath* path; + int i; + GpPointF line2_points[9]; + + for(i = 0; i < 9; i ++){ + line2_points[i].X = i * 5.0 * (REAL)(i % 2); + line2_points[i].Y = 50.0 - i * 5.0; + } + + GdipCreatePath(FillModeAlternate, &path); + status = GdipAddPathLine2(path, line2_points, 3); + expect(Ok, status); + status = GdipAddPathLine2(path, &(line2_points[3]), 3); + expect(Ok, status); + status = GdipClosePathFigure(path); + expect(Ok, status); + status = GdipAddPathLine2(path, &(line2_points[6]), 3); + expect(Ok, status); + + ok_path(path, line2_path, sizeof(line2_path)/sizeof(path_test_t), FALSE); +} + START_TEST(graphicspath) { struct GdiplusStartupInput gdiplusStartupInput; @@ -53,6 +198,7 @@ START_TEST(graphicspath) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_constructor_destructor(); + test_line2(); GdiplusShutdown(gdiplusToken); }

1 0

Juan Lang : crypt32: Implement CryptSIPLoad.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 19c3a09ba8160c3b654f39681f6abdc550ab5d39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c3a09ba8160c3b654f39681… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 9 17:07:54 2007 -0700 crypt32: Implement CryptSIPLoad. --- dlls/crypt32/crypt32_private.h | 1 + dlls/crypt32/main.c | 1 + dlls/crypt32/sip.c | 173 +++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/sip.c | 51 +++++------- 4 files changed, 194 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19c3a09ba8160c3b654f3…

1 0

Juan Lang : crypt32: Implement CryptSIPGetSignedDataMsg, CryptSIPPutSignedDataMsg,
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 1d5a8b2f781e2a4a8894c84d2590a8e198a24cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d5a8b2f781e2a4a8894c84d2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 9 13:44:38 2007 -0700 crypt32: Implement CryptSIPGetSignedDataMsg, CryptSIPPutSignedDataMsg, CryptSIPCreateIndirectData, CryptSIPVerifyIndirectData, and CryptSIPRemoveSignedDataMsg. --- dlls/crypt32/sip.c | 47 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index ed50380..34668e5 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -568,9 +568,14 @@ BOOL WINAPI CryptSIPLoad BOOL WINAPI CryptSIPCreateIndirectData(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pcbIndirectData, SIP_INDIRECT_DATA* pIndirectData) { - FIXME("(%p %p %p) stub\n", pSubjectInfo, pcbIndirectData, pIndirectData); + WINE_SIP_PROVIDER *sip; + BOOL ret = FALSE; - return FALSE; + TRACE("(%p %p %p)\n", pSubjectInfo, pcbIndirectData, pIndirectData); + + if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType))) + ret = sip->info.pfCreate(pSubjectInfo, pcbIndirectData, pIndirectData); + return ret; } /*********************************************************************** @@ -579,10 +584,16 @@ BOOL WINAPI CryptSIPCreateIndirectData(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pcb BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEncodingType, DWORD dwIndex, DWORD* pcbSignedDataMsg, BYTE* pbSignedDataMsg) { - FIXME("(%p %p %d %p %p) stub\n", pSubjectInfo, pdwEncodingType, dwIndex, + WINE_SIP_PROVIDER *sip; + BOOL ret = FALSE; + + TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, pcbSignedDataMsg, pbSignedDataMsg); - return FALSE; + if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType))) + ret = sip->info.pfGet(pSubjectInfo, pdwEncodingType, dwIndex, + pcbSignedDataMsg, pbSignedDataMsg); + return ret; } /*********************************************************************** @@ -591,10 +602,16 @@ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEn BOOL WINAPI CryptSIPPutSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD pdwEncodingType, DWORD* pdwIndex, DWORD cbSignedDataMsg, BYTE* pbSignedDataMsg) { - FIXME("(%p %d %p %d %p) stub\n", pSubjectInfo, pdwEncodingType, pdwIndex, + WINE_SIP_PROVIDER *sip; + BOOL ret = FALSE; + + TRACE("(%p %d %p %d %p)\n", pSubjectInfo, pdwEncodingType, pdwIndex, cbSignedDataMsg, pbSignedDataMsg); - return FALSE; + if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType))) + ret = sip->info.pfPut(pSubjectInfo, pdwEncodingType, pdwIndex, + cbSignedDataMsg, pbSignedDataMsg); + return ret; } /*********************************************************************** @@ -603,9 +620,14 @@ BOOL WINAPI CryptSIPPutSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD pdwEnc BOOL WINAPI CryptSIPRemoveSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD dwIndex) { - FIXME("(%p %d) stub\n", pSubjectInfo, dwIndex); + WINE_SIP_PROVIDER *sip; + BOOL ret = FALSE; - return FALSE; + TRACE("(%p %d)\n", pSubjectInfo, dwIndex); + + if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType))) + ret = sip->info.pfRemove(pSubjectInfo, dwIndex); + return ret; } /*********************************************************************** @@ -614,7 +636,12 @@ BOOL WINAPI CryptSIPRemoveSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, BOOL WINAPI CryptSIPVerifyIndirectData(SIP_SUBJECTINFO* pSubjectInfo, SIP_INDIRECT_DATA* pIndirectData) { - FIXME("(%p %p) stub\n", pSubjectInfo, pIndirectData); + WINE_SIP_PROVIDER *sip; + BOOL ret = FALSE; - return FALSE; + TRACE("(%p %p)\n", pSubjectInfo, pIndirectData); + + if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType))) + ret = sip->info.pfVerify(pSubjectInfo, pIndirectData); + return ret; }

1 0

Juan Lang : crypt32: More decode message update tests.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 685d7e799a84dfa51e79e56594a4bd1107403a0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=685d7e799a84dfa51e79e5659… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 9 11:27:46 2007 -0700 crypt32: More decode message update tests. --- dlls/crypt32/tests/msg.c | 100 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 99 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 3c9fc7e..1e987d2 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -632,12 +632,20 @@ static void test_data_msg(void) test_data_msg_encoding(); } +static CRYPT_DATA_BLOB b4 = { 0, NULL }; +static const struct update_accum a4 = { 1, &b4 }; + +static const BYTE bogusOIDContent[] = { +0x30,0x0f,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x07,0xa0,0x02, +0x04,0x00 }; + static void test_decode_msg_update(void) { HCRYPTMSG msg; BOOL ret; CMSG_STREAM_INFO streamInfo = { 0 }; DWORD i; + struct update_accum accum = { 0, NULL }; msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); /* Update with a full message in a final update */ @@ -686,16 +694,106 @@ static void test_decode_msg_update(void) "Expected STATUS_ACCESS_VIOLATION, got %x\n", GetLastError()); CryptMsgClose(msg); + /* Empty non-final updates are allowed when streaming.. */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); + ret = CryptMsgUpdate(msg, NULL, 0, FALSE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + /* but final updates aren't when not enough data has been received. */ + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_STREAM_INSUFFICIENT_DATA, + "Expected CRYPT_E_STREAM_INSUFFICIENT_DATA, got %x\n", GetLastError()); + CryptMsgClose(msg); + /* Updating the message byte by byte is legal */ + streamInfo.pfnStreamOutput = accumulating_stream_output; + streamInfo.pvArg = &accum; msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); - todo_wine { for (i = 0, ret = TRUE; ret && i < sizeof(dataEmptyContent); i++) ret = CryptMsgUpdate(msg, &dataEmptyContent[i], 1, FALSE); + todo_wine { ok(ret, "CryptMsgUpdate failed on byte %d: %x\n", i, GetLastError()); ret = CryptMsgUpdate(msg, NULL, 0, TRUE); ok(ret, "CryptMsgUpdate failed on byte %d: %x\n", i, GetLastError()); } CryptMsgClose(msg); + todo_wine + check_updates("byte-by-byte empty content", &a4, &accum); + free_updates(&accum); + + /* Decoding bogus content fails in non-streaming mode.. */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %x\n", GetLastError()); + CryptMsgClose(msg); + /* and as the final update in streaming mode.. */ + streamInfo.pfnStreamOutput = nop_stream_output; + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %x\n", GetLastError()); + CryptMsgClose(msg); + /* and even as a non-final update in streaming mode. */ + streamInfo.pfnStreamOutput = nop_stream_output; + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %x\n", GetLastError()); + CryptMsgClose(msg); + + /* An empty message can be opened with indetermined type.. */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), + TRUE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + /* but decoding it as an explicitly typed message fails. */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, 0, NULL, + NULL); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), + TRUE); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %x\n", GetLastError()); + CryptMsgClose(msg); + /* On the other hand, decoding the bare content of an empty message fails + * with unspecified type.. + */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, dataEmptyBareContent, + sizeof(dataEmptyBareContent), TRUE); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %x\n", GetLastError()); + CryptMsgClose(msg); + /* but succeeds with explicit type. */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, 0, NULL, + NULL); + ret = CryptMsgUpdate(msg, dataEmptyBareContent, + sizeof(dataEmptyBareContent), TRUE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + CryptMsgClose(msg); + + /* Decoding valid content with an unsupported OID fails */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, bogusOIDContent, sizeof(bogusOIDContent), TRUE); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); + CryptMsgClose(msg); } static void test_decode_msg(void)

1 0

Evan Stade : gdiplus: Updated draw_pie to use SaveDC/RestoreDC.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: a4fff71454ac04b7b3aa4f4a8f1dbf41505b1617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4fff71454ac04b7b3aa4f4a8… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 9 20:54:11 2007 -0700 gdiplus: Updated draw_pie to use SaveDC/RestoreDC. --- dlls/gdiplus/graphics.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5f730ab..1040009 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -60,14 +60,16 @@ static void deg2xy(REAL angle, REAL x_0, REAL y_0, REAL *x, REAL *y) static GpStatus draw_pie(GpGraphics *graphics, HBRUSH gdibrush, HPEN gdipen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) { - HGDIOBJ old_pen, old_brush; + INT save_state; REAL x_0, y_0, x_1, y_1, x_2, y_2; if(!graphics) return InvalidParameter; - old_pen = SelectObject(graphics->hdc, gdipen); - old_brush = SelectObject(graphics->hdc, gdibrush); + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); + SelectObject(graphics->hdc, gdipen); + SelectObject(graphics->hdc, gdibrush); x_0 = x + (width/2.0); y_0 = y + (height/2.0); @@ -78,8 +80,7 @@ static GpStatus draw_pie(GpGraphics *graphics, HBRUSH gdibrush, HPEN gdipen, Pie(graphics->hdc, roundr(x), roundr(y), roundr(x+width), roundr(y+height), roundr(x_1), roundr(y_1), roundr(x_2), roundr(y_2)); - SelectObject(graphics->hdc, old_pen); - SelectObject(graphics->hdc, old_brush); + RestoreDC(graphics->hdc, save_state); return Ok; }

1 0

Evan Stade : gdiplus: Updated GdipDrawRectangleI.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 14e0df1fa0c0225d8de4d997b64aaec74963dd9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e0df1fa0c0225d8de4d997b… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 9 20:54:18 2007 -0700 gdiplus: Updated GdipDrawRectangleI. --- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/graphics.c | 26 +++++++------------------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 7c5195a..d036057 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -22,7 +22,7 @@ #include "windef.h" #include "gdiplus.h" -#define GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_ENDCAP_FLAT) +#define GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_ENDCAP_FLAT | PS_JOIN_MITER) COLORREF ARGB2COLORREF(ARGB color); diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1040009..06a5dad 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -590,31 +590,19 @@ GpStatus WINGDIPAPI GdipDrawPie(GpGraphics *graphics, GpPen *pen, REAL x, GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x, INT y, INT width, INT height) { - LOGBRUSH lb; - HPEN hpen; - HGDIOBJ old_obj; + INT save_state; if(!pen || !graphics) return InvalidParameter; - lb.lbStyle = BS_SOLID; - lb.lbColor = pen->color; - lb.lbHatch = 0; - - hpen = ExtCreatePen(PS_GEOMETRIC | PS_ENDCAP_SQUARE, (INT) pen->width, - &lb, 0, NULL); - - old_obj = SelectObject(graphics->hdc, hpen); + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); + SelectObject(graphics->hdc, pen->gdipen); + SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); - /* assume pen aligment centered */ - MoveToEx(graphics->hdc, x, y, NULL); - LineTo(graphics->hdc, x+width, y); - LineTo(graphics->hdc, x+width, y+height); - LineTo(graphics->hdc, x, y+height); - LineTo(graphics->hdc, x, y); + Rectangle(graphics->hdc, x, y, x + width, y + height); - SelectObject(graphics->hdc, old_obj); - DeleteObject(hpen); + RestoreDC(graphics->hdc, save_state); return Ok; }

1 0

Evan Stade : gdiplus: GdipDrawCurve2 now uses SaveDC()/RestoreDC() and end caps.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: b72dc0df9d534322b74efa493d6e73793cc20f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72dc0df9d534322b74efa493… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 9 20:54:23 2007 -0700 gdiplus: GdipDrawCurve2 now uses SaveDC()/RestoreDC() and end caps. --- dlls/gdiplus/graphics.c | 44 +++++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 06a5dad..b640621 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -483,50 +483,52 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count, REAL tension) { - HGDIOBJ old_pen; - /* PolyBezier expects count*3-2 points. */ - int i, len_pt = count*3-2; - POINT pt[len_pt]; + INT i, len_pt = count*3-2, save_state; + GpPointF *pt; REAL x1, x2, y1, y2; if(!graphics || !pen) return InvalidParameter; + pt = GdipAlloc(len_pt * sizeof(GpPointF)); tension = tension * TENSION_CONST; calc_curve_bezier_endp(points[0].X, points[0].Y, points[1].X, points[1].Y, tension, &x1, &y1); - pt[0].x = roundr(points[0].X); - pt[0].y = roundr(points[0].Y); - pt[1].x = roundr(x1); - pt[1].y = roundr(y1); + pt[0].X = points[0].X; + pt[0].Y = points[0].Y; + pt[1].X = x1; + pt[1].Y = y1; for(i = 0; i < count-2; i++){ calc_curve_bezier(&(points[i]), tension, &x1, &y1, &x2, &y2); - pt[3*i+2].x = roundr(x1); - pt[3*i+2].y = roundr(y1); - pt[3*i+3].x = roundr(points[i+1].X); - pt[3*i+3].y = roundr(points[i+1].Y); - pt[3*i+4].x = roundr(x2); - pt[3*i+4].y = roundr(y2); + pt[3*i+2].X = x1; + pt[3*i+2].Y = y1; + pt[3*i+3].X = points[i+1].X; + pt[3*i+3].Y = points[i+1].Y; + pt[3*i+4].X = x2; + pt[3*i+4].Y = y2; } calc_curve_bezier_endp(points[count-1].X, points[count-1].Y, points[count-2].X, points[count-2].Y, tension, &x1, &y1); - pt[len_pt-2].x = x1; - pt[len_pt-2].y = y1; - pt[len_pt-1].x = roundr(points[count-1].X); - pt[len_pt-1].y = roundr(points[count-1].Y); + pt[len_pt-2].X = x1; + pt[len_pt-2].Y = y1; + pt[len_pt-1].X = points[count-1].X; + pt[len_pt-1].Y = points[count-1].Y; - old_pen = SelectObject(graphics->hdc, pen->gdipen); + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); + SelectObject(graphics->hdc, pen->gdipen); - PolyBezier(graphics->hdc, pt, len_pt); + draw_polybezier(graphics->hdc, pen, pt, len_pt, TRUE); - SelectObject(graphics->hdc, old_pen); + GdipFree(pt); + RestoreDC(graphics->hdc, save_state); return Ok; }

1 0

Evan Stade : gdiplus: Fixed a bug in helper function draw_polybezier.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 14c7466c9f2d726741e9e9f9cf6a8befc527a147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14c7466c9f2d726741e9e9f9c… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 9 20:54:27 2007 -0700 gdiplus: Fixed a bug in helper function draw_polybezier. --- dlls/gdiplus/graphics.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b640621..3a88295 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -376,8 +376,8 @@ static void draw_polybezier(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, pti[i].y = roundr(pt[i].Y); } for(i = 0; i < 4; i ++){ - pti[i].x = roundr(ptf[i].X); - pti[i].y = roundr(ptf[i].Y); + pti[i + count - 4].x = roundr(ptf[i].X); + pti[i + count - 4].y = roundr(ptf[i].Y); } PolyBezier(hdc, pti, count);

1 0