wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Alexandre Julliard : msvcrt: Use the msvcrt string functions internally.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 2fb08bed46fec302954578038566593bb108b57c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fb08bed46fec30295457803… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 16:04:34 2020 +0100 msvcrt: Use the msvcrt string functions internally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 4 ++-- dlls/msvcrt/mbcs.c | 4 ++-- dlls/msvcrt/msvcrt.h | 4 ++++ dlls/msvcrt/time.c | 6 +++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e68c16d7a57..e5b0e67c4be 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2455,7 +2455,7 @@ char * CDECL MSVCRT__ecvt( double number, int ndigits, int *decpt, int *sign ) /* take the exponential "e" out */ data->efcvt_buffer[ prec] = '\0'; /* read the exponent */ - sscanf( data->efcvt_buffer + prec + 1, "%d", decpt); + MSVCRT_sscanf( data->efcvt_buffer + prec + 1, "%d", decpt); (*decpt)++; /* adjust for some border cases */ if( data->efcvt_buffer[0] == '0')/* value is zero */ @@ -2515,7 +2515,7 @@ int CDECL MSVCRT__ecvt_s( char *buffer, MSVCRT_size_t length, double number, int /* take the exponential "e" out */ result[ prec] = '\0'; /* read the exponent */ - sscanf( result + prec + 1, "%d", decpt); + MSVCRT_sscanf( result + prec + 1, "%d", decpt); (*decpt)++; /* adjust for some border cases */ if( result[0] == '0')/* value is zero */ diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 13fffc5734a..dae3cb5cee2 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -124,7 +124,7 @@ static inline MSVCRT_size_t u_strlen( const unsigned char *str ) static inline unsigned char* u_strncat( unsigned char* dst, const unsigned char* src, MSVCRT_size_t len ) { - return (unsigned char*)strncat( (char*)dst, (const char*)src, len); + return (unsigned char*)MSVCRT_strncat( (char*)dst, (const char*)src, len); } static inline int u_strcmp( const unsigned char *s1, const unsigned char *s2 ) @@ -154,7 +154,7 @@ static inline unsigned char *u_strchr( const unsigned char *s, unsigned char x ) static inline unsigned char *u_strrchr( const unsigned char *s, unsigned char x ) { - return (unsigned char*) strrchr( (const char*)s, x ); + return (unsigned char*) MSVCRT_strrchr( (const char*)s, x ); } static inline unsigned char *u__strset( unsigned char *s, unsigned char c ) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 7c9e3137e14..229d8a07a9b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1170,6 +1170,7 @@ int __cdecl _ungetch(int); int __cdecl _cputs(const char*); int WINAPIV _cprintf(const char*,...); int WINAPIV _cwprintf(const MSVCRT_wchar_t*,...); +int WINAPIV MSVCRT_sscanf(const char *, const char *, ...); char*** __cdecl MSVCRT___p__environ(void); int* __cdecl __p___mb_cur_max(void); int* __cdecl MSVCRT___p__fmode(void); @@ -1200,9 +1201,12 @@ int __cdecl MSVCRT__stricmp(const char*, const char*); int __cdecl MSVCRT__strnicmp(const char*, const char*, MSVCRT_size_t); int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); int __cdecl MSVCRT__strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); +char* __cdecl MSVCRT_strncat(char*,const char *,MSVCRT_size_t); int __cdecl MSVCRT_strncmp(const char*, const char*, MSVCRT_size_t); int __cdecl MSVCRT_strcmp(const char*, const char*); +char* __cdecl MSVCRT_strrchr(const char *, int); char* __cdecl MSVCRT_strstr(const char*, const char*); +MSVCRT_long __cdecl MSVCRT_strtol(const char*, char**, int); unsigned int __cdecl MSVCRT__get_output_format(void); char* __cdecl MSVCRT_strtok_s(char*, const char*, char**); char* __cdecl MSVCRT__itoa(int, char*, int); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b71f5ac1224..702aaa8166f 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -127,11 +127,11 @@ void CDECL MSVCRT__tzset(void) }else if(*tz == '+') { tz++; } - MSVCRT___timezone = strtol(tz, &tz, 10)*3600; + MSVCRT___timezone = MSVCRT_strtol(tz, &tz, 10)*3600; if(*tz == ':') { - MSVCRT___timezone += strtol(tz+1, &tz, 10)*60; + MSVCRT___timezone += MSVCRT_strtol(tz+1, &tz, 10)*60; if(*tz == ':') - MSVCRT___timezone += strtol(tz+1, &tz, 10); + MSVCRT___timezone += MSVCRT_strtol(tz+1, &tz, 10); } if(neg_zone) MSVCRT___timezone = -MSVCRT___timezone;

