October 2020 - Wine-commits

Martin Storsjo : ntdll: Clear ExceptionFlags on arm64 after running an exception handler.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: b09acd526d0093962131ff900445cc2dae1f33c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b09acd526d0093962131ff90… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Oct 6 11:49:42 2020 +0300 ntdll: Clear ExceptionFlags on arm64 after running an exception handler. This applies the beahviour from a69762541a18107fbd8e9fb8362c3af8ddf1d90b (on x86_64) to arm64 as well. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c9f44e92d3..cc620eb1b4 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -341,6 +341,7 @@ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_C res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); + rec->ExceptionFlags &= EH_NONCONTINUABLE; __wine_pop_frame( &frame ); return res; }

1 0

Martin Storsjo : ntdll: Fix nested exceptions on arm64.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: 0a6e46e4367e10caa0b13156d89807c45a5bc3ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a6e46e4367e10caa0b13156… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Oct 6 11:49:43 2020 +0300 ntdll: Fix nested exceptions on arm64. This mirrors ae07938ba661dc0515673835878710a25c99eec8 (from x86_64) to arm64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index cc620eb1b4..c31eb51038 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -315,10 +315,10 @@ static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { - if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) return ExceptionContinueSearch; + if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) + rec->ExceptionFlags |= EH_NESTED_CALL; - /* FIXME */ - return ExceptionNestedException; + return ExceptionContinueSearch; }

1 0

Alexandre Julliard : gdi32: Store the face filename as a DOS path.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: f51fe9ead3f8322a6bba7984b4c0583d78d01c0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f51fe9ead3f8322a6bba7984… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 15:12:09 2020 +0200 gdi32: Store the face filename as a DOS path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 138 ++++++++++++++++++++++---------------------------- 1 file changed, 61 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f51fe9ead3f8322a6bba…

1 0

