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

Jacek Caban : mshtml: Added IHTMLElement2::get_scrollWidth implementation.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 925dbb58db2e38bec53318e52d3abf6cd213f8c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=925dbb58db2e38bec53318e52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 28 22:01:41 2008 +0200 mshtml: Added IHTMLElement2::get_scrollWidth implementation. --- dlls/mshtml/htmlelem2.c | 22 ++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 25 +++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 8085442..a1df1d6 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -738,8 +738,26 @@ static HRESULT WINAPI HTMLElement2_get_scrollHeight(IHTMLElement2 *iface, long * static HRESULT WINAPI HTMLElement2_get_scrollWidth(IHTMLElement2 *iface, long *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + PRInt32 width = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDOMNSHTMLElement_GetScrollWidth(nselem, &width); + nsIDOMNSHTMLElement_Release(nselem); + if(NS_FAILED(nsres)) + ERR("GetScrollWidth failed: %08x\n", nsres); + }else { + ERR("Could not get nsIDOMNSHTMLElement interface: %08x\n", nsres); + } + + *p = width; + TRACE("*p = %ld\n", *p); + + return S_OK; } static HRESULT WINAPI HTMLElement2_put_scrollTop(IHTMLElement2 *iface, long v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 18b2290..3a06d6a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -991,6 +991,29 @@ static long _elem_get_scroll_height(unsigned line, IUnknown *unk) return l; } +#define elem_get_scroll_width(u) _elem_get_scroll_width(__LINE__,u) +static long _elem_get_scroll_width(unsigned line, IUnknown *unk) +{ + IHTMLElement2 *elem = _get_elem2_iface(line, unk); + IHTMLTextContainer *txtcont; + long l = -1, l2 = -1; + HRESULT hres; + + hres = IHTMLElement2_get_scrollWidth(elem, &l); + ok_(__FILE__,line) (hres == S_OK, "get_scrollWidth failed: %08x\n", hres); + IHTMLElement2_Release(elem); + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLTextContainer, (void**)&txtcont); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLTextContainer: %08x\n", hres); + + hres = IHTMLTextContainer_get_scrollWidth(txtcont, &l2); + IHTMLTextContainer_Release(txtcont); + ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollWidth failed: %ld\n", l2); + ok_(__FILE__,line) (l == l2, "unexpected width %ld, expected %ld\n", l2, l); + + return l; +} + #define test_img_set_src(u,s) _test_img_set_src(__LINE__,u,s) static void _test_img_set_src(unsigned line, IUnknown *unk, const char *src) { @@ -1967,6 +1990,8 @@ static void test_default_body(IHTMLBodyElement *body) l = elem_get_scroll_height((IUnknown*)body); ok(l != -1, "scrollHeight == -1\n"); + l = elem_get_scroll_width((IUnknown*)body); + ok(l != -1, "scrollWidth == -1\n"); } static void test_window(IHTMLDocument2 *doc)

1 0

Jacek Caban : mshtml: Forward IHTMLTextContainer::get_scroll[Hight|Width] implementation to IHTMLElement2.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: e1a553e3283c3b1c888fa2f46496ac711aea09ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a553e3283c3b1c888fa2f46… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 28 22:02:01 2008 +0200 mshtml: Forward IHTMLTextContainer::get_scroll[Hight|Width] implementation to IHTMLElement2. --- dlls/mshtml/htmltextcont.c | 32 ++------------------------------ 1 files changed, 2 insertions(+), 30 deletions(-) diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c index f6f7c8b..c5141bc 100644 --- a/dlls/mshtml/htmltextcont.c +++ b/dlls/mshtml/htmltextcont.c @@ -101,47 +101,19 @@ static HRESULT WINAPI HTMLTextContainer_createControlRange(IHTMLTextContainer *i static HRESULT WINAPI HTMLTextContainer_get_scrollHeight(IHTMLTextContainer *iface, long *p) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - nsIDOMNSHTMLElement *nselem; - PRInt32 height = 0; - nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMElement_QueryInterface(This->element.nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); - if(NS_SUCCEEDED(nsres)) { - nsIDOMNSHTMLElement_GetScrollHeight(nselem, &height); - nsIDOMNSHTMLElement_Release(nselem); - }else { - ERR("Could not get nsIDOMNSHTMLElement interface: %08x\n", nsres); - } - - *p = height; - TRACE("*p = %ld\n", *p); - - return S_OK; + return IHTMLElement2_get_scrollHeight(HTMLELEM2(&This->element), p); } static HRESULT WINAPI HTMLTextContainer_get_scrollWidth(IHTMLTextContainer *iface, long *p) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - nsIDOMNSHTMLElement *nselem; - PRInt32 width = 0; - nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMElement_QueryInterface(This->element.nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); - if(NS_SUCCEEDED(nsres)) { - nsIDOMNSHTMLElement_GetScrollWidth(nselem, &width); - nsIDOMNSHTMLElement_Release(nselem); - }else { - ERR("Could not get nsIDOMNSHTMLElement interface: %08x\n", nsres); - } - - *p = width; - TRACE("*p = %ld\n", *p); - - return S_OK; + return IHTMLElement2_get_scrollWidth(HTMLELEM2(&This->element), p); } static HRESULT WINAPI HTMLTextContainer_put_scrollTop(IHTMLTextContainer *iface, long v)

