November 2008 - Wine-commits

Juan Lang : crypt32: Implement CryptFormatObject for szOID_AUTHORITY_KEY_IDENTIFIER2.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: 426d13e5be437a489bbbc6e7271bbc68f78572e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=426d13e5be437a489bbbc6e72… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 6 13:48:14 2008 -0800 crypt32: Implement CryptFormatObject for szOID_AUTHORITY_KEY_IDENTIFIER2. --- dlls/crypt32/crypt32_En.rc | 15 ++ dlls/crypt32/cryptres.h | 12 ++ dlls/crypt32/object.c | 447 +++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/main.c | 2 - 4 files changed, 467 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=426d13e5be437a489bbbc…

1 0

Juan Lang : crypt32: Implement CryptFormatObject for szOID_BASIC_CONSTRAINTS2.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: c6ec755469a0c67307d590cb74e8e4985b0af439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ec755469a0c67307d590cb7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 6 13:48:54 2008 -0800 crypt32: Implement CryptFormatObject for szOID_BASIC_CONSTRAINTS2. --- dlls/crypt32/crypt32_En.rc | 5 ++ dlls/crypt32/cryptres.h | 5 ++ dlls/crypt32/object.c | 108 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 114 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/crypt32_En.rc b/dlls/crypt32/crypt32_En.rc index 7b0c38e..7a433be 100644 --- a/dlls/crypt32/crypt32_En.rc +++ b/dlls/crypt32/crypt32_En.rc @@ -187,4 +187,9 @@ STRINGTABLE DISCARDABLE IDS_ALT_NAME_MASK "Mask=" IDS_ALT_NAME_REGISTERED_ID "Registered ID=" IDS_USAGE_UNKNOWN "Unknown Key Usage" + IDS_SUBJECT_TYPE "Subject Type=" + IDS_SUBJECT_TYPE_CA "CA" + IDS_SUBJECT_TYPE_END_CERT "End Entity" + IDS_PATH_LENGTH "Path Length Constraint=" + IDS_PATH_LENGTH_NONE "None" } diff --git a/dlls/crypt32/cryptres.h b/dlls/crypt32/cryptres.h index 975e88c..ac7c65c 100644 --- a/dlls/crypt32/cryptres.h +++ b/dlls/crypt32/cryptres.h @@ -177,5 +177,10 @@ #define IDS_ALT_NAME_MASK 1209 #define IDS_ALT_NAME_REGISTERED_ID 1210 #define IDS_USAGE_UNKNOWN 1211 +#define IDS_SUBJECT_TYPE 1212 +#define IDS_SUBJECT_TYPE_CA 1213 +#define IDS_SUBJECT_TYPE_END_CERT 1214 +#define IDS_PATH_LENGTH 1215 +#define IDS_PATH_LENGTH_NONE 1216 #endif /* ndef __WINE_CRYPTRES_H__ */ diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index cdbe8db..783dbce 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -603,6 +603,105 @@ static BOOL WINAPI CRYPT_FormatHexString(DWORD dwCertEncodingType, #define MAX_STRING_RESOURCE_LEN 128 +static const WCHAR crlf[] = { '\r','\n',0 }; +static const WCHAR commaSpace[] = { ',',' ',0 }; + +static WCHAR subjectTypeHeader[MAX_STRING_RESOURCE_LEN]; +static WCHAR subjectTypeCA[MAX_STRING_RESOURCE_LEN]; +static WCHAR subjectTypeEndCert[MAX_STRING_RESOURCE_LEN]; +static WCHAR pathLengthHeader[MAX_STRING_RESOURCE_LEN]; + +static BOOL WINAPI CRYPT_FormatBasicConstraints2(DWORD dwCertEncodingType, + DWORD dwFormatType, DWORD dwFormatStrType, void *pFormatStruct, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, void *pbFormat, + DWORD *pcbFormat) +{ + DWORD size; + CERT_BASIC_CONSTRAINTS2_INFO *info; + BOOL ret; + + if (!cbEncoded) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if ((ret = CryptDecodeObjectEx(dwCertEncodingType, X509_BASIC_CONSTRAINTS2, + pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size))) + { + static const WCHAR pathFmt[] = { '%','d',0 }; + static BOOL stringsLoaded = FALSE; + DWORD bytesNeeded = sizeof(WCHAR); /* space for the NULL terminator */ + WCHAR pathLength[MAX_STRING_RESOURCE_LEN]; + LPCWSTR sep, subjectType; + DWORD sepLen; + + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + sep = crlf; + sepLen = strlenW(crlf) * sizeof(WCHAR); + } + else + { + sep = commaSpace; + sepLen = strlenW(commaSpace) * sizeof(WCHAR); + } + + if (!stringsLoaded) + { + LoadStringW(hInstance, IDS_SUBJECT_TYPE, subjectTypeHeader, + sizeof(subjectTypeHeader) / sizeof(subjectTypeHeader[0])); + LoadStringW(hInstance, IDS_SUBJECT_TYPE_CA, subjectTypeCA, + sizeof(subjectTypeCA) / sizeof(subjectTypeCA[0])); + LoadStringW(hInstance, IDS_SUBJECT_TYPE_END_CERT, + subjectTypeEndCert, + sizeof(subjectTypeEndCert) / sizeof(subjectTypeEndCert[0])); + LoadStringW(hInstance, IDS_PATH_LENGTH, pathLengthHeader, + sizeof(pathLengthHeader) / sizeof(pathLengthHeader[0])); + stringsLoaded = TRUE; + } + bytesNeeded += strlenW(subjectTypeHeader) * sizeof(WCHAR); + if (info->fCA) + subjectType = subjectTypeCA; + else + subjectType = subjectTypeEndCert; + bytesNeeded += strlenW(subjectType) * sizeof(WCHAR); + bytesNeeded += sepLen; + bytesNeeded += strlenW(pathLengthHeader) * sizeof(WCHAR); + if (info->fPathLenConstraint) + sprintfW(pathLength, pathFmt, info->dwPathLenConstraint); + else + LoadStringW(hInstance, IDS_PATH_LENGTH_NONE, pathLength, + sizeof(pathLength) / sizeof(pathLength[0])); + bytesNeeded += strlenW(pathLength) * sizeof(WCHAR); + if (!pbFormat) + *pcbFormat = bytesNeeded; + else if (*pcbFormat < bytesNeeded) + { + *pcbFormat = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + LPWSTR str = pbFormat; + + *pcbFormat = bytesNeeded; + strcpyW(str, subjectTypeHeader); + str += strlenW(subjectTypeHeader); + strcpyW(str, subjectType); + str += strlenW(subjectType); + strcpyW(str, sep); + str += sepLen / sizeof(WCHAR); + strcpyW(str, pathLengthHeader); + str += strlenW(pathLengthHeader); + strcpyW(str, pathLength); + str += strlenW(pathLength); + } + LocalFree(info); + } + return ret; +} + static BOOL CRYPT_FormatHexStringWithPrefix(CRYPT_DATA_BLOB *blob, int id, LPWSTR str, DWORD *pcbStr) { @@ -650,8 +749,6 @@ static BOOL CRYPT_FormatCertSerialNumber(CRYPT_DATA_BLOB *serialNum, LPWSTR str, str, pcbStr); } -static const WCHAR crlf[] = { '\r','\n',0 }; - static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, CERT_ALT_NAME_ENTRY *entry, LPWSTR str, DWORD *pcbStr) { @@ -783,8 +880,6 @@ static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, return ret; } -static const WCHAR commaSpace[] = { ',',' ',0 }; - static BOOL CRYPT_FormatAltNameInfo(DWORD dwFormatStrType, CERT_ALT_NAME_INFO *name, LPWSTR str, DWORD *pcbStr) { @@ -1120,6 +1215,9 @@ static CryptFormatObjectFunc CRYPT_GetBuiltinFormatFunction(DWORD encodingType, { switch (LOWORD(lpszStructType)) { + case LOWORD(X509_BASIC_CONSTRAINTS2): + format = CRYPT_FormatBasicConstraints2; + break; case LOWORD(X509_AUTHORITY_KEY_ID2): format = CRYPT_FormatAuthorityKeyId2; break; @@ -1128,6 +1226,8 @@ static CryptFormatObjectFunc CRYPT_GetBuiltinFormatFunction(DWORD encodingType, break; } } + else if (!strcmp(lpszStructType, szOID_BASIC_CONSTRAINTS2)) + format = CRYPT_FormatBasicConstraints2; else if (!strcmp(lpszStructType, szOID_AUTHORITY_KEY_IDENTIFIER2)) format = CRYPT_FormatAuthorityKeyId2; else if (!strcmp(lpszStructType, szOID_ENHANCED_KEY_USAGE))