Alexandre Julliard : gdi32: Compare DOS filenames instead of Unix stat information for font files.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: 14395c85354ca90f2f37b1ed3ac6d2077e3d1f0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=14395c85354ca90f2f37b1ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 15:40:25 2020 +0200 gdi32: Compare DOS filenames instead of Unix stat information for font files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 64 ++++++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cb23173915..23edd1b0c3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -272,8 +272,6 @@ typedef struct tagFace { WCHAR *style_name; WCHAR *full_name; WCHAR *file; - dev_t dev; - ino_t ino; void *font_data_ptr; DWORD font_data_size; FT_Long face_index; @@ -1573,7 +1571,7 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) debugstr_w(face->full_name), debugstr_w(family->family_name), cursor->font_version, face->font_version ); - if (face->file && face->dev == cursor->dev && face->ino == cursor->ino) + if (face->file && !strcmpiW( face->file, cursor->file )) { cursor->refcount++; TRACE("Font %s already in list, refcount now %d\n", @@ -2100,10 +2098,9 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) } } -static Face *create_face( FT_Face ft_face, FT_Long face_index, const WCHAR *dos_name, const char *unix_name, +static Face *create_face( FT_Face ft_face, FT_Long face_index, const WCHAR *filename, void *font_data_ptr, DWORD font_data_size, DWORD flags ) { - struct stat st; Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); face->refcount = 1; @@ -2111,18 +2108,11 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const WCHAR *dos_ face->full_name = ft_face_get_full_name( ft_face, GetSystemDefaultLangID() ); if (flags & ADDFONT_VERTICAL_FONT) face->full_name = get_vertical_name( face->full_name ); - face->dev = 0; - face->ino = 0; - if (unix_name) + if (filename) { - face->file = dos_name ? strdupW( dos_name ) : wine_get_dos_file_name( unix_name ); + face->file = strdupW( filename ); face->font_data_ptr = NULL; face->font_data_size = 0; - if (!stat( unix_name, &st )) - { - face->dev = st.st_dev; - face->ino = st.st_ino; - } } else { @@ -2160,13 +2150,13 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const WCHAR *dos_ return face; } -static void AddFaceToList(FT_Face ft_face, const WCHAR *dos_name, const char *unix_name, - void *font_data_ptr, DWORD font_data_size, FT_Long face_index, DWORD flags ) +static void AddFaceToList(FT_Face ft_face, const WCHAR *file, void *font_data_ptr, DWORD font_data_size, + FT_Long face_index, DWORD flags ) { Face *face; Family *family; - face = create_face( ft_face, face_index, dos_name, unix_name, font_data_ptr, font_data_size, flags ); + face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags ); family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (insert_face_in_family_list( face, family )) @@ -2261,6 +2251,7 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon FT_Face ft_face; FT_Long face_index = 0, num_faces; INT ret = 0; + WCHAR *filename = NULL; /* we always load external fonts from files - otherwise we would get a crash in update_reg_entries */ assert(unix_name || !(flags & ADDFONT_EXTERNAL_FONT)); @@ -2286,26 +2277,28 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon } #endif /* HAVE_CARBON_CARBON_H */ + if (!dos_name && unix_name) dos_name = filename = wine_get_dos_file_name( unix_name ); + do { FONTSIGNATURE fs; ft_face = new_ft_face( unix_name, font_data_ptr, font_data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ); - if (!ft_face) return 0; + if (!ft_face) break; if(ft_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ { TRACE("Ignoring %s since its family name begins with a dot\n", debugstr_a(unix_name)); pFT_Done_Face(ft_face); - return 0; + break; } - AddFaceToList(ft_face, dos_name, unix_name, font_data_ptr, font_data_size, face_index, flags); + AddFaceToList(ft_face, dos_name, font_data_ptr, font_data_size, face_index, flags); ++ret; get_fontsig(ft_face, &fs); if (fs.fsCsb[0] & FS_DBCS_MASK) { - AddFaceToList(ft_face, dos_name, unix_name, font_data_ptr, font_data_size, face_index, + AddFaceToList(ft_face, dos_name, font_data_ptr, font_data_size, face_index, flags | ADDFONT_VERTICAL_FONT); ++ret; } @@ -2313,6 +2306,7 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon num_faces = ft_face->num_faces; pFT_Done_Face(ft_face); } while(num_faces > ++face_index); + HeapFree( GetProcessHeap(), 0, filename ); return ret; } @@ -2333,12 +2327,8 @@ static int remove_font_resource( const WCHAR *file, DWORD flags ) { Family *family, *family_next; Face *face, *face_next; - struct stat st; int count = 0; - char *unixname; - if (!(unixname = wine_get_unix_file_name( file ))) return 0; - if (stat( unixname, &st ) == -1) goto done; LIST_FOR_EACH_ENTRY_SAFE( family, family_next, &font_list, Family, entry ) { family->refcount++; @@ -2346,7 +2336,7 @@ static int remove_font_resource( const WCHAR *file, DWORD flags ) { if (!face->file) continue; if (LOWORD(face->flags) != LOWORD(flags)) continue; - if (st.st_dev == face->dev && st.st_ino == face->ino) + if (!strcmpiW( face->file, file )) { TRACE( "removing matching face %s refcount %d\n", debugstr_w(face->file), face->refcount ); release_face( face ); @@ -2355,8 +2345,6 @@ static int remove_font_resource( const WCHAR *file, DWORD flags ) } release_family( family ); } -done: - HeapFree( GetProcessHeap(), 0, unixname ); return count; } @@ -3500,19 +3488,17 @@ static BOOL get_fontdir( const WCHAR *dos_name, struct fontdir *fd ) if (!(unix_name = wine_get_unix_file_name( dos_name ))) return FALSE; ft_face = new_ft_face( unix_name, NULL, 0, 0, FALSE ); - if (ft_face) + HeapFree( GetProcessHeap(), 0, unix_name ); + if (!ft_face) return FALSE; + face = create_face( ft_face, 0, dos_name, NULL, 0, 0 ); + if (face) { - face = create_face( ft_face, 0, dos_name, unix_name, NULL, 0, 0 ); - if (face) - { - family_name = ft_face_get_family_name( ft_face, GetSystemDefaultLCID() ); - GetEnumStructs( face, family_name, &elf, &ntm, &type ); - release_face( face ); - HeapFree( GetProcessHeap(), 0, family_name ); - } - pFT_Done_Face( ft_face ); + family_name = ft_face_get_family_name( ft_face, GetSystemDefaultLCID() ); + GetEnumStructs( face, family_name, &elf, &ntm, &type ); + release_face( face ); + HeapFree( GetProcessHeap(), 0, family_name ); } - HeapFree( GetProcessHeap(), 0, unix_name ); + pFT_Done_Face( ft_face ); if (!face) return FALSE; if ((type & TRUETYPE_FONTTYPE) == 0) return FALSE;

1 0

