January 2020 - Wine-Devel - list.winehq.org

[PATCH] msvcrt: Duplicate the secondary structs in _get_current_locale().
by Chip Davis Jan. 27, 2020

Jan. 27, 2020

Otherwise, the returned _locale_t will reflect the state after a setlocale() call, and not before. Respect the refcount pointers now; this is necessary to share malloc'd stuff between _locale_t instances. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/msvcr90/tests/msvcr90.c | 27 +++++++ dlls/msvcrt/locale.c | 146 ++++++++++++++++++++++++++--------- 2 files changed, 137 insertions(+), 36 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index c8a49f25492d..07403c6b2fc7 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -139,6 +139,7 @@ static int (__cdecl *p_swscanf)(const wchar_t *str, const wchar_t* format, ...); static int (__cdecl *p____mb_cur_max_l_func)(_locale_t locale); static _locale_t (__cdecl *p__create_locale)(int, const char*); static void (__cdecl *p__free_locale)(_locale_t); +static _locale_t (__cdecl *p__get_current_locale)(void); /* make sure we use the correct errno */ #undef errno @@ -408,6 +409,7 @@ static BOOL init(void) SET(p____mb_cur_max_l_func, "___mb_cur_max_l_func"); SET(p__create_locale, "_create_locale"); SET(p__free_locale, "_free_locale"); + SET(p__get_current_locale, "_get_current_locale"); if (sizeof(void *) == 8) { @@ -1961,6 +1963,30 @@ static void test____mb_cur_max_l_func(void) p__free_locale(l); } +static void test__get_current_locale(void) +{ + _locale_t l = p__get_current_locale(); +#define lc_str(lc, s) \ + ok(!strcmp(l->locinfo->lc_category[lc].locale, s), #lc " = \"%s\"\n", \ + l->locinfo->lc_category[lc].locale) + lc_str(LC_COLLATE, "C"); + lc_str(LC_CTYPE, "C"); + lc_str(LC_MONETARY, "C"); + lc_str(LC_NUMERIC, "C"); + lc_str(LC_TIME, "C"); + + p_setlocale(LC_ALL, "english"); + lc_str(LC_COLLATE, "C"); + lc_str(LC_CTYPE, "C"); + lc_str(LC_MONETARY, "C"); + lc_str(LC_NUMERIC, "C"); + lc_str(LC_TIME, "C"); +#undef lc_str + + p__free_locale(l); + p_setlocale(LC_ALL, "C"); +} + START_TEST(msvcr90) { if(!init()) @@ -2001,4 +2027,5 @@ START_TEST(msvcr90) test___strncnt(); test_swscanf(); test____mb_cur_max_l_func(); + test__get_current_locale(); } diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 04a808d6b9c4..21e155d452c1 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -876,6 +876,9 @@ void free_locinfo(MSVCRT_pthreadlocinfo locinfo) return; for(i=MSVCRT_LC_MIN+1; i<=MSVCRT_LC_MAX; i++) { + if(!locinfo->lc_category[i].refcount || + InterlockedDecrement(locinfo->lc_category[i].refcount)) + continue; MSVCRT_free(locinfo->lc_category[i].locale); MSVCRT_free(locinfo->lc_category[i].refcount); #if _MSVCR_VER >= 110 @@ -884,37 +887,51 @@ void free_locinfo(MSVCRT_pthreadlocinfo locinfo) } if(locinfo->lconv) { - MSVCRT_free(locinfo->lconv->decimal_point); - MSVCRT_free(locinfo->lconv->thousands_sep); - MSVCRT_free(locinfo->lconv->grouping); - MSVCRT_free(locinfo->lconv->int_curr_symbol); - MSVCRT_free(locinfo->lconv->currency_symbol); - MSVCRT_free(locinfo->lconv->mon_decimal_point); - MSVCRT_free(locinfo->lconv->mon_thousands_sep); - MSVCRT_free(locinfo->lconv->mon_grouping); - MSVCRT_free(locinfo->lconv->positive_sign); - MSVCRT_free(locinfo->lconv->negative_sign); + if(locinfo->lconv_num_refcount && + !InterlockedDecrement(locinfo->lconv_num_refcount)) { + MSVCRT_free(locinfo->lconv->decimal_point); + MSVCRT_free(locinfo->lconv->thousands_sep); + MSVCRT_free(locinfo->lconv->grouping); #if _MSVCR_VER >= 100 - MSVCRT_free(locinfo->lconv->_W_decimal_point); - MSVCRT_free(locinfo->lconv->_W_thousands_sep); - MSVCRT_free(locinfo->lconv->_W_int_curr_symbol); - MSVCRT_free(locinfo->lconv->_W_currency_symbol); - MSVCRT_free(locinfo->lconv->_W_mon_decimal_point); - MSVCRT_free(locinfo->lconv->_W_mon_thousands_sep); - MSVCRT_free(locinfo->lconv->_W_positive_sign); - MSVCRT_free(locinfo->lconv->_W_negative_sign); + MSVCRT_free(locinfo->lconv->_W_decimal_point); + MSVCRT_free(locinfo->lconv->_W_thousands_sep); #endif + MSVCRT_free(locinfo->lconv_num_refcount); + } + if(locinfo->lconv_mon_refcount && + !InterlockedDecrement(locinfo->lconv_mon_refcount)) { + MSVCRT_free(locinfo->lconv->int_curr_symbol); + MSVCRT_free(locinfo->lconv->currency_symbol); + MSVCRT_free(locinfo->lconv->mon_decimal_point); + MSVCRT_free(locinfo->lconv->mon_thousands_sep); + MSVCRT_free(locinfo->lconv->mon_grouping); + MSVCRT_free(locinfo->lconv->positive_sign); + MSVCRT_free(locinfo->lconv->negative_sign); +#if _MSVCR_VER >= 100 + MSVCRT_free(locinfo->lconv->_W_int_curr_symbol); + MSVCRT_free(locinfo->lconv->_W_currency_symbol); + MSVCRT_free(locinfo->lconv->_W_mon_decimal_point); + MSVCRT_free(locinfo->lconv->_W_mon_thousands_sep); + MSVCRT_free(locinfo->lconv->_W_positive_sign); + MSVCRT_free(locinfo->lconv->_W_negative_sign); +#endif + MSVCRT_free(locinfo->lconv_mon_refcount); + } + if(locinfo->lconv_intl_refcount && + !InterlockedDecrement(locinfo->lconv_intl_refcount)) { + MSVCRT_free(locinfo->lconv_intl_refcount); + MSVCRT_free(locinfo->lconv); + } } - MSVCRT_free(locinfo->lconv_intl_refcount); - MSVCRT_free(locinfo->lconv_num_refcount); - MSVCRT_free(locinfo->lconv_mon_refcount); - MSVCRT_free(locinfo->lconv); - MSVCRT_free(locinfo->ctype1_refcount); - MSVCRT_free(locinfo->ctype1); + if(locinfo->ctype1_refcount && + !InterlockedDecrement(locinfo->ctype1_refcount)) { + MSVCRT_free(locinfo->ctype1_refcount); + MSVCRT_free(locinfo->ctype1); - MSVCRT_free(locinfo->pclmap); - MSVCRT_free(locinfo->pcumap); + MSVCRT_free(locinfo->pclmap); + MSVCRT_free(locinfo->pcumap); + } if(locinfo->lc_time_curr != &cloc_time_data) MSVCRT_free(locinfo->lc_time_curr); @@ -939,14 +956,34 @@ void free_mbcinfo(MSVCRT_pthreadmbcinfo mbcinfo) */ MSVCRT__locale_t CDECL MSVCRT__get_current_locale(void) { + int i; MSVCRT__locale_t loc = MSVCRT_malloc(sizeof(MSVCRT__locale_tstruct)); if(!loc) return NULL; - loc->locinfo = get_locinfo(); - loc->mbcinfo = get_mbcinfo(); - InterlockedIncrement(&loc->locinfo->refcount); - InterlockedIncrement(&loc->mbcinfo->refcount); + loc->locinfo = MSVCRT_malloc(sizeof(MSVCRT_threadlocinfo)); + loc->mbcinfo = MSVCRT_malloc(sizeof(MSVCRT_threadmbcinfo)); + if (!loc->locinfo || !loc->mbcinfo) { + MSVCRT_free(loc->locinfo); + MSVCRT_free(loc->mbcinfo); + MSVCRT_free(loc); + return NULL; + } + memcpy(loc->locinfo, get_locinfo(), sizeof(MSVCRT_threadlocinfo)); + memcpy(loc->mbcinfo, get_mbcinfo(), sizeof(MSVCRT_threadmbcinfo)); + loc->locinfo->refcount = 1; + loc->mbcinfo->refcount = 1; + for(i = 1; i <= (MSVCRT_LC_MAX - MSVCRT_LC_MIN); i++) + if(loc->locinfo->lc_category[i].refcount) + InterlockedIncrement(loc->locinfo->lc_category[i].refcount); + if(loc->locinfo->lconv_intl_refcount) + InterlockedIncrement(loc->locinfo->lconv_intl_refcount); + if(loc->locinfo->lconv_num_refcount) + InterlockedIncrement(loc->locinfo->lconv_num_refcount); + if(loc->locinfo->lconv_mon_refcount) + InterlockedIncrement(loc->locinfo->lconv_mon_refcount); + if(loc->locinfo->ctype1_refcount) + InterlockedIncrement(loc->locinfo->ctype1_refcount); return loc; } @@ -1213,8 +1250,12 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, free_locinfo(locinfo); return NULL; } - } else - locinfo->lc_category[MSVCRT_LC_COLLATE].locale = MSVCRT__strdup("C"); + } else { + if(!init_category_name("C", 1, locinfo, MSVCRT_LC_COLLATE)) { + free_locinfo(locinfo); + return NULL; + } + } if(locale_name[MSVCRT_LC_CTYPE] && !init_category_name(locale_name[MSVCRT_LC_CTYPE], @@ -1291,7 +1332,10 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, locinfo->lc_clike = 1; locinfo->mb_cur_max = 1; locinfo->pctype = MSVCRT__ctype+1; - locinfo->lc_category[MSVCRT_LC_CTYPE].locale = MSVCRT__strdup("C"); + if(!init_category_name("C", 1, locinfo, MSVCRT_LC_CTYPE)) { + free_locinfo(locinfo); + return NULL; + } for(i=0; i<256; i++) { if(locinfo->pctype[i] & MSVCRT__LEADBYTE) @@ -1528,6 +1572,16 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } } else { + locinfo->lconv_intl_refcount = MSVCRT_malloc(sizeof(int)); + locinfo->lconv_mon_refcount = MSVCRT_malloc(sizeof(int)); + if(!locinfo->lconv_intl_refcount || !locinfo->lconv_mon_refcount) { + free_locinfo(locinfo); + return NULL; + } + + *locinfo->lconv_intl_refcount = 1; + *locinfo->lconv_mon_refcount = 1; + locinfo->lconv->int_curr_symbol = MSVCRT_malloc(sizeof(char)); locinfo->lconv->currency_symbol = MSVCRT_malloc(sizeof(char)); locinfo->lconv->mon_decimal_point = MSVCRT_malloc(sizeof(char)); @@ -1583,7 +1637,10 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, locinfo->lconv->_W_negative_sign[0] = '\0'; #endif - locinfo->lc_category[MSVCRT_LC_MONETARY].locale = MSVCRT__strdup("C"); + if(!init_category_name("C", 1, locinfo, MSVCRT_LC_MONETARY)) { + free_locinfo(locinfo); + return NULL; + } } if(locale_name[MSVCRT_LC_NUMERIC] && @@ -1673,6 +1730,17 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } } else { + if(!locinfo->lconv_intl_refcount) + locinfo->lconv_intl_refcount = MSVCRT_malloc(sizeof(int)); + locinfo->lconv_num_refcount = MSVCRT_malloc(sizeof(int)); + if(!locinfo->lconv_intl_refcount || !locinfo->lconv_num_refcount) { + free_locinfo(locinfo); + return NULL; + } + + *locinfo->lconv_intl_refcount = 1; + *locinfo->lconv_num_refcount = 1; + locinfo->lconv->decimal_point = MSVCRT_malloc(sizeof(char[2])); locinfo->lconv->thousands_sep = MSVCRT_malloc(sizeof(char)); locinfo->lconv->grouping = MSVCRT_malloc(sizeof(char)); @@ -1701,7 +1769,10 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, locinfo->lconv->_W_thousands_sep[0] = '\0'; #endif - locinfo->lc_category[MSVCRT_LC_NUMERIC].locale = MSVCRT__strdup("C"); + if (!init_category_name("C", 1, locinfo, MSVCRT_LC_NUMERIC)) { + free_locinfo(locinfo); + return NULL; + } } if(locale_name[MSVCRT_LC_TIME] && @@ -1733,7 +1804,10 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } } else { - locinfo->lc_category[MSVCRT_LC_TIME].locale = MSVCRT__strdup("C"); + if(!init_category_name("C", 1, locinfo, MSVCRT_LC_TIME)) { + free_locinfo(locinfo); + return NULL; + } locinfo->lc_time_curr = &cloc_time_data; } -- 2.24.0