1 0

Juan Lang : crypt32: Implement CryptFormatObject for szOID_AUTHORITY_INFO_ACCESS.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: c11aa873c591c36ce23b34dc62531b3f836a7eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11aa873c591c36ce23b34dc6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 6 14:01:48 2008 -0800 crypt32: Implement CryptFormatObject for szOID_AUTHORITY_INFO_ACCESS. --- dlls/crypt32/crypt32_En.rc | 7 ++ dlls/crypt32/cryptres.h | 7 ++ dlls/crypt32/object.c | 257 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 268 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c11aa873c591c36ce23b3…

1 0

Nicolas Le Cam : user32: Partially implement SystemParametersInfo(SPI_{GET/ SET}FOREGROUNDLOCKTIMEOUT).
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: 2de85407511254935940ee03133127345e372ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de85407511254935940ee031… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu Nov 6 15:03:43 2008 +0100 user32: Partially implement SystemParametersInfo(SPI_{GET/SET}FOREGROUNDLOCKTIMEOUT). --- dlls/user32/sysparams.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index fc5785a..5662db3 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -83,6 +83,7 @@ enum spi_index SPI_USERPREFERENCEMASK_IDX, SPI_NONCLIENTMETRICS_IDX, SPI_MINIMIZEDMETRICS_IDX, + SPI_SETFOREGROUNDLOCKTIMEOUT_IDX, SPI_CARETWIDTH_IDX, SPI_INDEX_COUNT }; @@ -216,6 +217,8 @@ static const WCHAR SPI_SETMOUSESCROLLLINES_REGKEY[]= {'C','o','n','t',' static const WCHAR SPI_SETMOUSESCROLLLINES_VALNAME[]= {'W','h','e','e','l','S','c','r','o','l','l','L','i','n','e','s',0}; static const WCHAR SPI_SETMENUSHOWDELAY_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; static const WCHAR SPI_SETMENUSHOWDELAY_VALNAME[]= {'M','e','n','u','S','h','o','w','D','e','l','a','y',0}; +static const WCHAR SPI_SETFOREGROUNDLOCKTIMEOUT_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; +static const WCHAR SPI_SETFOREGROUNDLOCKTIMEOUT_VALNAME[]= {'F','o','r','e','g','r','o','u','n','d','L','o','c','k','T','i','m','e','o','u','t',0}; static const WCHAR SPI_CARETWIDTH_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; static const WCHAR SPI_CARETWIDTH_VALNAME[]= {'C','a','r','e','t','W','i','d','t','h',0}; @@ -307,6 +310,7 @@ static BOOL poweroffactive = FALSE; static BOOL show_sounds = FALSE; static BOOL snap_to_default_button = FALSE; static BOOL swap_buttons = FALSE; +static UINT foreground_lock_timeout = 0; static UINT caret_width = 1; static BYTE user_prefs[4]; @@ -2307,8 +2311,22 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, ret = set_user_pref_param( 3, 0x80, PtrToUlong(pvParam), fWinIni ); break; - WINE_SPI_FIXME(SPI_GETFOREGROUNDLOCKTIMEOUT);/* 0x2000 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETFOREGROUNDLOCKTIMEOUT);/* 0x2001 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_GETFOREGROUNDLOCKTIMEOUT: /* 0x2000 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = get_uint_param( SPI_SETFOREGROUNDLOCKTIMEOUT_IDX, + SPI_SETFOREGROUNDLOCKTIMEOUT_REGKEY, + SPI_SETFOREGROUNDLOCKTIMEOUT_VALNAME, + &foreground_lock_timeout, pvParam ); + break; + + case SPI_SETFOREGROUNDLOCKTIMEOUT: /* 0x2001 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + /* FIXME: this should check that the calling thread + * is able to change the foreground window */ + ret = set_uint_param( SPI_SETFOREGROUNDLOCKTIMEOUT_IDX, + SPI_SETFOREGROUNDLOCKTIMEOUT_REGKEY, + SPI_SETFOREGROUNDLOCKTIMEOUT_VALNAME, + &foreground_lock_timeout, PtrToUlong(pvParam), fWinIni ); + break; + WINE_SPI_FIXME(SPI_GETACTIVEWNDTRKTIMEOUT); /* 0x2002 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETACTIVEWNDTRKTIMEOUT); /* 0x2003 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_GETFOREGROUNDFLASHCOUNT);/* 0x2004 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */

1 0

Nikolay Sivov : gdiplus: Added TRACE(..) for Pen calls.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: fa1e0313ee12570469f40369d0f8b0ff86e44ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa1e0313ee12570469f40369d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Nov 6 20:44:10 2008 +0300 gdiplus: Added TRACE(..) for Pen calls. --- dlls/gdiplus/pen.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 104d9de..ea41a3a 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -69,6 +69,8 @@ static DWORD gdip_to_gdi_join(GpLineJoin join) GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen) { + TRACE("(%p, %p)\n", pen, clonepen); + if(!pen || !clonepen) return InvalidParameter; @@ -90,6 +92,8 @@ GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, REAL width, GpUnit unit, GpBrush *brush; GpStatus status; + TRACE("(%x, %.2f, %d, %p)\n", color, width, unit, pen); + GdipCreateSolidFill(color, (GpSolidFill **)(&brush)); status = GdipCreatePen2(brush, width, unit, pen); GdipDeleteBrush(brush); @@ -102,6 +106,8 @@ GpStatus WINGDIPAPI GdipCreatePen2(GpBrush *brush, REAL width, GpUnit unit, GpPen *gp_pen; GpBrush *clone_brush; + TRACE("(%p, %.2f, %d, %p)", brush, width, unit, pen); + if(!pen || !brush) return InvalidParameter; @@ -135,6 +141,8 @@ GpStatus WINGDIPAPI GdipCreatePen2(GpBrush *brush, REAL width, GpUnit unit, GpStatus WINGDIPAPI GdipDeletePen(GpPen *pen) { + TRACE("(%p)\n", pen); + if(!pen) return InvalidParameter; GdipDeleteBrush(pen->brush); @@ -148,6 +156,8 @@ GpStatus WINGDIPAPI GdipDeletePen(GpPen *pen) GpStatus WINGDIPAPI GdipGetPenBrushFill(GpPen *pen, GpBrush **brush) { + TRACE("(%p, %p)\n", pen, brush); + if(!pen || !brush) return InvalidParameter; @@ -156,6 +166,8 @@ GpStatus WINGDIPAPI GdipGetPenBrushFill(GpPen *pen, GpBrush **brush) GpStatus WINGDIPAPI GdipGetPenColor(GpPen *pen, ARGB *argb) { + TRACE("(%p, %p)\n", pen, argb); + if(!pen || !argb) return InvalidParameter; @@ -167,6 +179,8 @@ GpStatus WINGDIPAPI GdipGetPenColor(GpPen *pen, ARGB *argb) GpStatus WINGDIPAPI GdipGetPenCustomEndCap(GpPen *pen, GpCustomLineCap** customCap) { + TRACE("(%p, %p)\n", pen, customCap); + if(!pen || !customCap) return InvalidParameter; @@ -180,6 +194,8 @@ GpStatus WINGDIPAPI GdipGetPenCustomEndCap(GpPen *pen, GpCustomLineCap** customC GpStatus WINGDIPAPI GdipGetPenCustomStartCap(GpPen *pen, GpCustomLineCap** customCap) { + TRACE("(%p, %p)\n", pen, customCap); + if(!pen || !customCap) return InvalidParameter; @@ -193,6 +209,8 @@ GpStatus WINGDIPAPI GdipGetPenCustomStartCap(GpPen *pen, GpCustomLineCap** custo GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen *pen, REAL *dash, INT count) { + TRACE("(%p, %p, %d)\n", pen, dash, count); + if(!pen || !dash || count > pen->numdashes) return InvalidParameter; @@ -207,6 +225,8 @@ GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen *pen, REAL *dash, INT count) GpStatus WINGDIPAPI GdipGetPenDashCap197819(GpPen *pen, GpDashCap *dashCap) { + TRACE("(%p, %p)\n", pen, dashCap); + if(!pen || !dashCap) return InvalidParameter; @@ -217,6 +237,8 @@ GpStatus WINGDIPAPI GdipGetPenDashCap197819(GpPen *pen, GpDashCap *dashCap) GpStatus WINGDIPAPI GdipGetPenDashCount(GpPen *pen, INT *count) { + TRACE("(%p, %p)\n", pen, count); + if(!pen || !count) return InvalidParameter; @@ -227,6 +249,8 @@ GpStatus WINGDIPAPI GdipGetPenDashCount(GpPen *pen, INT *count) GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen *pen, REAL *offset) { + TRACE("(%p, %p)\n", pen, offset); + if(!pen || !offset) return InvalidParameter; @@ -237,6 +261,8 @@ GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen *pen, REAL *offset) GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen *pen, GpDashStyle *dash) { + TRACE("(%p, %p)\n", pen, dash); + if(!pen || !dash) return InvalidParameter; @@ -247,6 +273,8 @@ GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen *pen, GpDashStyle *dash) GpStatus WINGDIPAPI GdipGetPenEndCap(GpPen *pen, GpLineCap *endCap) { + TRACE("(%p, %p)\n", pen, endCap); + if(!pen || !endCap) return InvalidParameter; @@ -257,6 +285,8 @@ GpStatus WINGDIPAPI GdipGetPenEndCap(GpPen *pen, GpLineCap *endCap) GpStatus WINGDIPAPI GdipGetPenLineJoin(GpPen *pen, GpLineJoin *lineJoin) { + TRACE("(%p, %p)\n", pen, lineJoin); + if(!pen || !lineJoin) return InvalidParameter; @@ -267,6 +297,8 @@ GpStatus WINGDIPAPI GdipGetPenLineJoin(GpPen *pen, GpLineJoin *lineJoin) GpStatus WINGDIPAPI GdipGetPenMode(GpPen *pen, GpPenAlignment *mode) { + TRACE("(%p, %p)\n", pen, mode); + if(!pen || !mode) return InvalidParameter; @@ -277,6 +309,8 @@ GpStatus WINGDIPAPI GdipGetPenMode(GpPen *pen, GpPenAlignment *mode) GpStatus WINGDIPAPI GdipGetPenMiterLimit(GpPen *pen, REAL *miterLimit) { + TRACE("(%p, %p)\n", pen, miterLimit); + if(!pen || !miterLimit) return InvalidParameter; @@ -287,6 +321,8 @@ GpStatus WINGDIPAPI GdipGetPenMiterLimit(GpPen *pen, REAL *miterLimit) GpStatus WINGDIPAPI GdipGetPenStartCap(GpPen *pen, GpLineCap *startCap) { + TRACE("(%p, %p)\n", pen, startCap); + if(!pen || !startCap) return InvalidParameter; @@ -297,6 +333,8 @@ GpStatus WINGDIPAPI GdipGetPenStartCap(GpPen *pen, GpLineCap *startCap) GpStatus WINGDIPAPI GdipGetPenUnit(GpPen *pen, GpUnit *unit) { + TRACE("(%p, %p)\n", pen, unit); + if(!pen || !unit) return InvalidParameter; @@ -307,6 +345,8 @@ GpStatus WINGDIPAPI GdipGetPenUnit(GpPen *pen, GpUnit *unit) GpStatus WINGDIPAPI GdipGetPenWidth(GpPen *pen, REAL *width) { + TRACE("(%p, %p)\n", pen, width); + if(!pen || !width) return InvalidParameter; @@ -317,6 +357,8 @@ GpStatus WINGDIPAPI GdipGetPenWidth(GpPen *pen, REAL *width) GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush) { + TRACE("(%p, %p)\n", pen, brush); + if(!pen || !brush) return InvalidParameter; @@ -326,6 +368,8 @@ GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush) GpStatus WINGDIPAPI GdipSetPenColor(GpPen *pen, ARGB argb) { + TRACE("(%p, %x)\n", pen, argb); + if(!pen) return InvalidParameter; @@ -340,6 +384,8 @@ GpStatus WINGDIPAPI GdipSetPenCustomEndCap(GpPen *pen, GpCustomLineCap* customCa GpCustomLineCap * cap; GpStatus ret; + TRACE("(%p, %p)\n", pen, customCap); + /* native crashes on pen == NULL, customCap != NULL */ if(!customCap) return InvalidParameter; @@ -357,6 +403,8 @@ GpStatus WINGDIPAPI GdipSetPenCustomStartCap(GpPen *pen, GpCustomLineCap* custom GpCustomLineCap * cap; GpStatus ret; + TRACE("(%p, %p)\n", pen, customCap); + /* native crashes on pen == NULL, customCap != NULL */ if(!customCap) return InvalidParameter; @@ -375,6 +423,8 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash, INT i; REAL sum = 0; + TRACE("(%p, %p, %d)\n", pen, dash, count); + if(!pen || !dash) return InvalidParameter; @@ -409,6 +459,8 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash, GpStatus WINGDIPAPI GdipSetPenDashCap197819(GpPen *pen, GpDashCap dashCap) { + TRACE("(%p, %d)\n", pen, dashCap); + if(!pen) return InvalidParameter; @@ -420,6 +472,8 @@ GpStatus WINGDIPAPI GdipSetPenDashCap197819(GpPen *pen, GpDashCap dashCap) /* FIXME: dash offset not used */ GpStatus WINGDIPAPI GdipSetPenDashOffset(GpPen *pen, REAL offset) { + TRACE("(%p, %.2f)\n", pen, offset); + if(!pen) return InvalidParameter; @@ -430,6 +484,8 @@ GpStatus WINGDIPAPI GdipSetPenDashOffset(GpPen *pen, REAL offset) GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen *pen, GpDashStyle dash) { + TRACE("(%p, %d)\n", pen, dash); + if(!pen) return InvalidParameter; @@ -449,6 +505,8 @@ GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen *pen, GpDashStyle dash) GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen *pen, GpLineCap cap) { + TRACE("(%p, %d)\n", pen, cap); + if(!pen) return InvalidParameter; /* The old custom cap gets deleted even if the new style is LineCapCustom. */ @@ -463,6 +521,8 @@ GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen *pen, GpLineCap cap) GpStatus WINGDIPAPI GdipSetPenLineCap197819(GpPen *pen, GpLineCap start, GpLineCap end, GpDashCap dash) { + TRACE("%p, %d, %d, %d)\n", pen, start, end, dash); + if(!pen) return InvalidParameter; @@ -482,6 +542,8 @@ GpStatus WINGDIPAPI GdipSetPenLineCap197819(GpPen *pen, GpLineCap start, * Both kinds of miter joins clip if the angle is less than 11 degrees. */ GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen *pen, GpLineJoin join) { + TRACE("(%p, %d)\n", pen, join); + if(!pen) return InvalidParameter; pen->join = join; @@ -493,6 +555,8 @@ GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen *pen, GpLineJoin join) GpStatus WINGDIPAPI GdipSetPenMiterLimit(GpPen *pen, REAL limit) { + TRACE("(%p, %.2f)\n", pen, limit); + if(!pen) return InvalidParameter; @@ -503,6 +567,8 @@ GpStatus WINGDIPAPI GdipSetPenMiterLimit(GpPen *pen, REAL limit) GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen *pen, GpLineCap cap) { + TRACE("(%p, %d)\n", pen, cap); + if(!pen) return InvalidParameter; GdipDeleteCustomLineCap(pen->customstart); @@ -514,6 +580,8 @@ GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen *pen, GpLineCap cap) GpStatus WINGDIPAPI GdipSetPenWidth(GpPen *pen, REAL width) { + TRACE("(%p, %.2f)\n", pen, width); + if(!pen) return InvalidParameter; pen->width = width; @@ -523,6 +591,8 @@ GpStatus WINGDIPAPI GdipSetPenWidth(GpPen *pen, REAL width) GpStatus WINGDIPAPI GdipSetPenMode(GpPen *pen, GpPenAlignment mode) { + TRACE("(%p, %d)\n", pen, mode); + if(!pen) return InvalidParameter; pen->align = mode;

1 0

Andrew Talbot : rpcrt4: Sign-compare warnings fix.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: 99ae980c0df05ed8d640d7295a76c2c1fd6f9a57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99ae980c0df05ed8d640d7295… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 6 21:17:53 2008 +0000 rpcrt4: Sign-compare warnings fix. --- dlls/rpcrt4/cpsf.c | 4 ++-- dlls/rpcrt4/ndr_fullpointer.c | 6 +++--- dlls/rpcrt4/rpc_transport.c | 9 +++++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index 9449695..22537fd 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -147,7 +147,7 @@ HRESULT WINAPI NdrDllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv, *ppv = NULL; if (!pPSFactoryBuffer->lpVtbl) { const ProxyFileInfo **pProxyFileList2; - int max_delegating_vtbl_size = 0; + DWORD max_delegating_vtbl_size = 0; pPSFactoryBuffer->lpVtbl = &CStdPSFactory_Vtbl; pPSFactoryBuffer->RefCount = 0; pPSFactoryBuffer->pProxyFileList = pProxyFileList; @@ -158,7 +158,7 @@ HRESULT WINAPI NdrDllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv, * async interfaces */ void * const *pSrcRpcStubVtbl = (void * const *)&CStdStubBuffer_Vtbl; void **pRpcStubVtbl = (void **)&(*pProxyFileList2)->pStubVtblList[i]->Vtbl; - int j; + unsigned int j; if ((*pProxyFileList2)->pDelegatedIIDs && (*pProxyFileList2)->pDelegatedIIDs[i]) { pSrcRpcStubVtbl = (void * const *)&CStdStubBuffer_Delegating_Vtbl; diff --git a/dlls/rpcrt4/ndr_fullpointer.c b/dlls/rpcrt4/ndr_fullpointer.c index 307e545..b686683 100644 --- a/dlls/rpcrt4/ndr_fullpointer.c +++ b/dlls/rpcrt4/ndr_fullpointer.c @@ -111,7 +111,7 @@ int WINAPI NdrFullPointerQueryPointer(PFULL_PTR_XLAT_TABLES pXlatTables, ULONG *pRefId ) { ULONG Hash = 0; - int i; + unsigned int i; PFULL_PTR_TO_REFID_ELEMENT XlatTableEntry; TRACE("(%p, %p, %d, %p)\n", pXlatTables, pPointer, QueryType, pRefId); @@ -186,7 +186,7 @@ void WINAPI NdrFullPointerInsertRefId(PFULL_PTR_XLAT_TABLES pXlatTables, ULONG RefId, void *pPointer) { ULONG Hash = 0; - int i; + unsigned int i; PFULL_PTR_TO_REFID_ELEMENT XlatTableEntry; TRACE("(%p, 0x%x, %p)\n", pXlatTables, RefId, pPointer); @@ -211,7 +211,7 @@ void WINAPI NdrFullPointerInsertRefId(PFULL_PTR_XLAT_TABLES pXlatTables, int WINAPI NdrFullPointerFree(PFULL_PTR_XLAT_TABLES pXlatTables, void *Pointer) { ULONG Hash = 0; - int i; + unsigned int i; PFULL_PTR_TO_REFID_ELEMENT XlatTableEntry; ULONG RefId = 0; diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 13181b7..3d66740 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1326,7 +1326,8 @@ static void rpcrt4_protseq_sock_free_wait_array(RpcServerProtseq *protseq, void static int rpcrt4_protseq_sock_wait_for_new_connection(RpcServerProtseq *protseq, unsigned int count, void *wait_array) { struct pollfd *poll_info = wait_array; - int ret, i; + int ret; + unsigned int i; RpcConnection *cconn; RpcConnection_tcp *conn; @@ -1451,7 +1452,7 @@ static const struct protseq_ops protseq_list[] = const struct protseq_ops *rpcrt4_get_protseq_ops(const char *protseq) { - int i; + unsigned int i; for(i=0; i<ARRAYSIZE(protseq_list); i++) if (!strcmp(protseq_list[i].name, protseq)) return &protseq_list[i]; @@ -1460,7 +1461,7 @@ const struct protseq_ops *rpcrt4_get_protseq_ops(const char *protseq) static const struct connection_ops *rpcrt4_get_conn_protseq_ops(const char *protseq) { - int i; + unsigned int i; for(i=0; i<ARRAYSIZE(conn_protseq_list); i++) if (!strcmp(conn_protseq_list[i].name, protseq)) return &conn_protseq_list[i]; @@ -1614,7 +1615,7 @@ RPC_STATUS RpcTransport_ParseTopOfTower(const unsigned char *tower_data, const twr_empty_floor_t *floor4; const struct connection_ops *protseq_ops = NULL; RPC_STATUS status; - int i; + unsigned int i; if (tower_size < sizeof(*protocol_floor)) return EPT_S_NOT_REGISTERED;

1 0

Alexandre Julliard : kernel32/tests: Fix one more failing test on Win9x.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: a6ce819ca2278b1b1bcad4b215f4e5cf6afb2cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6ce819ca2278b1b1bcad4b21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 7 10:50:57 2008 +0100 kernel32/tests: Fix one more failing test on Win9x. --- dlls/kernel32/tests/virtual.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 3e09362..d90d846 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -720,7 +720,8 @@ static void test_CreateFileMapping(void) SetLastError(0xdeadbeef); handle2 = OpenFileMappingA( FILE_MAP_ALL_ACCESS, FALSE, "WINE TEST MAPPING"); ok( !handle2, "OpenFileMapping succeeded\n"); - ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + ok( GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_INVALID_NAME /* win9x */, + "wrong error %u\n", GetLastError()); CloseHandle( handle ); }

1 0

Vincent Povirk : setupapi: Add a matching CoUninitialize call.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: 23f54c939b7ab2a9f405b12b920a76ab9c542a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23f54c939b7ab2a9f405b12b9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 6 08:22:35 2008 -0600 setupapi: Add a matching CoUninitialize call. Spotted by Rob Shearman. --- dlls/setupapi/install.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 0a4db4f..133fb33 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -789,6 +789,7 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) INFCONTEXT name_context, context; IShellLinkW* shelllink=NULL; IPersistFile* persistfile=NULL; + HRESULT initresult=E_FAIL; int attrs=0; static const WCHAR dotlnk[] = {'.','l','n','k',0}; @@ -864,7 +865,7 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) if (!cmdline) return TRUE; - CoInitialize(NULL); + initresult = CoInitialize(NULL); if (!SUCCEEDED(CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&shelllink))) @@ -881,6 +882,7 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) IShellLinkW_Release( shelllink ); done: + if (SUCCEEDED(initresult)) CoUninitialize(); HeapFree( GetProcessHeap(), 0, cmdline ); return TRUE; }

1 0

Paul Vriens : gdi32/tests: Don't crash on NT4.
by Alexandre Julliard 06 Nov '08

06 Nov '08

Module: wine Branch: master Commit: 3f4333d70c27a813b4d99e0daeeb613e9e941a9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4333d70c27a813b4d99e0da… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 6 13:46:52 2008 +0100 gdi32/tests: Don't crash on NT4. --- dlls/gdi32/tests/metafile.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 5f295bb..499fd6c 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2076,9 +2076,11 @@ static void test_gdiis(void) pGdiIsMetaFileDC = (void*) GetProcAddress(hgdi32, "GdiIsMetaFileDC"); pGdiIsPlayMetafileDC = (void*) GetProcAddress(hgdi32, "GdiIsPlayMetafileDC"); - /* they should all exist or none should exist */ - if(!pGdiIsMetaPrintDC) + if(!pGdiIsMetaPrintDC || !pGdiIsMetaFileDC || !pGdiIsPlayMetafileDC) + { + win_skip("Needed GdiIs* functions are not available\n"); return; + } /* try with nothing */ ok(!pGdiIsMetaPrintDC(NULL), "ismetaprint with NULL parameter\n");

1 0

Alexandre Julliard : ntdll: Do not report non-reserved memory areas as free since we don't know what' s in them.
by Alexandre Julliard 06 Nov '08

06 Nov '08

Module: wine Branch: master Commit: 1ca7b881d744fe5003b1a00ef8a1e0d601e03caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca7b881d744fe5003b1a00ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 6 15:00:58 2008 +0100 ntdll: Do not report non-reserved memory areas as free since we don't know what's in them. --- dlls/ntdll/virtual.c | 57 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 50 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 01f78eb..1eb84b8 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1764,6 +1764,43 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T return status; } + +/* retrieve state for a free memory area; callback for wine_mmap_enum_reserved_areas */ +static int get_free_mem_state_callback( void *start, size_t size, void *arg ) +{ + MEMORY_BASIC_INFORMATION *info = arg; + void *end = (char *)start + size; + + if ((char *)info->BaseAddress + info->RegionSize < (char *)start) return 0; + + if (info->BaseAddress >= end) + { + if (info->AllocationBase < end) info->AllocationBase = end; + return 0; + } + + if (info->BaseAddress >= start) + { + /* it's a real free area */ + info->State = MEM_FREE; + info->Protect = PAGE_NOACCESS; + info->AllocationBase = 0; + info->AllocationProtect = 0; + info->Type = 0; + if ((char *)info->BaseAddress + info->RegionSize > (char *)end) + info->RegionSize = (char *)end - (char *)info->BaseAddress; + } + else /* outside of the reserved area, pretend it's allocated */ + { + info->RegionSize = (char *)start - (char *)info->BaseAddress; + info->State = MEM_RESERVE; + info->Protect = PAGE_NOACCESS; + info->AllocationProtect = PAGE_NOACCESS; + info->Type = MEM_PRIVATE; + } + return 1; +} + #define UNIMPLEMENTED_INFO_CLASS(c) \ case c: \ FIXME("(process=%p,addr=%p) Unimplemented information class: " #c "\n", process, addr); \ @@ -1861,13 +1898,20 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, /* Fill the info structure */ + info->AllocationBase = alloc_base; + info->BaseAddress = base; + info->RegionSize = size - (base - alloc_base); + if (!view) { - info->State = MEM_FREE; - info->Protect = PAGE_NOACCESS; - info->AllocationBase = 0; - info->AllocationProtect = 0; - info->Type = 0; + if (!wine_mmap_enum_reserved_areas( get_free_mem_state_callback, info, 0 )) + { + /* not in a reserved area at all, pretend it's allocated */ + info->State = MEM_RESERVE; + info->Protect = PAGE_NOACCESS; + info->AllocationProtect = PAGE_NOACCESS; + info->Type = MEM_PRIVATE; + } } else { @@ -1883,11 +1927,10 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, else info->Type = MEM_MAPPED; for (size = base - alloc_base; size < base + range_size - alloc_base; size += page_size) if (view->prot[size >> page_shift] != vprot) break; + info->RegionSize = size - (base - alloc_base); } server_leave_uninterrupted_section( &csVirtual, &sigset ); - info->BaseAddress = base; - info->RegionSize = size - (base - alloc_base); if (res_len) *res_len = sizeof(*info); return STATUS_SUCCESS; }

1 0