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

[v2 PATCH] oledb32: Coerce Variant to VT_DATE when converting data

by Alistair Leslie-Hughes

v2: Correct Parameters passed to VariantChangeType. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/convert.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 267de1b..22609ae 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -475,10 +475,13 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; case DBTYPE_VARIANT: - if( V_VT((VARIANT*)src) == VT_DATE) + { + VariantInit(&tmp); + + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_DATE)) == S_OK) { SYSTEMTIME st; - hr = (VariantTimeToSystemTime( V_DATE((VARIANT*)src), &st) ? S_OK : E_FAIL); + hr = (VariantTimeToSystemTime( V_DATE(&tmp), &st) ? S_OK : E_FAIL); d->year = st.wYear; d->month = st.wMonth; d->day = st.wDay; @@ -489,6 +492,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, return E_NOTIMPL; } break; + } default: FIXME("Unimplemented conversion %04x -> DBDATE\n", src_type); return E_NOTIMPL; } break; -- 1.9.1

Jan. 2, 2018

Re: [PATCH] gdi32/tests: Expect English font names even on non-English locales

by Alex Henrie

Please ignore this patch. I should have double-checked it with the testbot before submitting. -Alex

Jan. 1, 2018

Re: [PATCH] gdi32/tests: Expect English font names even on non-English locales

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=34978 Your paranoid android. === w7u (32 bit font) === font.c:5503: Test failed: MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: MS UI Gothic: style names don't match: returned W, expect Regular font.c:5484: Test failed: font family names don't match: returned lr SVbN, expect MS Gothic font.c:5494: Test failed: lr SVbN: font face names don't match: returned lr SVbN, expect MS Gothic font.c:5503: Test failed: lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned lr SVbN, expect MS Gothic font.c:5494: Test failed: lr SVbN: font face names don't match: returned lr SVbN, expect MS Gothic font.c:5503: Test failed: lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned lr SVbN, expect MS Gothic font.c:5494: Test failed: lr SVbN: font face names don't match: returned lr SVbN, expect MS Gothic font.c:5503: Test failed: lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned lr SVbN, expect MS Gothic font.c:5494: Test failed: lr SVbN: font face names don't match: returned lr SVbN, expect MS Gothic font.c:5503: Test failed: lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned lr SVbN, expect MS Gothic font.c:5494: Test failed: lr SVbN: font face names don't match: returned lr SVbN, expect MS Gothic font.c:5503: Test failed: lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned lr SVbN, expect MS Gothic font.c:5494: Test failed: lr SVbN: font face names don't match: returned lr SVbN, expect MS Gothic font.c:5503: Test failed: lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned lr SVbN, expect MS Gothic font.c:5494: Test failed: lr SVbN: font face names don't match: returned lr SVbN, expect MS Gothic font.c:5503: Test failed: lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned lr oSVbN, expect MS PGothic font.c:5494: Test failed: lr oSVbN: font face names don't match: returned lr oSVbN, expect MS PGothic font.c:5503: Test failed: lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned lr oSVbN, expect MS PGothic font.c:5494: Test failed: lr oSVbN: font face names don't match: returned lr oSVbN, expect MS PGothic font.c:5503: Test failed: lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned lr oSVbN, expect MS PGothic font.c:5494: Test failed: lr oSVbN: font face names don't match: returned lr oSVbN, expect MS PGothic font.c:5503: Test failed: lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned lr oSVbN, expect MS PGothic font.c:5494: Test failed: lr oSVbN: font face names don't match: returned lr oSVbN, expect MS PGothic font.c:5503: Test failed: lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned lr oSVbN, expect MS PGothic font.c:5494: Test failed: lr oSVbN: font face names don't match: returned lr oSVbN, expect MS PGothic font.c:5503: Test failed: lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned lr oSVbN, expect MS PGothic font.c:5494: Test failed: lr oSVbN: font face names don't match: returned lr oSVbN, expect MS PGothic font.c:5503: Test failed: lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned lr oSVbN, expect MS PGothic font.c:5494: Test failed: lr oSVbN: font face names don't match: returned lr oSVbN, expect MS PGothic font.c:5503: Test failed: lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5503: Test failed: @MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: @MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: @MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: @MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: @MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: @MS UI Gothic: style names don't match: returned W, expect Regular font.c:5503: Test failed: @MS UI Gothic: style names don't match: returned W, expect Regular font.c:5484: Test failed: font family names don't match: returned @lr SVbN, expect @MS Gothic font.c:5494: Test failed: @lr SVbN: font face names don't match: returned @lr SVbN, expect @MS Gothic font.c:5503: Test failed: @lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr SVbN, expect @MS Gothic font.c:5494: Test failed: @lr SVbN: font face names don't match: returned @lr SVbN, expect @MS Gothic font.c:5503: Test failed: @lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr SVbN, expect @MS Gothic font.c:5494: Test failed: @lr SVbN: font face names don't match: returned @lr SVbN, expect @MS Gothic font.c:5503: Test failed: @lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr SVbN, expect @MS Gothic font.c:5494: Test failed: @lr SVbN: font face names don't match: returned @lr SVbN, expect @MS Gothic font.c:5503: Test failed: @lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr SVbN, expect @MS Gothic font.c:5494: Test failed: @lr SVbN: font face names don't match: returned @lr SVbN, expect @MS Gothic font.c:5503: Test failed: @lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr SVbN, expect @MS Gothic font.c:5494: Test failed: @lr SVbN: font face names don't match: returned @lr SVbN, expect @MS Gothic font.c:5503: Test failed: @lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr SVbN, expect @MS Gothic font.c:5494: Test failed: @lr SVbN: font face names don't match: returned @lr SVbN, expect @MS Gothic font.c:5503: Test failed: @lr SVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr SVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr SVbN:2009, expect Microsoft:MS Gothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5494: Test failed: @lr oSVbN: font face names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5503: Test failed: @lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5494: Test failed: @lr oSVbN: font face names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5503: Test failed: @lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5494: Test failed: @lr oSVbN: font face names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5503: Test failed: @lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5494: Test failed: @lr oSVbN: font face names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5503: Test failed: @lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5494: Test failed: @lr oSVbN: font face names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5503: Test failed: @lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5494: Test failed: @lr oSVbN: font face names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5503: Test failed: @lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009 font.c:5484: Test failed: font family names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5494: Test failed: @lr oSVbN: font face names don't match: returned @lr oSVbN, expect @MS PGothic font.c:5503: Test failed: @lr oSVbN: style names don't match: returned W, expect Regular font.c:5513: Test failed: @lr oSVbN: UNIQUE ID (full name) doesn't match: returned Microsoft:lr oSVbN:2009, expect Microsoft:MS PGothic:2009