1 0

Alexandre Julliard : msvcrt: Use the msvcrt atoi() function internally.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: f48648aeec69f74899ba2f074b60aeb0de03615b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f48648aeec69f74899ba2f07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 16:04:09 2020 +0100 msvcrt: Use the msvcrt atoi() function internally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 52 +++++++++++++++++++++++++-------------------------- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/string.c | 2 +- dlls/msvcrt/undname.c | 4 ++-- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 37c4afcf786..32f2c9b4624 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -357,7 +357,7 @@ LCID MSVCRT_locale_to_LCID(const char *locale, unsigned short *codepage, BOOL *s locale_cp = CP_UTF8; #endif } else { - locale_cp = atoi(cp + 1); + locale_cp = MSVCRT_atoi(cp + 1); } if (!IsValidCodePage(locale_cp)) return -1; @@ -1118,7 +1118,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, LCID lcid[6] = { 0 }; unsigned short cp[6] = { 0 }; const char *locale_name[6] = { 0 }; - int locale_len[6] = { 0 }; + int val, locale_len[6] = { 0 }; char buf[256]; BOOL sname; #if _MSVCR_VER >= 100 @@ -1437,65 +1437,65 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } - if(GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_IINTLCURRDIGITS - |LOCALE_NOUSEROVERRIDE, buf, 256)) - locinfo->lconv->int_frac_digits = atoi(buf); + if(GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_IINTLCURRDIGITS + |LOCALE_NOUSEROVERRIDE|LOCALE_RETURN_NUMBER, (WCHAR *)&val, 2)) + locinfo->lconv->int_frac_digits = val; else { free_locinfo(locinfo); return NULL; } - if(GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_ICURRDIGITS - |LOCALE_NOUSEROVERRIDE, buf, 256)) - locinfo->lconv->frac_digits = atoi(buf); + if(GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_ICURRDIGITS + |LOCALE_NOUSEROVERRIDE|LOCALE_RETURN_NUMBER, (WCHAR *)&val, 2)) + locinfo->lconv->frac_digits = val; else { free_locinfo(locinfo); return NULL; } - if(GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_IPOSSYMPRECEDES - |LOCALE_NOUSEROVERRIDE, buf, 256)) - locinfo->lconv->p_cs_precedes = atoi(buf); + if(GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_IPOSSYMPRECEDES + |LOCALE_NOUSEROVERRIDE|LOCALE_RETURN_NUMBER, (WCHAR *)&val, 2)) + locinfo->lconv->p_cs_precedes = val; else { free_locinfo(locinfo); return NULL; } - if(GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_IPOSSEPBYSPACE - |LOCALE_NOUSEROVERRIDE, buf, 256)) - locinfo->lconv->p_sep_by_space = atoi(buf); + if(GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_IPOSSEPBYSPACE + |LOCALE_NOUSEROVERRIDE|LOCALE_RETURN_NUMBER, (WCHAR *)&val, 2)) + locinfo->lconv->p_sep_by_space = val; else { free_locinfo(locinfo); return NULL; } - if(GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_INEGSYMPRECEDES - |LOCALE_NOUSEROVERRIDE, buf, 256)) - locinfo->lconv->n_cs_precedes = atoi(buf); + if(GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_INEGSYMPRECEDES + |LOCALE_NOUSEROVERRIDE|LOCALE_RETURN_NUMBER, (WCHAR *)&val, 2)) + locinfo->lconv->n_cs_precedes = val; else { free_locinfo(locinfo); return NULL; } - if(GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_INEGSEPBYSPACE - |LOCALE_NOUSEROVERRIDE, buf, 256)) - locinfo->lconv->n_sep_by_space = atoi(buf); + if(GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_INEGSEPBYSPACE + |LOCALE_NOUSEROVERRIDE|LOCALE_RETURN_NUMBER, (WCHAR *)&val, 2)) + locinfo->lconv->n_sep_by_space = val; else { free_locinfo(locinfo); return NULL; } - if(GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_IPOSSIGNPOSN - |LOCALE_NOUSEROVERRIDE, buf, 256)) - locinfo->lconv->p_sign_posn = atoi(buf); + if(GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_IPOSSIGNPOSN + |LOCALE_NOUSEROVERRIDE|LOCALE_RETURN_NUMBER, (WCHAR *)&val, 2)) + locinfo->lconv->p_sign_posn = val; else { free_locinfo(locinfo); return NULL; } - if(GetLocaleInfoA(lcid[MSVCRT_LC_MONETARY], LOCALE_INEGSIGNPOSN - |LOCALE_NOUSEROVERRIDE, buf, 256)) - locinfo->lconv->n_sign_posn = atoi(buf); + if(GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_INEGSIGNPOSN + |LOCALE_NOUSEROVERRIDE|LOCALE_RETURN_NUMBER, (WCHAR *)&val, 2)) + locinfo->lconv->n_sign_posn = val; else { free_locinfo(locinfo); return NULL; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index ab5b4c13f85..7c9e3137e14 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1072,6 +1072,7 @@ void* __cdecl MSVCRT_malloc(MSVCRT_size_t); void* __cdecl MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); void* __cdecl MSVCRT_realloc(void*,MSVCRT_size_t); +int __cdecl MSVCRT_atoi(const char *str); int __cdecl MSVCRT_isalpha(int c); int __cdecl MSVCRT_isdigit(int c); int __cdecl MSVCRT_isspace(int c); diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 5a11eb1312b..d08687244b4 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2441,7 +2441,7 @@ int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I1 MSVCRT_sprintf(buf, format, d); buf[1] = buf[0]; - data->pos = atoi(buf+prec+3); + data->pos = MSVCRT_atoi(buf+prec+3); if(buf[1] != '0') data->pos++; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 23317f49605..8f8557dcea5 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -469,7 +469,7 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, sym->current++; if (!(n1 = get_number(sym))) return FALSE; - num = atoi(n1); + num = MSVCRT_atoi(n1); if (str_modif[0] == ' ' && !modifier) str_modif++; @@ -1007,7 +1007,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, sym->current++; if (!(n1 = get_number(sym))) goto done; - num = atoi(n1); + num = MSVCRT_atoi(n1); while (num--) arr = str_printf(sym, "%s[%s]", arr, get_number(sym));

1 0

Alexandre Julliard : msvcrt: Use the msvcrt ctype functions internally.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: b7fe06d0fa6dbad7d2c3ae380557adcaa10b89f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7fe06d0fa6dbad7d2c3ae38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 16:03:27 2020 +0100 msvcrt: Use the msvcrt ctype functions internally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 6 +++--- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/printf.h | 6 +++--- dlls/msvcrt/scanf.h | 7 ++----- dlls/msvcrt/undname.c | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 772357826eb..1334a514788 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -396,7 +396,7 @@ int CDECL MSVCRT_isblank(int c) */ int CDECL MSVCRT___isascii(int c) { - return isascii((unsigned)c); + return ((unsigned)c < 0x80); } /********************************************************************* @@ -421,7 +421,7 @@ int CDECL MSVCRT_iswascii(MSVCRT_wchar_t c) */ int CDECL MSVCRT___iscsym(int c) { - return (c < 127 && (isalnum(c) || c == '_')); + return (c < 127 && (MSVCRT_isalnum(c) || c == '_')); } /********************************************************************* @@ -429,7 +429,7 @@ int CDECL MSVCRT___iscsym(int c) */ int CDECL MSVCRT___iscsymf(int c) { - return (c < 127 && (isalpha(c) || c == '_')); + return (c < 127 && (MSVCRT_isalpha(c) || c == '_')); } /********************************************************************* diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 9d5f19cfbc0..090aa913589 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3013,7 +3013,7 @@ int CDECL MSVCRT_stat64(const char* path, struct MSVCRT__stat64 * buf) Also a letter as first char isn't enough to be classified as a drive letter */ - if (isalpha(*path)&& (*(path+1)==':')) + if (MSVCRT_isalpha(*path)&& (*(path+1)==':')) buf->st_dev = buf->st_rdev = MSVCRT__toupper_l(*path, NULL) - 'A'; /* drive num */ else buf->st_dev = buf->st_rdev = MSVCRT__getdrive() - 1; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 65956c9b2e5..ab5b4c13f85 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1072,6 +1072,9 @@ void* __cdecl MSVCRT_malloc(MSVCRT_size_t); void* __cdecl MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); void* __cdecl MSVCRT_realloc(void*,MSVCRT_size_t); +int __cdecl MSVCRT_isalpha(int c); +int __cdecl MSVCRT_isdigit(int c); +int __cdecl MSVCRT_isspace(int c); int __cdecl MSVCRT_iswalpha(MSVCRT_wint_t); int __cdecl MSVCRT_iswspace(MSVCRT_wint_t); int __cdecl MSVCRT_iswdigit(MSVCRT_wint_t); diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index cb83c05ff9f..f8b200c7e54 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -57,7 +57,7 @@ static inline const APICHAR* FUNC_NAME(pf_parse_int)(const APICHAR *fmt, int *va { *val = 0; - while(isdigit(*fmt)) { + while (*fmt >= '0' && *fmt <= '9') { *val *= 10; *val += *fmt++ - '0'; } @@ -1041,7 +1041,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } - } else while(isdigit(*p)) { + } else while (*p >= '0' && *p <= '9') { flags.FieldLength *= 10; flags.FieldLength += *p++ - '0'; } @@ -1059,7 +1059,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API i = -1; flags.Precision = pf_args(args_ctx, i, VT_INT, valist).get_int; - } else while(isdigit(*p)) { + } else while (*p >= '0' && *p <= '9') { flags.Precision *= 10; flags.Precision += *p++ - '0'; } diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index e1a194e39fa..4750fae0f4a 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -28,7 +28,6 @@ #define _EOF_ MSVCRT_WEOF #define _EOF_RET (short)MSVCRT_WEOF #define _ISSPACE_(c) MSVCRT_iswspace(c) -#define _ISDIGIT_(c) MSVCRT_iswdigit(c) #define _WIDE2SUPPORTED_(c) c /* No conversion needed (wide to wide) */ #define _CHAR2SUPPORTED_(c) c /* FIXME: convert char to wide char */ #define _CHAR2DIGIT_(c, base) wchar2digit((c), (base)) @@ -37,8 +36,7 @@ #define _CHAR_ char #define _EOF_ MSVCRT_EOF #define _EOF_RET MSVCRT_EOF -#define _ISSPACE_(c) isspace(c) -#define _ISDIGIT_(c) isdigit(c) +#define _ISSPACE_(c) MSVCRT_isspace(c) #define _WIDE2SUPPORTED_(c) c /* FIXME: convert wide char to char */ #define _CHAR2SUPPORTED_(c) c /* No conversion needed (char to char) */ #define _CHAR2DIGIT_(c, base) char2digit((c), (base)) @@ -260,7 +258,7 @@ _FUNCTION_ { /* read prefix (if any) */ while (!prefix_finished) { /* look for width specification */ - while (_ISDIGIT_(*format)) { + while (*format >= '0' && *format <= '9') { width *= 10; width += *format++ - '0'; } @@ -721,7 +719,6 @@ _FUNCTION_ { #undef _EOF_ #undef _EOF_RET #undef _ISSPACE_ -#undef _ISDIGIT_ #undef _CHAR2SUPPORTED_ #undef _WIDE2SUPPORTED_ #undef _CHAR2DIGIT_ diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 69eef44654e..23317f49605 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -857,7 +857,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (!get_modified_type(ct, sym, pmt_ref, in_args ? dt : 'P', in_args)) goto done; break; case 'P': /* Pointer */ - if (isdigit(*sym->current)) + if (MSVCRT_isdigit(*sym->current)) { /* FIXME: * P6 = Function pointer