1 0

Jacek Caban : mshtml: Added IHTMLElement2::get_scrollTop implementation.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 4d89c62eab07ec1830f28a0e994052e0e2bcc070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d89c62eab07ec1830f28a0e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 28 22:02:17 2008 +0200 mshtml: Added IHTMLElement2::get_scrollTop implementation. --- dlls/mshtml/htmlelem2.c | 22 ++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 16 ++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index a1df1d6..3455517 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -787,8 +787,26 @@ static HRESULT WINAPI HTMLElement2_put_scrollTop(IHTMLElement2 *iface, long v) static HRESULT WINAPI HTMLElement2_get_scrollTop(IHTMLElement2 *iface, long *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + PRInt32 top = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDOMNSHTMLElement_GetScrollTop(nselem, &top); + nsIDOMNSHTMLElement_Release(nselem); + if(NS_FAILED(nsres)) + ERR("GetScrollTop failed: %08x\n", nsres); + }else { + ERR("Could not get nsIDOMNSHTMLElement interface: %08x\n", nsres); + } + + *p = top; + TRACE("*p = %ld\n", *p); + + return S_OK; } static HRESULT WINAPI HTMLElement2_put_scrollLeft(IHTMLElement2 *iface, long v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3a06d6a..13fcfa2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1014,6 +1014,20 @@ static long _elem_get_scroll_width(unsigned line, IUnknown *unk) return l; } +#define elem_get_scroll_top(u) _elem_get_scroll_top(__LINE__,u) +static long _elem_get_scroll_top(unsigned line, IUnknown *unk) +{ + IHTMLElement2 *elem = _get_elem2_iface(line, unk); + long l = -1; + HRESULT hres; + + hres = IHTMLElement2_get_scrollTop(elem, &l); + ok_(__FILE__,line) (hres == S_OK, "get_scrollTop failed: %08x\n", hres); + IHTMLElement2_Release(elem); + + return l; +} + #define test_img_set_src(u,s) _test_img_set_src(__LINE__,u,s) static void _test_img_set_src(unsigned line, IUnknown *unk, const char *src) { @@ -1992,6 +2006,8 @@ static void test_default_body(IHTMLBodyElement *body) ok(l != -1, "scrollHeight == -1\n"); l = elem_get_scroll_width((IUnknown*)body); ok(l != -1, "scrollWidth == -1\n"); + l = elem_get_scroll_top((IUnknown*)body); + ok(!l, "scrollWidth = %ld\n", l); } static void test_window(IHTMLDocument2 *doc)

1 0

