March 2021 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Test simulations mask bitwise for consistency.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: d871f04bbdcf991b2b4b4433fb156a5636c72587 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d871f04bbdcf991b2b4b4433… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 15 10:36:47 2021 +0300 dwrite: Test simulations mask bitwise for consistency. This has no functional impact. Internal function is only called with one bit set at a time, but there is no reason to make it more confusing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 14be1b9fc1b..4e2917854ba 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4022,7 +4022,7 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo return S_OK; } -static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRITE_FONT_SIMULATIONS sim, +static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRITE_FONT_SIMULATIONS simulations, const WCHAR *facenameW, struct dwrite_font_data **ret) { struct dwrite_font_data *data; @@ -4035,10 +4035,10 @@ static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRI *data = *src; data->refcount = 1; - data->simulations |= sim; - if (sim == DWRITE_FONT_SIMULATIONS_BOLD) + data->simulations |= simulations; + if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) data->weight = DWRITE_FONT_WEIGHT_BOLD; - else if (sim == DWRITE_FONT_SIMULATIONS_OBLIQUE) + if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) data->style = DWRITE_FONT_STYLE_OBLIQUE; memset(data->info_strings, 0, sizeof(data->info_strings)); data->names = NULL;

1 0

Nikolay Sivov : dwrite: Implement IDWriteFontSet1::CreateFontResource().
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: a56112c330b823be017d46d1b790459d1eca53c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a56112c330b823be017d46d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 15 10:36:49 2021 +0300 dwrite: Implement IDWriteFontSet1::CreateFontResource(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 12 ++++++++++-- dlls/dwrite/tests/font.c | 8 ++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4e2917854ba..c0fff68ed15 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7467,9 +7467,17 @@ static HRESULT WINAPI dwritefontset1_GetFontFaceReference(IDWriteFontSet3 *iface static HRESULT WINAPI dwritefontset1_CreateFontResource(IDWriteFontSet3 *iface, UINT32 index, IDWriteFontResource **resource) { - FIXME("%p, %u, %p.\n", iface, index, resource); + struct dwrite_fontset *set = impl_from_IDWriteFontSet3(iface); - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, index, resource); + + *resource = NULL; + + if (index >= set->count) + return E_INVALIDARG; + + return IDWriteFactory7_CreateFontResource(set->factory, set->entries[index]->file, + set->entries[index]->face_index, resource); } static HRESULT WINAPI dwritefontset1_CreateFontFace(IDWriteFontSet3 *iface, UINT32 index, IDWriteFontFace5 **fontface) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7aa871dcd3c..27c2a9d0b7d 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -10018,6 +10018,7 @@ static void test_family_font_set(void) unsigned int count, refcount; IDWriteFontSet1 *fontset, *fontset2; IDWriteLocalizedStrings *values; + IDWriteFontResource *resource; WCHAR buffW[64]; BOOL exists; HRESULT hr; @@ -10070,6 +10071,13 @@ static void test_family_font_set(void) IDWriteLocalizedStrings_Release(values); } + hr = IDWriteFontSet1_CreateFontResource(fontset, 100, &resource); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontSet1_CreateFontResource(fontset, 0, &resource); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IDWriteFontResource_Release(resource); + IDWriteFontSet1_Release(fontset2); IDWriteFontSet1_Release(fontset);

1 0