3 2

[PATCH 3/3] vbscript: Fix VT_UNKNOWN handling in is expressions.
by Jacek Caban Jan. 27, 2020

Jan. 27, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 96 +++++++++++++++--------------------- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 40 insertions(+), 57 deletions(-)

1 0

[PATCH 2/3] vbscript: Fix VT_UNKNOWN handling in set statements.
by Jacek Caban Jan. 27, 2020

Jan. 27, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 12 +++++------ dlls/vbscript/tests/lang.vbs | 6 ++++++ dlls/vbscript/tests/run.c | 39 +++++++++++++++++++++++++++++++++++- 3 files changed, 50 insertions(+), 7 deletions(-)

1 0

[PATCH 1/3] vbscript: Overflow hex literals in 16-bit range.
by Jacek Caban Jan. 27, 2020

Jan. 27, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 6 +++--- dlls/vbscript/lex.c | 4 ++-- dlls/vbscript/tests/lang.vbs | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-)

1 0

[PATCH] msi: Add support for custom action type 7.
by Hans Leidekker Jan. 27, 2020

Jan. 27, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44618 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/custom.c | 230 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 159 insertions(+), 71 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index b864270690..e237942487 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -950,13 +950,28 @@ static UINT HANDLE_CustomType19( MSIPACKAGE *package, const WCHAR *source, const return ERROR_INSTALL_FAILURE; } +static WCHAR *build_msiexec_args( const WCHAR *filename, const WCHAR *params ) +{ + UINT len_filename = lstrlenW( filename ), len_params = lstrlenW( params ); + UINT len = ARRAY_SIZE(L"/qb /i ") - 1; + WCHAR *ret; + + if (!(ret = msi_alloc( (len + len_filename + len_params + 4) * sizeof(WCHAR) ))) return NULL; + memcpy( ret, L"/qb /i ", sizeof(L"/qb /i ") ); + ret[len++] = '"'; + memcpy( ret + len, filename, len_filename * sizeof(WCHAR) ); + len += len_filename; + ret[len++] = '"'; + ret[len++] = ' '; + lstrcpyW( ret + len, params ); + return ret; +} + static UINT HANDLE_CustomType23( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, INT type, const WCHAR *action ) { - static const WCHAR msiexecW[] = {'m','s','i','e','x','e','c',0}; - static const WCHAR paramsW[] = {'/','q','b',' ','/','i',' '}; - WCHAR *dir, *arg, *p; - UINT len_src, len_dir, len_tgt, len = ARRAY_SIZE( paramsW ); + WCHAR *dir, *filename, *args, *p; + UINT len_dir, len_source = lstrlenW( source ); HANDLE handle; if (!(dir = msi_dup_property( package->db, szOriginalDatabase ))) return ERROR_OUTOFMEMORY; @@ -967,33 +982,104 @@ static UINT HANDLE_CustomType23( MSIPACKAGE *package, const WCHAR *source, const } *p = 0; len_dir = p - dir; - len_src = lstrlenW( source ); - len_tgt = lstrlenW( target ); - if (!(arg = msi_alloc( (len + len_dir + len_src + len_tgt + 5) * sizeof(WCHAR) ))) + if (!(filename = msi_alloc( (len_dir + len_source + 2) * sizeof(WCHAR) ))) + { + msi_free( dir ); + return ERROR_OUTOFMEMORY; + } + memcpy( filename, dir, len_dir * sizeof(WCHAR) ); + filename[len_dir++] = '\\'; + memcpy( filename + len_dir, source, len_source * sizeof(WCHAR) ); + filename[len_dir + len_source] = 0; + + if (!(args = build_msiexec_args( filename, target ))) { msi_free( dir ); return ERROR_OUTOFMEMORY; } - memcpy( arg, paramsW, sizeof(paramsW) ); - arg[len++] = '"'; - memcpy( arg + len, dir, len_dir * sizeof(WCHAR) ); - len += len_dir; - arg[len++] = '\\'; - memcpy( arg + len, source, len_src * sizeof(WCHAR) ); - len += len_src; - arg[len++] = '"'; - arg[len++] = ' '; - lstrcpyW( arg + len, target ); TRACE("installing %s concurrently\n", debugstr_w(source)); - handle = execute_command( msiexecW, arg, dir ); + handle = execute_command( L"msiexec", args, dir ); msi_free( dir ); - msi_free( arg ); + msi_free( args ); if (handle == INVALID_HANDLE_VALUE) return ERROR_SUCCESS; return wait_process_handle( package, type, handle, action ); } +static UINT write_substorage_to_file( MSIPACKAGE *package, const WCHAR *source, const WCHAR *filename ) +{ + IStorage *src = NULL, *dst = NULL; + UINT r = ERROR_FUNCTION_FAILED; + HRESULT hr; + + hr = StgCreateDocfile( filename, STGM_CREATE|STGM_TRANSACTED|STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, &dst ); + if (FAILED( hr )) + { + WARN( "can't open destination storage %s (%08x)\n", debugstr_w(filename), hr ); + goto done; + } + + hr = IStorage_OpenStorage( package->db->storage, source, NULL, STGM_SHARE_EXCLUSIVE, NULL, 0, &src ); + if (FAILED( hr )) + { + WARN( "can't open source storage %s (%08x)\n", debugstr_w(source), hr ); + goto done; + } + + hr = IStorage_CopyTo( src, 0, NULL, NULL, dst ); + if (FAILED( hr )) + { + ERR( "failed to copy storage %s (%08x)\n", debugstr_w(source), hr ); + goto done; + } + + hr = IStorage_Commit( dst, 0 ); + if (FAILED( hr )) + ERR( "failed to commit storage (%08x)\n", hr ); + else + r = ERROR_SUCCESS; + +done: + if (src) IStorage_Release( src ); + if (dst) IStorage_Release( dst ); + return r; +} + +static UINT HANDLE_CustomType7( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, + INT type, const WCHAR *action ) +{ + WCHAR *tmpfile, *args; + MSIBINARY *binary = NULL; + HANDLE handle; + UINT r; + + if (!(tmpfile = msi_create_temp_file( package->db ))) return ERROR_FUNCTION_FAILED; + + r = write_substorage_to_file( package, source, tmpfile ); + if (r != ERROR_SUCCESS) + goto error; + + if (!(binary = msi_alloc( sizeof(*binary) ))) goto error; + binary->source = NULL; + binary->tmpfile = tmpfile; + list_add_tail( &package->binaries, &binary->entry ); + + if (!(args = build_msiexec_args( tmpfile, target ))) return ERROR_OUTOFMEMORY; + + TRACE("installing %s concurrently\n", debugstr_w(source)); + + handle = execute_command( L"msiexec", args, L"C:\\" ); + msi_free( args ); + if (handle == INVALID_HANDLE_VALUE) return ERROR_SUCCESS; + return wait_process_handle( package, type, handle, action ); + +error: + DeleteFileW( tmpfile ); + msi_free( tmpfile ); + return ERROR_FUNCTION_FAILED; +} + static UINT HANDLE_CustomType50( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, INT type, const WCHAR *action ) { @@ -1378,66 +1464,68 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, const WCHAR *action) switch (type & CUSTOM_ACTION_TYPE_MASK) { - case 1: /* DLL file stored in a Binary table stream */ - rc = HANDLE_CustomType1(package,source,target,type,action); - break; - case 2: /* EXE file stored in a Binary table stream */ - rc = HANDLE_CustomType2(package,source,target,type,action); - break; - case 18: /*EXE file installed with package */ - rc = HANDLE_CustomType18(package,source,target,type,action); - break; - case 19: /* Error that halts install */ - rc = HANDLE_CustomType19(package,source,target,type,action); - break; - case 17: - rc = HANDLE_CustomType17(package,source,target,type,action); - break; - case 23: /* installs another package in the source tree */ - deformat_string(package,target,&deformated); - rc = HANDLE_CustomType23(package,source,deformated,type,action); - msi_free(deformated); - break; - case 50: /*EXE file specified by a property value */ - rc = HANDLE_CustomType50(package,source,target,type,action); - break; - case 34: /*EXE to be run in specified directory */ - rc = HANDLE_CustomType34(package,source,target,type,action); - break; - case 35: /* Directory set with formatted text. */ - deformat_string(package,target,&deformated); - MSI_SetTargetPathW(package, source, deformated); - msi_free(deformated); - break; - case 51: /* Property set with formatted text. */ - if (!source) - break; - - len = deformat_string( package, target, &deformated ); - rc = msi_set_property( package->db, source, deformated, len ); - if (rc == ERROR_SUCCESS && !wcscmp( source, szSourceDir )) - msi_reset_source_folders( package ); - msi_free(deformated); - break; - case 37: /* JScript/VBScript text stored in target column. */ - case 38: - rc = HANDLE_CustomType37_38(package,source,target,type,action); + case 1: /* DLL file stored in a Binary table stream */ + rc = HANDLE_CustomType1( package, source, target, type, action ); + break; + case 2: /* EXE file stored in a Binary table stream */ + rc = HANDLE_CustomType2( package, source, target, type, action ); break; case 5: - case 6: /* JScript/VBScript file stored in a Binary table stream. */ - rc = HANDLE_CustomType5_6(package,source,target,type,action); + case 6: /* JScript/VBScript file stored in a Binary table stream */ + rc = HANDLE_CustomType5_6( package, source, target, type, action ); + break; + case 7: /* Concurrent install from substorage */ + deformat_string( package, target, &deformated ); + rc = HANDLE_CustomType7( package, source, target, type, action ); + msi_free( deformated ); + break; + case 17: + rc = HANDLE_CustomType17( package, source, target, type, action ); break; - case 21: /* JScript/VBScript file installed with the product. */ + case 18: /* EXE file installed with package */ + rc = HANDLE_CustomType18( package, source, target, type, action ); + break; + case 19: /* Error that halts install */ + rc = HANDLE_CustomType19( package, source, target, type, action ); + break; + case 21: /* JScript/VBScript file installed with the product */ case 22: - rc = HANDLE_CustomType21_22(package,source,target,type,action); + rc = HANDLE_CustomType21_22( package, source, target, type, action ); + break; + case 23: /* Installs another package in the source tree */ + deformat_string( package, target, &deformated ); + rc = HANDLE_CustomType23( package, source, deformated, type, action ); + msi_free( deformated ); + break; + case 34: /* EXE to be run in specified directory */ + rc = HANDLE_CustomType34( package, source, target, type, action ); + break; + case 35: /* Directory set with formatted text */ + deformat_string( package, target, &deformated ); + MSI_SetTargetPathW( package, source, deformated ); + msi_free( deformated ); + break; + case 37: /* JScript/VBScript text stored in target column */ + case 38: + rc = HANDLE_CustomType37_38( package, source, target, type, action ); + break; + case 50: /* EXE file specified by a property value */ + rc = HANDLE_CustomType50( package, source, target, type, action ); + break; + case 51: /* Property set with formatted text */ + if (!source) break; + len = deformat_string( package, target, &deformated ); + rc = msi_set_property( package->db, source, deformated, len ); + if (rc == ERROR_SUCCESS && !wcscmp( source, szSourceDir )) msi_reset_source_folders( package ); + msi_free( deformated ); break; - case 53: /* JScript/VBScript text specified by a property value. */ + case 53: /* JScript/VBScript text specified by a property value */ case 54: - rc = HANDLE_CustomType53_54(package,source,target,type,action); + rc = HANDLE_CustomType53_54( package, source, target, type, action ); break; default: - FIXME("unhandled action type %u (%s %s)\n", type & CUSTOM_ACTION_TYPE_MASK, - debugstr_w(source), debugstr_w(target)); + FIXME( "unhandled action type %u (%s %s)\n", type & CUSTOM_ACTION_TYPE_MASK, debugstr_w(source), + debugstr_w(target) ); } end: -- 2.20.1