Jacek Caban : mshtml: Added IOmNavigator::get_platform implementation.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 158488fdc94b140c4b6530c6592a8347431946aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=158488fdc94b140c4b6530c65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 28 22:01:25 2008 +0200 mshtml: Added IOmNavigator::get_platform implementation. --- dlls/mshtml/omnavigator.c | 9 +++++++-- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 9c285b0..32bd9bf 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -237,8 +237,13 @@ static HRESULT WINAPI OmNavigator_get_userLanguage(IOmNavigator *iface, BSTR *p) static HRESULT WINAPI OmNavigator_get_platform(IOmNavigator *iface, BSTR *p) { OmNavigator *This = OMNAVIGATOR_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + static const WCHAR win32W[] = {'W','i','n','3','2',0}; + + TRACE("(%p)->(%p)\n", This, p); + + *p = SysAllocString(win32W); + return S_OK; } static HRESULT WINAPI OmNavigator_get_appMinorVersion(IOmNavigator *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f3e263e..18b2290 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1845,6 +1845,12 @@ static void test_navigator(IHTMLDocument2 *doc) ok(!strcmp_wa(bstr, "Mozilla"), "Unexpected appCodeName %s\n", dbgstr_w(bstr)); SysFreeString(bstr); + bstr = NULL; + hres = IOmNavigator_get_platform(navigator, &bstr); + ok(hres == S_OK, "get_appMinorVersion failed: %08x\n", hres); + ok(!strcmp_wa(bstr, "Win32"), "unexpected platform %s\n", dbgstr_w(bstr)); + SysFreeString(bstr); + ref = IOmNavigator_Release(navigator); ok(!ref, "navigator should be destroyed here\n"); }

1 0

Jacek Caban : mshtml: Added IHTMLElement2::get_scrollHeight implementation.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 7e345794235401ba42082a794033c90e7fad92df URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e345794235401ba42082a794… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 28 22:01:07 2008 +0200 mshtml: Added IHTMLElement2::get_scrollHeight implementation. --- dlls/mshtml/htmlelem2.c | 22 ++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 27 +++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 5d0443e..8085442 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -713,8 +713,26 @@ static HRESULT WINAPI HTMLElement2_createControlRange(IHTMLElement2 *iface, IDis static HRESULT WINAPI HTMLElement2_get_scrollHeight(IHTMLElement2 *iface, long *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + PRInt32 height = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDOMNSHTMLElement_GetScrollHeight(nselem, &height); + nsIDOMNSHTMLElement_Release(nselem); + if(NS_FAILED(nsres)) + ERR("GetScrollHeight failed: %08x\n", nsres); + }else { + ERR("Could not get nsIDOMNSHTMLElement interface: %08x\n", nsres); + } + + *p = height; + TRACE("*p = %ld\n", *p); + + return S_OK; } static HRESULT WINAPI HTMLElement2_get_scrollWidth(IHTMLElement2 *iface, long *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cb15187..f3e263e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -968,6 +968,29 @@ static long _get_node_type(unsigned line, IUnknown *unk) return type; } +#define elem_get_scroll_height(u) _elem_get_scroll_height(__LINE__,u) +static long _elem_get_scroll_height(unsigned line, IUnknown *unk) +{ + IHTMLElement2 *elem = _get_elem2_iface(line, unk); + IHTMLTextContainer *txtcont; + long l = -1, l2 = -1; + HRESULT hres; + + hres = IHTMLElement2_get_scrollHeight(elem, &l); + ok_(__FILE__,line) (hres == S_OK, "get_scrollHeight failed: %08x\n", hres); + IHTMLElement2_Release(elem); + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLTextContainer, (void**)&txtcont); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLTextContainer: %08x\n", hres); + + hres = IHTMLTextContainer_get_scrollHeight(txtcont, &l2); + IHTMLTextContainer_Release(txtcont); + ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollHeight failed: %ld\n", l2); + ok_(__FILE__,line) (l == l2, "unexpected height %ld, expected %ld\n", l2, l); + + return l; +} + #define test_img_set_src(u,s) _test_img_set_src(__LINE__,u,s) static void _test_img_set_src(unsigned line, IUnknown *unk, const char *src) { @@ -1927,6 +1950,7 @@ static void test_default_selection(IHTMLDocument2 *doc) static void test_default_body(IHTMLBodyElement *body) { + long l; BSTR bstr; HRESULT hres; @@ -1934,6 +1958,9 @@ static void test_default_body(IHTMLBodyElement *body) hres = IHTMLBodyElement_get_background(body, &bstr); ok(hres == S_OK, "get_background failed: %08x\n", hres); ok(bstr == NULL, "bstr != NULL\n"); + + l = elem_get_scroll_height((IUnknown*)body); + ok(l != -1, "scrollHeight == -1\n"); } static void test_window(IHTMLDocument2 *doc)

1 0

