February 2021 - Wine-commits

Gabriel Ivăncescu : user32: Keep toplevel minimized windows offscreen if they're already.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: dd417540bb3afb3aa5a04a007eea9a7ee347655b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd417540bb3afb3aa5a04a00… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 4 18:34:38 2021 +0200 user32: Keep toplevel minimized windows offscreen if they're already. Some applications (e.g. Lego Worlds, Hitman 2) use (-32000,-32000) to determine whether a window is minimized. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 3 --- dlls/user32/winpos.c | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c457ce16d4e..eecccb70001 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11574,7 +11574,6 @@ todo_wine ret = GetWindowPlacement(hwnd, &wp); ok(ret, "failed to get window placement, error %u\n", GetLastError()); ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); -todo_wine ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); todo_wine @@ -11583,7 +11582,6 @@ todo_wine ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", wine_dbgstr_rect(&wp.rcNormalPosition)); GetWindowRect(hwnd, &rect); -todo_wine ok(rect.left == -32000 && rect.top == -32000, "got window rect %s\n", wine_dbgstr_rect(&rect)); ShowWindow(hwnd, SW_SHOWNORMAL); @@ -11591,7 +11589,6 @@ todo_wine ret = GetWindowPlacement(hwnd, &wp); ok(ret, "failed to get window placement, error %u\n", GetLastError()); ok(wp.showCmd == SW_NORMAL, "got show cmd %u\n", wp.showCmd); -todo_wine ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); todo_wine diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 9e5a0c238af..072b574f3aa 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1688,6 +1688,14 @@ static BOOL SWP_DoWinPosChanging( WINDOWPOS *pWinpos, RECT *old_window_rect, REC } if (!(pWinpos->flags & SWP_NOMOVE)) { + /* If the window is toplevel minimized off-screen, force keep it there */ + if ((wndPtr->dwStyle & WS_MINIMIZE) && + wndPtr->window_rect.left <= -32000 && wndPtr->window_rect.top <= -32000 && + (!wndPtr->parent || wndPtr->parent == GetDesktopWindow())) + { + pWinpos->x = -32000; + pWinpos->y = -32000; + } new_window_rect->left = pWinpos->x; new_window_rect->top = pWinpos->y; new_window_rect->right += pWinpos->x - old_window_rect->left;

1 0

Zebediah Figura : kernelbase: Map LANG_SERBIAN_NEUTRAL in ConvertDefaultLocale().
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: f51e44c1802338cdd41b38efe2757b642b619d6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f51e44c1802338cdd41b38ef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 3 17:48:34 2021 -0600 kernelbase: Map LANG_SERBIAN_NEUTRAL in ConvertDefaultLocale(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 4 ++++ dlls/kernelbase/locale.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 3fdfa251144..0f409abe3e2 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3652,6 +3652,10 @@ static void test_ConvertDefaultLocale(void) broken( lcid == 0x7c04 ) || /* winxp */ broken( lcid == 0x0404 ), /* vista */ "Expected lcid = %08x got %08x\n", MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_HONGKONG ), lcid ); + lcid = ConvertDefaultLocale( LANG_SERBIAN_NEUTRAL ); + ok( lcid == MAKELANGID( LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN ) || + broken( lcid == MAKELANGID( LANG_SERBIAN, SUBLANG_SERBIAN_LATIN ) ), /* <= vista */ + "Expected lcid = %08x got %08x\n", MAKELANGID( LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN ), lcid ); /* Invariant language is not treated specially */ TEST_LCID(LANG_INVARIANT, SUBLANG_DEFAULT, SORT_DEFAULT); diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index c60b796aa48..d2f71c97ac7 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3189,6 +3189,8 @@ LCID WINAPI DECLSPEC_HOTPATCH ConvertDefaultLocale( LCID lcid ) return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED ); case MAKELANGID( LANG_CHINESE, 0x1f ): return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_HONGKONG ); + case LANG_SERBIAN_NEUTRAL: + return MAKELANGID( LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN ); case MAKELANGID( LANG_SPANISH, SUBLANG_NEUTRAL ): return MAKELANGID( LANG_SPANISH, SUBLANG_SPANISH_MODERN ); case MAKELANGID( LANG_IRISH, SUBLANG_NEUTRAL ):

