July 2010 - Wine-Commits - list.winehq.org

Vincent Povirk : ole32: Update storage header saving code based on the latest MS spec.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 7f3c92b2a0daf53dbcc22ac111929ecf0c22e6f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3c92b2a0daf53dbcc22ac11… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jul 17 09:46:43 2010 -0500 ole32: Update storage header saving code based on the latest MS spec. These fields are needed for the MS storage implementation to load files that were created by Wine with a block size of 4096. --- dlls/ole32/storage32.c | 52 +++++++++++++++++++++++++++++++++++++++++------ dlls/ole32/storage32.h | 4 +++ 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 98df144..15fe143 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1306,6 +1306,8 @@ static HRESULT StorageImpl_CreateDirEntry( entryIndex, emptyData); } + + StorageImpl_SaveFileHeader(storage); } UpdateRawDirEntry(currentData, newData); @@ -3465,6 +3467,7 @@ static void StorageImpl_SaveFileHeader( HRESULT hr; ULARGE_INTEGER offset; DWORD bytes_read, bytes_written; + DWORD major_version, dirsectorcount; /* * Get a pointer to the big block of data containing the header. @@ -3475,6 +3478,16 @@ static void StorageImpl_SaveFileHeader( if (SUCCEEDED(hr) && bytes_read != HEADER_SIZE) hr = STG_E_FILENOTFOUND; + if (This->bigBlockSizeBits == 0x9) + major_version = 3; + else if (This->bigBlockSizeBits == 0xc) + major_version = 4; + else + { + ERR("invalid big block shift 0x%x\n", This->bigBlockSizeBits); + major_version = 4; + } + /* * If the block read failed, the file is probably new. */ @@ -3489,13 +3502,6 @@ static void StorageImpl_SaveFileHeader( * Initialize the magic number. */ memcpy(headerBigBlock, STORAGE_magic, sizeof(STORAGE_magic)); - - /* - * And a bunch of things we don't know what they mean - */ - StorageUtl_WriteWord(headerBigBlock, 0x18, 0x3b); - StorageUtl_WriteWord(headerBigBlock, 0x1a, 0x3); - StorageUtl_WriteWord(headerBigBlock, 0x1c, (WORD)-2); } /* @@ -3503,6 +3509,21 @@ static void StorageImpl_SaveFileHeader( */ StorageUtl_WriteWord( headerBigBlock, + OFFSET_MINORVERSION, + 0x3e); + + StorageUtl_WriteWord( + headerBigBlock, + OFFSET_MAJORVERSION, + major_version); + + StorageUtl_WriteWord( + headerBigBlock, + OFFSET_BYTEORDERMARKER, + (WORD)-2); + + StorageUtl_WriteWord( + headerBigBlock, OFFSET_BIGBLOCKSIZEBITS, This->bigBlockSizeBits); @@ -3511,6 +3532,23 @@ static void StorageImpl_SaveFileHeader( OFFSET_SMALLBLOCKSIZEBITS, This->smallBlockSizeBits); + if (major_version >= 4) + { + if (This->rootBlockChain) + dirsectorcount = BlockChainStream_GetCount(This->rootBlockChain); + else + /* This file is being created, and it will start out with one block. */ + dirsectorcount = 1; + } + else + /* This field must be 0 in versions older than 4 */ + dirsectorcount = 0; + + StorageUtl_WriteDWord( + headerBigBlock, + OFFSET_DIRSECTORCOUNT, + dirsectorcount); + StorageUtl_WriteDWord( headerBigBlock, OFFSET_BBDEPOTCOUNT, diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 19f3f2d..524ff7d 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -42,8 +42,12 @@ /* * Definitions for the file format offsets. */ +static const ULONG OFFSET_MINORVERSION = 0x00000018; +static const ULONG OFFSET_MAJORVERSION = 0x0000001a; +static const ULONG OFFSET_BYTEORDERMARKER = 0x0000001c; static const ULONG OFFSET_BIGBLOCKSIZEBITS = 0x0000001e; static const ULONG OFFSET_SMALLBLOCKSIZEBITS = 0x00000020; +static const ULONG OFFSET_DIRSECTORCOUNT = 0x00000028; static const ULONG OFFSET_BBDEPOTCOUNT = 0x0000002C; static const ULONG OFFSET_ROOTSTARTBLOCK = 0x00000030; static const ULONG OFFSET_SMALLBLOCKLIMIT = 0x00000038;

1 0

Vincent Povirk : ole32: Remove the BigBlockFile abstraction and always use an ILockBytes.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 14f8f9d5b56ee569ea50e72dc7911b785089539c URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f8f9d5b56ee569ea50e72dc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jul 17 11:56:17 2010 -0500 ole32: Remove the BigBlockFile abstraction and always use an ILockBytes. --- dlls/ole32/Makefile.in | 2 +- dlls/ole32/{stg_bigblockfile.c => filelockbytes.c} | 298 ++++++++------------ dlls/ole32/storage32.c | 33 ++- dlls/ole32/storage32.h | 32 +-- 4 files changed, 144 insertions(+), 221 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14f8f9d5b56ee569ea50e…

1 0

Piotr Caban : wininet: Delete authorization data on unsucessful login.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 98fb747aa9a2d04cbb676ef6ee4a4e91fbad1a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98fb747aa9a2d04cbb676ef6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 17 14:08:11 2010 +0200 wininet: Delete authorization data on unsucessful login. --- dlls/wininet/http.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index fc6e351..57c4f75 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3621,6 +3621,12 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, break; } } + + if(!loop_next) { + TRACE("Cleaning wrong authorization data\n"); + destroy_authinfo(lpwhr->pAuthInfo); + lpwhr->pAuthInfo = NULL; + } } if (dwStatusCode == HTTP_STATUS_PROXY_AUTH_REQ) { @@ -3637,6 +3643,12 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, break; } } + + if(!loop_next) { + TRACE("Cleaning wrong proxy authorization data\n"); + destroy_authinfo(lpwhr->pProxyAuthInfo); + lpwhr->pProxyAuthInfo = NULL; + } } } }

