wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Juan Lang : crypt32: Add tests for CertIsRDNAttrsInCertificateName.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: ed74536f0c92be2b9075f201fbc042e987fcffc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed74536f0c92be2b9075f201f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 16 13:42:21 2009 -0800 crypt32: Add tests for CertIsRDNAttrsInCertificateName. --- dlls/crypt32/tests/cert.c | 138 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 138 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 5463641..186691f 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2634,6 +2634,143 @@ static void testCompareCertName(void) ok(!ret, "Expected failure\n"); } +static void testIsRDNAttrsInCertificateName(void) +{ + static char oid_1_2_3[] = "1.2.3"; + static char oid_common_name[] = szOID_COMMON_NAME; + static char oid_organization[] = szOID_ORGANIZATION_NAME; + static char juan[] = "Juan Lang"; + static char juan_with_leading_space[] = " Juan Lang"; + static char juan_with_intermediate_space[] = "Juan Lang"; + static char juan_with_trailing_space[] = "Juan Lang "; + static char juan_lower_case[] = "juan lang"; + static WCHAR juanW[] = { 'J','u','a','n',' ','L','a','n','g',0 }; + static char the_wine_project[] = "The Wine Project"; + BOOL ret; + CERT_NAME_BLOB name; + CERT_RDN_ATTR attr[2]; + CERT_RDN rdn = { 0, NULL }; + + name.cbData = sizeof(cn); + name.pbData = cn; + if (0) + { + /* Crash */ + ret = CertIsRDNAttrsInCertificateName(0, 0, NULL, NULL); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, + NULL); + } + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(0, 0, &name, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + "expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(ret, "CertIsRDNAttrsInCertificateName failed: %08x\n", GetLastError()); + attr[0].pszObjId = oid_1_2_3; + rdn.rgRDNAttr = attr; + rdn.cRDNAttr = 1; + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + attr[0].pszObjId = oid_common_name; + attr[0].dwValueType = CERT_RDN_PRINTABLE_STRING; + attr[0].Value.cbData = strlen(juan); + attr[0].Value.pbData = (BYTE *)juan; + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(ret, "CertIsRDNAttrsInCertificateName failed: %08x\n", GetLastError()); + /* Again, spaces are not removed for name comparison. */ + attr[0].Value.cbData = strlen(juan_with_leading_space); + attr[0].Value.pbData = (BYTE *)juan_with_leading_space; + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + attr[0].Value.cbData = strlen(juan_with_intermediate_space); + attr[0].Value.pbData = (BYTE *)juan_with_intermediate_space; + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + attr[0].Value.cbData = strlen(juan_with_trailing_space); + attr[0].Value.pbData = (BYTE *)juan_with_trailing_space; + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + /* The lower case name isn't matched unless a case insensitive match is + * specified. + */ + attr[0].Value.cbData = strlen(juan_lower_case); + attr[0].Value.pbData = (BYTE *)juan_lower_case; + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, + CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG, &name, &rdn); + todo_wine + ok(ret, "CertIsRDNAttrsInCertificateName failed: %08x\n", GetLastError()); + /* The values don't match unless they have the same RDN type */ + attr[0].dwValueType = CERT_RDN_UNICODE_STRING; + attr[0].Value.cbData = lstrlenW(juanW) * sizeof(WCHAR); + attr[0].Value.pbData = (BYTE *)juanW; + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, + CERT_UNICODE_IS_RDN_ATTRS_FLAG, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + attr[0].dwValueType = CERT_RDN_IA5_STRING; + attr[0].Value.cbData = strlen(juan); + attr[0].Value.pbData = (BYTE *)juan; + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + /* All attributes must be present */ + attr[0].dwValueType = CERT_RDN_PRINTABLE_STRING; + attr[0].Value.cbData = strlen(juan); + attr[0].Value.pbData = (BYTE *)juan; + attr[1].pszObjId = oid_organization; + attr[1].dwValueType = CERT_RDN_PRINTABLE_STRING; + attr[1].Value.cbData = strlen(the_wine_project); + attr[1].Value.pbData = (BYTE *)the_wine_project; + rdn.cRDNAttr = 2; + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + /* Order also matters */ + name.pbData = cnThenO; + name.cbData = sizeof(cnThenO); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(ret, "CertIsRDNAttrsInCertificateName failed: %08x\n", GetLastError()); + name.pbData = oThenCN; + name.cbData = sizeof(oThenCN); + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); +} + static BYTE int1[] = { 0x88, 0xff, 0xff, 0xff }; static BYTE int2[] = { 0x88, 0xff }; static BYTE int3[] = { 0x23, 0xff }; @@ -3343,4 +3480,5 @@ START_TEST(cert) testVerifyRevocation(); testAcquireCertPrivateKey(); testGetPublicKeyLength(); + testIsRDNAttrsInCertificateName(); }

1 0

Juan Lang : crypt32: Add stub for CertIsRDNAttrsInCertificateName.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 7d12294f08594a480508c1dd610dd08ebbc0b75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d12294f08594a480508c1dd6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 16 11:59:29 2009 -0800 crypt32: Add stub for CertIsRDNAttrsInCertificateName. --- dlls/crypt32/cert.c | 8 ++++++++ dlls/crypt32/crypt32.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 4f3df32..656c547 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1832,6 +1832,14 @@ PCERT_RDN_ATTR WINAPI CertFindRDNAttr(LPCSTR pszObjId, PCERT_NAME_INFO pName) return ret; } +BOOL WINAPI CertIsRDNAttrsInCertificateName(DWORD dwCertEncodingType, + DWORD dwFlags, PCERT_NAME_BLOB pCertName, PCERT_RDN pRDN) +{ + FIXME("(%08x, %08x, %p, %p): stub\n", dwCertEncodingType, dwFlags, + pCertName, pRDN); + return FALSE; +} + LONG WINAPI CertVerifyTimeValidity(LPFILETIME pTimeToVerify, PCERT_INFO pCertInfo) { diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index b096c09..61e4d3d 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -66,7 +66,7 @@ @ stdcall CertGetStoreProperty(ptr long ptr ptr) @ stdcall CertGetSubjectCertificateFromStore(ptr long ptr) @ stdcall CertGetValidUsages(long ptr ptr ptr ptr) -@ stub CertIsRDNAttrsInCertificateName +@ stdcall CertIsRDNAttrsInCertificateName(long long ptr ptr) @ stdcall CertIsValidCRLForCertificate(ptr ptr long ptr) @ stdcall CertNameToStrA(long ptr long ptr long) @ stdcall CertNameToStrW(long ptr long ptr long)

1 0

Juan Lang : crypt32: Add more tests for CertCompareCertificateName.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 4a948fa92908b254b036a40c0c2dae5fb4bde06f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a948fa92908b254b036a40c0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 16 11:48:46 2009 -0800 crypt32: Add more tests for CertCompareCertificateName. --- dlls/crypt32/tests/cert.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index e1c8262..5463641 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2541,6 +2541,29 @@ static void testGetValidUsages(void) CertFreeCertificateContext(contexts[2]); } +static BYTE cn[] = { +0x30,0x14,0x31,0x12,0x30,0x10,0x06,0x03,0x55,0x04,0x03,0x13,0x09,0x4a,0x75, +0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67 }; +static BYTE cnWithLeadingSpace[] = { +0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x20,0x4a, +0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67 }; +static BYTE cnWithTrailingSpace[] = { +0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75, +0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x20 }; +static BYTE cnWithIntermediateSpace[] = { +0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75, +0x61,0x6e,0x20,0x20,0x4c,0x61,0x6e,0x67 }; +static BYTE cnThenO[] = { +0x30,0x2d,0x31,0x2b,0x30,0x10,0x06,0x03,0x55,0x04,0x03,0x13,0x09,0x4a,0x75, +0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x30,0x17,0x06,0x03,0x55,0x04,0x0a,0x13, +0x10,0x54,0x68,0x65,0x20,0x57,0x69,0x6e,0x65,0x20,0x50,0x72,0x6f,0x6a,0x65, +0x63,0x74 }; +static BYTE oThenCN[] = { +0x30,0x2d,0x31,0x2b,0x30,0x10,0x06,0x03,0x55,0x04,0x0a,0x13,0x09,0x4a,0x75, +0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x30,0x17,0x06,0x03,0x55,0x04,0x03,0x13, +0x10,0x54,0x68,0x65,0x20,0x57,0x69,0x6e,0x65,0x20,0x50,0x72,0x6f,0x6a,0x65, +0x63,0x74 }; + static void testCompareCertName(void) { static BYTE bogus[] = { 1, 2, 3, 4 }; @@ -2572,6 +2595,43 @@ static void testCompareCertName(void) blob2.cbData = sizeof(emptyPrime); ret = CertCompareCertificateName(0, &blob1, &blob2); ok(!ret, "Expected failure\n"); + /* Tests to show that CertCompareCertificateName doesn't decode the name + * to remove spaces, or to do an order-independent comparison. + */ + /* Compare CN="Juan Lang" with CN=" Juan Lang" */ + blob1.pbData = cn; + blob1.cbData = sizeof(cn); + blob2.pbData = cnWithLeadingSpace; + blob2.cbData = sizeof(cnWithLeadingSpace); + ret = CertCompareCertificateName(0, &blob1, &blob2); + ok(!ret, "Expected failure\n"); + ret = CertCompareCertificateName(X509_ASN_ENCODING, &blob1, &blob2); + ok(!ret, "Expected failure\n"); + /* Compare CN="Juan Lang" with CN="Juan Lang " */ + blob2.pbData = cnWithTrailingSpace; + blob2.cbData = sizeof(cnWithTrailingSpace); + ret = CertCompareCertificateName(0, &blob1, &blob2); + ok(!ret, "Expected failure\n"); + ret = CertCompareCertificateName(X509_ASN_ENCODING, &blob1, &blob2); + ok(!ret, "Expected failure\n"); + /* Compare CN="Juan Lang" with CN="Juan Lang" */ + blob2.pbData = cnWithIntermediateSpace; + blob2.cbData = sizeof(cnWithIntermediateSpace); + ret = CertCompareCertificateName(0, &blob1, &blob2); + ok(!ret, "Expected failure\n"); + ret = CertCompareCertificateName(X509_ASN_ENCODING, &blob1, &blob2); + ok(!ret, "Expected failure\n"); + /* Compare 'CN="Juan Lang", O="The Wine Project"' with + * 'O="The Wine Project", CN="Juan Lang"' + */ + blob1.pbData = cnThenO; + blob1.cbData = sizeof(cnThenO); + blob2.pbData = oThenCN; + blob2.cbData = sizeof(oThenCN); + ret = CertCompareCertificateName(0, &blob1, &blob2); + ok(!ret, "Expected failure\n"); + ret = CertCompareCertificateName(X509_ASN_ENCODING, &blob1, &blob2); + ok(!ret, "Expected failure\n"); } static BYTE int1[] = { 0x88, 0xff, 0xff, 0xff };