1 0

Zebediah Figura : ntdll: Map LANG_SERBIAN_NEUTRAL in RtlLocaleNameToLcid().
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: db3e08770fe9bfb6f06a71761e48a40fe9764058 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db3e08770fe9bfb6f06a7176… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 3 17:48:35 2021 -0600 ntdll: Map LANG_SERBIAN_NEUTRAL in RtlLocaleNameToLcid(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 10 +++------- dlls/ntdll/locale.c | 3 +++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0f409abe3e2..b354f759335 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2861,14 +2861,12 @@ static void test_LocaleNameToLCID(void) for (ptr = neutralsublang_names; *ptr->name; ptr++) { lcid = pLocaleNameToLCID(ptr->name, 0); - todo_wine_if (ptr->todo) - ok(lcid == ptr->lcid, "%s: got wrong lcid 0x%04x, expected 0x%04x\n", - wine_dbgstr_w(ptr->name), lcid, ptr->lcid); + ok(lcid == ptr->lcid, "%s: got wrong lcid 0x%04x, expected 0x%04x\n", + wine_dbgstr_w(ptr->name), lcid, ptr->lcid); *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)); @@ -2974,7 +2972,6 @@ static void test_LocaleNameToLCID(void) status = pRtlLocaleNameToLcid( ptr->name, &lcid, 2 ); ok( !status || broken(ptr->lcid == MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED)), /* vista */ "%s failed error %x\n", wine_dbgstr_w(ptr->name), status ); - todo_wine_if(ptr->todo) if (!status) ok( lcid == expect, "%s: got wrong lcid 0x%04x, expected 0x%04x\n", wine_dbgstr_w(ptr->name), lcid, expect ); status = pRtlLocaleNameToLcid( ptr->sname, &lcid, 0 ); @@ -4824,8 +4821,7 @@ static void test_GetLocaleInfoEx(void) { val = 0; pGetLocaleInfoEx(ptr->name, LOCALE_ILANGUAGE|LOCALE_RETURN_NUMBER, (WCHAR*)&val, sizeof(val)/sizeof(WCHAR)); - todo_wine_if (ptr->todo) - ok(val == ptr->lcid, "%s: got wrong lcid 0x%04x, expected 0x%04x\n", wine_dbgstr_w(ptr->name), val, ptr->lcid); + ok(val == ptr->lcid, "%s: got wrong lcid 0x%04x, expected 0x%04x\n", wine_dbgstr_w(ptr->name), val, ptr->lcid); bufferW[0] = 0; ret = pGetLocaleInfoEx(ptr->name, LOCALE_SNAME, bufferW, ARRAY_SIZE(bufferW)); ok(ret == lstrlenW(bufferW)+1, "%s: got ret value %d\n", wine_dbgstr_w(ptr->name), ret); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 3979f41089b..e4d90a8b1d5 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1358,6 +1358,9 @@ NTSTATUS WINAPI RtlLocaleNameToLcid( const WCHAR *name, LCID *lcid, ULONG flags case MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_HONGKONG ): *lcid = MAKELCID( 0x7c04, SORT_DEFAULT ); break; + case MAKELANGID( LANG_SERBIAN, SUBLANG_NEUTRAL ): + *lcid = LANG_SERBIAN_NEUTRAL; + break; default: *lcid = MAKELANGID( PRIMARYLANGID(id), SUBLANG_NEUTRAL ); break;

1 0

Michael Müller : kernel32: Update sr-Latn locale definition.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: 3b3dfda59951b0f42e297f2b9a31ded04a98d4b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b3dfda59951b0f42e297f2b… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 3 17:48:36 2021 -0600 kernel32: Update sr-Latn locale definition. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/srl.nls | 14 +++++++------- dlls/kernel32/tests/locale.c | 4 +--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls index 948b5e11a2b..516bb512aae 100644 --- a/dlls/kernel32/nls/srl.nls +++ b/dlls/kernel32/nls/srl.nls @@ -66,7 +66,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_ITLZERO "0" LOCALE_S1159 "" LOCALE_S2359 "" - LOCALE_SABBREVCTRYNAME "SRB" + LOCALE_SABBREVCTRYNAME "SCG" LOCALE_SABBREVDAYNAME1 "pon" LOCALE_SABBREVDAYNAME2 "uto" LOCALE_SABBREVDAYNAME3 "sre" @@ -88,7 +88,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_SABBREVMONTHNAME11 "nov" LOCALE_SABBREVMONTHNAME12 "dec" LOCALE_SABBREVMONTHNAME13 "" - LOCALE_SCOUNTRY "Serbia" + LOCALE_SCOUNTRY "Serbia and Montenegro (Former)" LOCALE_SCURRENCY "Din." LOCALE_SDATE "." LOCALE_SDAYNAME1 "ponedeljak" @@ -99,12 +99,12 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_SDAYNAME6 "subota" LOCALE_SDAYNAME7 "nedelja" LOCALE_SDECIMAL "," - LOCALE_SENGCOUNTRY "Serbia" + LOCALE_SENGCOUNTRY "Serbia and Montenegro (Former)" LOCALE_SENGCURRNAME "Serbian Dinar" LOCALE_SENGLANGUAGE "Serbian (Latin)" LOCALE_SGROUPING "3;0" - LOCALE_SINTLSYMBOL "RSD" - LOCALE_SISO3166CTRYNAME "RS" + LOCALE_SINTLSYMBOL "CSD" + LOCALE_SISO3166CTRYNAME "CS" LOCALE_SISO639LANGNAME "sr" LOCALE_SLANGUAGE "Serbian (Latin)" LOCALE_SLIST ";" @@ -126,9 +126,9 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_SMONTHNAME12 "decembar" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." - LOCALE_SNAME "sr-Latn-RS" + LOCALE_SNAME "sr-Latn-CS" LOCALE_SNAN "NaN" - LOCALE_SNATIVECTRYNAME "Srbija" + LOCALE_SNATIVECTRYNAME "Srbija i Crna Gora (Bivši)" LOCALE_SNATIVECURRNAME "dinar" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVEDISPLAYNAME "srpski (Srbija)" diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b354f759335..55566d3e703 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2768,7 +2768,6 @@ struct neutralsublang_name_t { WCHAR name[3]; WCHAR sname[16]; LCID lcid; - int todo; }; static const struct neutralsublang_name_t neutralsublang_names[] = { @@ -2782,7 +2781,7 @@ static const struct neutralsublang_name_t neutralsublang_names[] = { { {'m','s',0}, {'m','s','-','M','Y',0}, MAKELCID(MAKELANGID(LANG_MALAY, SUBLANG_MALAY_MALAYSIA), SORT_DEFAULT) }, { {'n','l',0}, {'n','l','-','N','L',0}, MAKELCID(MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH), SORT_DEFAULT) }, { {'p','t',0}, {'p','t','-','B','R',0}, MAKELCID(MAKELANGID(LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN), SORT_DEFAULT) }, - { {'s','r',0}, {'s','r','-','L','a','t','n','-','R','S',0}, MAKELCID(MAKELANGID(LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN), SORT_DEFAULT), 1 }, + { {'s','r',0}, {'s','r','-','L','a','t','n','-','R','S',0}, MAKELCID(MAKELANGID(LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN), SORT_DEFAULT) }, { {'s','v',0}, {'s','v','-','S','E',0}, MAKELCID(MAKELANGID(LANG_SWEDISH, SUBLANG_SWEDISH), SORT_DEFAULT) }, { {'u','z',0}, {'u','z','-','L','a','t','n','-','U','Z',0}, MAKELCID(MAKELANGID(LANG_UZBEK, SUBLANG_UZBEK_LATIN), SORT_DEFAULT) }, { {'z','h',0}, {'z','h','-','C','N',0}, MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT) }, @@ -2977,7 +2976,6 @@ static void test_LocaleNameToLCID(void) status = pRtlLocaleNameToLcid( ptr->sname, &lcid, 0 ); ok( !status || broken(ptr->lcid == MAKELANGID(LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN)), /* vista */ "%s failed error %x\n", wine_dbgstr_w(ptr->name), status ); - todo_wine_if(ptr->todo) if (!status) ok( lcid == ptr->lcid, "%s: got wrong lcid 0x%04x, expected 0x%04x\n", wine_dbgstr_w(ptr->name), lcid, ptr->lcid ); }

1 0

Nikolay Sivov : mfplat/tests: Fix a crash on Vista.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: 9ec297e283d5f914dcf70c81cfaf3e3c77675381 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ec297e283d5f914dcf70c81… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 4 12:49:15 2021 +0300 mfplat/tests: Fix a crash on Vista. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index deb9e78efba..0464293b37f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -136,6 +136,7 @@ static DXGI_FORMAT (WINAPI *pMFMapDX9FormatToDXGIFormat)(DWORD format); static HRESULT (WINAPI *pMFCreateVideoSampleAllocatorEx)(REFIID riid, void **allocator); static HRESULT (WINAPI *pMFCreateDXGISurfaceBuffer)(REFIID riid, IUnknown *surface, UINT subresource, BOOL bottomup, IMFMediaBuffer **buffer); +static HRESULT (WINAPI *pMFCreateVideoMediaTypeFromSubtype)(const GUID *subtype, IMFVideoMediaType **media_type); static HWND create_window(void) { @@ -799,6 +800,7 @@ static void init_functions(void) X(MFCreateMFByteStreamOnStream); X(MFCreateTrackedSample); X(MFCreateTransformActivate); + X(MFCreateVideoMediaTypeFromSubtype); X(MFCreateVideoSampleAllocatorEx); X(MFGetPlaneSize); X(MFGetStrideForBitmapInfoHeader); @@ -965,28 +967,32 @@ if(0) IUnknown_Release(unk2); IUnknown_Release(unk); + IMFMediaType_Release(mediatype); - hr = MFCreateVideoMediaTypeFromSubtype(&MFVideoFormat_RGB555, &video_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - - check_interface(video_type, &IID_IMFMediaType, TRUE); - check_interface(video_type, &IID_IMFVideoMediaType, TRUE); + if (pMFCreateVideoMediaTypeFromSubtype) + { + hr = pMFCreateVideoMediaTypeFromSubtype(&MFVideoFormat_RGB555, &video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - /* Major and subtype are set on creation. */ - hr = IMFVideoMediaType_GetCount(video_type, &count); - ok(count == 2, "Unexpected attribute count %#x.\n", hr); + check_interface(video_type, &IID_IMFMediaType, TRUE); + check_interface(video_type, &IID_IMFVideoMediaType, TRUE); - hr = IMFVideoMediaType_DeleteAllItems(video_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* Major and subtype are set on creation. */ + hr = IMFVideoMediaType_GetCount(video_type, &count); + ok(count == 2, "Unexpected attribute count %#x.\n", hr); - hr = IMFVideoMediaType_GetCount(video_type, &count); - ok(!count, "Unexpected attribute count %#x.\n", hr); + hr = IMFVideoMediaType_DeleteAllItems(video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - check_interface(video_type, &IID_IMFVideoMediaType, FALSE); + hr = IMFVideoMediaType_GetCount(video_type, &count); + ok(!count, "Unexpected attribute count %#x.\n", hr); - IMFVideoMediaType_Release(video_type); + check_interface(video_type, &IID_IMFVideoMediaType, FALSE); - IMFMediaType_Release(mediatype); + IMFVideoMediaType_Release(video_type); + } + else + win_skip("MFCreateVideoMediaTypeFromSubtype() is not available.\n"); /* IMFAudioMediaType */ hr = MFCreateMediaType(&mediatype);

1 0

Nikolay Sivov : dwrite: Change remaining traces to have consistent format.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: 4914f51c096dc6d19f9c4c3fdecb0b17b3ed1008 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4914f51c096dc6d19f9c4c3f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 4 13:19:46 2021 +0300 dwrite: Change remaining traces to have consistent format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 50 ++++++++++++++++++++++--------------------- dlls/dwrite/font.c | 58 ++++++++++++++++++++++++-------------------------- dlls/dwrite/layout.c | 4 ++-- dlls/dwrite/main.c | 2 +- dlls/dwrite/opentype.c | 2 +- 5 files changed, 58 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4914f51c096dc6d19f9c…

1 0

Nikolay Sivov : dwrite/layout: Implement desired orientation get/set methods.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: fdc56196ef4ed9fbafb759b38f78adf6e9a33eee URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdc56196ef4ed9fbafb759b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 4 13:19:47 2021 +0300 dwrite/layout: Implement desired orientation get/set methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 52 +++++++++++++++++++++++++++++++++------------- dlls/dwrite/tests/layout.c | 24 +++++++++++++++++++++ 2 files changed, 62 insertions(+), 14 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index b68daf0345b..a24752c9bff 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -492,6 +492,19 @@ static HRESULT format_set_optical_alignment(struct dwrite_textformat_data *forma return S_OK; } +static HRESULT format_set_vertical_orientation(struct dwrite_textformat_data *format, + DWRITE_VERTICAL_GLYPH_ORIENTATION orientation, BOOL *changed) +{ + if ((UINT32)orientation > DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED) + return E_INVALIDARG; + + if (changed) + *changed = format->vertical_orientation != orientation; + + format->vertical_orientation = orientation; + return S_OK; +} + static BOOL is_run_rtl(const struct layout_effective_run *run) { return run->run->u.regular.run.bidiLevel & 1; @@ -3957,6 +3970,21 @@ static HRESULT WINAPI dwritetextlayout2_GetMetrics(IDWriteTextLayout4 *iface, DW return hr; } +static HRESULT layout_set_vertical_orientation(struct dwrite_textlayout *layout, + DWRITE_VERTICAL_GLYPH_ORIENTATION orientation) +{ + BOOL changed; + HRESULT hr; + + if (FAILED(hr = format_set_vertical_orientation(&layout->format, orientation, &changed))) + return hr; + + if (changed) + layout->recompute = RECOMPUTE_EVERYTHING; + + return S_OK; +} + static HRESULT WINAPI dwritetextlayout2_SetVerticalGlyphOrientation(IDWriteTextLayout4 *iface, DWRITE_VERTICAL_GLYPH_ORIENTATION orientation) { @@ -3964,11 +3992,7 @@ static HRESULT WINAPI dwritetextlayout2_SetVerticalGlyphOrientation(IDWriteTextL TRACE("%p, %d.\n", iface, orientation); - if ((UINT32)orientation > DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED) - return E_INVALIDARG; - - layout->format.vertical_orientation = orientation; - return S_OK; + return layout_set_vertical_orientation(layout, orientation); } static DWRITE_VERTICAL_GLYPH_ORIENTATION WINAPI dwritetextlayout2_GetVerticalGlyphOrientation(IDWriteTextLayout4 *iface) @@ -4591,16 +4615,20 @@ static HRESULT WINAPI dwritetextformat_layout_GetLocaleName(IDWriteTextFormat3 * static HRESULT WINAPI dwritetextformat1_layout_SetVerticalGlyphOrientation(IDWriteTextFormat3 *iface, DWRITE_VERTICAL_GLYPH_ORIENTATION orientation) { - FIXME("%p, %d: stub\n", iface, orientation); + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); - return E_NOTIMPL; + TRACE("%p, %d.\n", iface, orientation); + + return layout_set_vertical_orientation(layout, orientation); } static DWRITE_VERTICAL_GLYPH_ORIENTATION WINAPI dwritetextformat1_layout_GetVerticalGlyphOrientation(IDWriteTextFormat3 *iface) { - FIXME("%p: stub\n", iface); + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); - return DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT; + TRACE("%p.\n", iface); + + return layout->format.vertical_orientation; } static HRESULT WINAPI dwritetextformat1_layout_SetLastLineWrapping(IDWriteTextFormat3 *iface, @@ -5709,11 +5737,7 @@ static HRESULT WINAPI dwritetextformat1_SetVerticalGlyphOrientation(IDWriteTextF TRACE("%p, %d.\n", iface, orientation); - if ((UINT32)orientation > DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED) - return E_INVALIDARG; - - format->format.vertical_orientation = orientation; - return S_OK; + return format_set_vertical_orientation(&format->format, orientation, NULL); } static DWRITE_VERTICAL_GLYPH_ORIENTATION WINAPI dwritetextformat1_GetVerticalGlyphOrientation(IDWriteTextFormat3 *iface) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index eb47997f22f..6f06e842493 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2708,6 +2708,7 @@ static void test_SetVerticalGlyphOrientation(void) { DWRITE_VERTICAL_GLYPH_ORIENTATION orientation; IDWriteTextLayout2 *layout2; + IDWriteTextFormat1 *format1; IDWriteTextFormat *format; IDWriteTextLayout *layout; IDWriteFactory *factory; @@ -2738,6 +2739,29 @@ static void test_SetVerticalGlyphOrientation(void) hr = IDWriteTextLayout2_SetVerticalGlyphOrientation(layout2, DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED+1); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteTextLayout2_QueryInterface(layout2, &IID_IDWriteTextFormat1, (void **)&format1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + orientation = IDWriteTextFormat1_GetVerticalGlyphOrientation(format1); + ok(orientation == DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT, "Unexpected orientation %d.\n", orientation); + + hr = IDWriteTextLayout2_SetVerticalGlyphOrientation(layout2, DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + orientation = IDWriteTextLayout2_GetVerticalGlyphOrientation(layout2); + ok(orientation == DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED, "Unexpected orientation %d.\n", orientation); + + orientation = IDWriteTextFormat1_GetVerticalGlyphOrientation(format1); + ok(orientation == DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED, "Unexpected orientation %d.\n", orientation); + + hr = IDWriteTextFormat1_SetVerticalGlyphOrientation(format1, DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + orientation = IDWriteTextLayout2_GetVerticalGlyphOrientation(layout2); + ok(orientation == DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT, "Unexpected orientation %d.\n", orientation); + + IDWriteTextFormat1_Release(format1); + IDWriteTextLayout2_Release(layout2); IDWriteFactory_Release(factory); }

1 0

Alexandre Julliard : ntdll: Fix loading of section table in get_cor_header().
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: 80898bfee0139bbb5d1c2efda25fc101f61d386b URL: https://source.winehq.org/git/wine.git/?a=commit;h=80898bfee0139bbb5d1c2efd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 4 11:47:51 2021 +0100 ntdll: Fix loading of section table in get_cor_header(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50613 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 464b69427d5..458f79a9197 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2040,7 +2040,7 @@ static BOOL get_cor_header( HANDLE file, const SECTION_IMAGE_INFORMATION *info, va = nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; size = nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; if (!va || size < sizeof(*cor)) return FALSE; - offset.QuadPart = offsetof( IMAGE_NT_HEADERS32, OptionalHeader ) + nt.FileHeader.SizeOfOptionalHeader; + offset.QuadPart += offsetof( IMAGE_NT_HEADERS32, OptionalHeader ) + nt.FileHeader.SizeOfOptionalHeader; count = min( 96, nt.FileHeader.NumberOfSections ); if (NtReadFile( file, 0, NULL, NULL, &io, &sec, count * sizeof(*sec), &offset, NULL )) return FALSE; if (io.Information != count * sizeof(*sec)) return FALSE;

1 0

Alexandre Julliard : ntdll/tests: Fix a couple of test failures on older Windows versions.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: 85c52b397ac203c8cdc1e32222c52d1e52314eff URL: https://source.winehq.org/git/wine.git/?a=commit;h=85c52b397ac203c8cdc1e322… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 4 14:04:35 2021 +0100 ntdll/tests: Fix a couple of test failures on older Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 1673686bddf..5d7673deffe 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1740,7 +1740,8 @@ static void test_query_process_image_info(void) ok( info.MinorSubsystemVersion == nt->OptionalHeader.MinorSubsystemVersion, "wrong minor version %x/%x\n", info.MinorSubsystemVersion, nt->OptionalHeader.MinorSubsystemVersion ); - ok( info.MajorOperatingSystemVersion == nt->OptionalHeader.MajorOperatingSystemVersion, + ok( info.MajorOperatingSystemVersion == nt->OptionalHeader.MajorOperatingSystemVersion || + broken( !info.MajorOperatingSystemVersion ), /* <= win8 */ "wrong major OS version %x/%x\n", info.MajorOperatingSystemVersion, nt->OptionalHeader.MajorOperatingSystemVersion ); ok( info.MinorOperatingSystemVersion == nt->OptionalHeader.MinorOperatingSystemVersion, @@ -2752,7 +2753,8 @@ static void test_wow64(void) } #endif ok( !NtCurrentTeb()->GdiBatchCount, "GdiBatchCount set to %x\n", NtCurrentTeb()->GdiBatchCount ); - ok( !NtCurrentTeb()->WowTebOffset, "WowTebOffset set to %x\n", NtCurrentTeb()->WowTebOffset ); + ok( !NtCurrentTeb()->WowTebOffset || broken( NtCurrentTeb()->WowTebOffset == 1 ), /* vista */ + "WowTebOffset set to %x\n", NtCurrentTeb()->WowTebOffset ); } static void test_debug_object(void)

1 0

Alistair Leslie-Hughes : include: Add mulres.idl.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: 578f857d4ad2ad028e7ae8b997e879411f28c3be URL: https://source.winehq.org/git/wine.git/?a=commit;h=578f857d4ad2ad028e7ae8b9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 15 18:22:16 2021 +1100 include: Add mulres.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 14 ++++++++++++++ include/Makefile.in | 1 + include/mulres.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 4 files changed, 63 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 917395b37bd..a71dbd5f5a5 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1630,6 +1630,20 @@ HRESULT __RPC_STUB IConvertType_CanConvert_Stub(IConvertType* This, DBTYPE from, return E_NOTIMPL; } +HRESULT __RPC_STUB IMultipleResults_GetResult_Stub(IMultipleResults* This, IUnknown *outer, + DBRESULTFLAG result, REFIID riid, DBROWCOUNT *affected, IUnknown **rowset, IErrorInfo **error) +{ + FIXME("(%p)->(%p %ld %s %p %p %p): stub\n", This, outer, result, debugstr_guid(riid), affected, rowset, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK IMultipleResults_GetResult_Proxy(IMultipleResults* This, IUnknown *outer, + DBRESULTFLAG result, REFIID riid, DBROWCOUNT *affected, IUnknown **rowset) +{ + FIXME("(%p)->(%p %ld %s %p %p): stub\n", This, outer, result, debugstr_guid(riid), affected, rowset); + return E_NOTIMPL; +} + HRESULT CALLBACK ICommandPrepare_Prepare_Proxy(ICommandPrepare* This, ULONG runs) { FIXME("(%p)->(%d): stub\n", This, runs); diff --git a/include/Makefile.in b/include/Makefile.in index 5de2a0e3a4f..f99280149fd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -509,6 +509,7 @@ SOURCES = \ msxml6did.h \ msxmldid.h \ mtxdm.h \ + mulres.idl \ multimon.h \ natupnp.idl \ nb30.h \ diff --git a/include/mulres.idl b/include/mulres.idl new file mode 100644 index 00000000000..d7bda98b9bf --- /dev/null +++ b/include/mulres.idl @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a90-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IMultipleResults : IUnknown +{ + typedef DB_LRESERVE DBRESULTFLAG; + + enum DBRESULTFLAGENUM + { + DBRESULTFLAG_DEFAULT = 0, + DBRESULTFLAG_ROWSET = 1, + DBRESULTFLAG_ROW = 2, + }; + + [local] + HRESULT GetResult([in] IUnknown *outer, [in] DBRESULTFLAG result, [in] REFIID riid, [out] DBROWCOUNT *affected, + [out, iid_is(riid), annotation("_Outptr_opt_result_maybenull_")] IUnknown ** rowset); + + [call_as(GetResult)] + HRESULT RemoteGetResult([in] IUnknown *outer, [in] DBRESULTFLAG result, [in] REFIID riid, + [in, out, unique] DBROWCOUNT *affected, [in, out, unique, iid_is(riid)] IUnknown **rowset, + [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 4e333353a5e..475eb85642e 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -77,6 +77,7 @@ typedef LONG_PTR DB_LRESERVE; #include "cmdpre.idl" #include "rstchg.idl" #include "rstupd.idl" +#include "mulres.idl" cpp_quote("#include <accctrl.h>")

1 0