November 2020 - Wine-Commits

Esme Povirk : windowscodecs: Fix allocation in tiff_decoder_get_metadata_blocks.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 764a93f121c6b0f88c3444454ebb85eb7cb63295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=764a93f121c6b0f88c344445… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Nov 17 14:06:45 2020 -0600 windowscodecs: Fix allocation in tiff_decoder_get_metadata_blocks. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libtiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/libtiff.c b/dlls/windowscodecs/libtiff.c index 27f89679766..7f174bbd5dd 100644 --- a/dlls/windowscodecs/libtiff.c +++ b/dlls/windowscodecs/libtiff.c @@ -1127,7 +1127,7 @@ static HRESULT CDECL tiff_decoder_get_metadata_blocks(struct decoder *iface, result.options |= WICPersistOptionNoCacheStream|DECODER_BLOCK_FULL_STREAM|DECODER_BLOCK_READER_CLSID; result.reader_clsid = CLSID_WICIfdMetadataReader; - *blocks = malloc(sizeof(**blocks)); + *blocks = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(**blocks)); **blocks = result; return S_OK;

1 0

Jeff Smith : user32/tests: Simplification of some message broadcast tests.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: e4538d9a1131e0051de213b74b30929897b8e330 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4538d9a1131e0051de213b7… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Nov 16 08:45:29 2020 -0600 user32/tests: Simplification of some message broadcast tests. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 47 +++++++++++------------------------------------ 1 file changed, 11 insertions(+), 36 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 1e616e3d061..8aae9405320 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16001,6 +16001,7 @@ static void test_broadcast(void) for (i = 0; i < ARRAY_SIZE(messages); i++) { BOOL ret; + BOOL msg_expected = (messages[i] < WM_USER || messages[i] >= 0xc000); MSG msg; flush_events(); @@ -16013,15 +16014,9 @@ static void test_broadcast(void) memset(&msg, 0xab, sizeof(msg)); ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); - if (messages[i] < WM_USER || messages[i] >= 0xc000) - { - ok(ret, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); + ok(ret == msg_expected, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); + if (msg_expected) ok(msg.hwnd == hwnd, "%d: got %p\n", i, msg.hwnd); - } - else - { - ok(!ret, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); - } /* post, topmost */ ret = PostMessageA(HWND_TOPMOST, messages[i], 0, 0); @@ -16029,15 +16024,9 @@ static void test_broadcast(void) memset(&msg, 0xab, sizeof(msg)); ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); - if (messages[i] < WM_USER || messages[i] >= 0xc000) - { - ok(ret, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); + ok(ret == msg_expected, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); + if (msg_expected) ok(msg.hwnd == hwnd, "%d: got %p\n", i, msg.hwnd); - } - else - { - ok(!ret, "%d: got %d, error %d\n", i, ret, GetLastError()); - } /* send, broadcast */ g_broadcast_wparam = 0xdead; @@ -16046,16 +16035,9 @@ static void test_broadcast(void) win_skip("broadcasting test %d, timeout\n", i); else { - if (messages[i] < WM_USER || messages[i] >= 0xc000) - { - ok(g_broadcast_wparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_wparam, GetLastError()); - } - else - { - ok(g_broadcast_wparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_wparam, GetLastError()); - } + WPARAM wparam_expected = msg_expected ? 0xbaadbeef : 0xdead; + ok(g_broadcast_wparam == wparam_expected, "%d: message %04x, got %#lx, error %d\n", + i, messages[i], g_broadcast_wparam, GetLastError()); } /* send, topmost */ @@ -16065,16 +16047,9 @@ static void test_broadcast(void) win_skip("broadcasting test %d, timeout\n", i); else { - if (messages[i] < WM_USER || messages[i] >= 0xc000) - { - ok(g_broadcast_wparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_wparam, GetLastError()); - } - else - { - ok(g_broadcast_wparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_wparam, GetLastError()); - } + WPARAM wparam_expected = msg_expected ? 0xbaadbeef : 0xdead; + ok(g_broadcast_wparam == wparam_expected, "%d: message %04x, got %#lx, error %d\n", + i, messages[i], g_broadcast_wparam, GetLastError()); } }

1 0

