December 2019 - Wine-Commits

Piotr Caban : msvcrt: Don't depend on how __lc_time_data was allocated in _W_Getmonths.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: 9571b362418e4491916ac79b430e5bee4b9a0aa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9571b362418e4491916ac79b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 4 15:30:13 2019 +0100 msvcrt: Don't depend on how __lc_time_data was allocated in _W_Getmonths. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 0e3e55b609..52052a4502 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -568,11 +568,14 @@ MSVCRT_wchar_t* CDECL _W_Getmonths(void) { MSVCRT___lc_time_data *cur = get_locinfo()->lc_time_curr; MSVCRT_wchar_t *out; - int i, len, size; + int i, len, size = 0; TRACE("\n"); - size = cur->wstr.names.am-cur->wstr.names.short_mon[0]; + for(i=0; i<12; i++) { + size += strlenW(cur->wstr.names.short_mon[i]) + 1; + size += strlenW(cur->wstr.names.mon[i]) + 1; + } out = MSVCRT_malloc((size+1)*sizeof(*out)); if(!out) return NULL;

1 0

Jeff Smith : ucrtbase: Improve strftime special test cases for %c %r formats.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: a1ce35cfda936825a4fe63520d9958c0bd218e13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1ce35cfda936825a4fe6352… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Dec 4 15:29:47 2019 +0100 ucrtbase: Improve strftime special test cases for %c %r formats. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 083be42f42..a3a20aa9b1 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -29,6 +29,7 @@ #include <fcntl.h> #include <time.h> #include <direct.h> +#include <locale.h> #include <windef.h> #include <winbase.h> @@ -162,6 +163,7 @@ static int* (CDECL *p_errno)(void); static char* (CDECL *p_asctime)(const struct tm *); static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); static size_t (__cdecl *p__Strftime)(char*, size_t, const char*, const struct tm*, void*); +static char* (__cdecl *p_setlocale)(int, const char*); static struct tm* (__cdecl *p__gmtime32)(const __time32_t*); static void (CDECL *p_exit)(int); static int (CDECL *p__crt_atexit)(void (CDECL*)(void)); @@ -538,6 +540,7 @@ static BOOL init(void) p_asctime = (void*)GetProcAddress(module, "asctime"); p_strftime = (void*)GetProcAddress(module, "strftime"); p__Strftime = (void*)GetProcAddress(module, "_Strftime"); + p_setlocale = (void*)GetProcAddress(module, "setlocale"); p__gmtime32 = (void*)GetProcAddress(module, "_gmtime32"); p__crt_atexit = (void*)GetProcAddress(module, "_crt_atexit"); p_exit = (void*)GetProcAddress(module, "exit"); @@ -1185,6 +1188,18 @@ static void test_strftime(void) i, j, buf, tests_yweek[i].ret[j]); } } + + if(!p_setlocale(LC_ALL, "fr-FR")) { + win_skip("fr-FR locale not available\n"); + return; + } + ret = p_strftime(buf, sizeof(buf), "%c", &epoch); + ok(ret == 19, "ret = %d\n", ret); + ok(!strcmp(buf, "01/01/1970 00:00:00"), "buf = \"%s\", expected \"%s\"\n", buf, "01/01/1970 00:00:00"); + ret = p_strftime(buf, sizeof(buf), "%r", &epoch); + todo_wine ok(ret == 8, "ret = %d\n", ret); + todo_wine ok(!strcmp(buf, "00:00:00"), "buf = \"%s\", expected \"%s\"\n", buf, "00:00:00"); + p_setlocale(LC_ALL, "C"); } static LONG* get_failures_counter(HANDLE *map)

1 0

Piotr Caban : msvcrt: Don't depend on how __lc_time_data was allocated in _Getdays.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: 66d702668a6aae4987466a898d072de32c6e0522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66d702668a6aae4987466a89… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 4 15:29:59 2019 +0100 msvcrt: Don't depend on how __lc_time_data was allocated in _Getdays. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 6f2a83cc7c..e0c6253044 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -456,12 +456,15 @@ static inline char* construct_lc_all(MSVCRT_pthreadlocinfo locinfo) { char* CDECL _Getdays(void) { MSVCRT___lc_time_data *cur = get_locinfo()->lc_time_curr; - int i, len, size; + int i, len, size = 0; char *out; TRACE("\n"); - size = cur->str.names.short_mon[0]-cur->str.names.short_wday[0]; + for(i=0; i<7; i++) { + size += strlen(cur->str.names.short_wday[i]) + 1; + size += strlen(cur->str.names.wday[i]) + 1; + } out = MSVCRT_malloc(size+1); if(!out) return NULL;

1 0

Alexandre Julliard : kernel32: Initialize argv from the dll entry point.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: 74eaa34147c08b15cb439d78b924b138e7571d6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=74eaa34147c08b15cb439d78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 3 19:20:17 2019 +0100 kernel32: Initialize argv from the dll entry point. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_main.c | 32 ++++++++++++++++++++++++++++++++ dlls/kernel32/process.c | 34 ---------------------------------- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 954b08b523..1d61853d86 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -29,6 +29,7 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wincon.h" #include "winternl.h" @@ -76,6 +77,36 @@ static void set_entry_point( HMODULE module, const char *name, DWORD rva ) } +/*********************************************************************** + * set_library_argv + * + * Set the Wine library argv global variable. + */ +static void set_library_argv( WCHAR **wargv ) +{ + int argc; + char *p, **argv; + DWORD total = 0; + + /* convert argv back from Unicode since it has to be in the Ansi codepage not the Unix one */ + + for (argc = 0; wargv[argc]; argc++) + total += WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, NULL, 0, NULL, NULL ); + + argv = RtlAllocateHeap( GetProcessHeap(), 0, total + (argc + 1) * sizeof(*argv) ); + p = (char *)(argv + argc + 1); + for (argc = 0; wargv[argc]; argc++) + { + DWORD reslen = WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, p, total, NULL, NULL ); + argv[argc] = p; + p += reslen; + total -= reslen; + } + argv[argc] = NULL; + __wine_main_argv = argv; +} + + /*********************************************************************** * KERNEL process initialisation routine */ @@ -83,6 +114,7 @@ static BOOL process_attach( HMODULE module ) { RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters; + set_library_argv( __wine_main_wargv ); NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); /* Setup registry timezone information */ diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 09c6bab3ce..72a93a7fe7 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -86,39 +86,6 @@ const WCHAR DIR_System[] = {'C',':','\\','w','i','n','d','o','w','s', #define PDB32_WIN32S_PROC 0x8000 /* Win32s process */ -/*********************************************************************** - * set_library_argv - * - * Set the Wine library argv global variables. - */ -static void set_library_argv( WCHAR **wargv ) -{ - int argc; - char *p, **argv; - DWORD total = 0; - - /* convert argv back from Unicode since it has to be in the Ansi codepage not the Unix one */ - - for (argc = 0; wargv[argc]; argc++) - total += WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, NULL, 0, NULL, NULL ); - - argv = RtlAllocateHeap( GetProcessHeap(), 0, total + (argc + 1) * sizeof(*argv) ); - p = (char *)(argv + argc + 1); - for (argc = 0; wargv[argc]; argc++) - { - DWORD reslen = WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, p, total, NULL, NULL ); - argv[argc] = p; - p += reslen; - total -= reslen; - } - argv[argc] = NULL; - - __wine_main_argc = argc; - __wine_main_argv = argv; - __wine_main_wargv = wargv; -} - - #ifdef __i386__ extern DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry ); __ASM_GLOBAL_FUNC( call_process_entry, @@ -214,7 +181,6 @@ void * CDECL __wine_kernel_init(void) RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter ); LOCALE_Init(); - set_library_argv( __wine_main_wargv ); if (!params->CurrentDirectory.Handle) chdir("/"); /* avoid locking removable devices */

1 0

Alexandre Julliard : kernel32: Use the Rtl UTF8 conversion functions.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: d33504b9bb2de873ffe15c1b4d0598fdfd414672 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d33504b9bb2de873ffe15c1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 3 12:34:00 2019 +0100 kernel32: Use the Rtl UTF8 conversion functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 84 ++++++++++++++++++++++++++++++------------- dlls/msvcrt/tests/file.c | 4 +-- dlls/ntdll/tests/rtlstr.c | 90 +++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 141 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d33504b9bb2de873ffe1…

1 0

Alexandre Julliard : ntdll: Implement RtlUTF8ToUnicodeN.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: 27f0426b6f3189ef20a6a2d5ef09688a0dd64c61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27f0426b6f3189ef20a6a2d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 3 10:10:47 2019 +0100 ntdll: Implement RtlUTF8ToUnicodeN. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 3 files changed, 116 insertions(+) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 09f64b8dad..d7a6401560 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1307,6 +1307,120 @@ found: } +/* helper for the various utf8 mbstowcs functions */ +static unsigned int decode_utf8_char( unsigned char ch, const char **str, const char *strend ) +{ + /* number of following bytes in sequence based on first byte value (for bytes above 0x7f) */ + static const char utf8_length[128] = + { + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x80-0x8f */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x90-0x9f */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xa0-0xaf */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xb0-0xbf */ + 0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0xc0-0xcf */ + 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0xd0-0xdf */ + 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, /* 0xe0-0xef */ + 3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0 /* 0xf0-0xff */ + }; + + /* first byte mask depending on UTF-8 sequence length */ + static const unsigned char utf8_mask[4] = { 0x7f, 0x1f, 0x0f, 0x07 }; + + unsigned int len = utf8_length[ch - 0x80]; + unsigned int res = ch & utf8_mask[len]; + const char *end = *str + len; + + if (end > strend) + { + *str = end; + return ~0; + } + switch (len) + { + case 3: + if ((ch = end[-3] ^ 0x80) >= 0x40) break; + res = (res << 6) | ch; + (*str)++; + if (res < 0x10) break; + case 2: + if ((ch = end[-2] ^ 0x80) >= 0x40) break; + res = (res << 6) | ch; + if (res >= 0x110000 >> 6) break; + (*str)++; + if (res < 0x20) break; + if (res >= 0xd800 >> 6 && res <= 0xdfff >> 6) break; + case 1: + if ((ch = end[-1] ^ 0x80) >= 0x40) break; + res = (res << 6) | ch; + (*str)++; + if (res < 0x80) break; + return res; + } + return ~0; +} + + +/************************************************************************** + * RtlUTF8ToUnicodeN (NTDLL.@) + */ +NTSTATUS WINAPI RtlUTF8ToUnicodeN( WCHAR *dst, DWORD dstlen, DWORD *reslen, const char *src, DWORD srclen ) +{ + unsigned int res, len; + NTSTATUS status = STATUS_SUCCESS; + const char *srcend = src + srclen; + WCHAR *dstend; + + if (!src) return STATUS_INVALID_PARAMETER_4; + if (!reslen) return STATUS_INVALID_PARAMETER; + + dstlen /= sizeof(WCHAR); + dstend = dst + dstlen; + if (!dst) + { + for (len = 0; src < srcend; len++) + { + unsigned char ch = *src++; + if (ch < 0x80) continue; + if ((res = decode_utf8_char( ch, &src, srcend )) > 0x10ffff) + status = STATUS_SOME_NOT_MAPPED; + else + if (res > 0xffff) len++; + } + *reslen = len * sizeof(WCHAR); + return status; + } + + while ((dst < dstend) && (src < srcend)) + { + unsigned char ch = *src++; + if (ch < 0x80) /* special fast case for 7-bit ASCII */ + { + *dst++ = ch; + continue; + } + if ((res = decode_utf8_char( ch, &src, srcend )) <= 0xffff) + { + *dst++ = res; + } + else if (res <= 0x10ffff) /* we need surrogates */ + { + res -= 0x10000; + *dst++ = 0xd800 | (res >> 10); + if (dst == dstend) break; + *dst++ = 0xdc00 | (res & 0x3ff); + } + else + { + *dst++ = 0xfffd; + status = STATUS_SOME_NOT_MAPPED; + } + } + if (src < srcend) status = STATUS_BUFFER_TOO_SMALL; /* overflow */ + *reslen = (dstlen - (dstend - dst)) * sizeof(WCHAR); + return status; +} + + /* get the next char value taking surrogates into account */ static inline unsigned int get_surrogate_value( const WCHAR *src, unsigned int srclen ) { diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 566f51c8d1..415a43ab53 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -981,6 +981,7 @@ @ stdcall RtlTryAcquireSRWLockExclusive(ptr) @ stdcall RtlTryAcquireSRWLockShared(ptr) @ stdcall RtlTryEnterCriticalSection(ptr) +@ stdcall RtlUTF8ToUnicodeN(ptr long ptr ptr long) @ cdecl -i386 -norelay RtlUlongByteSwap() NTDLL_RtlUlongByteSwap @ cdecl -ret64 RtlUlonglongByteSwap(int64) # @ stub RtlUnhandledExceptionFilter2 diff --git a/include/winternl.h b/include/winternl.h index ea46087aac..9e7e2bad93 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2902,6 +2902,7 @@ NTSYSAPI BOOLEAN WINAPI RtlTimeToSecondsSince1980(const LARGE_INTEGER *,LPDWOR NTSYSAPI BOOLEAN WINAPI RtlTryAcquireSRWLockExclusive(RTL_SRWLOCK *); NTSYSAPI BOOLEAN WINAPI RtlTryAcquireSRWLockShared(RTL_SRWLOCK *); NTSYSAPI BOOL WINAPI RtlTryEnterCriticalSection(RTL_CRITICAL_SECTION *); +NTSYSAPI NTSTATUS WINAPI RtlUTF8ToUnicodeN(WCHAR*,DWORD,DWORD*,const char*,DWORD); NTSYSAPI ULONGLONG __cdecl RtlUlonglongByteSwap(ULONGLONG); NTSYSAPI DWORD WINAPI RtlUnicodeStringToAnsiSize(const UNICODE_STRING*); NTSYSAPI NTSTATUS WINAPI RtlUnicodeStringToAnsiString(PANSI_STRING,PCUNICODE_STRING,BOOLEAN);

1 0

Alexandre Julliard : ntdll: Reimplement RtlUnicodeToUTF8N.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: 0b39344ef0b02a969e9755a891f7d7f1a2986d48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b39344ef0b02a969e9755a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 3 10:10:39 2019 +0100 ntdll: Reimplement RtlUnicodeToUTF8N. This avoids relying on wine_utf8_wcstombs(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/rtlstr.c | 33 -------------- dlls/ntdll/tests/rtlstr.c | 16 ------- 3 files changed, 111 insertions(+), 49 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 5ad32e4f1b..09f64b8dad 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1307,6 +1307,117 @@ found: } +/* get the next char value taking surrogates into account */ +static inline unsigned int get_surrogate_value( const WCHAR *src, unsigned int srclen ) +{ + if (src[0] >= 0xd800 && src[0] <= 0xdfff) /* surrogate pair */ + { + if (src[0] > 0xdbff || /* invalid high surrogate */ + srclen <= 1 || /* missing low surrogate */ + src[1] < 0xdc00 || src[1] > 0xdfff) /* invalid low surrogate */ + return 0; + return 0x10000 + ((src[0] & 0x3ff) << 10) + (src[1] & 0x3ff); + } + return src[0]; +} + + +/************************************************************************** + * RtlUnicodeToUTF8N (NTDLL.@) + */ +NTSTATUS WINAPI RtlUnicodeToUTF8N( char *dst, DWORD dstlen, DWORD *reslen, const WCHAR *src, DWORD srclen ) +{ + char *end; + unsigned int val, len; + NTSTATUS status = STATUS_SUCCESS; + + if (!src) return STATUS_INVALID_PARAMETER_4; + if (!reslen) return STATUS_INVALID_PARAMETER; + if (dst && (srclen & 1)) return STATUS_INVALID_PARAMETER_5; + + srclen /= sizeof(WCHAR); + + if (!dst) + { + for (len = 0; srclen; srclen--, src++) + { + if (*src < 0x80) len++; /* 0x00-0x7f: 1 byte */ + else if (*src < 0x800) len += 2; /* 0x80-0x7ff: 2 bytes */ + else + { + if (!(val = get_surrogate_value( src, srclen ))) + { + val = 0xfffd; + status = STATUS_SOME_NOT_MAPPED; + } + if (val < 0x10000) len += 3; /* 0x800-0xffff: 3 bytes */ + else /* 0x10000-0x10ffff: 4 bytes */ + { + len += 4; + src++; + srclen--; + } + } + } + *reslen = len; + return status; + } + + for (end = dst + dstlen; srclen; srclen--, src++) + { + WCHAR ch = *src; + + if (ch < 0x80) /* 0x00-0x7f: 1 byte */ + { + if (dst > end - 1) break; + *dst++ = ch; + continue; + } + if (ch < 0x800) /* 0x80-0x7ff: 2 bytes */ + { + if (dst > end - 2) break; + dst[1] = 0x80 | (ch & 0x3f); + ch >>= 6; + dst[0] = 0xc0 | ch; + dst += 2; + continue; + } + if (!(val = get_surrogate_value( src, srclen ))) + { + val = 0xfffd; + status = STATUS_SOME_NOT_MAPPED; + } + if (val < 0x10000) /* 0x800-0xffff: 3 bytes */ + { + if (dst > end - 3) break; + dst[2] = 0x80 | (val & 0x3f); + val >>= 6; + dst[1] = 0x80 | (val & 0x3f); + val >>= 6; + dst[0] = 0xe0 | val; + dst += 3; + } + else /* 0x10000-0x10ffff: 4 bytes */ + { + if (dst > end - 4) break; + dst[3] = 0x80 | (val & 0x3f); + val >>= 6; + dst[2] = 0x80 | (val & 0x3f); + val >>= 6; + dst[1] = 0x80 | (val & 0x3f); + val >>= 6; + dst[0] = 0xf0 | val; + dst += 4; + src++; + srclen--; + } + } + if (srclen) status = STATUS_BUFFER_TOO_SMALL; + *reslen = dstlen - (end - dst); + return status; +} + + /****************************************************************************** * RtlIsNormalizedString (NTDLL.@) */ diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 8196dd7178..c0d8ec6477 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -709,39 +709,6 @@ NTSTATUS WINAPI RtlUnicodeStringToOemString( STRING *oem, } -/************************************************************************** - * RtlUnicodeToUTF8N (NTDLL.@) - * - * Converts a Unicode string to a UTF-8 string. - * - * RETURNS - * NTSTATUS code - */ -NTSTATUS WINAPI RtlUnicodeToUTF8N( LPSTR dst, DWORD dstlen, LPDWORD reslen, - LPCWSTR src, DWORD srclen) -{ - int ret; - - if (!src) return STATUS_INVALID_PARAMETER_4; - if (!reslen) return STATUS_INVALID_PARAMETER; - if (dst && (srclen & 1)) return STATUS_INVALID_PARAMETER_5; - - if (!dstlen && dst) - { - char c; - dst = &c; - ret = wine_utf8_wcstombs( 0, src, srclen / sizeof(WCHAR), dst, 1 ); - if (ret > 0) ret--; - } - else - ret = wine_utf8_wcstombs( 0, src, srclen / sizeof(WCHAR), dst, dstlen ); - if (reslen) - *reslen = (ret >= 0) ? ret : dstlen; /* overflow -> we filled up to dstlen */ - if (ret < 0) return STATUS_BUFFER_TOO_SMALL; - return STATUS_SUCCESS; -} - - /* CASE CONVERSIONS */ diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 4583ddeb4b..6be036f406 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -2152,11 +2152,8 @@ static void test_RtlUnicodeToUTF8N(void) length_expect(0, 0, STATUS_SUCCESS); length_expect(1, 1, STATUS_SUCCESS); length_expect(2, 3, STATUS_SUCCESS); -todo_wine -{ length_expect(3, 6, STATUS_SOME_NOT_MAPPED); length_expect(4, 7, STATUS_SOME_NOT_MAPPED); -} #undef length_expect for (i = 0; i <= 6; i++) @@ -2164,20 +2161,14 @@ todo_wine memset(buffer, 0x55, sizeof(buffer)); bytes_out = 0xdeadbeef; status = pRtlUnicodeToUTF8N(buffer, i, &bytes_out, special_string, sizeof(special_string)); -todo_wine_if (i == 4 || i == 5 || i == 6) ok(status == STATUS_BUFFER_TOO_SMALL, "%d: status = 0x%x\n", i, status); -todo_wine_if (bytes_out != special_string_len[i]) ok(bytes_out == special_string_len[i], "%d: expected %u, got %u\n", i, special_string_len[i], bytes_out); -todo_wine_if (i == 6) ok(memcmp(buffer, special_expected, special_string_len[i]) == 0, "%d: bad conversion\n", i); } status = pRtlUnicodeToUTF8N(buffer, 7, &bytes_out, special_string, sizeof(special_string)); -todo_wine ok(status == STATUS_SOME_NOT_MAPPED, "status = 0x%x\n", status); -todo_wine ok(bytes_out == special_string_len[7], "expected %u, got %u\n", special_string_len[7], bytes_out); -todo_wine ok(memcmp(buffer, special_expected, 7) == 0, "bad conversion\n"); /* conversion behavior with varying input length */ @@ -2225,19 +2216,15 @@ todo_wine status = pRtlUnicodeToUTF8N( buffer, sizeof(buffer), &bytes_out, unicode_to_utf8[i].unicode, lstrlenW(unicode_to_utf8[i].unicode) * sizeof(WCHAR)); -todo_wine_if(unicode_to_utf8[i].status == STATUS_SOME_NOT_MAPPED) ok(status == unicode_to_utf8[i].status, "(test %d): status is 0x%x, expected 0x%x\n", i, status, unicode_to_utf8[i].status); -todo_wine_if(i == 9 || i == 10 || i == 11) -{ ok(bytes_out == strlen(unicode_to_utf8[i].expected), "(test %d): bytes_out is %u, expected %u\n", i, bytes_out, lstrlenA(unicode_to_utf8[i].expected)); ok(!memcmp(buffer, unicode_to_utf8[i].expected, bytes_out), "(test %d): got \"%.*s\", expected \"%s\"\n", i, bytes_out, buffer, unicode_to_utf8[i].expected); -} ok(buffer[bytes_out] == 0x55, "(test %d): behind string: 0x%x\n", i, buffer[bytes_out]); @@ -2247,8 +2234,6 @@ todo_wine_if(i == 9 || i == 10 || i == 11) status = pRtlUnicodeToUTF8N( buffer, sizeof(buffer), &bytes_out, unicode_to_utf8[i].unicode, (lstrlenW(unicode_to_utf8[i].unicode) + 1) * sizeof(WCHAR)); -todo_wine_if(i == 9 || i == 10 || i == 11) -{ ok(status == unicode_to_utf8[i].status, "(test %d): status is 0x%x, expected 0x%x\n", i, status, unicode_to_utf8[i].status); @@ -2258,7 +2243,6 @@ todo_wine_if(i == 9 || i == 10 || i == 11) ok(!memcmp(buffer, unicode_to_utf8[i].expected, bytes_out), "(test %d): got \"%.*s\", expected \"%s\"\n", i, bytes_out, buffer, unicode_to_utf8[i].expected); -} ok(buffer[bytes_out] == 0x55, "(test %d): behind string: 0x%x\n", i, buffer[bytes_out]); }

1 0

João Diogo Ferreira : kernelbase: Update GeoID when locale has changed.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: 7b1b0ce506be6871e8c3c5f6b837e0dc2c02b88c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b1b0ce506be6871e8c3c5f6… Author: João Diogo Ferreira <devilj(a)outlook.pt> Date: Mon Dec 2 21:39:54 2019 +0000 kernelbase: Update GeoID when locale has changed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46196 Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 9bc3cfe80e..d81da5195f 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -239,7 +239,8 @@ void init_locale(void) USHORT *ansi_ptr, *oem_ptr, *casemap_ptr; LCID lcid = GetUserDefaultLCID(); WCHAR bufferW[80]; - DWORD count, i; + GEOID geoid = GEOID_NOT_AVAILABLE; + DWORD count, dispos, i; SIZE_T size; HKEY hkey; @@ -268,6 +269,17 @@ void init_locale(void) RegCreateKeyExW( HKEY_CURRENT_USER, L"Control Panel\\International", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &intl_key, NULL ); + if (!RegCreateKeyExW( intl_key, L"Geo", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, &dispos )) + { + if (dispos == REG_CREATED_NEW_KEY) + { + GetLocaleInfoW( LOCALE_USER_DEFAULT, LOCALE_IGEOID | LOCALE_RETURN_NUMBER, + (WCHAR *)&geoid, sizeof(geoid) / sizeof(WCHAR) ); + SetUserGeoID( geoid ); + } + RegCloseKey( hkey ); + } + /* Update registry contents if the user locale has changed. * This simulates the action of the Windows control panel. */ @@ -290,6 +302,13 @@ void init_locale(void) (BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR) ); } + if (geoid == GEOID_NOT_AVAILABLE) + { + GetLocaleInfoW( LOCALE_USER_DEFAULT, LOCALE_IGEOID | LOCALE_RETURN_NUMBER, + (WCHAR *)&geoid, sizeof(geoid) / sizeof(WCHAR) ); + SetUserGeoID( geoid ); + } + if (!RegCreateKeyExW( nls_key, L"Codepage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL )) {

1 0

Piotr Caban : msvcrt: Don't depend on how __lc_time_data was allocated in _W_Getdays.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: 2d23512da1c4311b828eff9622a32d65102b2b63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d23512da1c4311b828eff96… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 4 15:30:03 2019 +0100 msvcrt: Don't depend on how __lc_time_data was allocated in _W_Getdays. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index e0c6253044..617d1fffb3 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -494,11 +494,14 @@ MSVCRT_wchar_t* CDECL _W_Getdays(void) { MSVCRT___lc_time_data *cur = get_locinfo()->lc_time_curr; MSVCRT_wchar_t *out; - int i, len, size; + int i, len, size = 0; TRACE("\n"); - size = cur->wstr.names.short_mon[0]-cur->wstr.names.short_wday[0]; + for(i=0; i<7; i++) { + size += strlenW(cur->wstr.names.short_wday[i]) + 1; + size += strlenW(cur->wstr.names.wday[i]) + 1; + } out = MSVCRT_malloc((size+1)*sizeof(*out)); if(!out) return NULL;

1 0

Alexandre Julliard : kernelbase: Verify that the file can be opened when looking for an executable.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: b82842461215f25c6d0819104cd06ab5cc7bf28a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b82842461215f25c6d081910… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 4 10:07:03 2019 +0100 kernelbase: Verify that the file can be opened when looking for an executable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48211 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 51b75470c8..90ea299416 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -57,6 +57,13 @@ static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, DWORD buflen ) ret = (SearchPathW( load_path, name, L".exe", buflen, buffer, NULL ) || /* not found, try without extension in case it is a Unix app */ SearchPathW( load_path, name, NULL, buflen, buffer, NULL )); + + if (ret) /* make sure it can be opened, SearchPathW also returns directories */ + { + HANDLE handle = CreateFileW( buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, 0 ); + if ((ret = (handle != INVALID_HANDLE_VALUE))) CloseHandle( handle ); + } RtlReleasePath( load_path ); return ret; }

1 0