Zac Brown : include/winhttp.h: Add WINHTTP_TIME_FORMAT_BUFSIZE.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 72d201b03733e28e2b8e6891b18ae9e0af0c2ab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d201b03733e28e2b8e6891b… Author: Zac Brown <zac(a)zacbrown.org> Date: Mon Jul 28 10:26:07 2008 -0700 include/winhttp.h: Add WINHTTP_TIME_FORMAT_BUFSIZE. --- include/winhttp.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winhttp.h b/include/winhttp.h index dab9bba..4c64768 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -436,6 +436,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_AUTH_TARGET_SERVER 0x00000000 #define WINHTTP_AUTH_TARGET_PROXY 0x00000001 +#define WINHTTP_TIME_FORMAT_BUFSIZE 62 typedef struct {

1 0

Owen Rudge : shell32: Ensure status bar in control panel is reset when menu closed. Also reset to blank when item deselected.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 6d598150596318d7514ae2266f6509a61e3d4848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d598150596318d7514ae2266… Author: Owen Rudge <owen(a)owenrudge.net> Date: Mon Jul 28 16:15:46 2008 +0100 shell32: Ensure status bar in control panel is reset when menu closed. Also reset to blank when item deselected. --- dlls/shell32/control.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index a339dbc..aa5abfe 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -511,6 +511,8 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, if (item) SetWindowTextW(panel->hWndStatusBar, item->applet->info[item->id].szInfo); + else + SetWindowTextW(panel->hWndStatusBar, NULL); return 0; } @@ -533,6 +535,18 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, if (item) SetWindowTextW(panel->hWndStatusBar, item->applet->info[item->id].szInfo); } + else if ((HIWORD(lParam1) == 0xFFFF) && (lParam2 == 0)) + { + /* reset status bar description to that of the selected icon */ + CPlItem *item = Control_GetCPlItem_From_ListView(panel); + + if (item) + SetWindowTextW(panel->hWndStatusBar, item->applet->info[item->id].szInfo); + else + SetWindowTextW(panel->hWndStatusBar, NULL); + + return 0; + } else SetWindowTextW(panel->hWndStatusBar, NULL);

1 0

