wine-commits December 2020

wine-commits@winehq.org

1 participants
414 discussions

Michael Stefaniuc : ntdll: Print the correct debug string and not a random global variable.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: cdf1b61a47a2fee8befb2ccbcce4e891f60a24f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdf1b61a47a2fee8befb2ccb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 4 00:36:29 2020 +0100 ntdll: Print the correct debug string and not a random global variable. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index b99d1655d22..faccd21d4b1 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3533,7 +3533,7 @@ static struct string_index *find_string_index(const struct strsection_header *se break; } else - WARN("hash collision 0x%08x, %s, %s\n", hash, debugstr_us(name), debugstr_w(nameW)); + WARN("hash collision 0x%08x, %s, %s\n", hash, debugstr_us(name), debugstr_us(&str)); } iter++; } @@ -3794,7 +3794,7 @@ static NTSTATUS find_window_class(ACTIVATION_CONTEXT* actctx, const UNICODE_STRI break; } else - WARN("hash collision 0x%08x, %s, %s\n", hash, debugstr_us(name), debugstr_w(nameW)); + WARN("hash collision 0x%08x, %s, %s\n", hash, debugstr_us(name), debugstr_us(&str)); } iter++; }

1 0

Francois Gouget : testbot: Tweak the VMs default status and snapshot name.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: tools Branch: master Commit: 27a033d5374d9e97b177ae94ae51ce4dec4d6a23 URL: https://source.winehq.org/git/tools.git/?a=commit;h=27a033d5374d9e97b177ae9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 2 19:03:20 2020 +0100 testbot: Tweak the VMs default status and snapshot name. These are only relevant when creating a new VM so provide more appropriate defaults. In particular new VMs are normally off and the TestBot deals with powering them up and setting up the live snapshot. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 6dd1ff2..53f4394 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -170,8 +170,8 @@ sub InitializeNew($$) { my ($self, $Collection) = @_; - $self->Status("idle"); - $self->IdleSnapshot("wtb"); + $self->Status("off"); + $self->IdleSnapshot("base-live"); $self->SUPER::InitializeNew($Collection); }

1 0