Alexandre Julliard : gdi32: Store face data as a single binary value in the registry cache.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: b6c099cda6c7d7694956758ec121562e781c97fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6c099cda6c7d7694956758e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 19:58:11 2020 +0200 gdi32: Store face data as a single binary value in the registry cache. This is faster than a bunch of separate string values. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 260 ++++++++++++++++++++------------------------------ 1 file changed, 102 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6c099cda6c7d7694956…

1 0

Michael Stefaniuc : vbscript/tests: Use wide-char string literals.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: 4ca80c2f9e439a1e7a515398170920609184e70d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ca80c2f9e439a1e7a515398… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:26 2020 +0200 vbscript/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/createobj.c | 4 +--- dlls/vbscript/tests/run.c | 28 +++++++++------------------- dlls/vbscript/tests/vbscript.c | 5 +---- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index 34a9def89d..c0a653fb1e 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -88,8 +88,6 @@ DEFINE_EXPECT(Caller_QS_SecMgr); DEFINE_EXPECT(QI_IObjectWithSite); DEFINE_EXPECT(SetSite); -static const WCHAR testW[] = {'t','e','s','t',0}; - static HRESULT QS_SecMgr_hres; static HRESULT ProcessUrlAction_hres; static DWORD ProcessUrlAction_policy; @@ -753,7 +751,7 @@ static IActiveScriptParse *create_script(BOOL use_sec_mgr) hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(script, testW, + hres = IActiveScript_AddNamedItem(script, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 6dcd13bf75..bb33e6576e 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -155,9 +155,6 @@ DEFINE_EXPECT(OnLeaveScript); #define FACILITY_VBS 0xa #define MAKE_VBSERROR(code) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_VBS, code) -static const WCHAR testW[] = {'t','e','s','t',0}; -static const WCHAR emptyW[] = {0}; - static BOOL strict_dispid_check, is_english, allow_ui; static int first_day_of_week; static const char *test_name = "(null)"; @@ -1957,7 +1954,7 @@ static IActiveScript *create_and_init_script(DWORD flags, BOOL start) hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|flags); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); @@ -2046,9 +2043,6 @@ static void test_parse_context(void) BSTR str; HRESULT hres; - static const WCHAR xW[] = {'x',0}; - static const WCHAR yW[] = {'y',0}; - global_ref = 1; engine = create_and_init_script(0, TRUE); if(!engine) @@ -2063,7 +2057,7 @@ static void test_parse_context(void) /* 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); + hres = IActiveScriptParse_ParseScriptText(parser, str, L"y", NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == E_INVALIDARG, "ParseScriptText failed: %08x\n", hres); SysFreeString(str); @@ -2080,14 +2074,14 @@ static void test_parse_context(void) /* 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); + hres = IActiveScriptParse_ParseScriptText(parser, str, L"x", 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); + hres = IActiveScriptParse_ParseScriptText(parser, str, L"test", NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); SysFreeString(str); CHECK_CALLED(global_success_d); @@ -2109,10 +2103,8 @@ static void _parse_htmlscript_a(unsigned line, const char *src) BSTR tmp; HRESULT hres; - static const WCHAR script_delimW[] = {'<','/','S','C','R','I','P','T','>',0}; - tmp = a2bstr(src); - hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp, script_delimW); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp, L"</SCRIPT>"); SysFreeString(tmp); ok_(__FILE__,line)(hres == S_OK, "parse_script failed: %08x\n", hres); } @@ -2124,10 +2116,8 @@ static IDispatchEx *parse_procedure(IActiveScriptParseProcedure2 *parse_proc, co BSTR str; HRESULT hres; - static const WCHAR delimiterW[] = {'\"',0}; - str = a2bstr(src); - hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, str, NULL, emptyW, NULL, NULL, delimiterW, 0, 0, + hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, str, NULL, L"", NULL, NULL, L"\"", 0, 0, SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS|flags, &disp); SysFreeString(str); ok(hres == S_OK, "ParseProcedureText failed: %08x\n", hres); @@ -2158,7 +2148,7 @@ static void test_procedures(void) hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParseProcedure2, (void**)&parse_proc); ok(hres == S_OK, "Could not get IActiveScriptParseProcedure2 iface: %08x\n", hres); - hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, NULL, NULL, emptyW, NULL, NULL, NULL, 0, 0, 0, &disp); + hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, NULL, NULL, L"", NULL, NULL, NULL, 0, 0, 0, &disp); ok(hres == S_OK, "ParseProcedureText failed: %08x\n", hres); IDispatch_Release(disp); @@ -2385,7 +2375,7 @@ static void test_gc(void) hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); @@ -2643,7 +2633,7 @@ static HRESULT test_global_vars_ref(BOOL use_close) hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 04e7545da2..8e6f0995c5 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -1500,9 +1500,6 @@ static void test_vbscript_uninitializing(void) ULONG ref; HRESULT hres; - static const WCHAR script_textW[] = - {'F','u','n','c','t','i','o','n',' ','f','\n','E','n','d',' ','F','u','n','c','t','i','o','n','\n',0}; - script = create_vbscript(); hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parse); @@ -1529,7 +1526,7 @@ static void test_vbscript_uninitializing(void) test_state(script, SCRIPTSTATE_INITIALIZED); - hres = IActiveScriptParse_ParseScriptText(parse, script_textW, NULL, NULL, NULL, 0, 1, 0x42, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parse, L"Function f\nEnd Function\n", NULL, NULL, NULL, 0, 1, 0x42, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite);

1 0

Sven Baars : vbscript: Avoid double frees on error path (Coverity).
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: da6a18ecb5e37f0397d69d0f57f23c07050a19cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=da6a18ecb5e37f0397d69d0f… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Oct 4 22:35:31 2020 +0200 vbscript: Avoid double frees on error path (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 4b1c23b838..18504a43b9 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2423,7 +2423,6 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, } hres = SafeArrayAccessData(sa, (void**)&data); if(FAILED(hres)) { - SafeArrayDestroy(sa); goto error; } @@ -2440,7 +2439,6 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, hres = VariantCopyInd(data+i, &var); if(FAILED(hres)) { SafeArrayUnaccessData(sa); - SafeArrayDestroy(sa); goto error; } start = indices[i]+delimiterlen; @@ -2452,7 +2450,7 @@ error: V_VT(res) = VT_ARRAY|VT_VARIANT; V_ARRAY(res) = sa; }else { - if (sa) SafeArrayDestroy(sa); + SafeArrayDestroy(sa); } heap_free(indices);

1 0

Nikolay Sivov : ucrtbase: Add wcstold()/_wcstold_l().
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: 5abeff59dfc2680cc3e4890f1b5d78c501a37857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5abeff59dfc2680cc3e4890f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 10:18:23 2020 +0300 ucrtbase: Add wcstold()/_wcstold_l(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- .../api-ms-win-crt-private-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index d662921d02..ab5128e500 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -56,7 +56,7 @@ @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) ucrtbase._wcstoi64_l @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) ucrtbase._wcstol_l -@ stub _wcstold_l +@ cdecl _wcstold_l(wstr ptr ptr) ucrtbase._wcstold_l @ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) ucrtbase._wcstoll_l @ cdecl _wcstombs_l(ptr ptr long ptr) ucrtbase._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) ucrtbase._wcstombs_s_l @@ -109,7 +109,7 @@ @ cdecl wcstof(ptr ptr) ucrtbase.wcstof @ stub wcstoimax @ cdecl wcstol(wstr ptr long) ucrtbase.wcstol -@ stub wcstold +@ cdecl wcstold(wstr ptr) ucrtbase.wcstold @ cdecl -ret64 wcstoll(wstr ptr long) ucrtbase.wcstoll @ cdecl wcstombs(ptr ptr long) ucrtbase.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) ucrtbase.wcstombs_s diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 4dd07406db..1a31ac536c 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -799,7 +799,7 @@ @ cdecl -ret64 _o__wcstoi64(wstr ptr long) ucrtbase._o__wcstoi64 @ cdecl -ret64 _o__wcstoi64_l(wstr ptr long ptr) ucrtbase._o__wcstoi64_l @ cdecl _o__wcstol_l(wstr ptr long ptr) ucrtbase._o__wcstol_l -@ stub _o__wcstold_l +@ cdecl _o__wcstold_l(wstr ptr ptr) ucrtbase._o__wcstold_l @ cdecl -ret64 _o__wcstoll_l(wstr ptr long ptr) ucrtbase._o__wcstoll_l @ cdecl _o__wcstombs_l(ptr ptr long ptr) ucrtbase._o__wcstombs_l @ cdecl _o__wcstombs_s_l(ptr ptr long wstr long ptr) ucrtbase._o__wcstombs_s_l @@ -1163,7 +1163,7 @@ @ cdecl _o_wcstok(wstr wstr ptr) ucrtbase._o_wcstok @ cdecl _o_wcstok_s(ptr wstr ptr) ucrtbase._o_wcstok_s @ cdecl _o_wcstol(wstr ptr long) ucrtbase._o_wcstol -@ stub _o_wcstold +@ cdecl _o_wcstold(wstr ptr ptr) ucrtbase._o_wcstold @ cdecl -ret64 _o_wcstoll(wstr ptr long) ucrtbase._o_wcstoll @ cdecl _o_wcstombs(ptr ptr long) ucrtbase._o_wcstombs @ cdecl _o_wcstombs_s(ptr ptr long wstr long) ucrtbase._o_wcstombs_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4c944a9d21..fda4bb6903 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1893,7 +1893,7 @@ @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l -@ stub _wcstold_l +@ cdecl _wcstold_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @@ -2475,7 +2475,7 @@ @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) MSVCRT_wcstol -@ stub wcstold +@ cdecl wcstold(wstr ptr) MSVCRT_wcstod @ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 9d292ccef5..d0d5da6306 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1586,7 +1586,7 @@ @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) msvcr120._wcstoi64_l @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) msvcr120._wcstol_l -@ stub _wcstold_l +@ cdecl _wcstold_l(wstr ptr ptr) msvcr120._wcstold_l @ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) msvcr120._wcstoll_l @ cdecl _wcstombs_l(ptr ptr long ptr) msvcr120._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcr120._wcstombs_s_l @@ -2137,7 +2137,7 @@ @ cdecl wcstok(wstr wstr) msvcr120.wcstok @ cdecl wcstok_s(ptr wstr ptr) msvcr120.wcstok_s @ cdecl wcstol(wstr ptr long) msvcr120.wcstol -@ stub wcstold +@ cdecl wcstold(wstr ptr) msvcr120.wcstold @ cdecl -ret64 wcstoll(wstr ptr long) msvcr120.wcstoll @ cdecl wcstombs(ptr ptr long) msvcr120.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) msvcr120.wcstombs_s diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 468d8dbb5a..16409de9f7 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1463,7 +1463,7 @@ @ cdecl -ret64 _o__wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _o__wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _o__wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l -@ stub _o__wcstold_l +@ cdecl _o__wcstold_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _o__wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _o__wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _o__wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @@ -1828,7 +1828,7 @@ @ cdecl _o_wcstok(wstr wstr ptr) MSVCRT_wcstok @ cdecl _o_wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl _o_wcstol(wstr ptr long) MSVCRT_wcstol -@ stub _o_wcstold +@ cdecl _o_wcstold(wstr ptr ptr) MSVCRT_wcstod @ cdecl -ret64 _o_wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl _o_wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl _o_wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @@ -2042,7 +2042,7 @@ @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l -@ stub _wcstold_l +@ cdecl _wcstold_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @@ -2582,7 +2582,7 @@ @ cdecl wcstok(wstr wstr ptr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) MSVCRT_wcstol -@ stub wcstold +@ cdecl wcstold(wstr ptr) MSVCRT_wcstod @ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s

