wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Huw Davies : riched20: Defer releasing the host if inside a notify callback.
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: 8138159f20d6453443861570689e0f14018051da URL: https://source.winehq.org/git/wine.git/?a=commit;h=8138159f20d6453443861570… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 14 07:36:13 2021 +0000 riched20: Defer releasing the host if inside a notify callback. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51521 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txthost.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index af4d37d9fd2..82a3db8f0b6 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -44,11 +44,13 @@ struct host unsigned int client_edge : 1; unsigned int use_set_rect : 1; unsigned int use_back_colour : 1; + unsigned int defer_release : 1; PARAFORMAT2 para_fmt; DWORD props, scrollbars, event_mask; RECT client_rect, set_rect; COLORREF back_colour; WCHAR password_char; + unsigned int notify_level; }; static const ITextHost2Vtbl textHostVtbl; @@ -118,6 +120,8 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) GetClientRect( hwnd, &texthost->client_rect ); texthost->use_back_colour = 0; texthost->password_char = (texthost->props & TXTBIT_USEPASSWORD) ? '*' : 0; + texthost->defer_release = 0; + texthost->notify_level = 0; return texthost; } @@ -1098,12 +1102,24 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, if ((((host->event_mask & ENM_KEYEVENTS) && msg >= WM_KEYFIRST && msg <= WM_KEYLAST) || ((host->event_mask & ENM_MOUSEEVENTS) && msg >= WM_MOUSEFIRST && msg <= WM_MOUSELAST) || - ((host->event_mask & ENM_SCROLLEVENTS) && msg >= WM_HSCROLL && msg <= WM_VSCROLL)) && - send_msg_filter( host, msg, &wparam, &lparam )) + ((host->event_mask & ENM_SCROLLEVENTS) && msg >= WM_HSCROLL && msg <= WM_VSCROLL))) { - TRACE( "exit (filtered) hwnd %p msg %04x (%s) %lx %lx -> %lu\n", - hwnd, msg, get_msg_name(msg), wparam, lparam, res ); - return res; + host->notify_level++; + res = send_msg_filter( host, msg, &wparam, &lparam ); + if (!--host->notify_level && host->defer_release) + { + TRACE( "exit (filtered deferred release) hwnd %p msg %04x (%s) %lx %lx -> 0\n", + hwnd, msg, get_msg_name(msg), wparam, lparam ); + ITextHost2_Release( &host->ITextHost_iface ); + return 0; + } + + if (res) + { + TRACE( "exit (filtered %lu) hwnd %p msg %04x (%s) %lx %lx -> 0\n", + res, hwnd, msg, get_msg_name(msg), wparam, lparam ); + return 0; + } } switch (msg) @@ -1139,7 +1155,8 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, break; } case WM_DESTROY: - ITextHost2_Release( &host->ITextHost_iface ); + if (!host->notify_level) ITextHost2_Release( &host->ITextHost_iface ); + else host->defer_release = 1; return 0; case WM_ERASEBKGND:

1 0

Nikolay Sivov : mfplat/tests: Fix test crash on old Windows 10 systems.
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: 77f596659682859487032cd5d145277c0944e1a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f596659682859487032cd5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 14 11:10:21 2021 +0300 mfplat/tests: Fix test crash on old Windows 10 systems. MFCreateDXGISurfaceBuffer() rejects unsupported riid argument. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52166 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 06547dba3f4..33b93852e2a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6867,7 +6867,12 @@ static void test_d3d12_surface_buffer(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D12Resource, (IUnknown *)resource, 0, FALSE, &buffer); + if (hr == E_INVALIDARG) + { todo_wine + win_skip("D3D12 resource buffers are not supported.\n"); + goto notsupported; + } ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); if (SUCCEEDED(hr)) @@ -6888,6 +6893,8 @@ if (SUCCEEDED(hr)) IMFDXGIBuffer_Release(dxgi_buffer); IMFMediaBuffer_Release(buffer); } + +notsupported: ID3D12Resource_Release(resource); refcount = ID3D12Device_Release(device); ok(!refcount, "Unexpected device refcount %u.\n", refcount);

1 0

Nikolay Sivov : mfplat/tests: Allocate test callbacks.
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: 4b69a997e933be3813393b5023f99171935ff36e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b69a997e933be3813393b50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 14 09:49:18 2021 +0300 mfplat/tests: Allocate test callbacks. It's not safe to use stack variables for async callbacks. Diagnosed by Bernhard Übelacker. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 178 ++++++++++++++++++++++++++------------------- 1 file changed, 104 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b69a997e933be381339…

1 0