1 0

Piotr Caban : msxml3: Improve bstr_from_xmlCharN implementation.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 7a22365674612122896ec5005406a45c25995de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a22365674612122896ec5005… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 17 14:06:53 2010 +0200 msxml3: Improve bstr_from_xmlCharN implementation. --- dlls/msxml3/saxreader.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index a09f4ea..5381d95 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -158,7 +158,6 @@ static int namespacePop(saxlocator *locator) static BSTR bstr_from_xmlCharN(const xmlChar *buf, int len) { DWORD dLen; - LPWSTR str; BSTR bstr; if (!buf) @@ -166,13 +165,11 @@ static BSTR bstr_from_xmlCharN(const xmlChar *buf, int len) dLen = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, NULL, 0); if(len != -1) dLen++; - str = heap_alloc(dLen * sizeof (WCHAR)); - if (!str) + bstr = SysAllocStringLen(NULL, dLen-1); + if (!bstr) return NULL; - MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, str, dLen); - if(len != -1) str[dLen-1] = '\0'; - bstr = SysAllocString(str); - heap_free(str); + MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, bstr, dLen); + if(len != -1) bstr[dLen-1] = '\0'; return bstr; }

1 0

Piotr Caban : msxml3: Improve QName_from_xmlChar implementation.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: bf263947e7eff1351e7b9bc6a43c7beb9b3746f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf263947e7eff1351e7b9bc6a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 17 14:06:27 2010 +0200 msxml3: Improve QName_from_xmlChar implementation. --- dlls/msxml3/saxreader.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index b81a47e..a09f4ea 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -180,7 +180,6 @@ static BSTR bstr_from_xmlCharN(const xmlChar *buf, int len) static BSTR QName_from_xmlChar(const xmlChar *prefix, const xmlChar *name) { DWORD dLen, dLast; - LPWSTR str; BSTR bstr; if(!name) return NULL; @@ -190,16 +189,13 @@ static BSTR QName_from_xmlChar(const xmlChar *prefix, const xmlChar *name) dLen = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)prefix, -1, NULL, 0) + MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, NULL, 0); - str = heap_alloc(dLen * sizeof(WCHAR)); - if(!str) + bstr = SysAllocStringLen(NULL, dLen-1); + if(!bstr) return NULL; - dLast = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)prefix, -1, str, dLen); - str[dLast-1] = ':'; - MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, &str[dLast], dLen-dLast); - bstr = SysAllocString(str); - - heap_free(str); + dLast = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)prefix, -1, bstr, dLen); + bstr[dLast-1] = ':'; + MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, &bstr[dLast], dLen-dLast); return bstr; }

1 0