1 0

Nikolay Sivov : msvcrt: Correct spec entries for _wcstod_l().
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: d29f424416b32baa66da1bd88cebf58a18973301 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d29f424416b32baa66da1bd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 10:18:24 2020 +0300 msvcrt: Correct spec entries for _wcstod_l(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec | 2 +- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index ab5128e500..4f8d597fb6 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -50,7 +50,7 @@ @ cdecl _ultoa_s(long ptr long long) ucrtbase._ultoa_s @ cdecl _ultow(long ptr long) ucrtbase._ultow @ cdecl _ultow_s(long ptr long long) ucrtbase._ultow_s -@ cdecl _wcstod_l(wstr ptr long) ucrtbase._wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) ucrtbase._wcstod_l @ cdecl _wcstof_l(wstr ptr ptr) ucrtbase._wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) ucrtbase._wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) ucrtbase._wcstoi64_l diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 1a31ac536c..6fcbab0f10 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -794,7 +794,7 @@ @ cdecl _o__wcsnset_s(wstr long long long) ucrtbase._o__wcsnset_s @ cdecl _o__wcsset(wstr long) ucrtbase._o__wcsset @ cdecl _o__wcsset_s(wstr long long) ucrtbase._o__wcsset_s -@ cdecl _o__wcstod_l(wstr ptr long) ucrtbase._o__wcstod_l +@ cdecl _o__wcstod_l(wstr ptr ptr) ucrtbase._o__wcstod_l @ cdecl _o__wcstof_l(wstr ptr ptr) ucrtbase._o__wcstof_l @ cdecl -ret64 _o__wcstoi64(wstr ptr long) ucrtbase._o__wcstoi64 @ cdecl -ret64 _o__wcstoi64_l(wstr ptr long ptr) ucrtbase._o__wcstoi64_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9f8755c6e8..780c86ee71 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1511,7 +1511,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 64205b704c..425bdfdc21 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1869,7 +1869,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index fda4bb6903..368f376939 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1887,7 +1887,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl _wcstof_l(wstr ptr ptr) MSVCRT__wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d0d5da6306..54a02bb0a9 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1580,7 +1580,7 @@ @ cdecl _wcsrev(wstr) msvcr120._wcsrev @ cdecl _wcsset(wstr long) msvcr120._wcsset @ cdecl _wcsset_s(wstr long long) msvcr120._wcsset_s -@ cdecl _wcstod_l(wstr ptr long) msvcr120._wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) msvcr120._wcstod_l @ cdecl _wcstof_l(wstr ptr ptr) msvcr120._wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) msvcr120._wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) msvcr120._wcstoi64_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f83637038b..97e30c5563 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1191,7 +1191,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ba75c3452e..5ea0226b3b 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1166,7 +1166,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 204dfe62e5..f6eead8a51 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1120,7 +1120,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 16409de9f7..5f65b97a98 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1458,7 +1458,7 @@ @ cdecl _o__wcsnset_s(wstr long long long) MSVCRT__wcsnset_s @ cdecl _o__wcsset(wstr long) MSVCRT__wcsset @ cdecl _o__wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _o__wcstod_l(wstr ptr long) MSVCRT__wcstod_l +@ cdecl _o__wcstod_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl _o__wcstof_l(wstr ptr ptr) MSVCRT__wcstof_l @ cdecl -ret64 _o__wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _o__wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @@ -2036,7 +2036,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr ptr) MSVCRT__wcstod_l @ cdecl _wcstof_l(wstr ptr ptr) MSVCRT__wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l

