December 2014 - Wine-Commits

Alistair Leslie-Hughes : jscript: Support PROPERTYGET in Date Value.
by Alexandre Julliard Dec. 15, 2014

Dec. 15, 2014

Module: wine Branch: master Commit: 6e8490a582db3ce5bdfb7b7461614dfedabe3e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e8490a582db3ce5bdfb7b746… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 12 13:47:54 2014 +1100 jscript: Support PROPERTYGET in Date Value. --- dlls/jscript/date.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 81b714f..8d62975 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -1925,6 +1925,8 @@ static HRESULT Date_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsign switch(flags) { case INVOKE_FUNC: return throw_type_error(ctx, JS_E_FUNCTION_EXPECTED, NULL); + case INVOKE_PROPERTYGET: + return dateobj_to_string( (DateInstance*)jsthis->u.jsdisp, r); default: FIXME("unimplemented flags %x\n", flags); return E_NOTIMPL;

1 0

Jacek Caban : jscript: Added test of Date object default value.
by Alexandre Julliard Dec. 15, 2014

Dec. 15, 2014

Module: wine Branch: master Commit: ceaf8bfd837946edf179408ea380c11dd98e6805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceaf8bfd837946edf179408ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 13 11:47:52 2014 +1100 jscript: Added test of Date object default value. --- dlls/jscript/tests/run.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 122db60..1adc25d 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1945,6 +1945,30 @@ static HRESULT parse_script_expr(const char *expr, VARIANT *res) return hres; } +static void test_default_value(void) +{ + DISPPARAMS dp = {0}; + IDispatch *disp; + VARIANT v; + HRESULT hres; + + hres = parse_script_expr("new Date()", &v); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d", V_VT(&v)); + disp = V_DISPATCH(&v); + + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK || broken(hres == 0x8000ffff), "Invoke failed: %08x\n", hres); + if(hres == S_OK) + { + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + } + + VariantClear(&v); + IDispatch_Release(disp); +} + static void test_script_exprs(void) { VARIANT v; @@ -1988,6 +2012,8 @@ static void test_script_exprs(void) CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + test_default_value(); + testing_expr = FALSE; }

1 0

Janis Lukss : wine.inf: Added ProductId registry key also to "Windows NT".
by Alexandre Julliard Dec. 15, 2014

Dec. 15, 2014

Module: wine Branch: master Commit: 5069cb7b07ee4fc76d27b76b178322049935e25f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5069cb7b07ee4fc76d27b76b1… Author: Janis Lukss <pendrokar(a)gmail.com> Date: Sun Dec 14 18:18:11 2014 +0200 wine.inf: Added ProductId registry key also to "Windows NT". --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 2fc2362..a4548f2 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -468,6 +468,7 @@ HKLM,%CurrentVersion%\Uninstall,,16 HKCU,%CurrentVersion%\Run,,16 HKLM,%CurrentVersion%\Run,,16 HKLM,%CurrentVersionNT%,"InstallDate",0x10003,1273299354 +HKLM,%CurrentVersionNT%,"ProductId",,"12345-oem-0000001-54321" HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"" HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%"

1 0

Nikolay Sivov : gdi32: Remove some useless returns.
by Alexandre Julliard Dec. 15, 2014

Dec. 15, 2014

Module: wine Branch: master Commit: 88202b3d9b906cdea5a36560299cdc2f2d7af3f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88202b3d9b906cdea5a365602… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 15 08:56:26 2014 +0300 gdi32: Remove some useless returns. --- dlls/gdi32/freetype.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f1af5d6..62e19a5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -995,7 +995,6 @@ static void DumpSubstList(void) TRACE("%s -> %s\n", debugstr_w(psub->from.name), debugstr_w(psub->to.name)); } - return; } static LPWSTR strdupW(LPCWSTR p) @@ -2215,7 +2214,6 @@ static void DumpFontList(void) TRACE("\n"); } } - return; } /*********************************************************** @@ -3011,7 +3009,6 @@ static void update_reg_entries(void) if(external_key) RegCloseKey(external_key); if(win9x_key) RegCloseKey(win9x_key); if(winnt_key) RegCloseKey(winnt_key); - return; } static void delete_external_font_keys(void) @@ -4658,7 +4655,6 @@ static void calc_hash(FONT_DESC *pfd) } hash ^= !pfd->can_use_bitmap; pfd->hash = hash; - return; } static GdiFont *find_in_cache(HFONT hfont, const LOGFONTW *plf, const FMAT2 *pmat, BOOL can_use_bitmap) @@ -5839,7 +5835,6 @@ static void FTVectorToPOINTFX(FT_Vector *vec, POINTFX *pt) pt->y.value = vec->y >> 6; pt->y.fract = (vec->y & 0x3f) << 10; pt->y.fract |= ((pt->y.fract >> 6) | (pt->y.fract >> 12)); - return; } /***************************************************

1 0

Jacek Caban : mshtml: Resolve duplicated IDispatch entries as soon as they are processed.
by Alexandre Julliard Dec. 15, 2014

Dec. 15, 2014

Module: wine Branch: master Commit: 0bfe8b441a2b862f6df5f6b5c4841240f43dde3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bfe8b441a2b862f6df5f6b5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 14 17:54:00 2014 +0100 mshtml: Resolve duplicated IDispatch entries as soon as they are processed. --- dlls/mshtml/dispex.c | 28 +++++++++------------------- dlls/mshtml/htmlobject.c | 4 ++-- dlls/mshtml/htmlstyle.c | 10 +++++----- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 707fe7f..7f6d5c5 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -230,9 +230,15 @@ static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUN func_info_t *info; HRESULT hres; - if(data->func_cnt && data->funcs[data->func_cnt-1].id == desc->memid) { - info = data->funcs+data->func_cnt-1; - }else { + for(info = data->funcs; info < data->funcs+data->func_cnt; info++) { + if(info->id == desc->memid) { + if(info->tid != tid) + return; /* Duplicated in other interface */ + break; + } + } + + if(info == data->funcs+data->func_cnt) { if(data->func_cnt == *size) data->funcs = heap_realloc_zero(data->funcs, (*size <<= 1)*sizeof(func_info_t)); @@ -373,22 +379,6 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) data->funcs = heap_realloc(data->funcs, data->func_cnt * sizeof(func_info_t)); qsort(data->funcs, data->func_cnt, sizeof(func_info_t), dispid_cmp); - for(i = 1; i < data->func_cnt && data->funcs[i-1].id != data->funcs[i].id; i++); - if(i < data->func_cnt) { - unsigned j = i--; - - /* We have at least one duplicated property. This may happen if more than one - * interface implements the same property. We have to remove these duplicated - * entries. */ - - while(j < data->func_cnt) { - while(j+1 < data->func_cnt && data->funcs[j+1].id == data->funcs[j].id) - j++; - data->funcs[i++] = data->funcs[j++]; - } - data->func_cnt = i; - } - data->name_table = heap_alloc(data->func_cnt * sizeof(func_info_t*)); for(i=0; i < data->func_cnt; i++) data->name_table[i] = data->funcs+i; diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index a12384f..d2f6c95 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -766,9 +766,9 @@ static const NodeImplVtbl HTMLObjectElementImplVtbl = { }; static const tid_t HTMLObjectElement_iface_tids[] = { - HTMLELEMENT_TIDS, - IHTMLObjectElement_tid, IHTMLObjectElement2_tid, + IHTMLObjectElement_tid, + HTMLELEMENT_TIDS, 0 }; static dispex_static_data_t HTMLObjectElement_dispex = { diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 0e74899..730ae2d 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -3154,12 +3154,12 @@ static const dispex_static_data_vtbl_t HTMLStyle_dispex_vtbl = { }; static const tid_t HTMLStyle_iface_tids[] = { - IHTMLStyle_tid, - IHTMLStyle2_tid, - IHTMLStyle3_tid, - IHTMLStyle4_tid, - IHTMLStyle5_tid, IHTMLStyle6_tid, + IHTMLStyle5_tid, + IHTMLStyle4_tid, + IHTMLStyle3_tid, + IHTMLStyle2_tid, + IHTMLStyle_tid, 0 }; static dispex_static_data_t HTMLStyle_dispex = {

1 0

Jonathan Vollebregt : reg/tests: Test REG_NONE.
by Alexandre Julliard Dec. 15, 2014

Dec. 15, 2014

Module: wine Branch: master Commit: 4db1e201229762b625f120748a4048da94c65208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4db1e201229762b625f120748… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Sat Dec 13 18:06:03 2014 +0100 reg/tests: Test REG_NONE. --- programs/reg/tests/reg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 9b1881e..b7605e4 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -151,6 +151,11 @@ static void test_add(void) err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4"); ok(err == ERROR_SUCCESS, "got exit code %d\n", r); + /* REG_NONE */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v none0 /d deadbeef /t REG_NONE /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d\n", r); + verify_reg(hkey, "none0", REG_NONE, "d\0e\0a\0d\0b\0e\0e\0f\0\0", 18, TODO_REG_SIZE); + /* REG_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */),

