February 2011 - Wine-commits

Jacek Caban : mshtml: Fixed memory leak.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 650feb0380fa0fbe76262d3da04eaa44fd229c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=650feb0380fa0fbe76262d3da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 28 13:13:59 2011 +0100 mshtml: Fixed memory leak. --- dlls/mshtml/htmlform.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 0f77d28..e53dbc0 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -174,6 +174,7 @@ static HRESULT WINAPI HTMLFormElement_get_action(IHTMLFormElement *iface, BSTR * hres = E_FAIL; } + nsAString_Finish(&action_str); return hres; }

1 0

Jacek Caban : mshtml: Added support for canceling default event behavior.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 5055caa8fa7681be60875bd3e4432248501ada40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5055caa8fa7681be60875bd3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 28 13:14:17 2011 +0100 mshtml: Added support for canceling default event behavior. --- dlls/mshtml/htmlevent.c | 125 ++++++++++++++++++++++++++++++---------------- 1 files changed, 81 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5055caa8fa7681be60875…

1 0

Akihiro Sagawa : msvfw32: Add Japanese translation.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: ea27fd99e91a8d60059b44799c39920fee69e1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea27fd99e91a8d60059b44799… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 26 20:31:23 2011 +0900 msvfw32: Add Japanese translation. --- dlls/msvfw32/Makefile.in | 1 + dlls/msvfw32/msvfw32_Ja.rc | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in index abc684e..776982f 100644 --- a/dlls/msvfw32/Makefile.in +++ b/dlls/msvfw32/Makefile.in @@ -17,6 +17,7 @@ RC_SRCS = \ msvfw32_He.rc \ msvfw32_Hu.rc \ msvfw32_It.rc \ + msvfw32_Ja.rc \ msvfw32_Ko.rc \ msvfw32_Lt.rc \ msvfw32_Nl.rc \ diff --git a/dlls/msvfw32/msvfw32_Ja.rc b/dlls/msvfw32/msvfw32_Ja.rc new file mode 100644 index 0000000..24d1841 --- /dev/null +++ b/dlls/msvfw32/msvfw32_Ja.rc @@ -0,0 +1,50 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2011 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 "msvideo_private.h" +#pragma code_page(65001) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ビデオ圧縮" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",IDOK,129,2,49,14 + PUSHBUTTON "キャンセル",IDCANCEL,129,18,49,14 + + LTEXT "コンプレッサー(&C):",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "設定(&F)...",882,129,36,49,14 + PUSHBUTTON "情報(&A)...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "圧縮率(&Q):",886,9,34,80,8 + + CONTROL "キーフレーム(&K)",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "ごと",889,103,62,26,10 + + CONTROL "データレート(&D)",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/秒",896,102,78,26,10 +}

1 0

