Ros-diffs September 2014

ros-diffs@reactos.org

16 participants
413 discussions

[akhaldi] 64330: [CRYPT32_WINETEST] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 10:36:54 2014 New Revision: 64330 URL: http://svn.reactos.org/svn/reactos?rev=64330&view=rev Log: [CRYPT32_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/crypt32/cert.c trunk/rostests/winetests/crypt32/chain.c trunk/rostests/winetests/crypt32/encode.c trunk/rostests/winetests/crypt32/sip.c trunk/rostests/winetests/crypt32/str.c Modified: trunk/rostests/winetests/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/cert.c?… ============================================================================== --- trunk/rostests/winetests/crypt32/cert.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/cert.c [iso-8859-1] Sat Sep 27 10:36:54 2014 @@ -797,7 +797,7 @@ ok(link->pCertInfo == context->pCertInfo, "unexpected pCertInfo\n"); CertFreeCertificateContext(link); - + CertFreeCertificateContext(context); CertCloseStore(store, 0); } @@ -1564,8 +1564,12 @@ static void testGetIssuerCert(void) { BOOL ret; - PCCERT_CONTEXT parent, child, cert1, cert2; - DWORD flags = 0xffffffff; + PCCERT_CONTEXT parent, child, cert1, cert2, cert3; + DWORD flags = 0xffffffff, size; + CERT_NAME_BLOB certsubject; + BYTE *certencoded; + WCHAR rootW[] = {'R', 'O', 'O', 'T', '\0'}, + certname[] = {'C', 'N', '=', 'd', 'u', 'm', 'm', 'y', ',', ' ', 'T', '=', 'T', 'e', 's', 't', '\0'}; HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -1640,6 +1644,7 @@ ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); ok(parent == NULL, "Expected no issuer\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); /* Adding an issuer allows one (and only one) issuer to be found */ ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain10_1, sizeof(chain10_1), CERT_STORE_ADD_ALWAYS, &cert1); @@ -1648,6 +1653,7 @@ ok(parent == cert1, "Expected cert1 to be the issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); ok(parent == NULL, "Expected only one issuer\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); /* Adding a second issuer allows two issuers to be found - and the second * issuer is found before the first, implying certs are added to the head * of a list. @@ -1661,6 +1667,7 @@ ok(parent == cert1, "Expected cert1 to be the second issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); ok(parent == NULL, "Expected no more than two issuers\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); CertFreeCertificateContext(child); CertFreeCertificateContext(cert1); CertFreeCertificateContext(cert2); @@ -1677,6 +1684,7 @@ ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); ok(parent == NULL, "Expected no issuer\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); /* Adding an issuer allows one (and only one) issuer to be found */ ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain10_0, sizeof(chain10_0), CERT_STORE_ADD_ALWAYS, &cert1); @@ -1685,6 +1693,7 @@ ok(parent == cert1, "Expected cert1 to be the issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); ok(parent == NULL, "Expected only one issuer\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); /* Adding a second issuer allows two issuers to be found - and the second * issuer is found before the first, implying certs are added to the head * of a list. @@ -1698,9 +1707,47 @@ ok(parent == cert1, "Expected cert1 to be the second issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); ok(parent == NULL, "Expected no more than two issuers\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08X\n", GetLastError()); + + /* Self-sign a certificate, add to the store and test getting the issuer */ + size = 0; + ok(CertStrToNameW(X509_ASN_ENCODING, certname, CERT_X500_NAME_STR, NULL, NULL, &size, NULL), + "CertStrToName should have worked\n"); + certencoded = HeapAlloc(GetProcessHeap(), 0, size); + ok(CertStrToNameW(X509_ASN_ENCODING, certname, CERT_X500_NAME_STR, NULL, certencoded, &size, NULL), + "CertStrToName should have worked\n"); + certsubject.pbData = certencoded; + certsubject.cbData = size; + cert3 = CertCreateSelfSignCertificate(0, &certsubject, 0, NULL, NULL, NULL, NULL, NULL); + ok(cert3 != NULL, "CertCreateSelfSignCertificate should have worked\n"); + ret = CertAddCertificateContextToStore(store, cert3, CERT_STORE_ADD_REPLACE_EXISTING, 0); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); + CertFreeCertificateContext(cert3); + cert3 = CertEnumCertificatesInStore(store, NULL); + ok(cert3 != NULL, "CertEnumCertificatesInStore should have worked\n"); + SetLastError(0xdeadbeef); + flags = 0; + parent = CertGetIssuerCertificateFromStore(store, cert3, NULL, &flags); + ok(!parent, "Expected NULL\n"); + ok(GetLastError() == CRYPT_E_SELF_SIGNED, + "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); CertFreeCertificateContext(child); CertFreeCertificateContext(cert1); CertFreeCertificateContext(cert2); + CertCloseStore(store, 0); + HeapFree(GetProcessHeap(), 0, certencoded); + + /* Test root storage self-signed certificate */ + store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, rootW); + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); + flags = 0; + cert1 = CertEnumCertificatesInStore(store, NULL); + ok(cert1 != NULL, "CertEnumCertificatesInStore should have worked\n"); + SetLastError(0xdeadbeef); + parent = CertGetIssuerCertificateFromStore(store, cert1, NULL, &flags); + ok(!parent, "Expected NULL\n"); + ok(GetLastError() == CRYPT_E_SELF_SIGNED, + "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); CertCloseStore(store, 0); } @@ -2343,6 +2390,7 @@ "Expected NTE_NO_KEY, got %08x\n", GetLastError()); ret = CryptGenKey(csp, AT_KEYEXCHANGE, 0, &key); ok(ret, "CryptGenKey failed: %08x\n", GetLastError()); + CryptDestroyKey(key); memset(&info,0,sizeof(info)); info.dwProvType = PROV_RSA_FULL; Modified: trunk/rostests/winetests/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/chain.c… ============================================================================== --- trunk/rostests/winetests/crypt32/chain.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/chain.c [iso-8859-1] Sat Sep 27 10:36:54 2014 @@ -3347,14 +3347,6 @@ { sizeof(chain0_0), chain0_0 }, { sizeof(chain29_1), chain29_1 }, }; -static const CERT_TRUST_STATUS elementStatus29[] = { - { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, - CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, -}; -static const SimpleChainStatusCheck simpleStatus29[] = { - { sizeof(elementStatus29) / sizeof(elementStatus29[0]), elementStatus29 }, -}; static CONST_DATA_BLOB chain30[] = { { sizeof(chain0_0), chain0_0 }, { sizeof(chain30_1), chain30_1 }, @@ -4228,10 +4220,6 @@ { 0, 0, -1, -1, NULL}, &expiredStatus, 0 }; -/* Windows NT 4 has a different error code when the name doesn't match. */ -static const CERT_CHAIN_POLICY_STATUS noMatchingNameBrokenStatus = - { 0, CERT_E_ROLE, 0, 0, NULL }; - /* Win98 does not trust the root of the OpenSSL chain or the Stanford chain */ static const CERT_CHAIN_POLICY_STATUS untrustedRootStatus = { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }; Modified: trunk/rostests/winetests/crypt32/encode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/encode.… ============================================================================== --- trunk/rostests/winetests/crypt32/encode.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/encode.c [iso-8859-1] Sat Sep 27 10:36:54 2014 @@ -2055,7 +2055,6 @@ static const unsigned char bin55[] = { 0xff,0xfe }; static const unsigned char bin56[] = { 0x03,0x02,0x01,0xfe }; static const unsigned char bin57[] = { 0xfe }; -static const unsigned char bin58[] = { 0x03,0x01,0x00 }; static const struct encodedBits bits[] = { /* normal test cases */ Modified: trunk/rostests/winetests/crypt32/sip.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/sip.c?r… ============================================================================== --- trunk/rostests/winetests/crypt32/sip.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/sip.c [iso-8859-1] Sat Sep 27 10:36:54 2014 @@ -119,6 +119,9 @@ newprov.pwszRemoveFuncName = dummyfunction; newprov.pwszIsFunctionNameFmt2 = dummyfunction; newprov.pwszIsFunctionName = dummyfunction; + /* If GetCapFuncName set to NULL, then CryptSIPRemoveProvider fails on win 8 */ + newprov.pwszGetCapFuncName = dummyfunction; + SetLastError(0xdeadbeef); ret = CryptSIPAddProvider(&newprov); ok ( ret, "CryptSIPAddProvider should have succeeded, last error %d\n", GetLastError()); Modified: trunk/rostests/winetests/crypt32/str.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/str.c?r… ============================================================================== --- trunk/rostests/winetests/crypt32/str.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/str.c [iso-8859-1] Sat Sep 27 10:36:54 2014 @@ -450,6 +450,15 @@ static BYTE encodedNewlineCN[] = { 0x30,0x11,0x31,0x0f,0x30,0x0d,0x06,0x03,0x55,0x04,0x03,0x1e,0x06,0x00,0x61, 0x00,0x0a,0x00,0x62 }; +static BYTE encodedDummyCN[] = { +0x30,0x1F,0x31,0x0E,0x30,0x0C,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x64,0x75, +0x6D,0x6D,0x79,0x31,0x0D,0x30,0x0B,0x06,0x03,0x55,0x04,0x0C,0x13,0x04,0x74, +0x65,0x73,0x74 }; +static BYTE encodedFields[] = { +0x30,0x2F,0x31,0x12,0x30,0x10,0x06,0x03,0x55,0x04,0x03,0x13,0x09,0x57,0x69, +0x6E,0x65,0x20,0x54,0x65,0x73,0x74,0x31,0x0C,0x30,0x0A,0x06,0x03,0x55,0x04, +0x0C,0x13,0x03,0x31,0x32,0x33,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06, +0x13,0x02,0x42,0x52 }; static void test_CertNameToStrA(void) { @@ -756,6 +765,8 @@ { "CN=\">\"", sizeof(encodedGreaterThanCN), encodedGreaterThanCN }, { "CN=\"#\"", sizeof(encodedHashCN), encodedHashCN }, { "CN=\";\"", sizeof(encodedSemiCN), encodedSemiCN }, + { "CN=dummy,T=test", sizeof(encodedDummyCN), encodedDummyCN }, + { " CN = Wine Test,T = 123, C = BR", sizeof(encodedFields), encodedFields }, }; static void test_CertStrToNameA(void) @@ -849,6 +860,10 @@ static const WCHAR simpleCN2_W[] = { 'C','N','=','"','1','"',0 }; static const WCHAR simpleCN3_W[] = { 'C','N',' ','=',' ','"','1','"',0 }; static const WCHAR japaneseCN_W[] = { 'C','N','=',0x226f,0x575b,0 }; +static const WCHAR dummyCN_W[] = { 'C','N','=','d','u','m','m','y',',','T','=','t','e','s','t',0 }; +static const WCHAR encodedFields_W[] = { ' ','C','N',' ','=',' ',' ',' ','W','i','n','e',' ','T', + 'e','s','t',',','T',' ','=',' ','1','2','3',',',' ','C', + ' ','=',' ','B','R',0 }; static const BYTE encodedJapaneseCN[] = { 0x30,0x0f,0x31,0x0d,0x30,0x0b,0x06, 0x03,0x55,0x04,0x03,0x1e,0x04,0x22,0x6f,0x57,0x5b }; @@ -867,6 +882,8 @@ { greaterThanCN_W, sizeof(encodedGreaterThanCN), encodedGreaterThanCN }, { hashCN_W, sizeof(encodedHashCN), encodedHashCN }, { semiCN_W, sizeof(encodedSemiCN), encodedSemiCN }, + { dummyCN_W, sizeof(encodedDummyCN), encodedDummyCN }, + { encodedFields_W, sizeof(encodedFields), encodedFields }, }; static void test_CertStrToNameW(void) @@ -922,7 +939,7 @@ size); if (ret) ok(!memcmp(buf, namesW[i].encoded, size), - "Index %d: unexpected value\n", i); + "Index %d: unexpected value for string %s\n", i, wine_dbgstr_w(namesW[i].x500)); } }

10 years, 1 month

[akhaldi] 64329: [CRYPT32] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 10:36:45 2014 New Revision: 64329 URL: http://svn.reactos.org/svn/reactos?rev=64329&view=rev Log: [CRYPT32] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/crypt32/cert.c trunk/reactos/dll/win32/crypt32/chain.c trunk/reactos/dll/win32/crypt32/crypt32_private.h trunk/reactos/dll/win32/crypt32/sip.c trunk/reactos/dll/win32/crypt32/str.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cert.c?r… ============================================================================== --- trunk/reactos/dll/win32/crypt32/cert.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/cert.c [iso-8859-1] Sat Sep 27 10:36:45 2014 @@ -1873,6 +1873,12 @@ { CertFreeCertificateContext(ret); ret = NULL; + } + if (CRYPT_IsCertificateSelfSigned(pSubjectContext)) + { + CertFreeCertificateContext(ret); + ret = NULL; + SetLastError(CRYPT_E_SELF_SIGNED); } } TRACE("returning %p\n", ret); Modified: trunk/reactos/dll/win32/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/chain.c?… ============================================================================== --- trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] Sat Sep 27 10:36:45 2014 @@ -258,7 +258,7 @@ LONG ref; } CertificateChain; -static BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) +BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) { PCERT_EXTENSION ext; DWORD size; Modified: trunk/reactos/dll/win32/crypt32/crypt32_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_private.h [iso-8859-1] Sat Sep 27 10:36:45 2014 @@ -366,6 +366,7 @@ WINECRYPT_CERTSTORE *CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) DECLSPEC_HIDDEN; WINECRYPT_CERTSTORE *CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags) DECLSPEC_HIDDEN; +BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) DECLSPEC_HIDDEN; /* Allocates and initializes a certificate chain engine, but without creating * the root store. Instead, it uses root, and assumes the caller has done any Modified: trunk/reactos/dll/win32/crypt32/sip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/sip.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/sip.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/sip.c [iso-8859-1] Sat Sep 27 10:36:45 2014 @@ -198,7 +198,7 @@ TRACE("%p\n", psNewProv); if (!psNewProv || - psNewProv->cbStruct != sizeof(SIP_ADD_NEWPROVIDER) || + psNewProv->cbStruct < FIELD_OFFSET(SIP_ADD_NEWPROVIDER, pwszGetCapFuncName) || !psNewProv->pwszGetFuncName || !psNewProv->pwszPutFuncName || !psNewProv->pwszCreateFuncName || Modified: trunk/reactos/dll/win32/crypt32/str.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/str.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/str.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/str.c [iso-8859-1] Sat Sep 27 10:36:45 2014 @@ -831,13 +831,14 @@ /* Assumes separators are characters in the 0-255 range */ static BOOL CRYPT_GetNextValueW(LPCWSTR str, DWORD dwFlags, LPCWSTR separators, - struct X500TokenW *token, LPCWSTR *ppszError) + WCHAR *separator_used, struct X500TokenW *token, LPCWSTR *ppszError) { BOOL ret = TRUE; TRACE("(%s, %s, %p, %p)\n", debugstr_w(str), debugstr_w(separators), token, ppszError); + *separator_used = 0; while (*str && isspaceW(*str)) str++; if (*str) @@ -877,6 +878,7 @@ while (*str && (*str >= 0xff || !map[*str])) str++; token->end = str; + if (map[*str]) *separator_used = *str; } } else @@ -1068,6 +1070,7 @@ static const WCHAR allSepsWithoutPlus[] = { ',',';','\r','\n',0 }; static const WCHAR allSeps[] = { '+',',',';','\r','\n',0 }; LPCWSTR sep; + WCHAR sep_used; str++; if (dwStrType & CERT_NAME_STR_COMMA_FLAG) @@ -1080,11 +1083,14 @@ sep = allSepsWithoutPlus; else sep = allSeps; - ret = CRYPT_GetNextValueW(str, dwStrType, sep, &token, + ret = CRYPT_GetNextValueW(str, dwStrType, sep, &sep_used, &token, ppszError); if (ret) { str = token.end; + /* if token.end points to the separator, skip it */ + if (str && sep_used && *str == sep_used) str++; + ret = CRYPT_ValueToRDN(dwCertEncodingType, &info, keyOID, &token, dwStrType, ppszError); } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 27 10:36:45 2014 @@ -64,7 +64,7 @@ reactos/dll/win32/comdlg32 # Synced to Wine-1.7.27 reactos/dll/win32/compstui # Synced to Wine-1.7.17 reactos/dll/win32/credui # Synced to Wine-1.7.17 -reactos/dll/win32/crypt32 # Synced to Wine-1.7.17 +reactos/dll/win32/crypt32 # Synced to Wine-1.7.27 reactos/dll/win32/cryptdlg # Synced to Wine-1.7.17 reactos/dll/win32/cryptdll # Synced to Wine-1.7.17 reactos/dll/win32/cryptnet # Synced to Wine-1.7.17

10 years, 1 month

[akhaldi] 64328: [PSDK] * Update SIP_ADD_NEWPROVIDER. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 10:29:56 2014 New Revision: 64328 URL: http://svn.reactos.org/svn/reactos?rev=64328&view=rev Log: [PSDK] * Update SIP_ADD_NEWPROVIDER. CORE-8540 Modified: trunk/reactos/include/psdk/mssip.h Modified: trunk/reactos/include/psdk/mssip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mssip.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/mssip.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mssip.h [iso-8859-1] Sat Sep 27 10:29:56 2014 @@ -156,6 +156,9 @@ WCHAR *pwszRemoveFuncName; WCHAR *pwszIsFunctionNameFmt2; + + /* NTDDI_VERSION >= NTDDI_WIN8 */ + WCHAR *pwszGetCapFuncName; } SIP_ADD_NEWPROVIDER, *PSIP_ADD_NEWPROVIDER; #include <poppack.h>

10 years, 1 month

[akhaldi] 64327: [MSISIP] * Don't assign ordinals to Dll{Register, Unregister}Server() exports.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 10:28:33 2014 New Revision: 64327 URL: http://svn.reactos.org/svn/reactos?rev=64327&view=rev Log: [MSISIP] * Don't assign ordinals to Dll{Register,Unregister}Server() exports. Modified: trunk/reactos/dll/win32/msisip/msisip.spec Modified: trunk/reactos/dll/win32/msisip/msisip.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisip/msisip.sp… ============================================================================== --- trunk/reactos/dll/win32/msisip/msisip.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msisip/msisip.spec [iso-8859-1] Sat Sep 27 10:28:33 2014 @@ -4,5 +4,5 @@ 8 stub MsiSIPRemoveSignedDataMsg 9 stub MsiSIPCreateIndirectData 10 stub MsiSIPVerifyIndirectData -11 stdcall -private DllRegisterServer() -12 stdcall -private DllUnregisterServer() +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

10 years, 1 month