1 0

Bruno Jesus : winefile: Allow paths with spaces.
by Alexandre Julliard Dec. 15, 2014

Dec. 15, 2014

Module: wine Branch: master Commit: a9c00c66d0495d0a78dd50467d14de16bae6ea46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c00c66d0495d0a78dd50467… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Dec 13 13:59:42 2014 -0200 winefile: Allow paths with spaces. --- programs/winefile/winefile.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index dee98c9..7046ad0 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1323,9 +1323,17 @@ static ChildWnd* alloc_child_window(LPCWSTR path, LPITEMIDLIST pidl, HWND hwnd) if (path) { - lstrcpyW(child->path, path); + int pathlen = strlenW(path); + const WCHAR *npath = path; - _wsplitpath(path, drv, dir, name, ext); + if (path[0] == '"' && path[pathlen - 1] == '"') + { + npath++; + pathlen--; + } + lstrcpynW(child->path, npath, pathlen + 1); + + _wsplitpath(child->path, drv, dir, name, ext); } lstrcpyW(child->filter_pattern, sAsterics);

1 0

Austin English : comctl32: Add a stub for LoadIconWithScaleDown.
by Alexandre Julliard Dec. 15, 2014

Dec. 15, 2014

Module: wine Branch: master Commit: 42c4c870af910c783f858bf16694632c9e32b197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c4c870af910c783f858bf16… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Dec 13 19:06:30 2014 -0600 comctl32: Add a stub for LoadIconWithScaleDown. --- dlls/comctl32/comctl32.spec | 1 + dlls/comctl32/commctrl.c | 9 +++++++++ include/commctrl.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 0dff369..0bd8b13 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -88,6 +88,7 @@ 375 stdcall -noname -private StrCSpnIW(wstr wstr) 376 stdcall -noname -private IntlStrEqWorkerA(long str str long) 377 stdcall -noname -private IntlStrEqWorkerW(long wstr wstr long) +381 stdcall -ordinal LoadIconWithScaleDown(ptr wstr long long ptr) 382 stdcall -noname SmoothScrollWindow(ptr) 383 stub -noname DoReaderMode 384 stdcall -noname SetPathWordBreakProc(ptr long) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 4f4e2b1..e18c27d 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1637,3 +1637,12 @@ HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *pTaskConfig, int *pnBu if (pfVerificationFlagChecked) *pfVerificationFlagChecked = TRUE; return S_OK; } + +/*********************************************************************** + * LoadIconWithScaleDown [COMCTL32.@] + */ +HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE hinst, PCWSTR name, int cx, int cy, HICON *icon) +{ + FIXME("stub: %p %s %d %d %p\n", hinst, wine_dbgstr_w(name), cx, cy, icon); + return E_NOTIMPL; +} diff --git a/include/commctrl.h b/include/commctrl.h index 9993ec7..0bcaeb6 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -42,6 +42,7 @@ BOOL WINAPI InitCommonControlsEx (const INITCOMMONCONTROLSEX*); LANGID WINAPI GetMUILanguage (VOID); VOID WINAPI InitMUILanguage (LANGID uiLang); +HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, PCWSTR, int, int, HICON *); #define COMCTL32_VERSION 5 /* dll version */

1 0

Nikolay Sivov : dwrite: Initial GetGlyphRunOutline() implementation.
by Alexandre Julliard Dec. 15, 2014

Dec. 15, 2014

Module: wine Branch: master Commit: 17a24679b491e43f8d85f0d13f95837496c6b382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17a24679b491e43f8d85f0d13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 15 09:39:26 2014 +0300 dwrite: Initial GetGlyphRunOutline() implementation. --- dlls/dwrite/dwrite_private.h | 19 +++++ dlls/dwrite/font.c | 123 ++++++++++++++++++++++++++-- dlls/dwrite/freetype.c | 156 +++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 189 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 482 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17a24679b491e43f8d85f…

1 0

Jonathan Vollebregt : reg/tests: Test for integer overflow.
by Alexandre Julliard Dec. 15, 2014

Dec. 15, 2014

Module: wine Branch: master Commit: c15e87cec416e5e735f7b9e630df56bc077fe95c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c15e87cec416e5e735f7b9e63… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Sat Dec 13 18:06:02 2014 +0100 reg/tests: Test for integer overflow. --- programs/reg/tests/reg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index f93df55..9b1881e 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -287,6 +287,9 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword10 /f /d -0x1", &r); todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0x01ffffffff /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d\n", r); + /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0