September 2009 - Wine-commits

Nikolay Sivov : comctl32/dpa: Fix parameter validation in DPA_LoadStream().
by Alexandre Julliard 15 Sep '09

15 Sep '09

Module: wine Branch: master Commit: c8f8e5da119c01d84ac787c3eec1fbbba292c5b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8f8e5da119c01d84ac787c3e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 12 03:32:02 2009 +0400 comctl32/dpa: Fix parameter validation in DPA_LoadStream(). --- dlls/comctl32/dpa.c | 21 +++++++++------------ dlls/comctl32/tests/dpa.c | 6 +++--- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index f9c8afc..ca28282 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -84,7 +84,7 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc, { HRESULT errCode; LARGE_INTEGER position; - ULARGE_INTEGER newPosition; + ULARGE_INTEGER initial_pos; STREAMDATA streamData; DPASTREAMINFO streamInfo; ULONG ulRead; @@ -101,15 +101,11 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc, position.QuadPart = 0; - /* - * Zero out our streamData - */ - memset(&streamData,0,sizeof(STREAMDATA)); - - errCode = IStream_Seek (pStream, position, STREAM_SEEK_CUR, &newPosition); + errCode = IStream_Seek (pStream, position, STREAM_SEEK_CUR, &initial_pos); if (errCode != S_OK) return errCode; + memset(&streamData, 0, sizeof(STREAMDATA)); errCode = IStream_Read (pStream, &streamData, sizeof(STREAMDATA), &ulRead); if (errCode != S_OK) return errCode; @@ -117,11 +113,12 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc, FIXME ("dwSize=%u dwData2=%u dwItems=%u\n", streamData.dwSize, streamData.dwData2, streamData.dwItems); - if ( ulRead < sizeof(STREAMDATA) || - (DWORD)pData < sizeof(STREAMDATA) || - streamData.dwSize < sizeof(STREAMDATA) || - streamData.dwData2 < 1) { - errCode = E_FAIL; + if (ulRead < sizeof(STREAMDATA) || + streamData.dwSize < sizeof(STREAMDATA) || streamData.dwData2 != 1) { + /* back to initial position */ + position.QuadPart = initial_pos.QuadPart; + IStream_Seek (pStream, position, STREAM_SEEK_SET, NULL); + return E_FAIL; } if (streamData.dwItems > (UINT_MAX / 2 / sizeof(VOID*))) /* 536870911 */ diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 5d7124a..54e8d0e 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -586,7 +586,7 @@ static void test_DPA_LoadStream(void) uli.QuadPart = 1; hRes = IStream_Seek(pStm, li, STREAM_SEEK_CUR, &uli); expect(S_OK, hRes); - todo_wine ok(uli.QuadPart == 0, "Expected to position reset\n"); + ok(uli.QuadPart == 0, "Expected to position reset\n"); /* write valid header for empty DPA */ header.dwSize = sizeof(header); @@ -612,7 +612,7 @@ static void test_DPA_LoadStream(void) expect(S_OK, hRes); hRes = pDPA_LoadStream(&dpa, CB_Load, pStm, NULL); - todo_wine expect(S_OK, hRes); + expect(S_OK, hRes); /* try with altered dwData2 field */ header.dwSize = sizeof(header); @@ -632,7 +632,7 @@ static void test_DPA_LoadStream(void) expect(S_OK, hRes); hRes = pDPA_LoadStream(&dpa, CB_Load, pStm, (void*)0xdeadbeef); - todo_wine expect(E_FAIL, hRes); + expect(E_FAIL, hRes); ret = IStream_Release(pStm); ok(!ret, "ret=%d\n", ret);

1 0

Nikolay Sivov : comctl32/dpa: Separate tests for parameter validation in DPA_LoadStream().
by Alexandre Julliard 15 Sep '09

15 Sep '09

Module: wine Branch: master Commit: b07ca01527c2e38c476a9725c9b21ee160c1401c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b07ca01527c2e38c476a9725c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 12 03:17:54 2009 +0400 comctl32/dpa: Separate tests for parameter validation in DPA_LoadStream(). --- dlls/comctl32/tests/dpa.c | 127 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 123 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index e9a1fa5..5d7124a 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -33,6 +33,13 @@ #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +typedef struct _STREAMDATA +{ + DWORD dwSize; + DWORD dwData2; + DWORD dwItems; +} STREAMDATA, *PSTREAMDATA; + static HDPA (WINAPI *pDPA_Clone)(const HDPA,const HDPA); static HDPA (WINAPI *pDPA_Create)(INT); static HDPA (WINAPI *pDPA_CreateEx)(INT,HANDLE); @@ -45,9 +52,9 @@ static INT (WINAPI *pDPA_GetPtr)(const HDPA,INT); static INT (WINAPI *pDPA_GetPtrIndex)(const HDPA,PVOID); static BOOL (WINAPI *pDPA_Grow)(HDPA,INT); static INT (WINAPI *pDPA_InsertPtr)(const HDPA,INT,PVOID); -static HRESULT (WINAPI *pDPA_LoadStream)(HDPA*,PFNDPASTREAM,IStream*,LPARAM); +static HRESULT (WINAPI *pDPA_LoadStream)(HDPA*,PFNDPASTREAM,IStream*,LPVOID); static BOOL (WINAPI *pDPA_Merge)(const HDPA,const HDPA,DWORD,PFNDPACOMPARE,PFNDPAMERGE,LPARAM); -static HRESULT (WINAPI *pDPA_SaveStream)(HDPA,PFNDPASTREAM,IStream*,LPARAM); +static HRESULT (WINAPI *pDPA_SaveStream)(HDPA,PFNDPASTREAM,IStream*,LPVOID); static INT (WINAPI *pDPA_Search)(HDPA,PVOID,INT,PFNDPACOMPARE,LPARAM,UINT); static BOOL (WINAPI *pDPA_SetPtr)(const HDPA,INT,PVOID); static BOOL (WINAPI *pDPA_Sort)(const HDPA,PFNDPACOMPARE,LPARAM); @@ -525,6 +532,117 @@ static void test_DPA_DestroyCallback(void) ok(nEnum == 3, "nEnum=%d\n", nEnum); } +static void test_DPA_LoadStream(void) +{ + static const WCHAR szStg[] = { 'S','t','g',0 }; + IStorage* pStg = NULL; + IStream* pStm = NULL; + LARGE_INTEGER li; + ULARGE_INTEGER uli; + DWORD dwMode; + HRESULT hRes; + STREAMDATA header; + ULONG written, ret; + HDPA dpa; + + hRes = CoInitialize(NULL); + if (hRes != S_OK) + { + ok(0, "hResult: %d\n", hRes); + return; + } + + dwMode = STGM_DIRECT|STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE; + hRes = StgCreateDocfile(NULL, dwMode|STGM_DELETEONRELEASE, 0, &pStg); + expect(S_OK, hRes); + + hRes = IStorage_CreateStream(pStg, szStg, dwMode, 0, 0, &pStm); + expect(S_OK, hRes); + + /* write less than header size */ + li.QuadPart = 0; + hRes = IStream_Seek(pStm, li, STREAM_SEEK_SET, NULL); + expect(S_OK, hRes); + + memset(&header, 0, sizeof(header)); + written = 0; + uli.QuadPart = sizeof(header)-1; + hRes = IStream_SetSize(pStm, uli); + expect(S_OK, hRes); + hRes = IStream_Write(pStm, &header, sizeof(header)-1, &written); + expect(S_OK, hRes); + written -= sizeof(header)-1; + expect(0, written); + + li.QuadPart = 0; + hRes = IStream_Seek(pStm, li, STREAM_SEEK_SET, NULL); + expect(S_OK, hRes); + + hRes = pDPA_LoadStream(&dpa, CB_Load, pStm, NULL); + expect(E_FAIL, hRes); + + /* check stream position after header read failed */ + li.QuadPart = 0; + uli.QuadPart = 1; + hRes = IStream_Seek(pStm, li, STREAM_SEEK_CUR, &uli); + expect(S_OK, hRes); + todo_wine ok(uli.QuadPart == 0, "Expected to position reset\n"); + + /* write valid header for empty DPA */ + header.dwSize = sizeof(header); + header.dwData2 = 1; + header.dwItems = 0; + written = 0; + + li.QuadPart = 0; + hRes = IStream_Seek(pStm, li, STREAM_SEEK_SET, NULL); + expect(S_OK, hRes); + + uli.QuadPart = sizeof(header); + hRes = IStream_SetSize(pStm, uli); + expect(S_OK, hRes); + + hRes = IStream_Write(pStm, &header, sizeof(header), &written); + expect(S_OK, hRes); + written -= sizeof(header); + expect(0, written); + + li.QuadPart = 0; + hRes = IStream_Seek(pStm, li, STREAM_SEEK_SET, NULL); + expect(S_OK, hRes); + + hRes = pDPA_LoadStream(&dpa, CB_Load, pStm, NULL); + todo_wine expect(S_OK, hRes); + + /* try with altered dwData2 field */ + header.dwSize = sizeof(header); + header.dwData2 = 2; + header.dwItems = 0; + + li.QuadPart = 0; + hRes = IStream_Seek(pStm, li, STREAM_SEEK_SET, NULL); + expect(S_OK, hRes); + hRes = IStream_Write(pStm, &header, sizeof(header), &written); + expect(S_OK, hRes); + written -= sizeof(header); + expect(0, written); + + li.QuadPart = 0; + hRes = IStream_Seek(pStm, li, STREAM_SEEK_SET, NULL); + expect(S_OK, hRes); + + hRes = pDPA_LoadStream(&dpa, CB_Load, pStm, (void*)0xdeadbeef); + todo_wine expect(E_FAIL, hRes); + + ret = IStream_Release(pStm); + ok(!ret, "ret=%d\n", ret); + + ret = IStorage_Release(pStg); + ok(!ret, "ret=%d\n", ret); + + CoUninitialize(); +} + static void test_dpa_stream(void) { HDPA dpa; @@ -566,14 +684,14 @@ static void test_dpa_stream(void) hRes = IStorage_CreateStream(pStg, szStg, dwMode, 0, 0, &pStm); ok(hRes == S_OK, "hRes=0x%x\n", hRes); - hRes = pDPA_SaveStream(dpa, CB_Save, pStm, 0xdeadbeef); + hRes = pDPA_SaveStream(dpa, CB_Save, pStm, (void*)0xdeadbeef); todo_wine ok(hRes == S_OK, "hRes=0x%x\n", hRes); pDPA_Destroy(dpa); liZero.QuadPart = 0; hRes = IStream_Seek(pStm, liZero, STREAM_SEEK_SET, NULL); ok(hRes == S_OK, "hRes=0x%x\n", hRes); - hRes = pDPA_LoadStream(&dpa, CB_Load, pStm, 0xdeadbeef); + hRes = pDPA_LoadStream(&dpa, CB_Load, pStm, (void*)0xdeadbeef); todo_wine { ok(hRes == S_OK, "hRes=0x%x\n", hRes); @@ -607,5 +725,6 @@ START_TEST(dpa) test_DPA_Merge(); test_DPA_EnumCallback(); test_DPA_DestroyCallback(); + test_DPA_LoadStream(); test_dpa_stream(); }

1 0

Juan Lang : crypt32: Implement retrieving the encoded signer of a decoded signed message.
by Alexandre Julliard 15 Sep '09

15 Sep '09

Module: wine Branch: master Commit: 96be0ee8dcfb487d1582c4e8bb9f09162a934a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=96be0ee8dcfb487d1582c4e8b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 14 08:01:43 2009 -0700 crypt32: Implement retrieving the encoded signer of a decoded signed message. --- dlls/crypt32/msg.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 0b4027d..8a88b75 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2410,6 +2410,20 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + case CMSG_ENCODED_SIGNER: + if (msg->u.signed_data.info) + { + if (dwIndex >= msg->u.signed_data.info->cSignerInfo) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CryptEncodeObjectEx( + X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, CMS_SIGNER_INFO, + &msg->u.signed_data.info->rgSignerInfo[dwIndex], 0, NULL, + pvData, pcbData); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; case CMSG_ATTR_CERT_COUNT_PARAM: if (msg->u.signed_data.info) {

1 0

Austin English : advapi32/tests: Avoid #if 0, use if(0) instead.
by Alexandre Julliard 15 Sep '09

15 Sep '09

Module: wine Branch: master Commit: addf0c11a0d9c06959d74d0be9f697fef124667d URL: http://source.winehq.org/git/wine.git/?a=commit;h=addf0c11a0d9c06959d74d0be… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Sep 14 02:13:19 2009 -0500 advapi32/tests: Avoid #if 0, use if(0) instead. --- dlls/advapi32/tests/cred.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 8d66ed0..6b7fa26 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -154,12 +154,13 @@ static void test_CredReadDomainCredentialsA(void) /* these two tests would crash on both native and Wine. Implementations * does not check for NULL output pointers and try to zero them out early */ -#if 0 +if(0) +{ ok(!pCredReadDomainCredentialsA(&info, 0, NULL, &creds) && GetLastError() == ERROR_INVALID_PARAMETER, "!\n"); ok(!pCredReadDomainCredentialsA(&info, 0, &count, NULL) && GetLastError() == ERROR_INVALID_PARAMETER, "!\n"); -#endif +} SetLastError(0xdeadbeef); ret = pCredReadDomainCredentialsA(NULL, 0, &count, &creds);

1 0

Jacek Caban : mshtml: Added IHTMLInputElement::src property implementation.
by Alexandre Julliard 15 Sep '09

15 Sep '09

Module: wine Branch: master Commit: 508aa85c6bf4b04b3f40b65bab1a0a04ff0b27cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=508aa85c6bf4b04b3f40b65ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 14 00:36:09 2009 +0200 mshtml: Added IHTMLInputElement::src property implementation. --- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmlinput.c | 35 +++++++++++++++++++++++++++++++---- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsio.c | 12 ++++++++---- dlls/mshtml/tests/dom.c | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index f7e2ab5..aac6f6c 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -295,7 +295,7 @@ static HRESULT WINAPI HTMLImgElement_get_src(IHTMLImgElement *iface, BSTR *p) } nsAString_GetData(&src_str, &src); - hres = nsuri_to_url(src, p); + hres = nsuri_to_url(src, TRUE, p); nsAString_Finish(&src_str); return hres; diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 48f19c8..3d69e0c 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -506,15 +506,42 @@ static HRESULT WINAPI HTMLInputElement_get_alt(IHTMLInputElement *iface, BSTR *p static HRESULT WINAPI HTMLInputElement_put_src(IHTMLInputElement *iface, BSTR v) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_Init(&nsstr, v); + nsres = nsIDOMHTMLInputElement_SetSrc(This->nsinput, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) + ERR("SetSrc failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLInputElement_get_src(IHTMLInputElement *iface, BSTR *p) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + const PRUnichar *src; + nsAString src_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&src_str, NULL); + nsres = nsIDOMHTMLInputElement_GetSrc(This->nsinput, &src_str); + if(NS_FAILED(nsres)) { + ERR("GetSrc failed: %08x\n", nsres); + return E_FAIL; + } + + nsAString_GetData(&src_str, &src); + hres = nsuri_to_url(src, FALSE, p); + nsAString_Finish(&src_str); + + return hres; } static HRESULT WINAPI HTMLInputElement_put_lowsrc(IHTMLInputElement *iface, BSTR v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e202688..2aedc98 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -554,7 +554,7 @@ void init_nsio(nsIComponentManager*,nsIComponentRegistrar*); void release_nsio(void); BOOL install_wine_gecko(BOOL); -HRESULT nsuri_to_url(LPCWSTR,BSTR*); +HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*); void hlink_frame_navigate(HTMLDocument*,IHlinkFrame*,LPCWSTR,nsIInputStream*,DWORD); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 12e8520..88f2dc6 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -77,7 +77,7 @@ static const char *debugstr_nsacstr(const nsACString *nsstr) return debugstr_a(data); } -HRESULT nsuri_to_url(LPCWSTR nsuri, BSTR *ret) +HRESULT nsuri_to_url(LPCWSTR nsuri, BOOL ret_empty, BSTR *ret) { const WCHAR *ptr = nsuri; @@ -86,9 +86,13 @@ HRESULT nsuri_to_url(LPCWSTR nsuri, BSTR *ret) if(!strncmpW(nsuri, wine_prefixW, sizeof(wine_prefixW)/sizeof(WCHAR))) ptr += sizeof(wine_prefixW)/sizeof(WCHAR); - *ret = SysAllocString(ptr); - if(!*ret) - return E_OUTOFMEMORY; + if(*ptr || ret_empty) { + *ret = SysAllocString(ptr); + if(!*ret) + return E_OUTOFMEMORY; + }else { + *ret = NULL; + } TRACE("%s -> %s\n", debugstr_w(nsuri), debugstr_w(*ret)); return S_OK; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b9a3ff8..bdf859f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1586,6 +1586,35 @@ static void _test_input_put_value(unsigned line, IUnknown *unk, const char *val) IHTMLInputElement_Release(input); } +#define test_input_src(i,s) _test_input_src(__LINE__,i,s) +static void _test_input_src(unsigned line, IHTMLInputElement *input, const char *exsrc) +{ + BSTR src; + HRESULT hres; + + hres = IHTMLInputElement_get_src(input, &src); + ok_(__FILE__,line) (hres == S_OK, "get_src failed: %08x\n", hres); + if(exsrc) + ok_(__FILE__,line) (!strcmp_wa(src, exsrc), "get_src returned %s expected %s\n", wine_dbgstr_w(src), exsrc); + else + ok_(__FILE__,line) (!src, "get_src returned %s expected NULL\n", wine_dbgstr_w(src)); + SysFreeString(src); +} + +#define test_input_set_src(u,s) _test_input_set_src(__LINE__,u,s) +static void _test_input_set_src(unsigned line, IHTMLInputElement *input, const char *src) +{ + BSTR tmp; + HRESULT hres; + + tmp = a2bstr(src); + hres = IHTMLInputElement_put_src(input, tmp); + SysFreeString(tmp); + ok_(__FILE__,line) (hres == S_OK, "put_src failed: %08x\n", hres); + + _test_input_src(line, input, src); +} + #define test_elem_class(u,c) _test_elem_class(__LINE__,u,c) static void _test_elem_class(unsigned line, IUnknown *unk, const char *exclass) { @@ -4622,6 +4651,9 @@ static void test_elems(IHTMLDocument2 *doc) test_input_set_checked(input, VARIANT_TRUE); test_input_set_checked(input, VARIANT_FALSE); + test_input_src(input, NULL); + test_input_set_src(input, "about:blank"); + IHTMLInputElement_Release(input); IHTMLElement_Release(elem); }

1 0

Jacek Caban : mshtml: Added semi-stub IHTMLElement2:: onreadystatechange implmementation.
by Alexandre Julliard 15 Sep '09

15 Sep '09

Module: wine Branch: master Commit: ee5d678450d59fd77dc75bcbebea410503c3832c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee5d678450d59fd77dc75bcbe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 14 00:35:40 2009 +0200 mshtml: Added semi-stub IHTMLElement2::onreadystatechange implmementation. --- dlls/mshtml/htmlelem2.c | 12 ++++++++---- dlls/mshtml/htmlevent.c | 38 +++++++++++++++++++++----------------- dlls/mshtml/htmlevent.h | 1 + 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 1120c79..d403368 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -628,15 +628,19 @@ static HRESULT WINAPI HTMLElement2_get_readyState(IHTMLElement2 *iface, VARIANT static HRESULT WINAPI HTMLElement2_put_onreadystatechange(IHTMLElement2 *iface, VARIANT v) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + FIXME("(%p)->(%s): semi-stub\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_READYSTATECHANGE, &v); } static HRESULT WINAPI HTMLElement2_get_onreadystatechange(IHTMLElement2 *iface, VARIANT *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_READYSTATECHANGE, p); } static HRESULT WINAPI HTMLElement2_put_onrowsdelete(IHTMLElement2 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 59fa6ff..db9691c 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -90,6 +90,9 @@ static const WCHAR onmouseupW[] = {'o','n','m','o','u','s','e','u','p',0}; static const WCHAR pasteW[] = {'p','a','s','t','e',0}; static const WCHAR onpasteW[] = {'o','n','p','a','s','t','e',0}; +static const WCHAR readystatechangeW[] = {'r','e','a','d','y','s','t','a','t','e','c','h','a','n','g','e',0}; +static const WCHAR onreadystatechangeW[] = {'o','n','r','e','a','d','y','s','t','a','t','e','c','h','a','n','g','e',0}; + static const WCHAR selectstartW[] = {'s','e','l','e','c','t','s','t','a','r','t',0}; static const WCHAR onselectstartW[] = {'o','n','s','e','l','e','c','t','s','t','a','r','t',0}; @@ -104,23 +107,24 @@ typedef struct { #define EVENT_FORWARDBODY 0x0004 static const event_info_t event_info[] = { - {beforeunloadW, onbeforeunloadW, EVENT_DEFAULTLISTENER|EVENT_FORWARDBODY}, - {blurW, onblurW, EVENT_DEFAULTLISTENER}, - {changeW, onchangeW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {clickW, onclickW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {dblclickW, ondblclickW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {dragW, ondragW, 0}, - {dragstartW, ondragstartW, 0}, - {focusW, onfocusW, EVENT_DEFAULTLISTENER}, - {keydownW, onkeydownW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {keyupW, onkeyupW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {loadW, onloadW, 0}, - {mousedownW, onmousedownW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {mouseoutW, onmouseoutW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {mouseoverW, onmouseoverW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {mouseupW, onmouseupW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, - {pasteW, onpasteW, 0}, - {selectstartW, onselectstartW, 0} + {beforeunloadW, onbeforeunloadW, EVENT_DEFAULTLISTENER|EVENT_FORWARDBODY}, + {blurW, onblurW, EVENT_DEFAULTLISTENER}, + {changeW, onchangeW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {clickW, onclickW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {dblclickW, ondblclickW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {dragW, ondragW, 0}, + {dragstartW, ondragstartW, 0}, + {focusW, onfocusW, EVENT_DEFAULTLISTENER}, + {keydownW, onkeydownW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {keyupW, onkeyupW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {loadW, onloadW, 0}, + {mousedownW, onmousedownW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {mouseoutW, onmouseoutW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {mouseoverW, onmouseoverW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {mouseupW, onmouseupW, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {pasteW, onpasteW, 0}, + {readystatechangeW, onreadystatechangeW, 0}, + {selectstartW, onselectstartW, 0} }; eventid_t str_to_eid(LPCWSTR str) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index c2f541d..03785c1 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -33,6 +33,7 @@ typedef enum { EVENTID_MOUSEOVER, EVENTID_MOUSEUP, EVENTID_PASTE, + EVENTID_READYSTATECHANGE, EVENTID_SELECTSTART, EVENTID_LAST } eventid_t;

1 0

Jacek Caban : mshtml: Report download failure to necko.
by Alexandre Julliard 15 Sep '09

15 Sep '09

Module: wine Branch: master Commit: 3130898e3927f30801c9acb2fdda7fea3fba758a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3130898e3927f30801c9acb2f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 14 00:35:20 2009 +0200 mshtml: Report download failure to necko. --- dlls/mshtml/navigate.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 1a0d5eb..e8fa949 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -893,20 +893,20 @@ static void on_start_nsrequest(nsChannelBSC *This) FIXME("OnStartRequest failed: %08x\n", nsres); } -static void on_stop_nsrequest(nsChannelBSC *This) +static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) { nsresult nsres; if(!This->nslistener) return; - if(!This->bsc.readed) { + if(!This->bsc.readed && SUCCEEDED(result)) { TRACE("No data read! Calling OnStartRequest\n"); on_start_nsrequest(This); } nsres = nsIStreamListener_OnStopRequest(This->nslistener, (nsIRequest*)NSCHANNEL(This->nschannel), - This->nscontext, NS_OK); + This->nscontext, SUCCEEDED(result) ? NS_OK : NS_ERROR_FAILURE); if(NS_FAILED(nsres)) WARN("OnStopRequest failed: %08x\n", nsres); } @@ -1030,7 +1030,7 @@ static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) { nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); - on_stop_nsrequest(This); + on_stop_nsrequest(This, result); if(This->nslistener) { if(This->nschannel->load_group) {

1 0

Mike Kaplinskiy : ws2_32: Remember to convert ports to network byte order.
by Alexandre Julliard 15 Sep '09

15 Sep '09

Module: wine Branch: master Commit: 13eef3d691cf555684a2a3ff55c08c1232fdddf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13eef3d691cf555684a2a3ff5… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sun Sep 13 17:54:54 2009 -0400 ws2_32: Remember to convert ports to network byte order. --- dlls/ws2_32/socket.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ab88925..c3ee046 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4959,7 +4959,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, ptrPort = strchr(workBuffer, ':'); if(ptrPort) { - ((LPSOCKADDR_IN)lpAddress)->sin_port = (WS_u_short)atoi(ptrPort+1); + ((LPSOCKADDR_IN)lpAddress)->sin_port = htons(atoi(ptrPort+1)); *ptrPort = '\0'; } else @@ -5002,7 +5002,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, ptrPort = strchr(workBuffer, ']'); if(ptrPort && *(++ptrPort) == ':') { - ((LPSOCKADDR_IN6)lpAddress)->sin6_port = (WS_u_short)atoi(ptrPort+1); + ((LPSOCKADDR_IN6)lpAddress)->sin6_port = htons(atoi(ptrPort+1)); *ptrPort = '\0'; } else

1 0

Akihiro Sagawa : start: Add Japanese translation.
by Alexandre Julliard 15 Sep '09

15 Sep '09

Module: wine Branch: master Commit: daa797f54b7c3b657ccf822bc771cfc3927c65c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daa797f54b7c3b657ccf822bc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Sep 13 18:12:22 2009 +0900 start: Add Japanese translation. --- programs/start/Ja.rc | 72 ++++++++++++++++++++++++++++++++++++++++++++ programs/start/Makefile.in | 1 + 2 files changed, 73 insertions(+), 0 deletions(-) diff --git a/programs/start/Ja.rc b/programs/start/Ja.rc new file mode 100644 index 0000000..58a47b8 --- /dev/null +++ b/programs/start/Ja.rc @@ -0,0 +1,72 @@ +/* + * Start + * Japanese Language Support + * + * Copyright 2003 Dan Kegel + * Copytight 2009 Akihiro Sagawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +#pragma code_page(65001) /* UTF-8 */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ +STRING_USAGE, "プログラムを開始したり、拡張子に基づき通常使われるプログラムで文書を開きます。\n\ +使い方:\n\ +start [options] プログラムファイル名 [...]\n\ +start [options] 文書ファイル名\n\ +\n\ +オプション:\n\ +/M[inimized] プログラムを最小化した状態で開始します。\n\ +/MAX[imized] プログラムを最大化した状態で開始します。\n\ +/R[estored] プログラムを通常の状態で開始します。(最小化や最大化ではなく)\n\ +/W[ait] 開始したプログラムが終了するまで待機し、そのプログラムの終了コードで終了します。\n\ +/Unix Unix ファイル名を使用して、windows エクスプローラのようにファイルを開始します。\n\ +/ProgIDOpen 直後に指定した progID を利用して文書を開きます。\n\ +/L エンドユーザライセンスを表示します。\n\ +\n\ +start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ +Start は完全に無保証です。詳細は /L オプションをつけて起動してください。\n\ +これはフリーソフトウェアです。一定の条件下で自由に再配布できます。\n\ +条件の詳細は 'start /L' を起動してください。\n\ +" + +STRING_LICENSE, "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ +This program is free software; you can redistribute it and/or\n\ +modify it under the terms of the GNU Lesser Public License\n\ +as published by the Free Software Foundation; either version 2.1\n\ +of the License, or (at your option) any later version.\n\ +\n\ +This program is distributed in the hope that it will be useful,\n\ +but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ +GNU Lesser Public License for more details.\n\ +\n\ +You should have received a copy of the GNU Lesser Public License\n\ +along with this program; if not, write to the Free Software\n\ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n\ +\n\ +ライセンスの内容については COPYING.LIB ファイルを参照してください。\n\ +" + +STRING_EXECFAIL, "アプリケーションを開始できません。もしくは、指定したファイルにアプリケーションが関連付けられていません。\nShellExecuteEx が失敗しました。" + +STRING_UNIXFAIL "指定された Unix ファイル名を DOS ファイル名に変換できませんでした。" +} diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in index a96fbce..66a05e8 100644 --- a/programs/start/Makefile.in +++ b/programs/start/Makefile.in @@ -16,6 +16,7 @@ RC_SRCS = \ Es.rc \ Fr.rc \ It.rc \ + Ja.rc \ Ko.rc \ Lt.rc \ Nl.rc \

1 0

Akihiro Sagawa : user32: Update Japanese resource.
by Alexandre Julliard 15 Sep '09

15 Sep '09

Module: wine Branch: master Commit: afd33d618fc5a39dd81f9da2b0de9c10f4d814bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd33d618fc5a39dd81f9da2b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Sep 13 18:12:21 2009 +0900 user32: Update Japanese resource. --- dlls/user32/resources/user32_Ja.rc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/resources/user32_Ja.rc b/dlls/user32/resources/user32_Ja.rc index c527f6b..6e03954 100644 --- a/dlls/user32/resources/user32_Ja.rc +++ b/dlls/user32/resources/user32_Ja.rc @@ -53,7 +53,6 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE MSGBOX DIALOG 100, 80, 216, 168 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 9, "MS Shell Dlg" BEGIN ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX

1 0