1 0

Alexandre Julliard : msvcrt: Use the msvcrt allocation functions internally.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 871d9863bc2d1c9406b47aa644974768d5c6d2c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=871d9863bc2d1c9406b47aa6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 16:02:06 2020 +0100 msvcrt: Use the msvcrt allocation functions internally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index fda3d11b86d..37c4afcf786 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -708,7 +708,7 @@ int CDECL __crtLCMapStringA( if (!in_len) return 0; if (in_len > ARRAY_SIZE(buf_in)) { - in = malloc(in_len * sizeof(WCHAR)); + in = MSVCRT_malloc(in_len * sizeof(WCHAR)); if (!in) return 0; } @@ -726,7 +726,7 @@ int CDECL __crtLCMapStringA( out_len = r; if (r > ARRAY_SIZE(buf_out)) { - out = malloc(r * sizeof(WCHAR)); + out = MSVCRT_malloc(r * sizeof(WCHAR)); if (!out) { r = 0; @@ -740,8 +740,8 @@ int CDECL __crtLCMapStringA( r = WideCharToMultiByte(codepage, 0, out, out_len, dst, dstlen, NULL, NULL); done: - if (in != buf_in) free(in); - if (out != buf_out) free(out); + if (in != buf_in) MSVCRT_free(in); + if (out != buf_out) MSVCRT_free(out); return r; }

1 0

Alexandre Julliard : msvcrt: Use the msvcrt math functions internally.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 1be5e83859229d0e8a6c4fb3913865beea00a085 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1be5e83859229d0e8a6c4fb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 16:01:52 2020 +0100 msvcrt: Use the msvcrt math functions internally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 78 +++++++++++++++++++++++++--------------------------- dlls/msvcrt/msvcrt.h | 7 +++++ dlls/msvcrt/printf.h | 6 ++-- dlls/msvcrt/string.c | 2 +- 4 files changed, 48 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1be5e83859229d0e8a6c…

1 0

Ziqing Hui : d3dx10: Implement D3DX10GetImageInfoFromResource{A, W}().
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 43aa33714ee081a8dcb6b489753a977d32b3fb3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=43aa33714ee081a8dcb6b489… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Nov 16 10:05:16 2020 +0800 d3dx10: Implement D3DX10GetImageInfoFromResource{A, W}(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 7 ++--- dlls/d3dx10_43/texture.c | 66 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 64 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index f9bd40a72cb..5d7ffcfde3f 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1460,8 +1460,6 @@ static void test_get_image_info(void) /* D3DX10GetImageInfoFromResource tests */ - todo_wine - { hr = D3DX10GetImageInfoFromResourceW(NULL, NULL, NULL, &image_info, NULL); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromResourceW(NULL, L"deadbeaf", NULL, &image_info, NULL); @@ -1470,20 +1468,19 @@ static void test_get_image_info(void) ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromResourceA(NULL, "deadbeaf", NULL, &image_info, NULL); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); - } for (i = 0; i < ARRAY_SIZE(test_image); ++i) { resource_module = create_resource_module(test_resource_name, test_image[i].data, test_image[i].size); hr = D3DX10GetImageInfoFromResourceW(resource_module, test_resource_name, NULL, &image_info, NULL); - todo_wine + todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_WMP) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); if (hr == S_OK) check_image_info(&image_info, i, __LINE__); hr = D3DX10GetImageInfoFromResourceA(resource_module, get_str_a(test_resource_name), NULL, &image_info, NULL); - todo_wine + todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_WMP) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); if (hr == S_OK) check_image_info(&image_info, i, __LINE__); diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 23d7b93e649..ea9b5120c47 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -148,6 +148,22 @@ done: return hr; } +static HRESULT load_resource(HMODULE module, HRSRC res_info, void **buffer, DWORD *size) +{ + HGLOBAL resource; + + if (!(*size = SizeofResource(module, res_info))) + return HRESULT_FROM_WIN32(GetLastError()); + + if (!(resource = LoadResource(module, res_info))) + return HRESULT_FROM_WIN32(GetLastError()); + + if (!(*buffer = LockResource(resource))) + return HRESULT_FROM_WIN32(GetLastError()); + + return S_OK; +} + HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { @@ -201,19 +217,61 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadP HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resource, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { - FIXME("module %p, resource %s, pump %p, info %p, result %p\n", + HRSRC res_info; + void *buffer; + HRESULT hr; + DWORD size; + + TRACE("module %p, resource %s, pump %p, info %p, result %p.\n", module, debugstr_a(resource), pump, info, result); - return E_NOTIMPL; + if (!resource || !info) + return D3DX10_ERR_INVALID_DATA; + + res_info = FindResourceA(module, resource, (const char *)RT_RCDATA); + if (!res_info) + { + /* Try loading the resource as bitmap data */ + res_info = FindResourceA(module, resource, (const char *)RT_BITMAP); + if (!res_info) + return D3DX10_ERR_INVALID_DATA; + } + + hr = load_resource(module, res_info, &buffer, &size); + if (FAILED(hr)) + return D3DX10_ERR_INVALID_DATA; + + return D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); } HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { - FIXME("module %p, resource %s, pump %p, info %p, result %p\n", + unsigned int size; + HRSRC res_info; + void *buffer; + HRESULT hr; + + TRACE("module %p, resource %s, pump %p, info %p, result %p.\n", module, debugstr_w(resource), pump, info, result); - return E_NOTIMPL; + if (!resource || !info) + return D3DX10_ERR_INVALID_DATA; + + res_info = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA); + if (!res_info) + { + /* Try loading the resource as bitmap data */ + res_info = FindResourceW(module, resource, (const WCHAR *)RT_BITMAP); + if (!res_info) + return D3DX10_ERR_INVALID_DATA; + } + + hr = load_resource(module, res_info, &buffer, &size); + if (FAILED(hr)) + return D3DX10_ERR_INVALID_DATA; + + return D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); } HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump,