1 0

[PATCH 1/3] d2d1/tests: Enable developers to export generated images.
by Giovanni Mascellani Jan. 27, 2020

Jan. 27, 2020

By flipping the export_surfaces flag a developer can easily access the generated bitmaps to inspect them visually. By default the flag is disabled, so that no files are generated or overwritten and no performance penalty is paid. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> --- Is this kind of developer-oriented patch acceptable in Wine? Or is there already an easy way to export the bitmaps generated during the test? I could not find one. --- dlls/d2d1/tests/d2d1.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 5377c4ea34..801334f2ad 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -28,6 +28,7 @@ #include "wine/heap.h" static BOOL use_mt = TRUE; +static const BOOL export_surfaces = FALSE; static struct test_entry { @@ -613,6 +614,30 @@ static void read_figure(struct figure *figure, BYTE *data, unsigned int pitch, figure_add_span(figure, span); } +static void export_surface_to_ppm(IDXGISurface *surface, const char *filename, + unsigned int x, unsigned int y, + unsigned int w, unsigned int h) { + unsigned int i, j, pitch; + struct resource_readback rb; + const BYTE *data; + FILE *fout; + + get_surface_readback(surface, &rb); + data = rb.map_desc.pData; + pitch = rb.map_desc.RowPitch; + + fout = fopen(filename, "w"); + fprintf(fout, "P3\n%d %d\n%d\n", w, h, 255); + for (i = 0; i < h; i++) { + const BYTE *row = &data[(y+i) * pitch + x * 4]; + for (j = 0; j < w; j++) { + fprintf(fout, "%d %d %d\n", row[j * 4 + 2], row[j * 4 + 1], row[j * 4]); + } + } + fflush(fout); + fclose(fout); +} + static BOOL compare_figure(IDXGISurface *surface, unsigned int x, unsigned int y, unsigned int w, unsigned int h, DWORD prev, unsigned int max_diff, const char *ref) { @@ -5841,6 +5866,10 @@ static void test_draw_geometry(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + if (export_surfaces) { + export_surface_to_ppm(surface, "surface1.ppm", 0, 0, 640, 480); + } + match = compare_figure(surface, 0, 0, 160, 160, 0xff652e89, 0, ""); ok(match, "Figure does not match.\n"); match = compare_figure(surface, 160, 0, 160, 160, 0xff652e89, 0, "yGBQUFBQUFBQUFDoYQAA"); @@ -5983,6 +6012,10 @@ static void test_draw_geometry(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); ID2D1PathGeometry_Release(geometry); + if (export_surfaces) { + export_surface_to_ppm(surface, "surface2.ppm", 0, 0, 640, 480); + } + match = compare_figure(surface, 0, 0, 160, 160, 0xff652e89, 0, ""); ok(match, "Figure does not match.\n"); match = compare_figure(surface, 160, 0, 160, 160, 0xff652e89, 0, ""); @@ -6095,6 +6128,10 @@ static void test_draw_geometry(void) ID2D1RectangleGeometry_Release(rect_geometry[1]); ID2D1RectangleGeometry_Release(rect_geometry[0]); + if (export_surfaces) { + export_surface_to_ppm(surface, "surface3.ppm", 0, 0, 640, 480); + } + match = compare_figure(surface, 0, 0, 160, 160, 0xff652e89, 0, "vi5kPGQ8ZDxkPGQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwU" "PBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8" @@ -6266,6 +6303,10 @@ static void test_draw_geometry(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); ID2D1PathGeometry_Release(geometry); + if (export_surfaces) { + export_surface_to_ppm(surface, "surface4.ppm", 0, 0, 640, 480); + } + match = compare_figure(surface, 0, 0, 160, 160, 0xff652e89, 0, "vi5kPGQ8ZDxkPGQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwU" "PBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8" @@ -6446,6 +6487,10 @@ static void test_draw_geometry(void) ID2D1TransformedGeometry_Release(transformed_geometry[1]); ID2D1TransformedGeometry_Release(transformed_geometry[0]); + if (export_surfaces) { + export_surface_to_ppm(surface, "surface5.ppm", 0, 0, 640, 480); + } + match = compare_figure(surface, 0, 0, 160, 160, 0xff652e89, 128, "yjIJkQEHBwaIAQUSBYMBBBYEggEEFgSCAQQWBIIBBBYEggEEFgSCAQQWBIIBBBYEggEEFgSCAQQW" "BIIBBBYEggEEFgSDAQQVBIMBBBUEgwEEFQSDAQQVBIMBBBUEgwEEFQSDAQQVBIMBBBUEgwEEFQSD" -- 2.25.0