Piotr Caban : wininet: Fix reporting errors in callbacks.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 3cfc7132be4709a199ed81bb883503a1715fea09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cfc7132be4709a199ed81bb8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 17 14:07:43 2010 +0200 wininet: Fix reporting errors in callbacks. --- dlls/wininet/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 54895bb..fc6e351 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3685,7 +3685,7 @@ lend: HTTP_ReceiveRequestData(lpwhr, TRUE); else { - iar.dwResult = 0; + iar.dwResult = (res==ERROR_SUCCESS ? (DWORD_PTR)lpwhr->hdr.hInternet : 0); iar.dwError = res; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, @@ -3769,7 +3769,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *lpwhr, DWORD dwFlags, DWORD_PT } } - iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet; + iar.dwResult = (res==ERROR_SUCCESS ? (DWORD_PTR)lpwhr->hdr.hInternet : 0); iar.dwError = res; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,

1 0

Jacek Caban : jscript: Fixed sort_cmp for non-string arguments.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: adb4e83eb286c085454f3d7e83016c10ca22b2b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb4e83eb286c085454f3d7e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 18 12:39:29 2010 +0200 jscript: Fixed sort_cmp for non-string arguments. --- dlls/jscript/array.c | 44 +++++++++++++++++++++++--------------------- dlls/jscript/tests/api.js | 21 +++++++++++++++++++++ 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 1268d59..5c1bf12 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -677,29 +677,31 @@ static HRESULT sort_cmp(script_ctx_t *ctx, DispatchEx *cmp_func, VARIANT *v1, VA *cmp = V_I4(&tmp); else *cmp = V_R8(&tmp) > 0.0 ? 1 : -1; - }else if(is_num_vt(V_VT(v1))) { - if(is_num_vt(V_VT(v2))) { - DOUBLE d = num_val(v1)-num_val(v2); - if(d > 0.0) - *cmp = 1; - else if(d < -0.0) - *cmp = -1; - else - *cmp = 0; - }else { - *cmp = -1; - } - }else if(is_num_vt(V_VT(v2))) { - *cmp = 1; - }else if(V_VT(v1) == VT_BSTR) { - if(V_VT(v2) == VT_BSTR) - *cmp = strcmpW(V_BSTR(v1), V_BSTR(v2)); + }else if(V_VT(v1) == VT_EMPTY) { + *cmp = V_VT(v2) == VT_EMPTY ? 0 : 1; + }else if(V_VT(v2) == VT_EMPTY) { + *cmp = -1; + }else if(is_num_vt(V_VT(v1)) && is_num_vt(V_VT(v2))) { + DOUBLE d = num_val(v1)-num_val(v2); + if(d > 0.0) + *cmp = 1; else - *cmp = -1; - }else if(V_VT(v2) == VT_BSTR) { - *cmp = 1; + *cmp = d < -0.0 ? -1 : 0; }else { - *cmp = 0; + BSTR x, y; + + hres = to_string(ctx, v1, ei, &x); + if(FAILED(hres)) + return hres; + + hres = to_string(ctx, v2, ei, &y); + if(SUCCEEDED(hres)) { + *cmp = strcmpW(x, y); + SysFreeString(y); + } + SysFreeString(x); + if(FAILED(hres)) + return hres; } return S_OK; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2ccad3d..e05e5bb 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -704,6 +704,27 @@ tmp = arr.sort(); ok(arr === tmp, "tmp !== arr"); ok(arr[0]===1 && arr[1]==="aa" && arr[2]===undefined, "arr is sorted incorectly"); +tmp = [["bb","aa"],["ab","aa"]].sort().toString(); +ok(tmp === "ab,aa,bb,aa", "sort() = " + tmp); + +tmp = [["bb","aa"],"ab"].sort().toString(); +ok(tmp === "ab,bb,aa", "sort() = " + tmp); + +tmp = [["bb","aa"],"cc"].sort().toString(); +ok(tmp === "bb,aa,cc", "sort() = " + tmp); + +tmp = [2,"1"].sort().toString(); +ok(tmp === "1,2", "sort() = " + tmp); + +tmp = ["2",1].sort().toString(); +ok(tmp === "1,2", "sort() = " + tmp); + +tmp = [,,0,"z"].sort().toString(); +ok(tmp === "0,z,,", "sort() = " + tmp); + +tmp = ["a,b",["a","a"],["a","c"]].sort().toString(); +ok(tmp === "a,a,a,b,a,c", "sort() = " + tmp); + arr = ["1", "2", "3"]; arr.length = 1; ok(arr.length === 1, "arr.length = " + arr.length);

1 0