Owen Rudge : shell32: Fix descriptions being applied to wrong entries in control panel.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: ac78bfe18a2727a548bcdaed6e8bb7436007c6fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac78bfe18a2727a548bcdaed6… Author: Owen Rudge <owen(a)owenrudge.net> Date: Mon Jul 28 16:14:49 2008 +0100 shell32: Fix descriptions being applied to wrong entries in control panel. --- dlls/shell32/control.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 642e611..a339dbc 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -237,6 +237,7 @@ static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) LVITEMW lvItem; INITCOMMONCONTROLSEX icex; INT sb_parts; + int itemidx; SetWindowLongPtrW(hWnd, 0, (LONG_PTR)panel); panel->hWnd = hWnd; @@ -296,10 +297,10 @@ static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) lvItem.iImage = index; lvItem.lParam = (LPARAM) item; - ListView_InsertItemW(panel->hWndListView, &lvItem); + itemidx = ListView_InsertItemW(panel->hWndListView, &lvItem); /* add the description */ - ListView_SetItemTextW(panel->hWndListView, menucount, 1, + ListView_SetItemTextW(panel->hWndListView, itemidx, 1, applet->info[i].szInfo); /* update menu bar, increment count */

1 0

Aric Stewart : mlang: Japanese conversion tests.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: a4b636f10ab28732d39dfdf6f7489aa6cb4dbb11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b636f10ab28732d39dfdf6f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 28 10:35:06 2008 -0500 mlang: Japanese conversion tests. --- dlls/mlang/tests/mlang.c | 173 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 173 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 858d9fe..b5d77f7 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1111,6 +1111,177 @@ static void test_ConvertINetUnicodeToMultiByte(void) "Expected %u, got %u\n", lstrlenW(src) + 1, destsz); } +static void test_JapaneseConversion(void) +{ + /* Data */ + static WCHAR unc_jp[9][12] = { + {9,0x31,0x20,0x3042,0x3044,0x3046,0x3048,0x304a,0x000d,0x000a}, + {9,0x31,0x20,0x30a2,0x30a4,0x30a6,0x30a8,0x30aa,0x000d,0x000a}, + {9,0x31,0x20,0xff71,0xff72,0xff73,0xff74,0xff75,0x000d,0x000a}, + {9,0x31,0x20,0x3041,0x3043,0x3045,0x3047,0x3049,0x000d,0x000a}, + {9,0x31,0x20,0x30a1,0x30a3,0x30a5,0x30a7,0x30a9,0x000d,0x000a}, + {9,0x31,0x20,0xff67,0xff68,0xff69,0xff6a,0xff6b,0x000d,0x000a}, + {9,0x31,0x20,0x300c,0x65e5,0x672c,0x8a9e,0x300d,0x000d,0x000a}, + {7,0x31,0x20,0x25c7,0x25c7,0x3012,0x000d,0x000a}, + {11,0x31,0x20,0x203b,0x3010,0x0074,0x0065,0x0073,0x0074,0x3011,0x000d,0x000a} + }; + static CHAR jis_jp[9][27] = { + {20,0x31,0x20,0x1b,0x24,0x42,0x24,0x22,0x24,0x24,0x24,0x26,0x24,0x28, + 0x24,0x2a,0x1b,0x28,0x42,0x0d,0x0a}, + {20,0x31,0x20,0x1b,0x24,0x42,0x25,0x22,0x25,0x24,0x25,0x26,0x25,0x28,\ + 0x25,0x2a,0x1b,0x28,0x42,0x0d,0x0a}, + {20,0x31,0x20,0x1b,0x24,0x42,0x25,0x22,0x25,0x24,0x25,0x26,0x25,0x28,\ + 0x25,0x2a,0x1b,0x28,0x42,0x0d,0x0a}, + {20,0x31,0x20,0x1b,0x24,0x42,0x24,0x21,0x24,0x23,0x24,0x25,0x24,0x27,\ + 0x24,0x29,0x1b,0x28,0x42,0x0d,0x0a}, + {20,0x31,0x20,0x1b,0x24,0x42,0x25,0x21,0x25,0x23,0x25,0x25,0x25,0x27,\ + 0x25,0x29,0x1b,0x28,0x42,0x0d,0x0a}, + {20,0x31,0x20,0x1b,0x24,0x42,0x25,0x21,0x25,0x23,0x25,0x25,0x25,0x27,\ + 0x25,0x29,0x1b,0x28,0x42,0x0d,0x0a}, + {20,0x31,0x20,0x1b,0x24,0x42,0x21,0x56,0x46,0x7c,0x4b,0x5c,0x38,0x6c,\ + 0x21,0x57,0x1b,0x28,0x42,0x0d,0x0a}, + {16,0x31,0x20,0x1b,0x24,0x42,0x21,0x7e,0x21,0x7e,0x22,0x29,0x1b,0x28,\ + 0x42,0x0d,0x0a}, + {26,0x31,0x20,0x1b,0x24,0x42,0x22,0x28,0x21,0x5a,0x1b,0x28,0x42,0x74,\ + 0x65,0x73,0x74,0x1b,0x24,0x42,0x21,0x5b,0x1b,0x28,0x42,0x0d,0x0a} + }; + static CHAR sjis_jp[9][15] = { + {14,0x31,0x20,0x82,0xa0,0x82,0xa2,0x82,0xa4,0x82,0xa6,0x82,0xa8,0x0d,0x0a}, + {14,0x31,0x20,0x83,0x41,0x83,0x43,0x83,0x45,0x83,0x47,0x83,0x49,0x0d,0x0a}, + {9,0x31,0x20,0xb1,0xb2,0xb3,0xb4,0xb5,0x0d,0x0a}, + {14,0x31,0x20,0x82,0x9f,0x82,0xa1,0x82,0xa3,0x82,0xa5,0x82,0xa7,0x0d,0x0a}, + {14,0x31,0x20,0x83,0x40,0x83,0x42,0x83,0x44,0x83,0x46,0x83,0x48,0x0d,0x0a}, + {9,0x31,0x20,0xa7,0xa8,0xa9,0xaa,0xab,0x0d,0x0a}, + {14,0x31,0x20,0x81,0x75,0x93,0xfa,0x96,0x7b,0x8c,0xea,0x81,0x76,0x0d,0x0a}, + {10,0x31,0x20,0x81,0x9e,0x81,0x9e,0x81,0xa7,0x0d,0x0a}, + {14,0x31,0x20,0x81,0xa6,0x81,0x79,0x74,0x65,0x73,0x74,0x81,0x7a,0x0d,0x0a} + }; + static CHAR euc_jp[9][15] = { + {14,0x31,0x20,0xa4,0xa2,0xa4,0xa4,0xa4,0xa6,0xa4,0xa8,0xa4,0xaa,0x0d,0x0a}, + {14,0x31,0x20,0xa5,0xa2,0xa5,0xa4,0xa5,0xa6,0xa5,0xa8,0xa5,0xaa,0x0d,0x0a}, + {14,0x31,0x20,0x8e,0xb1,0x8e,0xb2,0x8e,0xb3,0x8e,0xb4,0x8e,0xb5,0x0d,0x0a}, + {14,0x31,0x20,0xa4,0xa1,0xa4,0xa3,0xa4,0xa5,0xa4,0xa7,0xa4,0xa9,0x0d,0x0a}, + {14,0x31,0x20,0xa5,0xa1,0xa5,0xa3,0xa5,0xa5,0xa5,0xa7,0xa5,0xa9,0x0d,0x0a}, + {14,0x31,0x20,0x8e,0xa7,0x8e,0xa8,0x8e,0xa9,0x8e,0xaa,0x8e,0xab,0x0d,0x0a}, + {14,0x31,0x20,0xa1,0xd6,0xc6,0xfc,0xcb,0xdc,0xb8,0xec,0xa1,0xd7,0x0d,0x0a}, + {10,0x31,0x20,0xa1,0xfe,0xa1,0xfe,0xa2,0xa9,0x0d,0x0a}, + {14,0x31,0x20,0xa2,0xa8,0xa1,0xda,0x74,0x65,0x73,0x74,0xa1,0xdb,0x0d,0x0a} + }; + + INT srcsz, destsz; + INT i; + HRESULT hr; + CHAR output[30]; + WCHAR outputW[30]; + int outlen; + + /* test unc->jis */ + for (i = 0; i < 9; i++) + { + int j; + destsz = 30; + outlen = jis_jp[i][0]; + srcsz = unc_jp[i][0]; + hr = pConvertINetUnicodeToMultiByte(NULL, 50220, &unc_jp[i][1], &srcsz, output, &destsz); + ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n", i, hr); + ok(destsz == outlen, "(%i) Expected %i, got %i\n",i,outlen,destsz); + ok(srcsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],srcsz); + ok(memcmp(output,&jis_jp[i][1],destsz)==0,"(%i) Strings do not match\n",i); + + /* and back */ + srcsz = outlen; + destsz = 30; + hr = pConvertINetMultiByteToUnicode(NULL, 50220, output, &srcsz, outputW,&destsz); + + /* + * JIS does not have hankata so it get automatically converted to + * zenkata. this means that strings 1 and 2 are identical as well as + * strings 4 and 5. + */ + j = i; + if (i == 2) j = 1; + if (i == 5) j = 4; + + ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i, hr); + ok(destsz == unc_jp[j][0],"(%i) Expected %i, got %i\n",i,unc_jp[j][0],destsz); + ok(srcsz == outlen,"(%i) Expected %i, got %i\n",i,outlen,srcsz); + ok(memcmp(outputW,&unc_jp[j][1],destsz)==0,"(%i) Strings do not match\n",i); + } + + /* test unc->sjis */ + for (i = 0; i < 9; i++) + { + destsz = 30; + outlen = sjis_jp[i][0]; + srcsz = unc_jp[i][0]; + + hr = pConvertINetUnicodeToMultiByte(NULL, 932, &unc_jp[i][1], &srcsz, output, &destsz); + ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr); + ok(destsz == outlen,"(%i) Expected %i, got %i\n",i,outlen,destsz); + ok(srcsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],srcsz); + ok(memcmp(output,&sjis_jp[i][1],outlen)==0,"(%i) Strings do not match\n",i); + + srcsz = outlen; + destsz = 30; + hr = pConvertINetMultiByteToUnicode(NULL, 932, output, &srcsz, outputW,&destsz); + + ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n", i, hr); + ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz); + ok(srcsz == outlen,"(%i) Expected %i, got %i\n",i,outlen,srcsz); + ok(memcmp(outputW,&unc_jp[i][1],destsz)==0,"(%i) Strings do not match\n",i); + } + + /* test unc->euc */ + for (i = 0; i < 9; i++) + { + destsz = 30; + outlen = euc_jp[i][0]; + srcsz = unc_jp[i][0]; + + hr = pConvertINetUnicodeToMultiByte(NULL, 51932, &unc_jp[i][1], &srcsz, output, &destsz); + ok(hr == S_OK, "(%i) Expected S_OK, got %08x\n",i,hr); + ok(destsz == outlen, "(%i) Expected %i, got %i\n",i,outlen,destsz); + ok(srcsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz); + ok(memcmp(output,&euc_jp[i][1],outlen)==0,"(%i) Strings do not match\n",i); + + srcsz = outlen; + destsz = 30; + hr = pConvertINetMultiByteToUnicode(NULL, 51932, output, &srcsz, outputW,&destsz); + + ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr); + ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz); + ok(srcsz == outlen,"(%i) Expected %i, got %i\n",i,outlen,srcsz); + ok(memcmp(outputW,&unc_jp[i][1],destsz)==0,"(%i) Strings do not match\n",i); + } + + /* Japanese autodetect */ + i = 0; + destsz = 30; + srcsz = jis_jp[i][0]; + hr = pConvertINetMultiByteToUnicode(NULL, 50932, &jis_jp[i][1], &srcsz, outputW, &destsz); + ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr); + ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz); + ok(srcsz == jis_jp[i][0],"(%i) Expected %i, got %i\n",i,jis_jp[i][0],srcsz); + ok(memcmp(outputW,&unc_jp[i][1],destsz)==0,"(%i) Strings do not match\n",i); + + i = 1; + destsz = 30; + srcsz = sjis_jp[i][0]; + hr = pConvertINetMultiByteToUnicode(NULL, 50932, &sjis_jp[i][1], &srcsz, outputW, &destsz); + ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr); + ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz); + ok(srcsz == sjis_jp[i][0],"(%i) Expected %i, got %i\n",i,sjis_jp[i][0],srcsz); + ok(memcmp(outputW,&unc_jp[i][1],destsz)==0,"(%i) Strings do not match\n",i); + + i = 2; + destsz = 30; + srcsz = euc_jp[i][0]; + hr = pConvertINetMultiByteToUnicode(NULL, 50932, &euc_jp[i][1], &srcsz, outputW, &destsz); ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr); + ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz); + ok(srcsz == euc_jp[i][0],"(%i) Expected %i, got %i\n",i,euc_jp[i][0],srcsz); + ok(memcmp(outputW,&unc_jp[i][1],destsz)==0,"(%i) Strings do not match\n",i); +} + START_TEST(mlang) { IMultiLanguage2 *iML2 = NULL; @@ -1158,6 +1329,8 @@ START_TEST(mlang) test_ConvertINetUnicodeToMultiByte(); + test_JapaneseConversion(); + ret = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, &IID_IMLangFontLink, (void **)&iMLFL);