Jan. 1, 2018

[PATCH] gdi32/tests: Expect English font names even on non-English locales

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes numerous test VM failures dlls/gdi32/tests/font.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 117a14f153..f1b7e9a91c 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5477,8 +5477,7 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "%s: FAMILY (family name) could not be read\n", FamilyName); if (want_vertical) bufW = prepend_at(bufW); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); @@ -5488,8 +5487,7 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "FULL_NAME (face name) could not be read\n"); if (want_vertical) bufW = prepend_at(bufW); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); @@ -5499,8 +5497,7 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "%s: SUBFAMILY (style name) could not be read\n", FamilyName); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); ok(!lstrcmpA(StyleName, bufA), "%s: style names don't match: returned %s, expect %s\n", FamilyName, StyleName, bufA); @@ -5509,8 +5506,7 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "%s: UNIQUE_ID (full name) could not be read\n", FamilyName); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName; -- 2.15.1

Jan. 1, 2018

[PATCH] user32/tests: Add missing return value test (Coverity)

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/dialog.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index f7aae80c9c..afc3473df3 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1476,7 +1476,8 @@ static void test_DialogBoxParam(void) ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", 0, TestDefButtonDlgProc, 0); ok(ret == IDOK, "Expected IDOK\n"); - DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", 0, TestReturnKeyDlgProc, 0); + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", 0, TestReturnKeyDlgProc, 0); + ok(ret == 0, "Unexpected ret value %ld.\n", ret); /* WM_SETTEXT handling in case of A/W dialog procedures vs A/W dialog window. */ ret = DialogBoxParamW(GetModuleHandleA(NULL), nameW, 0, test_aw_conversion_dlgproc, 0); -- 2.15.1

