September 2008 - Wine-Commits

James Hawkins : crypt32: Fix several failing tests in win9x.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 094545079cfd4b8c9d0f8a2a93b5a0012d308b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094545079cfd4b8c9d0f8a2a9… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 22:46:01 2008 -0500 crypt32: Fix several failing tests in win9x. --- dlls/crypt32/tests/cert.c | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index cd0808a..b4f8760 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -513,7 +513,8 @@ static void testCertProperties(void) CERT_SIGNATURE_HASH_PROP_ID, NULL, &size); ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == CRYPT_E_NOT_FOUND), + GetLastError() == CRYPT_E_NOT_FOUND || + GetLastError() == OSS_DATA_ERROR), /* win9x */ "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); /* Test key contexts and handles and such */ @@ -1815,7 +1816,9 @@ static void testSignAndEncodeCert(void) */ ret = CryptSignAndEncodeCertificate(0, 0, X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, &info, &algID, NULL, NULL, &size); - ok(!ret && GetLastError() == NTE_BAD_ALGID, + ok(!ret && + (GetLastError() == NTE_BAD_ALGID || + GetLastError() == OSS_BAD_PTR), /* win9x */ "Expected NTE_BAD_ALGID, got %08x\n", GetLastError()); algID.pszObjId = oid_rsa_md5rsa; ret = CryptSignAndEncodeCertificate(0, 0, X509_ASN_ENCODING, @@ -2625,19 +2628,25 @@ static void testHashToBeSigned(void) "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, NULL, 0, NULL, &size); - ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG), /* win9x */ "expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); /* Can't sign anything: has to be asn.1 encoded, at least */ SetLastError(0xdeadbeef); ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, int1, sizeof(int1), NULL, &size); - ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_MORE_INPUT), /* win9x */ "expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); /* Can't be empty, either */ SetLastError(0xdeadbeef); ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, emptyCert, sizeof(emptyCert), NULL, &size); - ok(!ret && GetLastError() == CRYPT_E_ASN1_CORRUPT, + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_CORRUPT || + GetLastError() == OSS_DATA_ERROR), /* win9x */ "expected CRYPT_E_ASN1_CORRUPT, got %08x\n", GetLastError()); /* Signing a cert works */ ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, md5SignedEmptyCert, @@ -3021,7 +3030,9 @@ static void testGetPublicKeyLength(void) ret, GetLastError()); SetLastError(0xdeadbeef); ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); - ok(ret == 0 && GetLastError() == CRYPT_E_ASN1_EOD, + ok(ret == 0 && + (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG), /* win9x */ "Expected length 0 and CRYPT_E_ASN1_EOD, got length %d, %08x\n", ret, GetLastError()); /* With a nearly-empty public key info */ @@ -3033,7 +3044,9 @@ static void testGetPublicKeyLength(void) ret, GetLastError()); SetLastError(0xdeadbeef); ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); - ok(ret == 0 && GetLastError() == CRYPT_E_ASN1_EOD, + ok(ret == 0 && + (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG), /* win9x */ "Expected length 0 and CRYPT_E_ASN1_EOD, got length %d, %08x\n", ret, GetLastError()); /* With a bogus key */ @@ -3046,7 +3059,9 @@ static void testGetPublicKeyLength(void) ret, GetLastError()); SetLastError(0xdeadbeef); ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); - ok(ret == 0 && GetLastError() == CRYPT_E_ASN1_BADTAG, + ok(ret == 0 && + (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_PDU_MISMATCH), /* win9x */ "Expected length 0 and CRYPT_E_ASN1_BADTAGTAG, got length %d, %08x\n", ret, GetLastError()); /* With a believable RSA key but a bogus OID */ @@ -3065,7 +3080,9 @@ static void testGetPublicKeyLength(void) info.Algorithm.pszObjId = oid_rsa_dh; SetLastError(0xdeadbeef); ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); - ok(ret == 0 && GetLastError() == CRYPT_E_ASN1_BADTAG, + ok(ret == 0 && + (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == E_INVALIDARG), /* win9x */ "Expected length 0 and CRYPT_E_ASN1_BADTAG, got length %d, %08x\n", ret, GetLastError()); /* With the RSA OID */

1 0

James Hawkins : schannel: Fix a failing test in Vista.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 4ad88d25af72de6fa3f8edd9fb1ea1a599112b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad88d25af72de6fa3f8edd9f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 22:42:21 2008 -0500 schannel: Fix a failing test in Vista. --- dlls/schannel/tests/main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index 814b60a..5575cc1 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -148,7 +148,9 @@ static void testGetInfo(void) PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); - ok(PackageInfo.cbMaxToken == 0x4000, "cbMaxToken: 0x%lx\n", + ok(PackageInfo.cbMaxToken == 0x4000 || + PackageInfo.cbMaxToken == 0x6000, /* Vista */ + "cbMaxToken: 0x%lx\n", PackageInfo.cbMaxToken); /* Second package: SChannel */

1 0

James Hawkins : rpcrt4: Fix a failing test in Vista.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: bb6a8f36c3a447a885f972dd6b8fd4d860f6d7b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6a8f36c3a447a885f972dd6… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 22:41:36 2008 -0500 rpcrt4: Fix a failing test in Vista. --- dlls/rpcrt4/tests/rpc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index bcd6a65..9f2684e 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -328,7 +328,9 @@ static void test_towers(void) BOOL same; ret = TowerConstruct(&mapi_if_id, &ndr_syntax, "ncacn_ip_tcp", "135", "10.0.0.1", &tower); - ok(ret == RPC_S_OK, "TowerConstruct failed with error %ld\n", ret); + ok(ret == RPC_S_OK || + broken(ret == RPC_S_INVALID_RPC_PROTSEQ), /* Vista */ + "TowerConstruct failed with error %ld\n", ret); if (ret == RPC_S_INVALID_RPC_PROTSEQ) { /* Windows Vista fails with this error and crashes if we continue */

1 0

Nikolay Sivov : gdiplus: Add few TRACE(..) for Matrix.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 38196119f36295717edc42094d35a1b666277209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38196119f36295717edc42094… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 3 00:49:54 2008 +0400 gdiplus: Add few TRACE(..) for Matrix. --- dlls/gdiplus/matrix.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 008dcae..d2e1511 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -61,6 +61,8 @@ static REAL matrix_det(GDIPCONST GpMatrix *matrix) GpStatus WINGDIPAPI GdipCreateMatrix2(REAL m11, REAL m12, REAL m21, REAL m22, REAL dx, REAL dy, GpMatrix **matrix) { + TRACE("(%.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %p)\n", m11, m12, m21, m22, dx, dy, matrix); + if(!matrix) return InvalidParameter; @@ -83,6 +85,8 @@ GpStatus WINGDIPAPI GdipCreateMatrix2(REAL m11, REAL m12, REAL m21, REAL m22, GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *rect, GDIPCONST GpPointF *pt, GpMatrix **matrix) { + TRACE("(%p, %p, %p)\n", rect, pt, matrix); + if(!matrix) return InvalidParameter; @@ -103,6 +107,8 @@ GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect *rect, GDIPCONST GpPoint GpRectF rectF; GpPointF ptF; + TRACE("(%p, %p, %p)\n", rect, pt, matrix); + rectF.X = (REAL)rect->X; rectF.Y = (REAL)rect->Y; rectF.Width = (REAL)rect->Width; @@ -116,6 +122,8 @@ GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect *rect, GDIPCONST GpPoint GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix *matrix, GpMatrix **clone) { + TRACE("(%p, %p)\n", matrix, clone); + if(!matrix || !clone) return InvalidParameter; @@ -129,6 +137,8 @@ GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix *matrix, GpMatrix **clone) GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix **matrix) { + TRACE("(%p)\n", matrix); + if(!matrix) return InvalidParameter; @@ -147,6 +157,8 @@ GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix **matrix) GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix *matrix) { + TRACE("(%p)\n", matrix); + if(!matrix) return InvalidParameter; @@ -158,6 +170,8 @@ GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix *matrix) GpStatus WINGDIPAPI GdipGetMatrixElements(GDIPCONST GpMatrix *matrix, REAL *out) { + TRACE("(%p, %p)\n", matrix, out); + if(!matrix || !out) return InvalidParameter; @@ -172,6 +186,8 @@ GpStatus WINGDIPAPI GdipInvertMatrix(GpMatrix *matrix) REAL det; BOOL invertible; + TRACE("(%p)\n", matrix); + if(!matrix) return InvalidParameter; @@ -195,6 +211,8 @@ GpStatus WINGDIPAPI GdipInvertMatrix(GpMatrix *matrix) GpStatus WINGDIPAPI GdipIsMatrixInvertible(GDIPCONST GpMatrix *matrix, BOOL *result) { + TRACE("(%p, %p)\n", matrix, result); + if(!matrix || !result) return InvalidParameter; @@ -206,6 +224,8 @@ GpStatus WINGDIPAPI GdipIsMatrixInvertible(GDIPCONST GpMatrix *matrix, BOOL *res GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix *matrix, GpMatrix* matrix2, GpMatrixOrder order) { + TRACE("(%p, %p, %d)\n", matrix, matrix2, order); + if(!matrix || !matrix2) return InvalidParameter; @@ -222,6 +242,8 @@ GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix *matrix, REAL angle, { REAL cos_theta, sin_theta, rotate[6]; + TRACE("(%p, %.2f, %d)\n", matrix, angle, order); + if(!matrix) return InvalidParameter; @@ -249,6 +271,8 @@ GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix *matrix, REAL scaleX, REAL scaleY, { REAL scale[6]; + TRACE("(%p, %.2f, %.2f, %d)\n", matrix, scaleX, scaleY, order); + if(!matrix) return InvalidParameter; @@ -270,6 +294,9 @@ GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix *matrix, REAL scaleX, REAL scaleY, GpStatus WINGDIPAPI GdipSetMatrixElements(GpMatrix *matrix, REAL m11, REAL m12, REAL m21, REAL m22, REAL dx, REAL dy) { + TRACE("(%p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", matrix, m11, m12, + m21, m22, dx, dy); + if(!matrix) return InvalidParameter; @@ -288,6 +315,8 @@ GpStatus WINGDIPAPI GdipShearMatrix(GpMatrix *matrix, REAL shearX, REAL shearY, { REAL shear[6]; + TRACE("(%p, %.2f, %.2f, %d)\n", matrix, shearX, shearY, order); + if(!matrix) return InvalidParameter; @@ -313,6 +342,8 @@ GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix *matrix, GpPointF *pts, REAL x, y; INT i; + TRACE("(%p, %p, %d)\n", matrix, pts, count); + if(!matrix || !pts || count <= 0) return InvalidParameter; @@ -334,6 +365,8 @@ GpStatus WINGDIPAPI GdipTransformMatrixPointsI(GpMatrix *matrix, GpPoint *pts, I GpStatus ret; INT i; + TRACE("(%p, %p, %d)\n", matrix, pts, count); + if(count <= 0) return InvalidParameter; @@ -363,6 +396,8 @@ GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix *matrix, REAL offsetX, { REAL translate[6]; + TRACE("(%p, %.2f, %.2f, %d)\n", matrix, offsetX, offsetY, order); + if(!matrix) return InvalidParameter; @@ -386,6 +421,8 @@ GpStatus WINGDIPAPI GdipVectorTransformMatrixPoints(GpMatrix *matrix, GpPointF * REAL x, y; INT i; + TRACE("(%p, %p, %d)\n", matrix, pts, count); + if(!matrix || !pts || count <= 0) return InvalidParameter; @@ -407,6 +444,8 @@ GpStatus WINGDIPAPI GdipVectorTransformMatrixPointsI(GpMatrix *matrix, GpPoint * GpStatus ret; INT i; + TRACE("(%p, %p, %d)\n", matrix, pts, count); + if(count <= 0) return InvalidParameter; @@ -434,6 +473,8 @@ GpStatus WINGDIPAPI GdipVectorTransformMatrixPointsI(GpMatrix *matrix, GpPoint * GpStatus WINGDIPAPI GdipIsMatrixEqual(GDIPCONST GpMatrix *matrix, GDIPCONST GpMatrix *matrix2, BOOL *result) { + TRACE("(%p, %p, %p)\n", matrix, matrix2, result); + if(!matrix || !matrix2 || !result) return InvalidParameter; /* based on single array member of GpMatrix */ @@ -448,6 +489,8 @@ GpStatus WINGDIPAPI GdipIsMatrixIdentity(GDIPCONST GpMatrix *matrix, BOOL *resul GpStatus ret; BOOL isIdentity; + TRACE("(%p, %p)\n", matrix, result); + if(!matrix || !result) return InvalidParameter;

1 0

James Hawkins : comctl32: Fix a failing test in win98.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: a9086abac69dce8c84cc2251e601627f8f5e2e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9086abac69dce8c84cc2251e… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 22:43:00 2008 -0500 comctl32: Fix a failing test in win98. --- dlls/comctl32/tests/comboex.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index d0e0bb6..7add84b 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -271,7 +271,8 @@ static void test_WM_LBUTTONDOWN(void) result = SendMessage(hList, WM_LBUTTONUP, 0, MAKELPARAM(x, y)); ok(!result, "WM_LBUTTONUP was not processed. LastError=%d\n", GetLastError()); - todo_wine ok(GetFocus() == hEdit, + todo_wine ok(GetFocus() == hEdit || + broken(GetFocus() == hCombo), /* win98 */ "Focus not on ComboBoxEx's Edit Control, instead on %p\n", GetFocus());

1 0

Nikolay Sivov : gdiplus: Add few TRACE(..) for ImageAttributes.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 088ed7a52d2dc08baaf481dbf45ba126e1ae4ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=088ed7a52d2dc08baaf481dbf… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 3 00:38:01 2008 +0400 gdiplus: Add few TRACE(..) for ImageAttributes. --- dlls/gdiplus/imageattributes.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index dcee68b..55bff18 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes *imageattr, GpImageAttributes **cloneImageattr) { + TRACE("(%p, %p)\n", imageattr, cloneImageattr); + if(!imageattr || !cloneImageattr) return InvalidParameter; @@ -40,6 +42,8 @@ GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes *imagea GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes **imageattr) { + TRACE("(%p)\n", imageattr); + if(!imageattr) return InvalidParameter; @@ -51,6 +55,8 @@ GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes **imageattr) GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes *imageattr) { + TRACE("(%p)\n", imageattr); + if(!imageattr) return InvalidParameter;

1 0

Nikolay Sivov : gdiplus: GdipGetLineGammaCorrection should check result pointer. Test added.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 69e17d6a6a879aaf1b3bafe87d3fe3b99c8f3feb URL: http://source.winehq.org/git/wine.git/?a=commit;h=69e17d6a6a879aaf1b3bafe87… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 3 00:25:39 2008 +0400 gdiplus: GdipGetLineGammaCorrection should check result pointer. Test added. --- dlls/gdiplus/brush.c | 2 +- dlls/gdiplus/tests/brush.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index b8c5870..8bb807b 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -631,7 +631,7 @@ GpStatus WINGDIPAPI GdipGetLineGammaCorrection(GpLineGradient *line, { TRACE("(%p, %p)\n", line, usinggamma); - if(!line) + if(!line || !usinggamma) return InvalidParameter; *usinggamma = line->gamma; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 6711fe4..c9f9826 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -145,6 +145,30 @@ static void test_getbounds(void) GdipDeleteBrush((GpBrush*) brush); } +static void test_getgamma(void) +{ + GpStatus status; + GpLineGradient *line; + GpPointF start, end; + BOOL gamma; + + start.X = start.Y = 0.0; + end.X = end.Y = 100.0; + + status = GdipCreateLineBrush(&start, &end, (ARGB)0xdeadbeef, 0xdeadbeef, WrapModeTile, &line); + expect(Ok, status); + + /* NULL arguments */ + status = GdipGetLineGammaCorrection(NULL, NULL); + expect(InvalidParameter, status); + status = GdipGetLineGammaCorrection(line, NULL); + expect(InvalidParameter, status); + status = GdipGetLineGammaCorrection(NULL, &gamma); + expect(InvalidParameter, status); + + GdipDeleteBrush((GpBrush*)line); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -162,6 +186,7 @@ START_TEST(brush) test_gradientblendcount(); test_getblend(); test_getbounds(); + test_getgamma(); GdiplusShutdown(gdiplusToken); }

1 0

Nikolay Sivov : gdiplus: Add TRACE(..) for font calls.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: c9d4046bcf95c7b1700a92af1f6b0860ebe83021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d4046bcf95c7b1700a92af1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 3 00:33:58 2008 +0400 gdiplus: Add TRACE(..) for font calls. --- dlls/gdiplus/font.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 3a9d36d..210ebff 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -166,6 +166,8 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, HFONT hfont, oldfont; TEXTMETRICW textmet; + TRACE("(%p, %p, %p)\n", hdc, logfont, font); + if(!logfont || !font) return InvalidParameter; @@ -206,6 +208,8 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC hdc, { LOGFONTW lfw; + TRACE("(%p, %p, %p)\n", hdc, lfa, font); + if(!lfa || !font) return InvalidParameter; @@ -224,6 +228,8 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC hdc, */ GpStatus WINGDIPAPI GdipDeleteFont(GpFont* font) { + TRACE("(%p)\n", font); + if(!font) return InvalidParameter; @@ -240,6 +246,8 @@ GpStatus WINGDIPAPI GdipCreateFontFromDC(HDC hdc, GpFont **font) HFONT hfont; LOGFONTW lfw; + TRACE("(%p, %p)\n", hdc, font); + if(!font) return InvalidParameter; @@ -294,6 +302,8 @@ GpStatus WINGDIPAPI GdipGetFamily(GpFont *font, GpFontFamily **family) */ GpStatus WINGDIPAPI GdipGetFontSize(GpFont *font, REAL *size) { + TRACE("(%p, %p)\n", font, size); + if (!(font && size)) return InvalidParameter; *size = font->emSize; @@ -348,6 +358,8 @@ GpStatus WINGDIPAPI GdipGetFontStyle(GpFont *font, INT *style) */ GpStatus WINGDIPAPI GdipGetFontUnit(GpFont *font, Unit *unit) { + TRACE("(%p, %p)\n", font, unit); + if (!(font && unit)) return InvalidParameter; *unit = font->unit; @@ -361,6 +373,8 @@ GpStatus WINGDIPAPI GdipGetFontUnit(GpFont *font, Unit *unit) GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW *lfw) { + TRACE("(%p, %p, %p)\n", font, graphics, lfw); + /* FIXME: use graphics */ if(!font || !graphics || !lfw) return InvalidParameter; @@ -375,6 +389,8 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, */ GpStatus WINGDIPAPI GdipCloneFont(GpFont *font, GpFont **cloneFont) { + TRACE("(%p, %p)\n", font, cloneFont); + if(!font || !cloneFont) return InvalidParameter; @@ -624,6 +640,8 @@ GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily *family, GpStatus WINGDIPAPI GdipGetCellDescent(GDIPCONST GpFontFamily *family, INT style, UINT16* CellDescent) { + TRACE("(%p, %d, %p)\n", family, style, CellDescent); + if (!(family && CellDescent)) return InvalidParameter; *CellDescent = family->tmw.tmDescent; @@ -730,6 +748,8 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily **nativeFamily) { static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; + TRACE("(%p)\n", nativeFamily); + if (nativeFamily == NULL) return InvalidParameter; return GdipCreateFontFamilyFromName(TimesNewRoman, NULL, nativeFamily); @@ -753,6 +773,8 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily **nativeFamil * affect anything */ static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; + TRACE("(%p)\n", nativeFamily); + if (nativeFamily == NULL) return InvalidParameter; return GdipCreateFontFamilyFromName(MSSansSerif, NULL, nativeFamily);

1 0

Nikolay Sivov : gdiplus: Add TRACE(..) for brush calls.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 26ccb33f864f30e3da32d7951d4b61e07d1fe9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26ccb33f864f30e3da32d7951… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 3 00:13:40 2008 +0400 gdiplus: Add TRACE(..) for brush calls. --- dlls/gdiplus/brush.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26ccb33f864f30e3da32d…

1 0

Nikolay Sivov : gdiplus: Fix API documentation name.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: cf5562338af651877ccd0f83b122e0745e22fc76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5562338af651877ccd0f83b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Sep 2 23:47:33 2008 +0400 gdiplus: Fix API documentation name. --- dlls/gdiplus/region.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 689f30b..90aaf9e 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -813,7 +813,7 @@ GpStatus WINGDIPAPI GdipIsInfiniteRegion(GpRegion *region, GpGraphics *graphics, } /***************************************************************************** - * GdipSetEmptye [GDIPLUS.@] + * GdipSetEmpty [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *region) {

1 0