1 0

Ziqing Hui : d3dx10/tests: Add tests for D3DX10GetImageInfoFromResource{A, W}().
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 6ffc3ecbd8ce9fe10d7f57183ecd2440d812cc6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ffc3ecbd8ce9fe10d7f5718… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Nov 18 13:22:08 2020 +0100 d3dx10/tests: Add tests for D3DX10GetImageInfoFromResource{A, W}(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 73 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 54cb4df3b7b..f9bd40a72cb 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -626,6 +626,43 @@ static ID3D10Device *create_device(void) return NULL; } +static HMODULE create_resource_module(const WCHAR *filename, const void *data, unsigned int size) +{ + WCHAR resource_module_path[MAX_PATH], current_module_path[MAX_PATH]; + HANDLE resource; + HMODULE module; + BOOL ret; + + if (!temp_dir[0]) + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + lstrcpyW(resource_module_path, temp_dir); + lstrcatW(resource_module_path, filename); + + GetModuleFileNameW(NULL, current_module_path, ARRAY_SIZE(current_module_path)); + ret = CopyFileW(current_module_path, resource_module_path, FALSE); + ok(ret, "CopyFileW failed, error %u.\n", GetLastError()); + SetFileAttributesW(resource_module_path, FILE_ATTRIBUTE_NORMAL); + + resource = BeginUpdateResourceW(resource_module_path, TRUE); + UpdateResourceW(resource, (LPCWSTR)RT_RCDATA, filename, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), (void *)data, size); + EndUpdateResourceW(resource, FALSE); + + module = LoadLibraryExW(resource_module_path, NULL, LOAD_LIBRARY_AS_DATAFILE); + + return module; +} + +static void delete_resource_module(const WCHAR *filename, HMODULE module) +{ + WCHAR path[MAX_PATH]; + + FreeLibrary(module); + + lstrcpyW(path, temp_dir); + lstrcatW(path, filename); + DeleteFileW(path); +} + static void check_image_info(D3DX10_IMAGE_INFO *image_info, unsigned int i, unsigned int line) { ok_(__FILE__, line)(image_info->Width == test_image[i].expected.Width, @@ -1364,8 +1401,10 @@ static void test_D3DX10CreateAsyncResourceLoader(void) static void test_get_image_info(void) { + static const WCHAR test_resource_name[] = L"resource.data"; static const WCHAR test_filename[] = L"image.data"; D3DX10_IMAGE_INFO image_info; + HMODULE resource_module; WCHAR path[MAX_PATH]; unsigned int i; DWORD dword; @@ -1418,6 +1457,40 @@ static void test_get_image_info(void) delete_file(test_filename); } + + /* D3DX10GetImageInfoFromResource tests */ + + todo_wine + { + hr = D3DX10GetImageInfoFromResourceW(NULL, NULL, NULL, &image_info, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + hr = D3DX10GetImageInfoFromResourceW(NULL, L"deadbeaf", NULL, &image_info, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + hr = D3DX10GetImageInfoFromResourceA(NULL, NULL, NULL, &image_info, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + hr = D3DX10GetImageInfoFromResourceA(NULL, "deadbeaf", NULL, &image_info, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + } + + for (i = 0; i < ARRAY_SIZE(test_image); ++i) + { + resource_module = create_resource_module(test_resource_name, test_image[i].data, test_image[i].size); + + hr = D3DX10GetImageInfoFromResourceW(resource_module, test_resource_name, NULL, &image_info, NULL); + todo_wine + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (hr == S_OK) + check_image_info(&image_info, i, __LINE__); + + hr = D3DX10GetImageInfoFromResourceA(resource_module, get_str_a(test_resource_name), NULL, &image_info, NULL); + todo_wine + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (hr == S_OK) + check_image_info(&image_info, i, __LINE__); + + delete_resource_module(test_resource_name, resource_module); + } + CoUninitialize(); }

1 0

Sven Baars : d3dx9: Remove unreachable DT_SINGLELINE handling from ID3DXFont_DrawText.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: a097f54ea1e7e75b78842ceb835f5db5f08fea06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a097f54ea1e7e75b78842ceb… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Nov 17 15:33:32 2020 +0100 d3dx9: Remove unreachable DT_SINGLELINE handling from ID3DXFont_DrawText. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index f5775384da3..13cffe4c514 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -512,7 +512,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite, } static void word_break(HDC hdc, const WCHAR *str, unsigned int *str_len, - unsigned int chars_fit, unsigned int *chars_used, DWORD format, SIZE *size) + unsigned int chars_fit, unsigned int *chars_used, SIZE *size) { SCRIPT_LOGATTR *sla; SCRIPT_ANALYSIS sa; @@ -535,7 +535,7 @@ static void word_break(HDC hdc, const WCHAR *str, unsigned int *str_len, --i; /* If the there is no word that fits put in all characters that do fit */ - if (!sla[i].fSoftBreak || (format & DT_SINGLELINE)) + if (!sla[i].fSoftBreak) i = chars_fit; *chars_used = i; @@ -571,20 +571,13 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, unsigned int *count, num_fit = 0; GetTextExtentExPointW(hdc, dest, *dest_len, width, &num_fit, NULL, size); - if (num_fit < *dest_len) + if (num_fit < *dest_len && (format & DT_WORDBREAK)) { - if (format & DT_WORDBREAK) - { - unsigned int chars_used; + unsigned int chars_used; - word_break(hdc, dest, dest_len, num_fit, &chars_used, format, size); - *count = orig_count - chars_used; - i = chars_used; - } - else if (format & DT_SINGLELINE) - { - *count = 0; - } + word_break(hdc, dest, dest_len, num_fit, &chars_used, size); + *count = orig_count - chars_used; + i = chars_used; } if (*count && str[i] == '\n')

1 0

Sven Baars : d3dx9: Implement clipping of glyphs in ID3DXFont_DrawText.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 84cbf6a49dfe75b9fd497b2c3ef7e922857bb618 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84cbf6a49dfe75b9fd497b2c… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Nov 17 15:33:31 2020 +0100 d3dx9: Implement clipping of glyphs in ID3DXFont_DrawText. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49546 Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 235ae11072b..f5775384da3 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -583,7 +583,6 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, unsigned int *count, } else if (format & DT_SINGLELINE) { - *dest_len = num_fit; *count = 0; } } @@ -768,6 +767,21 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, pos.y = cell_inc.y + y; pos.z = 0; + if (!(format & DT_NOCLIP)) + { + if (pos.x > rect->right) + { + IDirect3DTexture9_Release(texture); + continue; + } + + if (pos.x + black_box.right - black_box.left > rect->right) + black_box.right = black_box.left + rect->right - pos.x; + + if (pos.y + black_box.bottom - black_box.top > rect->bottom) + black_box.bottom = black_box.top + rect->bottom - pos.y; + } + ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color); IDirect3DTexture9_Release(texture); }

1 0

Sven Baars : d3dx9: Fully initialize the glyph position.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 2481e617bbd529a297266ad53b1afe1d96e9af89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2481e617bbd529a297266ad5… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Nov 17 15:33:30 2020 +0100 d3dx9: Fully initialize the glyph position. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49376 Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 4b909406df1..235ae11072b 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -726,7 +726,6 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, { unsigned int line_len, i; GCP_RESULTSW results; - D3DXVECTOR3 pos; string = read_line(font->hdc, string, &count, line, &line_len, width, format, &size); @@ -756,6 +755,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, for (i = 0; i < results.nGlyphs; ++i) { IDirect3DTexture9 *texture; + D3DXVECTOR3 pos; POINT cell_inc; RECT black_box; @@ -766,6 +766,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, pos.x = cell_inc.x + x + results.lpCaretPos[i]; pos.y = cell_inc.y + y; + pos.z = 0; ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color); IDirect3DTexture9_Release(texture);

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
86
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 November 2020