Nikolay Sivov : mfplat/tests: Use CRT allocation functions.
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: 6f8debb11f22db4f96059e7cc0cf962031fed5bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f8debb11f22db4f96059e7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 14 09:49:17 2021 +0300 mfplat/tests: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4dfdc18bb52..baac5ceffae 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -38,7 +38,6 @@ #include "evr.h" #include "wine/test.h" -#include "wine/heap.h" #define D3D11_INIT_GUID #include "initguid.h" @@ -4201,7 +4200,7 @@ static void test_attributes_serialization(void) ok(hr == S_OK, "Failed to get blob size, hr %#x.\n", hr); ok(size == 8, "Got size %u.\n", size); - buffer = heap_alloc(size); + buffer = malloc(size); hr = MFGetAttributesAsBlob(attributes, buffer, size); ok(hr == S_OK, "Failed to serialize, hr %#x.\n", hr); @@ -4223,7 +4222,7 @@ static void test_attributes_serialization(void) ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); ok(count == 0, "Unexpected count %u.\n", count); - heap_free(buffer); + free(buffer); /* Set some attributes of various types. */ IMFAttributes_SetUINT32(attributes, &MF_MT_MAJOR_TYPE, 456); @@ -4238,12 +4237,12 @@ static void test_attributes_serialization(void) ok(hr == S_OK, "Failed to get blob size, hr %#x.\n", hr); ok(size > 8, "Got unexpected size %u.\n", size); - buffer = heap_alloc(size); + buffer = malloc(size); hr = MFGetAttributesAsBlob(attributes, buffer, size); ok(hr == S_OK, "Failed to serialize, hr %#x.\n", hr); hr = MFInitAttributesFromBlob(dest, buffer, size); ok(hr == S_OK, "Failed to deserialize, hr %#x.\n", hr); - heap_free(buffer); + free(buffer); hr = IMFAttributes_GetUINT32(dest, &MF_MT_MAJOR_TYPE, &value32); ok(hr == S_OK, "Failed to get get uint32 value, hr %#x.\n", hr);

1 0

Roberto Pungartnik : po: Update Spanish translation.
by Alexandre Julliard 13 Dec '21

13 Dec '21

Module: wine Branch: master Commit: be2b2901cf072daedd7a07d0a3ac6ee3f83976a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be2b2901cf072daedd7a07d0… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sun Dec 12 16:31:27 2021 -0300 po: Update Spanish translation. Signed-off-by: Roberto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/es.po | 708 ++++++++++++++++++++++++++++----------------------------------- 1 file changed, 315 insertions(+), 393 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be2b2901cf072daedd7a…

1 0

Roberto Pungartnik : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 13 Dec '21

13 Dec '21

Module: wine Branch: master Commit: cf823cefd43d7966989c4f13eba1979e602bdb48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf823cefd43d7966989c4f13… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sun Dec 12 16:30:28 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 | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 21a21850893..a7de7ae0bbe 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: 2021-09-11 12:32-0300\n" +"PO-Revision-Date: 2021-12-12 12:11-0300\n" "Last-Translator: Roberto Augusto Pungartnik <rpungartnik(a)gmail.com>\n" "Language-Team: Portuguese (Brazil)\n" "Language: pt_BR\n" @@ -3721,30 +3721,24 @@ msgid "&Disable" msgstr "&Desativar" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "Reiniciar" +msgstr "&Reiniciar" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "&Habilitar" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "Editar Substituição" +msgstr "S&obrescrever" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "Conectado" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "Entrada de voz:" +msgstr "Conectado (dispositivo xinput)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -10402,7 +10396,7 @@ msgstr "Horário de verão de Cabo Verde" #: dlls/tzres/tzres.rc:92 msgid "(UTC-01:00) Cabo Verde Is." -msgstr "(UTC-01:00) Ilha de Cabo Verde" +msgstr "(UTC-01:00) Ilha de Cabo Verde." #: dlls/tzres/tzres.rc:183 msgid "Haiti Standard Time" @@ -13272,13 +13266,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "Página de código ativa: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "Mensagem inválida.\n" +msgstr "Página de código inválida.\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13291,6 +13283,14 @@ msgid "" " Type CHCP without a number to display the active console code page.\n" "\n" msgstr "" +"CHCP [número]\n" +"\n" +" Configura ou apresenta a página de código ativa do console.\n" +"\n" +" número Página de código do console para ativar.\n" +"\n" +" Tecle CHCP sem um número para exibir a página de código ativa no console.\n" +"\n" #: programs/clock/clock.rc:32 msgid "Ana&log" @@ -14463,7 +14463,7 @@ msgstr "Endereço IPv6" #: programs/ipconfig/ipconfig.rc:38 msgid "Primary DNS suffix" -msgstr "" +msgstr "Sufixo de DNS Primário" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information"