Vincent Povirk : shell32: Don' t access szFullPath when SHGFI_PIDL is set in SHGetFileInfo.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 537bfbf4946837ce8739b5722c22f0d45abceacf URL: http://source.winehq.org/git/wine.git/?a=commit;h=537bfbf4946837ce8739b5722… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jul 16 15:36:30 2010 -0500 shell32: Don't access szFullPath when SHGFI_PIDL is set in SHGetFileInfo. --- dlls/shell32/shell32_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 2824268..75b9c7e 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -436,7 +436,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, /* get the displayname */ if (SUCCEEDED(hr) && (flags & SHGFI_DISPLAYNAME)) { - if (flags & SHGFI_USEFILEATTRIBUTES) + if (flags & SHGFI_USEFILEATTRIBUTES && !(flags & SHGFI_PIDL)) { lstrcpyW (psfi->szDisplayName, PathFindFileNameW(szFullPath)); } @@ -455,7 +455,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, static const WCHAR szFile[] = { 'F','i','l','e',0 }; static const WCHAR szDashFile[] = { '-','f','i','l','e',0 }; - if (!(flags & SHGFI_USEFILEATTRIBUTES)) + if (!(flags & SHGFI_USEFILEATTRIBUTES) || (flags & SHGFI_PIDL)) { char ftype[80]; @@ -508,7 +508,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, { UINT uDummy,uFlags; - if (flags & SHGFI_USEFILEATTRIBUTES) + if (flags & SHGFI_USEFILEATTRIBUTES && !(flags & SHGFI_PIDL)) { if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {

1 0

Jacek Caban : mshtml: Added implementation of remaining IHTMLRect getters.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: f2361112bad88e8807815c4755fffe35d3e8e71d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2361112bad88e8807815c475… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 13:31:15 2010 +0200 mshtml: Added implementation of remaining IHTMLRect getters. --- dlls/mshtml/htmlelem2.c | 45 +++++++++++++++++++++++++++++++++++++++------ dlls/mshtml/tests/dom.c | 15 +++++++++++++++ 2 files changed, 54 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 251763f..0c20723 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -138,8 +138,19 @@ static HRESULT WINAPI HTMLRect_put_left(IHTMLRect *iface, LONG v) static HRESULT WINAPI HTMLRect_get_left(IHTMLRect *iface, LONG *p) { HTMLRect *This = HTMLRECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + float left; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMClientRect_GetLeft(This->nsrect, &left); + if(NS_FAILED(nsres)) { + ERR("GetLeft failed: %08x\n", nsres); + return E_FAIL; + } + + *p = floor(left+0.5); + return S_OK; } static HRESULT WINAPI HTMLRect_put_top(IHTMLRect *iface, LONG v) @@ -177,8 +188,19 @@ static HRESULT WINAPI HTMLRect_put_right(IHTMLRect *iface, LONG v) static HRESULT WINAPI HTMLRect_get_right(IHTMLRect *iface, LONG *p) { HTMLRect *This = HTMLRECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + float right; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMClientRect_GetRight(This->nsrect, &right); + if(NS_FAILED(nsres)) { + ERR("GetRight failed: %08x\n", nsres); + return E_FAIL; + } + + *p = floor(right+0.5); + return S_OK; } static HRESULT WINAPI HTMLRect_put_bottom(IHTMLRect *iface, LONG v) @@ -191,8 +213,19 @@ static HRESULT WINAPI HTMLRect_put_bottom(IHTMLRect *iface, LONG v) static HRESULT WINAPI HTMLRect_get_bottom(IHTMLRect *iface, LONG *p) { HTMLRect *This = HTMLRECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + float bottom; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMClientRect_GetBottom(This->nsrect, &bottom); + if(NS_FAILED(nsres)) { + ERR("GetBottom failed: %08x\n", nsres); + return E_FAIL; + } + + *p = floor(bottom+0.5); + return S_OK; } #undef HTMLRECT_THIS diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index fa3763c..b19822e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2875,6 +2875,21 @@ static void test_elem_bounding_client_rect(IUnknown *unk) ok(hres == S_OK, "get_top failed: %08x\n", hres); ok(l != 0xdeadbeef, "l = 0xdeadbeef\n"); + l = 0xdeadbeef; + hres = IHTMLRect_get_left(rect, &l); + ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(l != 0xdeadbeef, "l = 0xdeadbeef\n"); + + l = 0xdeadbeef; + hres = IHTMLRect_get_bottom(rect, &l); + ok(hres == S_OK, "get_bottom failed: %08x\n", hres); + ok(l != 0xdeadbeef, "l = 0xdeadbeef\n"); + + l = 0xdeadbeef; + hres = IHTMLRect_get_right(rect, &l); + ok(hres == S_OK, "get_right failed: %08x\n", hres); + ok(l != 0xdeadbeef, "l = 0xdeadbeef\n"); + IHTMLRect_Release(rect); }

1 0

Jacek Caban : mshtml: Added IHTMLDocument3::detachEvent implementation.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 4890eb5775b388d31ab00393f8707d98749a3144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4890eb5775b388d31ab00393f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 13:31:43 2010 +0200 mshtml: Added IHTMLDocument3::detachEvent implementation. --- dlls/mshtml/htmldoc3.c | 6 +++- dlls/mshtml/tests/events.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index f4ea096..8d135ff 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -189,8 +189,10 @@ static HRESULT WINAPI HTMLDocument3_detachEvent(IHTMLDocument3 *iface, BSTR even IDispatch *pDisp) { HTMLDocument *This = HTMLDOC3_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(event), pDisp); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(event), pDisp); + + return detach_event(This->doc_node->node.event_target, This, event, pDisp); } static HRESULT WINAPI HTMLDocument3_put_onrowsdelete(IHTMLDocument3 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index deafd54..7d69dd5 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -59,6 +59,7 @@ DEFINE_EXPECT(document_onclick); DEFINE_EXPECT(body_onclick); +DEFINE_EXPECT(doc_onclick_attached); DEFINE_EXPECT(div_onclick); DEFINE_EXPECT(div_onclick_attached); DEFINE_EXPECT(timeout); @@ -662,6 +663,36 @@ static void _elem_detach_event(unsigned line, IUnknown *unk, const char *namea, ok_(__FILE__,line)(hres == S_OK, "detachEvent failed: %08x\n", hres); } +#define doc_attach_event(a,b,c) _doc_attach_event(__LINE__,a,b,c) +static void _doc_attach_event(unsigned line, IHTMLDocument2 *doc, const char *namea, IDispatch *disp) +{ + IHTMLDocument3 *doc3 = _get_doc3_iface(line, (IUnknown*)doc); + VARIANT_BOOL res; + BSTR name; + HRESULT hres; + + name = a2bstr(namea); + hres = IHTMLDocument3_attachEvent(doc3, name, disp, &res); + IHTMLDocument3_Release(doc3); + SysFreeString(name); + ok_(__FILE__,line)(hres == S_OK, "attachEvent failed: %08x\n", hres); + ok_(__FILE__,line)(res == VARIANT_TRUE, "attachEvent returned %x\n", res); +} + +#define doc_detach_event(a,b,c) _doc_detach_event(__LINE__,a,b,c) +static void _doc_detach_event(unsigned line, IHTMLDocument2 *doc, const char *namea, IDispatch *disp) +{ + IHTMLDocument3 *doc3 = _get_doc3_iface(line, (IUnknown*)doc); + BSTR name; + HRESULT hres; + + name = a2bstr(namea); + hres = IHTMLDocument3_detachEvent(doc3, name, disp); + IHTMLDocument3_Release(doc3); + SysFreeString(name); + ok_(__FILE__,line)(hres == S_OK, "detachEvent failed: %08x\n", hres); +} + static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -841,6 +872,18 @@ static HRESULT WINAPI div_onclick_attached(IDispatchEx *iface, DISPID id, LCID l EVENT_HANDLER_FUNC_OBJ(div_onclick_attached); +static HRESULT WINAPI doc_onclick_attached(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(doc_onclick_attached); + + test_attached_event_args(id, wFlags, pdp, pvarRes, pei); + test_event_src("DIV"); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(doc_onclick_attached); + static HRESULT WINAPI body_onclick(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1249,12 +1292,14 @@ static void test_onclick(IHTMLDocument2 *doc) cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, (IUnknown*)&doccp_obj); elem_attach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); + doc_attach_event(doc, "onclick", (IDispatch*)&doc_onclick_attached_obj); SET_EXPECT(div_onclick); SET_EXPECT(div_onclick_disp); SET_EXPECT(div_onclick_attached); SET_EXPECT(body_onclick); SET_EXPECT(document_onclick); + SET_EXPECT(doc_onclick_attached); SET_EXPECT(doccp_onclick); hres = IHTMLElement_click(div); @@ -1265,6 +1310,7 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(div_onclick_attached); CHECK_CALLED(body_onclick); CHECK_CALLED(document_onclick); + CHECK_CALLED(doc_onclick_attached); CHECK_CALLED(doccp_onclick); unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, cp_cookie); @@ -1280,6 +1326,7 @@ static void test_onclick(IHTMLDocument2 *doc) elem_detach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); elem_detach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); elem_detach_event((IUnknown*)div, "test", (IDispatch*)&div_onclick_disp); + doc_detach_event(doc, "onclick", (IDispatch*)&doc_onclick_attached_obj); SET_EXPECT(div_onclick_attached); SET_EXPECT(body_onclick);

1 0