3 6

[PATCH resend] msvcrt: Correct return value of ___mb_cur_max_l_func().
by Chip Davis Jan. 27, 2020

Jan. 27, 2020

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/msvcr90/tests/msvcr90.c | 26 ++++++++++++++++++++++++++ dlls/msvcrt/mbcs.c | 4 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 9e7d280cf8f1..c8a49f25492d 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -136,6 +136,9 @@ static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist); static size_t (__cdecl *p___strncnt)(const char *str, size_t count); static int (__cdecl *p_swscanf)(const wchar_t *str, const wchar_t* format, ...); +static int (__cdecl *p____mb_cur_max_l_func)(_locale_t locale); +static _locale_t (__cdecl *p__create_locale)(int, const char*); +static void (__cdecl *p__free_locale)(_locale_t); /* make sure we use the correct errno */ #undef errno @@ -402,6 +405,9 @@ static BOOL init(void) SET(p__vsnwprintf, "_vsnwprintf"); SET(p___strncnt, "__strncnt"); SET(p_swscanf, "swscanf"); + SET(p____mb_cur_max_l_func, "___mb_cur_max_l_func"); + SET(p__create_locale, "_create_locale"); + SET(p__free_locale, "_free_locale"); if (sizeof(void *) == 8) { @@ -1936,6 +1942,25 @@ static void test_swscanf(void) ok( ret == (short)WEOF, "ret = %d\n", ret ); } +static void test____mb_cur_max_l_func(void) +{ + int ret; + _locale_t l; + + ret = p____mb_cur_max_l_func(NULL); + ok( ret == 1, "MB_CUR_MAX_L(NULL) = %d\n", ret ); + + l = p__create_locale(LC_ALL, "chinese-traditional"); + if (!l) + { + skip("DBCS locale not available\n"); + return; + } + ret = p____mb_cur_max_l_func(l); + ok( ret == 2, "MB_CUR_MAX_L(cht) = %d\n", ret ); + p__free_locale(l); +} + START_TEST(msvcr90) { if(!init()) @@ -1975,4 +2000,5 @@ START_TEST(msvcr90) #endif test___strncnt(); test_swscanf(); + test____mb_cur_max_l_func(); } diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index a9dbcfff661e..39f94b17a366 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -184,7 +184,7 @@ int CDECL MSVCRT____mb_cur_max_func(void) /********************************************************************* * ___mb_cur_max_l_func (MSVCR80.@) */ -int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) +int CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; @@ -193,7 +193,7 @@ int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) else locinfo = locale->locinfo; - return &locinfo->mb_cur_max; + return locinfo->mb_cur_max; } #endif -- 2.24.0