Huw Davies : riched20: Remove unused code from ITextHost_TxGetPropertyBits.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: b456420096ccb50b070e1f58d9bb5b2953e241db URL: https://source.winehq.org/git/wine.git/?a=commit;h=b456420096ccb50b070e1f58… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 15 10:03:19 2021 +0000 riched20: Remove unused code from ITextHost_TxGetPropertyBits. Currently TxGetPropertyBits is only called during text services creation, so the editor is not set. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txthost.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 1acf1d1e207..278b0a64379 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -375,28 +375,14 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPropertyBits( ITextHost *i struct host *host = impl_from_ITextHost( iface ); DWORD style; DWORD dwBits = 0; + DWORD dwScrollBar; - if (host->editor) - { - style = host->editor->styleFlags; - if (host->editor->mode & TM_RICHTEXT) - dwBits |= TXTBIT_RICHTEXT; - if (host->editor->bWordWrap) - dwBits |= TXTBIT_WORDWRAP; - if (style & ECO_AUTOWORDSELECTION) - dwBits |= TXTBIT_AUTOWORDSEL; - } - else - { - DWORD dwScrollBar; - - style = GetWindowLongW( host->window, GWL_STYLE ); - ITextHostImpl_TxGetScrollBars(iface, &dwScrollBar); + style = GetWindowLongW( host->window, GWL_STYLE ); + ITextHostImpl_TxGetScrollBars(iface, &dwScrollBar); - dwBits |= TXTBIT_RICHTEXT|TXTBIT_AUTOWORDSEL; - if (!(dwScrollBar & ES_AUTOHSCROLL)) - dwBits |= TXTBIT_WORDWRAP; - } + dwBits |= TXTBIT_RICHTEXT|TXTBIT_AUTOWORDSEL; + if (!(dwScrollBar & ES_AUTOHSCROLL)) + dwBits |= TXTBIT_WORDWRAP; /* Bits that correspond to window styles. */ if (style & ES_MULTILINE)

1 0

Huw Davies : riched20: Implement EM_SETREADONLY using EM_SETOPTIONS.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 5d75cac480f1ab14b923137784a0a7583d986018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d75cac480f1ab14b9231377… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 15 10:03:20 2021 +0000 riched20: Implement EM_SETREADONLY using EM_SETOPTIONS. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 8 -------- dlls/riched20/txthost.c | 11 ++++------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 994e91ce3d5..4988f6e0746 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3779,14 +3779,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; } - case EM_SETREADONLY: - { - if (wParam) - editor->styleFlags |= ES_READONLY; - else - editor->styleFlags &= ~ES_READONLY; - return 1; - } case EM_SETEVENTMASK: { DWORD nOldMask = editor->nEventMask; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 278b0a64379..5bd11c5aba2 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1002,14 +1002,11 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, } case EM_SETREADONLY: { - DWORD style; + DWORD op = wparam ? ECOOP_OR : ECOOP_AND; + DWORD mask = wparam ? ECO_READONLY : ~ECO_READONLY; - res = ME_HandleMessage( editor, msg, wparam, lparam, unicode, &hr ); - style = GetWindowLongW( hwnd, GWL_STYLE ); - style &= ~ES_READONLY; - if (wparam) style |= ES_READONLY; - SetWindowLongW( hwnd, GWL_STYLE, style ); - return res; + SendMessageW( hwnd, EM_SETOPTIONS, op, mask ); + return 1; } case WM_SETTEXT: {

1 0

Henri Verbeet : d3d11/tests: Add some more device context state tests.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 6167f5e6dfbaee0c7ed05b66575e9fdf7523061c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6167f5e6dfbaee0c7ed05b66… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 16:11:33 2021 +0100 d3d11/tests: Add some more device context state tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1e69d827977..1b35e8f4983 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6779,6 +6779,7 @@ static void test_device_context_state(void) ID3DDeviceContextState *context_state, *previous_context_state, *tmp_context_state, *context_state2; UINT ib_offset, vb_offset, vb_stride, so_offset, offset, stride, sample_mask, stencil_ref, count; ID3D11Buffer *cb, *srvb, *uavb, *ib, *vb, *sob, *tmp_cb, *tmp_ib, *tmp_vb, *tmp_sob; + D3D_FEATURE_LEVEL feature_level, selected_feature_level; ID3D11UnorderedAccessView *tmp_uav, *uav, *ps_uav; ID3D11Device *d3d11_device, *d3d11_device2; ID3D11SamplerState *sampler, *tmp_sampler; @@ -6800,7 +6801,6 @@ static void test_device_context_state(void) ID3D11Predicate *tmp_pred, *pred; ID3D11DomainShader *tmp_ds, *ds; D3D11_SAMPLER_DESC sampler_desc; - D3D_FEATURE_LEVEL feature_level; D3D11_QUERY_DESC predicate_desc; ID3D11Device1 *device, *device2; ID3D11InputLayout *il, *tmp_il; @@ -6860,17 +6860,41 @@ static void test_device_context_state(void) ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); feature_level = min(feature_level, D3D_FEATURE_LEVEL_11_1); - hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, - &IID_ID3D11Device1, NULL, &context_state); - ok(SUCCEEDED(hr), "Failed to create device context state, hr %#x.\n", hr); - if (FAILED(hr)) - { - ID3D11SamplerState_Release(sampler); - ID3D11Device1_Release(device); - return; - } + + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, + 1, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + selected_feature_level = 0xc0de0000; + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, + D3D11_SDK_VERSION, &IID_ID3D11Device1, &selected_feature_level, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(selected_feature_level == feature_level, "Got unexpected feature level %#x, expected %#x.\n", + selected_feature_level, feature_level); + + selected_feature_level = 0xc0de0000; + context_state = (void *)0xc0de0001; + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 0, + D3D11_SDK_VERSION, &IID_ID3D11Device1, &selected_feature_level, &context_state); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!selected_feature_level, "Got unexpected feature level %#x.\n", selected_feature_level); + todo_wine ok(!context_state, "Got unexpected context state %p.\n", context_state); + if (SUCCEEDED(hr)) + ID3DDeviceContextState_Release(context_state); + + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, + 0, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D11Device1_CreateDeviceContextState(device, 0, NULL, + 0, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, + 1, D3D11_SDK_VERSION, &IID_ID3D11Device1, NULL, &context_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); refcount = get_refcount(context_state); - ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); context_type = ID3D11DeviceContext1_GetType(context); ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type);