Jan. 1, 2018

[PATCH] psapi/tests: Increase GetPerformanceInfo error margins for Windows 8

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes the intermittent failures on Windows 8 dlls/psapi/tests/psapi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 50dfdd903c..cd07ce727a 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -230,11 +230,11 @@ static void test_GetPerformanceInfo(void) /* TODO: info.SystemCache not checked yet - to which field(s) does this value correspond to? */ - ok(check_with_margin(info.KernelTotal, sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, 64), + ok(check_with_margin(info.KernelTotal, sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, 256), "expected approximately %ld but got %d\n", info.KernelTotal, sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage); - ok(check_with_margin(info.KernelPaged, sys_performance_info->PagedPoolUsage, 64), + ok(check_with_margin(info.KernelPaged, sys_performance_info->PagedPoolUsage, 256), "expected approximately %ld but got %d\n", info.KernelPaged, sys_performance_info->PagedPoolUsage); ok(check_with_margin(info.KernelNonpaged, sys_performance_info->NonPagedPoolUsage, 16), -- 2.15.1

Jan. 1, 2018

[PATCH] vbscript/tests: Fix first-day-of-week test on mixed locales

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- One of the test VMs uses the German language (first day Monday) but Inuktitut dates (first day Sunday). When determining the first day of the week, Inuktitut needs to take precedence, which it does when LOCALE_USER_DEFAULT is used. dlls/vbscript/tests/run.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 7c97db2a9b..ee811c6e5b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -219,8 +219,7 @@ static void detect_locale(void) PRIMARYLANGID(GetUserDefaultUILanguage()) == LANG_ENGLISH && PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH); - GetLocaleInfoA(pGetThreadUILanguage ? pGetThreadUILanguage() : GetUserDefaultUILanguage(), - LOCALE_IFIRSTDAYOFWEEK | LOCALE_RETURN_NUMBER, + GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK | LOCALE_RETURN_NUMBER, (void*)&first_day_of_week, sizeof(first_day_of_week)); first_day_of_week = 1 + (first_day_of_week + 1) % 7; } -- 2.15.1

Jan. 1, 2018

[PATCH] po: Fix Catalan spelling and grammar (Softcatalà quality check)

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- po/ca.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/ca.po b/po/ca.po index 0fdec04444..ce9601561c 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-12-17 18:14-0700\n" +"PO-Revision-Date: 2017-12-31 19:18-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -6913,7 +6913,7 @@ msgstr "S'està assignant espai en el registre" #: msi.rc:91 msgid "Searching for installed applications" -msgstr "S'estan cercant aplicacions instalades" +msgstr "S'estan cercant aplicacions instal·lades" #: msi.rc:92 msgid "Binding executables" @@ -6969,7 +6969,7 @@ msgstr "S'està instal·lant el catàleg de sistema" #: msi.rc:107 msgid "Validating install" -msgstr "S'està validant l'instalació" +msgstr "S'està validant l'instal·lació" #: msi.rc:108 msgid "Evaluating launch conditions" @@ -6987,7 +6987,7 @@ msgstr "S'estan movent fixters" #: msi.rc:111 msgid "Publishing assembly information" -msgstr "S'està publicant informació de assemblatge" +msgstr "S'està publicant informació d'assemblatge" #: msi.rc:112 msgid "Unpublishing assembly information" @@ -10640,7 +10640,7 @@ msgid "" "Specifying no open command after the equal sign removes the command string\n" "associated to the specified file type.\n" msgstr "" -"FTYPE mostra o modifica les ordres d'obertura associats amb els tipus de\n" +"FTYPE mostra o modifica les ordres d'obertura associades amb els tipus de\n" "fitxers.\n" "\n" "Sintaxi: FTYPE [tipusDeFitxer[=[ordreDeObertura]]]\n" -- 2.15.1

Jan. 1, 2018