2 1

[PATCH] msvcrt: Implement _ispunct_l().
by Chip Davis Jan. 27, 2020

Jan. 27, 2020

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- .../api-ms-win-crt-string-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/ctype.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 0dae2a82332f..6a68274479b8 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -16,7 +16,7 @@ @ cdecl _isleadbyte_l(long ptr) ucrtbase._isleadbyte_l @ cdecl _islower_l(long ptr) ucrtbase._islower_l @ cdecl _isprint_l(long ptr) ucrtbase._isprint_l -@ stub _ispunct_l +@ cdecl _ispunct_l(long ptr) ucrtbase._ispunct_l @ cdecl _isspace_l(long ptr) ucrtbase._isspace_l @ cdecl _isupper_l(long ptr) ucrtbase._isupper_l @ cdecl _iswalnum_l(long ptr) ucrtbase._iswalnum_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 63c3a9d8a06c..560e14b33b83 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1013,7 +1013,7 @@ @ cdecl _isnan(double) MSVCRT__isnan @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l -@ stub _ispunct_l +@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 366c7717463f..2316535e5d18 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1359,7 +1359,7 @@ @ cdecl _isnan(double) MSVCRT__isnan @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l -@ stub _ispunct_l +@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 07ff5abdff56..903f4b7ce380 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1364,7 +1364,7 @@ @ cdecl _isnan(double) MSVCRT__isnan @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l -@ stub _ispunct_l +@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 89d240b567e8..63a4ccfacf27 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1229,7 +1229,7 @@ @ cdecl _isnan(double) msvcr120._isnan @ cdecl -arch=x86_64 _isnanf(float) msvcr120._isnanf @ cdecl _isprint_l(long ptr) msvcr120._isprint_l -@ stub _ispunct_l +@ cdecl _ispunct_l(long ptr) msvcr120._ispunct_l @ cdecl _isspace_l(long ptr) msvcr120._isspace_l @ cdecl _isupper_l(long ptr) msvcr120._isupper_l @ cdecl _iswalnum_l(long ptr) msvcr120._iswalnum_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 14ed7f35532c..402e6efc1092 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -685,7 +685,7 @@ @ cdecl _isnan(double) MSVCRT__isnan @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l -@ stub _ispunct_l +@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index acb976a7b023..8a079abe254a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -663,7 +663,7 @@ @ cdecl _isnan(double) MSVCRT__isnan @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l -@ stub _ispunct_l +@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 3b037aa8de26..9e2d029950eb 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -244,6 +244,14 @@ int CDECL MSVCRT_ispunct(int c) return MSVCRT__isctype( c, MSVCRT__PUNCT ); } +/********************************************************************* + * _ispunct_l (MSVCR80.@) + */ +int CDECL MSVCRT__ispunct_l(int c, MSVCRT__locale_t locale) +{ + return MSVCRT__isctype_l( c, MSVCRT__PUNCT, locale ); +} + /********************************************************************* * _isspace_l (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 93a75248bf96..3d8dd5807a60 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -503,7 +503,7 @@ @ cdecl _isnan(double) MSVCRT__isnan @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l -@ stub _ispunct_l +@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l -- 2.24.0

2 1

[PATCH] msvcrt: Fix the btowc() function.
by Chip Davis Jan. 27, 2020

Jan. 27, 2020

This function returns WEOF on conversion failure. It should only operate on single-byte characters in the C locale. Finally, it should use the current locale's codepage, instead of the current locale itself, to do conversions. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/msvcrt/locale.c | 8 +++-- dlls/msvcrt/tests/string.c | 73 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index ae9f7c9c2166..02b74554e6bc 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -786,9 +786,11 @@ MSVCRT_wint_t CDECL MSVCRT_btowc(int c) unsigned char letter = c; MSVCRT_wchar_t ret; - if(!MultiByteToWideChar(get_locinfo()->lc_handle[MSVCRT_LC_CTYPE], - 0, (LPCSTR)&letter, 1, &ret, 1)) - return 0; + if(!get_locinfo()->lc_codepage) + return c & 255; + if(!MultiByteToWideChar(get_locinfo()->lc_codepage, + MB_ERR_INVALID_CHARS, (LPCSTR)&letter, 1, &ret, 1)) + return MSVCRT_WEOF; return ret; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index da0400fa832f..7de776c65bf8 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -90,6 +90,7 @@ static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); +static wint_t (__cdecl *p_btowc)(int); static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_wcrtomb_s)(size_t*, char*, size_t, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); @@ -2880,6 +2881,76 @@ static void test_wctob(void) _setmbcp(cp); } +static void test_btowc(void) +{ + wint_t ret; + int cp = _getmbcp(); + + if(!p_btowc || !setlocale(LC_ALL, "chinese-traditional")) { + win_skip("Skipping btowc tests\n"); + return; + } + + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + _setmbcp(1250); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + setlocale(LC_ALL, "C"); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0x9f); + ok(ret == 0x9f, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0xe0, "ret = %x\n", ret); + + ret = p_btowc(0x100); + ok(ret == 0x00, "ret = %x\n", ret); + + ret = p_btowc(0x1e0); + ok(ret == 0xe0, "ret = %x\n", ret); + + _setmbcp(0); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0x9f); + ok(ret == 0x9f, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0xe0, "ret = %x\n", ret); + + ret = p_btowc(0x100); + ok(ret == 0x00, "ret = %x\n", ret); + + ret = p_btowc(0x1e0); + ok(ret == 0xe0, "ret = %x\n", ret); + + _setmbcp(cp); +} + static void test_wctomb(void) { mbstate_t state; @@ -4127,6 +4198,7 @@ START_TEST(string) p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); + p_btowc = (void*)GetProcAddress(hMsvcrt, "btowc"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_wcrtomb_s = (void*)GetProcAddress(hMsvcrt, "wcrtomb_s"); @@ -4204,6 +4276,7 @@ START_TEST(string) test__mbsupr_s(); test__mbslwr_s(); test_wctob(); + test_btowc(); test_wctomb(); test__atodbl(); test__stricmp(); -- 2.24.0

2 1

[PATCH 1/3] msvcrt: Provide exp2f in importlib.
by Jacek Caban Jan. 27, 2020

Jan. 27, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/mathf.c | 1 + 1 file changed, 1 insertion(+)

2 1