1 0

Nikolay Sivov : dwrite/gdiinterop: Pass target transform when getting recommended rendering mode.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 6f9e1e078e9b264da812d238201be4e5ebe4e8be URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f9e1e078e9b264da812d238… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 15 10:36:50 2021 +0300 dwrite/gdiinterop: Pass target transform when getting recommended rendering mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 ++-- dlls/dwrite/gdiinterop.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c0fff68ed15..e5050476938 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1265,7 +1265,7 @@ static HRESULT WINAPI dwritefontface2_GetRecommendedRenderingMode(IDWriteFontFac TRACE("%p, %.8e, %.8e, %.8e, %p, %d, %d, %d, %p, %p, %p.\n", iface, emSize, dpiX, dpiY, m, is_sideways, threshold, measuringmode, params, renderingmode, gridfitmode); - if (m) + if (m && memcmp(m, &identity, sizeof(*m))) FIXME("transform not supported %s\n", debugstr_matrix(m)); if (is_sideways) @@ -1452,7 +1452,7 @@ static HRESULT WINAPI dwritefontface3_GetRecommendedRenderingMode(IDWriteFontFac TRACE("%p, %.8e, %.8e, %.8e, %p, %d, %d, %d, %p, %p, %p.\n", iface, emSize, dpiX, dpiY, m, is_sideways, threshold, measuring_mode, params, rendering_mode, gridfit_mode); - if (m) + if (m && memcmp(m, &identity, sizeof(*m))) FIXME("transform not supported %s\n", debugstr_matrix(m)); if (is_sideways) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 84d1f615f75..6a5953a67e9 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -369,7 +369,7 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac } hr = IDWriteFontFace3_GetRecommendedRenderingMode(fontface, run->fontEmSize, target->ppdip * 96.0f, - target->ppdip * 96.0f, NULL /* FIXME */, run->isSideways, DWRITE_OUTLINE_THRESHOLD_ALIASED, measuring_mode, + target->ppdip * 96.0f, &target->m, run->isSideways, DWRITE_OUTLINE_THRESHOLD_ALIASED, measuring_mode, params, &rendermode, &gridfitmode); IDWriteFontFace3_Release(fontface); if (FAILED(hr))

1 0

Roberto Pungartnik : po: Update Brazilian Portuguese translation.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: b89c183158ae618433368a47f32f0494013837a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b89c183158ae618433368a47… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sat Mar 13 21:50:12 2021 -0300 po: Update Brazilian Portuguese translation. Signed-off-by: Roberto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 84 ++++++++++++++++--------------------------------------------- 1 file changed, 22 insertions(+), 62 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index b04c35506ab..d5af03add65 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.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: 2020-09-25 18:58-0300\n" +"PO-Revision-Date: 2021-03-13 17:38-0300\n" "Last-Translator: Roberto Augusto Pungartnik <rpungartnik(a)gmail.com>\n" "Language-Team: Portuguese (Brazil)\n" "Language: pt_BR\n" @@ -20,26 +20,20 @@ msgid "Security" msgstr "Segurança" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Nome de usuário:" +msgstr "&Grupo ou nome dos usuários:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Amarelo" +msgstr "Permitir" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Negado" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "Acesso negado" +msgstr "Permissões para %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -6964,10 +6958,8 @@ msgid "Not implemented.\n" msgstr "Não implementado.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "Falha na chamada RPC.\n" +msgstr "Falha na chamada.\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" @@ -9949,16 +9941,12 @@ msgid "Iran Daylight Time" msgstr "Horário de verão do Irã" #: dlls/tzres/tzres.rc:204 -#, fuzzy -#| msgid "Haiti Standard Time" msgid "Saint Pierre Standard Time" -msgstr "Hora padrão do Haiti" +msgstr "Hora padrão de São Pedro" #: dlls/tzres/tzres.rc:205 -#, fuzzy -#| msgid "Haiti Daylight Time" msgid "Saint Pierre Daylight Time" -msgstr "Horário de verão do Haiti" +msgstr "Horário de verão de São Pedro" #: dlls/tzres/tzres.rc:170 msgid "Namibia Standard Time" @@ -10001,16 +9989,12 @@ msgid "Central Asia Daylight Time" msgstr "Horário de verão da Asia Central" #: dlls/tzres/tzres.rc:146 -#, fuzzy -#| msgid "Korea Standard Time" msgid "Lord Howe Standard Time" -msgstr "Hora padrão da Coreia" +msgstr "Hora padrão de Lord Howe" #: dlls/tzres/tzres.rc:147 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "Lord Howe Daylight Time" -msgstr "Horário de verão da Coreia" +msgstr "Horário de verão de Lord Howe" #: dlls/tzres/tzres.rc:40 msgid "Arabic Standard Time" @@ -10061,16 +10045,12 @@ msgid "Azerbaijan Daylight Time" msgstr "Horário de verão do Azerbaijão" #: dlls/tzres/tzres.rc:150 -#, fuzzy -#| msgid "Magadan Standard Time" msgid "Magallanes Standard Time" -msgstr "Hora padrão de Magadan" +msgstr "Hora padrão de Magalhães" #: dlls/tzres/tzres.rc:151 -#, fuzzy -#| msgid "Magadan Daylight Time" msgid "Magallanes Daylight Time" -msgstr "Horário de verão Magadan" +msgstr "Horário de verão Magalhães" #: dlls/tzres/tzres.rc:206 msgid "Samoa Standard Time" @@ -10121,16 +10101,12 @@ msgid "Line Islands Daylight Time" msgstr "Horário de verão das Ilhas Equatoriais" #: dlls/tzres/tzres.rc:92 -#, fuzzy -#| msgid "China Standard Time" msgid "Cuba Standard Time" -msgstr "Hora padrão da China" +msgstr "Hora padrão da Cuba" #: dlls/tzres/tzres.rc:93 -#, fuzzy -#| msgid "China Daylight Time" msgid "Cuba Daylight Time" -msgstr "Horário de verão da China" +msgstr "Horário de verão da Cuba" #: dlls/tzres/tzres.rc:136 msgid "Jordan Standard Time" @@ -10329,16 +10305,12 @@ msgid "US Eastern Daylight Time" msgstr "Horário de verão do Leste EUA" #: dlls/tzres/tzres.rc:182 -#, fuzzy -#| msgid "Korea Standard Time" msgid "North Korea Standard Time" -msgstr "Hora padrão da Coreia" +msgstr "Hora padrão da Coreia do Norte" #: dlls/tzres/tzres.rc:183 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "North Korea Daylight Time" -msgstr "Horário de verão da Coreia" +msgstr "Horário de verão da Coreia do Norte" #: dlls/tzres/tzres.rc:220 msgid "Tasmania Standard Time" @@ -10429,16 +10401,12 @@ msgid "Arabian Daylight Time" msgstr "Horário de verão da Arábia Saudita" #: dlls/tzres/tzres.rc:222 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Tocantins Standard Time" -msgstr "Hora padrão de Montanha" +msgstr "Hora padrão de Tocantins" #: dlls/tzres/tzres.rc:223 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Tocantins Daylight Time" -msgstr "Horário de verão de Montanha" +msgstr "Horário de verão de Tocantins" #: dlls/tzres/tzres.rc:196 msgid "Russian Standard Time" @@ -10449,16 +10417,12 @@ msgid "Russian Daylight Time" msgstr "Horário de verão da Rússia" #: dlls/tzres/tzres.rc:48 -#, fuzzy -#| msgid "AUS Central Standard Time" msgid "Aus Central W. Standard Time" -msgstr "Hora padrão da Austrália Central" +msgstr "Hora padrão da Austrália Ocidental" #: dlls/tzres/tzres.rc:49 -#, fuzzy -#| msgid "AUS Central Daylight Time" msgid "Aus Central W. Daylight Time" -msgstr "Horário de verão da Austrália Central" +msgstr "Horário de verão da Austrália Ocidental" #: dlls/tzres/tzres.rc:194 msgid "Romance Standard Time" @@ -10677,16 +10641,12 @@ msgid "Egypt Daylight Time" msgstr "Horário de verão do Egito" #: dlls/tzres/tzres.rc:106 -#, fuzzy -#| msgid "Central Standard Time (Mexico)" msgid "Eastern Standard Time (Mexico)" -msgstr "Hora padrão Central(México)" +msgstr "Hora padrão Oriental(México)" #: dlls/tzres/tzres.rc:107 -#, fuzzy -#| msgid "Central Daylight Time (Mexico)" msgid "Eastern Daylight Time (Mexico)" -msgstr "Horário de verão Central(México)" +msgstr "Horário de verão Oriental(México)" #: dlls/tzres/tzres.rc:154 msgid "Mauritius Standard Time"

1 0

Michael Stefaniuc : mshtml: Print the debug string and not the pointer to it.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: be74418c8ca1035025d983873bc944e546b00b3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=be74418c8ca1035025d98387… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 14 22:54:37 2021 +0100 mshtml: Print the debug string and not the pointer to it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9ba5a6c8612..1ffc6325725 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2182,7 +2182,7 @@ static nsresult NSAPI nsCacheInfoChannel_GetCacheTokenCachedCharset(nsICacheInfo static nsresult NSAPI nsCacheInfoChannel_SetCacheTokenCachedCharset(nsICacheInfoChannel *iface, const nsACString *p) { nsChannel *This = impl_from_nsICacheInfoChannel(iface); - FIXME("(%p)->(%p)\n", This, debugstr_nsacstr(p)); + FIXME("(%p)->(%s)\n", This, debugstr_nsacstr(p)); return E_NOTIMPL; }

1 0

Nikolay Sivov : dwrite/tests: Extend tests for synthesized axis values.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 6fea399a84e730908db30c112af4106530d71683 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fea399a84e730908db30c11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 15 10:36:48 2021 +0300 dwrite/tests: Extend tests for synthesized axis values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c14c557c92a..7aa871dcd3c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7822,10 +7822,31 @@ static void test_HasCharacter(void) ok(ref == 0, "factory not released, %u\n", ref); } +static BOOL has_main_axis_values(const DWRITE_FONT_AXIS_VALUE *values, unsigned int count) +{ + BOOL has_wght = FALSE, has_wdth = FALSE, has_ital = FALSE, has_slnt = FALSE; + unsigned int i; + + for (i = 0; i < count; ++i) + { + if (values[i].axisTag == DWRITE_FONT_AXIS_TAG_WEIGHT) + has_wght = TRUE; + else if (values[i].axisTag == DWRITE_FONT_AXIS_TAG_WIDTH) + has_wdth = TRUE; + else if (values[i].axisTag == DWRITE_FONT_AXIS_TAG_ITALIC) + has_ital = TRUE; + else if (values[i].axisTag == DWRITE_FONT_AXIS_TAG_SLANT) + has_slnt = TRUE; + } + + return has_wght && has_wdth && has_ital && has_slnt; +} + static void test_CreateFontFaceReference(void) { IDWriteFontFaceReference *ref, *ref1, *ref3; IDWriteFontFace3 *fontface, *fontface1; + DWRITE_FONT_AXIS_VALUE axis_values[16]; IDWriteFontCollection1 *collection; IDWriteFontFile *file, *file1; IDWriteFactory3 *factory; @@ -7978,7 +7999,15 @@ todo_wine (void **)&ref2))) { UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); - ok(axis_count > 0, "Unexpected axis value count.\n"); + todo_wine + ok(axis_count >= 4, "Unexpected axis value count.\n"); + + hr = IDWriteFontFaceReference1_GetFontAxisValues(ref2, axis_values, ARRAY_SIZE(axis_values)); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + todo_wine + ok(has_main_axis_values(axis_values, axis_count), "Unexpected axis returned.\n"); + IDWriteFontFaceReference1_Release(ref2); } @@ -9394,9 +9423,11 @@ static void test_AnalyzeContainerType(void) static void test_fontsetbuilder(void) { IDWriteFontFaceReference *ref, *ref2, *ref3; + IDWriteFontFaceReference1 *ref1; IDWriteFontCollection1 *collection; IDWriteFontSetBuilder1 *builder1; IDWriteFontSetBuilder *builder; + DWRITE_FONT_AXIS_VALUE axis_values[4]; IDWriteFactory3 *factory; UINT32 count, i, refcount; IDWriteFontSet *fontset; @@ -9436,6 +9467,39 @@ static void test_fontsetbuilder(void) count = IDWriteFontSet_GetFontCount(fontset); ok(count == 2, "Unexpected font count %u.\n", count); + hr = IDWriteFontSet_GetFontFaceReference(fontset, 0, &ref); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + + hr = IDWriteFontFaceReference_QueryInterface(ref, &IID_IDWriteFontFaceReference1, (void **)&ref1); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + + count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref1); + todo_wine + ok(count == 4, "Unexpected axis count %u.\n", count); + + if (count == 4) + { + hr = IDWriteFontFaceReference1_GetFontAxisValues(ref1, axis_values, ARRAY_SIZE(axis_values)); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + + ok(axis_values[0].axisTag == DWRITE_FONT_AXIS_TAG_WEIGHT, "Unexpected tag[0] %s.\n", + wine_dbgstr_an((char *)&axis_values[0].axisTag, 4)); + ok(axis_values[0].value == 500.0f, "Unexpected value[0] %f.\n", axis_values[0].value); + ok(axis_values[1].axisTag == DWRITE_FONT_AXIS_TAG_WIDTH, "Unexpected tag[1] %s.\n", + wine_dbgstr_an((char *)&axis_values[1].axisTag, 4)); + ok(axis_values[1].value == 100.0f, "Unexpected value[1] %f.\n", axis_values[1].value); + ok(axis_values[2].axisTag == DWRITE_FONT_AXIS_TAG_ITALIC, "Unexpected tag[2] %s.\n", + wine_dbgstr_an((char *)&axis_values[2].axisTag, 4)); + ok(axis_values[2].value == 0.0f, "Unexpected value[2] %f.\n", axis_values[2].value); + ok(axis_values[3].axisTag == DWRITE_FONT_AXIS_TAG_SLANT, "Unexpected tag[3] %s.\n", + wine_dbgstr_an((char *)&axis_values[3].axisTag, 4)); + ok(axis_values[3].value == 0.0f, "Unexpected value[3] %f.\n", axis_values[3].value); + } + + IDWriteFontFaceReference1_Release(ref1); + + IDWriteFontFaceReference_Release(ref); + IDWriteFontSet_Release(fontset); IDWriteFontFile_Release(file);

1 0

Michael Stefaniuc : wldap32: Remove redundant NULL check before heap_free().
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 35ee15eab36eafc660a50284529613ed9dd044da URL: https://source.winehq.org/git/wine.git/?a=commit;h=35ee15eab36eafc660a50284… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 14 22:54:36 2021 +0100 wldap32: Remove redundant NULL check before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/page.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index a16ea52409e..07f29be0d50 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -241,11 +241,8 @@ ULONG CDECL ldap_get_paged_count( WLDAP32_LDAP *ld, PLDAPSearch search, return WLDAP32_LDAP_SUCCESS; } - if (search->cookie) - { - heap_free( search->cookie ); - search->cookie = NULL; - } + heap_free( search->cookie ); + search->cookie = NULL; ret = ldap_parse_page_controlW( ld, server_ctrls, count, &search->cookie ); if (ret == WLDAP32_LDAP_SUCCESS)

1 0