Jacek Caban : makedep: Use -fno-builtin for crt modules.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 727168a9e116a43f851df2673a9169ad280a9ec8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=727168a9e116a43f851df267… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 19:11:35 2020 +0100 makedep: Use -fno-builtin for crt modules. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index f769713a8cf..d892b7e9541 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2276,6 +2276,15 @@ static struct strarray get_default_imports( const struct makefile *make ) } +/******************************************************************* + * is_crt_module + */ +static int is_crt_module( const char *file ) +{ + return !strncmp( file, "msvcr", 5 ) || !strncmp( file, "ucrt", 4 ) || !strcmp( file, "crtdll.dll" ); +} + + /******************************************************************* * add_crt_import */ @@ -2286,16 +2295,13 @@ static void add_crt_import( const struct makefile *make, struct strarray *import for (i = 0; i < imports->count; i++) { - if (strncmp( imports->str[i], "msvcr", 5 ) && strncmp( imports->str[i], "ucrt", 4 )) continue; + if (!is_crt_module( imports->str[i])) continue; if (crt_dll) fatal_error( "More than one C runtime DLL imported: %s and %s\n", crt_dll, imports->str[i] ); crt_dll = imports->str[i]; } if (!crt_dll && !strarray_exists( &make->extradllflags, "-nodefaultlibs" )) { - if (make->module && - (!strncmp( make->module, "msvcr", 5 ) || - !strncmp( make->module, "ucrt", 4 ) || - !strcmp( make->module, "crtdll.dll" ))) + if (make->module && is_crt_module( make->module )) { crt_dll = make->module; } @@ -3147,7 +3153,8 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( defines ); output_filenames( extra_cross_cflags ); - if (source->file->flags & FLAG_C_IMPLIB) output_filename( "-fno-builtin" ); + if (source->file->flags & FLAG_C_IMPLIB || (make->module && is_crt_module( make->module ))) + output_filename( "-fno-builtin" ); output_filenames( cpp_flags ); output_filename( "$(CROSSCFLAGS)" ); output( "\n" );

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from file.c functions.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 1913affb7b4ee57740a0322e6962d588ae62aca0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1913affb7b4ee57740a0322e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 3 19:11:20 2020 +0100 msvcrt: Remove MSVCRT_ prefix from file.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 168 ++++---- dlls/msvcr100/msvcr100.spec | 372 +++++++++--------- dlls/msvcr110/msvcr110.spec | 372 +++++++++--------- dlls/msvcr120/msvcr120.spec | 372 +++++++++--------- dlls/msvcr70/msvcr70.spec | 236 +++++------ dlls/msvcr71/msvcr71.spec | 236 +++++------ dlls/msvcr80/msvcr80.spec | 372 +++++++++--------- dlls/msvcr90/msvcr90.spec | 372 +++++++++--------- dlls/msvcrt/errno.c | 9 +- dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/file.c | 932 ++++++++++++++++++++++---------------------- dlls/msvcrt/msvcrt.h | 14 - dlls/msvcrt/msvcrt.spec | 308 +++++++-------- dlls/msvcrt/process.c | 27 +- dlls/msvcrt/scanf.h | 24 +- dlls/msvcrtd/msvcrtd.spec | 230 +++++------ dlls/ucrtbase/ucrtbase.spec | 616 ++++++++++++++--------------- include/msvcrt/io.h | 2 +- include/msvcrt/stdio.h | 2 + 19 files changed, 2336 insertions(+), 2330 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1913affb7b4ee57740a0…

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from dir.c functions.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 41fa6e4b6f0e64bfe8be35c215a3c01d8290700c URL: https://source.winehq.org/git/wine.git/?a=commit;h=41fa6e4b6f0e64bfe8be35c2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 3 19:11:02 2020 +0100 msvcrt: Remove MSVCRT_ prefix from dir.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 30 ++++----- dlls/msvcr100/msvcr100.spec | 80 +++++++++++----------- dlls/msvcr110/msvcr110.spec | 80 +++++++++++----------- dlls/msvcr120/msvcr120.spec | 80 +++++++++++----------- dlls/msvcr70/msvcr70.spec | 68 +++++++++---------- dlls/msvcr71/msvcr71.spec | 68 +++++++++---------- dlls/msvcr80/msvcr80.spec | 80 +++++++++++----------- dlls/msvcr90/msvcr90.spec | 80 +++++++++++----------- dlls/msvcrt/dir.c | 141 ++++++++++++++++++++------------------ dlls/msvcrt/file.c | 6 +- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/msvcrt.spec | 94 +++++++++++++------------- dlls/msvcrtd/msvcrtd.spec | 60 ++++++++--------- dlls/ucrtbase/ucrtbase.spec | 160 ++++++++++++++++++++++---------------------- 14 files changed, 519 insertions(+), 509 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=41fa6e4b6f0e64bfe8be…

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from math.c functions.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 4f2f3545e59c00aac92448aebe7484467a8cedce URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f2f3545e59c00aac92448ae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 3 19:10:57 2020 +0100 msvcrt: Remove MSVCRT_ prefix from math.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 96 +++--- dlls/msvcr100/msvcr100.spec | 206 ++++++------ dlls/msvcr110/msvcr110.spec | 230 +++++++------- dlls/msvcr120/msvcr120.spec | 420 ++++++++++++------------- dlls/msvcr70/msvcr70.spec | 98 +++--- dlls/msvcr71/msvcr71.spec | 98 +++--- dlls/msvcr80/msvcr80.spec | 202 ++++++------ dlls/msvcr90/msvcr90.spec | 200 ++++++------ dlls/msvcrt/math.c | 634 ++++++++++++++++++------------------- dlls/msvcrt/msvcrt.h | 3 - dlls/msvcrt/msvcrt.spec | 214 ++++++------- dlls/msvcrt/printf.h | 6 +- dlls/msvcrt/string.c | 2 +- dlls/msvcrtd/msvcrtd.spec | 96 +++--- dlls/ucrtbase/ucrtbase.spec | 750 ++++++++++++++++++++++---------------------- include/msvcrt/math.h | 31 +- 16 files changed, 1649 insertions(+), 1637 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f2f3545e59c00aac924…

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from wcs.c functions.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 6ad42ee7f4df2a3a731e404f090abe383d40dd1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ad42ee7f4df2a3a731e404f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 3 19:10:54 2020 +0100 msvcrt: Remove MSVCRT_ prefix from wcs.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 102 +++--- dlls/msvcr100/msvcr100.spec | 334 +++++++++---------- dlls/msvcr110/msvcr110.spec | 334 +++++++++---------- dlls/msvcr120/msvcr120.spec | 358 ++++++++++---------- dlls/msvcr70/msvcr70.spec | 122 +++---- dlls/msvcr71/msvcr71.spec | 130 ++++---- dlls/msvcr80/msvcr80.spec | 334 +++++++++---------- dlls/msvcr90/msvcr90.spec | 334 +++++++++---------- dlls/msvcrt/console.c | 2 +- dlls/msvcrt/data.c | 16 +- dlls/msvcrt/dir.c | 36 +-- dlls/msvcrt/environ.c | 16 +- dlls/msvcrt/errno.c | 12 +- dlls/msvcrt/exit.c | 6 +- dlls/msvcrt/file.c | 28 +- dlls/msvcrt/locale.c | 28 +- dlls/msvcrt/main.c | 2 +- dlls/msvcrt/math.c | 14 +- dlls/msvcrt/mbcs.c | 20 +- dlls/msvcrt/msvcrt.h | 32 -- dlls/msvcrt/msvcrt.spec | 316 +++++++++--------- dlls/msvcrt/printf.h | 6 +- dlls/msvcrt/process.c | 36 +-- dlls/msvcrt/scanf.h | 2 +- dlls/msvcrt/string.c | 4 +- dlls/msvcrt/time.c | 14 +- dlls/msvcrt/undname.c | 2 +- dlls/msvcrt/wcs.c | 684 +++++++++++++++++++-------------------- dlls/msvcrtd/msvcrtd.spec | 108 +++---- dlls/ucrtbase/ucrtbase.spec | 452 +++++++++++++------------- include/msvcrt/corecrt_wctype.h | 9 + include/msvcrt/corecrt_wstdio.h | 5 +- include/msvcrt/corecrt_wstdlib.h | 2 + include/msvcrt/stdio.h | 10 + 34 files changed, 1949 insertions(+), 1961 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ad42ee7f4df2a3a731e…

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from time.c functions.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 40b3361c0a3363633a764984a1079a7c9f1af9d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40b3361c0a3363633a764984… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 3 19:10:50 2020 +0100 msvcrt: Remove MSVCRT_ prefix from time.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 35 +++--- dlls/msvcr100/msvcr100.spec | 96 +++++++------- dlls/msvcr110/msvcr110.spec | 96 +++++++------- dlls/msvcr120/msvcr120.spec | 96 +++++++------- dlls/msvcr70/msvcr70.spec | 64 +++++----- dlls/msvcr71/msvcr71.spec | 63 +++++----- dlls/msvcr80/msvcr80.spec | 96 +++++++------- dlls/msvcr90/msvcr90.spec | 96 +++++++------- dlls/msvcrt/file.c | 3 +- dlls/msvcrt/msvcrt.spec | 117 +++++++++-------- dlls/msvcrt/time.c | 301 +++++++++++++------------------------------- dlls/msvcrtd/msvcrtd.spec | 50 ++++---- dlls/ucrtbase/ucrtbase.spec | 170 ++++++++++++------------- 13 files changed, 598 insertions(+), 685 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=40b3361c0a3363633a76…

1 0

Jeff Smith : jscript: Clean up date formatting strings with era.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 58c565559bafafb687c38af5ae01d582889e4140 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58c565559bafafb687c38af5… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Dec 3 00:04:26 2020 -0600 jscript: Clean up date formatting strings with era. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/date.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 5ca23f199f3..efb97aa632e 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -441,7 +441,7 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, LOCALE_SABBREVMONTHNAME9, LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 }; - BOOL formatAD = TRUE; + const WCHAR *formatEra = L""; WCHAR week[64], month[64]; WCHAR buf[192]; jsstr_t *date_jsstr; @@ -466,7 +466,7 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, year = year_from_time(time); if(year<0) { - formatAD = FALSE; + formatEra = L" B.C."; year = -year+1; } @@ -480,16 +480,16 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, if(!show_offset) swprintf(buf, ARRAY_SIZE(buf), L"%s %s %d %02d:%02d:%02d %d%s", week, month, day, (int)hour_from_time(time), (int)min_from_time(time), - (int)sec_from_time(time), year, formatAD?L"":L" B.C."); + (int)sec_from_time(time), year, formatEra); else if(offset) swprintf(buf, ARRAY_SIZE(buf), L"%s %s %d %02d:%02d:%02d UTC%c%02d%02d %d%s", week, month, day, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), sign, offset/60, offset%60, - year, formatAD?L"":L" B.C."); + year, formatEra); else swprintf(buf, ARRAY_SIZE(buf), L"%s %s %d %02d:%02d:%02d UTC %d%s", week, month, day, (int)hour_from_time(time), (int)min_from_time(time), - (int)sec_from_time(time), year, formatAD?L"":L" B.C."); + (int)sec_from_time(time), year, formatEra); date_jsstr = jsstr_alloc(buf); if(!date_jsstr) @@ -638,7 +638,7 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva LOCALE_SABBREVMONTHNAME9, LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 }; - BOOL formatAD = TRUE; + const WCHAR *formatEra = L""; WCHAR week[64], month[64]; WCHAR buf[192]; DateInstance *date; @@ -666,15 +666,15 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva year = year_from_time(date->time); if(year<0) { - formatAD = FALSE; + formatEra = L" B.C."; year = -year+1; } day = date_from_time(date->time); swprintf(buf, ARRAY_SIZE(buf), - formatAD ? L"%s, %d %s %d %02d:%02d:%02d UTC" : L"%s, %d %s %d B.C. %02d:%02d:%02d UTC", - week, day, month, year, (int)hour_from_time(date->time), (int)min_from_time(date->time), + L"%s, %d %s %d%s %02d:%02d:%02d UTC", week, day, month, year, formatEra, + (int)hour_from_time(date->time), (int)min_from_time(date->time), (int)sec_from_time(date->time)); date_str = jsstr_alloc(buf); @@ -714,7 +714,7 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r) LOCALE_SABBREVMONTHNAME9, LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 }; - BOOL formatAD = TRUE; + const WCHAR *formatEra = L""; WCHAR week[64], month[64]; WCHAR buf[192]; jsstr_t *date_str; @@ -741,14 +741,13 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r) year = year_from_time(time); if(year<0) { - formatAD = FALSE; + formatEra = L" B.C."; year = -year+1; } day = date_from_time(time); - swprintf(buf, ARRAY_SIZE(buf), formatAD ? L"%s %s %d %d" : L"%s %s %d %d B.C.", week, month, - day, year); + swprintf(buf, ARRAY_SIZE(buf), L"%s %s %d %d%s", week, month, day, year, formatEra); date_str = jsstr_alloc(buf); if(!date_str)

