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

Henri Verbeet : wined3d: Pass a wined3d_box structure to wined3d_surface_upload_data().
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: 89cd64bcb7fe4f9fb791a542a82ef9868252d628 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89cd64bcb7fe4f9fb791a542… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 19 00:27:09 2018 +0330 wined3d: Pass a wined3d_box structure to wined3d_surface_upload_data(). For consistency with wined3d_texture_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 52 +++++++++++++++++++++++------------------- dlls/wined3d/texture.c | 18 ++++++++------- dlls/wined3d/wined3d_private.h | 6 ++--- 3 files changed, 42 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=89cd64bcb7fe4f9fb791…

1 0

Henri Verbeet : wined3d: Pass the destination x/ y coordinates as separate parameters to wined3d_surface_upload_data().
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: d4b0249c48e0601bdb3ed38b20113b364c93b298 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4b0249c48e0601bdb3ed38b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 19 00:27:10 2018 +0330 wined3d: Pass the destination x/y coordinates as separate parameters to wined3d_surface_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 51 +++++++++++++++++++----------------------- dlls/wined3d/texture.c | 10 ++++----- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 29 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4b0249c48e0601bdb3e…

1 0

Alistair Leslie-Hughes : pidgen: Add PIDGenSimpA stub.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: df408ba3abd75c10af35d647728087cf447d29b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df408ba3abd75c10af35d647… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 17 10:19:17 2018 +0000 pidgen: Add PIDGenSimpA stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pidgen/main.c | 7 +++++++ dlls/pidgen/pidgen.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c index 3aa3e84..cf165ea 100644 --- a/dlls/pidgen/main.c +++ b/dlls/pidgen/main.c @@ -43,3 +43,10 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +int WINAPI PIDGenSimpA(LPCSTR str, int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) +{ + FIXME("%s,%d,%d,%d,%d,%d,%d,%d,%d\n", debugstr_a(str), p1, p2, p3, p4, p5, p6, p7, p8); + + return 0; +} diff --git a/dlls/pidgen/pidgen.spec b/dlls/pidgen/pidgen.spec index ad5c369..8b7e778 100644 --- a/dlls/pidgen/pidgen.spec +++ b/dlls/pidgen/pidgen.spec @@ -1,6 +1,6 @@ @ stub PIDGenA @ stub PIDGenW -@ stub PIDGenSimpA +@ stdcall PIDGenSimpA(str long long long long long long long long) @ stub PIDGenSimpW @ stub SetupPIDGenA @ stub SetupPIDGenW

1 0