1 0

Hans Leidekker : bcrypt: Fix buffer size query in BCryptSignHash.
by Alexandre Julliard 06 Oct '20

06 Oct '20

Module: wine Branch: master Commit: ab0a7d2a1b31160134d9205236fade162f0bc1dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab0a7d2a1b31160134d92052… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 6 12:27:10 2020 +0200 bcrypt: Fix buffer size query in BCryptSignHash. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 21520bb4a8..be1a28e472 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1415,9 +1415,9 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat case ALG_ID_RSA: case ALG_ID_RSA_SIGN: { - if (output_len < signature.size) return STATUS_BUFFER_TOO_SMALL; - memcpy( output, signature.data, signature.size ); *ret_len = signature.size; + if (output_len < signature.size) return STATUS_BUFFER_TOO_SMALL; + if (output) memcpy( output, signature.data, signature.size ); return STATUS_SUCCESS; } case ALG_ID_ECDSA_P256: @@ -1435,6 +1435,7 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat return STATUS_INTERNAL_ERROR; } + *ret_len = sig_len; if (output_len < sig_len) return STATUS_BUFFER_TOO_SMALL; if (r.size % 2) /* remove prepended zero byte */ @@ -1457,14 +1458,16 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat return STATUS_INTERNAL_ERROR; } - pad_size_r = (sig_len / 2) - r.size; - pad_size_s = (sig_len / 2) - s.size; - memset( output, 0, sig_len ); + if (output) + { + pad_size_r = (sig_len / 2) - r.size; + pad_size_s = (sig_len / 2) - s.size; + memset( output, 0, sig_len ); - memcpy( output + pad_size_r, r_data, r.size ); - memcpy( output + (sig_len / 2) + pad_size_s, s_data, s.size ); + memcpy( output + pad_size_r, r_data, r.size ); + memcpy( output + (sig_len / 2) + pad_size_s, s_data, s.size ); + } - *ret_len = sig_len; free( r.data ); free( s.data ); return STATUS_SUCCESS; }

1 0