March 2009 - Wine-commits - list.winehq.org

Hans Leidekker : usp10: Don't test digit substitution data.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 8a2d97ac3dbf3914546a7a6a75e77ce74e454195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a2d97ac3dbf3914546a7a6a7… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Mar 4 12:45:03 2009 +0100 usp10: Don't test digit substitution data. It has apparently changed in Vista. --- dlls/usp10/tests/usp10.c | 194 ---------------------------------------------- 1 files changed, 0 insertions(+), 194 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 1dba682..c8bb551 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1099,184 +1099,6 @@ static void test_ScriptLayout(void) } } -static const struct -{ - LGRPID group; - LCID lcid; - SCRIPT_DIGITSUBSTITUTE sds; - DWORD uDefaultLanguage; - DWORD fContextDigits; - WORD fDigitSubstitute; -} -subst_data[] = -{ - { 0x01, 0x00403, { 9, 3, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00406, { 9, 6, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00407, { 9, 7, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00409, { 9, 9, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0040a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0040b, { 9, 11, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0040c, { 9, 12, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0040f, { 9, 15, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00410, { 9, 16, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00413, { 9, 19, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00414, { 9, 20, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00416, { 9, 22, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0041d, { 9, 29, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00421, { 9, 33, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0042d, { 9, 45, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00432, { 9, 50, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00434, { 9, 52, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00435, { 9, 53, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00436, { 9, 54, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00438, { 9, 56, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0043a, { 9, 58, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0043b, { 9, 59, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0043e, { 9, 62, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00441, { 9, 65, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00452, { 9, 82, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00456, { 9, 86, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0046b, { 9, 107, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0046c, { 9, 108, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00481, { 9, 129, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00807, { 9, 7, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00809, { 9, 9, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0080a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0080c, { 9, 12, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00810, { 9, 16, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00813, { 9, 19, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00814, { 9, 20, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00816, { 9, 22, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0081d, { 9, 29, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0083b, { 9, 59, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0083e, { 9, 62, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0086b, { 9, 107, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00c07, { 9, 7, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00c09, { 9, 9, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00c0a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00c0c, { 9, 12, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00c3b, { 9, 59, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x00c6b, { 9, 107, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x01007, { 9, 7, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x01009, { 9, 9, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0100a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0100c, { 9, 12, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0103b, { 9, 59, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x01407, { 9, 7, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x01409, { 9, 9, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0140a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0140c, { 9, 12, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0143b, { 9, 59, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x01809, { 9, 9, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0180a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0180c, { 9, 12, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0183b, { 9, 59, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x01c09, { 9, 9, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x01c0a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x01c3b, { 9, 59, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x02009, { 9, 9, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0200a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0203b, { 9, 59, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x02409, { 9, 9, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0240a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0243b, { 9, 59, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x02809, { 9, 9, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0280a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x02c09, { 9, 9, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x02c0a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x03009, { 9, 9, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0300a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x03409, { 9, 9, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0340a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0380a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x03c0a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0400a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0440a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0480a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x04c0a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x0500a, { 9, 10, 1, 0 }, 9, 0, 0 }, - { 0x01, 0x10407, { 9, 7, 1, 0 }, 9, 0, 0 }, - { 0x02, 0x00405, { 9, 5, 1, 0 }, 9, 0, 0 }, - { 0x02, 0x0040e, { 9, 14, 1, 0 }, 9, 0, 0 }, - { 0x02, 0x00415, { 9, 21, 1, 0 }, 9, 0, 0 }, - { 0x02, 0x00418, { 9, 24, 1, 0 }, 9, 0, 0 }, - { 0x02, 0x0041a, { 9, 26, 1, 0 }, 9, 0, 0 }, - { 0x02, 0x0041b, { 9, 27, 1, 0 }, 9, 0, 0 }, - { 0x02, 0x0041c, { 9, 28, 1, 0 }, 9, 0, 0 }, - { 0x02, 0x00424, { 9, 36, 1, 0 }, 9, 0, 0 }, - { 0x02, 0x0081a, { 9, 26, 1, 0 }, 9, 0, 0 }, - { 0x02, 0x0101a, { 9, 26, 1, 0 }, 9, 0, 0 }, - { 0x02, 0x0141a, { 9, 26, 1, 0 }, 9, 0, 0 }, - { 0x02, 0x0181a, { 9, 26, 1, 0 }, 9, 0, 0 }, - { 0x02, 0x1040e, { 9, 14, 1, 0 }, 9, 0, 0 }, - { 0x03, 0x00425, { 9, 37, 1, 0 }, 9, 0, 0 }, - { 0x03, 0x00426, { 9, 38, 1, 0 }, 9, 0, 0 }, - { 0x03, 0x00427, { 9, 39, 1, 0 }, 9, 0, 0 }, - { 0x04, 0x00408, { 9, 8, 1, 0 }, 9, 0, 0 }, - { 0x05, 0x00402, { 9, 2, 1, 0 }, 9, 0, 0 }, - { 0x05, 0x00419, { 9, 25, 1, 0 }, 9, 0, 0 }, - { 0x05, 0x00422, { 9, 34, 1, 0 }, 9, 0, 0 }, - { 0x05, 0x00423, { 9, 35, 1, 0 }, 9, 0, 0 }, - { 0x05, 0x0042f, { 9, 47, 1, 0 }, 9, 0, 0 }, - { 0x05, 0x0043f, { 9, 63, 1, 0 }, 9, 0, 0 }, - { 0x05, 0x00440, { 9, 64, 1, 0 }, 9, 0, 0 }, - { 0x05, 0x00444, { 9, 68, 1, 0 }, 9, 0, 0 }, - { 0x05, 0x00450, { 9, 80, 1, 0 }, 9, 0, 0 }, - { 0x05, 0x0082c, { 9, 44, 1, 0 }, 9, 0, 0 }, - { 0x05, 0x00843, { 9, 67, 1, 0 }, 9, 0, 0 }, - { 0x05, 0x00c1a, { 9, 26, 1, 0 }, 9, 0, 0 }, - { 0x05, 0x01c1a, { 9, 26, 1, 0 }, 9, 0, 0 }, - { 0x06, 0x0041f, { 9, 31, 1, 0 }, 9, 0, 0 }, - { 0x06, 0x0042c, { 9, 44, 1, 0 }, 9, 0, 0 }, - { 0x06, 0x00443, { 9, 67, 1, 0 }, 9, 0, 0 }, - { 0x07, 0x00411, { 9, 17, 1, 0 }, 9, 0, 0 }, - { 0x08, 0x00412, { 9, 18, 1, 0 }, 9, 0, 0 }, - { 0x09, 0x00404, { 9, 4, 1, 0 }, 9, 0, 0 }, - { 0x09, 0x00c04, { 9, 4, 1, 0 }, 9, 0, 0 }, - { 0x09, 0x01404, { 9, 4, 1, 0 }, 9, 0, 0 }, - { 0x09, 0x21404, { 9, 4, 1, 0 }, 9, 0, 0 }, - { 0x09, 0x30404, { 9, 4, 1, 0 }, 9, 0, 0 }, - { 0x0a, 0x00804, { 9, 4, 1, 0 }, 9, 0, 0 }, - { 0x0a, 0x01004, { 9, 4, 1, 0 }, 9, 0, 0 }, - { 0x0a, 0x20804, { 9, 4, 1, 0 }, 9, 0, 0 }, - { 0x0a, 0x21004, { 9, 4, 1, 0 }, 9, 0, 0 }, - { 0x0b, 0x0041e, { 9, 30, 1, 0 }, 9, 0, 0 }, - { 0x0c, 0x0040d, { 9, 13, 1, 0 }, 9, 0, 0 }, - { 0x0d, 0x00401, { 1, 1, 0, 0 }, 9, 0, 0 }, - { 0x0d, 0x00420, { 9, 32, 1, 0 }, 9, 0, 0 }, - { 0x0d, 0x00429, { 41, 41, 0, 0 }, 9, 0, 0 }, - { 0x0d, 0x0045a, { 9, 90, 1, 0 }, 9, 0, 0 }, - { 0x0d, 0x00465, { 9, 101, 1, 0 }, 9, 0, 0 }, - { 0x0d, 0x00801, { 1, 1, 0, 0 }, 9, 0, 0 }, - { 0x0d, 0x00c01, { 1, 1, 0, 0 }, 9, 0, 0 }, - { 0x0d, 0x01001, { 1, 1, 0, 0 }, 9, 0, 0 }, - { 0x0d, 0x01401, { 1, 1, 0, 0 }, 9, 0, 0 }, - { 0x0d, 0x01801, { 1, 1, 0, 0 }, 9, 0, 0 }, - { 0x0d, 0x01c01, { 1, 1, 0, 0 }, 9, 0, 0 }, - { 0x0d, 0x02001, { 1, 1, 0, 0 }, 9, 0, 0 }, - { 0x0d, 0x02401, { 1, 1, 0, 0 }, 9, 0, 0 }, - { 0x0d, 0x02801, { 1, 1, 0, 0 }, 9, 0, 0 }, - { 0x0d, 0x02c01, { 1, 1, 0, 0 }, 9, 0, 0 }, - { 0x0d, 0x03001, { 1, 1, 0, 0 }, 9, 0, 0 }, - { 0x0d, 0x03401, { 1, 1, 0, 0 }, 9, 0, 0 }, - { 0x0d, 0x03801, { 1, 1, 0, 0 }, 9, 0, 0 }, - { 0x0d, 0x03c01, { 1, 1, 0, 0 }, 9, 0, 0 }, - { 0x0d, 0x04001, { 1, 1, 0, 0 }, 9, 0, 0 }, - { 0x0e, 0x0042a, { 9, 42, 1, 0 }, 9, 0, 0 }, - { 0x0f, 0x00439, { 9, 57, 1, 0 }, 9, 0, 0 }, - { 0x0f, 0x00446, { 9, 70, 1, 0 }, 9, 0, 0 }, - { 0x0f, 0x00447, { 9, 71, 1, 0 }, 9, 0, 0 }, - { 0x0f, 0x00449, { 9, 73, 1, 0 }, 9, 0, 0 }, - { 0x0f, 0x0044a, { 9, 74, 1, 0 }, 9, 0, 0 }, - { 0x0f, 0x0044b, { 9, 75, 1, 0 }, 9, 0, 0 }, - { 0x0f, 0x0044e, { 9, 78, 1, 0 }, 9, 0, 0 }, - { 0x0f, 0x0044f, { 9, 79, 1, 0 }, 9, 0, 0 }, - { 0x0f, 0x00457, { 9, 87, 1, 0 }, 9, 0, 0 }, - { 0x10, 0x00437, { 9, 55, 1, 0 }, 9, 0, 0 }, - { 0x10, 0x10437, { 9, 55, 1, 0 }, 9, 0, 0 }, - { 0x11, 0x0042b, { 9, 43, 1, 0 }, 9, 0, 0 } -}; - static BOOL CALLBACK enum_proc(LGRPID group, LCID lcid, LPSTR locale, LONG_PTR lparam) { HRESULT hr; @@ -1284,7 +1106,6 @@ static BOOL CALLBACK enum_proc(LGRPID group, LCID lcid, LPSTR locale, LONG_PTR l SCRIPT_CONTROL sc; SCRIPT_STATE ss; LCID lcid_old; - unsigned int i; if (!IsValidLocale(lcid, LCID_INSTALLED)) return TRUE; @@ -1301,21 +1122,6 @@ static BOOL CALLBACK enum_proc(LGRPID group, LCID lcid, LPSTR locale, LONG_PTR l hr = ScriptApplyDigitSubstitution(&sds, &sc, &ss); ok(hr == S_OK, "ScriptApplyDigitSubstitution failed: 0x%08x\n", hr); - for (i = 0; i < sizeof(subst_data)/sizeof(subst_data[0]); i++) - { - if (group == subst_data[i].group && lcid == subst_data[i].lcid) - { - ok(!memcmp(&sds, &subst_data[i].sds, sizeof(sds)), - "substitution data does not match\n"); - - ok(sc.uDefaultLanguage == subst_data[i].uDefaultLanguage, - "sc.uDefaultLanguage does not match\n"); - ok(sc.fContextDigits == subst_data[i].fContextDigits, - "sc.fContextDigits does not match\n"); - ok(ss.fDigitSubstitute == subst_data[i].fDigitSubstitute, - "ss.fDigitSubstitute does not match\n"); - } - } SetThreadLocale(lcid_old); return TRUE; }

1 0

Hans Leidekker : mscms: Accept REG_DWORD values when enumerating registered color profiles.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: ec87dfde5060e15fce2c6afe32e9ccad99f41e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec87dfde5060e15fce2c6afe3… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Mar 4 12:45:30 2009 +0100 mscms: Accept REG_DWORD values when enumerating registered color profiles. Fixes test failures on Vista. --- dlls/mscms/tests/profile.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index e33280a..100c15c 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -581,9 +581,14 @@ static void check_registry(BOOL *has_space_rgb) trace("RegEnumValueA() failed (%d), cannot enumerate profiles\n", res); break; } - ok( dwType == REG_SZ, "RegEnumValueA() returned unexpected value type (%d)\n", dwType ); - if (dwType != REG_SZ) break; - trace(" found '%s' value containing '%s' (%d chars)\n", szName, szData, lstrlenA(szData)); + ok( dwType == REG_SZ || dwType == REG_DWORD, "RegEnumValueA() returned unexpected value type (%d)\n", dwType ); + + if (dwType == REG_SZ) + trace(" found string value '%s' containing '%s' (%d chars)\n", szName, szData, lstrlenA(szData)); + else if (dwType == REG_DWORD) + trace(" found DWORD value '%s' containing '%x'\n", szName, *(DWORD *)szData); + else + break; } RegCloseKey( hkIcmKey );

1 0

Christian Costa : ddraw: Implement IDirect3DViewportImpl_NextLight.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: f716306f366744ec205bc0485b04d18bab74d080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f716306f366744ec205bc0485… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Mar 3 22:45:21 2009 +0100 ddraw: Implement IDirect3DViewportImpl_NextLight. --- dlls/ddraw/viewport.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 299d92d..30d5e18 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -829,8 +829,51 @@ IDirect3DViewportImpl_NextLight(IDirect3DViewport3 *iface, DWORD dwFlags) { IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; - FIXME("(%p)->(%p,%p,%08x): stub!\n", This, lpDirect3DLight, lplpDirect3DLight, dwFlags); - return D3D_OK; + IDirect3DLightImpl *cur_light, *prev_light = NULL; + + TRACE("(%p)->(%p,%p,%08x)\n", This, lpDirect3DLight, lplpDirect3DLight, dwFlags); + + if (!lplpDirect3DLight) + return DDERR_INVALIDPARAMS; + + *lplpDirect3DLight = NULL; + + EnterCriticalSection(&ddraw_cs); + + cur_light = This->lights; + + switch (dwFlags) { + case D3DNEXT_NEXT: + if (!lpDirect3DLight) { + LeaveCriticalSection(&ddraw_cs); + return DDERR_INVALIDPARAMS; + } + while (cur_light != NULL) { + if (cur_light == (IDirect3DLightImpl *)lpDirect3DLight) { + *lplpDirect3DLight = (IDirect3DLight*)cur_light->next; + break; + } + cur_light = cur_light->next; + } + break; + case D3DNEXT_HEAD: + *lplpDirect3DLight = (IDirect3DLight*)This->lights; + break; + case D3DNEXT_TAIL: + while (cur_light != NULL) { + prev_light = cur_light; + cur_light = cur_light->next; + } + *lplpDirect3DLight = (IDirect3DLight*)prev_light; + break; + default: + ERR("Unknown flag %d\n", dwFlags); + break; + } + + LeaveCriticalSection(&ddraw_cs); + + return *lplpDirect3DLight ? D3D_OK : DDERR_INVALIDPARAMS; } /*****************************************************************************

1 0

Hans Leidekker : wininet: Remove MSG_PEEK hack from HTTP_GetResponseHeaders .
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 96b639dc8a5311aa10f298e629ff2e64aad8d060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96b639dc8a5311aa10f298e62… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Mar 4 12:42:43 2009 +0100 wininet: Remove MSG_PEEK hack from HTTP_GetResponseHeaders. Fixes Quicken 2009. Aric said he added this hack back in 2002 to work around a bug in the IE6 installer, which installs fine now without this hack. --- dlls/wininet/http.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3a42d67..6a9df2c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3833,17 +3833,12 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear) do { /* - * HACK peek at the buffer - */ - buflen = MAX_REPLY_LEN; - NETCON_recv(&lpwhr->netConnection, buffer, buflen, MSG_PEEK, &rc); - - /* * We should first receive 'HTTP/1.x nnn OK' where nnn is the status code. */ - memset(buffer, 0, MAX_REPLY_LEN); + buflen = MAX_REPLY_LEN; if (!NETCON_getNextLine(&lpwhr->netConnection, bufferA, &buflen)) goto lend; + rc += buflen; MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); /* split the version from the status code */

1 0

Hans Leidekker : wininet: Ignore invalid response headers.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 100ee0ad2ae113e4e942494f1fbdd60f18de0fcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=100ee0ad2ae113e4e942494f1… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Mar 4 12:44:22 2009 +0100 wininet: Ignore invalid response headers. --- dlls/wininet/http.c | 7 +++++ dlls/wininet/tests/http.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 6a9df2c..7b26070 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3893,6 +3893,13 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear) LPWSTR * pFieldAndValue; TRACE("got line %s, now interpreting\n", debugstr_a(bufferA)); + + if (!bufferA[0]) break; + if (!strchr(bufferA, ':')) + { + WARN("invalid header\n"); + continue; + } MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5fd45d5..193c446 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1305,6 +1305,12 @@ static const char noauthmsg[] = "WWW-Authenticate: Basic realm=\"placebo\"\r\n" "\r\n"; +static const char noauthmsg2[] = +"HTTP/1.0 401 Anonymous requests or requests on unsecure channel are not allowed\r\n" +"HTTP/1.0 401 Anonymous requests or requests on unsecure channel are not allowed" +"\0d`0|6\n" +"Server: winetest\r\n"; + static const char proxymsg[] = "HTTP/1.1 407 Proxy Authentication Required\r\n" "Server: winetest\r\n" @@ -1488,6 +1494,10 @@ static DWORD CALLBACK server_thread(LPVOID param) { send(c, okmsg2, sizeof okmsg2-1, 0); } + if (strstr(buffer, "/testE")) + { + send(c, noauthmsg2, sizeof noauthmsg2-1, 0); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg-1, 0); @@ -1917,6 +1927,49 @@ static void test_basic_authentication(int port) InternetCloseHandle(session); } +static void test_invalid_response_headers(int port) +{ + HINTERNET session, connect, request; + DWORD size, status; + BOOL ret; + char buffer[256]; + + session = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(session != NULL, "InternetOpen failed\n"); + + connect = InternetConnect(session, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(connect != NULL, "InternetConnect failed\n"); + + request = HttpOpenRequest(connect, NULL, "/testE", NULL, NULL, NULL, 0, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed %u\n", GetLastError()); + + status = 0; + size = sizeof(status); + ret = HttpQueryInfo( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok(ret, "HttpQueryInfo failed\n"); + ok(status == 401, "unexpected status %u\n", status); + + buffer[0] = 0; + size = sizeof(buffer); + ret = HttpQueryInfo( request, HTTP_QUERY_RAW_HEADERS, buffer, &size, NULL); + ok(ret, "HttpQueryInfo failed\n"); + ok(!strcmp(buffer, "HTTP/1.0 401 Anonymous requests or requests on unsecure channel are not allowed"), + "headers wrong \"%s\"\n", buffer); + + buffer[0] = 0; + size = sizeof(buffer); + ret = HttpQueryInfo( request, HTTP_QUERY_SERVER, buffer, &size, NULL); + ok(ret, "HttpQueryInfo failed\n"); + ok(!strcmp(buffer, "winetest"), "server wrong \"%s\"\n", buffer); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + InternetCloseHandle(session); +} + static void test_HttpQueryInfo(int port) { HINTERNET hi, hc, hr; @@ -2050,6 +2103,7 @@ static void test_http_connection(void) test_http1_1(si.port); test_cookie_header(si.port); test_basic_authentication(si.port); + test_invalid_response_headers(si.port); test_HttpQueryInfo(si.port); test_HttpSendRequestW(si.port);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/put borderStyle.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: d804631e34fe8a42fc63a8ecab08ca0689833d63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d804631e34fe8a42fc63a8eca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 2 21:58:55 2009 +1100 mshtml: Implement IHTMLStyle get/put borderStyle. --- dlls/mshtml/htmlstyle.c | 48 +++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index e571ac9..7817d9b 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -55,6 +55,8 @@ static const WCHAR attrBorderLeftStyle[] = {'b','o','r','d','e','r','-','l','e','f','t','-','s','t','y','l','e',0}; static const WCHAR attrBorderRightStyle[] = {'b','o','r','d','e','r','-','r','i','g','h','t','-','s','t','y','l','e',0}; +static const WCHAR attrBorderStyle[] = + {'b','o','r','d','e','r','-','s','t','y','l','e',0}; static const WCHAR attrBorderTopStyle[] = {'b','o','r','d','e','r','-','t','o','p','-','s','t','y','l','e',0}; static const WCHAR attrBorderWidth[] = @@ -124,6 +126,7 @@ static const struct{ {attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT}, {attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE}, {attrBorderRightStyle, DISPID_IHTMLSTYLE_BORDERRIGHTSTYLE}, + {attrBorderStyle, DISPID_IHTMLSTYLE_BORDERSTYLE}, {attrBorderTopStyle, DISPID_IHTMLSTYLE_BORDERTOPSTYLE}, {attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH}, {attrColor, DISPID_IHTMLSTYLE_COLOR}, @@ -1562,15 +1565,52 @@ static HRESULT WINAPI HTMLStyle_get_borderLeftWidth(IHTMLStyle *iface, VARIANT * static HRESULT WINAPI HTMLStyle_put_borderStyle(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + static const WCHAR styleWindowInset[] = {'w','i','n','d','o','w','-','i','n','s','e','t',0}; + HRESULT hres = S_OK; + BSTR pstyle; + int i=0; + int last = 0; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + while(v[i] && hres == S_OK) + { + if(v[i] == (WCHAR)' ') + { + pstyle = SysAllocStringLen(&v[last], (i-last)); + if( !(is_valid_border_style(pstyle) || strcmpiW(styleWindowInset, pstyle) == 0)) + { + TRACE("1. Invalid style (%s)\n", debugstr_w(pstyle)); + hres = E_INVALIDARG; + } + SysFreeString(pstyle); + last = i+1; + } + i++; + } + + if(hres == S_OK) + { + pstyle = SysAllocStringLen(&v[last], i-last); + if( !(is_valid_border_style(pstyle) || strcmpiW(styleWindowInset, pstyle) == 0)) + { + TRACE("2. Invalid style (%s)\n", debugstr_w(pstyle)); + hres = E_INVALIDARG; + } + SysFreeString(pstyle); + } + + if(hres == S_OK) + hres = set_nsstyle_attr(This->nsstyle, STYLEID_BORDER_STYLE, v, 0); + + return hres; } static HRESULT WINAPI HTMLStyle_get_borderStyle(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_attr(This, STYLEID_BORDER_STYLE, p); } static HRESULT WINAPI HTMLStyle_put_borderTopStyle(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 8922448..a275c3a 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -45,6 +45,7 @@ typedef enum { STYLEID_BORDER_LEFT, STYLEID_BORDER_LEFT_STYLE, STYLEID_BORDER_RIGHT_STYLE, + STYLEID_BORDER_STYLE, STYLEID_BORDER_TOP_STYLE, STYLEID_BORDER_WIDTH, STYLEID_COLOR, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a00aa78..dca4215 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3262,6 +3262,56 @@ static void test_default_style(IHTMLStyle *style) test_border_styles(style, str); SysFreeString(str); + hres = IHTMLStyle_get_borderStyle(style, &sDefault); + ok(hres == S_OK, "get_borderStyle failed: %08x\n", hres); + + str = a2bstr("none dotted dashed solid"); + hres = IHTMLStyle_put_borderStyle(style, str); + ok(hres == S_OK, "put_borderStyle failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("none dotted dashed solid"); + hres = IHTMLStyle_get_borderStyle(style, &str); + ok(hres == S_OK, "get_borderStyle failed: %08x\n", hres); + ok(!strcmp_wa(str, "none dotted dashed solid"), + "expected (none dotted dashed solid) = (%s)\n", dbgstr_w(V_BSTR(&v))); + SysFreeString(str); + + str = a2bstr("double groove ridge inset"); + hres = IHTMLStyle_put_borderStyle(style, str); + ok(hres == S_OK, "put_borderStyle failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("window-inset outset ridge inset"); + hres = IHTMLStyle_put_borderStyle(style, str); + ok(hres == S_OK, "put_borderStyle failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("window-inset"); + hres = IHTMLStyle_put_borderStyle(style, str); + ok(hres == S_OK, "put_borderStyle failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("none none none none none"); + hres = IHTMLStyle_put_borderStyle(style, str); + ok(hres == S_OK, "put_borderStyle failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("invalid none none none"); + hres = IHTMLStyle_put_borderStyle(style, str); + ok(hres == E_INVALIDARG, "put_borderStyle failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("none invalid none none"); + hres = IHTMLStyle_put_borderStyle(style, str); + ok(hres == E_INVALIDARG, "put_borderStyle failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_put_borderStyle(style, sDefault); + ok(hres == S_OK, "put_borderStyle failed: %08x\n", hres); + SysFreeString(sDefault); + + /* backgoundColor */ hres = IHTMLStyle_get_backgroundColor(style, &v); ok(hres == S_OK, "get_backgroundColor: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v));

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_borderStyle.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 8156db58940e03aa981ccf51b53490fe6479d8f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8156db58940e03aa981ccf51b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 3 21:49:12 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_borderStyle. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 78457c9..77c10ee 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -709,8 +709,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_layoutGridType(IHTMLCurrentStyle *ifa static HRESULT WINAPI HTMLCurrentStyle_get_borderStyle(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_BORDER_STYLE, p); } static HRESULT WINAPI HTMLCurrentStyle_get_borderColor(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index dca4215..8bc393a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2449,6 +2449,10 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_borderColor failed: %08x\n", hres); SysFreeString(str); + hres = IHTMLCurrentStyle_get_borderStyle(current_style, &str); + ok(hres == S_OK, "get_borderStyle failed: %08x\n", hres); + SysFreeString(str); + hres = IHTMLCurrentStyle_get_fontWeight(current_style, &v); ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v));

1 0

Alistair Leslie-Hughes : shell32: Add and register CLSID_QueryAssociations.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 28fe361115d400895ee6a96cf20db033a686765d URL: http://source.winehq.org/git/wine.git/?a=commit;h=28fe361115d400895ee6a96cf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 4 20:18:12 2009 +1100 shell32: Add and register CLSID_QueryAssociations. --- dlls/shell32/regsvr.c | 7 +++++++ include/shlguid.h | 2 ++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c index 3f89917..a23190e 100644 --- a/dlls/shell32/regsvr.c +++ b/dlls/shell32/regsvr.c @@ -658,6 +658,13 @@ static struct regsvr_coclass const coclass_list[] = { "shell32.dll", "Apartment" }, + { &CLSID_QueryAssociations, + "Query file associations", + 0, + NULL, + "shell32.dll", + "Apartment" + }, { &CLSID_ControlPanel, "Control Panel", IDS_CONTROLPANEL, diff --git a/include/shlguid.h b/include/shlguid.h index 1692dec..88d70ce 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -123,6 +123,8 @@ DEFINE_GUID(CLSID_FolderShortcut, 0x0AFACED1, 0xE828, 0x11D1, 0x91, 0x87, 0xB5, DEFINE_GUID(IID_IQueryAssociations, 0xc46ca590, 0x3c3f, 0x11d2, 0xbe, 0xe6, 0x00, 0x00, 0xf8, 0x05, 0xca, 0x57); +DEFINE_GUID(CLSID_QueryAssociations, 0xa07034fd, 0x6caa, 0x4954, 0xac, 0x3f, 0x97, 0xa2, 0x72, 0x16, 0xf9, 0x8a); + DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/put borderColor.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 73241dfe845e699dbf09e1e627925e3fa045f3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73241dfe845e699dbf09e1e62… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 3 21:04:49 2009 +1100 mshtml: Implement IHTMLStyle get/put borderColor. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 90ff089..e571ac9 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -47,6 +47,8 @@ static const WCHAR attrBorder[] = {'b','o','r','d','e','r',0}; static const WCHAR attrBorderBottomStyle[] = {'b','o','r','d','e','r','-','b','o','t','t','o','m','-','s','t','y','l','e',0}; +static const WCHAR attrBorderColor[] = + {'b','o','r','d','e','r','-','c','o','l','o','r',0}; static const WCHAR attrBorderLeft[] = {'b','o','r','d','e','r','-','l','e','f','t',0}; static const WCHAR attrBorderLeftStyle[] = @@ -118,6 +120,7 @@ static const struct{ {attrBackgroundRepeat, DISPID_IHTMLSTYLE_BACKGROUNDREPEAT}, {attrBorder, DISPID_IHTMLSTYLE_BORDER}, {attrBorderBottomStyle, DISPID_IHTMLSTYLE_BORDERBOTTOMSTYLE}, + {attrBorderColor, DISPID_IHTMLSTYLE_BORDERCOLOR}, {attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT}, {attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE}, {attrBorderRightStyle, DISPID_IHTMLSTYLE_BORDERRIGHTSTYLE}, @@ -1415,15 +1418,19 @@ static HRESULT WINAPI HTMLStyle_get_borderLeft(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_borderColor(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, STYLEID_BORDER_COLOR, v, 0); } static HRESULT WINAPI HTMLStyle_get_borderColor(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, STYLEID_BORDER_COLOR, p); } static HRESULT WINAPI HTMLStyle_put_borderTopColor(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 73c7c7d..8922448 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -41,6 +41,7 @@ typedef enum { STYLEID_BACKGROUND_REPEAT, STYLEID_BORDER, STYLEID_BORDER_BOTTOM_STYLE, + STYLEID_BORDER_COLOR, STYLEID_BORDER_LEFT, STYLEID_BORDER_LEFT_STYLE, STYLEID_BORDER_RIGHT_STYLE, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6674024..8ef7bed 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3319,6 +3319,24 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "put_backgroundRepeat failed: %08x\n", hres); SysFreeString(sDefault); + /* BorderColor */ + hres = IHTMLStyle_get_borderColor(style, &sDefault); + ok(hres == S_OK, "get_borderColor failed: %08x\n", hres); + + str = a2bstr("red green red blue"); + hres = IHTMLStyle_put_borderColor(style, str); + ok(hres == S_OK, "put_borderColor failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_borderColor(style, &str); + ok(hres == S_OK, "get_borderColor failed: %08x\n", hres); + ok(!strcmp_wa(str, "red green red blue"), "str=%s\n", dbgstr_w(str)); + SysFreeString(str); + + hres = IHTMLStyle_put_borderColor(style, sDefault); + ok(hres == S_OK, "put_borderColor failed: %08x\n", hres); + SysFreeString(sDefault); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_borderColor.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 9188cba16404321702186bf70ee7e53c8517671b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9188cba16404321702186bf70… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 3 21:10:55 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_borderColor. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 9bb139d..78457c9 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -716,8 +716,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_borderStyle(IHTMLCurrentStyle *iface, static HRESULT WINAPI HTMLCurrentStyle_get_borderColor(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_BORDER_COLOR, p); } static HRESULT WINAPI HTMLCurrentStyle_get_borderWidth(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8ef7bed..a00aa78 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2445,6 +2445,10 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(!strcmp_wa(str, "repeat"), "get_backgroundRepeat returned %s\n", dbgstr_w(str)); SysFreeString(str); + hres = IHTMLCurrentStyle_get_borderColor(current_style, &str); + ok(hres == S_OK, "get_borderColor failed: %08x\n", hres); + SysFreeString(str); + hres = IHTMLCurrentStyle_get_fontWeight(current_style, &v); ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v));

1 0