Jeff Smith : user32: Only child windows should not receive broadcast messages.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: ab1a97926811f91760d699a5f98b25febdfbf8eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab1a97926811f91760d699a5… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Nov 16 08:45:31 2020 -0600 user32: Only child windows should not receive broadcast messages. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 3 ++- dlls/user32/tests/msg.c | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 4434f4b0c2a..d8ebbfd32e3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -552,7 +552,8 @@ LRESULT WINAPI MessageWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lP static BOOL CALLBACK broadcast_message_callback( HWND hwnd, LPARAM lparam ) { struct send_message_info *info = (struct send_message_info *)lparam; - if (!(GetWindowLongW( hwnd, GWL_STYLE ) & (WS_POPUP|WS_CAPTION))) return TRUE; + if ((GetWindowLongW( hwnd, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) + return TRUE; switch(info->type) { case MSG_UNICODE: diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f6802fe3bdd..2ce2b3c6e54 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16002,10 +16002,9 @@ static void test_broadcast(void) { LONG style; BOOL receive; - BOOL todo; } bcast_expect[] = { - {WS_OVERLAPPED, TRUE, TRUE}, + {WS_OVERLAPPED, TRUE}, {WS_OVERLAPPED|WS_DLGFRAME, TRUE}, {WS_OVERLAPPED|WS_BORDER, TRUE}, {WS_OVERLAPPED|WS_CAPTION, TRUE}, @@ -16096,7 +16095,6 @@ static void test_broadcast(void) for (j = 0; j < ARRAY_SIZE(bcast_expect); j++) { wparam_expected = (msg_expected && bcast_expect[j].receive) ? 0xbaadbeef : 0xdead; - todo_wine_if (msg_expected && bcast_expect[j].todo) ok(g_broadcast_sub_wparam[j] == wparam_expected, "%d,%d: message %04x, got %#lx, error %d\n", i, j, messages[i], g_broadcast_sub_wparam[j], GetLastError()); @@ -16118,7 +16116,6 @@ static void test_broadcast(void) for (j = 0; j < ARRAY_SIZE(bcast_expect); j++) { wparam_expected = (msg_expected && bcast_expect[j].receive) ? 0xbaadbeef : 0xdead; - todo_wine_if (msg_expected && bcast_expect[j].todo) ok(g_broadcast_sub_wparam[j] == wparam_expected, "%d,%d: message %04x, got %#lx, error %d\n", i, j, messages[i], g_broadcast_sub_wparam[j], GetLastError());

1 0

Esme Povirk : windowscodecs: Fix memory leak in common decoder.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 466bec7c1690edc52824ef6c3ad5a2b6e1ad2ecb URL: https://source.winehq.org/git/wine.git/?a=commit;h=466bec7c1690edc52824ef6c… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Nov 17 14:06:44 2020 -0600 windowscodecs: Fix memory leak in common decoder. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50140 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/decoder.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index ad5127cd258..0e97135bc16 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -95,6 +95,7 @@ static ULONG WINAPI CommonDecoder_Release(IWICBitmapDecoder *iface) IStream_Release(This->stream); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); + decoder_destroy(This->decoder); HeapFree(GetProcessHeap(), 0, This); }

1 0

Alistair Leslie-Hughes : msi: Correct Query for loading an image.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 358d4f5a914e574c026380666964fcefb0495517 URL: https://source.winehq.org/git/wine.git/?a=commit;h=358d4f5a914e574c02638066… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 17 22:21:10 2020 +1100 msi: Correct Query for loading an image. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index f2bfbf1d913..703f9d43957 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -463,7 +463,7 @@ static HANDLE msi_load_image( MSIDATABASE *db, LPCWSTR name, UINT type, if (!(tmp = msi_create_temp_file( db ))) return NULL; - rec = MSI_QueryGetRecord( db, L"SELCT * FROM `Binary` WHERE `Name` = '%s'", name ); + rec = MSI_QueryGetRecord( db, L"SELECT * FROM `Binary` WHERE `Name` = '%s'", name ); if( rec ) { r = MSI_RecordStreamToFile( rec, 2, tmp ); @@ -962,7 +962,7 @@ static HBITMAP msi_load_picture( MSIDATABASE *db, const WCHAR *name, INT cx, INT BITMAP bm; UINT r; - rec = MSI_QueryGetRecord( db, L"SELCT * FROM `Binary` WHERE `Name` = '%s'", name ); + rec = MSI_QueryGetRecord( db, L"SELECT * FROM `Binary` WHERE `Name` = '%s'", name ); if (!rec) goto end;

1 0

Zebediah Figura : winegstreamer: Don't fail state change methods if the sink pin is not connected.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 60814198fed9a58083dfa80aac8c9ecb0cd1af56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60814198fed9a58083dfa80a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 17 11:37:51 2020 -0600 winegstreamer: Don't fail state change methods if the sink pin is not connected. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 16 ++++++++-------- dlls/quartz/tests/mpegsplit.c | 16 ++++++++-------- dlls/quartz/tests/waveparser.c | 16 ++++++++-------- dlls/winegstreamer/gstdemux.c | 6 +++--- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index a277256255b..644807dc32f 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -1300,25 +1300,25 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1328,11 +1328,11 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index e407fe44eeb..f8a0ac56356 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1043,25 +1043,25 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1071,11 +1071,11 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c index e9540bc0f55..37f924b716f 100644 --- a/dlls/quartz/tests/waveparser.c +++ b/dlls/quartz/tests/waveparser.c @@ -780,25 +780,25 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -808,11 +808,11 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9f5e147b7ed..771694b4d3c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1438,7 +1438,7 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) unsigned int i; if (!filter->container) - return VFW_E_NOT_CONNECTED; + return S_OK; for (i = 0; i < filter->source_count; ++i) { @@ -1489,7 +1489,7 @@ static HRESULT gstdemux_start_stream(struct strmbase_filter *iface, REFERENCE_TI GstStateChangeReturn ret; if (!filter->container) - return VFW_E_NOT_CONNECTED; + return S_OK; if ((ret = gst_element_set_state(filter->container, GST_STATE_PLAYING)) == GST_STATE_CHANGE_FAILURE) { @@ -1507,7 +1507,7 @@ static HRESULT gstdemux_stop_stream(struct strmbase_filter *iface) GstStateChangeReturn ret; if (!filter->container) - return VFW_E_NOT_CONNECTED; + return S_OK; if ((ret = gst_element_set_state(filter->container, GST_STATE_PAUSED)) == GST_STATE_CHANGE_FAILURE) {

1 0

Jacek Caban : server: Support writing directly on console handle.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 22afbb8fe78968391f6d1e0890ee3bf3cc1504fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=22afbb8fe78968391f6d1e08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 17 18:58:16 2020 +0100 server: Support writing directly on console handle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 58 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/server/console.c b/server/console.c index a290e0647e4..1215fc9603d 100644 --- a/server/console.c +++ b/server/console.c @@ -236,6 +236,7 @@ static const struct object_ops screen_buffer_ops = screen_buffer_destroy /* destroy */ }; +static int screen_buffer_write( struct fd *fd, struct async *async, file_pos_t pos ); static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct fd_ops screen_buffer_fd_ops = @@ -244,7 +245,7 @@ static const struct fd_ops screen_buffer_fd_ops = default_poll_event, /* poll_event */ console_get_fd_type, /* get_fd_type */ no_fd_read, /* read */ - no_fd_write, /* write */ + screen_buffer_write, /* write */ no_fd_flush, /* flush */ no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ @@ -916,6 +917,31 @@ static int console_input_flush( struct fd *fd, struct async *async ) return queue_host_ioctl( console->server, IOCTL_CONDRV_FLUSH, 0, NULL, NULL ); } +static int screen_buffer_write( struct fd *fd, struct async *async, file_pos_t pos ) +{ + struct screen_buffer *screen_buffer = get_fd_user( fd ); + struct iosb *iosb; + + if (!screen_buffer->input || !screen_buffer->input->server) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + + if (!queue_host_ioctl( screen_buffer->input->server, IOCTL_CONDRV_WRITE_FILE, + screen_buffer->id, async, &screen_buffer->ioctl_q )) + return 0; + + /* we can't use default async handling, because write result is not + * compatible with ioctl result */ + iosb = async_get_iosb( async ); + iosb->status = STATUS_SUCCESS; + iosb->result = iosb->in_size; + async_terminate( async, iosb->result ? STATUS_ALERTED : STATUS_SUCCESS ); + release_object( iosb ); + return 1; +} + static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct screen_buffer *screen_buffer = get_fd_user( fd ); @@ -1336,21 +1362,29 @@ DECL_HANDLER(get_next_console_request) if (ioctl->async) { iosb = async_get_iosb( ioctl->async ); - iosb->status = status; - iosb->out_size = min( iosb->out_size, get_req_data_size() ); - if (iosb->out_size) + if (iosb->status == STATUS_PENDING) { - if ((iosb->out_data = memdup( get_req_data(), iosb->out_size ))) + iosb->status = status; + iosb->out_size = min( iosb->out_size, get_req_data_size() ); + if (iosb->out_size) { - iosb->result = iosb->out_size; - status = STATUS_ALERTED; - } - else if (!status) - { - iosb->status = STATUS_NO_MEMORY; - iosb->out_size = 0; + if ((iosb->out_data = memdup( get_req_data(), iosb->out_size ))) + { + iosb->result = iosb->out_size; + status = STATUS_ALERTED; + } + else if (!status) + { + iosb->status = STATUS_NO_MEMORY; + iosb->out_size = 0; + } } } + else + { + release_object( ioctl->async ); + ioctl->async = NULL; + } } console_host_ioctl_terminate( ioctl, status ); if (iosb) release_object( iosb );

1 0

Paul Gofman : user32: Avoid holding display_dc_section when creating display DC.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 073b6dc240bada1f700a7c37d6797a6b15a176d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=073b6dc240bada1f700a7c37… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 16 18:48:02 2020 +0300 user32: Avoid holding display_dc_section when creating display DC. get_display_dc() may be locking display_dc_section at the end of user driver initialization in LoadCursorA() called from register_builtin_classes(). If the driver initialization initiated in CreateDCW() goes in parallel with the initialization started elsewhere without holding display_dc_section, the process can deadlock. Fixes random lockup on start in Hammerting. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 1381f387e03..a620116053a 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -548,7 +548,18 @@ static BOOL init_entry_string( struct sysparam_entry *entry, const WCHAR *str ) HDC get_display_dc(void) { EnterCriticalSection( &display_dc_section ); - if (!display_dc) display_dc = CreateDCW( L"DISPLAY", NULL, NULL, NULL ); + if (!display_dc) + { + HDC dc; + + LeaveCriticalSection( &display_dc_section ); + dc = CreateDCW( L"DISPLAY", NULL, NULL, NULL ); + EnterCriticalSection( &display_dc_section ); + if (display_dc) + DeleteDC(dc); + else + display_dc = dc; + } return display_dc; }

1 0

Paul Gofman : directmanipulation: Return S_OK form viewport_SetViewportOptions stub.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: b58882993e7b28bd71f50f1eecd4750d576167e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b58882993e7b28bd71f50f1e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Nov 13 19:26:41 2020 +0300 directmanipulation: Return S_OK form viewport_SetViewportOptions stub. Fixes Paradox launcher crash on start when Windows version is set to 10. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/directmanipulation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index 36a863c7c69..5bb3461d443 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -610,7 +610,7 @@ static HRESULT WINAPI viewport_SetViewportOptions(IDirectManipulationViewport2 * { struct directviewport *This = impl_from_IDirectManipulationViewport2(iface); FIXME("%p, %d\n", This, options); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI viewport_AddConfiguration(IDirectManipulationViewport2 *iface, DIRECTMANIPULATION_CONFIGURATION configuration)

1 0

Zebediah Figura : quartz/tests: Pass an IMediaControl to some functions.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: f35e5c4de27037ef148fac5e2f1db26f572bf2df URL: https://source.winehq.org/git/wine.git/?a=commit;h=f35e5c4de27037ef148fac5e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 17 11:37:50 2020 -0600 quartz/tests: Pass an IMediaControl to some functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 12 +++++------ dlls/quartz/tests/videorenderer.c | 43 +++++++++++++-------------------------- dlls/quartz/tests/vmr7.c | 27 ++++++++---------------- 3 files changed, 28 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f35e5c4de27037ef148f…

1 0