November 2019 - Wine-Commits

Zebediah Figura : strmbase: Forbid (dis)connecting pins if the filter is not stopped.
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: 2a6037e263ff3fae8ca82d90b0b141bea1cd473d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a6037e263ff3fae8ca82d90… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 18:51:21 2019 -0600 strmbase: Forbid (dis)connecting pins if the filter is not stopped. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index c7f1ed2af4..8c337ca471 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -366,6 +366,13 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const EnterCriticalSection(&This->pin.filter->csFilter); { + if (This->pin.filter->state != State_Stopped) + { + LeaveCriticalSection(&This->pin.filter->csFilter); + WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); + return VFW_E_NOT_STOPPED; + } + /* if we have been a specific type to connect with, then we can either connect * with that or fail. We cannot choose different AM_MEDIA_TYPE */ if (pmt && !IsEqualGUID(&pmt->majortype, &GUID_NULL) && !IsEqualGUID(&pmt->subtype, &GUID_NULL)) @@ -447,6 +454,13 @@ HRESULT WINAPI BaseOutputPinImpl_Disconnect(IPin * iface) EnterCriticalSection(&This->pin.filter->csFilter); { + if (This->pin.filter->state != State_Stopped) + { + LeaveCriticalSection(&This->pin.filter->csFilter); + WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); + return VFW_E_NOT_STOPPED; + } + if (This->pMemInputPin) { IMemInputPin_Release(This->pMemInputPin); @@ -730,6 +744,13 @@ HRESULT WINAPI BaseInputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceiveP EnterCriticalSection(&This->pin.filter->csFilter); { + if (This->pin.filter->state != State_Stopped) + { + LeaveCriticalSection(&This->pin.filter->csFilter); + WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); + return VFW_E_NOT_STOPPED; + } + if (This->pin.peer) hr = VFW_E_ALREADY_CONNECTED;

1 0

Alexandre Julliard : ntdll: Move locale functions to a new locale.c file.
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: 4538a137e089240f1981f0d6f82fb8d63a65f4f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4538a137e089240f1981f0d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 13 20:55:03 2019 +0100 ntdll: Move locale functions to a new locale.c file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/directory.c | 134 --------------------------- dlls/ntdll/loader.c | 1 + dlls/ntdll/locale.c | 236 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll_misc.h | 4 +- dlls/ntdll/resource.c | 59 +----------- 6 files changed, 242 insertions(+), 193 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4538a137e089240f1981…

1 0

Alexandre Julliard : ntdll: Support SystemPerformanceInformation on non-Linux platforms.
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: dad14ab8331922171393d6ef75861303c8bc8d50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dad14ab8331922171393d6ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 18 14:55:00 2019 +0100 ntdll: Support SystemPerformanceInformation on non-Linux platforms. Based on the GlobalMemoryStatusEx implementation. --- dlls/ntdll/nt.c | 197 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 147 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index b6daa226b3..c9b278d3fc 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -50,6 +50,19 @@ #endif #include <time.h> +#ifdef sun +/* FIXME: Unfortunately swapctl can't be used with largefile.... */ +# undef _FILE_OFFSET_BITS +# define _FILE_OFFSET_BITS 32 +# ifdef HAVE_SYS_RESOURCE_H +# include <sys/resource.h> +# endif +# ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +# endif +# include <sys/swap.h> +#endif + #define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS @@ -2347,6 +2360,139 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG #endif +static void get_performance_info( SYSTEM_PERFORMANCE_INFORMATION *info ) +{ + unsigned long long totalram = 0, freeram = 0, totalswap = 0, freeswap = 0; + FILE *fp; + + memset( info, 0, sizeof(*info) ); + + if ((fp = fopen("/proc/uptime", "r"))) + { + double uptime, idle_time; + + fscanf(fp, "%lf %lf", &uptime, &idle_time); + fclose(fp); + info->IdleTime.QuadPart = 10000000 * idle_time; + } + else + { + static ULONGLONG idle; + /* many programs expect IdleTime to change so fake change */ + info->IdleTime.QuadPart = ++idle; + } + +#ifdef linux + if ((fp = fopen("/proc/meminfo", "r"))) + { + unsigned long long value; + char line[64]; + + while (fgets(line, sizeof(line), fp)) + { + if(sscanf(line, "MemTotal: %llu kB", &value) == 1) + totalram += value * 1024; + else if(sscanf(line, "MemFree: %llu kB", &value) == 1) + freeram += value * 1024; + else if(sscanf(line, "SwapTotal: %llu kB", &value) == 1) + totalswap += value * 1024; + else if(sscanf(line, "SwapFree: %llu kB", &value) == 1) + freeswap += value * 1024; + else if (sscanf(line, "Buffers: %llu", &value)) + freeram += value * 1024; + else if (sscanf(line, "Cached: %llu", &value)) + freeram += value * 1024; + } + fclose(fp); + } +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || \ + defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) + { +#ifdef __APPLE__ + unsigned int val; +#else + unsigned long val; +#endif + int mib[2]; + size_t size_sys; + + mib[0] = CTL_HW; +#ifdef HW_MEMSIZE + { + uint64_t val64; + mib[1] = HW_MEMSIZE; + size_sys = sizeof(val64); + if (!sysctl(mib, 2, &val64, &size_sys, NULL, 0) && size_sys == sizeof(val64)) totalram = val64; + } +#endif + +#ifdef HAVE_MACH_MACH_H + { + host_name_port_t host = mach_host_self(); + mach_msg_type_number_t count; +#ifdef HOST_VM_INFO64_COUNT + vm_statistics64_data_t vm_stat; + + count = HOST_VM_INFO64_COUNT; + if (host_statistics64(host, HOST_VM_INFO64, (host_info64_t)&vm_stat, &count) == KERN_SUCCESS) + freeram = (vm_stat.free_count + vm_stat.inactive_count) * (ULONGLONG)page_size; +#endif + if (!totalram) + { + host_basic_info_data_t info; + count = HOST_BASIC_INFO_COUNT; + if (host_info(host, HOST_BASIC_INFO, (host_info_t)&info, &count) == KERN_SUCCESS) + totalram = info.max_mem; + } + mach_port_deallocate(mach_task_self(), host); + } +#endif + + if (!totalram) + { + mib[1] = HW_PHYSMEM; + size_sys = sizeof(val); + if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val)) totalram = val; + } + if (!freeram) + { + mib[1] = HW_USERMEM; + size_sys = sizeof(val); + if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val)) freeram = val; + } +#ifdef VM_SWAPUSAGE + { + struct xsw_usage swap; + mib[0] = CTL_VM; + mib[1] = VM_SWAPUSAGE; + size_sys = sizeof(swap); + if (!sysctl(mib, 2, &swap, &size_sys, NULL, 0) && size_sys == sizeof(swap)) + { + totalswap = swap.xsu_total; + freeswap = swap.xsu_avail; + } + } +#endif + } +#elif defined( sun ) + { + struct anoninfo swapinf; + int rval; + totalram = sysconf(_SC_PHYS_PAGES) * (ULONGLONG)page_size; + freeram = sysconf(_SC_AVPHYS_PAGES) * (ULONGLONG)page_size; + rval = swapctl(SC_AINFO, &swapinf); + if (rval > -1) + { + totalswap = swapinf.ani_max * (ULONGLONG)page_size; + freeswap = swapinf.ani_free * (ULONGLONG)page_size; + } + } +#endif + info->AvailablePages = freeram / page_size; + info->TotalCommittedPages = (totalram + totalswap - freeram - freeswap) / page_size; + info->TotalCommitLimit = (totalram + totalswap) / page_size; +} + /*********************************************************************** * RtlIsProcessorFeaturePresent [NTDLL.@] */ @@ -2415,59 +2561,10 @@ NTSTATUS WINAPI NtQuerySystemInformation( { SYSTEM_PERFORMANCE_INFORMATION spi; static BOOL fixme_written = FALSE; - FILE *fp; - memset(&spi, 0 , sizeof(spi)); + get_performance_info( &spi ); len = sizeof(spi); - spi.Reserved3 = 0x7fffffff; /* Available paged pool memory? */ - - if ((fp = fopen("/proc/uptime", "r"))) - { - double uptime, idle_time; - - fscanf(fp, "%lf %lf", &uptime, &idle_time); - fclose(fp); - spi.IdleTime.QuadPart = 10000000 * idle_time; - } - else - { - static ULONGLONG idle; - /* many programs expect IdleTime to change so fake change */ - spi.IdleTime.QuadPart = ++idle; - } - - if ((fp = fopen("/proc/meminfo", "r"))) - { - unsigned long long totalram = 0, freeram = 0, totalswap = 0, freeswap = 0; - char line[64]; - while (fgets(line, sizeof(line), fp)) - { - if(sscanf(line, "MemTotal: %llu kB", &totalram) == 1) - { - totalram *= 1024; - } - else if(sscanf(line, "MemFree: %llu kB", &freeram) == 1) - { - freeram *= 1024; - } - else if(sscanf(line, "SwapTotal: %llu kB", &totalswap) == 1) - { - totalswap *= 1024; - } - else if(sscanf(line, "SwapFree: %llu kB", &freeswap) == 1) - { - freeswap *= 1024; - break; - } - } - fclose(fp); - - spi.AvailablePages = freeram / page_size; - spi.TotalCommittedPages = (totalram + totalswap - freeram - freeswap) / page_size; - spi.TotalCommitLimit = (totalram + totalswap) / page_size; - } - if (Length >= len) { if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION;

1 0

Zebediah Figura : strmbase: Avoid unnecessary use of IPin::ConnectedTo().
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: cc78d104054378570b0d4a244efb5a3e95b92cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc78d104054378570b0d4a24… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 18:51:24 2019 -0600 strmbase: Avoid unnecessary use of IPin::ConnectedTo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/outputqueue.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index ee05653d7a..dbcc4b6d0d 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -177,6 +177,8 @@ VOID WINAPI OutputQueue_SendAnyway(OutputQueue *pOutputQueue) VOID WINAPI OutputQueue_EOS(OutputQueue *pOutputQueue) { + IPin *peer; + EnterCriticalSection(&pOutputQueue->csQueue); if (pOutputQueue->hThread) { @@ -191,16 +193,8 @@ VOID WINAPI OutputQueue_EOS(OutputQueue *pOutputQueue) qev->pSample = NULL; list_add_tail(&pOutputQueue->SampleList, &qev->entry); } - else - { - IPin* ppin = NULL; - IPin_ConnectedTo(&pOutputQueue->pInputPin->pin.IPin_iface, &ppin); - if (ppin) - { - IPin_EndOfStream(ppin); - IPin_Release(ppin); - } - } + else if ((peer = pOutputQueue->pInputPin->pin.peer)) + IPin_EndOfStream(peer); LeaveCriticalSection(&pOutputQueue->csQueue); /* Covers sending the Event to the worker Thread */ OutputQueue_SendAnyway(pOutputQueue); @@ -259,13 +253,9 @@ DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); if (qev->type == EOS_PACKET) { - IPin* ppin = NULL; - IPin_ConnectedTo(&pOutputQueue->pInputPin->pin.IPin_iface, &ppin); - if (ppin) - { - IPin_EndOfStream(ppin); - IPin_Release(ppin); - } + IPin *peer; + if ((peer = pOutputQueue->pInputPin->pin.peer)) + IPin_EndOfStream(peer); } else if (qev->type == SAMPLE_PACKET) break;

1 0

Alexandre Julliard : kernel32/tests: Get rid of Unicode helper functions.
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: e8ef4c0f53720243f8bccfdfec7f87cf75e0ed7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8ef4c0f53720243f8bccfdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 15:36:22 2019 +0100 kernel32/tests: Get rid of Unicode helper functions. --- dlls/kernel32/tests/locale.c | 57 +++++++++++++------------------------------- 1 file changed, 16 insertions(+), 41 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9a13693443..aaaf09cf5c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -48,33 +48,6 @@ static const WCHAR fooW[] = {'f','o','o',0}; static const WCHAR emptyW[] = {0}; static const WCHAR invalidW[] = {'i','n','v','a','l','i','d',0}; -static inline unsigned int strlenW( const WCHAR *str ) -{ - const WCHAR *s = str; - while (*s) s++; - return s - str; -} - -static inline int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) -{ - if (n <= 0) return 0; - while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - -static inline WCHAR *strchrW( const WCHAR *str, WCHAR ch ) -{ - do { if (*str == ch) return (WCHAR *)str; } while (*str++); - return NULL; -} - -static inline BOOL isdigitW( WCHAR wc ) -{ - WORD type; - GetStringTypeW( CT_CTYPE1, &wc, 1, &type ); - return type & C1_DIGIT; -} - /* Some functions are only in later versions of kernel32.dll */ static WORD enumCount; @@ -171,7 +144,7 @@ static void InitFunctionPointers(void) MultiByteToWideChar(CP_ACP,0,y,-1,Expected,ARRAY_SIZE(Expected)); \ SetLastError(0xdeadbeef); buffer[0] = '\0' #define EXPECT_LENW ok(ret == lstrlenW(Expected)+1, "Expected Len %d, got %d\n", lstrlenW(Expected)+1, ret) -#define EXPECT_EQW ok(strncmpW(buffer, Expected, strlenW(Expected)) == 0, "Bad conversion\n") +#define EXPECT_EQW ok(wcsncmp(buffer, Expected, lstrlenW(Expected)) == 0, "Bad conversion\n") #define NUO LOCALE_NOUSEROVERRIDE @@ -681,7 +654,7 @@ static void test_GetTimeFormatEx(void) STRINGSW("m1s2m3s4", ""); /* TIME_NOMINUTESORSECONDS/complex format */ ret = pGetTimeFormatEx(localeW, TIME_NOMINUTESORSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret == strlenW(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + ok(ret == lstrlenW(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_LENW; EXPECT_EQW; STRINGSW("", "8:56 AM"); /* TIME_NOSECONDS/Default format */ @@ -701,7 +674,7 @@ static void test_GetTimeFormatEx(void) STRINGSW("s1s2s3", ""); /* Duplicate tokens */ ret = pGetTimeFormatEx(localeW, TIME_NOSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret == strlenW(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + ok(ret == lstrlenW(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_LENW; EXPECT_EQW; STRINGSW("t/tt", "A/AM"); /* AM time marker */ @@ -3346,6 +3319,7 @@ static void test_FoldStringA(void) static void test_FoldStringW(void) { int ret; + WORD type; unsigned int i, j; WCHAR src[256], dst[256], ch, prev_ch = 1; static const DWORD badFlags[] = @@ -3564,10 +3538,11 @@ static void test_FoldStringW(void) ret = pFoldStringW(MAP_FOLDDIGITS, src, -1, dst, 256); ok(ret == 2, "Expected ret == 2, got %d, error %d\n", ret, GetLastError()); - ok(dst[0] == ch || strchrW(outOfSequenceDigits, ch) || + ok(dst[0] == ch || wcschr(outOfSequenceDigits, ch) || (ch >= 0xa8e0 && ch <= 0xa8e9), /* combining Devanagari on Win8 */ "MAP_FOLDDIGITS: ch 0x%04x Expected unchanged got %04x\n", ch, dst[0]); - ok(!isdigitW(ch) || strchrW(outOfSequenceDigits, ch) || + GetStringTypeW( CT_CTYPE1, &ch, 1, &type ); + ok(!(type & C1_DIGIT) || wcschr(outOfSequenceDigits, ch) || broken( ch >= 0xbf0 && ch <= 0xbf2 ), /* win2k */ "char %04x should not be a digit\n", ch ); } @@ -3595,7 +3570,7 @@ static void test_FoldStringW(void) broken( dst[0] == ch ) || /* old Windows versions don't have all mappings */ (digitRanges[j] == 0x3020 && dst[0] == ch) || /* Hangzhou not present in all Windows versions */ (digitRanges[j] == 0x0F29 && dst[0] == ch) || /* Tibetan not present in all Windows versions */ - strchrW(noDigitAvailable, c), + wcschr(noDigitAvailable, c), "MAP_FOLDDIGITS: ch %04x Expected %04x got %04x\n", ch, '0' + digitRanges[j] - ch, dst[0]); } @@ -5908,22 +5883,22 @@ static void test_NormalizeString(void) if (dstlen) { dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, dst, dstlen ); - ok(dstlen == strlenW( dst )+1, "%s:%d: Copied length differed: was %d, should be %d\n", - wine_dbgstr_w(ptest->str), i, dstlen, strlenW( dst )+1); - str_cmp = strncmpW( ptest->expected[i], dst, dstlen+1 ); + ok(dstlen == lstrlenW( dst )+1, "%s:%d: Copied length differed: was %d, should be %d\n", + wine_dbgstr_w(ptest->str), i, dstlen, lstrlenW( dst )+1); + str_cmp = wcsncmp( ptest->expected[i], dst, dstlen+1 ); todo_wine_if(ptest->todo[i]) ok( str_cmp == 0, "%s:%d: string incorrect got %s expect %s\n", wine_dbgstr_w(ptest->str), i, wine_dbgstr_w(dst), wine_dbgstr_w(ptest->expected[i]) ); } - dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), NULL, 0 ); + dstlen = pNormalizeString( norm_forms[i], ptest->str, lstrlenW(ptest->str), NULL, 0 ); if (dstlen) { memset(dst, 0, sizeof(dst)); - dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), dst, dstlen ); - ok(dstlen == strlenW( dst ), "%s:%d: Copied length differed: was %d, should be %d\n", - wine_dbgstr_w(ptest->str), i, dstlen, strlenW( dst )); - str_cmp = strncmpW( ptest->expected[i], dst, dstlen ); + dstlen = pNormalizeString( norm_forms[i], ptest->str, lstrlenW(ptest->str), dst, dstlen ); + ok(dstlen == lstrlenW( dst ), "%s:%d: Copied length differed: was %d, should be %d\n", + wine_dbgstr_w(ptest->str), i, dstlen, lstrlenW( dst )); + str_cmp = wcsncmp( ptest->expected[i], dst, dstlen ); todo_wine_if(ptest->todo[i]) ok( str_cmp == 0, "%s:%d: string incorrect got %s expect %s\n", wine_dbgstr_w(ptest->str), i, wine_dbgstr_w(dst), wine_dbgstr_w(ptest->expected[i]) );

1 0

Alexandre Julliard : kernel32: Use RtlLocaleNameToLcid().
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: 9f0983ddfc570f20e211ddc257f2c39068266273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f0983ddfc570f20e211ddc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 10:10:18 2019 +0100 kernel32: Use RtlLocaleNameToLcid(). --- dlls/kernel32/locale.c | 43 +++++++------------------------------------ dlls/kernel32/tests/locale.c | 7 +++++++ 2 files changed, 14 insertions(+), 36 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index a465ba6e29..e5e32d3cb5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1182,32 +1182,12 @@ BOOL WINAPI GetUserPreferredUILanguages( DWORD flags, ULONG *count, WCHAR *buffe */ LCID WINAPI LocaleNameToLCID( LPCWSTR name, DWORD flags ) { - struct locale_name locale_name; - static int once; - - if (flags && !once++) - FIXME( "unsupported flags %x\n", flags ); - - if (name == LOCALE_NAME_USER_DEFAULT) - return GetUserDefaultLCID(); + LCID lcid; - /* string parsing */ - parse_locale_name( name, &locale_name ); - - TRACE( "found lcid %x for %s, matches %d\n", - locale_name.lcid, debugstr_w(name), locale_name.matches ); - - if (!locale_name.matches) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (locale_name.matches == 1) - WARN( "locale %s not recognized, defaulting to %s\n", - debugstr_w(name), debugstr_w(locale_name.lang) ); - - return locale_name.lcid; + if (!name) return GetUserDefaultLCID(); + if (!set_ntstatus( RtlLocaleNameToLcid( name, &lcid, 2 ))) return 0; + if (!(flags & LOCALE_ALLOW_NEUTRAL_NAMES)) lcid = ConvertDefaultLocale( lcid ); + return lcid; } @@ -2570,18 +2550,9 @@ BOOL WINAPI IsValidLocale( LCID lcid, DWORD flags ) */ BOOL WINAPI IsValidLocaleName( LPCWSTR locale ) { - struct locale_name locale_name; - - if (!locale) - return FALSE; - - /* string parsing */ - parse_locale_name( locale, &locale_name ); - - TRACE( "found lcid %x for %s, matches %d\n", - locale_name.lcid, debugstr_w(locale), locale_name.matches ); + LCID lcid; - return locale_name.matches > 0; + return !RtlLocaleNameToLcid( locale, &lcid, 2 ); } /****************************************************************************** diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b87f99c1c2..9a13693443 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2856,6 +2856,9 @@ static void test_LocaleNameToLCID(void) ok(lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT), "Got wrong lcid for es-es: 0x%x\n", lcid); /* english neutral name */ + lcid = pLocaleNameToLCID(enW, LOCALE_ALLOW_NEUTRAL_NAMES); + ok(lcid == MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), SORT_DEFAULT) || + broken(lcid == 0) /* Vista */, "got 0x%04x\n", lcid); lcid = pLocaleNameToLCID(enW, 0); ok(lcid == MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT) || broken(lcid == 0) /* Vista */, "got 0x%04x\n", lcid); @@ -2871,6 +2874,7 @@ static void test_LocaleNameToLCID(void) *buffer = 0; ret = pLCIDToLocaleName(lcid, buffer, ARRAY_SIZE(buffer), 0); ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(ptr->name), ret); + todo_wine_if (ptr->todo) ok(!lstrcmpW(ptr->sname, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(ptr->name), wine_dbgstr_w(buffer)); @@ -4740,6 +4744,7 @@ static void test_GetLocaleInfoEx(void) static void test_IsValidLocaleName(void) { static const WCHAR enusW[] = {'e','n','-','U','S',0}; + static const WCHAR enW[] = {'e','n',0}; static const WCHAR zzW[] = {'z','z',0}; static const WCHAR zz_zzW[] = {'z','z','-','Z','Z',0}; static const WCHAR zzzzW[] = {'z','z','z','z',0}; @@ -4753,6 +4758,8 @@ static void test_IsValidLocaleName(void) ret = pIsValidLocaleName(enusW); ok(ret, "IsValidLocaleName failed\n"); + ret = pIsValidLocaleName(enW); + ok(ret || broken(!ret), "IsValidLocaleName failed\n"); ret = pIsValidLocaleName(zzW); ok(!ret || broken(ret), "IsValidLocaleName should have failed\n"); ret = pIsValidLocaleName(zz_zzW);

1 0

Alexandre Julliard : kernel32: Add more special cases in ConvertDefaultLocale().
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: 4b1a8d63615d0e553fd4021a7b135192467220cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b1a8d63615d0e553fd4021a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 09:58:20 2019 +0100 kernel32: Add more special cases in ConvertDefaultLocale(). --- dlls/kernel32/locale.c | 41 ++++++++++++++++--------- dlls/kernel32/tests/locale.c | 73 ++++++++++++++++++++++++++++++++------------ 2 files changed, 81 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b1a8d63615d0e553fd4…

1 0

Alexandre Julliard : kernel32: Move system information functions to kernelbase.
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: 71aba33fc68e97d1b49a9207c8fc2ef733b604a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71aba33fc68e97d1b49a9207… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 18 18:57:26 2019 +0100 kernel32: Move system information functions to kernelbase. --- dlls/kernel32/cpu.c | 151 ---------------------------------------- dlls/kernel32/kernel32.spec | 10 +-- dlls/kernelbase/kernelbase.spec | 10 +-- dlls/kernelbase/memory.c | 147 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 157 insertions(+), 161 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71aba33fc68e97d1b49a…

1 0

Alexandre Julliard : kernel32: Move physical memory status functions to kernelbase.
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: b73cfa72edaed76744cfa9a19670bff3684c66ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=b73cfa72edaed76744cfa9a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 18 15:05:04 2019 +0100 kernel32: Move physical memory status functions to kernelbase. --- dlls/kernel32/heap.c | 274 +--------------------------------------- dlls/kernel32/kernel32.spec | 4 +- dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/memory.c | 77 +++++++++++ 4 files changed, 83 insertions(+), 276 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b73cfa72edaed76744cf…

1 0

Zebediah Figura : strmbase: Rename the "mtCurrent" field of struct strmbase_pin to "mt".
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: 03f0479c34ec1d9cf732728f740113fedd48a10c URL: https://source.winehq.org/git/wine.git/?a=commit;h=03f0479c34ec1d9cf732728f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 18:51:20 2019 -0600 strmbase: Rename the "mtCurrent" field of struct strmbase_pin to "mt". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 4 ++-- dlls/qcap/avimux.c | 2 +- dlls/qcap/smartteefilter.c | 4 ++-- dlls/quartz/dsoundrender.c | 14 +++++++------- dlls/quartz/filesource.c | 4 ++-- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/quartz/videorenderer.c | 4 ++-- dlls/quartz/vmr9.c | 6 +++--- dlls/strmbase/pin.c | 20 ++++++++++---------- dlls/winegstreamer/gstdemux.c | 4 ++-- dlls/wineqtdecoder/qtsplitter.c | 4 ++-- include/wine/strmbase.h | 2 +- 14 files changed, 40 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03f0479c34ec1d9cf732…

1 0