Jörg Höhle : mciwave: Fix a leak when Open fails (valgrind).
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 90da8b749ebe228fd75b20132a42e3568440fd27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90da8b749ebe228fd75b20132… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Feb 25 15:58:47 2011 +0100 mciwave: Fix a leak when Open fails (valgrind). --- dlls/mciwave/mciwave.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 1cf3556..9a62f8f 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -465,7 +465,7 @@ static LRESULT WAVE_mciOpenFile(WINE_MCIWAVE* wmw, LPCWSTR filename) fn = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(filename) + 1) * sizeof(WCHAR)); if (!fn) return MCIERR_OUT_OF_MEMORY; strcpyW(fn, filename); - HeapFree(GetProcessHeap(), 0, (void*)wmw->lpFileName); + HeapFree(GetProcessHeap(), 0, wmw->lpFileName); wmw->lpFileName = fn; if (strlenW(filename) > 0) { @@ -568,6 +568,8 @@ static LRESULT WAVE_mciOpen(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_P if (wmw->hFile != 0) mmioClose(wmw->hFile, 0); wmw->hFile = 0; + HeapFree(GetProcessHeap(), 0, wmw->lpFileName); + wmw->lpFileName = NULL; } return dwRet; } @@ -680,7 +682,7 @@ static DWORD WAVE_mciClose(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARM if (wmw->lpWaveFormat != &wmw->wfxRef) HeapFree(GetProcessHeap(), 0, wmw->lpWaveFormat); wmw->lpWaveFormat = &wmw->wfxRef; - HeapFree(GetProcessHeap(), 0, (void*)wmw->lpFileName); + HeapFree(GetProcessHeap(), 0, wmw->lpFileName); wmw->lpFileName = NULL; if ((dwFlags & MCI_NOTIFY) && lpParms) { @@ -1025,7 +1027,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt * we don't modify the wave part of an existing file (ie. we always erase an * existing content, we don't overwrite) */ - HeapFree(GetProcessHeap(), 0, (void*)wmw->lpFileName); + HeapFree(GetProcessHeap(), 0, wmw->lpFileName); dwRet = create_tmp_file(&wmw->hFile, (WCHAR**)&wmw->lpFileName); if (dwRet != 0) return dwRet;

1 0

Jacek Caban : jscript: Fixed corner cases in parseInt implementation.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 04e9b16c5be12233b8a46ea0cb8e1eb81c35fa84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e9b16c5be12233b8a46ea0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 28 13:11:48 2011 +0100 jscript: Fixed corner cases in parseInt implementation. --- dlls/jscript/global.c | 45 ++++++++++++++++++++++++++++----------------- dlls/jscript/tests/api.js | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index ebfc55c..edc8350 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -450,10 +450,10 @@ static INT char_to_int(WCHAR c) static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { + BOOL neg = FALSE, empty = TRUE; DOUBLE ret = 0.0; - INT radix=10, i; + INT radix=0, i; WCHAR *ptr; - BOOL neg = FALSE; BSTR str; HRESULT hres; @@ -467,11 +467,11 @@ static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, if(FAILED(hres)) return hres; - if(!radix) { - radix = 10; - }else if(radix < 2 || radix > 36) { + if(radix && (radix < 2 || radix > 36)) { WARN("radix %d out of range\n", radix); - return E_FAIL; + if(retv) + num_set_nan(retv); + return S_OK; } } @@ -489,20 +489,31 @@ static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, neg = TRUE; ptr++; break; - case '0': - ptr++; - if(*ptr == 'x' || *ptr == 'X') { - radix = 16; - ptr++; - } } - while(*ptr) { - i = char_to_int(*ptr++); - if(i > radix) - break; + if(!radix) { + if(*ptr == '0') { + if(ptr[1] == 'x' || ptr[1] == 'X') { + radix = 16; + ptr += 2; + }else { + radix = 8; + ptr++; + empty = FALSE; + } + }else { + radix = 10; + } + } - ret = ret*radix + i; + i = char_to_int(*ptr++); + if(i < radix) { + do { + ret = ret*radix + i; + i = char_to_int(*ptr++); + }while(i < radix); + }else if(empty) { + ret = ret_nan(); } SysFreeString(str); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 482d8b2..45d24b1 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -42,6 +42,48 @@ i = parseInt("123", 10, "test"); ok(i === 123, "parseInt('123', 10, 'test') = " + i); i = parseInt("11", "8"); ok(i === 9, "parseInt('11', '8') = " + i); +i = parseInt("010"); +ok(i === 8, "parseInt('010') = " + i); +i = parseInt(""); +ok(isNaN(i), "parseInt('') = " + i); +i = parseInt("0x"); +ok(isNaN(i), "parseInt('0x') = " + i); +i = parseInt("+"); +ok(isNaN(i), "parseInt('+') = " + i); +i = parseInt("-"); +ok(isNaN(i), "parseInt('-') = " + i); +i = parseInt("0x10", 11); +ok(i === 0, "parseInt('0x10', 11) = " + i); +i = parseInt("010", 7); +ok(i === 7, "parseInt('010', 7) = " + i); +i = parseInt("123abc"); +ok(i === 123, "parseInt('123abc') = " + i); +i = parseInt(" \t123abc"); +ok(i === 123, "parseInt(' \\t123abc') = " + i); +i = parseInt("abc"); +ok(isNaN(i), "parseInt('123abc') = " + i); +i = parseInt("-12", 11); +ok(i === -13, "parseInt('-12') = " + i); +i = parseInt("-0x10"); +ok(i === -16, "parseInt('-0x10') = " + i); +i = parseInt("-010"); +ok(i === -8, "parseInt('-010') = " + i); +i = parseInt("123", 0); +ok(i === 123, "parseInt('123', 0) = " + i); +i = parseInt("0x10", 0); +ok(i === 16, "parseInt('123', 0) = " + i); +i = parseInt("0x10", 10); +ok(i === 0, "parseInt('0x10', 10) = " + i); +i = parseInt("0xz"); +ok(isNaN(i), "parseInt('0xz') = " + i); +i = parseInt("1", 1); +ok(isNaN(i), "parseInt('1', 1) = " + i); +i = parseInt("1", -1); +ok(isNaN(i), "parseInt('1', -1) = " + i); +i = parseInt("1", 37); +ok(isNaN(i), "parseInt('1', 37) = " + i); +i = parseInt("1", 36); +ok(i === 1, "parseInt('1', 36) = " + i); tmp = encodeURI("abc"); ok(tmp === "abc", "encodeURI('abc') = " + tmp);

1 0

Alexandre Julliard : winedbg: Support setting a breakpoint from a file name and line number.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 35d5c07538940a846b4d895261213a75f05acca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d5c07538940a846b4d89526… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 28 14:04:20 2011 +0100 winedbg: Support setting a breakpoint from a file name and line number. --- programs/winedbg/break.c | 21 ++++++++++++--------- programs/winedbg/dbg.y | 12 ++++++------ programs/winedbg/debug.l | 4 ++-- programs/winedbg/debugger.h | 2 +- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index b8627b6..debc0c7 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -292,7 +292,7 @@ static BOOL CALLBACK line_cb(SRCCODEINFO* sci, void* user) * * Add a breakpoint from a line number in current file */ -void break_add_break_from_lineno(int lineno, BOOL swbp) +void break_add_break_from_lineno(const char *filename, int lineno, BOOL swbp) { struct cb_break_lineno bkln; @@ -301,20 +301,23 @@ void break_add_break_from_lineno(int lineno, BOOL swbp) if (lineno != -1) { IMAGEHLP_LINE64 il; - - - DWORD disp; DWORD_PTR linear = (DWORD_PTR)memory_to_linear_addr(&bkln.addr); - il.SizeOfStruct = sizeof(il); - if (!SymGetLineFromAddr64(dbg_curr_process->handle, linear, &disp, &il)) + if (!filename) { - dbg_printf("Unable to add breakpoint (unknown address %lx)\n", linear); - return; + DWORD disp; + + il.SizeOfStruct = sizeof(il); + if (!SymGetLineFromAddr64(dbg_curr_process->handle, linear, &disp, &il)) + { + dbg_printf("Unable to add breakpoint (unknown address %lx)\n", linear); + return; + } + filename = il.FileName; } bkln.addr.Offset = 0; bkln.lineno = lineno; - SymEnumLines(dbg_curr_process->handle, linear, NULL, il.FileName, line_cb, &bkln); + SymEnumLines(dbg_curr_process->handle, linear, NULL, filename, line_cb, &bkln); if (!bkln.addr.Offset) { dbg_printf("Unknown line number\n" diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 7c92565..c7e2c3b 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -233,14 +233,14 @@ print_command: break_command: tBREAK '*' expr_lvalue { break_add_break_from_lvalue(&$3, TRUE); } | tBREAK identifier { break_add_break_from_id($2, -1, TRUE); } - | tBREAK identifier ':' tNUM { break_add_break_from_id($2, $4, TRUE); } - | tBREAK tNUM { break_add_break_from_lineno($2, TRUE); } - | tBREAK { break_add_break_from_lineno(-1, TRUE); } + | tBREAK pathname ':' tNUM { break_add_break_from_lineno($2, $4, TRUE); } + | tBREAK tNUM { break_add_break_from_lineno(NULL, $2, TRUE); } + | tBREAK { break_add_break_from_lineno(NULL, -1, TRUE); } | tHBREAK '*' expr_lvalue { break_add_break_from_lvalue(&$3, FALSE); } | tHBREAK identifier { break_add_break_from_id($2, -1, FALSE); } - | tHBREAK identifier ':' tNUM { break_add_break_from_id($2, $4, FALSE); } - | tHBREAK tNUM { break_add_break_from_lineno($2, FALSE); } - | tHBREAK { break_add_break_from_lineno(-1, FALSE); } + | tHBREAK pathname ':' tNUM { break_add_break_from_lineno($2, $4, FALSE); } + | tHBREAK tNUM { break_add_break_from_lineno(NULL, $2, FALSE); } + | tHBREAK { break_add_break_from_lineno(NULL, -1, FALSE); } | tENABLE tNUM { break_enable_xpoint($2, TRUE); } | tENABLE tBREAK tNUM { break_enable_xpoint($3, TRUE); } | tDISABLE tNUM { break_enable_xpoint($2, FALSE); } diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index bdacb78..41db76c 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -200,8 +200,8 @@ STRING \"[^\n"]+\" <INITIAL,NOPROCESS>source|sourc|sour|src { BEGIN(PATH_EXPECTED); return tSOURCE; } <INITIAL>symbolfile|symbols|symbol|sf { BEGIN(PATH_EXPECTED); return tSYMBOLFILE; } -<INITIAL,INFO_CMD,BD_CMD>break|brea|bre|br|b { BEGIN(NOCMD); return tBREAK; } -<INITIAL,INFO_CMD,BD_CMD>hbreak|hbrea|hbre|hbr|hb { BEGIN(NOCMD); return tHBREAK; } +<INITIAL,INFO_CMD,BD_CMD>break|brea|bre|br|b { BEGIN(PATH_ACCEPTED); return tBREAK; } +<INITIAL,INFO_CMD,BD_CMD>hbreak|hbrea|hbre|hbr|hb { BEGIN(PATH_ACCEPTED); return tHBREAK; } <INITIAL>watch|watc|wat { BEGIN(NOCMD); return tWATCH; } <INITIAL>rwatch|rwatc|rwat { BEGIN(NOCMD); return tRWATCH; } <INITIAL>whatis|whati|what { BEGIN(NOCMD); return tWHATIS; } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 5be0943..529191f 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -293,7 +293,7 @@ extern void break_set_xpoints(BOOL set); extern BOOL break_add_break(const ADDRESS64* addr, BOOL verbose, BOOL swbp); extern BOOL break_add_break_from_lvalue(const struct dbg_lvalue* value, BOOL swbp); extern void break_add_break_from_id(const char* name, int lineno, BOOL swbp); -extern void break_add_break_from_lineno(int lineno, BOOL swbp); +extern void break_add_break_from_lineno(const char *filename, int lineno, BOOL swbp); extern void break_add_watch_from_lvalue(const struct dbg_lvalue* lvalue, BOOL is_write); extern void break_add_watch_from_id(const char* name, BOOL is_write); extern void break_check_delayed_bp(void);

1 0

Jacek Caban : mshtml: Fixed typos in IHTMLInputElement::value tests.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 624287499e6f9b3b9962e36498a3e0c128cc5247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=624287499e6f9b3b9962e3649… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 28 13:12:22 2011 +0100 mshtml: Fixed typos in IHTMLInputElement::value tests. --- dlls/mshtml/htmlinput.c | 14 +------------- dlls/mshtml/tests/dom.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 66a6d94..0775436 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -178,25 +178,13 @@ static HRESULT WINAPI HTMLInputElement_get_value(IHTMLInputElement *iface, BSTR { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); nsAString value_str; - const PRUnichar *value = NULL; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); nsAString_Init(&value_str, NULL); - nsres = nsIDOMHTMLInputElement_GetValue(This->nsinput, &value_str); - if(NS_SUCCEEDED(nsres)) { - nsAString_GetData(&value_str, &value); - *p = SysAllocString(value); - }else { - ERR("GetValue failed: %08x\n", nsres); - } - - nsAString_Finish(&value_str); - - TRACE("value=%s\n", debugstr_w(*p)); - return S_OK; + return return_nsstr(nsres, &value_str, p); } static HRESULT WINAPI HTMLInputElement_put_name(IHTMLInputElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7d6a476..af1b991 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -414,6 +414,9 @@ static BSTR a2bstr(const char *str) BSTR ret; int len; + if(!str) + return NULL; + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); ret = SysAllocStringLen(NULL, len); MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); @@ -2306,7 +2309,7 @@ static void _test_input_value(unsigned line, IUnknown *unk, const char *exval) if(exval) ok_(__FILE__,line) (!strcmp_wa(bstr, exval), "value=%s\n", wine_dbgstr_w(bstr)); else - ok_(__FILE__,line) (!exval, "exval != NULL\n"); + ok_(__FILE__,line) (!bstr, "exval != NULL\n"); SysFreeString(bstr); IHTMLInputElement_Release(input); } @@ -2324,10 +2327,12 @@ static void _test_input_put_value(unsigned line, IUnknown *unk, const char *val) return; bstr = a2bstr(val); - hres = IHTMLInputElement_get_value(input, &bstr); + hres = IHTMLInputElement_put_value(input, bstr); ok_(__FILE__,line) (hres == S_OK, "get_value failed: %08x\n", hres); SysFreeString(bstr); IHTMLInputElement_Release(input); + + _test_input_value(line, unk, val); } #define test_input_src(i,s) _test_input_src(__LINE__,i,s) @@ -3101,6 +3106,7 @@ static void _test_border_styles(unsigned line, IHTMLStyle *pStyle, BSTR Name) hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, &params, &ret, NULL, NULL); ok_(__FILE__,line) (hres == S_OK, "default. ret: %08x\n", hres); + VariantClear(&vDefault); } } @@ -6427,7 +6433,6 @@ static void test_elems(IHTMLDocument2 *doc) test_node_get_value_str((IUnknown*)elem, NULL); test_input_value((IUnknown*)elem, NULL); test_input_put_value((IUnknown*)elem, "test"); - test_input_value((IUnknown*)elem, NULL); test_elem_class((IUnknown*)elem, "testclass"); test_elem_tabindex((IUnknown*)elem, 2); test_elem_set_tabindex((IUnknown*)elem, 3);

1 0

Jacek Caban : mshtml: Store style filter in HTMLStyle object.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 0131e0472fbc91a3b803951289247f180f331e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0131e0472fbc91a3b80395128… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 28 13:12:50 2011 +0100 mshtml: Store style filter in HTMLStyle object. --- dlls/mshtml/htmlstyle.c | 28 +++++++++++++++++++++----- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index dffc39e..5bd69b1 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -633,6 +633,7 @@ static ULONG WINAPI HTMLStyle_Release(IHTMLStyle *iface) if(!ref) { if(This->nsstyle) nsIDOMCSSStyleDeclaration_Release(This->nsstyle); + heap_free(This->filter); release_dispex(&This->dispex); heap_free(This); } @@ -2547,21 +2548,36 @@ static HRESULT WINAPI HTMLStyle_get_clip(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_filter(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); + WCHAR *new_filter = NULL; - WARN("(%p)->(%s)\n", This, debugstr_w(v)); + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(v) { + new_filter = heap_strdupW(v); + if(!new_filter) + return E_OUTOFMEMORY; + } - /* FIXME: Handle MS-style filters */ - return set_style_attr(This, STYLEID_FILTER, v, 0); + heap_free(This->filter); + This->filter = new_filter; + return S_OK; } static HRESULT WINAPI HTMLStyle_get_filter(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - WARN("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); + + if(This->filter) { + *p = SysAllocString(This->filter); + if(!*p) + return E_OUTOFMEMORY; + }else { + *p = NULL; + } - /* FIXME: Handle MS-style filters */ - return get_style_attr(This, STYLEID_FILTER, p); + return S_OK; } static HRESULT WINAPI HTMLStyle_setAttribute(IHTMLStyle *iface, BSTR strAttributeName, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 6731584..9d2be65 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -26,6 +26,7 @@ struct HTMLStyle { LONG ref; nsIDOMCSSStyleDeclaration *nsstyle; + WCHAR *filter; }; /* NOTE: Make sure to keep in sync with style_tbl in htmlstyle.c */ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index af1b991..b23f63c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5569,6 +5569,53 @@ static void test_default_style(IHTMLStyle *style) } } +#define test_style_filter(a,b) _test_style_filter(__LINE__,a,b) +static void _test_style_filter(unsigned line, IHTMLStyle *style, const char *exval) +{ + BSTR str; + HRESULT hres; + + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_filter(style, &str); + ok_(__FILE__,line)(hres == S_OK, "get_filter failed: %08x\n", hres); + if(exval) + ok_(__FILE__,line)(str && !strcmp_wa(str, exval), "filter = %s, expected %s\n", wine_dbgstr_w(str), exval); + else + ok_(__FILE__,line)(!str, "str = %s, expected NULL\n", wine_dbgstr_w(str)); + + SysFreeString(str); +} + +#define set_style_filter(a,b) _set_style_filter(__LINE__,a,b) +static void _set_style_filter(unsigned line, IHTMLStyle *style, const char *val) +{ + BSTR str = a2bstr(val); + HRESULT hres; + + hres = IHTMLStyle_put_filter(style, str); + ok_(__FILE__,line)(hres == S_OK, "put_filter failed: %08x\n", hres); + SysFreeString(str); + + _test_style_filter(line, style, val); +} + +static void test_style_filters(IHTMLElement *elem) +{ + IHTMLStyle *style; + HRESULT hres; + + hres = IHTMLElement_get_style(elem, &style); + ok(hres == S_OK, "get_style failed: %08x\n", hres); + + test_style_filter(style, NULL); + set_style_filter(style, "alpha(opacity=50.00000)"); + set_style_filter(style, "alpha(opacity=100)"); + set_style_filter(style, "xxx(a,b,c) alpha(opacity=100)"); + set_style_filter(style, NULL); + + IHTMLStyle_Release(style); +} + static void test_set_csstext(IHTMLStyle *style) { VARIANT v; @@ -6770,6 +6817,7 @@ static void test_elems2(IHTMLDocument2 *doc) } test_attr(div); + test_style_filters(div); IHTMLElement_Release(div); }

1 0

Wolfram Sang : user32: Make DIB_GetBitmapInfo checks stricter.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: ce5763b88c23e3c3452036c748edffb3f1e7bb1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce5763b88c23e3c3452036c74… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Thu Feb 24 22:12:08 2011 +0100 user32: Make DIB_GetBitmapInfo checks stricter. --- dlls/user32/cursoricon.c | 6 ++++-- dlls/user32/tests/cursoricon.c | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index d007c6e..2c9aeef 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -372,7 +372,9 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, *compr = 0; return 0; } - else if (header->biSize >= sizeof(BITMAPINFOHEADER)) + else if (header->biSize == sizeof(BITMAPINFOHEADER) || + header->biSize == sizeof(BITMAPV4HEADER) || + header->biSize == sizeof(BITMAPV5HEADER)) { *width = header->biWidth; *height = header->biHeight; @@ -380,7 +382,7 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, *compr = header->biCompression; return 1; } - ERR("(%d): unknown/wrong size for header\n", header->biSize ); + WARN("unknown/wrong size (%u) for header\n", header->biSize); return -1; } diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 454606a..da748b6 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -765,6 +765,24 @@ static unsigned char gif4pixel[42] = { 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b }; +static const DWORD biSize_tests[] = { + 0, + sizeof(BITMAPCOREHEADER) - 1, + sizeof(BITMAPCOREHEADER) + 1, + sizeof(BITMAPINFOHEADER) - 1, + sizeof(BITMAPINFOHEADER) + 1, + sizeof(BITMAPV4HEADER) - 1, + sizeof(BITMAPV4HEADER) + 1, + sizeof(BITMAPV5HEADER) - 1, + sizeof(BITMAPV5HEADER) + 1, + (sizeof(BITMAPCOREHEADER) + sizeof(BITMAPINFOHEADER)) / 2, + (sizeof(BITMAPV4HEADER) + sizeof(BITMAPV5HEADER)) / 2, + 0xdeadbeef, + 0xffffffff +}; + +#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) + static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) { BITMAP bm; @@ -856,6 +874,7 @@ static void test_LoadImage(void) CURSORICONFILEDIRENTRY *icon_entry; BITMAPINFOHEADER *icon_header, *bitmap_header; ICONINFO icon_info; + int i; #define ICON_WIDTH 32 #define ICON_HEIGHT 32 @@ -992,8 +1011,16 @@ static void test_LoadImage(void) bitmap_header->biWidth = 65536; test_LoadImageFile("BMP (too wide)", bmpimage, sizeof(bmpimage), "bmp", 0); bitmap_header->biWidth = 1; + + for (i = 0; i < ARRAY_SIZE(biSize_tests); i++) { + bitmap_header->biSize = biSize_tests[i]; + test_LoadImageFile("BMP (broken biSize)", bmpimage, sizeof(bmpimage), "bmp", 0); + } + bitmap_header->biSize = sizeof(BITMAPINFOHEADER); } +#undef ARRAY_SIZE + static void test_CreateIconFromResource(void) { HANDLE handle;

1 0

Wolfram Sang : user32: Check bitmap info before it is used.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: c67f075d67a6d8de19dae570022265fc0f89ef52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c67f075d67a6d8de19dae5700… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Thu Feb 24 22:12:09 2011 +0100 user32: Check bitmap info before it is used. --- dlls/user32/cursoricon.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 2c9aeef..cd7d3ed 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2198,6 +2198,14 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, if (bmfh->bfOffBits) offbits = bmfh->bfOffBits - sizeof(BITMAPFILEHEADER); } + bm_type = DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, + &bpp_dummy, &compr_dummy); + if (bm_type == -1) + { + WARN("Invalid bitmap format!\n"); + goto end; + } + size = bitmap_info_size(info, DIB_RGB_COLORS); fix_info = HeapAlloc(GetProcessHeap(), 0, size); scaled_info = HeapAlloc(GetProcessHeap(), 0, size); @@ -2209,13 +2217,6 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, DIB_FixColorsToLoadflags(fix_info, loadflags, pix); memcpy(scaled_info, fix_info, size); - bm_type = DIB_GetBitmapInfo( &fix_info->bmiHeader, &width, &height, - &bpp_dummy, &compr_dummy); - if (bm_type == -1) - { - WARN("Invalid bitmap format!\n"); - goto end; - } if(desiredx != 0) new_width = desiredx;

1 0