Mark Jansen : comctl32/tests: Prevent a possible nullptr dereference.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: f94d0e7b3aa9cb9af17e7c36212d95f20fbbce54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f94d0e7b3aa9cb9af17e7c36… Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Fri Mar 16 22:57:15 2018 +0100 comctl32/tests: Prevent a possible nullptr dereference. Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 3838563..1c307e4 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2047,9 +2047,9 @@ static void check_color_table(const char *name, HDC hdc, HIMAGELIST himl, UINT i ok((bmi->bmiColors[i].rgbRed == expect[i].rgbRed && bmi->bmiColors[i].rgbGreen == expect[i].rgbGreen && bmi->bmiColors[i].rgbBlue == expect[i].rgbBlue) || - broken(bmi->bmiColors[i].rgbRed == broken_expect[i].rgbRed && + (broken_expect && broken(bmi->bmiColors[i].rgbRed == broken_expect[i].rgbRed && bmi->bmiColors[i].rgbGreen == broken_expect[i].rgbGreen && - bmi->bmiColors[i].rgbBlue == broken_expect[i].rgbBlue), + bmi->bmiColors[i].rgbBlue == broken_expect[i].rgbBlue)), "%d: %s: got color[%d] %02x %02x %02x expect %02x %02x %02x\n", depth, name, i, bmi->bmiColors[i].rgbRed, bmi->bmiColors[i].rgbGreen, bmi->bmiColors[i].rgbBlue, expect[i].rgbRed, expect[i].rgbGreen, expect[i].rgbBlue);

1 0

Jacek Caban : vbscript: Split named item lookup into a helper function.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: aa5b68ac400726132aa61a6e590e33d17f087f94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa5b68ac400726132aa61a6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 16 23:34:41 2018 +0100 vbscript: Split named item lookup into a helper function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 29 ++++++----------------------- dlls/vbscript/vbscript.c | 32 ++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 39 insertions(+), 23 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 9ec3299..4f746c7 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -99,6 +99,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ { named_item_t *item; function_t *func; + IDispatch *disp; unsigned i; DISPID id; HRESULT hres; @@ -178,29 +179,11 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } - LIST_FOR_EACH_ENTRY(item, &ctx->script->named_items, named_item_t, entry) { - if((item->flags & SCRIPTITEM_ISVISIBLE) && !strcmpiW(item->name, name)) { - if(!item->disp) { - IUnknown *unk; - - hres = IActiveScriptSite_GetItemInfo(ctx->script->site, item->name, SCRIPTINFO_IUNKNOWN, &unk, NULL); - if(FAILED(hres)) { - WARN("GetItemInfo failed: %08x\n", hres); - continue; - } - - hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&item->disp); - IUnknown_Release(unk); - if(FAILED(hres)) { - WARN("object does not implement IDispatch\n"); - continue; - } - } - - ref->type = REF_OBJ; - ref->u.obj = item->disp; - return S_OK; - } + disp = lookup_named_item(ctx->script, name, SCRIPTITEM_ISVISIBLE); + if(disp) { + ref->type = REF_OBJ; + ref->u.obj = disp; + return S_OK; } LIST_FOR_EACH_ENTRY(item, &ctx->script->named_items, named_item_t, entry) { diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 645068e..054d53b 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -96,6 +96,38 @@ static void exec_queued_code(script_ctx_t *ctx) } } +IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flags) +{ + named_item_t *item; + HRESULT hres; + + LIST_FOR_EACH_ENTRY(item, &ctx->named_items, named_item_t, entry) { + if((item->flags & flags) == flags && !strcmpiW(item->name, name)) { + if(!item->disp) { + IUnknown *unk; + + hres = IActiveScriptSite_GetItemInfo(ctx->site, item->name, + SCRIPTINFO_IUNKNOWN, &unk, NULL); + if(FAILED(hres)) { + WARN("GetItemInfo failed: %08x\n", hres); + continue; + } + + hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&item->disp); + IUnknown_Release(unk); + if(FAILED(hres)) { + WARN("object does not implement IDispatch\n"); + continue; + } + } + + return item->disp; + } + } + + return NULL; +} + static HRESULT set_ctx_site(VBScript *This) { HRESULT hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 5e935ff..42b3cd1 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -355,6 +355,7 @@ void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,vbscode_t**) DECLSPEC_HIDDEN; HRESULT exec_script(script_ctx_t*,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; +IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; typedef struct { UINT16 len;

1 0

Jacek Caban : vbscript: Added support for script context in ParseScriptText.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: 7e109410836f18a67418209a4b73dcdb513532f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e109410836f18a67418209a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 16 23:34:52 2018 +0100 vbscript: Added support for script context in ParseScriptText. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 15 +++---------- dlls/vbscript/interp.c | 10 +++++++++ dlls/vbscript/tests/run.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.c | 12 +++++++++++ dlls/vbscript/vbscript.h | 1 + 5 files changed, 80 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index c8189d6..302804f 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1746,6 +1746,8 @@ void release_vbscode(vbscode_t *code) for(i=0; i < code->bstr_cnt; i++) SysFreeString(code->bstr_pool[i]); + if(code->context) + IDispatch_Release(code->context); heap_pool_free(&code->heap); heap_free(code->bstr_pool); @@ -1758,7 +1760,7 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) { vbscode_t *ret; - ret = heap_alloc(sizeof(*ret)); + ret = heap_alloc_zero(sizeof(*ret)); if(!ret) return NULL; @@ -1780,19 +1782,8 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ret->option_explicit = ctx->parser.option_explicit; - ret->bstr_pool = NULL; - ret->bstr_pool_size = 0; - ret->bstr_cnt = 0; - ret->pending_exec = FALSE; - ret->main_code.type = FUNC_GLOBAL; - ret->main_code.name = NULL; ret->main_code.code_ctx = ret; - ret->main_code.vars = NULL; - ret->main_code.var_cnt = 0; - ret->main_code.array_cnt = 0; - ret->main_code.arg_cnt = 0; - ret->main_code.args = NULL; list_init(&ret->entry); return ret; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4f746c7..b46bd01 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -154,6 +154,16 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } + if(ctx->func->code_ctx->context) { + hres = disp_get_id(ctx->func->code_ctx->context, name, invoke_type, TRUE, &id); + if(SUCCEEDED(hres)) { + ref->type = REF_DISP; + ref->u.d.disp = ctx->func->code_ctx->context; + ref->u.d.id = id; + return S_OK; + } + } + if(ctx->func->type != FUNC_GLOBAL && lookup_dynamic_vars(ctx->script->global_vars, name, ref)) return S_OK; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index ee811c6..9172add 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1804,6 +1804,59 @@ static HRESULT parse_script_ar(const char *src) return hres; } +static void test_parse_context(void) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + BSTR str; + HRESULT hres; + + static const WCHAR xW[] = {'x',0}; + static const WCHAR yW[] = {'y',0}; + + engine = create_and_init_script(0); + if(!engine) + return; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + /* unknown identifier context is not a valid argument */ + str = a2bstr("Call reportSuccess()\n"); + hres = IActiveScriptParse_ParseScriptText(parser, str, yW, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == E_INVALIDARG, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("class Cl\n" + " Public Sub ClMethod\n" + " Call reportSuccess()\n" + " End Sub\n" + "End Class\n" + "Dim x\n" + "set x = new Cl\n"); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + + /* known global variable is not a valid context */ + str = a2bstr("Call reportSuccess()\n"); + hres = IActiveScriptParse_ParseScriptText(parser, str, xW, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == E_INVALIDARG, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + str = a2bstr("Call reportSuccess()\n"); + hres = IActiveScriptParse_ParseScriptText(parser, str, testW, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + IActiveScriptParse_Release(parser); + close_script(engine); +} + static void parse_script_a(const char *src) { parse_script_af(SCRIPTITEM_GLOBALMEMBERS, src); @@ -2334,6 +2387,7 @@ static void run_tests(void) test_procedures(); test_gc(); test_msgbox(); + test_parse_context(); } static BOOL check_vbscript(void) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 054d53b..b97cf5a 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -636,6 +636,7 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { VBScript *This = impl_from_IActiveScriptParse(iface); + IDispatch *context = NULL; vbscode_t *code; HRESULT hres; @@ -646,10 +647,21 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; + if(pstrItemName) { + context = lookup_named_item(This->ctx, pstrItemName, 0); + if(!context) { + WARN("Inknown context %s\n", debugstr_w(pstrItemName)); + return E_INVALIDARG; + } + } + hres = compile_script(This->ctx, pstrCode, pstrDelimiter, &code); if(FAILED(hres)) return hres; + if(context) + IDispatch_AddRef(code->context = context); + if(!is_started(This)) { code->pending_exec = TRUE; return S_OK; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 42b3cd1..5877762 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -342,6 +342,7 @@ struct _vbscode_t { BOOL pending_exec; function_t main_code; + IDispatch *context; BSTR *bstr_pool; unsigned bstr_pool_size;

1 0

Alexandre Julliard : Wine release 2.0.5
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: website Branch: master Commit: 26866d63248c5209e8181440370e79440197ecfb URL: https://source.winehq.org/git/website.git/?a=commit;h=26866d63248c5209e8181… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 18 15:02:43 2018 +0100 Wine release 2.0.5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018031801.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2018031801.xml b/news/en/2018031801.xml new file mode 100644 index 0000000..85d969b --- /dev/null +++ b/news/en/2018031801.xml @@ -0,0 +1,12 @@ +<news> +<date>March 18, 2018</date> +<title>Wine 2.0.5 Released</title> +<body> + The Wine maintenance release 2.0.5 is now available. + <a href="{$root}/announce/2.0.5">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.0/wine-2.0.5.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Fabian Maurer : msvcrt: Don' t crash if _vsnwprintf gets NULL as format string and add test.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 1f2bfe7520a9295710d28e04f0173e5a677b98b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f2bfe7520a9295710d28e04… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Dec 1 18:19:31 2017 +0100 msvcrt: Don't crash if _vsnwprintf gets NULL as format string and add test. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 058be4304eb0c0e5f264e166b68991808a21001a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 31 +++++++++++++++++++++++++++++++ dlls/msvcrt/printf.h | 3 +++ 2 files changed, 34 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 2fde843..237bf68 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -133,6 +133,7 @@ static char* (__cdecl *p_setlocale)(int, const char*); static int (__cdecl *p__fpieee_flt)(ULONG, EXCEPTION_POINTERS*, int (__cdecl *handler)(_FPIEEE_RECORD*)); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); +static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist); /* make sure we use the correct errno */ #undef errno @@ -401,6 +402,7 @@ static BOOL init(void) SET(p__fpieee_flt, "_fpieee_flt"); SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); + SET(p__vsnwprintf, "_vsnwprintf"); if (sizeof(void *) == 8) { @@ -1864,6 +1866,34 @@ static void test__memicmp_l(void) ok(ret == -1, "got %d\n", ret); } +static int WINAPIV _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p__vsnwprintf(str, len, format, valist); + __ms_va_end(valist); + return ret; +} + +void test__vsnwprintf(void) +{ + int ret; + WCHAR str[2] = {0}; + + _invalid_parameter_handler old_handler = p_set_invalid_parameter_handler(test_invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + str[0] = 'x'; + ret = _vsnwprintf_wrapper(str, 0, NULL); + ok(ret == -1, "got %d, expected -1\n", ret); + ok(str[0] == 'x', "Expected string to be unchanged.\n"); + CHECK_CALLED(invalid_parameter_handler, EINVAL); + + ok(p_set_invalid_parameter_handler(old_handler) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); +} + START_TEST(msvcr90) { if(!init()) @@ -1897,6 +1927,7 @@ START_TEST(msvcr90) test__mbstok_s(); test__memicmp(); test__memicmp_l(); + test__vsnwprintf(); #ifdef __i386__ test__fpieee_flt(); #endif diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 392ead8..51a52a5 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -367,6 +367,9 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API TRACE("Format is: %s\n", FUNC_NAME(debugstr)(fmt)); + if (!MSVCRT_CHECK_PMT(fmt != NULL)) + return -1; + if(!locale) locinfo = get_locinfo(); else

1 0

Zhiyi Zhang : winecfg: Fix a crash when inputting non-ASCII dll override name.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 0ce94877dd2339c293cf759417a1c8d1703acd8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ce94877dd2339c293cf7594… Author: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Date: Mon Dec 18 22:33:08 2017 +0800 winecfg: Fix a crash when inputting non-ASCII dll override name. Signed-off-by: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit eee8131d3ba53daa85303602046e7523a04a3a10) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winecfg/winecfg.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index dbac929..ba317c7 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -571,7 +571,7 @@ char **enumerate_values(HKEY root, char *path) WCHAR *wpath; WCHAR **wret; char **ret=NULL; - int i=0, len=0; + int i=0, len=0, size; wpath = HeapAlloc(GetProcessHeap(), 0, (strlen(path)+1)*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, path, -1, wpath, strlen(path)+1); @@ -586,11 +586,13 @@ char **enumerate_values(HKEY root, char *path) /* convert WCHAR ** to char ** and HeapFree each WCHAR * element on our way */ for (i=0; i<len; i++) { - ret[i] = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(wret[i]) + 1) * sizeof(char)); - WideCharToMultiByte(CP_ACP, 0, wret[i], -1, ret[i], - lstrlenW(wret[i]) + 1, NULL, NULL); - HeapFree(GetProcessHeap(), 0, wret[i]); + size = WideCharToMultiByte(CP_ACP, 0, wret[i], -1, NULL, 0, NULL, NULL); + if(size) + { + ret[i] = HeapAlloc(GetProcessHeap(), 0, size); + WideCharToMultiByte(CP_ACP, 0, wret[i], -1, ret[i], size, NULL, NULL); + HeapFree(GetProcessHeap(), 0, wret[i]); + } } ret[len] = NULL; }

1 0

Nikolay Sivov : mshtml: Avoid potential moniker instance leak.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 1a6c8f4f7d2a00c764554a4fd59a002c3e1599bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a6c8f4f7d2a00c764554a4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 4 14:56:15 2017 +0300 mshtml: Avoid potential moniker instance leak. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2b37b97d0c6356f8b89401183295222123e4b619) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/persist.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 2735ab5..408bc00 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -892,10 +892,9 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream prepare_for_binding(This, mon, FALSE); hres = set_moniker(This->window, mon, NULL, NULL, NULL, TRUE); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) + hres = channelbsc_load_stream(This->window->pending_window, mon, pStm); - hres = channelbsc_load_stream(This->window->pending_window, mon, pStm); IMoniker_Release(mon); return hres; } @@ -950,10 +949,9 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) prepare_for_binding(This, mon, FALSE); hres = set_moniker(This->window, mon, NULL, NULL, NULL, FALSE); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) + hres = channelbsc_load_stream(This->window->pending_window, mon, NULL); - hres = channelbsc_load_stream(This->window->pending_window, mon, NULL); IMoniker_Release(mon); return hres; }

1 0