[akhaldi] 64326: [COMDLG32_WINETEST] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 10:18:07 2014 New Revision: 64326 URL: http://svn.reactos.org/svn/reactos?rev=64326&view=rev Log: [COMDLG32_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/comdlg32/itemdlg.c Modified: trunk/rostests/winetests/comdlg32/itemdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/itemdl… ============================================================================== --- trunk/rostests/winetests/comdlg32/itemdlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/itemdlg.c [iso-8859-1] Sat Sep 27 10:18:07 2014 @@ -30,6 +30,16 @@ #include <shlobj.h> +#define IDT_CHANGEFILETYPE 500 +#define IDT_CLOSEDIALOG 501 + +typedef enum { + IFDEVENT_TEST_NONE = 0, + IFDEVENT_TEST1 = 0x1, + IFDEVENT_TEST2 = 0x2, + IFDEVENT_TEST3 = 0x3 +} FileDialogEventsTest; + static HRESULT (WINAPI *pSHCreateShellItem)(LPCITEMIDLIST,IShellFolder*,LPCITEMIDLIST,IShellItem**); static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHCreateItemFromParsingName)(PCWSTR,IBindCtx*,REFIID,void**); @@ -47,6 +57,62 @@ #include <initguid.h> DEFINE_GUID(IID_IFileDialogCustomizeAlt, 0x8016B7B3, 0x3D49, 0x4504, 0xA0,0xAA, 0x2A,0x37,0x49,0x4E,0x60,0x6F); + +struct fw_arg { + LPCWSTR class, text; + HWND hwnd_res; +}; + +static BOOL CALLBACK find_window_callback(HWND hwnd, LPARAM lparam) +{ + struct fw_arg *arg = (struct fw_arg*)lparam; + WCHAR buf[1024]; + + if(arg->class) + { + GetClassNameW(hwnd, buf, 1024); + if(lstrcmpW(buf, arg->class)) + return TRUE; + } + + if(arg->text) + { + GetWindowTextW(hwnd, buf, 1024); + if(lstrcmpW(buf, arg->text)) + return TRUE; + } + + arg->hwnd_res = hwnd; + return FALSE; +} + +static HWND find_window(HWND parent, LPCWSTR class, LPCWSTR text) +{ + struct fw_arg arg = {class, text, NULL}; + + EnumChildWindows(parent, find_window_callback, (LPARAM)&arg); + return arg.hwnd_res; +} + +static HWND get_hwnd_from_ifiledialog(IFileDialog *pfd) +{ + IOleWindow *pow; + HWND dlg_hwnd; + HRESULT hr; + + hr = IFileDialog_QueryInterface(pfd, &IID_IOleWindow, (void**)&pow); + ok(hr == S_OK, "Got 0x%08x\n", hr); + + hr = IOleWindow_GetWindow(pow, &dlg_hwnd); + ok(hr == S_OK, "Got 0x%08x\n", hr); + + IOleWindow_Release(pow); + + return dlg_hwnd; +} + +static void test_customize_onfolderchange(IFileDialog *pfd); +static void filedialog_change_filetype(IFileDialog *pfd, HWND dlg_hwnd); /************************************************************************** * IFileDialogEvents implementation @@ -60,7 +126,7 @@ LONG OnOverwrite; LPCWSTR set_filename; BOOL set_filename_tried; - BOOL cfd_test1; + FileDialogEventsTest events_test; } IFileDialogEventsImpl; static inline IFileDialogEventsImpl *impl_from_IFileDialogEvents(IFileDialogEvents *iface) @@ -108,25 +174,39 @@ return S_OK; } -static void test_customize_onfolderchange(IFileDialog *pfd); - -static LRESULT CALLBACK test_customize_dlgproc(HWND hwnd, UINT message, LPARAM lparam, WPARAM wparam) +static LRESULT CALLBACK test_customize_dlgproc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { WNDPROC oldwndproc = GetPropA(hwnd, "WT_OLDWC"); - - if(message == WM_USER+0x1234) - { - IFileDialog *pfd = (IFileDialog*)lparam; + IFileDialog *pfd = GetPropA(hwnd, "WT_PFD"); + BOOL br; + + switch(message) + { + case WM_USER+0x1234: test_customize_onfolderchange(pfd); - } - - return CallWindowProcW(oldwndproc, hwnd, message, lparam, wparam); + break; + case WM_TIMER: + switch(wparam) + { + case IDT_CHANGEFILETYPE: + filedialog_change_filetype(pfd, hwnd); + KillTimer(hwnd, IDT_CHANGEFILETYPE); + SetTimer(hwnd, IDT_CLOSEDIALOG, 100, 0); + return TRUE; + case IDT_CLOSEDIALOG: + /* Calling IFileDialog_Close here does not work */ + br = PostMessageW(hwnd, WM_COMMAND, IDCANCEL, 0); + ok(br, "Failed\n"); + return TRUE; + } + } + + return CallWindowProcW(oldwndproc, hwnd, message, wparam, lparam); } static HRESULT WINAPI IFileDialogEvents_fnOnFolderChange(IFileDialogEvents *iface, IFileDialog *pfd) { IFileDialogEventsImpl *This = impl_from_IFileDialogEvents(iface); - IOleWindow *pow; HWND dlg_hwnd; HRESULT hr; BOOL br; @@ -134,14 +214,8 @@ if(This->set_filename) { - hr = IFileDialog_QueryInterface(pfd, &IID_IOleWindow, (void**)&pow); - ok(hr == S_OK, "Got 0x%08x\n", hr); - - hr = IOleWindow_GetWindow(pow, &dlg_hwnd); - ok(hr == S_OK, "Got 0x%08x\n", hr); + dlg_hwnd = get_hwnd_from_ifiledialog(pfd); ok(dlg_hwnd != NULL, "Got NULL.\n"); - - IOleWindow_Release(pow); hr = IFileDialog_SetFileName(pfd, This->set_filename); ok(hr == S_OK, "Got 0x%08x\n", hr); @@ -154,27 +228,35 @@ } } - if(This->cfd_test1) + if(This->events_test) { WNDPROC oldwndproc; - hr = IFileDialog_QueryInterface(pfd, &IID_IOleWindow, (void**)&pow); - ok(hr == S_OK, "Got 0x%08x\n", hr); - - hr = IOleWindow_GetWindow(pow, &dlg_hwnd); - ok(hr == S_OK, "Got 0x%08x\n", hr); - ok(dlg_hwnd != NULL, "Got NULL.\n"); - - IOleWindow_Release(pow); + + dlg_hwnd = get_hwnd_from_ifiledialog(pfd); /* On Vista, the custom control area of the dialog is not * fully set up when the first OnFolderChange event is * issued. */ oldwndproc = (WNDPROC)GetWindowLongPtrW(dlg_hwnd, GWLP_WNDPROC); SetPropA(dlg_hwnd, "WT_OLDWC", (HANDLE)oldwndproc); + SetPropA(dlg_hwnd, "WT_PFD", (HANDLE)pfd); SetWindowLongPtrW(dlg_hwnd, GWLP_WNDPROC, (LPARAM)test_customize_dlgproc); - br = PostMessageW(dlg_hwnd, WM_USER+0x1234, (LPARAM)pfd, 0); - ok(br, "Failed\n"); + switch(This->events_test) + { + case IFDEVENT_TEST1: + br = PostMessageW(dlg_hwnd, WM_USER+0x1234, 0, 0); + ok(br, "Failed\n"); + break; + case IFDEVENT_TEST2: + SetTimer(dlg_hwnd, IDT_CLOSEDIALOG, 100, 0); + break; + case IFDEVENT_TEST3: + SetTimer(dlg_hwnd, IDT_CHANGEFILETYPE, 100, 0); + break; + default: + ok(FALSE, "Should not happen (%d)\n", This->events_test); + } } return S_OK; @@ -566,8 +648,6 @@ hr = IFileOpenDialog_SetFileTypes(pfod, 0, filterspec); ok(hr == S_OK, "got 0x%08x.\n", hr); - hr = IFileOpenDialog_SetFileTypeIndex(pfod, -1); - ok(hr == E_FAIL, "got 0x%08x.\n", hr); hr = IFileOpenDialog_SetFileTypeIndex(pfod, 0); ok(hr == E_FAIL, "got 0x%08x.\n", hr); hr = IFileOpenDialog_SetFileTypeIndex(pfod, 1); @@ -578,25 +658,39 @@ ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); hr = IFileOpenDialog_SetFileTypeIndex(pfod, 0); ok(hr == S_OK, "got 0x%08x.\n", hr); + hr = IFileOpenDialog_GetFileTypeIndex(pfod, &filetype); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(filetype == 1, "got %d\n", filetype); hr = IFileOpenDialog_SetFileTypeIndex(pfod, 100); ok(hr == S_OK, "got 0x%08x.\n", hr); + hr = IFileOpenDialog_GetFileTypeIndex(pfod, &filetype); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(filetype == 1, "got %d\n", filetype); hr = IFileOpenDialog_SetFileTypes(pfod, 1, filterspec); ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); hr = IFileOpenDialog_SetFileTypes(pfod, 1, &filterspec[1]); ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); - hr = IFileSaveDialog_SetFileTypeIndex(pfsd, -1); - ok(hr == E_FAIL, "got 0x%08x.\n", hr); hr = IFileSaveDialog_SetFileTypeIndex(pfsd, 0); ok(hr == E_FAIL, "got 0x%08x.\n", hr); hr = IFileSaveDialog_SetFileTypeIndex(pfsd, 1); ok(hr == E_FAIL, "got 0x%08x.\n", hr); - hr = IFileSaveDialog_SetFileTypes(pfsd, 1, filterspec); - ok(hr == S_OK, "got 0x%08x.\n", hr); + hr = IFileSaveDialog_SetFileTypes(pfsd, 2, filterspec); + ok(hr == S_OK, "got 0x%08x.\n", hr); + hr = IFileSaveDialog_GetFileTypeIndex(pfsd, &filetype); + ok(hr == S_OK, "got 0x%08x.\n", hr); + /* I hope noone relies on this one */ + todo_wine ok(filetype == 0, "got %d\n", filetype); hr = IFileSaveDialog_SetFileTypeIndex(pfsd, 0); ok(hr == S_OK, "got 0x%08x.\n", hr); + hr = IFileSaveDialog_GetFileTypeIndex(pfsd, &filetype); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(filetype == 1, "got %d\n", filetype); hr = IFileSaveDialog_SetFileTypeIndex(pfsd, 100); ok(hr == S_OK, "got 0x%08x.\n", hr); + hr = IFileSaveDialog_GetFileTypeIndex(pfsd, &filetype); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(filetype == 2, "got %d\n", filetype); hr = IFileSaveDialog_SetFileTypes(pfsd, 1, filterspec); ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); hr = IFileSaveDialog_SetFileTypes(pfsd, 1, &filterspec[1]); @@ -1011,6 +1105,168 @@ test_advise_helper(pfd); ref = IFileDialog_Release(pfd); ok(!ref, "Got refcount %d, should have been released.\n", ref); +} + +static void filedialog_change_filetype(IFileDialog *pfd, HWND dlg_hwnd) +{ + HWND cb_filetype; + const WCHAR filetype1[] = {'f','n','a','m','e','1',0}; + const WCHAR filetype1_broken[] = {'f','n','a','m','e','1',' ', '(','*','.','t','x','t',')',0}; + + cb_filetype = find_window(dlg_hwnd, NULL, filetype1); + ok(cb_filetype != NULL || broken(cb_filetype == NULL), "Could not find combobox on first attempt\n"); + + if(!cb_filetype) + { + /* Not sure when this happens. Some specific version? + * Seen on 32-bit English Vista */ + trace("Didn't find combobox on first attempt, trying broken string..\n"); + cb_filetype = find_window(dlg_hwnd, NULL, filetype1_broken); + ok(broken(cb_filetype != NULL), "Failed to find combobox on second attempt\n"); + if(!cb_filetype) + return; + } + + /* Making the combobox send a CBN_SELCHANGE */ + SendMessageW( cb_filetype, CB_SHOWDROPDOWN, 1, 0 ); + SendMessageW( cb_filetype, CB_SETCURSEL, 1, 0 ); + SendMessageW( cb_filetype, WM_LBUTTONDOWN, 0, -1 ); + SendMessageW( cb_filetype, WM_LBUTTONUP, 0, -1 ); +} + +static void test_events(void) +{ + IFileDialog *pfd; + IFileDialogEventsImpl *pfdeimpl; + IFileDialogEvents *pfde; + DWORD cookie; + ULONG ref; + HRESULT hr; + const WCHAR fname1[] = {'f','n','a','m','e','1', 0}; + const WCHAR fspec1[] = {'*','.','t','x','t',0}; + const WCHAR fname2[] = {'f','n','a','m','e','2', 0}; + const WCHAR fspec2[] = {'*','.','e','x','e',0}; + COMDLG_FILTERSPEC filterspec[3] = {{fname1, fspec1}, {fname2, fspec2}}; + + + /* + * 1. Show the dialog with no filetypes added + */ + hr = CoCreateInstance(&CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&pfd); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + pfde = IFileDialogEvents_Constructor(); + pfdeimpl = impl_from_IFileDialogEvents(pfde); + pfdeimpl->events_test = IFDEVENT_TEST2; + + hr = IFileDialog_Advise(pfd, pfde, &cookie); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileDialog_Show(pfd, NULL); + ok(hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "got 0x%08x.\n", hr); + + ok(pfdeimpl->OnFolderChanging == 1, "Got %d\n", pfdeimpl->OnFolderChanging); + pfdeimpl->OnFolderChanging = 0; + ok(pfdeimpl->OnFolderChange == 1, "Got %d\n", pfdeimpl->OnFolderChange); + pfdeimpl->OnFolderChange = 0; + /* pfdeimpl->OnSelectionChange too unreliable to test. Can be 0, 1 or even 2. */ + pfdeimpl->OnSelectionChange = 0; + ok(pfdeimpl->OnTypeChange == 0, "Got %d\n", pfdeimpl->OnTypeChange); + pfdeimpl->OnTypeChange = 0; + + ensure_zero_events(pfdeimpl); + + hr = IFileDialog_Unadvise(pfd, cookie); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + IFileDialogEvents_Release(pfde); + ref = IFileDialog_Release(pfd); + ok(!ref || broken(ref /* win2008_64 (intermittently) */), "Got %d\n", ref); + + + /* + * 2. Show the dialog with filetypes added + */ + hr = CoCreateInstance(&CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&pfd); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + pfde = IFileDialogEvents_Constructor(); + pfdeimpl = impl_from_IFileDialogEvents(pfde); + pfdeimpl->events_test = IFDEVENT_TEST2; + + hr = IFileDialog_Advise(pfd, pfde, &cookie); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileDialog_SetFileTypes(pfd, 2, filterspec); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + ensure_zero_events(pfdeimpl); + + hr = IFileDialog_Show(pfd, NULL); + ok(hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "got 0x%08x.\n", hr); + + ok(pfdeimpl->OnFolderChanging == 1, "Got %d\n", pfdeimpl->OnFolderChanging); + pfdeimpl->OnFolderChanging = 0; + ok(pfdeimpl->OnFolderChange == 1, "Got %d\n", pfdeimpl->OnFolderChange); + pfdeimpl->OnFolderChange = 0; + /* pfdeimpl->OnSelectionChange too unreliable to test. Can be 0, 1 or even 2. */ + pfdeimpl->OnSelectionChange = 0; + /* Called once just by showing the dialog */ + ok(pfdeimpl->OnTypeChange == 1, "Got %d\n", pfdeimpl->OnTypeChange); + pfdeimpl->OnTypeChange = 0; + + ensure_zero_events(pfdeimpl); + + hr = IFileDialog_Unadvise(pfd, cookie); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + IFileDialogEvents_Release(pfde); + ref = IFileDialog_Release(pfd); + ok(!ref || broken(ref /* win2008_64 (intermittently) */), "Got %d\n", ref); + + + /* + * 3. Show the dialog with filetypes added and simulate manual change of filetype + */ + hr = CoCreateInstance(&CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&pfd); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + pfde = IFileDialogEvents_Constructor(); + pfdeimpl = impl_from_IFileDialogEvents(pfde); + pfdeimpl->events_test = IFDEVENT_TEST3; + + hr = IFileDialog_Advise(pfd, pfde, &cookie); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileDialog_SetFileTypes(pfd, 2, filterspec); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + ensure_zero_events(pfdeimpl); + + hr = IFileDialog_Show(pfd, NULL); + ok(hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "got 0x%08x.\n", hr); + + ok(pfdeimpl->OnFolderChanging == 1, "Got %d\n", pfdeimpl->OnFolderChanging); + pfdeimpl->OnFolderChanging = 0; + ok(pfdeimpl->OnFolderChange == 1, "Got %d\n", pfdeimpl->OnFolderChange); + pfdeimpl->OnFolderChange = 0; + /* pfdeimpl->OnSelectionChange too unreliable to test. Can be 0, 1 or even 2. */ + pfdeimpl->OnSelectionChange = 0; + /* Called once by showing the dialog and once again when changing the filetype */ + todo_wine ok(pfdeimpl->OnTypeChange == 2, "Got %d\n", pfdeimpl->OnTypeChange); + pfdeimpl->OnTypeChange = 0; + + ensure_zero_events(pfdeimpl); + + hr = IFileDialog_Unadvise(pfd, cookie); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + IFileDialogEvents_Release(pfde); + ref = IFileDialog_Release(pfd); + ok(!ref || broken(ref /* win2008_64 (intermittently) */), "Got %d\n", ref); } static void touch_file(LPCWSTR filename) @@ -1274,57 +1530,16 @@ static const WCHAR floatnotifysinkW[] = {'F','l','o','a','t','N','o','t','i','f','y','S','i','n','k',0}; static const WCHAR RadioButtonListW[] = {'R','a','d','i','o','B','u','t','t','o','n','L','i','s','t',0}; -struct fw_arg { - LPCWSTR class, text; - HWND hwnd_res; -}; -static BOOL CALLBACK find_window_callback(HWND hwnd, LPARAM lparam) -{ - struct fw_arg *arg = (struct fw_arg*)lparam; - WCHAR buf[1024]; - - if(arg->class) - { - GetClassNameW(hwnd, buf, 1024); - if(lstrcmpW(buf, arg->class)) - return TRUE; - } - - if(arg->text) - { - GetWindowTextW(hwnd, buf, 1024); - if(lstrcmpW(buf, arg->text)) - return TRUE; - } - - arg->hwnd_res = hwnd; - return FALSE; -} - -static HWND find_window(HWND parent, LPCWSTR class, LPCWSTR text) -{ - struct fw_arg arg = {class, text, NULL}; - - EnumChildWindows(parent, find_window_callback, (LPARAM)&arg); - return arg.hwnd_res; -} - static void test_customize_onfolderchange(IFileDialog *pfd) { - IOleWindow *pow; HWND dlg_hwnd, item, item_parent; - HRESULT hr; BOOL br; WCHAR buf[1024]; buf[0] = '\0'; - hr = IFileDialog_QueryInterface(pfd, &IID_IOleWindow, (void**)&pow); - ok(hr == S_OK, "Got 0x%08x\n", hr); - hr = IOleWindow_GetWindow(pow, &dlg_hwnd); - ok(hr == S_OK, "Got 0x%08x\n", hr); + dlg_hwnd = get_hwnd_from_ifiledialog(pfd); ok(dlg_hwnd != NULL, "Got NULL.\n"); - IOleWindow_Release(pow); item = find_window(dlg_hwnd, NULL, checkbutton2W); ok(item != NULL, "Failed to find item.\n"); @@ -1368,7 +1583,7 @@ item = find_window(dlg_hwnd, NULL, visualgroup1W); ok(item == NULL, "Found item: %p\n", item); item = find_window(dlg_hwnd, NULL, visualgroup2W); - ok(item == NULL, "Found item: %p\n", item); + todo_wine ok(item == NULL, "Found item: %p\n", item); br = PostMessageW(dlg_hwnd, WM_COMMAND, IDCANCEL, 0); ok(br, "Failed\n"); @@ -1385,6 +1600,7 @@ DWORD cookie; LPWSTR tmpstr; UINT i; + UINT id_vgroup1, id_text, id_editbox1; LONG ref; HWND dlg_hwnd; HRESULT hr; @@ -1637,25 +1853,25 @@ ok(hr == S_OK, "got 0x%08x (control: %d).\n", hr, i); hr = IFileDialogCustomize_StartVisualGroup(pfdc, i, label); - todo_wine ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); + ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); hr = IFileDialogCustomize_StartVisualGroup(pfdc, ++i, visualgroup1W); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); hr = IFileDialogCustomize_AddControlItem(pfdc, i, 0, label); - todo_wine ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); + ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); hr = IFileDialogCustomize_SetControlLabel(pfdc, i, visualgroup2W); - todo_wine ok(hr == S_OK, "got 0x%08x (control: %d).\n", hr, i); + ok(hr == S_OK, "got 0x%08x (control: %d).\n", hr, i); cdstate = 0xdeadbeef; hr = IFileDialogCustomize_GetControlState(pfdc, i, &cdstate); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); - todo_wine ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); hr = IFileDialogCustomize_StartVisualGroup(pfdc, ++i, label); - todo_wine ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); + ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); hr = IFileDialogCustomize_EndVisualGroup(pfdc); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); i++; /* Nonexisting control */ hr = IFileDialogCustomize_AddControlItem(pfdc, i, 0, label); @@ -1669,7 +1885,7 @@ pfde = IFileDialogEvents_Constructor(); pfdeimpl = impl_from_IFileDialogEvents(pfde); - pfdeimpl->cfd_test1 = TRUE; + pfdeimpl->events_test = IFDEVENT_TEST1; hr = IFileDialog_Advise(pfod, pfde, &cookie); ok(hr == S_OK, "Got 0x%08x\n", hr); @@ -1901,6 +2117,127 @@ IFileDialogCustomize_Release(pfdc); ref = IFileDialog_Release(pfod); ok(!ref, "Refcount not zero (%d).\n", ref); + + + /* Some more tests for VisualGroup behavior */ + hr = CoCreateInstance(&CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&pfod); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileDialog_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&pfdc); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + i = -1; + id_vgroup1 = ++i; + hr = IFileDialogCustomize_StartVisualGroup(pfdc, id_vgroup1, visualgroup1W); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + cdstate = 0xdeadbeef; + hr = IFileDialogCustomize_GetControlState(pfdc, id_vgroup1, &cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); + + id_text = ++i; + hr = IFileDialogCustomize_AddText(pfdc, id_text, label); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + cdstate = 0xdeadbeef; + hr = IFileDialogCustomize_GetControlState(pfdc, id_text, &cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); + + id_editbox1 = ++i; + hr = IFileDialogCustomize_AddEditBox(pfdc, id_editbox1, editbox1W); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + cdstate = 0xdeadbeef; + hr = IFileDialogCustomize_GetControlState(pfdc, id_editbox1, &cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); + + + /* Set all Visible but not Enabled */ + hr = IFileDialogCustomize_SetControlState(pfdc, id_vgroup1, CDCS_VISIBLE); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + cdstate = 0xdeadbeef; + hr = IFileDialogCustomize_GetControlState(pfdc, id_vgroup1, &cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_VISIBLE, "got 0x%08x.\n", cdstate); + cdstate = 0xdeadbeef; + + hr = IFileDialogCustomize_GetControlState(pfdc, id_text, &cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); + + cdstate = 0xdeadbeef; + hr = IFileDialogCustomize_GetControlState(pfdc, id_editbox1, &cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); + + /* Set text to Visible but not Enabled */ + hr = IFileDialogCustomize_SetControlState(pfdc, id_text, CDCS_VISIBLE); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + cdstate = 0xdeadbeef; + hr = IFileDialogCustomize_GetControlState(pfdc, id_vgroup1, &cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_VISIBLE, "got 0x%08x.\n", cdstate); + cdstate = 0xdeadbeef; + + hr = IFileDialogCustomize_GetControlState(pfdc, id_text, &cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_VISIBLE, "got 0x%08x.\n", cdstate); + + cdstate = 0xdeadbeef; + hr = IFileDialogCustomize_GetControlState(pfdc, id_editbox1, &cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); + + /* Set vgroup to inactive */ + hr = IFileDialogCustomize_SetControlState(pfdc, id_vgroup1, CDCS_INACTIVE); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + cdstate = 0xdeadbeef; + hr = IFileDialogCustomize_GetControlState(pfdc, id_vgroup1, &cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_INACTIVE, "got 0x%08x.\n", cdstate); + + cdstate = 0xdeadbeef; + hr = IFileDialogCustomize_GetControlState(pfdc, id_text, &cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_VISIBLE, "got 0x%08x.\n", cdstate); + + cdstate = 0xdeadbeef; + hr = IFileDialogCustomize_GetControlState(pfdc, id_editbox1, &cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); + + /* Set vgroup to Enabled and Visible again */ + hr = IFileDialogCustomize_SetControlState(pfdc, id_vgroup1, CDCS_ENABLEDVISIBLE); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + cdstate = 0xdeadbeef; + hr = IFileDialogCustomize_GetControlState(pfdc, id_vgroup1, &cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); + + cdstate = 0xdeadbeef; + hr = IFileDialogCustomize_GetControlState(pfdc, id_text, &cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_VISIBLE, "got 0x%08x.\n", cdstate); + + cdstate = 0xdeadbeef; + hr = IFileDialogCustomize_GetControlState(pfdc, id_editbox1, &cdstate); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); + + hr = IFileDialogCustomize_MakeProminent(pfdc, id_vgroup1); + todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + + IFileDialogCustomize_Release(pfdc); + ref = IFileDialog_Release(pfod); + ok(!ref, "Refcount not zero (%d).\n", ref); } static void test_persistent_state(void) @@ -1936,6 +2273,7 @@ { test_basics(); test_advise(); + test_events(); test_filename(); test_customize(); test_persistent_state();