1 0

Alistair Leslie-Hughes : msxml3: Format get_xml string to be more like msxml3.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 95660514d34709d89228ec849408f4205ea38f05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95660514d34709d89228ec849… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 26 21:06:41 2008 +1000 msxml3: Format get_xml string to be more like msxml3. --- dlls/msxml3/main.c | 8 +++++ dlls/msxml3/node.c | 67 ++++++++++++++++++++++++++++++++++++++++---- dlls/msxml3/tests/domdoc.c | 39 +++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 8c7d0d3..8a1496f 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -175,10 +175,18 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_PROCESS_ATTACH: #ifdef HAVE_LIBXML2 xmlInitParser(); + + /* Set the default indent character to a single tab. */ + xmlThrDefTreeIndentString("\t"); #endif #ifdef HAVE_XSLTINIT xsltInit(); #endif + +#ifdef HAVE_LIBXML2 + /* Set the current ident to the default */ + xmlTreeIndentString = "\t"; +#endif hInstance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 583e0e1..68bf881 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1039,6 +1039,59 @@ static HRESULT WINAPI xmlnode_put_dataType( return hr; } +static BSTR EnsureCorrectEOL(BSTR sInput) +{ + static const WCHAR SZ_RETURN[] = {'\n',0}; + static const WCHAR SZ_LINEFEED[] = {'\r',0}; + int nNum = 0; + BSTR sNew; + int nLen; + int i; + + nLen = lstrlenW(sInput); + /* Count line endings */ + for(i=0; i < nLen; i++) + { + if(sInput[i] == SZ_RETURN[0]) + nNum++; + } + + TRACE("len=%d, num=%d\n", nLen, nNum); + + /* Add linefeed as needed */ + if(nNum > 0) + { + int nPlace = 0; + sNew = SysAllocStringLen(NULL, nLen + nNum+1); + for(i=0; i < nLen; i++) + { + if(sInput[i] == SZ_RETURN[0]) + { + sNew[i+nPlace] = SZ_LINEFEED[0]; + nPlace++; + } + sNew[i+nPlace] = sInput[i]; + } + + SysFreeString(sInput); + } + else + { + sNew = sInput; + } + + TRACE("len %d\n", lstrlenW(sNew)); + + return sNew; +} + +/* + * We are trying to replicate the same behaviour as msxml by converting + * line endings to \r\n and using idents as \t. The problem is that msxml + * only formats nodes that have a line ending. Using libxml we cannot + * reproduce behaviour exactly. + * + */ static HRESULT WINAPI xmlnode_get_xml( IXMLDOMNode *iface, BSTR* xmlString) @@ -1047,7 +1100,7 @@ static HRESULT WINAPI xmlnode_get_xml( xmlBufferPtr pXmlBuf; int nSize; - TRACE("iface %p\n", iface); + TRACE("iface %p %d\n", iface, This->node->type); if(!xmlString) return E_INVALIDARG; @@ -1057,21 +1110,23 @@ static HRESULT WINAPI xmlnode_get_xml( pXmlBuf = xmlBufferCreate(); if(pXmlBuf) { - nSize = xmlNodeDump(pXmlBuf, This->node->doc, This->node, 0, 0); + nSize = xmlNodeDump(pXmlBuf, This->node->doc, This->node, 0, 1); if(nSize > 0) { const xmlChar *pContent; + BSTR bstrContent; /* Attribute Nodes return a space in front of their name */ pContent = xmlBufferContent(pXmlBuf); if( ((char*)pContent)[0] == ' ') - *xmlString = bstr_from_xmlChar(pContent+1); + bstrContent = bstr_from_xmlChar(pContent+1); else - *xmlString = bstr_from_xmlChar(pContent); - + bstrContent = bstr_from_xmlChar(pContent); - xmlBufferFree(pXmlBuf); + *xmlString = This->node->type == XML_ELEMENT_NODE ? EnsureCorrectEOL(bstrContent) : bstrContent; } + + xmlBufferFree(pXmlBuf); } /* Always returns a string. */ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1a2f85c..8d64804 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3419,6 +3419,44 @@ static void test_Namespaces(void) free_bstrs(); } +static void test_FormattingXML(void) +{ + IXMLDOMDocument2 *doc = NULL; + IXMLDOMElement *pElement; + VARIANT_BOOL bSucc; + HRESULT hr; + BSTR str; + static const CHAR szLinefeedXML[] = "<?xml version=\"1.0\"?>\n<Root>\n\t<Sub val=\"A\" />\n</Root>"; + static const CHAR szLinefeedRootXML[] = "<Root>\r\n\t<Sub val=\"A\"/>\r\n</Root>"; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc ); + if( hr != S_OK ) + return; + + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szLinefeedXML), &bSucc); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n"); + + if(bSucc == VARIANT_TRUE) + { + hr = IXMLDOMDocument2_get_documentElement(doc, &pElement); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMElement_get_xml(pElement, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_(szLinefeedRootXML) ), "incorrect element xml\n"); + SysFreeString(str); + + IXMLDOMElement_Release(pElement); + } + } + + IXMLDOMDocument2_Release(doc); + + free_bstrs(); +} + START_TEST(domdoc) { HRESULT r; @@ -3444,6 +3482,7 @@ START_TEST(domdoc) test_DocumentSaveToFile(); test_testTransforms(); test_Namespaces(); + test_FormattingXML(); CoUninitialize(); }

1 0