December 2020 - Wine-Commits

Nikolay Sivov : dwrite/shaping: Merge extension subtables handling with existing helper.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 240567a8b3858c67b32f2146a190cf2abbb8bc1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=240567a8b3858c67b32f2146… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 2 14:44:01 2020 +0300 dwrite/shaping: Merge extension subtables handling with existing helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 103 +++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 60 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 68da6e4ecfb..1cf47e5ac69 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3499,13 +3499,46 @@ static void opentype_layout_apply_gpos_value(struct scriptshaping_context *conte } } +struct lookup +{ + unsigned short index; + unsigned short type; + unsigned short flags; + unsigned short subtable_count; + + unsigned int mask; + unsigned int offset; +}; + static unsigned int opentype_layout_get_gsubgpos_subtable(const struct scriptshaping_context *context, - unsigned int lookup_offset, unsigned int subtable) + const struct lookup *lookup, unsigned int subtable, unsigned int *lookup_type) { - unsigned int subtable_offset = table_read_be_word(&context->table->table, lookup_offset + + unsigned int subtable_offset = table_read_be_word(&context->table->table, lookup->offset + FIELD_OFFSET(struct ot_lookup_table, subtable[subtable])); + const struct ot_gsubgpos_extension_format1 *format1; + + subtable_offset += lookup->offset; + + if ((context->table == &context->cache->gsub && lookup->type != GSUB_LOOKUP_EXTENSION_SUBST) || + (context->table == &context->cache->gpos && lookup->type != GPOS_LOOKUP_EXTENSION_POSITION)) + { + *lookup_type = lookup->type; + return subtable_offset; + } + + *lookup_type = 0; + + if (!(format1 = table_read_ensure(&context->table->table, subtable_offset, sizeof(*format1)))) + return 0; + + if (GET_BE_WORD(format1->format) != 1) + { + WARN("Unexpected extension table format %#x.\n", format1->format); + return 0; + } - return lookup_offset + subtable_offset; + *lookup_type = GET_BE_WORD(format1->lookup_type); + return subtable_offset + GET_BE_DWORD(format1->extension_offset); } struct ot_lookup @@ -3715,17 +3748,6 @@ static BOOL glyph_iterator_prev(struct glyph_iterator *iter) return FALSE; } -struct lookup -{ - unsigned short index; - unsigned short type; - unsigned short flags; - unsigned short subtable_count; - - unsigned int mask; - unsigned int offset; -}; - static BOOL opentype_layout_apply_gpos_single_adjustment(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { @@ -4247,31 +4269,6 @@ static BOOL opentype_layout_apply_gpos_mark_to_mark_attachment(struct scriptshap return TRUE; } -static unsigned int opentype_layout_adjust_extension_subtable(struct scriptshaping_context *context, - unsigned int *subtable_offset, const struct lookup *lookup) -{ - const struct ot_gsubgpos_extension_format1 *format1; - - if ((context->table == &context->cache->gsub && lookup->type != GSUB_LOOKUP_EXTENSION_SUBST) || - (context->table == &context->cache->gpos && lookup->type != GPOS_LOOKUP_EXTENSION_POSITION)) - { - return lookup->type; - } - - if (!(format1 = table_read_ensure(&context->table->table, *subtable_offset, sizeof(*format1)))) - return 0; - - if (GET_BE_WORD(format1->format) != 1) - { - WARN("Unexpected extension table format %#x.\n", format1->format); - return 0; - } - - *subtable_offset = *subtable_offset + GET_BE_DWORD(format1->extension_offset); - - return GET_BE_WORD(format1->lookup_type); -} - static BOOL opentype_layout_apply_context(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset); static BOOL opentype_layout_apply_chain_context(struct scriptshaping_context *context, const struct lookup *lookup, @@ -4284,9 +4281,7 @@ static BOOL opentype_layout_apply_gpos_lookup(struct scriptshaping_context *cont for (i = 0; i < lookup->subtable_count; ++i) { - unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup->offset, i); - - lookup_type = opentype_layout_adjust_extension_subtable(context, &subtable_offset, lookup); + unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup, i, &lookup_type); switch (lookup_type) { @@ -5595,9 +5590,7 @@ static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont for (i = 0; i < lookup->subtable_count; ++i) { - unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup->offset, i); - - lookup_type = opentype_layout_adjust_extension_subtable(context, &subtable_offset, lookup); + unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup, i, &lookup_type); switch (lookup_type) { @@ -5740,14 +5733,9 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c static BOOL opentype_is_gsub_lookup_reversed(const struct scriptshaping_context *context, const struct lookup *lookup) { - unsigned int subtable_offset, lookup_type = lookup->type; + unsigned int lookup_type; - if (lookup->type == GSUB_LOOKUP_EXTENSION_SUBST) - { - subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup->offset, 0); - /* Assumes format 1. */ - lookup_type = table_read_be_word(&context->table->table, subtable_offset + 2); - } + opentype_layout_get_gsubgpos_subtable(context, lookup, 0, &lookup_type); return lookup_type == GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST; } @@ -5914,9 +5902,7 @@ static BOOL opentype_layout_gsub_lookup_is_glyph_covered(struct scriptshaping_co for (i = 0; i < lookup->subtable_count; ++i) { - unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup->offset, i); - - lookup_type = opentype_layout_adjust_extension_subtable(context, &subtable_offset, lookup); + unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup, i, &lookup_type); format = table_read_be_word(gsub, subtable_offset); @@ -5981,9 +5967,7 @@ static BOOL opentype_layout_gpos_lookup_is_glyph_covered(struct scriptshaping_co for (i = 0; i < lookup->subtable_count; ++i) { - unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup->offset, i); - - lookup_type = opentype_layout_adjust_extension_subtable(context, &subtable_offset, lookup); + unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup, i, &lookup_type); format = table_read_be_word(gpos, subtable_offset); @@ -6104,8 +6088,7 @@ BOOL opentype_has_vertical_variants(struct dwrite_fontface *fontface) for (j = 0; j < lookup->subtable_count && !count; ++j) { - subtable_offset = opentype_layout_get_gsubgpos_subtable(&context, lookup->offset, j); - lookup_type = opentype_layout_adjust_extension_subtable(&context, &subtable_offset, lookup); + subtable_offset = opentype_layout_get_gsubgpos_subtable(&context, lookup, j, &lookup_type); if (lookup_type != GSUB_LOOKUP_SINGLE_SUBST) continue;

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from process.c functions.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: f10c1118e2c2159140d32730f2e49ec70f37bd33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f10c1118e2c2159140d32730… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 2 00:53:59 2020 +0100 msvcrt: Remove MSVCRT_ prefix from process.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 24 ++++++++-------- dlls/msvcr100/msvcr100.spec | 42 ++++++++++++++-------------- dlls/msvcr110/msvcr110.spec | 44 ++++++++++++++--------------- dlls/msvcr120/msvcr120.spec | 44 ++++++++++++++--------------- dlls/msvcr70/msvcr70.spec | 42 ++++++++++++++-------------- dlls/msvcr71/msvcr71.spec | 42 ++++++++++++++-------------- dlls/msvcr80/msvcr80.spec | 42 ++++++++++++++-------------- dlls/msvcr90/msvcr90.spec | 42 ++++++++++++++-------------- dlls/msvcrt/msvcrt.h | 5 ---- dlls/msvcrt/msvcrt.spec | 42 ++++++++++++++-------------- dlls/msvcrt/process.c | 67 ++++++++++++++++++++++---------------------- dlls/msvcrtd/msvcrtd.spec | 42 ++++++++++++++-------------- dlls/ucrtbase/ucrtbase.spec | 68 ++++++++++++++++++++++----------------------- 13 files changed, 271 insertions(+), 275 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f10c1118e2c2159140d3…

1 0

Alexandre Julliard : hhctrl.ocx: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 810a2f0be26a308b5105d5e97bc2a7223962800d URL: https://source.winehq.org/git/wine.git/?a=commit;h=810a2f0be26a308b5105d5e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 12:19:34 2020 +0100 hhctrl.ocx: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/search.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/search.c b/dlls/hhctrl.ocx/search.c index f9c13a91312..75bbc2e4ba2 100644 --- a/dlls/hhctrl.ocx/search.c +++ b/dlls/hhctrl.ocx/search.c @@ -102,7 +102,7 @@ static WCHAR *SearchCHM_File(IStorage *pStorage, const WCHAR *file, const char * char *text = &content.buf[1]; int textlen = content.len-1; - if(!_strnicmp(node_name.buf, "title", -1)) + if(!stricmp(node_name.buf, "title")) { int wlen = MultiByteToWideChar(CP_ACP, 0, text, textlen, NULL, 0); title = heap_alloc((wlen+1)*sizeof(WCHAR));

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from scanf.c functions.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: a1662e3f7d6626618dc0158627ffbe8cf2c81be0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1662e3f7d6626618dc01586… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 2 00:54:03 2020 +0100 msvcrt: Remove MSVCRT_ prefix from scanf.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 12 +-- dlls/msvcr100/msvcr100.spec | 64 +++++++-------- dlls/msvcr110/msvcr110.spec | 64 +++++++-------- dlls/msvcr120/msvcr120.spec | 66 +++++++-------- dlls/msvcr70/msvcr70.spec | 16 ++-- dlls/msvcr71/msvcr71.spec | 16 ++-- dlls/msvcr80/msvcr80.spec | 64 +++++++-------- dlls/msvcr90/msvcr90.spec | 64 +++++++-------- dlls/msvcrt/math.c | 4 +- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 64 +++++++-------- dlls/msvcrt/scanf.c | 176 ++++++++++++++++++++-------------------- dlls/msvcrt/scanf.h | 32 ++++---- dlls/msvcrtd/msvcrtd.spec | 12 +-- dlls/ucrtbase/ucrtbase.spec | 16 ++-- include/msvcrt/corecrt_wstdio.h | 8 +- include/msvcrt/stdio.h | 8 +- 17 files changed, 348 insertions(+), 340 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a1662e3f7d6626618dc0…

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from string.c functions.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 1514c54ce560acadb4cacb77cd4ee5915e8dbd67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1514c54ce560acadb4cacb77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 2 00:54:09 2020 +0100 msvcrt: Remove MSVCRT_ prefix from string.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 62 ++++---- dlls/msvcr100/msvcr100.spec | 158 +++++++++--------- dlls/msvcr110/msvcr110.spec | 158 +++++++++--------- dlls/msvcr120/msvcr120.spec | 186 +++++++++++----------- dlls/msvcr70/msvcr70.spec | 76 ++++----- dlls/msvcr71/msvcr71.spec | 74 ++++----- dlls/msvcr80/msvcr80.spec | 158 +++++++++--------- dlls/msvcr90/msvcr90.spec | 158 +++++++++--------- dlls/msvcrt/data.c | 2 +- dlls/msvcrt/dir.c | 2 +- dlls/msvcrt/environ.c | 2 +- dlls/msvcrt/except.c | 2 +- dlls/msvcrt/file.c | 4 +- dlls/msvcrt/locale.c | 18 +-- dlls/msvcrt/mbcs.c | 22 +-- dlls/msvcrt/msvcrt.h | 15 +- dlls/msvcrt/msvcrt.spec | 160 +++++++++---------- dlls/msvcrt/printf.h | 2 +- dlls/msvcrt/string.c | 273 ++++++++++++++++---------------- dlls/msvcrt/time.c | 6 +- dlls/msvcrt/undname.c | 4 +- dlls/msvcrtd/msvcrtd.spec | 72 ++++----- dlls/ucrtbase/ucrtbase.spec | 334 +++++++++++++++++++-------------------- include/msvcrt/corecrt_wstdlib.h | 4 +- 24 files changed, 970 insertions(+), 982 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1514c54ce560acadb4ca…

1 0

Piotr Caban : msvcrt: Use stdio.h definitions.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 0d479b9d8c54184cce9678b3095bf01d5b4a473c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d479b9d8c54184cce9678b3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 2 00:53:28 2020 +0100 msvcrt: Use stdio.h definitions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 242 ++++++++++++++++++++++++------------------------- dlls/msvcrt/msvcrt.h | 31 +------ include/msvcrt/stdio.h | 1 + 3 files changed, 126 insertions(+), 148 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0d479b9d8c54184cce96…

1 0

Alexandre Julliard : include: Remove some no longer used Unicode functions.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 6ca76dc5e73733d7fb8212a614bf093cd49da342 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ca76dc5e73733d7fb8212a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 12:19:09 2020 +0100 include: Remove some no longer used Unicode functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 4 +- dlls/mountmgr.sys/device.c | 2 +- dlls/netapi32/netapi32.c | 2 +- dlls/shell32/autocomplete.c | 2 +- dlls/winemac.drv/keyboard.c | 2 +- include/wine/unicode.h | 124 ++------------------------------------------ programs/winedbg/memory.c | 10 +--- 7 files changed, 13 insertions(+), 133 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index f11388628e6..7ee8e18eff7 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -293,9 +293,11 @@ static inline UINT16 get_char_script(WCHAR c) static DWRITE_SCRIPT_ANALYSIS get_char_sa(WCHAR c) { DWRITE_SCRIPT_ANALYSIS sa; + WORD type; + GetStringTypeW(CT_CTYPE1, &c, 1, &type); sa.script = get_char_script(c); - sa.shapes = iscntrlW(c) || c == 0x2028 /* LINE SEPARATOR */ || c == 0x2029 /* PARAGRAPH SEPARATOR */ ? + sa.shapes = (type & C1_CNTRL) || c == 0x2028 /* LINE SEPARATOR */ || c == 0x2029 /* PARAGRAPH SEPARATOR */ ? DWRITE_SCRIPT_SHAPES_NO_VISUAL : DWRITE_SCRIPT_SHAPES_DEFAULT; return sa; } diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index ed345d110a4..c4e30aa1f33 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -2086,7 +2086,7 @@ static void create_port_devices( DRIVER_OBJECT *driver ) if (type != REG_SZ || strncmpiW( port, port_prefix, 3 )) continue; - n = atolW( port + 3 ); + n = atoiW( port + 3 ); if (n < 1 || n >= MAX_PORTS) continue; diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 4cbd02f9d3d..2e2ac84a49c 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -3621,7 +3621,7 @@ DWORD WINAPI DavGetUNCFromHTTPPath(const WCHAR *http_path, WCHAR *buf, DWORD *bu if (*p == ':') { port = ++p; - while (*p && isdigitW(*p)) { p++; len_port++; }; + while (*p >= '0' && *p <= '9') { p++; len_port++; }; if (len_port == 2 && !ssl && !memcmp( port, port80W, sizeof(port80W) )) port = NULL; else if (len_port == 3 && ssl && !memcmp( port, port443W, sizeof(port443W) )) port = NULL; path = p; diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index f0777ff1398..ac97527852d 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -799,7 +799,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, This->no_fwd_char = '\0'; /* Don't autocomplete at all on most control characters */ - if (iscntrlW(wParam) && !(wParam >= '\b' && wParam <= '\r')) + if (wParam < 32 && !(wParam >= '\b' && wParam <= '\r')) break; ret = CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index bb408cb20c5..45770b3125b 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1242,7 +1242,7 @@ INT CDECL macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) 0, &deadKeyState, size - 1, &len, (UniChar*)buffer); if (status != noErr) len = 0; - if (len && isgraphW(buffer[0])) + if (len && buffer[0] > 32) buffer[len] = 0; vkey = thread_data->keyc2vkey[keyc]; diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 7a9e07fa1bc..d29a371fe53 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -28,18 +28,10 @@ #include <winnls.h> #include <winternl.h> -#ifdef __WINE_WINE_TEST_H -#error This file should not be used in Wine tests -#endif - #ifdef __WINE_USE_MSVCRT #error This file should not be used with msvcrt headers #endif -#ifdef __cplusplus -extern "C" { -#endif - #ifndef WINE_UNICODE_INLINE #define WINE_UNICODE_INLINE static FORCEINLINE #endif @@ -54,72 +46,13 @@ WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch ) return RtlUpcaseUnicodeChar( ch ); } -/* the character type contains the C1_* flags in the low 12 bits */ -/* and the C2_* type in the high 4 bits */ -WINE_UNICODE_INLINE unsigned short get_char_typeW( WCHAR ch ) -{ - unsigned short type; - GetStringTypeW( CT_CTYPE1, &ch, 1, &type ); - return type; -} - -WINE_UNICODE_INLINE int iscntrlW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_CNTRL; -} - -WINE_UNICODE_INLINE int ispunctW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_PUNCT; -} - WINE_UNICODE_INLINE int isspaceW( WCHAR wc ) { - return get_char_typeW(wc) & C1_SPACE; -} - -WINE_UNICODE_INLINE int isdigitW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_DIGIT; -} - -WINE_UNICODE_INLINE int isxdigitW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_XDIGIT; -} - -WINE_UNICODE_INLINE int islowerW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_LOWER; -} - -WINE_UNICODE_INLINE int isupperW( WCHAR wc ) -{ - return get_char_typeW(wc) & C1_UPPER; -} - -WINE_UNICODE_INLINE int isalnumW( WCHAR wc ) -{ - return get_char_typeW(wc) & (C1_ALPHA|C1_DIGIT|C1_LOWER|C1_UPPER); -} - -WINE_UNICODE_INLINE int isalphaW( WCHAR wc ) -{ - return get_char_typeW(wc) & (C1_ALPHA|C1_LOWER|C1_UPPER); -} - -WINE_UNICODE_INLINE int isgraphW( WCHAR wc ) -{ - return get_char_typeW(wc) & (C1_ALPHA|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); -} - -WINE_UNICODE_INLINE int isprintW( WCHAR wc ) -{ - return get_char_typeW(wc) & (C1_ALPHA|C1_BLANK|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); + unsigned short type; + GetStringTypeW( CT_CTYPE1, &wc, 1, &type ); + return type & C1_SPACE; } -/* some useful string manipulation routines */ - WINE_UNICODE_INLINE unsigned int strlenW( const WCHAR *str ) { const WCHAR *s = str; @@ -134,9 +67,6 @@ WINE_UNICODE_INLINE WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) return dst; } -/* strncpy doesn't do what you think, don't use it */ -#define strncpyW(d,s,n) error do_not_use_strncpyW_use_lstrcpynW_or_memcpy_instead - WINE_UNICODE_INLINE int strcmpW( const WCHAR *str1, const WCHAR *str2 ) { while (*str1 && (*str1 == *str2)) { str1++; str2++; } @@ -175,20 +105,6 @@ WINE_UNICODE_INLINE WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) return NULL; } -WINE_UNICODE_INLINE size_t strspnW( const WCHAR *str, const WCHAR *accept ) -{ - const WCHAR *ptr; - for (ptr = str; *ptr; ptr++) if (!strchrW( accept, *ptr )) break; - return ptr - str; -} - -WINE_UNICODE_INLINE size_t strcspnW( const WCHAR *str, const WCHAR *reject ) -{ - const WCHAR *ptr; - for (ptr = str; *ptr; ptr++) if (strchrW( reject, *ptr )) break; - return ptr - str; -} - WINE_UNICODE_INLINE WCHAR *strlwrW( WCHAR *str ) { WCHAR *ret; @@ -196,13 +112,6 @@ WINE_UNICODE_INLINE WCHAR *strlwrW( WCHAR *str ) return ret; } -WINE_UNICODE_INLINE WCHAR *struprW( WCHAR *str ) -{ - WCHAR *ret; - for (ret = str; *str; str++) *str = toupperW(*str); - return ret; -} - WINE_UNICODE_INLINE WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) { const WCHAR *end; @@ -210,14 +119,6 @@ WINE_UNICODE_INLINE WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) return NULL; } -WINE_UNICODE_INLINE WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) -{ - const WCHAR *end; - WCHAR *ret = NULL; - for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) ret = (WCHAR *)(ULONG_PTR)ptr; - return ret; -} - WINE_UNICODE_INLINE int strcmpiW( const WCHAR *str1, const WCHAR *str2 ) { for (;;) @@ -237,14 +138,6 @@ WINE_UNICODE_INLINE int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ) return ret; } -WINE_UNICODE_INLINE int memicmpW( const WCHAR *str1, const WCHAR *str2, int n ) -{ - int ret = 0; - for ( ; n > 0; n--, str1++, str2++) - if ((ret = tolowerW(*str1) - tolowerW(*str2))) break; - return ret; -} - WINE_UNICODE_INLINE WCHAR *strstrW( const WCHAR *str, const WCHAR *sub ) { while (*str) @@ -350,14 +243,9 @@ WINE_UNICODE_INLINE ULONG strtoulW( LPCWSTR s, LPWSTR *end, INT base ) return negative ? -ret : ret; } -WINE_UNICODE_INLINE long int atolW( const WCHAR *str ) -{ - return strtolW( str, (WCHAR **)0, 10 ); -} - WINE_UNICODE_INLINE int atoiW( const WCHAR *str ) { - return (int)atolW( str ); + return (int)strtolW( str, (WCHAR **)0, 10 ); } NTSYSAPI int __cdecl _vsnwprintf(WCHAR*,size_t,const WCHAR*,__ms_va_list); @@ -384,8 +272,4 @@ static inline int WINAPIV sprintfW( WCHAR *str, const WCHAR *format, ...) #undef WINE_UNICODE_INLINE -#ifdef __cplusplus -} -#endif - #endif /* __WINE_WINE_UNICODE_H */ diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index c9b97686aab..8cc039a6899 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -394,15 +394,9 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) */ if (!dbg_curr_process->be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return; print_char: - if (size == 1 && isprint((char)val_int)) + if ((size == 1 && isprint((char)val_int)) || + (size == 2 && val_int < 127 && isprint((char)val_int))) dbg_printf("'%c'", (char)val_int); - else if (size == 2 && isprintW((WCHAR)val_int)) - { - WCHAR wch = (WCHAR)val_int; - dbg_printf("'"); - dbg_outputW(&wch, 1); - dbg_printf("'"); - } else dbg_printf("%d", (int)val_int); break;

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from mbcs.c functions.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 065cf4e71496d96baf5f7ff35af4f0bbfee9d1a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=065cf4e71496d96baf5f7ff3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 2 00:53:51 2020 +0100 msvcrt: Remove MSVCRT_ prefix from mbcs.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 6 ++--- dlls/msvcr100/msvcr100.spec | 24 ++++++++++---------- dlls/msvcr110/msvcr110.spec | 24 ++++++++++---------- dlls/msvcr120/msvcr120.spec | 24 ++++++++++---------- dlls/msvcr70/msvcr70.spec | 8 +++---- dlls/msvcr71/msvcr71.spec | 8 +++---- dlls/msvcr80/msvcr80.spec | 24 ++++++++++---------- dlls/msvcr90/msvcr90.spec | 24 ++++++++++---------- dlls/msvcrt/exit.c | 8 +++---- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/mbcs.c | 38 +++++++++++++++---------------- dlls/msvcrt/msvcrt.h | 6 ----- dlls/msvcrt/msvcrt.spec | 24 ++++++++++---------- dlls/msvcrt/printf.h | 2 +- dlls/msvcrt/time.c | 8 +++---- dlls/msvcrtd/msvcrtd.spec | 8 +++---- dlls/ucrtbase/ucrtbase.spec | 48 ++++++++++++++++++++-------------------- include/msvcrt/corecrt_wstdlib.h | 3 +++ 19 files changed, 145 insertions(+), 148 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=065cf4e71496d96baf5f…

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from except.c functions.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 6bd9ea5be9c1e53d2cf7369c5eb75817b3c80df5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bd9ea5be9c1e53d2cf7369c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 2 00:53:42 2020 +0100 msvcrt: Remove MSVCRT_ prefix from except.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 10 +++++----- dlls/msvcr120/msvcr120.spec | 10 +++++----- dlls/msvcr70/msvcr70.spec | 8 ++++---- dlls/msvcr71/msvcr71.spec | 8 ++++---- dlls/msvcr80/msvcr80.spec | 8 ++++---- dlls/msvcr90/msvcr90.spec | 8 ++++---- dlls/msvcrt/except.c | 22 +++++++++++----------- dlls/msvcrt/exit.c | 4 ++-- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/msvcrt.spec | 8 ++++---- dlls/msvcrtd/msvcrtd.spec | 6 +++--- dlls/ucrtbase/ucrtbase.spec | 18 +++++++++--------- 14 files changed, 62 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6bd9ea5be9c1e53d2cf7…

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from exit.c functions.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 2c35caa7671ec4fbf90651e3301cfc58c011031c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c35caa7671ec4fbf90651e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 2 00:53:47 2020 +0100 msvcrt: Remove MSVCRT_ prefix from exit.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 14 +++++------ dlls/msvcr100/msvcr100.spec | 20 +++++++-------- dlls/msvcr110/msvcr110.spec | 22 ++++++++--------- dlls/msvcr120/msvcr120.spec | 24 +++++++++--------- dlls/msvcr70/msvcr70.spec | 16 ++++++------ dlls/msvcr71/msvcr71.spec | 16 ++++++------ dlls/msvcr80/msvcr80.spec | 20 +++++++-------- dlls/msvcr90/msvcr90.spec | 20 +++++++-------- dlls/msvcrt/cpp.c | 2 +- dlls/msvcrt/errno.c | 2 +- dlls/msvcrt/except.c | 6 ++--- dlls/msvcrt/exit.c | 44 ++++++++++++++++----------------- dlls/msvcrt/locale.c | 10 ++++---- dlls/msvcrt/msvcrt.h | 2 -- dlls/msvcrt/msvcrt.spec | 18 +++++++------- dlls/msvcrt/process.c | 2 +- dlls/msvcrtd/msvcrtd.spec | 16 ++++++------ dlls/ucrtbase/ucrtbase.spec | 60 ++++++++++++++++++++++----------------------- 18 files changed, 156 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2c35caa7671ec4fbf906…

1 0