10 years, 1 month

[akhaldi] 64325: [COMDLG32] * Sync with Wine 1.7.27. * Translators, you're up ; ) CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 10:16:40 2014 New Revision: 64325 URL: http://svn.reactos.org/svn/reactos?rev=64325&view=rev Log: [COMDLG32] * Sync with Wine 1.7.27. * Translators, you're up ;) CORE-8540 Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h trunk/reactos/dll/win32/comdlg32/itemdlg.c trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sq.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc trunk/reactos/dll/win32/comdlg32/resource.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -1776,7 +1776,7 @@ } else { - /* Resize the height, if open as read only checkbox ad help button are + /* Resize the height; if opened as read-only, checkbox and help button are * hidden and we are not using a custom template nor a customDialog */ if ( (fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) && Modified: trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -94,6 +94,7 @@ #define IDS_INVALID_FILENAME 121 #define IDS_PATHNOTEXISTING 122 #define IDS_FILENOTEXISTING 123 +#define IDS_INVALID_FOLDERNAME 124 /* File Dialog Tooltips string IDs */ Modified: trunk/reactos/dll/win32/comdlg32/itemdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/itemdlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/itemdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/itemdlg.c [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -67,7 +67,8 @@ IDLG_CCTRL_CHECKBUTTON, IDLG_CCTRL_EDITBOX, IDLG_CCTRL_SEPARATOR, - IDLG_CCTRL_TEXT + IDLG_CCTRL_TEXT, + IDLG_CCTRL_VISUALGROUP }; typedef struct { @@ -76,6 +77,9 @@ enum ITEMDLG_CCTRL_TYPE type; CDCONTROLSTATEF cdcstate; struct list entry; + + struct list sub_cctrls; + struct list sub_cctrls_entry; } customctrl; typedef struct { @@ -124,9 +128,11 @@ LPWSTR custom_filenamelabel; UINT cctrl_width, cctrl_def_height, cctrls_cols; + UINT cctrl_indent; HWND cctrls_hwnd; struct list cctrls; UINT_PTR cctrl_next_dlgid; + customctrl *cctrl_active_vg; GUID client_guid; } FileDialogImpl; @@ -195,6 +201,18 @@ { TRACE("Notifying %p\n", cursor); IFileDialogEvents_OnSelectionChange(cursor->pfde, (IFileDialog*)&This->IFileDialog2_iface); + } +} + +static void events_OnTypeChange(FileDialogImpl *This) +{ + events_client *cursor; + TRACE("%p\n", This); + + LIST_FOR_EACH_ENTRY(cursor, &This->events_clients, events_client, entry) + { + TRACE("Notifying %p\n", cursor); + IFileDialogEvents_OnTypeChange(cursor->pfde, (IFileDialog*)&This->IFileDialog2_iface); } } @@ -348,8 +366,10 @@ UINT attr; hr = IShellItem_GetAttributes(psi, SFGAO_FOLDER, &attr); - if(SUCCEEDED(hr) && (attr & SFGAO_FOLDER)) - continue; /* FIXME: FOS_PICKFOLDERS */ + if(SUCCEEDED(hr) && + (( (This->options & FOS_PICKFOLDERS) && !(attr & SFGAO_FOLDER)) || + (!(This->options & FOS_PICKFOLDERS) && (attr & SFGAO_FOLDER)))) + continue; hr = IShellItem_GetDisplayName(psi, SIGDN_PARENTRELATIVEPARSING, &names[valid_count]); if(SUCCEEDED(hr)) @@ -538,21 +558,42 @@ break; case ONOPEN_OPEN: - if(events_OnFileOk(This) != S_OK) - break; - hr = SHGetDesktopFolder(&psf_desktop); if(SUCCEEDED(hr)) { if(This->psia_results) + { IShellItemArray_Release(This->psia_results); + This->psia_results = NULL; + } hr = SHCreateShellItemArray(NULL, psf_desktop, file_count, (PCUITEMID_CHILD_ARRAY)pidla, &This->psia_results); - if(SUCCEEDED(hr)) + + IShellFolder_Release(psf_desktop); + + if(FAILED(hr)) + break; + + if(This->options & FOS_PICKFOLDERS) + { + SFGAOF attributes; + hr = IShellItemArray_GetAttributes(This->psia_results, SIATTRIBFLAGS_AND, SFGAO_FOLDER, &attributes); + if(hr != S_OK) + { + WCHAR buf[64]; + LoadStringW(COMDLG32_hInstance, IDS_INVALID_FOLDERNAME, buf, sizeof(buf)/sizeof(WCHAR)); + + MessageBoxW(This->dlg_hwnd, buf, This->custom_title, MB_OK | MB_ICONEXCLAMATION); + + IShellItemArray_Release(This->psia_results); + This->psia_results = NULL; + break; + } + } + + if(events_OnFileOk(This) == S_OK) ret = S_OK; - - IShellFolder_Release(psf_desktop); } break; @@ -575,25 +616,38 @@ */ static inline customctrl *get_cctrl_from_dlgid(FileDialogImpl *This, DWORD dlgid) { - customctrl *ctrl; + customctrl *ctrl, *sub_ctrl; LIST_FOR_EACH_ENTRY(ctrl, &This->cctrls, customctrl, entry) + { if(ctrl->dlgid == dlgid) return ctrl; + LIST_FOR_EACH_ENTRY(sub_ctrl, &ctrl->sub_cctrls, customctrl, sub_cctrls_entry) + if(sub_ctrl->dlgid == dlgid) + return sub_ctrl; + } + ERR("Failed to find control with dialog id %d\n", dlgid); return NULL; } static inline customctrl *get_cctrl(FileDialogImpl *This, DWORD ctlid) { - customctrl *ctrl; + customctrl *ctrl, *sub_ctrl; LIST_FOR_EACH_ENTRY(ctrl, &This->cctrls, customctrl, entry) + { if(ctrl->id == ctlid) return ctrl; - ERR("Failed to find control with control id %d\n", ctlid); + LIST_FOR_EACH_ENTRY(sub_ctrl, &ctrl->sub_cctrls, customctrl, sub_cctrls_entry) + if(sub_ctrl->id == ctlid) + return sub_ctrl; + } + + + TRACE("No existing control with control id %d\n", ctlid); return NULL; } @@ -639,9 +693,39 @@ HeapFree(GetProcessHeap(), 0, text); } +static UINT ctrl_get_height(customctrl *ctrl) { + RECT rc; + GetWindowRect(ctrl->wrapper_hwnd, &rc); + return rc.bottom - rc.top; +} + +static void ctrl_free(customctrl *ctrl) +{ + customctrl *sub_cur1, *sub_cur2; + + TRACE("Freeing control %p\n", ctrl); + if(ctrl->type == IDLG_CCTRL_MENU) + { + TBBUTTON tbb; + SendMessageW(ctrl->hwnd, TB_GETBUTTON, 0, (LPARAM)&tbb); + DestroyMenu((HMENU)tbb.dwData); + } + + LIST_FOR_EACH_ENTRY_SAFE(sub_cur1, sub_cur2, &ctrl->sub_cctrls, customctrl, sub_cctrls_entry) + { + list_remove(&sub_cur1->sub_cctrls_entry); + ctrl_free(sub_cur1); + } + + DestroyWindow(ctrl->hwnd); + HeapFree(GetProcessHeap(), 0, ctrl); +} + static void customctrl_resize(FileDialogImpl *This, customctrl *ctrl) { RECT rc; + UINT total_height; + customctrl *sub_ctrl; switch(ctrl->type) { @@ -652,7 +736,35 @@ ctrl_resize(ctrl->hwnd, 160, 160, TRUE); GetWindowRect(ctrl->hwnd, &rc); SetWindowPos(ctrl->wrapper_hwnd, NULL, 0, 0, rc.right-rc.left, rc.bottom-rc.top, - SWP_NOZORDER|SWP_NOMOVE|SWP_NOZORDER); + SWP_NOZORDER|SWP_NOMOVE); + break; + case IDLG_CCTRL_VISUALGROUP: + total_height = 0; + ctrl_resize(ctrl->hwnd, 0, This->cctrl_indent, TRUE); + + LIST_FOR_EACH_ENTRY(sub_ctrl, &ctrl->sub_cctrls, customctrl, sub_cctrls_entry) + { + customctrl_resize(This, sub_ctrl); + SetWindowPos(sub_ctrl->wrapper_hwnd, NULL, This->cctrl_indent, total_height, 0, 0, + SWP_NOZORDER|SWP_NOSIZE); + + total_height += ctrl_get_height(sub_ctrl); + } + + /* The label should be right adjusted */ + { + UINT width, height; + + GetWindowRect(ctrl->hwnd, &rc); + width = rc.right - rc.left; + height = rc.bottom - rc.top; + + SetWindowPos(ctrl->hwnd, NULL, This->cctrl_indent - width, 0, width, height, SWP_NOZORDER); + } + + /* Resize the wrapper window to fit all the sub controls */ + SetWindowPos(ctrl->wrapper_hwnd, NULL, 0, 0, This->cctrl_width + This->cctrl_indent, total_height, + SWP_NOZORDER|SWP_NOMOVE); break; case IDLG_CCTRL_RADIOBUTTONLIST: case IDLG_CCTRL_EDITBOX: @@ -757,6 +869,7 @@ static LRESULT CALLBACK notifysink_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { FileDialogImpl *This = (FileDialogImpl*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + customctrl *ctrl; HWND hwnd_child; RECT rc; @@ -767,8 +880,12 @@ case WM_NOTIFY: return notifysink_on_wm_notify(This, hwnd, wparam, lparam); case WM_SIZE: hwnd_child = GetPropW(hwnd, notifysink_childW); - GetClientRect(hwnd, &rc); - SetWindowPos(hwnd_child, NULL, 0, 0, rc.right, rc.bottom, SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOZORDER); + ctrl = (customctrl*)GetWindowLongPtrW(hwnd_child, GWLP_USERDATA); + if(ctrl && ctrl->type != IDLG_CCTRL_VISUALGROUP) + { + GetClientRect(hwnd, &rc); + SetWindowPos(hwnd_child, NULL, 0, 0, rc.right, rc.bottom, SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOZORDER); + } return TRUE; } @@ -779,15 +896,20 @@ LPCWSTR text, LPCWSTR wndclass, DWORD ctrl_wsflags, DWORD ctrl_exflags, UINT height, customctrl **ppctrl) { - HWND ns_hwnd, control_hwnd; + HWND ns_hwnd, control_hwnd, parent_hwnd; DWORD wsflags = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS; customctrl *ctrl; if(get_cctrl(This, id)) return E_UNEXPECTED; /* Duplicate id */ + if(This->cctrl_active_vg) + parent_hwnd = This->cctrl_active_vg->wrapper_hwnd; + else + parent_hwnd = This->cctrls_hwnd; + ns_hwnd = CreateWindowExW(0, floatnotifysinkW, NULL, wsflags, - 0, 0, This->cctrl_width, height, This->cctrls_hwnd, + 0, 0, This->cctrl_width, height, parent_hwnd, (HMENU)This->cctrl_next_dlgid, COMDLG32_hInstance, This); control_hwnd = CreateWindowExW(ctrl_exflags, wndclass, text, wsflags | ctrl_wsflags, 0, 0, This->cctrl_width, height, ns_hwnd, @@ -813,7 +935,15 @@ ctrl->id = id; ctrl->dlgid = This->cctrl_next_dlgid; ctrl->cdcstate = CDCS_ENABLED | CDCS_VISIBLE; - list_add_tail(&This->cctrls, &ctrl->entry); + list_init(&ctrl->sub_cctrls); + + if(This->cctrl_active_vg) + list_add_tail(&This->cctrl_active_vg->sub_cctrls, &ctrl->sub_cctrls_entry); + else + list_add_tail(&This->cctrls, &ctrl->entry); + + SetWindowLongPtrW(ctrl->hwnd, GWLP_USERDATA, (LPARAM)ctrl); + if(ppctrl) *ppctrl = ctrl; This->cctrl_next_dlgid++; @@ -832,7 +962,6 @@ UINT cur_col_pos, cur_row_pos; customctrl *ctrl; BOOL fits_height; - static const UINT col_indent = 100; /* The first column is indented 100px */ static const UINT cspacing = 90; /* Columns are spaced with 90px */ static const UINT rspacing = 4; /* Rows are spaced with 4 px. */ @@ -844,7 +973,7 @@ TRACE("%p\n", This); column_width = This->cctrl_width + cspacing; - nr_of_cols = (container_width - col_indent + cspacing) / column_width; + nr_of_cols = (container_width - This->cctrl_indent + cspacing) / column_width; /* We don't need to do anything unless the number of visible columns has changed. */ if(nr_of_cols == This->cctrls_cols) @@ -854,7 +983,7 @@ return rc.bottom - rc.top; } - This->cctrls_cols = nr_of_cols; + This->cctrls_cols = nr_of_cols; /* Get the size of the tallest control, and the total size of * all the controls to figure out the number of slots we need. @@ -864,10 +993,7 @@ { if(ctrl->cdcstate & CDCS_VISIBLE) { - RECT rc; - UINT control_height; - GetWindowRect(ctrl->wrapper_hwnd, &rc); - control_height = rc.bottom - rc.top; + UINT control_height = ctrl_get_height(ctrl); max_control_height = max(max_control_height, control_height); total_height += control_height + rspacing; @@ -892,10 +1018,7 @@ { if(ctrl->cdcstate & CDCS_VISIBLE) { - RECT rc; - UINT control_height; - GetWindowRect(ctrl->wrapper_hwnd, &rc); - control_height = rc.bottom - rc.top; + UINT control_height = ctrl_get_height(ctrl); if(cur_row_pos + control_height > container_height) { @@ -917,13 +1040,13 @@ /* Move the controls to their final destination */ - cur_col_pos = col_indent, cur_row_pos = 0; + cur_col_pos = 0, cur_row_pos = 0; LIST_FOR_EACH_ENTRY(ctrl, &This->cctrls, customctrl, entry) { if(ctrl->cdcstate & CDCS_VISIBLE) { RECT rc; - UINT control_height; + UINT control_height, control_indent; GetWindowRect(ctrl->wrapper_hwnd, &rc); control_height = rc.bottom - rc.top; @@ -933,7 +1056,13 @@ cur_col_pos += This->cctrl_width + cspacing; } - SetWindowPos(ctrl->wrapper_hwnd, NULL, cur_col_pos, cur_row_pos, 0, 0, + + if(ctrl->type == IDLG_CCTRL_VISUALGROUP) + control_indent = 0; + else + control_indent = This->cctrl_indent; + + SetWindowPos(ctrl->wrapper_hwnd, NULL, cur_col_pos + control_indent, cur_row_pos, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER); cur_row_pos += control_height + rspacing; @@ -953,7 +1082,7 @@ if(parent) { - customctrl *ctrl; + customctrl *ctrl, *sub_ctrl; HFONT font; wndstyle = GetWindowLongW(This->cctrls_hwnd, GWL_STYLE); @@ -972,6 +1101,13 @@ LIST_FOR_EACH_ENTRY(ctrl, &This->cctrls, customctrl, entry) { if(font) SendMessageW(ctrl->hwnd, WM_SETFONT, (WPARAM)font, TRUE); + + /* If this is a VisualGroup */ + LIST_FOR_EACH_ENTRY(sub_ctrl, &ctrl->sub_cctrls, customctrl, sub_cctrls_entry) + { + if(font) SendMessageW(sub_ctrl->hwnd, WM_SETFONT, (WPARAM)font, TRUE); + } + customctrl_resize(This, ctrl); } } @@ -1004,18 +1140,8 @@ LIST_FOR_EACH_ENTRY_SAFE(cur1, cur2, &This->cctrls, customctrl, entry) { - TRACE("Freeing control %p\n", cur1); list_remove(&cur1->entry); - - if(cur1->type == IDLG_CCTRL_MENU) - { - TBBUTTON tbb; - SendMessageW(cur1->hwnd, TB_GETBUTTON, 0, (LPARAM)&tbb); - DestroyMenu((HMENU)tbb.dwData); - } - - DestroyWindow(cur1->hwnd); - HeapFree(GetProcessHeap(), 0, cur1); + ctrl_free(cur1); } return TRUE; @@ -1044,11 +1170,13 @@ InitCommonControlsEx(NULL); This->cctrl_width = 160; /* Controls have a fixed width */ + This->cctrl_indent = 100; This->cctrl_def_height = 23; This->cctrls_cols = 0; This->cctrl_next_dlgid = 0x2000; list_init(&This->cctrls); + This->cctrl_active_vg = NULL; if( !GetClassInfoW(COMDLG32_hInstance, ctrl_container_classname, &wc) ) { @@ -1409,9 +1537,31 @@ hitem = GetDlgItem(This->dlg_hwnd, IDC_FILETYPE); if(This->filterspec_count) { - UINT i; + HDC hdc; + HFONT font; + SIZE size; + UINT i, maxwidth = 0; + + hdc = GetDC(hitem); + font = (HFONT)SendMessageW(hitem, WM_GETFONT, 0, 0); + SelectObject(hdc, font); + for(i = 0; i < This->filterspec_count; i++) + { SendMessageW(hitem, CB_ADDSTRING, 0, (LPARAM)This->filterspecs[i].pszName); + + if(GetTextExtentPoint32W(hdc, This->filterspecs[i].pszName, lstrlenW(This->filterspecs[i].pszName), &size)) + maxwidth = max(maxwidth, size.cx); + } + ReleaseDC(hitem, hdc); + + if(maxwidth > 0) + { + maxwidth += GetSystemMetrics(SM_CXVSCROLL) + 4; + SendMessageW(hitem, CB_SETDROPPEDWIDTH, (WPARAM)maxwidth, 0); + } + else + ERR("Failed to calculate width of filetype dropdown\n"); SendMessageW(hitem, CB_SETCURSEL, This->filetypeindex, 0); } @@ -1427,6 +1577,9 @@ init_toolbar(This, hwnd); update_control_text(This); update_layout(This); + + if(This->filterspec_count) + events_OnTypeChange(This); return TRUE; } @@ -1538,6 +1691,11 @@ } CoTaskMemFree(filename); } + + /* The documentation claims that OnTypeChange is called only + * when the dialog is opened, but this is obviously not the + * case. */ + events_OnTypeChange(This); } return FALSE; @@ -1746,10 +1904,9 @@ if(!This->filterspecs) return E_FAIL; - if(iFileType >= This->filterspec_count) - This->filetypeindex = This->filterspec_count - 1; - else - This->filetypeindex = iFileType; + iFileType = max(iFileType, 1); + iFileType = min(iFileType, This->filterspec_count); + This->filetypeindex = iFileType-1; return S_OK; } @@ -1762,7 +1919,10 @@ if(!piFileType) return E_INVALIDARG; - *piFileType = This->filetypeindex; + if(This->filterspec_count == 0) + *piFileType = 0; + else + *piFileType = This->filetypeindex + 1; return S_OK; } @@ -1818,6 +1978,13 @@ { FileDialogImpl *This = impl_from_IFileDialog2(iface); TRACE("%p (0x%x)\n", This, fos); + + if( !(This->options & FOS_PICKFOLDERS) && (fos & FOS_PICKFOLDERS) ) + { + WCHAR buf[30]; + LoadStringW(COMDLG32_hInstance, IDS_SELECT_FOLDER, buf, sizeof(buf)/sizeof(WCHAR)); + IFileDialog2_SetTitle(iface, buf); + } This->options = fos; @@ -2850,7 +3017,7 @@ ULONG attr; TRACE("%p (%p, %p)\n", This, shv, pidl); - if(!This->filterspec_count) + if(!This->filterspec_count && !(This->options & FOS_PICKFOLDERS)) return S_OK; hr = SHGetIDListFromObject((IUnknown*)shv, &parent_pidl); @@ -2872,6 +3039,12 @@ { IShellItem_Release(psi); return S_OK; + } + + if((This->options & FOS_PICKFOLDERS) && !(attr & (SFGAO_FOLDER | SFGAO_LINK))) + { + IShellItem_Release(psi); + return S_FALSE; } hr = S_OK; @@ -3116,7 +3289,7 @@ HRESULT hr; TRACE("%p (%d, %p, %d)\n", This, dwIDCtl, pszLabel, bChecked); - hr = cctrl_create_new(This, dwIDCtl, pszLabel, WC_BUTTONW, BS_AUTOCHECKBOX, 0, + hr = cctrl_create_new(This, dwIDCtl, pszLabel, WC_BUTTONW, BS_AUTOCHECKBOX|BS_MULTILINE, 0, This->cctrl_def_height, &ctrl); if(SUCCEEDED(hr)) { @@ -3193,6 +3366,7 @@ case IDLG_CCTRL_PUSHBUTTON: case IDLG_CCTRL_CHECKBUTTON: case IDLG_CCTRL_TEXT: + case IDLG_CCTRL_VISUALGROUP: SendMessageW(ctrl->hwnd, WM_SETTEXT, 0, (LPARAM)pszLabel); break; default: @@ -3510,15 +3684,32 @@ LPCWSTR pszLabel) { FileDialogImpl *This = impl_from_IFileDialogCustomize(iface); - FIXME("stub - %p (%d, %s)\n", This, dwIDCtl, debugstr_w(pszLabel)); - return E_NOTIMPL; + customctrl *vg; + HRESULT hr; + TRACE("%p (%d, %s)\n", This, dwIDCtl, debugstr_w(pszLabel)); + + if(This->cctrl_active_vg) + return E_UNEXPECTED; + + hr = cctrl_create_new(This, dwIDCtl, pszLabel, WC_STATICW, 0, 0, + This->cctrl_def_height, &vg); + if(SUCCEEDED(hr)) + { + vg->type = IDLG_CCTRL_VISUALGROUP; + This->cctrl_active_vg = vg; + } + + return hr; } static HRESULT WINAPI IFileDialogCustomize_fnEndVisualGroup(IFileDialogCustomize *iface) { FileDialogImpl *This = impl_from_IFileDialogCustomize(iface); - FIXME("stub - %p\n", This); - return E_NOTIMPL; + TRACE("%p\n", This); + + This->cctrl_active_vg = NULL; + + return S_OK; } static HRESULT WINAPI IFileDialogCustomize_fnMakeProminent(IFileDialogCustomize *iface, Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "ÐÑÑÑÑ Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐ²Ð°" IDS_FILENOTEXISTING "Ð¤Ð°Ð¹Ð»ÑÑ Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐ²Ð°" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "Ð¡ÑÑÑÐ°Ð½Ð¸" IDS_SAVE_AS "Ð¡ÑÑÑÐ°Ð½Ð¸ ÐºÐ°ÑÐ¾" IDS_OPEN_FILE "ÐÑÐ²Ð¾ÑÐ¸ ÑÐ°Ð¹Ð»" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "La ruta no existeix" IDS_FILENOTEXISTING "El fitxer no existeix" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "Desa" IDS_SAVE_AS "Anomenar i Desar" IDS_OPEN_FILE "Obre Fitxer" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "AdresÃ¡Å neexistuje" IDS_FILENOTEXISTING "Soubor neexistuje" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "UloÅ¾it" IDS_SAVE_AS "UloÅ¾ pod jmÃ©nem" IDS_OPEN_FILE "OtevÅÃt soubor" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "Stien eksisterer ikke." IDS_FILENOTEXISTING "Filen eksisterer ikke." + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "Gem" IDS_SAVE_AS "Gem som" IDS_OPEN_FILE "Ãben fil" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "Der Pfad existiert nicht" IDS_FILENOTEXISTING "Die Datei existiert nicht" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "Speichern" IDS_SAVE_AS "Speichern als" IDS_OPEN_FILE "Ãffne Datei" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "Î¤Î¿ Î¼Î¿Î½Î¿ÏÎ¬ÏÎ¹ Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹" IDS_FILENOTEXISTING "Î¤Î¿ Î±ÏÏÎµÎ¯Î¿ Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ·" IDS_SAVE_AS "ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ· ÏÏ" IDS_OPEN_FILE "ÎÎ½Î¿Î¹Î³Î¼Î± ÎÏÏÎµÎ¯Î¿Ï" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "Path does not exist" IDS_FILENOTEXISTING "File does not exist" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "Save" IDS_SAVE_AS "Save As" IDS_OPEN_FILE "Open File" + IDS_SELECT_FOLDER "Select Folder" } /* @@ -479,7 +481,7 @@ EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Files of type:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT - COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | + COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_HASSTRINGS | CBS_DROPDOWNLIST DEFPUSHBUTTON "&Open", IDOK, 350, 240, 40, 14, WS_GROUP Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "Vojo estas neekzistanta" IDS_FILENOTEXISTING "Dosiero estas neekzistanta" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "Konservu" IDS_SAVE_AS "Konservu" IDS_OPEN_FILE "Malfermu Dosieron" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "La ruta no existe" IDS_FILENOTEXISTING "El archivo no existe" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "Guardar" IDS_SAVE_AS "&Guardar como" IDS_OPEN_FILE "Abrir archivo" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "Kansiota ei ole" IDS_FILENOTEXISTING "Tiedostoa ei ole" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "Tallenna" IDS_SAVE_AS "Tallenna nimellÃ¤" IDS_OPEN_FILE "Avaa tiedosto" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "Le chemin d'accÃ¨s n'existe pas" IDS_FILENOTEXISTING "Le fichier n'existe pas" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "Enregistrer" IDS_SAVE_AS "Enregistrer" IDS_OPEN_FILE "Ouvrir le fichier" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "×× ×ª×× ××× × ×§×××" IDS_FILENOTEXISTING "××§×××¥ ××× × ×§×××" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "×©×××¨×" IDS_SAVE_AS "×©×××¨× ××©×" IDS_OPEN_FILE "×¤×ª×××ª ×§×××¥" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "Ãtvonal nem lÃ©tezik" IDS_FILENOTEXISTING "FÃ¡jl nem lÃ©tezik" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "MentÃ©s" IDS_SAVE_AS "MentÃ©s mÃ¡skÃ©nt" IDS_OPEN_FILE "FÃ¡jl megnyitÃ¡sa" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "Il percorso specificato non esiste" IDS_FILENOTEXISTING "Il file non esiste" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "Salva" IDS_SAVE_AS "Salva con nome" IDS_OPEN_FILE "Apri file" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "ãã¹ãè¦ã¤ããã¾ãã" IDS_FILENOTEXISTING "ãã¡ã¤ã«ãè¦ã¤ããã¾ãã" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "ä¿å" IDS_SAVE_AS "ååãä»ãã¦ä¿å" IDS_OPEN_FILE "ãã¡ã¤ã«ãéã" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "ê²½ë¡ê° ì¡´ì¬íì§ ììµëë¤." IDS_FILENOTEXISTING "íì¼ì´ ì¡´ì¬íì§ ììµëë¤" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "ì ì¥" IDS_SAVE_AS "ë¤ë¥¸ ì´ë¦ì¼ë¡ ì ì¥" IDS_OPEN_FILE "íì¼ ì´ê¸°" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "Kelias neegzistuoja" IDS_FILENOTEXISTING "Failas neegzistuoja" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "IÅ¡saugoti" IDS_SAVE_AS "IÅ¡saugoti kaip" IDS_OPEN_FILE "Atverti failÄ" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "Het pad bestaat niet" IDS_FILENOTEXISTING "Kan het bestand niet vinden" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -135,6 +136,7 @@ IDS_SAVE "Opslaan" IDS_SAVE_AS "&Opslaan als" IDS_OPEN_FILE "Open bestand" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "Stien finnes ikke" IDS_FILENOTEXISTING "Filen finnes ikke" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "Lagre" IDS_SAVE_AS "Lagre som" IDS_OPEN_FILE "Ãpne fil" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "Katalog nie istnieje" IDS_FILENOTEXISTING "Plik nie istnieje" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "Zapisz" IDS_SAVE_AS "Zapisz jako" IDS_OPEN_FILE "OtwÃ³rz plik" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "A localizaÃ§Ã£o nÃ£o existe" IDS_FILENOTEXISTING "O ficheiro nÃ£o existe" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "Gravar" IDS_SAVE_AS "Gravar Como" IDS_OPEN_FILE "Abrir Ficheiro" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -36,6 +36,7 @@ / : < > |" IDS_PATHNOTEXISTING "Calea nu existÄ" IDS_FILENOTEXISTING "FiÈierul nu existÄ" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -138,6 +139,7 @@ IDS_SAVE "PÄstrare" IDS_SAVE_AS "PÄstrare Ã®n:" IDS_OPEN_FILE "Deschidere fiÈier" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "ÐÑÑÑ Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ" IDS_FILENOTEXISTING "Ð¤Ð°Ð¹Ð» Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ" IDS_SAVE_AS "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÐºÐ°Ðº" IDS_OPEN_FILE "ÐÑÐºÑÑÑÑ ÑÐ°Ð¹Ð»" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "Pot ne obstaja" IDS_FILENOTEXISTING "Datoteka ne obstaja" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "Shrani" IDS_SAVE_AS "Shrani kot" IDS_OPEN_FILE "Odpri datoteko" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "Cesta neexistuje" IDS_FILENOTEXISTING "SÃºbor neexistuje" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "UloÅ¾iÅ¥" IDS_SAVE_AS "UloÅ¾iÅ¥ ako" IDS_OPEN_FILE "OtvoriÅ¥ sÃºbor" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sq.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sq.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -38,6 +38,7 @@ / : < > |" IDS_PATHNOTEXISTING "Rruga nuk ekziston" IDS_FILENOTEXISTING "Dokumenti nuk ekziston" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -69,6 +70,7 @@ PD32_GENERIC_ERROR "Nje error." PD32_DRIVER_UNKNOWN "Driveri i printerir i panjohur." PD32_NO_DEVICES "Para se te besh nje detyre ne lidhje me printerin si konfigurimi i faqes ose printimi i dokumentit, duhet te instaloni nje printer. Ju lutem instaloni nje dhe provoni perseri." + PD32_DEFAULT_PRINTER "Printeri i perzgjedhur; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Dokumentet %d jane ne rradhe/pritje" PD32_MARGINS_IN_INCHES "Diferenca [inches]" @@ -139,6 +141,7 @@ IDS_SAVE "Ruaj" IDS_SAVE_AS "Ruaj si " IDS_OPEN_FILE "Hap" + IDS_SELECT_FOLDER "Select Folder" } /* @@ -370,6 +373,7 @@ ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE CONTROL "Mbledh", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER + GROUPBOX "Printo gamen", grp1, 8,92, 144,64, WS_GROUP CONTROL "Te gjith", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 CONTROL "Faqet", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "Putanja ne postoji" IDS_FILENOTEXISTING "Datoteka ne postoji" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "SaÄuvaj" IDS_SAVE_AS "SaÄuvaj kao" IDS_OPEN_FILE "Otvori datoteku" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "SÃ¶kvÃ¤gen finns inte" IDS_FILENOTEXISTING "Filen finns inte" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -135,6 +136,7 @@ IDS_SAVE "Spara" IDS_SAVE_AS "Spara som" IDS_OPEN_FILE "Ãppna fil" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "à¹à¸¡à¹à¸à¸à¹à¸à¹à¸£à¸à¸à¸à¸£à¸µ" IDS_FILENOTEXISTING "à¹à¸¡à¹à¸à¸à¹à¸à¹à¸¡" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -135,6 +136,7 @@ IDS_SAVE "Save" IDS_SAVE_AS "à¸à¸±à¸à¸à¸·à¸" IDS_OPEN_FILE "à¹à¸à¹à¸¡" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -33,6 +33,7 @@ / : < > |" IDS_PATHNOTEXISTING "KÃ¼tÃ¼k yolu yok." IDS_FILENOTEXISTING "KÃ¼tÃ¼k yok." + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -135,6 +136,7 @@ IDS_SAVE "Sakla" IDS_SAVE_AS "AyrÄ± Sakla" IDS_OPEN_FILE "KÃ¼tÃ¼k AÃ§" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "è³æå¤¾ä¸åå¨" IDS_FILENOTEXISTING "æªæ¡ä¸åå¨" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "Save" IDS_SAVE_AS "å¦åæ°æª" IDS_OPEN_FILE "Open File" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "Ð¨Ð»ÑÑ Ð½Ðµ ÑÑÐ½ÑÑ" IDS_FILENOTEXISTING "Ð¤Ð°Ð¹Ð» Ð½Ðµ ÑÑÐ½ÑÑ" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "ÐÐ±ÐµÑÐµÐ³ÑÐ¸" IDS_SAVE_AS "ÐÐ±ÐµÑÐµÐ³ÑÐ¸ ÑÐº" IDS_OPEN_FILE "ÐÑÐ´ÐºÑÐ¸ÑÐ¸ ÑÐ°Ð¹Ð»" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -34,6 +34,7 @@ / : < > |" IDS_PATHNOTEXISTING "è·¯å¾ä¸åå¨" IDS_FILENOTEXISTING "æä»¶ä¸åå¨" + IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" } STRINGTABLE @@ -136,6 +137,7 @@ IDS_SAVE "ä¿å" IDS_SAVE_AS "å¦åä¸º" IDS_OPEN_FILE "æå¼æä»¶" + IDS_SELECT_FOLDER "Select Folder" } /* Modified: trunk/reactos/dll/win32/comdlg32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/resourc… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/resource.h [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -126,11 +126,12 @@ #define IDC_COLOR_GL 727 #define IDC_COLOR_BL 728 -#define IDS_FONT_SIZE 1200 -#define IDS_SAVE_BUTTON 1201 -#define IDS_SAVE_IN 1202 -#define IDS_SAVE 1203 -#define IDS_SAVE_AS 1204 -#define IDS_OPEN_FILE 1205 +#define IDS_FONT_SIZE 1200 +#define IDS_SAVE_BUTTON 1201 +#define IDS_SAVE_IN 1202 +#define IDS_SAVE 1203 +#define IDS_SAVE_AS 1204 +#define IDS_OPEN_FILE 1205 +#define IDS_SELECT_FOLDER 1206 #define IDS_FAKEDOCTEXT 1300 Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 27 10:16:40 2014 @@ -61,7 +61,7 @@ reactos/dll/win32/clusapi # Synced to Wine-1.7.17 reactos/dll/win32/comcat # Synced to Wine-1.7.17 reactos/dll/win32/comctl32 # Synced to Wine-1.7.27 -reactos/dll/win32/comdlg32 # Synced to Wine-1.7.17 +reactos/dll/win32/comdlg32 # Synced to Wine-1.7.27 reactos/dll/win32/compstui # Synced to Wine-1.7.17 reactos/dll/win32/credui # Synced to Wine-1.7.17 reactos/dll/win32/crypt32 # Synced to Wine-1.7.17

10 years, 1 month

[hbelusca] 64324: [NTVDM] Implement INT 15h, AH=4Fh "Keyboard intercept", which is used by INT 9h / IRQ 1 to possibly translate scan code before any further treatment. The default implementation is...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 27 02:17:54 2014 New Revision: 64324 URL: http://svn.reactos.org/svn/reactos?rev=64324&view=rev Log: [NTVDM] Implement INT 15h, AH=4Fh "Keyboard intercept", which is used by INT 9h / IRQ 1 to possibly translate scan code before any further treatment. The default implementation is a trivial one, do it à la DosBox. Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c trunk/reactos/subsystems/ntvdm/dos/dem.c trunk/reactos/subsystems/ntvdm/hardware/keyboard.c Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sat Sep 27 02:17:54 2014 @@ -146,6 +146,16 @@ { switch (getAH()) { + /* Keyboard intercept */ + case 0x4F: + { + /* CF should be set but let's just set it again just in case */ + /* Do not modify AL (the hardware scan code), but set CF to continue processing */ + // setCF(1); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + break; + } + /* Wait */ case 0x86: { @@ -493,7 +503,7 @@ Bct->Model = BIOS_MODEL; Bct->SubModel = BIOS_SUBMODEL; Bct->Revision = BIOS_REVISION; - Bct->Feature[0] = 0x64; // At the moment we don't support "INT 15/AH=4Fh called upon INT 09h" nor "wait for external event (INT 15/AH=41h) supported"; see http://www.ctyme.com/intr/rb-1594.htm#Table510 + Bct->Feature[0] = 0x70; // At the moment we don't support "wait for external event (INT 15/AH=41h)", we also don't have any "extended BIOS area allocated (usually at top of RAM)"; see http://www.ctyme.com/intr/rb-1594.htm#Table510 Bct->Feature[1] = 0x00; // We don't support anything from here; see http://www.ctyme.com/intr/rb-1594.htm#Table511 Bct->Feature[2] = 0x00; Bct->Feature[3] = 0x00; Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Sat Sep 27 02:17:54 2014 @@ -197,8 +197,26 @@ BYTE ScanCode, VirtualKey; WORD Character; - /* Get the scan code and virtual key code */ - ScanCode = IOReadB(PS2_DATA_PORT); + /* + * Get the scan code from the PS/2 port, then call the + * INT 15h, AH=4Fh Keyboard Intercept function to try to + * translate the scan code. CF must be set before the call. + * In return, if CF is set we continue processing the scan code + * stored in AL, and if not, we skip it. + */ + setCF(1); + setAL(IOReadB(PS2_DATA_PORT)); + setAH(0x4F); + Int32Call(&BiosContext, BIOS_MISC_INTERRUPT); + + /* Check whether CL is clear. If so, skip the scan code. */ + if (getCF() == 0) goto Quit; + /**/setCF(0);/**/ // FIXME: HACK: Reset CF otherwise we enter in an infinite loop. + + /* Retrieve the modified scan code in AL */ + ScanCode = getAL(); + + /* Get the corresponding virtual key code */ VirtualKey = MapVirtualKey(ScanCode & 0x7F, MAPVK_VSC_TO_VK); /* Check if this is a key press or release */ @@ -255,6 +273,10 @@ if (BiosKeyboardMap[VK_CAPITAL] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_CAPSLOCK; if (BiosKeyboardMap[VK_INSERT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_INSERT; + DPRINT("BiosKeyboardIrq - Character = 0x%X, ScanCode = 0x%X, KeybdShiftFlags = 0x%X\n", + Character, ScanCode, Bda->KeybdShiftFlags); + +Quit: PicIRQComplete(Stack); } Modified: trunk/reactos/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dem.c… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] Sat Sep 27 02:17:54 2014 @@ -91,7 +91,6 @@ default: { - DPRINT1("Unknown DOS System BOP Function: 0x%02X\n", FuncNum); // setCF(1); // Disable, otherwise we enter an infinite loop break; Modified: trunk/reactos/subsystems/ntvdm/hardware/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/keyboard.c [iso-8859-1] Sat Sep 27 02:17:54 2014 @@ -40,6 +40,8 @@ PS2QueuePush(PS2Port, ScanCode); } + DPRINT("Press 0x%X\n", ScanCode); + // PicInterruptRequest(1); }

10 years, 1 month

[akhaldi] 64323: [COMCTL32_WINETEST] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 00:19:59 2014 New Revision: 64323 URL: http://svn.reactos.org/svn/reactos?rev=64323&view=rev Log: [COMCTL32_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/comctl32/button.c trunk/rostests/winetests/comctl32/imagelist.c trunk/rostests/winetests/comctl32/listview.c trunk/rostests/winetests/comctl32/msg.h trunk/rostests/winetests/comctl32/syslink.c trunk/rostests/winetests/comctl32/tab.c trunk/rostests/winetests/comctl32/toolbar.c trunk/rostests/winetests/comctl32/tooltips.c trunk/rostests/winetests/comctl32/trackbar.c trunk/rostests/winetests/comctl32/treeview.c trunk/rostests/winetests/comctl32/updown.c Modified: trunk/rostests/winetests/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/button… ============================================================================== --- trunk/rostests/winetests/comctl32/button.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/button.c [iso-8859-1] Sat Sep 27 00:19:59 2014 @@ -748,10 +748,10 @@ ok(lstrcmpW(nameW, WC_BUTTONW), "got %s\n", wine_dbgstr_w(nameW)); ret = GetClassInfoExW(NULL, nameW, &ex2W); -todo_wine { +todo_wine ok(ret, "got %d\n", ret); +if (ret) /* TODO: remove once Wine is fixed */ ok(ex2W.lpfnWndProc == exW.lpfnWndProc, "got %p, %p\n", exW.lpfnWndProc, ex2W.lpfnWndProc); -} /* Check reported class name */ hwnd = create_button(BS_CHECKBOX, NULL); Modified: trunk/rostests/winetests/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/imagel… ============================================================================== --- trunk/rostests/winetests/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/imagelist.c [iso-8859-1] Sat Sep 27 00:19:59 2014 @@ -1481,6 +1481,7 @@ static void test_iimagelist(void) { IImageList *imgl, *imgl2; + IImageList2 *imagelist; HIMAGELIST himl; HRESULT hr; ULONG ret; @@ -1545,6 +1546,16 @@ IImageList_Release(imgl); ImageList_Destroy(himl); + + /* IImageList2 */ + hr = pImageList_CoCreateInstance(&CLSID_ImageList, NULL, &IID_IImageList2, (void**)&imagelist); + if (hr != S_OK) + { + win_skip("IImageList2 is not supported.\n"); + return; + } + ok(hr == S_OK, "got 0x%08x\n", hr); + IImageList2_Release(imagelist); } static void test_hotspot_v6(void) Modified: trunk/rostests/winetests/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/listvi… ============================================================================== --- trunk/rostests/winetests/comctl32/listview.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/listview.c [iso-8859-1] Sat Sep 27 00:19:59 2014 @@ -3,7 +3,7 @@ * * Copyright 2006 Mike McCormack for CodeWeavers * Copyright 2007 George Gov - * Copyright 2009-2013 Nikolay Sivov + * Copyright 2009-2014 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,12 +31,15 @@ #include "v6util.h" #include "msg.h" -#define PARENT_SEQ_INDEX 0 -#define PARENT_FULL_SEQ_INDEX 1 -#define LISTVIEW_SEQ_INDEX 2 -#define EDITBOX_SEQ_INDEX 3 -#define COMBINED_SEQ_INDEX 4 -#define NUM_MSG_SEQUENCES 5 +enum seq_index { + PARENT_SEQ_INDEX, + PARENT_FULL_SEQ_INDEX, + PARENT_CD_SEQ_INDEX, + LISTVIEW_SEQ_INDEX, + EDITBOX_SEQ_INDEX, + COMBINED_SEQ_INDEX, + NUM_MSG_SEQUENCES +}; #define LISTVIEW_ID 0 #define HEADER_ID 1 @@ -389,6 +392,26 @@ { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static const struct message parent_report_cd_seq[] = { + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_PREPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT|CDDS_SUBITEM }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPOSTPAINT|CDDS_SUBITEM }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT|CDDS_SUBITEM }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPOSTPAINT|CDDS_SUBITEM }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPOSTPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_POSTPAINT }, + { 0 } +}; + +static const struct message parent_list_cd_seq[] = { + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_PREPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPOSTPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_POSTPAINT }, { 0 } }; @@ -1761,24 +1784,36 @@ DestroyWindow(hwnd); } -static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { COLORREF clr, c0ffee = RGB(0xc0, 0xff, 0xee); - if(msg == WM_NOTIFY) { - NMHDR *nmhdr = (PVOID)lp; + if(message == WM_NOTIFY) { + NMHDR *nmhdr = (NMHDR*)lParam; if(nmhdr->code == NM_CUSTOMDRAW) { NMLVCUSTOMDRAW *nmlvcd = (NMLVCUSTOMDRAW*)nmhdr; + struct message msg; + + msg.message = message; + msg.flags = sent|wparam|lparam|custdraw; + msg.wParam = wParam; + msg.lParam = lParam; + msg.id = nmhdr->code; + msg.stage = nmlvcd->nmcd.dwDrawStage; + add_message(sequences, PARENT_CD_SEQ_INDEX, &msg); switch(nmlvcd->nmcd.dwDrawStage) { case CDDS_PREPAINT: SetBkColor(nmlvcd->nmcd.hdc, c0ffee); - return CDRF_NOTIFYITEMDRAW; + return CDRF_NOTIFYITEMDRAW|CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPREPAINT: nmlvcd->clrTextBk = CLR_DEFAULT; - return CDRF_NOTIFYSUBITEMDRAW; + nmlvcd->clrText = RGB(0, 255, 0); + return CDRF_NOTIFYSUBITEMDRAW|CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPREPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); + ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk); + ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); if (nmlvcd->iSubItem) todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); else @@ -1787,13 +1822,15 @@ case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); + ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk); + ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); return CDRF_DODEFAULT; } return CDRF_DODEFAULT; } } - return DefWindowProcA(hwnd, msg, wp, lp); + return DefWindowProcA(hwnd, message, wParam, lParam); } static void test_customdraw(void) @@ -1813,8 +1850,26 @@ InvalidateRect(hwnd, NULL, TRUE); UpdateWindow(hwnd); + /* message tests */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + InvalidateRect(hwnd, NULL, TRUE); + UpdateWindow(hwnd); + ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, "parent customdraw, LVS_REPORT", FALSE); + + DestroyWindow(hwnd); + + hwnd = create_listview_control(LVS_LIST); + + insert_column(hwnd, 0); + insert_column(hwnd, 1); + insert_item(hwnd, 0); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + InvalidateRect(hwnd, NULL, TRUE); + UpdateWindow(hwnd); + ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_list_cd_seq, "parent customdraw, LVS_LIST", FALSE); + SetWindowLongPtrA(hwndparent, GWLP_WNDPROC, (LONG_PTR)oldwndproc); - DestroyWindow(hwnd); } Modified: trunk/rostests/winetests/comctl32/msg.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/msg.h?… ============================================================================== --- trunk/rostests/winetests/comctl32/msg.h [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/msg.h [iso-8859-1] Sat Sep 27 00:19:59 2014 @@ -38,7 +38,8 @@ optional = 0x80, hook = 0x100, winevent_hook =0x200, - id = 0x400 + id = 0x400, + custdraw = 0x800 } msg_flags_t; struct message @@ -49,6 +50,7 @@ LPARAM lParam; /* expected value of lParam */ UINT id; /* extra message data: id of the window, notify code etc. */ + DWORD stage; /* custom draw stage */ }; struct msg_sequence @@ -80,12 +82,7 @@ assert(msg_seq->sequence); - msg_seq->sequence[msg_seq->count].message = msg->message; - msg_seq->sequence[msg_seq->count].flags = msg->flags; - msg_seq->sequence[msg_seq->count].wParam = msg->wParam; - msg_seq->sequence[msg_seq->count].lParam = msg->lParam; - msg_seq->sequence[msg_seq->count].id = msg->id; - + msg_seq->sequence[msg_seq->count] = *msg; msg_seq->count++; } @@ -105,6 +102,68 @@ flush_sequence(seq, i); } +static void dump_sequence( struct msg_sequence **seq, int sequence_index, + const struct message *expected, const char *context, + const char *file, int line ) +{ + struct msg_sequence *msg_seq = seq[sequence_index]; + const struct message *actual, *sequence; + unsigned int count = 0; + + sequence = msg_seq->sequence; + actual = sequence; + + trace_(file, line)("Failed sequence %s:\n", context ); + while (expected->message && actual->message) + { + trace_(file, line)( " %u: expected: %04x - actual: %04x wp %08lx lp %08lx\n", + count, expected->message, actual->message, actual->wParam, actual->lParam ); + + if (expected->message == actual->message) + { + if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && + (expected->flags & optional)) + { + /* don't match messages if their defwinproc status differs */ + expected++; + } + else + { + expected++; + actual++; + } + } + else + { + expected++; + actual++; + } + count++; + } + + /* optional trailing messages */ + while (expected->message && expected->flags & optional) + { + trace_(file, line)( " %u: expected: msg %04x - actual: nothing\n", count, expected->message ); + expected++; + count++; + } + + if (expected->message) + { + trace_(file, line)( " %u: expected: msg %04x - actual: nothing\n", count, expected->message ); + return; + } + + while (actual->message) + { + trace_(file, line)( " %u: expected: nothing - actual: %04x wp %08lx lp %08lx\n", + count, actual->message, actual->wParam, actual->lParam ); + actual++; + count++; + } +} + static void ok_sequence_(struct msg_sequence **seq, int sequence_index, const struct message *expected, const char *context, BOOL todo, const char *file, int line) @@ -112,7 +171,7 @@ struct msg_sequence *msg_seq = seq[sequence_index]; static const struct message end_of_sequence = {0, 0, 0, 0}; const struct message *actual, *sequence; - int failcount = 0; + int failcount = 0, dump = 0; add_message(seq, sequence_index, &end_of_sequence); @@ -121,8 +180,6 @@ while (expected->message && actual->message) { - trace_( file, line)("expected %04x - actual %04x\n", expected->message, actual->message); - if (expected->message == actual->message) { if (expected->flags & wparam) @@ -132,6 +189,7 @@ todo_wine { failcount++; + dump++; ok_(file, line) (FALSE, "%s: in msg 0x%04x expecting wParam 0x%lx got 0x%lx\n", context, expected->message, expected->wParam, actual->wParam); @@ -142,6 +200,7 @@ ok_(file, line) (expected->wParam == actual->wParam, "%s: in msg 0x%04x expecting wParam 0x%lx got 0x%lx\n", context, expected->message, expected->wParam, actual->wParam); + if (expected->wParam != actual->wParam) dump++; } } @@ -152,6 +211,7 @@ todo_wine { failcount++; + dump++; ok_(file, line) (FALSE, "%s: in msg 0x%04x expecting lParam 0x%lx got 0x%lx\n", context, expected->message, expected->lParam, actual->lParam); @@ -162,21 +222,45 @@ ok_(file, line) (expected->lParam == actual->lParam, "%s: in msg 0x%04x expecting lParam 0x%lx got 0x%lx\n", context, expected->message, expected->lParam, actual->lParam); - } - } - - if (expected->flags & id) - { - if (expected->id != actual->id && expected->flags & optional) - { - expected++; - continue; - } - if (expected->id != actual->id && todo) + if (expected->lParam != actual->lParam) dump++; + } + } + + if (expected->flags & custdraw) + { + if (expected->stage != actual->stage && todo) { todo_wine { failcount++; + dump++; + ok_(file, line) (FALSE, + "%s: in msg 0x%04x expecting cd stage 0x%08x got 0x%08x\n", + context, expected->message, expected->stage, actual->stage); + } + } + else + { + ok_(file, line) (expected->stage == actual->stage, + "%s: in msg 0x%04x expecting cd stage 0x%08x got 0x%08x\n", + context, expected->message, expected->stage, actual->stage); + if (expected->stage != actual->stage) dump++; + } + } + + if (expected->flags & id) + { + if (expected->id != actual->id && expected->flags & optional) + { + expected++; + continue; + } + if (expected->id != actual->id && todo) + { + todo_wine + { + failcount++; + dump++; ok_(file, line) (FALSE, "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", context, expected->message, expected->id, actual->id); @@ -187,6 +271,7 @@ ok_(file, line) (expected->id == actual->id, "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", context, expected->message, expected->id, actual->id); + if (expected->id != actual->id) dump++; } } @@ -195,6 +280,7 @@ todo_wine { failcount++; + dump++; ok_(file, line) (FALSE, "%s: the msg 0x%04x should %shave been sent by DefWindowProc\n", context, expected->message, (expected->flags & defwinproc) ? "" : "NOT "); @@ -205,23 +291,34 @@ ok_(file, line) ((expected->flags & defwinproc) == (actual->flags & defwinproc), "%s: the msg 0x%04x should %shave been sent by DefWindowProc\n", context, expected->message, (expected->flags & defwinproc) ? "" : "NOT "); + if ((expected->flags & defwinproc) != (actual->flags & defwinproc)) dump++; } ok_(file, line) ((expected->flags & beginpaint) == (actual->flags & beginpaint), "%s: the msg 0x%04x should %shave been sent by BeginPaint\n", context, expected->message, (expected->flags & beginpaint) ? "" : "NOT "); + if ((expected->flags & beginpaint) != (actual->flags & beginpaint)) dump++; + ok_(file, line) ((expected->flags & (sent|posted)) == (actual->flags & (sent|posted)), "%s: the msg 0x%04x should have been %s\n", context, expected->message, (expected->flags & posted) ? "posted" : "sent"); + if ((expected->flags & (sent|posted)) != (actual->flags & (sent|posted))) dump++; + ok_(file, line) ((expected->flags & parent) == (actual->flags & parent), "%s: the msg 0x%04x was expected in %s\n", context, expected->message, (expected->flags & parent) ? "parent" : "child"); + if ((expected->flags & parent) != (actual->flags & parent)) dump++; + ok_(file, line) ((expected->flags & hook) == (actual->flags & hook), "%s: the msg 0x%04x should have been sent by a hook\n", context, expected->message); + if ((expected->flags & hook) != (actual->flags & hook)) dump++; + ok_(file, line) ((expected->flags & winevent_hook) == (actual->flags & winevent_hook), "%s: the msg 0x%04x should have been sent by a winevent hook\n", context, expected->message); + if ((expected->flags & winevent_hook) != (actual->flags & winevent_hook)) dump++; + expected++; actual++; } @@ -230,19 +327,19 @@ else if (todo) { failcount++; + dump++; todo_wine { ok_(file, line) (FALSE, "%s: the msg 0x%04x was expected, but got msg 0x%04x instead\n", context, expected->message, actual->message); } - - flush_sequence(seq, sequence_index); - return; + goto done; } else { ok_(file, line) (FALSE, "%s: the msg 0x%04x was expected, but got msg 0x%04x instead\n", context, expected->message, actual->message); + dump++; expected++; actual++; } @@ -259,6 +356,7 @@ if (expected->message || actual->message) { failcount++; + dump++; ok_(file, line) (FALSE, "%s: the msg sequence is not complete: expected %04x - actual %04x\n", context, expected->message, actual->message); } @@ -266,18 +364,22 @@ } else if (expected->message || actual->message) { + dump++; ok_(file, line) (FALSE, "%s: the msg sequence is not complete: expected %04x - actual %04x\n", context, expected->message, actual->message); } if(todo && !failcount) /* succeeded yet marked todo */ { + dump++; todo_wine { ok_(file, line)(TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); } } +done: + if (dump) dump_sequence( seq, sequence_index, expected, context, file, line ); flush_sequence(seq, sequence_index); } Modified: trunk/rostests/winetests/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/syslin… ============================================================================== --- trunk/rostests/winetests/comctl32/syslink.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/syslink.c [iso-8859-1] Sat Sep 27 00:19:59 2014 @@ -94,8 +94,6 @@ message != WM_GETICON && message != WM_DEVICECHANGE) { - trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -151,8 +149,6 @@ LRESULT ret; struct message msg; - trace("syslink: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; Modified: trunk/rostests/winetests/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/tab.c?… ============================================================================== --- trunk/rostests/winetests/comctl32/tab.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/tab.c [iso-8859-1] Sat Sep 27 00:19:59 2014 @@ -344,8 +344,6 @@ message != WM_GETICON && message != WM_DEVICECHANGE) { - trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -409,8 +407,6 @@ message != WM_GETICON && message != WM_DEVICECHANGE) { - trace("tab: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; Modified: trunk/rostests/winetests/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolba… ============================================================================== --- trunk/rostests/winetests/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/toolbar.c [iso-8859-1] Sat Sep 27 00:19:59 2014 @@ -160,7 +160,6 @@ message != WM_GETICON && message != WM_DEVICECHANGE) { - trace("parent: %p, %04x, %08lx, %08lx\n", hWnd, message, wParam, lParam); add_message(sequences, PARENT_SEQ_INDEX, &msg); } Modified: trunk/rostests/winetests/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolti… ============================================================================== --- trunk/rostests/winetests/comctl32/tooltips.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/tooltips.c [iso-8859-1] Sat Sep 27 00:19:59 2014 @@ -470,6 +470,7 @@ tiW.hwnd = NULL; tiW.uId = 0x1234ABCD; tiW.lParam = 0xaaaaaaaa; + tiW.lpszText = NULL; r = SendMessageA(hwnd, TTM_GETTOOLINFOW, 0, (LPARAM)&tiW); ok(r, "Getting tooltip info failed\n"); ok(0x1abe11ed == tiW.lParam || Modified: trunk/rostests/winetests/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/trackb… ============================================================================== --- trunk/rostests/winetests/comctl32/trackbar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/trackbar.c [iso-8859-1] Sat Sep 27 00:19:59 2014 @@ -387,8 +387,6 @@ message != WM_GETICON && message != WM_DEVICECHANGE) { - trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -435,8 +433,6 @@ static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; - - trace("trackbar: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); msg.message = message; msg.flags = sent|wparam|lparam; Modified: trunk/rostests/winetests/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/treevi… ============================================================================== --- trunk/rostests/winetests/comctl32/treeview.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/treeview.c [iso-8859-1] Sat Sep 27 00:19:59 2014 @@ -40,10 +40,12 @@ static BOOL g_disp_A_to_W; static BOOL g_disp_set_stateimage; static BOOL g_beginedit_alter_text; - -#define NUM_MSG_SEQUENCES 2 +static HFONT g_customdraw_font; + +#define NUM_MSG_SEQUENCES 3 #define TREEVIEW_SEQ_INDEX 0 #define PARENT_SEQ_INDEX 1 +#define PARENT_CD_SEQ_INDEX 2 #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) @@ -204,7 +206,7 @@ }; static const struct message parent_expand_kb_seq[] = { - { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, TVN_KEYDOWN }, { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, { WM_CHANGEUISTATE, sent|optional }, @@ -219,7 +221,7 @@ }; static const struct message parent_expand_empty_kb_seq[] = { - { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, TVN_KEYDOWN }, { WM_CHANGEUISTATE, sent|optional }, { 0 } }; @@ -239,6 +241,21 @@ }; static const struct message empty_seq[] = { + { 0 } +}; + +static const struct message parent_cd_seq[] = { + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_PREPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPOSTPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_POSTPAINT }, + { 0 } +}; + +static const struct message parent_vk_return_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, NM_RETURN }, + { WM_CHANGEUISTATE, sent|optional }, { 0 } }; @@ -1017,7 +1034,6 @@ message != WM_GETICON && message != WM_DEVICECHANGE) { - trace("parent: %p, %04x, %08lx, %08lx\n", hWnd, message, wParam, lParam); add_message(sequences, PARENT_SEQ_INDEX, &msg); } @@ -1149,6 +1165,38 @@ break; } + case NM_CUSTOMDRAW: + { + NMTVCUSTOMDRAW *nmcd = (NMTVCUSTOMDRAW*)lParam; + COLORREF c0ffee = RGB(0xc0,0xff,0xee), cafe = RGB(0xca,0xfe,0x00); + + msg.flags |= custdraw; + msg.stage = nmcd->nmcd.dwDrawStage; + add_message(sequences, PARENT_CD_SEQ_INDEX, &msg); + + switch (msg.stage) + { + case CDDS_PREPAINT: + return CDRF_NOTIFYITEMDRAW|CDRF_NOTIFYITEMERASE|CDRF_NOTIFYPOSTPAINT; + case CDDS_ITEMPREPAINT: + nmcd->clrTextBk = c0ffee; + nmcd->clrText = cafe; + if (g_customdraw_font) + SelectObject(nmcd->nmcd.hdc, g_customdraw_font); + return CDRF_NOTIFYPOSTPAINT|CDRF_NEWFONT; + case CDDS_ITEMPOSTPAINT: + /* at the point of post paint notification colors are already restored */ + ok(GetTextColor(nmcd->nmcd.hdc) != cafe, "got 0%x\n", GetTextColor(nmcd->nmcd.hdc)); + ok(GetBkColor(nmcd->nmcd.hdc) != c0ffee, "got 0%x\n", GetBkColor(nmcd->nmcd.hdc)); + if (g_customdraw_font) + ok(GetCurrentObject(nmcd->nmcd.hdc, OBJ_FONT) != g_customdraw_font, "got %p\n", + GetCurrentObject(nmcd->nmcd.hdc, OBJ_FONT)); + break; + default: + ; + } + break; + } } } break; @@ -2051,6 +2099,60 @@ ok(code == (DLGC_WANTCHARS | DLGC_WANTARROWS), "0x%08x\n", code); DestroyWindow(hTree); +} + +static void test_customdraw(void) +{ + static const char *rootA = "root"; + TVINSERTSTRUCTA ins; + HTREEITEM hRoot; + LOGFONTA lf; + HWND hwnd; + + hwnd = create_treeview_control(0); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = (char*)rootA; + hRoot = TreeView_InsertItemA(hwnd, &ins); + ok(hRoot != NULL, "got %p\n", hRoot); + + /* create additional font, custom draw handler will select it */ + SystemParametersInfoA(SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, 0); + lf.lfHeight *= 2; + g_customdraw_font = CreateFontIndirectA(&lf); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + InvalidateRect(hwnd, NULL, TRUE); + UpdateWindow(hwnd); + ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_cd_seq, "custom draw notifications", FALSE); + DeleteObject(g_customdraw_font); + g_customdraw_font = NULL; + + DestroyWindow(hwnd); +} + +static void test_WM_KEYDOWN(void) +{ + static const char *rootA = "root"; + TVINSERTSTRUCTA ins; + HTREEITEM hRoot; + HWND hwnd; + + hwnd = create_treeview_control(0); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = (char*)rootA; + hRoot = TreeView_InsertItemA(hwnd, &ins); + ok(hRoot != NULL, "got %p\n", hRoot); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageA(hwnd, WM_KEYDOWN, VK_RETURN, 0); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_vk_return_seq, "WM_KEYDOWN/VK_RETURN parent notification", TRUE); + + DestroyWindow(hwnd); } START_TEST(treeview) @@ -2126,6 +2228,8 @@ test_TVM_GETNEXTITEM(); test_TVM_HITTEST(); test_WM_GETDLGCODE(); + test_customdraw(); + test_WM_KEYDOWN(); if (!load_v6_module(&ctx_cookie, &hCtx)) { Modified: trunk/rostests/winetests/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/updown… ============================================================================== --- trunk/rostests/winetests/comctl32/updown.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/updown.c [iso-8859-1] Sat Sep 27 00:19:59 2014 @@ -182,8 +182,6 @@ message != WM_GETICON && message != WM_DEVICECHANGE) { - trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -237,8 +235,6 @@ LRESULT ret; struct message msg; - trace("edit: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -278,8 +274,6 @@ static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; - - trace("updown: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); msg.message = message; msg.flags = sent|wparam|lparam;

10 years, 1 month

[akhaldi] 64322: [COMCTL32] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 00:19:40 2014 New Revision: 64322 URL: http://svn.reactos.org/svn/reactos?rev=64322&view=rev Log: [COMCTL32] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/pager.c trunk/reactos/dll/win32/comctl32/progress.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… ============================================================================== --- trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Sat Sep 27 00:19:40 2014 @@ -48,8 +48,7 @@ struct _IMAGELIST { - const struct IImageListVtbl *lpVtbl; /* 00: IImageList vtable */ - + IImageList2 IImageList2_iface; /* 00: IImageList vtable */ INT cCurImage; /* 04: ImageCount */ INT cMaxImage; /* 08: maximages */ INT cGrow; /* 0C: cGrow */ @@ -116,9 +115,14 @@ static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, 0, FALSE, 0 }; +static inline HIMAGELIST impl_from_IImageList2(IImageList2 *iface) +{ + return CONTAINING_RECORD(iface, struct _IMAGELIST, IImageList2_iface); +} + static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count); static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID iid, void** ppv); -static inline BOOL is_valid(HIMAGELIST himl); +static BOOL is_valid(HIMAGELIST himl); /* * An imagelist with N images is tiled like this: @@ -2053,13 +2057,13 @@ * RETURNS * Success: The newly created image list. It contains a single image * consisting of the second image merged with the first. - * Failure: NULL, if either himl1 or himl2 are invalid. + * Failure: NULL, if either himl1 or himl2 is invalid. * * NOTES * - The returned image list should be deleted by the caller using * ImageList_Destroy() when it is no longer required. - * - If either i1 or i2 are not valid image indices they will be treated - * as a blank image. + * - If either i1 or i2 is not a valid image index, they will be treated + * as blank images. */ HIMAGELIST WINAPI ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2, @@ -2363,6 +2367,12 @@ for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) himl->nOvlIdx[nCount] = -1; + if (himl->has_alpha) + { + HeapFree( GetProcessHeap(), 0, himl->has_alpha ); + himl->has_alpha = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->cMaxImage ); + } + hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage); SelectObject (himl->hdcImage, hbmNewImage); DeleteObject (himl->hbmImage); @@ -3183,38 +3193,43 @@ * IImageList implementation */ -static HRESULT WINAPI ImageListImpl_QueryInterface(IImageList *iface, +static HRESULT WINAPI ImageListImpl_QueryInterface(IImageList2 *iface, REFIID iid, void **ppv) { - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST imgl = impl_from_IImageList2(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; - if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IImageList, iid)) - *ppv = This; + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IImageList, iid) || + IsEqualIID(&IID_IImageList2, iid)) + { + *ppv = &imgl->IImageList2_iface; + } else { *ppv = NULL; return E_NOINTERFACE; } - IUnknown_AddRef((IUnknown*)*ppv); + IImageList2_AddRef(iface); return S_OK; } -static ULONG WINAPI ImageListImpl_AddRef(IImageList *iface) -{ - HIMAGELIST This = (HIMAGELIST) iface; - ULONG ref = InterlockedIncrement(&This->ref); +static ULONG WINAPI ImageListImpl_AddRef(IImageList2 *iface) +{ + HIMAGELIST imgl = impl_from_IImageList2(iface); + ULONG ref = InterlockedIncrement(&imgl->ref); TRACE("(%p) refcount=%u\n", iface, ref); return ref; } -static ULONG WINAPI ImageListImpl_Release(IImageList *iface) -{ - HIMAGELIST This = (HIMAGELIST) iface; +static ULONG WINAPI ImageListImpl_Release(IImageList2 *iface) +{ + HIMAGELIST This = impl_from_IImageList2(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -3233,7 +3248,7 @@ if (This->hbrBlend25) DeleteObject (This->hbrBlend25); if (This->hbrBlend50) DeleteObject (This->hbrBlend50); - This->lpVtbl = NULL; + This->IImageList2_iface.lpVtbl = NULL; HeapFree(GetProcessHeap(), 0, This->has_alpha); HeapFree(GetProcessHeap(), 0, This); } @@ -3241,16 +3256,16 @@ return ref; } -static HRESULT WINAPI ImageListImpl_Add(IImageList *iface, HBITMAP hbmImage, +static HRESULT WINAPI ImageListImpl_Add(IImageList2 *iface, HBITMAP hbmImage, HBITMAP hbmMask, int *pi) { - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST imgl = impl_from_IImageList2(iface); int ret; if (!pi) return E_FAIL; - ret = ImageList_Add(This, hbmImage, hbmMask); + ret = ImageList_Add(imgl, hbmImage, hbmMask); if (ret == -1) return E_FAIL; @@ -3259,16 +3274,16 @@ return S_OK; } -static HRESULT WINAPI ImageListImpl_ReplaceIcon(IImageList *iface, int i, +static HRESULT WINAPI ImageListImpl_ReplaceIcon(IImageList2 *iface, int i, HICON hicon, int *pi) { - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST imgl = impl_from_IImageList2(iface); int ret; if (!pi) return E_FAIL; - ret = ImageList_ReplaceIcon(This, i, hicon); + ret = ImageList_ReplaceIcon(imgl, i, hicon); if (ret == -1) return E_FAIL; @@ -3277,30 +3292,30 @@ return S_OK; } -static HRESULT WINAPI ImageListImpl_SetOverlayImage(IImageList *iface, +static HRESULT WINAPI ImageListImpl_SetOverlayImage(IImageList2 *iface, int iImage, int iOverlay) { - return ImageList_SetOverlayImage((HIMAGELIST) iface, iImage, iOverlay) - ? S_OK : E_FAIL; -} - -static HRESULT WINAPI ImageListImpl_Replace(IImageList *iface, int i, + HIMAGELIST imgl = impl_from_IImageList2(iface); + return ImageList_SetOverlayImage(imgl, iImage, iOverlay) ? S_OK : E_FAIL; +} + +static HRESULT WINAPI ImageListImpl_Replace(IImageList2 *iface, int i, HBITMAP hbmImage, HBITMAP hbmMask) { - return ImageList_Replace((HIMAGELIST) iface, i, hbmImage, hbmMask) ? S_OK : - E_FAIL; -} - -static HRESULT WINAPI ImageListImpl_AddMasked(IImageList *iface, HBITMAP hbmImage, + HIMAGELIST imgl = impl_from_IImageList2(iface); + return ImageList_Replace(imgl, i, hbmImage, hbmMask) ? S_OK : E_FAIL; +} + +static HRESULT WINAPI ImageListImpl_AddMasked(IImageList2 *iface, HBITMAP hbmImage, COLORREF crMask, int *pi) { - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST imgl = impl_from_IImageList2(iface); int ret; if (!pi) return E_FAIL; - ret = ImageList_AddMasked(This, hbmImage, crMask); + ret = ImageList_AddMasked(imgl, hbmImage, crMask); if (ret == -1) return E_FAIL; @@ -3309,17 +3324,17 @@ return S_OK; } -static HRESULT WINAPI ImageListImpl_Draw(IImageList *iface, +static HRESULT WINAPI ImageListImpl_Draw(IImageList2 *iface, IMAGELISTDRAWPARAMS *pimldp) { - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST imgl = impl_from_IImageList2(iface); HIMAGELIST old_himl; int ret; /* As far as I can tell, Windows simply ignores the contents of pimldp->himl so we shall simulate the same */ old_himl = pimldp->himl; - pimldp->himl = This; + pimldp->himl = imgl; ret = ImageList_DrawIndirect(pimldp); @@ -3327,20 +3342,22 @@ return ret ? S_OK : E_INVALIDARG; } -static HRESULT WINAPI ImageListImpl_Remove(IImageList *iface, int i) -{ - return (ImageList_Remove((HIMAGELIST) iface, i) == 0) ? E_INVALIDARG : S_OK; -} - -static HRESULT WINAPI ImageListImpl_GetIcon(IImageList *iface, int i, UINT flags, +static HRESULT WINAPI ImageListImpl_Remove(IImageList2 *iface, int i) +{ + HIMAGELIST imgl = impl_from_IImageList2(iface); + return (ImageList_Remove(imgl, i) == 0) ? E_INVALIDARG : S_OK; +} + +static HRESULT WINAPI ImageListImpl_GetIcon(IImageList2 *iface, int i, UINT flags, HICON *picon) { + HIMAGELIST imgl = impl_from_IImageList2(iface); HICON hIcon; if (!picon) return E_FAIL; - hIcon = ImageList_GetIcon((HIMAGELIST) iface, i, flags); + hIcon = ImageList_GetIcon(imgl, i, flags); if (hIcon == NULL) return E_FAIL; @@ -3349,28 +3366,29 @@ return S_OK; } -static HRESULT WINAPI ImageListImpl_GetImageInfo(IImageList *iface, int i, +static HRESULT WINAPI ImageListImpl_GetImageInfo(IImageList2 *iface, int i, IMAGEINFO *pImageInfo) { - return ImageList_GetImageInfo((HIMAGELIST) iface, i, pImageInfo) ? S_OK : E_FAIL; -} - -static HRESULT WINAPI ImageListImpl_Copy(IImageList *iface, int iDst, - IUnknown *punkSrc, int iSrc, UINT uFlags) -{ - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST imgl = impl_from_IImageList2(iface); + return ImageList_GetImageInfo(imgl, i, pImageInfo) ? S_OK : E_FAIL; +} + +static HRESULT WINAPI ImageListImpl_Copy(IImageList2 *iface, int dst_index, + IUnknown *unk_src, int src_index, UINT flags) +{ + HIMAGELIST imgl = impl_from_IImageList2(iface); IImageList *src = NULL; HRESULT ret; - if (!punkSrc) + if (!unk_src) return E_FAIL; /* TODO: Add test for IID_ImageList2 too */ - if (FAILED(IUnknown_QueryInterface(punkSrc, &IID_IImageList, + if (FAILED(IUnknown_QueryInterface(unk_src, &IID_IImageList, (void **) &src))) return E_FAIL; - if (ImageList_Copy(This, iDst, (HIMAGELIST) src, iSrc, uFlags)) + if (ImageList_Copy(imgl, dst_index, (HIMAGELIST) src, src_index, flags)) ret = S_OK; else ret = E_FAIL; @@ -3379,12 +3397,12 @@ return ret; } -static HRESULT WINAPI ImageListImpl_Merge(IImageList *iface, int i1, +static HRESULT WINAPI ImageListImpl_Merge(IImageList2 *iface, int i1, IUnknown *punk2, int i2, int dx, int dy, REFIID riid, void **ppv) { - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST imgl = impl_from_IImageList2(iface); IImageList *iml2 = NULL; - HIMAGELIST hNew; + HIMAGELIST merged; HRESULT ret = E_FAIL; TRACE("(%p)->(%d %p %d %d %d %s %p)\n", iface, i1, punk2, i2, dx, dy, debugstr_guid(riid), ppv); @@ -3394,126 +3412,126 @@ (void **) &iml2))) return E_FAIL; - hNew = ImageList_Merge(This, i1, (HIMAGELIST) iml2, i2, dx, dy); + merged = ImageList_Merge(imgl, i1, (HIMAGELIST) iml2, i2, dx, dy); /* Get the interface for the new image list */ - if (hNew) - { - IImageList *imerge = (IImageList*)hNew; - - ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); - IImageList_Release(imerge); + if (merged) + { + ret = HIMAGELIST_QueryInterface(merged, riid, ppv); + ImageList_Destroy(merged); } IImageList_Release(iml2); return ret; } -static HRESULT WINAPI ImageListImpl_Clone(IImageList *iface, REFIID riid, void **ppv) -{ - HIMAGELIST This = (HIMAGELIST) iface; +static HRESULT WINAPI ImageListImpl_Clone(IImageList2 *iface, REFIID riid, void **ppv) +{ + HIMAGELIST imgl = impl_from_IImageList2(iface); HIMAGELIST clone; HRESULT ret = E_FAIL; TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); - clone = ImageList_Duplicate(This); + clone = ImageList_Duplicate(imgl); /* Get the interface for the new image list */ if (clone) { - IImageList *iclone = (IImageList*)clone; - ret = HIMAGELIST_QueryInterface(clone, riid, ppv); - IImageList_Release(iclone); + ImageList_Destroy(clone); } return ret; } -static HRESULT WINAPI ImageListImpl_GetImageRect(IImageList *iface, int i, +static HRESULT WINAPI ImageListImpl_GetImageRect(IImageList2 *iface, int i, RECT *prc) { - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST imgl = impl_from_IImageList2(iface); IMAGEINFO info; if (!prc) return E_FAIL; - if (!ImageList_GetImageInfo(This, i, &info)) + if (!ImageList_GetImageInfo(imgl, i, &info)) return E_FAIL; return CopyRect(prc, &info.rcImage) ? S_OK : E_FAIL; } -static HRESULT WINAPI ImageListImpl_GetIconSize(IImageList *iface, int *cx, +static HRESULT WINAPI ImageListImpl_GetIconSize(IImageList2 *iface, int *cx, int *cy) { - HIMAGELIST This = (HIMAGELIST) iface; - - return ImageList_GetIconSize(This, cx, cy) ? S_OK : E_INVALIDARG; -} - -static HRESULT WINAPI ImageListImpl_SetIconSize(IImageList *iface, int cx, + HIMAGELIST imgl = impl_from_IImageList2(iface); + return ImageList_GetIconSize(imgl, cx, cy) ? S_OK : E_INVALIDARG; +} + +static HRESULT WINAPI ImageListImpl_SetIconSize(IImageList2 *iface, int cx, int cy) { - return ImageList_SetIconSize((HIMAGELIST) iface, cx, cy) ? S_OK : E_FAIL; -} - -static HRESULT WINAPI ImageListImpl_GetImageCount(IImageList *iface, int *pi) -{ - *pi = ImageList_GetImageCount((HIMAGELIST) iface); + HIMAGELIST imgl = impl_from_IImageList2(iface); + return ImageList_SetIconSize(imgl, cx, cy) ? S_OK : E_FAIL; +} + +static HRESULT WINAPI ImageListImpl_GetImageCount(IImageList2 *iface, int *pi) +{ + HIMAGELIST imgl = impl_from_IImageList2(iface); + *pi = ImageList_GetImageCount(imgl); return S_OK; } -static HRESULT WINAPI ImageListImpl_SetImageCount(IImageList *iface, - UINT uNewCount) -{ - return ImageList_SetImageCount((HIMAGELIST) iface, uNewCount) ? S_OK : E_FAIL; -} - -static HRESULT WINAPI ImageListImpl_SetBkColor(IImageList *iface, COLORREF clrBk, +static HRESULT WINAPI ImageListImpl_SetImageCount(IImageList2 *iface, UINT count) +{ + HIMAGELIST imgl = impl_from_IImageList2(iface); + return ImageList_SetImageCount(imgl, count) ? S_OK : E_FAIL; +} + +static HRESULT WINAPI ImageListImpl_SetBkColor(IImageList2 *iface, COLORREF clrBk, COLORREF *pclr) { - *pclr = ImageList_SetBkColor((HIMAGELIST) iface, clrBk); + HIMAGELIST imgl = impl_from_IImageList2(iface); + *pclr = ImageList_SetBkColor(imgl, clrBk); return S_OK; } -static HRESULT WINAPI ImageListImpl_GetBkColor(IImageList *iface, COLORREF *pclr) -{ - *pclr = ImageList_GetBkColor((HIMAGELIST) iface); +static HRESULT WINAPI ImageListImpl_GetBkColor(IImageList2 *iface, COLORREF *pclr) +{ + HIMAGELIST imgl = impl_from_IImageList2(iface); + *pclr = ImageList_GetBkColor(imgl); return S_OK; } -static HRESULT WINAPI ImageListImpl_BeginDrag(IImageList *iface, int iTrack, +static HRESULT WINAPI ImageListImpl_BeginDrag(IImageList2 *iface, int iTrack, int dxHotspot, int dyHotspot) { - return ImageList_BeginDrag((HIMAGELIST) iface, iTrack, dxHotspot, dyHotspot) ? S_OK : E_FAIL; -} - -static HRESULT WINAPI ImageListImpl_EndDrag(IImageList *iface) + HIMAGELIST imgl = impl_from_IImageList2(iface); + return ImageList_BeginDrag(imgl, iTrack, dxHotspot, dyHotspot) ? S_OK : E_FAIL; +} + +static HRESULT WINAPI ImageListImpl_EndDrag(IImageList2 *iface) { ImageList_EndDrag(); return S_OK; } -static HRESULT WINAPI ImageListImpl_DragEnter(IImageList *iface, HWND hwndLock, +static HRESULT WINAPI ImageListImpl_DragEnter(IImageList2 *iface, HWND hwndLock, int x, int y) { return ImageList_DragEnter(hwndLock, x, y) ? S_OK : E_FAIL; } -static HRESULT WINAPI ImageListImpl_DragLeave(IImageList *iface, HWND hwndLock) +static HRESULT WINAPI ImageListImpl_DragLeave(IImageList2 *iface, HWND hwndLock) { return ImageList_DragLeave(hwndLock) ? S_OK : E_FAIL; } -static HRESULT WINAPI ImageListImpl_DragMove(IImageList *iface, int x, int y) +static HRESULT WINAPI ImageListImpl_DragMove(IImageList2 *iface, int x, int y) { return ImageList_DragMove(x, y) ? S_OK : E_FAIL; } -static HRESULT WINAPI ImageListImpl_SetDragCursorImage(IImageList *iface, +static HRESULT WINAPI ImageListImpl_SetDragCursorImage(IImageList2 *iface, IUnknown *punk, int iDrag, int dxHotspot, int dyHotspot) { IImageList *iml2 = NULL; @@ -3535,12 +3553,12 @@ return ret ? S_OK : E_FAIL; } -static HRESULT WINAPI ImageListImpl_DragShowNolock(IImageList *iface, BOOL fShow) +static HRESULT WINAPI ImageListImpl_DragShowNolock(IImageList2 *iface, BOOL fShow) { return ImageList_DragShowNolock(fShow) ? S_OK : E_FAIL; } -static HRESULT WINAPI ImageListImpl_GetDragImage(IImageList *iface, POINT *ppt, +static HRESULT WINAPI ImageListImpl_GetDragImage(IImageList2 *iface, POINT *ppt, POINT *pptHotspot, REFIID riid, PVOID *ppv) { HRESULT ret = E_FAIL; @@ -3563,17 +3581,17 @@ return ret; } -static HRESULT WINAPI ImageListImpl_GetItemFlags(IImageList *iface, int i, +static HRESULT WINAPI ImageListImpl_GetItemFlags(IImageList2 *iface, int i, DWORD *dwFlags) { FIXME("STUB: %p %d %p\n", iface, i, dwFlags); return E_NOTIMPL; } -static HRESULT WINAPI ImageListImpl_GetOverlayImage(IImageList *iface, int iOverlay, +static HRESULT WINAPI ImageListImpl_GetOverlayImage(IImageList2 *iface, int iOverlay, int *piIndex) { - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST This = impl_from_IImageList2(iface); int i; if ((iOverlay < 0) || (iOverlay > This->cCurImage)) @@ -3591,8 +3609,80 @@ return E_FAIL; } - -static const IImageListVtbl ImageListImpl_Vtbl = { +static HRESULT WINAPI ImageListImpl_Resize(IImageList2 *iface, INT cx, INT cy) +{ + FIXME("(%p)->(%d %d): stub\n", iface, cx, cy); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_GetOriginalSize(IImageList2 *iface, INT image, DWORD flags, INT *cx, INT *cy) +{ + FIXME("(%p)->(%d %x %p %p): stub\n", iface, image, flags, cx, cy); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_SetOriginalSize(IImageList2 *iface, INT image, INT cx, INT cy) +{ + FIXME("(%p)->(%d %d %d): stub\n", iface, image, cx, cy); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_SetCallback(IImageList2 *iface, IUnknown *callback) +{ + FIXME("(%p)->(%p): stub\n", iface, callback); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_GetCallback(IImageList2 *iface, REFIID riid, void **ppv) +{ + FIXME("(%p)->(%s %p): stub\n", iface, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_ForceImagePresent(IImageList2 *iface, INT image, DWORD flags) +{ + FIXME("(%p)->(%d %x): stub\n", iface, image, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_DiscardImages(IImageList2 *iface, INT first_image, INT last_image, DWORD flags) +{ + FIXME("(%p)->(%d %d %x): stub\n", iface, first_image, last_image, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_PreloadImages(IImageList2 *iface, IMAGELISTDRAWPARAMS *params) +{ + FIXME("(%p)->(%p): stub\n", iface, params); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_GetStatistics(IImageList2 *iface, IMAGELISTSTATS *stats) +{ + FIXME("(%p)->(%p): stub\n", iface, stats); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_Initialize(IImageList2 *iface, INT cx, INT cy, UINT flags, INT initial, INT grow) +{ + FIXME("(%p)->(%d %d %d %d %d): stub\n", iface, cx, cy, flags, initial, grow); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_Replace2(IImageList2 *iface, INT i, HBITMAP image, HBITMAP mask, IUnknown *unk, DWORD flags) +{ + FIXME("(%p)->(%d %p %p %p %x): stub\n", iface, i, image, mask, unk, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_ReplaceFromImageList(IImageList2 *iface, INT i, IImageList *imagelist, INT src, + IUnknown *unk, DWORD flags) +{ + FIXME("(%p)->(%d %p %d %p %x): stub\n", iface, i, imagelist, src, unk, flags); + return E_NOTIMPL; +} + +static const IImageList2Vtbl ImageListImpl_Vtbl = { ImageListImpl_QueryInterface, ImageListImpl_AddRef, ImageListImpl_Release, @@ -3624,7 +3714,19 @@ ImageListImpl_DragShowNolock, ImageListImpl_GetDragImage, ImageListImpl_GetItemFlags, - ImageListImpl_GetOverlayImage + ImageListImpl_GetOverlayImage, + ImageListImpl_Resize, + ImageListImpl_GetOriginalSize, + ImageListImpl_SetOriginalSize, + ImageListImpl_SetCallback, + ImageListImpl_GetCallback, + ImageListImpl_ForceImagePresent, + ImageListImpl_DiscardImages, + ImageListImpl_PreloadImages, + ImageListImpl_GetStatistics, + ImageListImpl_Initialize, + ImageListImpl_Replace2, + ImageListImpl_ReplaceFromImageList }; static BOOL is_valid(HIMAGELIST himl) @@ -3632,7 +3734,7 @@ BOOL valid; __TRY { - valid = himl && himl->lpVtbl == &ImageListImpl_Vtbl; + valid = himl && himl->IImageList2_iface.lpVtbl == &ImageListImpl_Vtbl; } __EXCEPT_PAGE_FAULT { @@ -3661,7 +3763,7 @@ HIMAGELIST_QueryInterface (HIMAGELIST himl, REFIID riid, void **ppv) { TRACE("(%p,%s,%p)\n", himl, debugstr_guid(riid), ppv); - return IImageList_QueryInterface((IImageList *) himl, riid, ppv); + return IImageList2_QueryInterface((IImageList2 *) himl, riid, ppv); } static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID iid, void** ppv) @@ -3678,11 +3780,11 @@ This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct _IMAGELIST)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &ImageListImpl_Vtbl; + This->IImageList2_iface.lpVtbl = &ImageListImpl_Vtbl; This->ref = 1; - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IImageList2_QueryInterface(&This->IImageList2_iface, iid, ppv); + IImageList2_Release(&This->IImageList2_iface); return ret; } Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] Sat Sep 27 00:19:40 2014 @@ -6,7 +6,7 @@ * Copyright 2000 Jason Mawdsley * Copyright 2001 CodeWeavers Inc. * Copyright 2002 Dimitrie O. Paun - * Copyright 2009-2013 Nikolay Sivov + * Copyright 2009-2014 Nikolay Sivov * Copyright 2009 Owen Rudge for CodeWeavers * Copyright 2012-2013 Daniel Jelinski * @@ -313,7 +313,6 @@ WCHAR szSearchParam[ MAX_PATH ]; /* painting */ - DWORD cditemmode; /* Keep the custom draw flags for an item/row */ BOOL bIsDrawing; /* Drawing in progress */ INT nMeasureItemHeight; /* WM_MEASUREITEM result */ BOOL bRedraw; /* WM_SETREDRAW switch */ @@ -767,6 +766,7 @@ if (lpnmh->pitem->mask & HDI_TEXT) { text = (LPCWSTR)lpnmh->pitem->pszText; + lpnmh->pitem->pszText = NULL; Str_SetPtrWtoA(&lpnmh->pitem->pszText, text); } /* convert filter text */ @@ -774,6 +774,7 @@ lpnmh->pitem->pvFilter) { filter = (LPCWSTR)((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText; + ((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText = NULL; Str_SetPtrWtoA(&((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText, filter); } } @@ -1034,10 +1035,7 @@ static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRAW *lpnmlvcd, BOOL SubItem) { - if (lpnmlvcd->clrTextBk == CLR_DEFAULT) - lpnmlvcd->clrTextBk = comctl32_color.clrWindow; - if (lpnmlvcd->clrText == CLR_DEFAULT) - lpnmlvcd->clrText = comctl32_color.clrWindowText; + COLORREF backcolor, textcolor; /* apparently, for selected items, we have to override the returned values */ if (!SubItem) @@ -1057,15 +1055,23 @@ } } + backcolor = lpnmlvcd->clrTextBk; + textcolor = lpnmlvcd->clrText; + + if (backcolor == CLR_DEFAULT) + backcolor = comctl32_color.clrWindow; + if (textcolor == CLR_DEFAULT) + textcolor = comctl32_color.clrWindowText; + /* Set the text attributes */ - if (lpnmlvcd->clrTextBk != CLR_NONE) + if (backcolor != CLR_NONE) { SetBkMode(hdc, OPAQUE); - SetBkColor(hdc,lpnmlvcd->clrTextBk); + SetBkColor(hdc, backcolor); } else SetBkMode(hdc, TRANSPARENT); - SetTextColor(hdc, lpnmlvcd->clrText); + SetTextColor(hdc, textcolor); } static inline DWORD notify_postpaint (const LISTVIEW_INFO *infoPtr, NMLVCUSTOMDRAW *lpnmlvcd) @@ -4536,86 +4542,27 @@ return FillRect(hdc, lprcBox, infoPtr->hBkBrush); } -/*** - * DESCRIPTION: - * Draws an item. - * - * PARAMETER(S): - * [I] infoPtr : valid pointer to the listview structure - * [I] hdc : device context handle - * [I] nItem : item index - * [I] nSubItem : subitem index - * [I] pos : item position in client coordinates - * [I] cdmode : custom draw mode - * - * RETURN: - * Success: TRUE - * Failure: FALSE - */ -static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nSubItem, POINT pos, DWORD cdmode) -{ - UINT uFormat; - WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' }; - static WCHAR szCallback[] = { '(', 'c', 'a', 'l', 'l', 'b', 'a', 'c', 'k', ')', 0 }; - DWORD cdsubitemmode = CDRF_DODEFAULT; - LPRECT lprcFocus; - RECT rcSelect, rcBox, rcIcon, rcLabel, rcStateIcon; - NMLVCUSTOMDRAW nmlvcd; +/* Draw main item or subitem */ +static void LISTVIEW_DrawItemPart(LISTVIEW_INFO *infoPtr, LVITEMW *item, const NMLVCUSTOMDRAW *nmlvcd, const POINT *pos) +{ + RECT rcSelect, rcLabel, rcBox, rcStateIcon, rcIcon; HIMAGELIST himl; - LVITEMW lvItem; - - TRACE("(hdc=%p, nItem=%d, nSubItem=%d, pos=%s)\n", hdc, nItem, nSubItem, wine_dbgstr_point(&pos)); - - /* get information needed for drawing the item */ - lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; - if (nSubItem == 0) lvItem.mask |= LVIF_STATE; - if (infoPtr->uView == LV_VIEW_DETAILS) lvItem.mask |= LVIF_INDENT; - lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK | LVIS_CUT | LVIS_OVERLAYMASK; - lvItem.iItem = nItem; - lvItem.iSubItem = nSubItem; - lvItem.state = 0; - lvItem.lParam = 0; - lvItem.cchTextMax = DISP_TEXT_SIZE; - lvItem.pszText = szDispText; - if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) return FALSE; - if (nSubItem > 0 && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) - lvItem.state = LISTVIEW_GetItemState(infoPtr, nItem, LVIS_SELECTED); - if (lvItem.pszText == LPSTR_TEXTCALLBACKW) lvItem.pszText = szCallback; - TRACE(" lvItem=%s\n", debuglvitem_t(&lvItem, TRUE)); + UINT format; + RECT *focus; /* now check if we need to update the focus rectangle */ - lprcFocus = infoPtr->bFocus && (lvItem.state & LVIS_FOCUSED) ? &infoPtr->rcFocus : 0; - - if (!lprcFocus) lvItem.state &= ~LVIS_FOCUSED; - LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &rcBox, &rcSelect, &rcIcon, &rcStateIcon, &rcLabel); - OffsetRect(&rcBox, pos.x, pos.y); - OffsetRect(&rcSelect, pos.x, pos.y); - OffsetRect(&rcIcon, pos.x, pos.y); - OffsetRect(&rcStateIcon, pos.x, pos.y); - OffsetRect(&rcLabel, pos.x, pos.y); + focus = infoPtr->bFocus && (item->state & LVIS_FOCUSED) ? &infoPtr->rcFocus : 0; + if (!focus) item->state &= ~LVIS_FOCUSED; + + LISTVIEW_GetItemMetrics(infoPtr, item, &rcBox, &rcSelect, &rcIcon, &rcStateIcon, &rcLabel); + OffsetRect(&rcBox, pos->x, pos->y); + OffsetRect(&rcSelect, pos->x, pos->y); + OffsetRect(&rcIcon, pos->x, pos->y); + OffsetRect(&rcStateIcon, pos->x, pos->y); + OffsetRect(&rcLabel, pos->x, pos->y); TRACE(" rcBox=%s, rcSelect=%s, rcIcon=%s. rcLabel=%s\n", wine_dbgstr_rect(&rcBox), wine_dbgstr_rect(&rcSelect), wine_dbgstr_rect(&rcIcon), wine_dbgstr_rect(&rcLabel)); - - /* fill in the custom draw structure */ - customdraw_fill(&nmlvcd, infoPtr, hdc, &rcBox, &lvItem); - - if (nSubItem > 0) cdmode = infoPtr->cditemmode; - if (cdmode & CDRF_SKIPDEFAULT) goto postpaint; - if (cdmode & CDRF_NOTIFYITEMDRAW) - cdsubitemmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd); - if (nSubItem == 0) infoPtr->cditemmode = cdsubitemmode; - if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint; - /* we have to send a CDDS_SUBITEM customdraw explicitly for subitem 0 */ - if (nSubItem == 0 && (cdsubitemmode & CDRF_NOTIFYITEMDRAW) != 0) - { - cdsubitemmode = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd); - if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint; - } - if (nSubItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW)) - prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); - else if ((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) == FALSE) - prepaint_setup(infoPtr, hdc, &nmlvcd, TRUE); /* FIXME: temporary hack */ rcSelect.left = rcLabel.left; @@ -4625,16 +4572,15 @@ /* in detail mode, we want to paint background for label rect when * item is not selected or listview has full row select; otherwise paint * background for text only */ - if (infoPtr->uView == LV_VIEW_ICON || - (infoPtr->uView == LV_VIEW_DETAILS && - (!(lvItem.state & LVIS_SELECTED) || - (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) != 0))) + if ( infoPtr->uView == LV_VIEW_ICON || + (infoPtr->uView == LV_VIEW_DETAILS && (!(item->state & LVIS_SELECTED) || + (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)))) rcSelect = rcLabel; - if (nmlvcd.clrTextBk != CLR_NONE) - ExtTextOutW(hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, NULL, 0, NULL); - - if(nSubItem == 0 && infoPtr->nFocusedItem == nItem) + if (nmlvcd->clrTextBk != CLR_NONE) + ExtTextOutW(nmlvcd->nmcd.hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, NULL, 0, NULL); + + if (item->state & LVIS_FOCUSED) { if (infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) { @@ -4646,7 +4592,7 @@ if ((leftmost = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, 0, 0))) { - INT Originx = pos.x - LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left; + INT Originx = pos->x - LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left; INT index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, 0); @@ -4663,73 +4609,201 @@ } /* state icons */ - if (infoPtr->himlState && STATEIMAGEINDEX(lvItem.state) && (nSubItem == 0)) - { - UINT uStateImage = STATEIMAGEINDEX(lvItem.state); - if (uStateImage) + if (infoPtr->himlState && STATEIMAGEINDEX(item->state) && (item->iSubItem == 0)) + { + UINT stateimage = STATEIMAGEINDEX(item->state); + if (stateimage) { - TRACE("uStateImage=%d\n", uStateImage); - ImageList_Draw(infoPtr->himlState, uStateImage - 1, hdc, - rcStateIcon.left, rcStateIcon.top, ILD_NORMAL); + TRACE("stateimage=%d\n", stateimage); + ImageList_Draw(infoPtr->himlState, stateimage-1, nmlvcd->nmcd.hdc, rcStateIcon.left, rcStateIcon.top, ILD_NORMAL); } } /* item icons */ himl = (infoPtr->uView == LV_VIEW_ICON ? infoPtr->himlNormal : infoPtr->himlSmall); - if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon)) + if (himl && item->iImage >= 0 && !IsRectEmpty(&rcIcon)) { UINT style; - TRACE("iImage=%d\n", lvItem.iImage); - - if (lvItem.state & (LVIS_SELECTED | LVIS_CUT) && infoPtr->bFocus) + TRACE("iImage=%d\n", item->iImage); + + if (item->state & (LVIS_SELECTED | LVIS_CUT) && infoPtr->bFocus) style = ILD_SELECTED; else style = ILD_NORMAL; - ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, + ImageList_DrawEx(himl, item->iImage, nmlvcd->nmcd.hdc, rcIcon.left, rcIcon.top, rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk, - lvItem.state & LVIS_CUT ? RGB(255, 255, 255) : CLR_DEFAULT, - style | (lvItem.state & LVIS_OVERLAYMASK)); + item->state & LVIS_CUT ? RGB(255, 255, 255) : CLR_DEFAULT, + style | (item->state & LVIS_OVERLAYMASK)); } /* Don't bother painting item being edited */ - if (infoPtr->hwndEdit && nItem == infoPtr->nEditLabelItem && nSubItem == 0) goto postpaint; - + if (infoPtr->hwndEdit && item->iItem == infoPtr->nEditLabelItem && item->iSubItem == 0) return; + /* figure out the text drawing flags */ - uFormat = (infoPtr->uView == LV_VIEW_ICON ? (lprcFocus ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS) : LV_SL_DT_FLAGS); + format = (infoPtr->uView == LV_VIEW_ICON ? (focus ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS) : LV_SL_DT_FLAGS); if (infoPtr->uView == LV_VIEW_ICON) - uFormat = (lprcFocus ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS); - else if (nSubItem) - { - switch (LISTVIEW_GetColumnInfo(infoPtr, nSubItem)->fmt & LVCFMT_JUSTIFYMASK) + format = (focus ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS); + else if (item->iSubItem) + { + switch (LISTVIEW_GetColumnInfo(infoPtr, item->iSubItem)->fmt & LVCFMT_JUSTIFYMASK) { - case LVCFMT_RIGHT: uFormat |= DT_RIGHT; break; - case LVCFMT_CENTER: uFormat |= DT_CENTER; break; - default: uFormat |= DT_LEFT; + case LVCFMT_RIGHT: format |= DT_RIGHT; break; + case LVCFMT_CENTER: format |= DT_CENTER; break; + default: format |= DT_LEFT; } } - if (!(uFormat & (DT_RIGHT | DT_CENTER))) - { - if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon)) rcLabel.left += IMAGE_PADDING; + if (!(format & (DT_RIGHT | DT_CENTER))) + { + if (himl && item->iImage >= 0 && !IsRectEmpty(&rcIcon)) rcLabel.left += IMAGE_PADDING; else rcLabel.left += LABEL_HOR_PADDING; } - else if (uFormat & DT_RIGHT) rcLabel.right -= LABEL_HOR_PADDING; + else if (format & DT_RIGHT) rcLabel.right -= LABEL_HOR_PADDING; /* for GRIDLINES reduce the bottom so the text formats correctly */ if (infoPtr->uView == LV_VIEW_DETAILS && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) rcLabel.bottom--; #ifdef __REACTOS__ - if ((!(lvItem.state & LVIS_SELECTED) || !infoPtr->bFocus) && (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTSHADOWTEXT)) - DrawShadowText(hdc, lvItem.pszText, -1, &rcLabel, uFormat, RGB(255, 255, 255), RGB(0, 0, 0), 2, 2); + if ((!(item->state & LVIS_SELECTED) || !infoPtr->bFocus) && (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTSHADOWTEXT)) + DrawShadowText(nmlvcd->nmcd.hdc, item->pszText, -1, &rcLabel, format, RGB(255, 255, 255), RGB(0, 0, 0), 2, 2); else #endif - DrawTextW(hdc, lvItem.pszText, -1, &rcLabel, uFormat); + DrawTextW(nmlvcd->nmcd.hdc, item->pszText, -1, &rcLabel, format); +} + +/*** + * DESCRIPTION: + * Draws an item. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * [I] hdc : device context handle + * [I] nItem : item index + * [I] nSubItem : subitem index + * [I] pos : item position in client coordinates + * [I] cdmode : custom draw mode + * + * RETURN: + * Success: TRUE + * Failure: FALSE + */ +static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERATOR *subitems, POINT pos, DWORD cdmode) +{ + WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' }; + static WCHAR callbackW[] = { '(', 'c', 'a', 'l', 'l', 'b', 'a', 'c', 'k', ')', 0 }; + DWORD cdsubitemmode = CDRF_DODEFAULT; + RECT *focus, rcBox; + NMLVCUSTOMDRAW nmlvcd; + LVITEMW lvItem; + + TRACE("(hdc=%p, nItem=%d, subitems=%p, pos=%s)\n", hdc, nItem, subitems, wine_dbgstr_point(&pos)); + + /* get information needed for drawing the item */ + lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM | LVIF_STATE; + if (infoPtr->uView == LV_VIEW_DETAILS) lvItem.mask |= LVIF_INDENT; + lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK | LVIS_CUT | LVIS_OVERLAYMASK; + lvItem.iItem = nItem; + lvItem.iSubItem = 0; + lvItem.state = 0; + lvItem.lParam = 0; + lvItem.cchTextMax = DISP_TEXT_SIZE; + lvItem.pszText = szDispText; + if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) return FALSE; + if (lvItem.pszText == LPSTR_TEXTCALLBACKW) lvItem.pszText = callbackW; + TRACE(" lvItem=%s\n", debuglvitem_t(&lvItem, TRUE)); + + /* now check if we need to update the focus rectangle */ + focus = infoPtr->bFocus && (lvItem.state & LVIS_FOCUSED) ? &infoPtr->rcFocus : 0; + if (!focus) lvItem.state &= ~LVIS_FOCUSED; + + LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &rcBox, NULL, NULL, NULL, NULL); + OffsetRect(&rcBox, pos.x, pos.y); + + /* Full custom draw stage sequence looks like this: + + LV_VIEW_DETAILS: + + - CDDS_ITEMPREPAINT + - CDDS_ITEMPREPAINT|CDDS_SUBITEM | => sent n times, where n is number of subitems, + CDDS_ITEMPOSTPAINT|CDDS_SUBITEM | including item iself + - CDDS_ITEMPOSTPAINT + + other styles: + + - CDDS_ITEMPREPAINT + - CDDS_ITEMPOSTPAINT + */ + + /* fill in the custom draw structure */ + customdraw_fill(&nmlvcd, infoPtr, hdc, &rcBox, &lvItem); + if (cdmode & CDRF_NOTIFYITEMDRAW) + cdsubitemmode = notify_customdraw(infoPtr, CDDS_ITEMPREPAINT, &nmlvcd); + if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint; + + if (subitems) + { + while (iterator_next(subitems)) + { + DWORD subitemstage = CDRF_DODEFAULT; + + /* We need to query for each subitem, item's data (subitem == 0) is already here at this point */ + if (subitems->nItem) + { + lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM | LVIF_INDENT; + lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK | LVIS_CUT | LVIS_OVERLAYMASK; + lvItem.iItem = nItem; + lvItem.iSubItem = subitems->nItem; + lvItem.state = 0; + lvItem.lParam = 0; + lvItem.cchTextMax = DISP_TEXT_SIZE; + lvItem.pszText = szDispText; + if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) return FALSE; + if (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) + lvItem.state = LISTVIEW_GetItemState(infoPtr, nItem, LVIS_SELECTED); + if (lvItem.pszText == LPSTR_TEXTCALLBACKW) lvItem.pszText = callbackW; + TRACE(" lvItem=%s\n", debuglvitem_t(&lvItem, TRUE)); + + /* update custom draw data */ + LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &nmlvcd.nmcd.rc, NULL, NULL, NULL, NULL); + OffsetRect(&nmlvcd.nmcd.rc, pos.x, pos.y); + nmlvcd.iSubItem = subitems->nItem; + } + + if (cdsubitemmode & CDRF_NOTIFYSUBITEMDRAW) + subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd); + else + { + nmlvcd.clrTextBk = infoPtr->clrTextBk; + nmlvcd.clrText = infoPtr->clrText; + } + + if (subitems->nItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW)) + prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); + else if (!(infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) + prepaint_setup(infoPtr, hdc, &nmlvcd, TRUE); + + if (!(subitemstage & CDRF_SKIPDEFAULT)) + LISTVIEW_DrawItemPart(infoPtr, &lvItem, &nmlvcd, &pos); + + if (subitemstage & CDRF_NOTIFYPOSTPAINT) + subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPOSTPAINT, &nmlvcd); + } + } + else + { + prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); + LISTVIEW_DrawItemPart(infoPtr, &lvItem, &nmlvcd, &pos); + } postpaint: if (cdsubitemmode & CDRF_NOTIFYPOSTPAINT) - notify_postpaint(infoPtr, &nmlvcd); + { + nmlvcd.iSubItem = 0; + notify_customdraw(infoPtr, CDDS_ITEMPOSTPAINT, &nmlvcd); + } + return TRUE; } @@ -4856,9 +4930,14 @@ /* iterate through the invalidated rows */ while(iterator_next(i)) { + RANGES subitems; + ITERATOR k; + SelectObject(hdc, infoPtr->hFont); LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position); Position.y += Origin.y; + + subitems = ranges_create(DPA_GetPtrCount(infoPtr->hdpaColumns)); /* iterate through the invalidated columns */ while(iterator_next(&j)) @@ -4874,8 +4953,12 @@ if (!RectVisible(hdc, &rcItem)) continue; } - LISTVIEW_DrawItem(infoPtr, hdc, i->nItem, j.nItem, Position, cdmode); + ranges_additem(subitems, j.nItem); } + + iterator_rangesitems(&k, subitems); + LISTVIEW_DrawItem(infoPtr, hdc, i->nItem, &k, Position, cdmode); + iterator_destroy(&k); } iterator_destroy(&j); } @@ -5009,7 +5092,7 @@ Position.x += Origin.x; Position.y += Origin.y; - LISTVIEW_DrawItem(infoPtr, hdc, i->nItem, 0, Position, cdmode); + LISTVIEW_DrawItem(infoPtr, hdc, i->nItem, NULL, Position, cdmode); } } @@ -5085,8 +5168,6 @@ hdcOrig, infoPtr->rcList.left, infoPtr->rcList.top, SRCCOPY); } - infoPtr->cditemmode = CDRF_DODEFAULT; - GetClientRect(infoPtr->hwndSelf, &rcClient); customdraw_fill(&nmlvcd, infoPtr, hdc, &rcClient, 0); cdmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd); @@ -5352,7 +5433,7 @@ FillRect(hdc, &rcItem, infoPtr->hBkBrush); pos.x = pos.y = 0; - if (LISTVIEW_DrawItem(infoPtr, hdc, iItem, 0, pos, infoPtr->cditemmode)) + if (LISTVIEW_DrawItem(infoPtr, hdc, iItem, NULL, pos, CDRF_DODEFAULT)) { dragList = ImageList_Create(size.cx, size.cy, ILC_COLOR, 10, 10); SelectObject(hdc, hOldbmp); Modified: trunk/reactos/dll/win32/comctl32/pager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/pager.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/pager.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/pager.c [iso-8859-1] Sat Sep 27 00:19:40 2014 @@ -744,7 +744,7 @@ PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y) { POINT clpt, pt; - RECT wnrect, *btnrect = NULL; + RECT wnrect; BOOL topLeft = FALSE; INT btnstate = 0; INT hit; @@ -757,8 +757,9 @@ ClientToScreen(infoPtr->hwndSelf, &pt); GetWindowRect(infoPtr->hwndSelf, &wnrect); if (PtInRect(&wnrect, pt)) { - RECT TLbtnrect, BRbtnrect; - PAGER_GetButtonRects(infoPtr, &TLbtnrect, &BRbtnrect, FALSE); + RECT topleft, bottomright, *rect = NULL; + + PAGER_GetButtonRects(infoPtr, &topleft, &bottomright, FALSE); clpt = pt; MapWindowPoints(0, infoPtr->hwndSelf, &clpt, 1); @@ -766,23 +767,23 @@ if ((hit == PGB_TOPORLEFT) && (infoPtr->TLbtnState == PGF_NORMAL)) { topLeft = TRUE; - btnrect = &TLbtnrect; + rect = &topleft; infoPtr->TLbtnState = PGF_HOT; btnstate = infoPtr->TLbtnState; } else if ((hit == PGB_BOTTOMORRIGHT) && (infoPtr->BRbtnState == PGF_NORMAL)) { topLeft = FALSE; - btnrect = &BRbtnrect; + rect = &bottomright; infoPtr->BRbtnState = PGF_HOT; btnstate = infoPtr->BRbtnState; } /* If in one of the buttons the capture and draw buttons */ - if (btnrect) + if (rect) { TRACE("[%p] draw btn (%s), Capture %s, style %08x\n", - infoPtr->hwndSelf, wine_dbgstr_rect(btnrect), + infoPtr->hwndSelf, wine_dbgstr_rect(rect), (infoPtr->bCapture) ? "TRUE" : "FALSE", infoPtr->dwStyle); if (!infoPtr->bCapture) @@ -795,7 +796,7 @@ SetTimer(infoPtr->hwndSelf, TIMERID1, 0x3e, 0); hdc = GetWindowDC(infoPtr->hwndSelf); /* OffsetRect(wnrect, 0 | 1, 0 | 1) */ - PAGER_DrawButton(hdc, infoPtr->clrBk, *btnrect, + PAGER_DrawButton(hdc, infoPtr->clrBk, *rect, infoPtr->dwStyle & PGS_HORZ, topLeft, btnstate); ReleaseDC(infoPtr->hwndSelf, hdc); return 0; @@ -976,16 +977,17 @@ { POINT pt, ptorig; HWND parent; + LRESULT ret; pt.x = 0; pt.y = 0; parent = GetParent(infoPtr->hwndSelf); MapWindowPoints(infoPtr->hwndSelf, parent, &pt, 1); OffsetWindowOrgEx (hdc, pt.x, pt.y, &ptorig); - SendMessageW (parent, WM_ERASEBKGND, (WPARAM)hdc, 0); + ret = SendMessageW (parent, WM_ERASEBKGND, (WPARAM)hdc, 0); SetWindowOrgEx (hdc, ptorig.x, ptorig.y, 0); - return 0; + return ret; } Modified: trunk/reactos/dll/win32/comctl32/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/progres… ============================================================================== --- trunk/reactos/dll/win32/comctl32/progress.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/progress.c [iso-8859-1] Sat Sep 27 00:19:40 2014 @@ -57,6 +57,7 @@ #define LED_GAP 2 #define MARQUEE_LEDS 5 #define ID_MARQUEE_TIMER 1 +#define DEFAULT_MARQUEE_PERIOD 30 /* Helper to obtain size of a progress bar chunk ("led"). */ static inline int get_led_size ( const PROGRESS_INFO *infoPtr, LONG style, @@ -436,40 +437,32 @@ /*********************************************************************** - * PROGRESS_Timer - * Handle the marquee timer messages - */ -static LRESULT PROGRESS_Timer (PROGRESS_INFO *infoPtr, INT idTimer) -{ - if(idTimer == ID_MARQUEE_TIMER) - { - LONG style = GetWindowLongW (infoPtr->Self, GWL_STYLE); - RECT rect; - int ledWidth, leds; - HTHEME theme = GetWindowTheme (infoPtr->Self); - BOOL barSmooth = (style & PBS_SMOOTH) && !theme; - - get_client_rect (infoPtr->Self, &rect); - - if(!barSmooth) - ledWidth = get_led_size( infoPtr, style, &rect ) + - get_led_gap( infoPtr ); - else - ledWidth = 1; - - leds = (get_bar_size( style, &rect ) + ledWidth - 1) / - ledWidth; - - /* increment the marquee progress */ - if(++infoPtr->MarqueePos >= leds) - { - infoPtr->MarqueePos = 0; - } - - InvalidateRect(infoPtr->Self, &rect, FALSE); - UpdateWindow(infoPtr->Self); - } - return 0; + * Advance marquee progress by one step. + */ +static void PROGRESS_UpdateMarquee (PROGRESS_INFO *infoPtr) +{ + LONG style = GetWindowLongW (infoPtr->Self, GWL_STYLE); + RECT rect; + int ledWidth, leds; + HTHEME theme = GetWindowTheme (infoPtr->Self); + BOOL smooth = (style & PBS_SMOOTH) && !theme; + + get_client_rect (infoPtr->Self, &rect); + + if (smooth) + ledWidth = 1; + else + ledWidth = get_led_size( infoPtr, style, &rect ) + get_led_gap( infoPtr ); + + leds = (get_bar_size( style, &rect ) + ledWidth - 1) / + ledWidth; + + /* increment the marquee progress */ + if (++infoPtr->MarqueePos >= leds) + infoPtr->MarqueePos = 0; + + InvalidateRect(infoPtr->Self, &rect, TRUE); + UpdateWindow(infoPtr->Self); } @@ -510,6 +503,30 @@ PROGRESS_CoercePos(infoPtr); InvalidateRect(infoPtr->Self, NULL, TRUE); return res; +} + +static UINT PROGRESS_SetPos (PROGRESS_INFO *infoPtr, INT pos) +{ + DWORD style = GetWindowLongW(infoPtr->Self, GWL_STYLE); + + if (style & PBS_MARQUEE) + { + PROGRESS_UpdateMarquee(infoPtr); + return 1; + } + else + { + UINT oldVal; + oldVal = infoPtr->CurVal; + if (oldVal != pos) { + infoPtr->CurVal = pos; + PROGRESS_CoercePos(infoPtr); + TRACE("PBM_SETPOS: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal); + PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal ); + UpdateWindow( infoPtr->Self ); + } + return oldVal; + } } /*********************************************************************** @@ -586,7 +603,9 @@ return PROGRESS_Paint (infoPtr, (HDC)wParam); case WM_TIMER: - return PROGRESS_Timer (infoPtr, (INT)wParam); + if (wParam == ID_MARQUEE_TIMER) + PROGRESS_UpdateMarquee (infoPtr); + return 0; case WM_THEMECHANGED: { @@ -622,18 +641,7 @@ } case PBM_SETPOS: - { - UINT oldVal; - oldVal = infoPtr->CurVal; - if(oldVal != wParam) { - infoPtr->CurVal = (INT)wParam; - PROGRESS_CoercePos(infoPtr); - TRACE("PBM_SETPOS: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal); - PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal ); - UpdateWindow( infoPtr->Self ); - } - return oldVal; - } + return PROGRESS_SetPos(infoPtr, wParam); case PBM_SETRANGE: return PROGRESS_SetRange (infoPtr, (int)LOWORD(lParam), (int)HIWORD(lParam)); @@ -713,8 +721,9 @@ case PBM_SETMARQUEE: if(wParam != 0) { + UINT period = lParam ? (UINT)lParam : DEFAULT_MARQUEE_PERIOD; infoPtr->Marquee = TRUE; - SetTimer(infoPtr->Self, ID_MARQUEE_TIMER, (UINT)lParam, NULL); + SetTimer(infoPtr->Self, ID_MARQUEE_TIMER, period, NULL); } else { Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sat Sep 27 00:19:40 2014 @@ -734,10 +734,10 @@ /* draws a blank frame for a toolbar button */ static void -TOOLBAR_DrawFrame(const TOOLBAR_INFO *infoPtr, const NMTBCUSTOMDRAW *tbcd, DWORD dwItemCDFlag) +TOOLBAR_DrawFrame(const TOOLBAR_INFO *infoPtr, const NMTBCUSTOMDRAW *tbcd, const RECT *rect, DWORD dwItemCDFlag) { HDC hdc = tbcd->nmcd.hdc; - RECT rc = tbcd->nmcd.rc; + RECT rc = *rect; /* if the state is disabled or indeterminate then the button * cannot have an interactive look like pressed or hot */ BOOL non_interactive_state = (tbcd->nmcd.uItemState & CDIS_DISABLED) || @@ -940,7 +940,7 @@ tbcd.rcText.bottom = rcText.bottom - rc.top; tbcd.nmcd.uItemState = TOOLBAR_TranslateState(btnPtr); tbcd.nmcd.hdc = hdc; - tbcd.nmcd.rc = rc; + tbcd.nmcd.rc = btnPtr->rect; tbcd.hbrMonoDither = COMCTL32_hPattern55AABrush; /* FIXME: what are these used for? */ @@ -958,7 +958,7 @@ ntfret = TOOLBAR_SendNotify(&tbcd.nmcd.hdr, infoPtr, NM_CUSTOMDRAW); /* reset these fields so the user can't alter the behaviour like native */ tbcd.nmcd.hdc = hdc; - tbcd.nmcd.rc = rc; + tbcd.nmcd.rc = btnPtr->rect; dwItemCustDraw = ntfret & 0xffff; dwItemCDFlag = ntfret & 0xffff0000; @@ -1007,10 +1007,10 @@ || (drawSepDropDownArrow && btnPtr->bDropDownPressed)) stateId = TS_HOT; - DrawThemeBackground (theme, hdc, partId, stateId, &tbcd.nmcd.rc, NULL); + DrawThemeBackground (theme, hdc, partId, stateId, &rc, NULL); } else - TOOLBAR_DrawFrame(infoPtr, &tbcd, dwItemCDFlag); + TOOLBAR_DrawFrame(infoPtr, &tbcd, &rc, dwItemCDFlag); if (drawSepDropDownArrow) { Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] Sat Sep 27 00:19:40 2014 @@ -477,24 +477,22 @@ } static inline BOOL -TREEVIEW_SendRealNotify(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPNMHDR pnmh) -{ - TRACE("wParam=%ld, lParam=%p\n", wParam, pnmh); - return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, wParam, (LPARAM)pnmh); +TREEVIEW_SendRealNotify(const TREEVIEW_INFO *infoPtr, UINT code, NMHDR *hdr) +{ + TRACE("code=%d, hdr=%p\n", code, hdr); + + hdr->hwndFrom = infoPtr->hwnd; + hdr->idFrom = GetWindowLongPtrW(infoPtr->hwnd, GWLP_ID); + hdr->code = get_notifycode(infoPtr, code); + + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); } static BOOL TREEVIEW_SendSimpleNotify(const TREEVIEW_INFO *infoPtr, UINT code) { - NMHDR nmhdr; - HWND hwnd = infoPtr->hwnd; - - TRACE("%d\n", code); - nmhdr.hwndFrom = hwnd; - nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmhdr.code = get_notifycode(infoPtr, code); - - return TREEVIEW_SendRealNotify(infoPtr, nmhdr.idFrom, &nmhdr); + NMHDR hdr; + return TREEVIEW_SendRealNotify(infoPtr, code, &hdr); } static VOID @@ -534,18 +532,13 @@ TREEVIEW_SendTreeviewNotify(const TREEVIEW_INFO *infoPtr, UINT code, UINT action, UINT mask, HTREEITEM oldItem, HTREEITEM newItem) { - HWND hwnd = infoPtr->hwnd; NMTREEVIEWW nmhdr; BOOL ret; TRACE("code:%d action:%x olditem:%p newitem:%p\n", code, action, oldItem, newItem); - ZeroMemory(&nmhdr, sizeof(NMTREEVIEWW)); - - nmhdr.hdr.hwndFrom = hwnd; - nmhdr.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmhdr.hdr.code = get_notifycode(infoPtr, code); + memset(&nmhdr, 0, sizeof(NMTREEVIEWW)); nmhdr.action = action; if (oldItem) @@ -557,7 +550,7 @@ nmhdr.ptDrag.x = 0; nmhdr.ptDrag.y = 0; - ret = TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, &nmhdr.hdr); + ret = TREEVIEW_SendRealNotify(infoPtr, code, &nmhdr.hdr); if (!infoPtr->bNtfUnicode) { Free(nmhdr.itemOld.pszText); @@ -570,14 +563,10 @@ TREEVIEW_SendTreeviewDnDNotify(const TREEVIEW_INFO *infoPtr, UINT code, HTREEITEM dragItem, POINT pt) { - HWND hwnd = infoPtr->hwnd; NMTREEVIEWW nmhdr; TRACE("code:%d dragitem:%p\n", code, dragItem); - nmhdr.hdr.hwndFrom = hwnd; - nmhdr.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmhdr.hdr.code = get_notifycode(infoPtr, code); nmhdr.action = 0; nmhdr.itemNew.mask = TVIF_STATE | TVIF_PARAM | TVIF_HANDLE; nmhdr.itemNew.hItem = dragItem; @@ -587,7 +576,7 @@ nmhdr.ptDrag.x = pt.x; nmhdr.ptDrag.y = pt.y; - return TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, &nmhdr.hdr); + return TREEVIEW_SendRealNotify(infoPtr, code, &nmhdr.hdr); } @@ -595,16 +584,12 @@ TREEVIEW_SendCustomDrawNotify(const TREEVIEW_INFO *infoPtr, DWORD dwDrawStage, HDC hdc, RECT rc) { - HWND hwnd = infoPtr->hwnd; NMTVCUSTOMDRAW nmcdhdr; - LPNMCUSTOMDRAW nmcd; + NMCUSTOMDRAW *nmcd; TRACE("drawstage:%x hdc:%p\n", dwDrawStage, hdc); nmcd = &nmcdhdr.nmcd; - nmcd->hdr.hwndFrom = hwnd; - nmcd->hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmcd->hdr.code = NM_CUSTOMDRAW; nmcd->dwDrawStage = dwDrawStage; nmcd->hdc = hdc; nmcd->rc = rc; @@ -615,10 +600,8 @@ nmcdhdr.clrTextBk = infoPtr->clrBk; nmcdhdr.iLevel = 0; - return TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, &nmcdhdr.nmcd.hdr); -} - - + return TREEVIEW_SendRealNotify(infoPtr, NM_CUSTOMDRAW, &nmcdhdr.nmcd.hdr); +} /* FIXME: need to find out when the flags in uItemState need to be set */ @@ -627,8 +610,7 @@ TREEVIEW_ITEM *item, UINT uItemDrawState, NMTVCUSTOMDRAW *nmcdhdr) { - HWND hwnd = infoPtr->hwnd; - LPNMCUSTOMDRAW nmcd; + NMCUSTOMDRAW *nmcd; DWORD dwDrawStage; DWORD_PTR dwItemSpec; UINT uItemState; @@ -644,9 +626,6 @@ uItemState |= CDIS_HOT; nmcd = &nmcdhdr->nmcd; - nmcd->hdr.hwndFrom = hwnd; - nmcd->hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmcd->hdr.code = NM_CUSTOMDRAW; nmcd->dwDrawStage = dwDrawStage; nmcd->hdc = hdc; nmcd->rc = item->rect; @@ -659,24 +638,19 @@ nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec, nmcd->uItemState, nmcd->lItemlParam); - return TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, &nmcdhdr->nmcd.hdr); + return TREEVIEW_SendRealNotify(infoPtr, NM_CUSTOMDRAW, &nmcdhdr->nmcd.hdr); } static BOOL TREEVIEW_BeginLabelEditNotify(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *editItem) { - HWND hwnd = infoPtr->hwnd; NMTVDISPINFOW tvdi; BOOL ret; - tvdi.hdr.hwndFrom = hwnd; - tvdi.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - tvdi.hdr.code = get_notifycode(infoPtr, TVN_BEGINLABELEDITW); - TREEVIEW_TVItemFromItem(infoPtr, TVIF_HANDLE | TVIF_STATE | TVIF_PARAM | TVIF_TEXT, &tvdi.item, editItem); - ret = TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, &tvdi.hdr); + ret = TREEVIEW_SendRealNotify(infoPtr, TVN_BEGINLABELEDITW, &tvdi.hdr); if (!infoPtr->bNtfUnicode) Free(tvdi.item.pszText); @@ -689,16 +663,11 @@ UINT mask) { NMTVDISPINFOEXW callback; - HWND hwnd = infoPtr->hwnd; TRACE("mask=0x%x, callbackmask=0x%x\n", mask, item->callbackMask); mask &= item->callbackMask; if (mask == 0) return; - - callback.hdr.hwndFrom = hwnd; - callback.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - callback.hdr.code = get_notifycode(infoPtr, TVN_GETDISPINFOW); /* 'state' always contains valid value, as well as 'lParam'. * All other parameters are uninitialized. @@ -714,7 +683,7 @@ if (mask & TVIF_TEXT) item->textWidth = 0; - TREEVIEW_SendRealNotify(infoPtr, callback.hdr.idFrom, &callback.hdr); + TREEVIEW_SendRealNotify(infoPtr, TVN_GETDISPINFOW, &callback.hdr); TRACE("resulting code 0x%08x\n", callback.hdr.code); /* It may have changed due to a call to SetItem. */ @@ -2692,17 +2661,17 @@ DeleteObject(hNewPen); } - if (cditem & CDRF_NOTIFYPOSTPAINT) - { - cditem = TREEVIEW_SendCustomDrawItemNotify - (infoPtr, hdc, item, CDDS_ITEMPOSTPAINT, &nmcdhdr); - TRACE("postpaint:cditem-app returns 0x%x\n", cditem); - } - /* Restore the hdc state */ SetTextColor(hdc, oldTextColor); SetBkColor(hdc, oldTextBkColor); SelectObject(hdc, hOldFont); + + if (cditem & CDRF_NOTIFYPOSTPAINT) + { + cditem = TREEVIEW_SendCustomDrawItemNotify + (infoPtr, hdc, item, CDDS_ITEMPOSTPAINT, &nmcdhdr); + TRACE("postpaint:cditem-app returns 0x%x\n", cditem); + } } /* Computes treeHeight and treeWidth and updates the scroll bars. @@ -3973,7 +3942,6 @@ static LRESULT TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) { - HWND hwnd = infoPtr->hwnd; TREEVIEW_ITEM *editedItem = infoPtr->editItem; NMTVDISPINFOW tvdi; BOOL bCommit; @@ -3983,9 +3951,6 @@ if (!IsWindow(infoPtr->hwndEdit)) return FALSE; - tvdi.hdr.hwndFrom = hwnd; - tvdi.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - tvdi.hdr.code = get_notifycode(infoPtr, TVN_ENDLABELEDITW); tvdi.item.mask = 0; tvdi.item.hItem = editedItem; tvdi.item.state = editedItem->state; @@ -4013,7 +3978,7 @@ tvdi.item.cchTextMax = 0; } - bCommit = TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, &tvdi.hdr); + bCommit = TREEVIEW_SendRealNotify(infoPtr, TVN_ENDLABELEDITW, &tvdi.hdr); if (!bCancel && bCommit) /* Apply the changes */ { @@ -5219,10 +5184,14 @@ { /* If it is non-NULL and different, it will be selected and visible. */ TREEVIEW_ITEM *newSelection = NULL; - TREEVIEW_ITEM *prevItem = infoPtr->selectedItem; + NMTVKEYDOWN nmkeydown; TRACE("%lx\n", wParam); + + nmkeydown.wVKey = wParam; + nmkeydown.flags = 0; + TREEVIEW_SendRealNotify(infoPtr, TVN_KEYDOWN, &nmkeydown.hdr); if (prevItem == NULL) return FALSE; @@ -5244,8 +5213,8 @@ case VK_RETURN: TREEVIEW_SendSimpleNotify(infoPtr, NM_RETURN); - break; - + break; + case VK_HOME: newSelection = infoPtr->root->firstChild; break; @@ -5526,9 +5495,6 @@ item = TREEVIEW_HitTestPoint(infoPtr, pt); memset(&nmmouse, 0, sizeof(nmmouse)); - nmmouse.hdr.hwndFrom = infoPtr->hwnd; - nmmouse.hdr.idFrom = GetWindowLongPtrW(infoPtr->hwnd, GWLP_ID); - nmmouse.hdr.code = NM_SETCURSOR; if (item) { nmmouse.dwItemSpec = (DWORD_PTR)item; @@ -5537,7 +5503,7 @@ nmmouse.pt.x = 0; nmmouse.pt.y = 0; nmmouse.dwHitInfo = lParam; - if (TREEVIEW_SendRealNotify(infoPtr, nmmouse.hdr.idFrom, &nmmouse.hdr)) + if (TREEVIEW_SendRealNotify(infoPtr, NM_SETCURSOR, &nmmouse.hdr)) return 0; if (item && (infoPtr->dwStyle & TVS_TRACKSELECT)) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 27 00:19:40 2014 @@ -60,7 +60,7 @@ reactos/dll/win32/cabinet # Synced to Wine-1.7.17 reactos/dll/win32/clusapi # Synced to Wine-1.7.17 reactos/dll/win32/comcat # Synced to Wine-1.7.17 -reactos/dll/win32/comctl32 # Synced to Wine-1.7.17 +reactos/dll/win32/comctl32 # Synced to Wine-1.7.27 reactos/dll/win32/comdlg32 # Synced to Wine-1.7.17 reactos/dll/win32/compstui # Synced to Wine-1.7.17 reactos/dll/win32/credui # Synced to Wine-1.7.17

10 years, 1 month

[akhaldi] 64321: [PSDK] * Add CDRF_NOTIFYITEMERASE. * Update commoncontrols.idl. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 00:05:34 2014 New Revision: 64321 URL: http://svn.reactos.org/svn/reactos?rev=64321&view=rev Log: [PSDK] * Add CDRF_NOTIFYITEMERASE. * Update commoncontrols.idl. CORE-8540 Modified: trunk/reactos/include/psdk/commctrl.h trunk/reactos/include/psdk/commoncontrols.idl Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Sep 27 00:05:34 2014 @@ -247,6 +247,7 @@ #define CDRF_NOTIFYITEMDRAW 0x20 #define CDRF_NOTIFYSUBITEMDRAW 0x20 #define CDRF_NOTIFYPOSTERASE 0x40 +#define CDRF_NOTIFYITEMERASE 0x00000080 /* obsolete ??? */ #define CDDS_PREPAINT 0x1 #define CDDS_POSTPAINT 0x2 Modified: trunk/reactos/include/psdk/commoncontrols.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commoncontrol… ============================================================================== --- trunk/reactos/include/psdk/commoncontrols.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commoncontrols.idl [iso-8859-1] Sat Sep 27 00:05:34 2014 @@ -66,9 +66,7 @@ const UINT ILIF_ALPHA = 1; [ - object, - uuid(46EB5926-582E-4017-9FDF-E8998DAA0950), - helpstring("Image List"), + uuid(46eb5926-582e-4017-9fdf-e8998daa0950), local ] interface IImageList : IUnknown @@ -200,15 +198,44 @@ } [ - uuid(BCADA15B-B428-420c-8D28-023590924C9F) + uuid(192b9d83-50fc-457b-90a0-2b82a8b5dae1), + local +] +interface IImageList2 : IImageList +{ + typedef struct tagIMAGELISTSTATS + { + DWORD cbSize; + INT cAlloc; + INT cUsed; + INT cStandby; + } IMAGELISTSTATS; + + HRESULT Resize(INT x_size, INT y_size); + HRESULT GetOriginalSize([in] INT image, [in] DWORD flags, [out] INT *cx, [out] INT *cy); + HRESULT SetOriginalSize([in] INT image, [in] INT cx, [in] INT cy); + HRESULT SetCallback([in, unique] IUnknown *callback); + HRESULT GetCallback([in] REFIID riid, [out, iid_is(riid)] void** ppv); + HRESULT ForceImagePresent([in] INT image, DWORD flags); + HRESULT DiscardImages([in] INT first_image, [in] INT last_image, [in] DWORD flags); + HRESULT PreloadImages([in] IMAGELISTDRAWPARAMS *params); + HRESULT GetStatistics([in, out] IMAGELISTSTATS *stats); + HRESULT Initialize([in] INT cx, [in] INT cy, [in] UINT flags, [in] INT initial, [in] INT grow); + HRESULT Replace2([in] INT i, [in] HBITMAP image, [in, unique] HBITMAP mask, [in, unique] IUnknown *unk, [in] DWORD flags); + HRESULT ReplaceFromImageList([in] INT i, [in] IImageList *imagelist, [in] INT src, [in, unique] IUnknown *unk, [in] DWORD flags); +} + +[ + uuid(bcada15B-b428-420c-8d28-023590924c9f) ] library CommonControlObjects { [ - uuid(7C476BA2-02B1-48f4-8048-B24619DDC058) + uuid(7c476ba2-02b1-48f4-8048-b24619ddc058) ] coclass ImageList { interface IImageList; + interface IImageList2; } }

10 years, 1 month

← Newer
1
...
8
9
10
11
12
13
14
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2014