1 0

Jeff Smith : jscript: Use wide-char string literals.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 4d68572aa635094717bd1bdb0165a441f6f8ca2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d68572aa635094717bd1bdb… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Dec 3 00:04:25 2020 -0600 jscript: Use wide-char string literals. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/decode.c | 12 ++++++------ dlls/jscript/function.c | 19 +++++++++---------- dlls/jscript/jsutils.c | 6 +++--- dlls/jscript/parser.y | 4 +--- dlls/jscript/string.c | 4 +--- 5 files changed, 20 insertions(+), 25 deletions(-) diff --git a/dlls/jscript/decode.c b/dlls/jscript/decode.c index 283aa2ed947..6a87d55e0e0 100644 --- a/dlls/jscript/decode.c +++ b/dlls/jscript/decode.c @@ -113,14 +113,14 @@ HRESULT decode_source(WCHAR *code) const WCHAR *src = code; WCHAR *dst = code; - static const WCHAR decode_beginW[] = {'#','@','~','^'}; - static const WCHAR decode_endW[] = {'^','#','~','@'}; + static const WCHAR decode_beginW[] = L"#@~^"; + static const WCHAR decode_endW[] = L"^#~@"; while(*src) { - if(!wcsncmp(src, decode_beginW, ARRAY_SIZE(decode_beginW))) { + if(!wcsncmp(src, decode_beginW, ARRAY_SIZE(decode_beginW)-1)) { DWORD len, i, j=0, csum, s=0; - src += ARRAY_SIZE(decode_beginW); + src += ARRAY_SIZE(decode_beginW) - 1; if(!decode_dword(src, &len)) return JS_E_INVALID_CHAR; @@ -165,9 +165,9 @@ HRESULT decode_source(WCHAR *code) return JS_E_INVALID_CHAR; src += 8; - if(wcsncmp(src, decode_endW, ARRAY_SIZE(decode_endW))) + if(wcsncmp(src, decode_endW, ARRAY_SIZE(decode_endW)-1)) return JS_E_INVALID_CHAR; - src += ARRAY_SIZE(decode_endW); + src += ARRAY_SIZE(decode_endW) - 1; }else { *dst++ = *src++; } diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 9f6aa4b4ec6..7a6dd4b61f3 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -620,17 +620,16 @@ static HRESULT NativeFunction_toString(FunctionInstance *func, jsstr_t **ret) jsstr_t *str; WCHAR *ptr; - static const WCHAR native_prefixW[] = {'\n','f','u','n','c','t','i','o','n',' '}; - static const WCHAR native_suffixW[] = - {'(',')',' ','{','\n',' ',' ',' ',' ','[','n','a','t','i','v','e',' ','c','o','d','e',']','\n','}','\n'}; + static const WCHAR native_prefixW[] = L"\nfunction "; + static const WCHAR native_suffixW[] = L"() {\n [native code]\n}\n"; name_len = function->name ? lstrlenW(function->name) : 0; - str = jsstr_alloc_buf(ARRAY_SIZE(native_prefixW) + ARRAY_SIZE(native_suffixW) + name_len, &ptr); + str = jsstr_alloc_buf(ARRAY_SIZE(native_prefixW) + ARRAY_SIZE(native_suffixW) + name_len - 2, &ptr); if(!str) return E_OUTOFMEMORY; memcpy(ptr, native_prefixW, sizeof(native_prefixW)); - ptr += ARRAY_SIZE(native_prefixW); + ptr += ARRAY_SIZE(native_prefixW) - 1; memcpy(ptr, function->name, name_len*sizeof(WCHAR)); ptr += name_len; memcpy(ptr, native_suffixW, sizeof(native_suffixW)); @@ -912,8 +911,8 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg int j = 0; HRESULT hres = S_OK; - static const WCHAR function_anonymousW[] = {'f','u','n','c','t','i','o','n',' ','a','n','o','n','y','m','o','u','s','('}; - static const WCHAR function_beginW[] = {')',' ','{','\n'}; + static const WCHAR function_anonymousW[] = L"function anonymous("; + static const WCHAR function_beginW[] = L") {\n"; static const WCHAR function_endW[] = L"\n}"; if(argc) { @@ -932,11 +931,11 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg } if(SUCCEEDED(hres)) { - len += ARRAY_SIZE(function_anonymousW) + ARRAY_SIZE(function_beginW) + ARRAY_SIZE(function_endW); + len += ARRAY_SIZE(function_anonymousW) + ARRAY_SIZE(function_beginW) + ARRAY_SIZE(function_endW) - 2; str = heap_alloc(len*sizeof(WCHAR)); if(str) { memcpy(str, function_anonymousW, sizeof(function_anonymousW)); - ptr = str + ARRAY_SIZE(function_anonymousW); + ptr = str + ARRAY_SIZE(function_anonymousW) - 1; if(argc > 1) { while(1) { ptr += jsstr_flush(params[j], ptr); @@ -947,7 +946,7 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg } } memcpy(ptr, function_beginW, sizeof(function_beginW)); - ptr += ARRAY_SIZE(function_beginW); + ptr += ARRAY_SIZE(function_beginW) - 1; if(argc) ptr += jsstr_flush(params[argc-1], ptr); memcpy(ptr, function_endW, sizeof(function_endW)); diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 56e8306ba21..a2ac53f64b9 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -494,7 +494,7 @@ static HRESULT str_to_number(jsstr_t *str, double *ret) BOOL neg = FALSE; DOUBLE d = 0.0; - static const WCHAR infinityW[] = {'I','n','f','i','n','i','t','y'}; + static const WCHAR infinityW[] = L"Infinity"; ptr = jsstr_flatten(str); if(!ptr) @@ -510,8 +510,8 @@ static HRESULT str_to_number(jsstr_t *str, double *ret) ptr++; } - if(!wcsncmp(ptr, infinityW, ARRAY_SIZE(infinityW))) { - ptr += ARRAY_SIZE(infinityW); + if(!wcsncmp(ptr, infinityW, ARRAY_SIZE(infinityW)-1)) { + ptr += ARRAY_SIZE(infinityW) - 1; while(*ptr && iswspace(*ptr)) ptr++; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 6016be6cfd8..ba81668dbb3 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1573,14 +1573,12 @@ HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, byteco heap_pool_t *mark; HRESULT hres; - const WCHAR html_tagW[] = {'<','/','s','c','r','i','p','t','>',0}; - parser_ctx = heap_alloc_zero(sizeof(parser_ctx_t)); if(!parser_ctx) return E_OUTOFMEMORY; parser_ctx->error_loc = -1; - parser_ctx->is_html = delimiter && !wcsicmp(delimiter, html_tagW); + parser_ctx->is_html = delimiter && !wcsicmp(delimiter, L"</script>"); parser_ctx->begin = parser_ctx->ptr = code->source; parser_ctx->end = parser_ctx->begin + lstrlenW(parser_ctx->begin); diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 3dd40e6744f..a8bd77dc398 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -888,9 +888,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un if(FAILED(hres)) break; }else { - static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d'}; - - hres = strbuf_append(&ret, undefinedW, ARRAY_SIZE(undefinedW)); + hres = strbuf_append(&ret, L"undefined", ARRAY_SIZE(L"undefined")-1); if(FAILED(hres)) break; }

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2020