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

Bruno Jesus : rsaenh/tests: Add many tests related to key derivation.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 0f31d82c04e14a87ce993ac94017dd9e3da605a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f31d82c04e14a87ce993ac94… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 23 00:47:33 2014 -0300 rsaenh/tests: Add many tests related to key derivation. --- dlls/rsaenh/tests/rsaenh.c | 350 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 350 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f31d82c04e14a87ce993…

1 0

Bruno Jesus : rsaenh: Change the default AES chaining mode to CBC.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: e55dc350209e15ff9d8c05a12be01c93dbd3e318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55dc350209e15ff9d8c05a12… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 23 00:47:53 2014 -0300 rsaenh: Change the default AES chaining mode to CBC. --- dlls/rsaenh/rsaenh.c | 2 +- dlls/rsaenh/tests/rsaenh.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index b5ab7a9..dd49618 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -900,7 +900,7 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK case CALG_AES_192: case CALG_AES_256: pCryptKey->dwBlockLen = 16; - pCryptKey->dwMode = CRYPT_MODE_ECB; + pCryptKey->dwMode = CRYPT_MODE_CBC; break; case CALG_RSA_KEYX: diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 3e1dc59..dad6a27 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1140,7 +1140,9 @@ static void test_aes(int keylen) result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, sizeof(pbData)); ok(result, "Expected OK, got last error %d\n", GetLastError()); ok(dwLen == 48, "Expected dwLen 48, got %d\n", dwLen); -todo_wine + if(i == 0) todo_wine + ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); + else ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); @@ -1161,7 +1163,6 @@ todo_wine dwLen = sizeof(dwMode); result = CryptGetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, &dwLen, 0); ok(result, "%08x\n", GetLastError()); -todo_wine ok(dwMode == CRYPT_MODE_CBC, "Wrong default chaining\n"); dwLen = 13; @@ -3529,12 +3530,9 @@ static void test_key_derivation(const char *prov) memset(wine_broken, 0, sizeof(wine_broken)); wine_broken[8].mode = wine_broken[8].blen = 1; - wine_broken[9].mode = wine_broken[9].exp_data = 1; - wine_broken[10].mode = 1; + wine_broken[9].exp_data = 1; wine_broken[20] = wine_broken[32] = wine_broken[44] = wine_broken[8]; wine_broken[21] = wine_broken[33] = wine_broken[45] = wine_broken[9]; - wine_broken[22] = wine_broken[23] = wine_broken[34] = wine_broken[35] = wine_broken[10]; - wine_broken[46] = wine_broken[47] = wine_broken[11] = wine_broken[10]; for (i=0; i<sizeof(tests)/sizeof(tests[0]); i++) {

1 0

Bruno Jesus : rsaenh: Change the way AES 128 is derived to match Windows behavior.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 453d6dc105ee69df2a58c24c7cbebc9c6da0ad58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=453d6dc105ee69df2a58c24c7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 23 00:48:09 2014 -0300 rsaenh: Change the way AES 128 is derived to match Windows behavior. --- dlls/rsaenh/rsaenh.c | 26 +++++++++++++++++++++++--- dlls/rsaenh/tests/rsaenh.c | 5 ----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index dd49618..0f0111b 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3926,6 +3926,8 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD switch (GET_ALG_CLASS(Algid)) { case ALG_CLASS_DATA_ENCRYPT: + { + int need_padding; *phKey = new_key(hProv, Algid, dwFlags, &pCryptKey); if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) return FALSE; @@ -3936,8 +3938,26 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD */ dwLen = RSAENH_MAX_HASH_SIZE; RSAENH_CPGetHashParam(pCryptHash->hProv, hBaseData, HP_HASHVAL, abHashValue, &dwLen, 0); - - if (dwLen < pCryptKey->dwKeyLen) { + + /* + * The usage of padding seems to vary from algorithm to algorithm. + * For now the only different case found was for AES with 128 bit key. + */ + switch(Algid) + { + case CALG_AES_128: + /* To reduce the chance of regressions we will only deviate + * from the old behavior for the tested hash lengths */ + if (dwLen == 16 || dwLen == 20) + { + need_padding = 1; + break; + } + default: + need_padding = dwLen < pCryptKey->dwKeyLen; + } + + if (need_padding) { BYTE pad1[RSAENH_HMAC_DEF_PAD_LEN], pad2[RSAENH_HMAC_DEF_PAD_LEN]; BYTE old_hashval[RSAENH_MAX_HASH_SIZE]; DWORD i; @@ -3966,7 +3986,7 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD memcpy(pCryptKey->abKeyValue, abHashValue, RSAENH_MIN(pCryptKey->dwKeyLen, sizeof(pCryptKey->abKeyValue))); break; - + } case ALG_CLASS_MSG_ENCRYPT: if (!lookup_handle(&handle_table, pCryptHash->hKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pMasterKey)) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index dad6a27..c49bd92 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1140,9 +1140,6 @@ static void test_aes(int keylen) result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, sizeof(pbData)); ok(result, "Expected OK, got last error %d\n", GetLastError()); ok(dwLen == 48, "Expected dwLen 48, got %d\n", dwLen); - if(i == 0) todo_wine - ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); - else ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); @@ -3530,9 +3527,7 @@ static void test_key_derivation(const char *prov) memset(wine_broken, 0, sizeof(wine_broken)); wine_broken[8].mode = wine_broken[8].blen = 1; - wine_broken[9].exp_data = 1; wine_broken[20] = wine_broken[32] = wine_broken[44] = wine_broken[8]; - wine_broken[21] = wine_broken[33] = wine_broken[45] = wine_broken[9]; for (i=0; i<sizeof(tests)/sizeof(tests[0]); i++) {

1 0

Bruno Jesus : rsaenh: CALG_AES cannot be used if the key length was not specified.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: f5c687e3652004e4efebe9352aadd02d179603cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c687e3652004e4efebe9352… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 23 00:48:51 2014 -0300 rsaenh: CALG_AES cannot be used if the key length was not specified. --- dlls/rsaenh/rsaenh.c | 10 +++++++++- dlls/rsaenh/tests/rsaenh.c | 17 ----------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 0f0111b..b4829f0 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -780,7 +780,7 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK { HCRYPTKEY hCryptKey; CRYPTKEY *pCryptKey; - DWORD dwKeyLen = HIWORD(dwFlags); + DWORD dwKeyLen = HIWORD(dwFlags), bKeyLen = dwKeyLen; const PROV_ENUMALGS_EX *peaAlgidInfo; *ppCryptKey = NULL; @@ -839,6 +839,14 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK */ break; + case CALG_AES: + if (!bKeyLen) + { + TRACE("missing key len for CALG_AES\n"); + SetLastError(NTE_BAD_ALGID); + return (HCRYPTKEY)INVALID_HANDLE_VALUE; + } + /* fall through */ default: if (dwKeyLen % 8 || dwKeyLen > peaAlgidInfo->dwMaxLen || diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index c49bd92..7106c80 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -3511,13 +3511,6 @@ static void test_key_derivation(const char *prov) /* 47 */ }, }; - - /* Temporary struct to hold wine broken cases */ - struct broken - { - int mode, exp_data, blen; - } wine_broken[sizeof(tests)/sizeof(tests[0])]; - /* Due to differences between encryption from <= 2000 and >= XP some tests need to be skipped */ int old_broken[sizeof(tests)/sizeof(tests[0])]; memset(old_broken, 0, sizeof(old_broken)); @@ -3525,10 +3518,6 @@ static void test_key_derivation(const char *prov) old_broken[27] = old_broken[28] = old_broken[39] = old_broken[40] = 1; uniquecontainer(NULL); - memset(wine_broken, 0, sizeof(wine_broken)); - wine_broken[8].mode = wine_broken[8].blen = 1; - wine_broken[20] = wine_broken[32] = wine_broken[44] = wine_broken[8]; - for (i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { if (win2k && old_broken[i]) continue; @@ -3567,23 +3556,17 @@ static void test_key_derivation(const char *prov) mode = 0xdeadbeef; result = CryptGetKeyParam(hKey, KP_MODE, (BYTE*)&mode, &len, 0); ok(result, "Test [%s %d]: CryptGetKeyParam failed with error %08x\n", prov, i, GetLastError()); - if (wine_broken[i].mode) winetest_start_todo("wine"); ok(mode == tests[i].chain_mode, "Test [%s %d]: Expected chaining mode %d, got %d\n", prov, i, tests[i].chain_mode, mode); - if (wine_broken[i].mode) winetest_end_todo("wine"); SetLastError(0xdeadbeef); len = 4; result = CryptEncrypt(hKey, 0, TRUE, 0, dvData, &len, sizeof(dvData)); ok(result, "Test [%s %d]: CryptEncrypt failed with error 0x%08x\n", prov, i, GetLastError()); - if (wine_broken[i].blen) winetest_start_todo("wine"); ok(len == tests[i].blocklen, "Test [%s %d]: Expected block len %d, got %d\n", prov, i, tests[i].blocklen, len); - if (wine_broken[i].blen) winetest_end_todo("wine"); - if (wine_broken[i].exp_data) winetest_start_todo("wine"); ok(!memcmp(dvData, tests[i].expected_enc, tests[i].blocklen), "Test [%s %d]: Encrypted data comparison failed\n", prov, i); - if (wine_broken[i].exp_data) winetest_end_todo("wine"); CryptDestroyKey(hKey); err:

1 0

Thomas Faber : include: Correctly spell STATUS_SMI_PRIMITIVE_INSTALLER_FAILED.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: b4c96633ea50ef9c8838619d833616765afb3f3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c96633ea50ef9c8838619d8… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Wed Jul 23 14:46:54 2014 +0200 include: Correctly spell STATUS_SMI_PRIMITIVE_INSTALLER_FAILED. --- dlls/ntdll/error.c | 2 +- dlls/ntdll/tests/error.c | 2 +- include/ntstatus.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index bc52de6..5c42010 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -1482,7 +1482,7 @@ static const DWORD table_c0150001[39] = ERROR_SXS_MANIFEST_TOO_BIG, /* c0150022 (STATUS_SXS_MANIFEST_TOO_BIG) */ ERROR_SXS_SETTING_NOT_REGISTERED, /* c0150023 (STATUS_SXS_SETTING_NOT_REGISTERED) */ ERROR_SXS_TRANSACTION_CLOSURE_INCOMPLETE, /* c0150024 (STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE) */ - ERROR_SMI_PRIMITIVE_INSTALLER_FAILED, /* c0150025 (STATUS_SXS_PRIMITIVE_INSTALLER_FAILED) */ + ERROR_SMI_PRIMITIVE_INSTALLER_FAILED, /* c0150025 (STATUS_SMI_PRIMITIVE_INSTALLER_FAILED) */ ERROR_GENERIC_COMMAND_FAILED, /* c0150026 (STATUS_GENERIC_COMMAND_FAILED) */ ERROR_SXS_FILE_HASH_MISSING /* c0150027 (STATUS_SXS_FILE_HASH_MISSING) */ }; diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 862f0a9..718b8c5 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -963,7 +963,7 @@ static void run_error_tests(void) cmp2(STATUS_SXS_MANIFEST_TOO_BIG, ERROR_SXS_MANIFEST_TOO_BIG); cmp2(STATUS_SXS_SETTING_NOT_REGISTERED, ERROR_SXS_SETTING_NOT_REGISTERED); cmp2(STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE, ERROR_SXS_TRANSACTION_CLOSURE_INCOMPLETE); - cmp2(STATUS_SXS_PRIMITIVE_INSTALLER_FAILED, ERROR_SMI_PRIMITIVE_INSTALLER_FAILED); + cmp2(STATUS_SMI_PRIMITIVE_INSTALLER_FAILED, ERROR_SMI_PRIMITIVE_INSTALLER_FAILED); cmp2(STATUS_GENERIC_COMMAND_FAILED, ERROR_GENERIC_COMMAND_FAILED); cmp2(STATUS_SXS_FILE_HASH_MISSING, ERROR_SXS_FILE_HASH_MISSING); cmp2(STATUS_REDIRECTOR_STARTED, ERROR_SERVICE_ALREADY_RUNNING); diff --git a/include/ntstatus.h b/include/ntstatus.h index 325ce55..86dad85 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -1202,7 +1202,7 @@ #define STATUS_SXS_MANIFEST_TOO_BIG ((NTSTATUS) 0xC0150022) #define STATUS_SXS_SETTING_NOT_REGISTERED ((NTSTATUS) 0xC0150023) #define STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE ((NTSTATUS) 0xC0150024) -#define STATUS_SXS_PRIMITIVE_INSTALLER_FAILED ((NTSTATUS) 0xC0150025) +#define STATUS_SMI_PRIMITIVE_INSTALLER_FAILED ((NTSTATUS) 0xC0150025) #define STATUS_GENERIC_COMMAND_FAILED ((NTSTATUS) 0xC0150026) #define STATUS_SXS_FILE_HASH_MISSING ((NTSTATUS) 0xC0150027)

1 0

Jacek Caban : mshtml: Added IHTMLMetaElement:: charset property implementation.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 6031108076213818445668992d19a8ba0a483082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6031108076213818445668992… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 15:29:32 2014 +0200 mshtml: Added IHTMLMetaElement::charset property implementation. --- dlls/mshtml/htmlelem.c | 32 +++++++++++++++++++++++++++++--- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmlmeta.c | 20 +++++++++++++------- dlls/mshtml/mshtml_private.h | 3 ++- dlls/mshtml/tests/dom.c | 39 ++++++++++++++++++++++++++++++++++++--- 5 files changed, 81 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8e246fe..8378d74 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -175,11 +175,12 @@ nsresult get_elem_attr_value(nsIDOMHTMLElement *nselem, const WCHAR *name, nsASt return NS_OK; } -HRESULT elem_string_attr_getter(HTMLElement *elem, const WCHAR *name, BSTR *p) +HRESULT elem_string_attr_getter(HTMLElement *elem, const WCHAR *name, BOOL use_null, BSTR *p) { const PRUnichar *val; nsAString val_str; nsresult nsres; + HRESULT hres = S_OK; nsres = get_elem_attr_value(elem->nselem, name, &val_str, &val); if(NS_FAILED(nsres)) @@ -187,9 +188,34 @@ HRESULT elem_string_attr_getter(HTMLElement *elem, const WCHAR *name, BSTR *p) TRACE("%s: returning %s\n", debugstr_w(name), debugstr_w(val)); - *p = SysAllocString(val); + if(*val || !use_null) { + *p = SysAllocString(val); + if(!*p) + hres = E_OUTOFMEMORY; + }else { + *p = NULL; + } nsAString_Finish(&val_str); - return *p ? S_OK : E_OUTOFMEMORY; + return hres; +} + +HRESULT elem_string_attr_setter(HTMLElement *elem, const WCHAR *name, const WCHAR *value) +{ + nsAString name_str, val_str; + nsresult nsres; + + nsAString_InitDepend(&name_str, name); + nsAString_InitDepend(&val_str, value); + nsres = nsIDOMHTMLElement_SetAttribute(elem->nselem, &name_str, &val_str); + nsAString_Finish(&name_str); + nsAString_Finish(&val_str); + + if(NS_FAILED(nsres)) { + WARN("SetAttribute failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } typedef struct diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index f5e086c..f832b88 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1337,7 +1337,7 @@ static HRESULT WINAPI HTMLLabelElement_get_htmlFor(IHTMLLabelElement *iface, BST TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(&This->element, forW, p); + return elem_string_attr_getter(&This->element, forW, FALSE, p); } static HRESULT WINAPI HTMLLabelElement_put_accessKey(IHTMLLabelElement *iface, BSTR v) diff --git a/dlls/mshtml/htmlmeta.c b/dlls/mshtml/htmlmeta.c index e9783c8..ab73c3c 100644 --- a/dlls/mshtml/htmlmeta.c +++ b/dlls/mshtml/htmlmeta.c @@ -108,7 +108,7 @@ static HRESULT WINAPI HTMLMetaElement_get_httpEquiv(IHTMLMetaElement *iface, BST TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(&This->element, httpEquivW, p); + return elem_string_attr_getter(&This->element, httpEquivW, TRUE, p); } static HRESULT WINAPI HTMLMetaElement_put_content(IHTMLMetaElement *iface, BSTR v) @@ -125,7 +125,7 @@ static HRESULT WINAPI HTMLMetaElement_get_content(IHTMLMetaElement *iface, BSTR TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(&This->element, contentW, p); + return elem_string_attr_getter(&This->element, contentW, TRUE, p); } static HRESULT WINAPI HTMLMetaElement_put_name(IHTMLMetaElement *iface, BSTR v) @@ -142,7 +142,7 @@ static HRESULT WINAPI HTMLMetaElement_get_name(IHTMLMetaElement *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(&This->element, nameW, p); + return elem_string_attr_getter(&This->element, nameW, TRUE, p); } static HRESULT WINAPI HTMLMetaElement_put_url(IHTMLMetaElement *iface, BSTR v) @@ -159,18 +159,24 @@ static HRESULT WINAPI HTMLMetaElement_get_url(IHTMLMetaElement *iface, BSTR *p) return E_NOTIMPL; } +static const WCHAR charsetW[] = {'c','h','a','r','s','e','t',0}; + static HRESULT WINAPI HTMLMetaElement_put_charset(IHTMLMetaElement *iface, BSTR v) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return elem_string_attr_setter(&This->element, charsetW, v); } static HRESULT WINAPI HTMLMetaElement_get_charset(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return elem_string_attr_getter(&This->element, charsetW, TRUE, p); } static const IHTMLMetaElementVtbl HTMLMetaElementVtbl = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8db2ba8..64b9087 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -959,7 +959,8 @@ IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOM IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; -HRESULT elem_string_attr_getter(HTMLElement*,const WCHAR*,BSTR*) DECLSPEC_HIDDEN; +HRESULT elem_string_attr_getter(HTMLElement*,const WCHAR*,BOOL,BSTR*) DECLSPEC_HIDDEN; +HRESULT elem_string_attr_setter(HTMLElement*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; /* commands */ typedef struct { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 533d7b7..33645c8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3803,7 +3803,6 @@ static void _test_meta_name(unsigned line, IUnknown *unk, const char *exname) BSTR name = NULL; HRESULT hres; - meta = _get_metaelem_iface(line, unk); hres = IHTMLMetaElement_get_name(meta, &name); ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); @@ -3819,7 +3818,6 @@ static void _test_meta_content(unsigned line, IUnknown *unk, const char *exconte BSTR content = NULL; HRESULT hres; - meta = _get_metaelem_iface(line, unk); hres = IHTMLMetaElement_get_content(meta, &content); ok_(__FILE__,line)(hres == S_OK, "get_content failed: %08x\n", hres); @@ -3835,7 +3833,6 @@ static void _test_meta_httpequiv(unsigned line, IUnknown *unk, const char *exval BSTR val = NULL; HRESULT hres; - meta = _get_metaelem_iface(line, unk); hres = IHTMLMetaElement_get_httpEquiv(meta, &val); ok_(__FILE__,line)(hres == S_OK, "get_httpEquiv failed: %08x\n", hres); @@ -3844,6 +3841,40 @@ static void _test_meta_httpequiv(unsigned line, IUnknown *unk, const char *exval IHTMLMetaElement_Release(meta); } +#define test_meta_charset(a,b) _test_meta_charset(__LINE__,a,b) +static void _test_meta_charset(unsigned line, IUnknown *unk, const char *exval) +{ + IHTMLMetaElement *meta; + BSTR val = NULL; + HRESULT hres; + + meta = _get_metaelem_iface(line, unk); + hres = IHTMLMetaElement_get_charset(meta, &val); + ok_(__FILE__,line)(hres == S_OK, "get_charset failed: %08x\n", hres); + if(exval) + ok_(__FILE__,line)(!strcmp_wa(val, exval), "charset = %s, expected %s\n", wine_dbgstr_w(val), exval); + else + ok_(__FILE__,line)(!val, "charset = %s, expected NULL\n", wine_dbgstr_w(val)); + SysFreeString(val); + IHTMLMetaElement_Release(meta); +} + +#define set_meta_charset(a,b) _set_meta_charset(__LINE__,a,b) +static void _set_meta_charset(unsigned line, IUnknown *unk, const char *vala) +{ + BSTR val = a2bstr(vala); + IHTMLMetaElement *meta; + HRESULT hres; + + meta = _get_metaelem_iface(line, unk); + hres = IHTMLMetaElement_put_charset(meta, val); + ok_(__FILE__,line)(hres == S_OK, "put_charset failed: %08x\n", hres); + SysFreeString(val); + IHTMLMetaElement_Release(meta); + + _test_meta_charset(line, unk, vala); +} + #define test_link_media(a,b) _test_link_media(__LINE__,a,b) static void _test_link_media(unsigned line, IHTMLElement *elem, const char *exval) { @@ -6969,6 +7000,8 @@ static void test_elems(IHTMLDocument2 *doc) test_meta_name((IUnknown*)elem, "meta name"); test_meta_content((IUnknown*)elem, "text/html; charset=utf-8"); test_meta_httpequiv((IUnknown*)elem, "Content-Type"); + test_meta_charset((IUnknown*)elem, NULL); + set_meta_charset((IUnknown*)elem, "utf-8"); IHTMLElement_Release(elem); }

1 0

Jacek Caban : mshtml: Avoid useless PATH changes and avoid buffer overflow in set_environment.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 1bd0f4f065da6db368f57c63d9bd89e98e1677b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd0f4f065da6db368f57c63d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 16:29:48 2014 +0200 mshtml: Avoid useless PATH changes and avoid buffer overflow in set_environment. --- dlls/mshtml/nsembed.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index fd87d37..0cc861f 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -438,8 +438,10 @@ static BOOL install_wine_gecko(void) static void set_environment(LPCWSTR gre_path) { - WCHAR path_env[MAX_PATH], buf[20]; - int len, debug_level = 0; + size_t len, gre_path_len; + int debug_level = 0; + WCHAR *path, buf[20]; + const WCHAR *ptr; static const WCHAR pathW[] = {'P','A','T','H',0}; static const WCHAR warnW[] = {'w','a','r','n',0}; @@ -449,13 +451,6 @@ static void set_environment(LPCWSTR gre_path) {'N','S','P','R','_','L','O','G','_','M','O','D','U','L','E','S',0}; static const WCHAR debug_formatW[] = {'a','l','l',':','%','d',0}; - /* We have to modify PATH as XPCOM loads other DLLs from this directory. */ - GetEnvironmentVariableW(pathW, path_env, sizeof(path_env)/sizeof(WCHAR)); - len = strlenW(path_env); - path_env[len++] = ';'; - strcpyW(path_env+len, gre_path); - SetEnvironmentVariableW(pathW, path_env); - SetEnvironmentVariableW(xpcom_debug_breakW, warnW); if(TRACE_ON(gecko)) @@ -467,6 +462,23 @@ static void set_environment(LPCWSTR gre_path) sprintfW(buf, debug_formatW, debug_level); SetEnvironmentVariableW(nspr_log_modulesW, buf); + + len = GetEnvironmentVariableW(pathW, NULL, 0); + gre_path_len = strlenW(gre_path); + path = heap_alloc((len+gre_path_len+1)*sizeof(WCHAR)); + if(!path) + return; + GetEnvironmentVariableW(pathW, path, len); + + /* We have to modify PATH as xul.dll loads other DLLs from this directory. */ + if(!(ptr = strstrW(path, gre_path)) + || (ptr > path && *(ptr-1) != ';') + || (ptr[gre_path_len] && ptr[gre_path_len] != ';')) { + if(len) + path[len-1] = ';'; + strcpyW(path+len, gre_path); + SetEnvironmentVariableW(pathW, path); + } } static BOOL load_xul(const PRUnichar *gre_path)

1 0

Jacek Caban : wscript: Added IActiveScriptSiteWindow implementation.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: e2fcd874e073d165e5e581fee8b0ce652f0ca881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2fcd874e073d165e5e581fee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 17:44:03 2014 +0200 wscript: Added IActiveScriptSiteWindow implementation. --- programs/wscript/main.c | 79 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 64 insertions(+), 15 deletions(-) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index fe0a2ed..d354c90 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -56,23 +56,12 @@ WCHAR scriptFullName[MAX_PATH]; ITypeInfo *host_ti; ITypeInfo *arguments_ti; +static HRESULT query_interface(REFIID,void**); + static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) { - if(IsEqualGUID(riid, &IID_IUnknown)) { - WINE_TRACE("(IID_IUnknown %p)\n", ppv); - *ppv = iface; - }else if(IsEqualGUID(riid, &IID_IActiveScriptSite)) { - WINE_TRACE("(IID_IActiveScriptSite %p)\n", ppv); - *ppv = iface; - }else { - *ppv = NULL; - WINE_TRACE("(%s %p)\n", wine_dbgstr_guid(riid), ppv); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + return query_interface(riid, ppv); } static ULONG WINAPI ActiveScriptSite_AddRef(IActiveScriptSite *iface) @@ -168,7 +157,67 @@ static IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { ActiveScriptSite_OnLeaveScript }; -IActiveScriptSite script_site = { &ActiveScriptSiteVtbl }; +static IActiveScriptSite script_site = { &ActiveScriptSiteVtbl }; + +static HRESULT WINAPI ActiveScriptSiteWindow_QueryInterface(IActiveScriptSiteWindow *iface, REFIID riid, void **ppv) +{ + return query_interface(riid, ppv); +} + +static ULONG WINAPI ActiveScriptSiteWindow_AddRef(IActiveScriptSiteWindow *iface) +{ + return 2; +} + +static ULONG WINAPI ActiveScriptSiteWindow_Release(IActiveScriptSiteWindow *iface) +{ + return 1; +} + +static HRESULT WINAPI ActiveScriptSiteWindow_GetWindow(IActiveScriptSiteWindow *iface, HWND *phwnd) +{ + TRACE("(%p)\n", phwnd); + + *phwnd = NULL; + return S_OK; +} + +static HRESULT WINAPI ActiveScriptSiteWindow_EnableModeless(IActiveScriptSiteWindow *iface, BOOL fEnable) +{ + TRACE("(%x)\n", fEnable); + return S_OK; +} + +static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { + ActiveScriptSiteWindow_QueryInterface, + ActiveScriptSiteWindow_AddRef, + ActiveScriptSiteWindow_Release, + ActiveScriptSiteWindow_GetWindow, + ActiveScriptSiteWindow_EnableModeless +}; + +static IActiveScriptSiteWindow script_site_window = { &ActiveScriptSiteWindowVtbl }; + +static HRESULT query_interface(REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = &script_site; + }else if(IsEqualGUID(riid, &IID_IActiveScriptSite)) { + TRACE("(IID_IActiveScriptSite %p)\n", ppv); + *ppv = &script_site; + }else if(IsEqualGUID(riid, &IID_IActiveScriptSiteWindow)) { + TRACE("(IID_IActiveScriptSiteWindow %p)\n", ppv); + *ppv = &script_site_window; + }else { + *ppv = NULL; + TRACE("(%s %p)\n", wine_dbgstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} static BOOL load_typelib(void) {

1 0

Jacek Caban : vbscript: Added support for title and type arguments of MsgBox.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 2c78d5815bc7b790f5285a6f1ee762b71daea8c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c78d5815bc7b790f5285a6f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 18:28:28 2014 +0200 vbscript: Added support for title and type arguments of MsgBox. --- dlls/vbscript/global.c | 55 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 68fa388..dc41db5 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -282,14 +282,15 @@ static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) return obj; } -static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, VARIANT *res) +static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, unsigned type, BSTR orig_title, VARIANT *res) { SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_ALLOW; IActiveScriptSiteUIControl *ui_control; IActiveScriptSiteWindow *acts_window; + WCHAR *title_buf = NULL; const WCHAR *title; HWND hwnd = NULL; - int ret; + int ret = 0; HRESULT hres; hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IActiveScriptSiteUIControl, (void**)&ui_control); @@ -310,23 +311,43 @@ static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, VARIANT *res) return E_FAIL; } - title = (ctx->safeopt & INTERFACE_USES_SECURITY_MANAGER) ? vbscriptW : emptyW; - hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IActiveScriptSiteWindow, (void**)&acts_window); if(FAILED(hres)) { FIXME("No IActiveScriptSiteWindow\n"); return hres; } + if(ctx->safeopt & INTERFACE_USES_SECURITY_MANAGER) { + if(orig_title && *orig_title) { + WCHAR *ptr; + + title = title_buf = heap_alloc(sizeof(vbscriptW) + (strlenW(orig_title)+2)*sizeof(WCHAR)); + if(!title) + return E_OUTOFMEMORY; + + memcpy(title_buf, vbscriptW, sizeof(vbscriptW)); + ptr = title_buf + sizeof(vbscriptW)/sizeof(WCHAR)-1; + + *ptr++ = ':'; + *ptr++ = ' '; + strcpyW(ptr, orig_title); + }else { + title = vbscriptW; + } + }else { + title = orig_title ? orig_title : emptyW; + } + hres = IActiveScriptSiteWindow_GetWindow(acts_window, &hwnd); if(SUCCEEDED(hres)) { hres = IActiveScriptSiteWindow_EnableModeless(acts_window, FALSE); if(SUCCEEDED(hres)) { - ret = MessageBoxW(hwnd, prompt, title, MB_OK); + ret = MessageBoxW(hwnd, prompt, title, type); hres = IActiveScriptSiteWindow_EnableModeless(acts_window, TRUE); } } + heap_free(title_buf); IActiveScriptSiteWindow_Release(acts_window); if(FAILED(hres)) { FIXME("failed: %08x\n", hres); @@ -1385,22 +1406,34 @@ static HRESULT Global_InputBox(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_MsgBox(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - BSTR prompt; + BSTR prompt, title = NULL; + int type = MB_OK; HRESULT hres; TRACE("\n"); - if(args_cnt != 1) { - FIXME("unsupported arg_cnt %d\n", args_cnt); - return E_NOTIMPL; - } + assert(1 <= args_cnt && args_cnt <= 5); hres = to_string(args, &prompt); if(FAILED(hres)) return hres; - hres = show_msgbox(This->desc->ctx, prompt, res); + if(args_cnt > 1) + hres = to_int(args+1, &type); + + if(SUCCEEDED(hres) && args_cnt > 2) + hres = to_string(args+2, &title); + + if(SUCCEEDED(hres) && args_cnt > 3) { + FIXME("unsupported arg_cnt %d\n", args_cnt); + hres = E_NOTIMPL; + } + + if(SUCCEEDED(hres)) + hres = show_msgbox(This->desc->ctx, prompt, type, title, res); + SysFreeString(prompt); + SysFreeString(title); return hres; }

1 0

André Hentschel : Add news for WWN 372
by Jeremy Newman 23 Jul '14

23 Jul '14

Module: website Branch: master Commit: 84e03d9cc8f98a3099fb1d6bfe305a784419029f URL: http://source.winehq.org/git/website.git/?a=commit;h=84e03d9cc8f98a3099fb1d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 23 21:12:49 2014 +0200 Add news for WWN 372 --- news/de/2014072301.xml | 12 ++++++++++++ news/en/2014072301.xml | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/news/de/2014072301.xml b/news/de/2014072301.xml new file mode 100644 index 0000000..66dc365 --- /dev/null +++ b/news/de/2014072301.xml @@ -0,0 +1,12 @@ +<news> + <date>23. Juli 2014</date> + <title>World Wine News Ausgabe 372</title> + <body> +<a href="{$root}/wwn/372">WWN Ausgabe 372 (en)</a> wurde heute veröffentlicht. +<ul> +<li><a href="{$root}/wwn/372#New WineHQ Server">Neuer WineHQ Server</a></li> +<li><a href="{$root}/wwn/372#Failing tests on test bots">Fehlschlagende Tests auf den Testbots</a></li> +<li><a href="{$root}/wwn/372#AppDB/Bugzilla Status Changes">AppDB/Bugzilla Statusänderungen</a></li> +</ul> + </body> +</news> diff --git a/news/en/2014072301.xml b/news/en/2014072301.xml new file mode 100644 index 0000000..c4e5b73 --- /dev/null +++ b/news/en/2014072301.xml @@ -0,0 +1,12 @@ +<news> + <date>July 23, 2014</date> + <title>World Wine News Issue 372</title> + <body> +<a href="{$root}/wwn/372">WWN Issue 372</a> was released today. +<ul> +<li><a href="{$root}/wwn/372#New WineHQ Server">New WineHQ Server</a></li> +<li><a href="{$root}/wwn/372#Failing tests on test bots">Failing tests on test bots</a></li> +<li><a href="{$root}/wwn/372#AppDB/Bugzilla Status Changes">AppDB/Bugzilla Status Changes</a></li> +</ul> + </body> +</news>

1 0