1 0

Owen Rudge : comctl32/tests: Use defined flags instead of magic numbers in v6 tests.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 459361d4d668351d336e8a9f157d447c8fd349b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=459361d4d668351d336e8a9f1… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 16 13:27:33 2009 -0600 comctl32/tests: Use defined flags instead of magic numbers in v6 tests. --- dlls/comctl32/tests/imagelist.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 38a3b48..ef5034c 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1394,7 +1394,7 @@ static void DoTest1_v6(void) int ret = 0; /* create an imagelist to play with */ - himl = ImageList_Create(84,84,0x10,0,3); + himl = ImageList_Create(84, 84, ILC_COLOR16, 0, 3); ok(himl != 0,"failed to create imagelist\n"); imgl = (IImageList *) himl; @@ -1466,7 +1466,7 @@ static void DoTest3_v6(void) ok(hdc!=NULL, "couldn't get DC\n"); /* create an imagelist to play with */ - himl = ImageList_Create(48,48,0x10,0,3); + himl = ImageList_Create(48, 48, ILC_COLOR16, 0, 3); ok(himl!=0,"failed to create imagelist\n"); imgl = (IImageList *) himl;

1 0

Owen Rudge : shell32: Implement SHGetImageList and remove todo_wine from imagelist tests.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 9db87f13d3f0f9e07accc9b5e12dccd202b88156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db87f13d3f0f9e07accc9b5e… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 16 13:27:32 2009 -0600 shell32: Implement SHGetImageList and remove todo_wine from imagelist tests. --- dlls/comctl32/tests/imagelist.c | 6 +++--- dlls/shell32/shellord.c | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 36d0aea..38a3b48 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1012,18 +1012,18 @@ static void test_shell_imagelist(void) /* Get system image list */ hr = (pSHGetImageList)(SHIL_LARGE, &IID_IImageList, (void**)&iml); - todo_wine ok(SUCCEEDED(hr), "SHGetImageList failed, hr=%x\n", hr); + ok(SUCCEEDED(hr), "SHGetImageList failed, hr=%x\n", hr); if (hr != S_OK) return; IImageList_GetImageCount(iml, &out); - todo_wine ok(out > 0, "IImageList_GetImageCount returned out <= 0\n"); + ok(out > 0, "IImageList_GetImageCount returned out <= 0\n"); /* right and bottom should be 32x32 for large icons, or 48x48 if larger icons enabled in control panel */ IImageList_GetImageRect(iml, 0, &rect); - todo_wine ok((((rect.right == 32) && (rect.bottom == 32)) || + ok((((rect.right == 32) && (rect.bottom == 32)) || ((rect.right == 48) && (rect.bottom == 48))), "IImageList_GetImageRect returned r:%d,b:%d\n", rect.right, rect.bottom); diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 29b77df..7aa3a0c 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -46,6 +46,7 @@ #include "pidl.h" #include "shlwapi.h" #include "commdlg.h" +#include "commoncontrols.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DECLARE_DEBUG_CHANNEL(pidl); @@ -2173,10 +2174,41 @@ void WINAPI SHFlushSFCache(void) { } +/************************************************************************* + * SHGetImageList (SHELL32.727) + * + * Returns a copy of a shell image list. + * + * NOTES + * Windows XP features 4 sizes of image list, and Vista 5. Wine currently + * only supports 2, so requests for the others will currently fail. + */ HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) { - FIXME("STUB: %i %s\n",iImageList,debugstr_guid(riid)); - return E_NOINTERFACE; + HIMAGELIST hLarge, hSmall; + HIMAGELIST hNew; + HRESULT ret = E_FAIL; + + /* Wine currently only maintains large and small image lists */ + if ((iImageList != SHIL_LARGE) && (iImageList != SHIL_SMALL)) + { + FIXME("Unsupported image list %i requested\n", iImageList); + return E_FAIL; + } + + Shell_GetImageList(&hLarge, &hSmall); + hNew = ImageList_Duplicate(iImageList == SHIL_LARGE ? hLarge : hSmall); + + /* Get the interface for the new image list */ + if (hNew) + { + ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); + + if (!SUCCEEDED(ret)) + ImageList_Destroy(hNew); + } + + return ret; } /*************************************************************************

1 0

Owen Rudge : comctl32/tests: Add hotspot/drag test for IImageList.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: c0a6c5cd3ffa50cfce82cfdd8a9a1134269c36e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a6c5cd3ffa50cfce82cfdd8… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 16 13:27:30 2009 -0600 comctl32/tests: Add hotspot/drag test for IImageList. --- dlls/comctl32/tests/imagelist.c | 77 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index f35a641..36d0aea 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1306,6 +1306,81 @@ static void test_iimagelist(void) ImageList_Destroy(himl); } +static void testHotspot_v6(void) +{ + struct hotspot { + int dx; + int dy; + }; + +#define SIZEX1 47 +#define SIZEY1 31 +#define SIZEX2 11 +#define SIZEY2 17 +#define HOTSPOTS_MAX 4 /* Number of entries in hotspots */ + static const struct hotspot hotspots[HOTSPOTS_MAX] = { + { 10, 7 }, + { SIZEX1, SIZEY1 }, + { -9, -8 }, + { -7, 35 } + }; + int i, j; + HIMAGELIST himl1 = createImageList(SIZEX1, SIZEY1); + HIMAGELIST himl2 = createImageList(SIZEX2, SIZEY2); + IImageList *imgl1, *imgl2; + HRESULT hr; + + /* cast to IImageList */ + imgl1 = (IImageList *) himl1; + imgl2 = (IImageList *) himl2; + + for (i = 0; i < HOTSPOTS_MAX; i++) { + for (j = 0; j < HOTSPOTS_MAX; j++) { + int dx1 = hotspots[i].dx; + int dy1 = hotspots[i].dy; + int dx2 = hotspots[j].dx; + int dy2 = hotspots[j].dy; + int correctx, correcty, newx, newy; + char loc[256]; + IImageList *imglNew; + POINT ppt; + + hr = IImageList_BeginDrag(imgl1, 0, dx1, dy1); + ok(SUCCEEDED(hr), "BeginDrag failed for { %d, %d }\n", dx1, dy1); + sprintf(loc, "BeginDrag (%d,%d)\n", i, j); + + /* check merging the dragged image with a second image */ + hr = IImageList_SetDragCursorImage(imgl2, (IUnknown *) imgl2, 0, dx2, dy2); + ok(SUCCEEDED(hr), "SetDragCursorImage failed for {%d, %d}{%d, %d}\n", + dx1, dy1, dx2, dy2); + sprintf(loc, "SetDragCursorImage (%d,%d)\n", i, j); + + /* check new hotspot, it should be the same like the old one */ + hr = IImageList_GetDragImage(imgl2, NULL, &ppt, &IID_IImageList, (PVOID *) &imglNew); + ok(SUCCEEDED(hr), "GetDragImage failed\n"); + ok(ppt.x == dx1 && ppt.y == dy1, + "Expected drag hotspot [%d,%d] got [%d,%d]\n", + dx1, dy1, ppt.x, ppt.y); + /* check size of new dragged image */ + IImageList_GetIconSize(imglNew, &newx, &newy); + correctx = max(SIZEX1, max(SIZEX2 + dx2, SIZEX1 - dx2)); + correcty = max(SIZEY1, max(SIZEY2 + dy2, SIZEY1 - dy2)); + ok(newx == correctx && newy == correcty, + "Expected drag image size [%d,%d] got [%d,%d]\n", + correctx, correcty, newx, newy); + sprintf(loc, "GetDragImage (%d,%d)\n", i, j); + IImageList_EndDrag(imgl2); + } + } +#undef SIZEX1 +#undef SIZEY1 +#undef SIZEX2 +#undef SIZEY2 +#undef HOTSPOTS_MAX + IImageList_Release(imgl2); + IImageList_Release(imgl1); +} + static void DoTest1_v6(void) { IImageList *imgl; @@ -1571,6 +1646,8 @@ START_TEST(imagelist) test_ImageList_DrawIndirect(); test_shell_imagelist(); test_iimagelist(); + + testHotspot_v6(); DoTest1_v6(); DoTest3_v6(); testMerge_v6();

1 0

Owen Rudge : comctl32: Implement imagelist drag functions, GetOverlayImage.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 341e6ed533754297c658381ea9d2c9770784dba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=341e6ed533754297c658381ea… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 16 13:27:28 2009 -0600 comctl32: Implement imagelist drag functions, GetOverlayImage. --- dlls/comctl32/imagelist.c | 72 +++++++++++++++++++++++++++++++++------------ 1 files changed, 53 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index ff2eff8..9f310c3 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3225,54 +3225,74 @@ static HRESULT WINAPI ImageListImpl_GetBkColor(IImageList *iface, COLORREF *pclr static HRESULT WINAPI ImageListImpl_BeginDrag(IImageList *iface, int iTrack, int dxHotspot, int dyHotspot) { - FIXME("STUB: %p %d %d %d\n", iface, iTrack, dxHotspot, dyHotspot); - return E_NOTIMPL; + return ImageList_BeginDrag((HIMAGELIST) iface, iTrack, dxHotspot, dyHotspot) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_EndDrag(IImageList *iface) { - FIXME("STUB: %p\n", iface); - return E_NOTIMPL; + ImageList_EndDrag(); + return S_OK; } static HRESULT WINAPI ImageListImpl_DragEnter(IImageList *iface, HWND hwndLock, int x, int y) { - FIXME("STUB: %p %p %d %d\n", iface, hwndLock, x, y); - return E_NOTIMPL; + return ImageList_DragEnter(hwndLock, x, y) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_DragLeave(IImageList *iface, HWND hwndLock) { - FIXME("STUB: %p %p\n", iface, hwndLock); - return E_NOTIMPL; + return ImageList_DragLeave(hwndLock) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_DragMove(IImageList *iface, int x, int y) { - FIXME("STUB: %p %d %d\n", iface, x, y); - return E_NOTIMPL; + return ImageList_DragMove(x, y) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_SetDragCursorImage(IImageList *iface, IUnknown *punk, int iDrag, int dxHotspot, int dyHotspot) { - FIXME("STUB: %p %p %d %d %d\n", iface, punk, iDrag, dxHotspot, dyHotspot); - return E_NOTIMPL; + IImageList *iml2 = NULL; + HRESULT ret; + + if (!punk) + return E_FAIL; + + /* TODO: Add test for IID_ImageList2 too */ + if (!SUCCEEDED(IImageList_QueryInterface(punk, &IID_IImageList, + (void **) &iml2))) + return E_FAIL; + + ret = ImageList_SetDragCursorImage((HIMAGELIST) iml2, iDrag, dxHotspot, + dyHotspot); + + IImageList_Release(iml2); + + return ret ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_DragShowNolock(IImageList *iface, BOOL fShow) { - FIXME("STUB: %p %d\n", iface, fShow); - return E_NOTIMPL; + return ImageList_DragShowNolock(fShow) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_GetDragImage(IImageList *iface, POINT *ppt, POINT *pptHotspot, REFIID riid, PVOID *ppv) { - FIXME("STUB: %p %p %p %s %p\n", iface, ppt, pptHotspot, debugstr_guid(riid), - ppv); - return E_NOTIMPL; + HRESULT ret = E_FAIL; + HIMAGELIST hNew; + + if (!ppv) + return E_FAIL; + + hNew = ImageList_GetDragImage(ppt, pptHotspot); + + /* Get the interface for the new image list */ + if (hNew) + ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); + + return ret; } static HRESULT WINAPI ImageListImpl_GetItemFlags(IImageList *iface, int i, @@ -3285,8 +3305,22 @@ static HRESULT WINAPI ImageListImpl_GetItemFlags(IImageList *iface, int i, static HRESULT WINAPI ImageListImpl_GetOverlayImage(IImageList *iface, int iOverlay, int *piIndex) { - FIXME("STUB: %p %d %p\n", iface, iOverlay, piIndex); - return E_NOTIMPL; + HIMAGELIST This = (HIMAGELIST) iface; + int i; + + if ((iOverlay < 0) || (iOverlay > This->cCurImage)) + return E_FAIL; + + for (i = 0; i < MAX_OVERLAYIMAGE; i++) + { + if (This->nOvlIdx[i] == iOverlay) + { + *piIndex = i + 1; + return S_OK; + } + } + + return E_FAIL; }

1 0

Owen Rudge : comctl32: Implement GetImageRect, Get/SetIconSize, Get/ SetBkColor.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 2e9a6e96e3058749d3beaae5b276555a36d5f56c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e9a6e96e3058749d3beaae5b… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 16 13:27:21 2009 -0600 comctl32: Implement GetImageRect, Get/SetIconSize, Get/SetBkColor. --- dlls/comctl32/imagelist.c | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index cc92486..ff2eff8 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3162,22 +3162,30 @@ static HRESULT WINAPI ImageListImpl_Clone(IImageList *iface, REFIID riid, static HRESULT WINAPI ImageListImpl_GetImageRect(IImageList *iface, int i, RECT *prc) { - FIXME("STUB: %p %d %p\n", iface, i, prc); - return E_NOTIMPL; + HIMAGELIST This = (HIMAGELIST) iface; + IMAGEINFO info; + + if (!prc) + return E_FAIL; + + if (!ImageList_GetImageInfo(This, i, &info)) + return E_FAIL; + + return CopyRect(prc, &info.rcImage) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_GetIconSize(IImageList *iface, int *cx, int *cy) { - FIXME("STUB: %p %p %p\n", iface, cx, cy); - return E_NOTIMPL; + HIMAGELIST This = (HIMAGELIST) iface; + + return ImageList_GetIconSize(This, cx, cy) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_SetIconSize(IImageList *iface, int cx, int cy) { - FIXME("STUB: %p %d %d\n", iface, cx, cy); - return E_NOTIMPL; + return ImageList_SetIconSize((HIMAGELIST) iface, cx, cy) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_GetImageCount(IImageList *iface, int *pi) @@ -3198,14 +3206,20 @@ static HRESULT WINAPI ImageListImpl_SetImageCount(IImageList *iface, static HRESULT WINAPI ImageListImpl_SetBkColor(IImageList *iface, COLORREF clrBk, COLORREF *pclr) { - FIXME("STUB: %p %x %p\n", iface, clrBk, pclr); - return E_NOTIMPL; + if (!pclr) + return E_FAIL; + + *pclr = ImageList_SetBkColor((HIMAGELIST) iface, clrBk); + return *pclr == CLR_NONE ? E_FAIL : S_OK; } static HRESULT WINAPI ImageListImpl_GetBkColor(IImageList *iface, COLORREF *pclr) { - FIXME("STUB: %p %p\n", iface, pclr); - return E_NOTIMPL; + if (!pclr) + return E_FAIL; + + *pclr = ImageList_GetBkColor((HIMAGELIST) iface); + return S_OK; } static HRESULT WINAPI ImageListImpl_BeginDrag(IImageList *iface, int iTrack,

1 0

Owen Rudge : comctl32/tests: Add test of IImageList_Merge function.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 9adc1b8fd67a3ac44fc515de41c4bbe75225f28f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9adc1b8fd67a3ac44fc515de4… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 16 13:27:20 2009 -0600 comctl32/tests: Add test of IImageList_Merge function. --- dlls/comctl32/tests/imagelist.c | 77 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index b97ca9a..f35a641 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1451,6 +1451,82 @@ static void DoTest3_v6(void) DestroyWindow(hwndfortest); } +static void testMerge_v6(void) +{ + HIMAGELIST himl1, himl2; + IImageList *imgl1, *imgl2, *merge; + HICON hicon1; + HWND hwnd = create_a_window(); + HRESULT hr; + int ret; + + himl1 = ImageList_Create(32,32,0,0,3); + ok(himl1 != NULL,"failed to create himl1\n"); + + himl2 = ImageList_Create(32,32,0,0,3); + ok(himl2 != NULL,"failed to create himl2\n"); + + hicon1 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); + ok(hicon1 != NULL, "failed to create hicon1\n"); + + if (!himl1 || !himl2 || !hicon1) + return; + + /* cast to IImageList */ + imgl1 = (IImageList *) himl1; + imgl2 = (IImageList *) himl2; + + ok(SUCCEEDED(IImageList_ReplaceIcon(imgl2, -1, hicon1, &ret)) && (ret == 0),"add icon1 to himl2 failed\n"); + + /* If himl1 has no images, merge still succeeds */ + hr = IImageList_Merge(imgl1, -1, (IUnknown *) imgl2, 0, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl1,-1 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + hr = IImageList_Merge(imgl1, 0, (IUnknown *) imgl2, 0, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl1,0 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + /* Same happens if himl2 is empty */ + IImageList_Release(imgl2); + himl2 = ImageList_Create(32,32,0,0,3); + ok(himl2 != NULL,"failed to recreate himl2\n"); + + imgl2 = (IImageList *) himl2; + + hr = IImageList_Merge(imgl1, -1, (IUnknown *) imgl2, -1, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl2,-1 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + hr = IImageList_Merge(imgl1, -1, (IUnknown *) imgl2, 0, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl2,0 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + /* Now try merging an image with itself */ + ok(SUCCEEDED(IImageList_ReplaceIcon(imgl2, -1, hicon1, &ret)) && (ret == 0),"re-add icon1 to himl2 failed\n"); + + hr = IImageList_Merge(imgl2, 0, (IUnknown *) imgl2, 0, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl2 with itself failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + /* Try merging 2 different image lists */ + ok(SUCCEEDED(IImageList_ReplaceIcon(imgl1, -1, hicon1, &ret)) && (ret == 0),"add icon1 to himl1 failed\n"); + + hr = IImageList_Merge(imgl1, 0, (IUnknown *) imgl2, 0, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl1 with himl2 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + hr = IImageList_Merge(imgl1, 0, (IUnknown *) imgl2, 0, 8, 16, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl1 with himl2 8,16 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + IImageList_Release(imgl1); + IImageList_Release(imgl2); + + DestroyIcon(hicon1); + DestroyWindow(hwnd); +} + START_TEST(imagelist) { ULONG_PTR ctx_cookie; @@ -1497,6 +1573,7 @@ START_TEST(imagelist) test_iimagelist(); DoTest1_v6(); DoTest3_v6(); + testMerge_v6(); CoUninitialize();

1 0

Paul Vriens : advapi32/tests: Fix some test failures on NT4.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: bfa2479d4d9a9a7974b7d410dcbee8ddf26f850c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa2479d4d9a9a7974b7d410d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 17 09:48:44 2009 +0100 advapi32/tests: Fix some test failures on NT4. --- dlls/advapi32/tests/security.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 94be18a..a327c53 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3301,7 +3301,8 @@ static void test_EqualSid(void) SetLastError(0xdeadbeef); ret = EqualSid(sid1, sid2); ok(!ret, "World and domain admins sids shouldn't have been equal\n"); - ok(GetLastError() == ERROR_SUCCESS, + ok(GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), /* NT4 */ "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", GetLastError()); @@ -3319,7 +3320,8 @@ static void test_EqualSid(void) SetLastError(0xdeadbeef); ret = EqualSid(sid1, sid2); ok(ret, "Same sids should have been equal\n"); - ok(GetLastError() == ERROR_SUCCESS, + ok(GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), /* NT4 */ "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", GetLastError()); @@ -3327,7 +3329,8 @@ static void test_EqualSid(void) SetLastError(0xdeadbeef); ret = EqualSid(sid1, sid2); ok(!ret, "EqualSid with invalid sid should have returned FALSE\n"); - ok(GetLastError() == ERROR_SUCCESS, + ok(GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), /* NT4 */ "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", GetLastError()); ((SID *)sid2)->Revision = SID_REVISION;

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2009