1 0

Alistair Leslie-Hughes : dbghelp: Fix use after free.
by Alexandre Julliard 13 Dec '21

13 Dec '21

Module: wine Branch: master Commit: e19b18dd8249c7b35c6a275e9e4223763607100b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e19b18dd8249c7b35c6a275e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Dec 9 07:33:58 2021 +1100 dbghelp: Fix use after free. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 5614c575cd0..def7b799d73 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1058,7 +1058,6 @@ BOOL WINAPI SymUnloadModule64(HANDLE hProcess, DWORD64 BaseOfDll) if (!pcs) return FALSE; module = module_find_by_addr(pcs, BaseOfDll, DMT_UNKNOWN); if (!module) return FALSE; - if (!module_remove(pcs, module)) return FALSE; /* remove local scope if defined inside this module */ if (pcs->localscope_pc >= module->module.BaseOfImage && pcs->localscope_pc < module->module.BaseOfImage + module->module.ImageSize) @@ -1066,6 +1065,7 @@ BOOL WINAPI SymUnloadModule64(HANDLE hProcess, DWORD64 BaseOfDll) pcs->localscope_pc = 0; pcs->localscope_symt = NULL; } + module_remove(pcs, module); return TRUE; }

1 0

Piotr Caban : msvcrt: Fix _strtime implementation in Hindi locale.
by Alexandre Julliard 13 Dec '21

13 Dec '21

Module: wine Branch: master Commit: 2f2891e5d59dcec5810ca6809eb857bcfc29aae4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f2891e5d59dcec5810ca680… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 13 17:19:14 2021 +0100 msvcrt: Fix _strtime implementation in Hindi locale. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index c246c9a42fd..fb91aa2b1ec 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -611,7 +611,18 @@ int CDECL _wstrdate_s(wchar_t* date, size_t size) */ char* CDECL _strtime(char* time) { - GetTimeFormatA(LOCALE_NEUTRAL, 0, NULL, "HH':'mm':'ss", time, 9); + SYSTEMTIME st; + + GetLocalTime(&st); + time[0] = '0' + st.wHour / 10; + time[1] = '0' + st.wHour % 10; + time[2] = ':'; + time[3] = '0' + st.wMinute / 10; + time[4] = '0' + st.wMinute % 10; + time[5] = ':'; + time[6] = '0' + st.wSecond / 10; + time[7] = '0' + st.wSecond % 10; + time[8] = 0; return time; }

1 0

Piotr Caban : msvcrt: Fix _strdate implementation in Hindi locale.
by Alexandre Julliard 13 Dec '21

13 Dec '21

Module: wine Branch: master Commit: 0e9431b809fd12d1055baa99bee07a02af2d7a4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e9431b809fd12d1055baa99… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 13 17:19:10 2021 +0100 msvcrt: Fix _strdate implementation in Hindi locale. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 9abd1f5555b..c246c9a42fd 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -538,7 +538,18 @@ struct tm* CDECL _gmtime32(const __time32_t* secs) */ char* CDECL _strdate(char* date) { - GetDateFormatA(LOCALE_NEUTRAL, 0, NULL, "MM'/'dd'/'yy", date, 9); + SYSTEMTIME st; + + GetLocalTime(&st); + date[0] = '0' + st.wMonth / 10; + date[1] = '0' + st.wMonth % 10; + date[2] = '/'; + date[3] = '0' + st.wDay / 10; + date[4] = '0' + st.wDay % 10; + date[5] = '/'; + date[6] = '0' + st.wYear / 10 % 10; + date[7] = '0' + st.wYear % 10; + date[8] = 0; return date; }

1 0

Piotr Caban : concrt140/tests: Fix race in _Timer tests.
by Alexandre Julliard 13 Dec '21

13 Dec '21

Module: wine Branch: master Commit: a4f86cbf3d1887869758621da7789bb08a046252 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4f86cbf3d1887869758621d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 13 16:56:06 2021 +0100 concrt140/tests: Fix race in _Timer tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/tests/concrt140.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/concrt140/tests/concrt140.c b/dlls/concrt140/tests/concrt140.c index a6cfe4a809a..55b200c6c78 100644 --- a/dlls/concrt140/tests/concrt140.c +++ b/dlls/concrt140/tests/concrt140.c @@ -190,6 +190,7 @@ static void test_Timer(void) call_func1(p__Timer__Stop, &timer); ok(!timer.timer, "timer != NULL\n"); call_func1(p__Timer_dtor, &timer); + ResetEvent(callback_called); call_func3(p__Timer_ctor, &timer, 1, FALSE); timer.vtable = vtable;

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2021