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

Jacek Caban : mshtml: Fixed handling escaped paths in is_gecko_path.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 46827308158ad290806c099d03fcc89db4644566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46827308158ad290806c099d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 14:14:48 2013 +0100 mshtml: Fixed handling escaped paths in is_gecko_path. --- dlls/mshtml/nsembed.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 7691849..1613fe8 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -29,6 +29,7 @@ #include "winreg.h" #include "ole2.h" #include "shlobj.h" +#include "shlwapi.h" #include "wine/debug.h" @@ -1106,12 +1107,14 @@ BOOL is_gecko_path(const char *path) if(!buf || strlenW(buf) < gecko_path_len) return FALSE; - buf[gecko_path_len] = 0; for(ptr = buf; *ptr; ptr++) { if(*ptr == '\\') *ptr = '/'; } + UrlUnescapeW(buf, NULL, NULL, URL_UNESCAPE_INPLACE); + buf[gecko_path_len] = 0; + ret = !strcmpiW(buf, gecko_path); heap_free(buf); return ret;

1 0

Piotr Caban : cmd: Fixed memory leak in WCMD_run_program.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 743a42b25907c410069a2730831ff4d844c32b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=743a42b25907c410069a27308… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 14:31:13 2013 +0100 cmd: Fixed memory leak in WCMD_run_program. --- programs/cmd/wcmdmain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ee64253..95f2995 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1213,6 +1213,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) Note: Launching internal wine processes cannot specify a full path to exe */ status = CreateProcessW(assumeInternal?NULL : thisDir, command, NULL, NULL, TRUE, 0, NULL, NULL, &st, &pe); + heap_free(st.lpReserved2); if ((opt_c || opt_k) && !opt_s && !status && GetLastError()==ERROR_FILE_NOT_FOUND && command[0]=='\"') { /* strip first and last quote WCHARacters and try again */

1 0

Piotr Caban : msvcrt: Fixed closing of FindFirstFile handle in build_expanded_argv.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: d622ffcba08f79631eecdb5f86cd2f04a0ddeab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d622ffcba08f79631eecdb5f8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 14:31:41 2013 +0100 msvcrt: Fixed closing of FindFirstFile handle in build_expanded_argv. --- dlls/msvcrt/data.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index b31e5f7..80e023a 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -431,7 +431,7 @@ static int build_expanded_argv(int *argc, char **argv) args_no++; size += len+path_len; }while(FindNextFileA(h, &data)); - CloseHandle(h); + FindClose(h); } if(!len) { @@ -528,7 +528,7 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) args_no++; size += len+path_len; }while(FindNextFileW(h, &data)); - CloseHandle(h); + FindClose(h); } if(!len) {

1 0

Jacek Caban : mshtml: Fixed 'adjacent' spelling.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 306cec23cb465632e67ade46c39cc2a92637dc26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=306cec23cb465632e67ade46c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 15:44:38 2013 +0100 mshtml: Fixed 'adjacent' spelling. --- dlls/mshtml/htmlelem2.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 16d5056..dc3ad7f 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -1116,7 +1116,7 @@ static HRESULT WINAPI HTMLElement2_get_oncontextmenu(IHTMLElement2 *iface, VARIA return E_NOTIMPL; } -static HRESULT WINAPI HTMLElement2_insertAdjecentElement(IHTMLElement2 *iface, BSTR where, +static HRESULT WINAPI HTMLElement2_insertAdjacentElement(IHTMLElement2 *iface, BSTR where, IHTMLElement *insertedElement, IHTMLElement **inserted) { HTMLElement *This = impl_from_IHTMLElement2(iface); @@ -1132,14 +1132,14 @@ static HRESULT WINAPI HTMLElement2_applyElement(IHTMLElement2 *iface, IHTMLEleme return E_NOTIMPL; } -static HRESULT WINAPI HTMLElement2_getAdjecentText(IHTMLElement2 *iface, BSTR where, BSTR *text) +static HRESULT WINAPI HTMLElement2_getAdjacentText(IHTMLElement2 *iface, BSTR where, BSTR *text) { HTMLElement *This = impl_from_IHTMLElement2(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_w(where), text); return E_NOTIMPL; } -static HRESULT WINAPI HTMLElement2_replaceAdjecentText(IHTMLElement2 *iface, BSTR where, +static HRESULT WINAPI HTMLElement2_replaceAdjacentText(IHTMLElement2 *iface, BSTR where, BSTR newText, BSTR *oldText) { HTMLElement *This = impl_from_IHTMLElement2(iface); @@ -1348,10 +1348,10 @@ static const IHTMLElement2Vtbl HTMLElement2Vtbl = { HTMLElement2_mergeAttributes, HTMLElement2_put_oncontextmenu, HTMLElement2_get_oncontextmenu, - HTMLElement2_insertAdjecentElement, + HTMLElement2_insertAdjacentElement, HTMLElement2_applyElement, - HTMLElement2_getAdjecentText, - HTMLElement2_replaceAdjecentText, + HTMLElement2_getAdjacentText, + HTMLElement2_replaceAdjacentText, HTMLElement2_get_canHandleChildren, HTMLElement2_addBehavior, HTMLElement2_removeBehavior,

1 0

Jacek Caban : mshtml: insert_adjacent_node clean up.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 6d55379f7a98c9149d4ed072a8f654dd20c0f8c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d55379f7a98c9149d4ed072a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 15:44:48 2013 +0100 mshtml: insert_adjacent_node clean up. --- dlls/mshtml/htmlelem.c | 105 +++++++++++++++++++++++++----------------------- 1 files changed, 55 insertions(+), 50 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 208493f..581669c 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1087,68 +1087,74 @@ static HRESULT WINAPI HTMLElement_get_outerText(IHTMLElement *iface, BSTR *p) return E_NOTIMPL; } -static HRESULT HTMLElement_InsertAdjacentNode(HTMLElement *This, BSTR where, nsIDOMNode *nsnode) +static HRESULT insert_adjacent_node(HTMLElement *This, const WCHAR *where, nsIDOMNode *nsnode) { - static const WCHAR wszBeforeBegin[] = {'b','e','f','o','r','e','B','e','g','i','n',0}; - static const WCHAR wszAfterBegin[] = {'a','f','t','e','r','B','e','g','i','n',0}; - static const WCHAR wszBeforeEnd[] = {'b','e','f','o','r','e','E','n','d',0}; - static const WCHAR wszAfterEnd[] = {'a','f','t','e','r','E','n','d',0}; + nsIDOMNode *ret_nsnode; nsresult nsres; + HRESULT hres = S_OK; - if (!strcmpiW(where, wszBeforeBegin)) - { - nsIDOMNode *unused; + static const WCHAR beforebeginW[] = {'b','e','f','o','r','e','b','e','g','i','n',0}; + static const WCHAR afterbeginW[] = {'a','f','t','e','r','b','e','g','i','n',0}; + static const WCHAR beforeendW[] = {'b','e','f','o','r','e','e','n','d',0}; + static const WCHAR afterendW[] = {'a','f','t','e','r','e','n','d',0}; + + if (!strcmpiW(where, beforebeginW)) { nsIDOMNode *parent; + nsres = nsIDOMNode_GetParentNode(This->node.nsnode, &parent); - if (!parent) return E_INVALIDARG; - nsres = nsIDOMNode_InsertBefore(parent, nsnode, This->node.nsnode, &unused); - if (unused) nsIDOMNode_Release(unused); + if(NS_FAILED(nsres)) + return E_FAIL; + + if(!parent) + return E_INVALIDARG; + + nsres = nsIDOMNode_InsertBefore(parent, nsnode, This->node.nsnode, &ret_nsnode); nsIDOMNode_Release(parent); - } - else if (!strcmpiW(where, wszAfterBegin)) - { - nsIDOMNode *unused; + }else if(!strcmpiW(where, afterbeginW)) { nsIDOMNode *first_child; - nsIDOMNode_GetFirstChild(This->node.nsnode, &first_child); - nsres = nsIDOMNode_InsertBefore(This->node.nsnode, nsnode, first_child, &unused); - if (unused) nsIDOMNode_Release(unused); - if (first_child) nsIDOMNode_Release(first_child); - } - else if (!strcmpiW(where, wszBeforeEnd)) - { - nsIDOMNode *unused; - nsres = nsIDOMNode_AppendChild(This->node.nsnode, nsnode, &unused); - if (unused) nsIDOMNode_Release(unused); - } - else if (!strcmpiW(where, wszAfterEnd)) - { - nsIDOMNode *unused; - nsIDOMNode *next_sibling; - nsIDOMNode *parent; - nsIDOMNode_GetParentNode(This->node.nsnode, &parent); - if (!parent) return E_INVALIDARG; - - nsIDOMNode_GetNextSibling(This->node.nsnode, &next_sibling); - if (next_sibling) - { - nsres = nsIDOMNode_InsertBefore(parent, nsnode, next_sibling, &unused); - nsIDOMNode_Release(next_sibling); + + nsres = nsIDOMNode_GetFirstChild(This->node.nsnode, &first_child); + if(NS_FAILED(nsres)) + return E_FAIL; + + nsres = nsIDOMNode_InsertBefore(This->node.nsnode, nsnode, first_child, &ret_nsnode); + if(NS_FAILED(nsres)) + return E_FAIL; + + if (first_child) + nsIDOMNode_Release(first_child); + }else if (!strcmpiW(where, beforeendW)) { + nsres = nsIDOMNode_AppendChild(This->node.nsnode, nsnode, &ret_nsnode); + }else if (!strcmpiW(where, afterendW)) { + nsIDOMNode *next_sibling, *parent; + + nsres = nsIDOMNode_GetParentNode(This->node.nsnode, &parent); + if(NS_FAILED(nsres)) + return E_FAIL; + if(!parent) + return E_INVALIDARG; + + nsres = nsIDOMNode_GetNextSibling(This->node.nsnode, &next_sibling); + if(NS_SUCCEEDED(nsres)) { + if(next_sibling) { + nsres = nsIDOMNode_InsertBefore(parent, nsnode, next_sibling, &ret_nsnode); + nsIDOMNode_Release(next_sibling); + }else { + nsres = nsIDOMNode_AppendChild(parent, nsnode, &ret_nsnode); + } } - else - nsres = nsIDOMNode_AppendChild(parent, nsnode, &unused); + nsIDOMNode_Release(parent); - if (unused) nsIDOMNode_Release(unused); - } - else - { + }else { ERR("invalid where: %s\n", debugstr_w(where)); return E_INVALIDARG; } if (NS_FAILED(nsres)) return E_FAIL; - else - return S_OK; + + nsIDOMNode_Release(ret_nsnode); + return hres; } static HRESULT WINAPI HTMLElement_insertAdjacentHTML(IHTMLElement *iface, BSTR where, @@ -1188,9 +1194,8 @@ static HRESULT WINAPI HTMLElement_insertAdjacentHTML(IHTMLElement *iface, BSTR w return E_FAIL; } - hr = HTMLElement_InsertAdjacentNode(This, where, nsnode); + hr = insert_adjacent_node(This, where, nsnode); nsIDOMNode_Release(nsnode); - return hr; } @@ -1221,7 +1226,7 @@ static HRESULT WINAPI HTMLElement_insertAdjacentText(IHTMLElement *iface, BSTR w return E_FAIL; } - hr = HTMLElement_InsertAdjacentNode(This, where, nsnode); + hr = insert_adjacent_node(This, where, nsnode); nsIDOMNode_Release(nsnode); return hr;

1 0

Jacek Caban : mshtml: Added IHTMLElement2:: insertAdjacentElement implementation.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: e03de990ef3fef92ca57dbe89e1d7df00993cd25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e03de990ef3fef92ca57dbe89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 15:44:57 2013 +0100 mshtml: Added IHTMLElement2::insertAdjacentElement implementation. --- dlls/mshtml/htmlelem.c | 8 +++++--- dlls/mshtml/htmlelem2.c | 19 +++++++++++++++++-- dlls/mshtml/mshtml_private.h | 2 ++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 581669c..f0789f8 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1087,7 +1087,7 @@ static HRESULT WINAPI HTMLElement_get_outerText(IHTMLElement *iface, BSTR *p) return E_NOTIMPL; } -static HRESULT insert_adjacent_node(HTMLElement *This, const WCHAR *where, nsIDOMNode *nsnode) +HRESULT insert_adjacent_node(HTMLElement *This, const WCHAR *where, nsIDOMNode *nsnode, HTMLDOMNode **ret_node) { nsIDOMNode *ret_nsnode; nsresult nsres; @@ -1153,6 +1153,8 @@ static HRESULT insert_adjacent_node(HTMLElement *This, const WCHAR *where, nsIDO if (NS_FAILED(nsres)) return E_FAIL; + if(ret_node) + hres = get_node(This->node.doc, ret_nsnode, TRUE, ret_node); nsIDOMNode_Release(ret_nsnode); return hres; } @@ -1194,7 +1196,7 @@ static HRESULT WINAPI HTMLElement_insertAdjacentHTML(IHTMLElement *iface, BSTR w return E_FAIL; } - hr = insert_adjacent_node(This, where, nsnode); + hr = insert_adjacent_node(This, where, nsnode, NULL); nsIDOMNode_Release(nsnode); return hr; } @@ -1226,7 +1228,7 @@ static HRESULT WINAPI HTMLElement_insertAdjacentText(IHTMLElement *iface, BSTR w return E_FAIL; } - hr = insert_adjacent_node(This, where, nsnode); + hr = insert_adjacent_node(This, where, nsnode, NULL); nsIDOMNode_Release(nsnode); return hr; diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index dc3ad7f..24aaba5 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -1120,8 +1120,23 @@ static HRESULT WINAPI HTMLElement2_insertAdjacentElement(IHTMLElement2 *iface, B IHTMLElement *insertedElement, IHTMLElement **inserted) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(where), insertedElement, inserted); - return E_NOTIMPL; + HTMLDOMNode *ret_node; + HTMLElement *elem; + HRESULT hres; + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(where), insertedElement, inserted); + + elem = unsafe_impl_from_IHTMLElement(insertedElement); + if(!elem) + return E_INVALIDARG; + + hres = insert_adjacent_node(This, where, elem->node.nsnode, &ret_node); + if(FAILED(hres)) + return hres; + + hres = IHTMLDOMNode_QueryInterface(&ret_node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)inserted); + IHTMLDOMNode_Release(&ret_node->IHTMLDOMNode_iface); + return hres; } static HRESULT WINAPI HTMLElement2_applyElement(IHTMLElement2 *iface, IHTMLElement *apply, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index dab68d7..c515e6c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -831,6 +831,8 @@ void detach_ranges(HTMLDocumentNode*) DECLSPEC_HIDDEN; HRESULT get_node_text(HTMLDOMNode*,BSTR*) DECLSPEC_HIDDEN; HRESULT replace_node_by_html(nsIDOMHTMLDocument*,nsIDOMNode*,const WCHAR*) DECLSPEC_HIDDEN; +HRESULT insert_adjacent_node(HTMLElement*,const WCHAR*,nsIDOMNode*,HTMLDOMNode**) DECLSPEC_HIDDEN; + HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**) DECLSPEC_HIDDEN; HRESULT create_element(HTMLDocumentNode*,const WCHAR*,HTMLElement**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Added IHTMLElement2::insertAdjacentElement tests.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 4a6807038b9c9b290f71fb74d56ab6af4f998982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6807038b9c9b290f71fb74d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 15:45:07 2013 +0100 mshtml: Added IHTMLElement2::insertAdjacentElement tests. --- dlls/mshtml/tests/dom.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1ca7b87..913411c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4179,6 +4179,48 @@ static void test_create_img_elem(IHTMLDocument2 *doc) } } +#define insert_adjacent_elem(a,b,c) _insert_adjacent_elem(__LINE__,a,b,c) +static void _insert_adjacent_elem(unsigned line, IHTMLElement *parent, const char *where, IHTMLElement *elem) +{ + IHTMLElement2 *elem2 = _get_elem2_iface(line, (IUnknown*)parent); + IHTMLElement *ret_elem = NULL; + BSTR str = a2bstr(where); + HRESULT hres; + + hres = IHTMLElement2_insertAdjacentElement(elem2, str, elem, &ret_elem); + IHTMLElement2_Release(elem2); + SysFreeString(str); + ok_(__FILE__,line)(hres == S_OK, "insertAdjacentElement failed: %08x\n", hres); + ok_(__FILE__,line)(ret_elem == elem, "ret_elem != elem\n"); + IHTMLElement_Release(ret_elem); +} + +void test_insert_adjacent_elems(IHTMLDocument2 *doc, IHTMLElement *parent) +{ + IHTMLElement *elem, *elem2; + + static const elem_type_t br_br[] = {ET_BR, ET_BR}; + static const elem_type_t br_div_br[] = {ET_BR, ET_DIV, ET_BR}; + + elem = test_create_elem(doc, "BR"); + insert_adjacent_elem(parent, "BeforeEnd", elem); + IHTMLElement_Release(elem); + + test_elem_all((IUnknown*)parent, br_br, 1); + + elem = test_create_elem(doc, "BR"); + insert_adjacent_elem(parent, "beforeend", elem); + + test_elem_all((IUnknown*)parent, br_br, 2); + + elem2 = test_create_elem(doc, "DIV"); + insert_adjacent_elem(elem, "beforebegin", elem2); + IHTMLElement_Release(elem2); + IHTMLElement_Release(elem); + + test_elem_all((IUnknown*)parent, br_div_br, 3); +} + static IHTMLTxtRange *test_create_body_range(IHTMLDocument2 *doc) { IHTMLBodyElement *body; @@ -6405,6 +6447,9 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + test_elem_set_innerhtml((IUnknown*)div, ""); + test_insert_adjacent_elems(doc, div); + test_elem_set_innerhtml((IUnknown*)div, "<form id=\"form\"><input type=\"button\" /><div><input type=\"text\" /></div></textarea>"); elem = get_elem_by_id(doc, "form", TRUE);

1 0

Andrew Talbot : windowscodecs: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: e458665a42aec77e4d4560df712062c4c80a30fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e458665a42aec77e4d4560df7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 28 22:47:14 2013 +0000 windowscodecs: Avoid signed-unsigned integer comparisons. --- dlls/windowscodecs/converter.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 975730a..f0730d7 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -93,7 +93,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -160,7 +160,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -223,7 +223,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -283,7 +283,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -325,7 +325,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -378,7 +378,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -420,7 +420,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -468,7 +468,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -516,7 +516,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -564,7 +564,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -607,7 +607,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -655,7 +655,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; res = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); if (FAILED(res)) return res; @@ -674,7 +674,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; res = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); if (FAILED(res)) return res; @@ -696,7 +696,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -740,7 +740,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -838,7 +838,7 @@ static HRESULT copypixels_to_32bppPBGRA(struct FormatConverter *This, const WICR hr = copypixels_to_32bppBGRA(This, prc, cbStride, cbBufferSize, pbBuffer, source_format); if (SUCCEEDED(hr) && prc) { - UINT x, y; + INT x, y; for (y=0; y<prc->Height; y++) for (x=0; x<prc->Width; x++) @@ -879,7 +879,7 @@ static HRESULT copypixels_to_24bppBGR(struct FormatConverter *This, const WICRec if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -947,7 +947,7 @@ static HRESULT copypixels_to_24bppRGB(struct FormatConverter *This, const WICRec if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow;

1 0

Andrew Talbot : kernel32/tests: Do not assume the signedness of plain char.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 64c6c08e088d1d53d9f038d7167c6531f2ce365a URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c6c08e088d1d53d9f038d71… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 28 22:47:11 2013 +0000 kernel32/tests: Do not assume the signedness of plain char. --- dlls/kernel32/tests/codepage.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index c980348..36ea66d 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -285,7 +285,7 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) SetLastError(0xdeadbeef); ret = WideCharToMultiByte(1252, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); ok(ret == 1, "ret is %d\n", ret); - ok(mbc == -28, "mbc is %d\n", mbc); + ok(mbc == '\xe4', "mbc is %d\n", mbc); if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); @@ -301,7 +301,7 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) SetLastError(0xdeadbeef); ret = WideCharToMultiByte(1251, 0, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); ok(ret == 1, "ret is %d\n", ret); - ok(mbc == -16, "mbc is %d\n", mbc); + ok(mbc == '\xf0', "mbc is %d\n", mbc); if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); ok(GetLastError() == 0xdeadbeef || broken(GetLastError() == 0), /* win95 */

1 0

Nikolay Sivov : msxml3: Remove unneeded cast to xmlDocPtr.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: a935a44b441a586e4a8044fa5ad423b532349415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a935a44b441a586e4a8044fa5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 28 22:44:02 2013 +0400 msxml3: Remove unneeded cast to xmlDocPtr. --- dlls/msxml3/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 32e9591..67902bd 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -632,7 +632,7 @@ HRESULT xmldoc_remove_orphan(xmlDocPtr doc, xmlNodePtr node) static inline xmlDocPtr get_doc( domdoc *This ) { - return (xmlDocPtr)This->node.node; + return This->node.node->doc; } static HRESULT attach_xmldoc(domdoc *This, xmlDocPtr xml )

1 0