November 2020 - Wine-Commits

Damjan Jovanovic : cmd.exe: Increase size of WCMD_HandleTildeModifiers() buffers to MAXSTRING.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: abe848f05f5d91d4c8eb875ebbf143ca9ca9a210 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abe848f05f5d91d4c8eb875e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Nov 13 18:09:59 2020 +0200 cmd.exe: Increase size of WCMD_HandleTildeModifiers() buffers to MAXSTRING. Some buffers in WCMD_HandleTildeModifiers() are only of size MAX_PATH, even though they handle strings that aren't necessarily filenames. When changed to have size MAXSTRING, a stack overflow crash with strings of size MAX_PATH stops happening. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42731 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/batch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 3aa40874aea..a08648d8c26 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -342,8 +342,8 @@ void WCMD_HandleTildeModifiers(WCHAR **start, BOOL atExecute) }; WIN32_FILE_ATTRIBUTE_DATA fileInfo; - WCHAR outputparam[MAX_PATH]; - WCHAR finaloutput[MAX_PATH]; + WCHAR outputparam[MAXSTRING]; + WCHAR finaloutput[MAXSTRING]; WCHAR fullfilename[MAX_PATH]; WCHAR thisoutput[MAX_PATH]; WCHAR *filepart = NULL;

1 0

Jeff Smith : user32/tests: Test message broadcast to parented windows.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 81dec8de77a50148ba50ac05a307431bcf365147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81dec8de77a50148ba50ac05… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Nov 16 08:45:30 2020 -0600 user32/tests: Test message broadcast to parented windows. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8aae9405320..f6802fe3bdd 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15976,6 +15976,16 @@ static LRESULT WINAPI broadcast_test_proc(HWND hwnd, UINT message, WPARAM wParam return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); } +static WNDPROC *g_oldproc_sub; +static WPARAM *g_broadcast_sub_wparam; +static LRESULT WINAPI broadcast_test_sub_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + int sub_index = GetWindowLongPtrA(hwnd, GWLP_USERDATA); + + g_broadcast_sub_wparam[sub_index] = (wParam == 0xbaadbeef) ? wParam : 0; + + return CallWindowProcA(g_oldproc_sub[sub_index], hwnd, message, wParam, lParam); +} static void test_broadcast(void) { @@ -15988,9 +15998,35 @@ static void test_broadcast(void) 0xc000, /* lowest possible atom returned by RegisterWindowMessage */ 0xffff, }; + static const struct + { + LONG style; + BOOL receive; + BOOL todo; + } bcast_expect[] = + { + {WS_OVERLAPPED, TRUE, TRUE}, + {WS_OVERLAPPED|WS_DLGFRAME, TRUE}, + {WS_OVERLAPPED|WS_BORDER, TRUE}, + {WS_OVERLAPPED|WS_CAPTION, TRUE}, + {WS_CHILD, FALSE}, + {WS_CHILD|WS_DLGFRAME, FALSE}, + {WS_CHILD|WS_BORDER, FALSE}, + {WS_CHILD|WS_CAPTION, FALSE}, + {WS_CHILD|WS_POPUP, TRUE}, + {WS_POPUP, TRUE}, + {WS_POPUP|WS_DLGFRAME, TRUE}, + {WS_POPUP|WS_BORDER, TRUE}, + {WS_POPUP|WS_CAPTION, TRUE}, + }; WNDPROC oldproc; - unsigned int i; + unsigned int i, j; HWND hwnd; + HWND *hwnd_sub; + + hwnd_sub = HeapAlloc( GetProcessHeap(), 0, ARRAY_SIZE(bcast_expect) * sizeof(*hwnd_sub) ); + g_oldproc_sub = HeapAlloc( GetProcessHeap(), 0, ARRAY_SIZE(bcast_expect) * sizeof(*g_oldproc_sub) ); + g_broadcast_sub_wparam = HeapAlloc( GetProcessHeap(), 0, ARRAY_SIZE(bcast_expect) * sizeof(*g_broadcast_sub_wparam) ); hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL); ok(hwnd != NULL, "got %p\n", hwnd); @@ -16027,9 +16063,28 @@ static void test_broadcast(void) 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); + } + + for (j = 0; j < ARRAY_SIZE(bcast_expect); j++) + { + hwnd_sub[j] = CreateWindowA("static", NULL, bcast_expect[j].style, 0, 0, 0, 0, hwnd, 0, 0, NULL); + ok(hwnd_sub[j] != NULL, "got %p\n", hwnd_sub[j]); + /* CreateWindow adds extra style flags, so call SetWindowLong to clear some of those. */ + SetWindowLongA(hwnd_sub[j], GWL_STYLE, bcast_expect[j].style); + + g_oldproc_sub[j] = (WNDPROC)SetWindowLongPtrA(hwnd_sub[j], GWLP_WNDPROC, (LONG_PTR)broadcast_test_sub_proc); + SetWindowLongPtrA(hwnd_sub[j], GWLP_USERDATA, (LONG_PTR)j); + } + + for (i = 0; i < ARRAY_SIZE(messages); i++) + { + BOOL ret; + BOOL msg_expected = (messages[i] < WM_USER || messages[i] >= 0xc000); /* send, broadcast */ g_broadcast_wparam = 0xdead; + for (j = 0; j < ARRAY_SIZE(bcast_expect); j++) + g_broadcast_sub_wparam[j] = 0xdead; ret = SendMessageTimeoutA(HWND_BROADCAST, messages[i], 0xbaadbeef, 0, SMTO_NORMAL, 2000, NULL); if (!ret && GetLastError() == ERROR_TIMEOUT) win_skip("broadcasting test %d, timeout\n", i); @@ -16038,10 +16093,20 @@ static void test_broadcast(void) 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()); + 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()); + } } /* send, topmost */ g_broadcast_wparam = 0xdead; + for (j = 0; j < ARRAY_SIZE(bcast_expect); j++) + g_broadcast_sub_wparam[j] = 0xdead; ret = SendMessageTimeoutA(HWND_TOPMOST, messages[i], 0xbaadbeef, 0, SMTO_NORMAL, 2000, NULL); if (!ret && GetLastError() == ERROR_TIMEOUT) win_skip("broadcasting test %d, timeout\n", i); @@ -16050,9 +16115,24 @@ static void test_broadcast(void) 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()); + 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()); + } } } + for (j = 0; j < ARRAY_SIZE(bcast_expect); j++) + DestroyWindow(hwnd_sub[j]); + + HeapFree(GetProcessHeap(), 0, g_broadcast_sub_wparam); + HeapFree(GetProcessHeap(), 0, g_oldproc_sub); + HeapFree(GetProcessHeap(), 0, hwnd_sub); + DestroyWindow(hwnd); }

1 0

Zebediah Figura : wineqtdecoder: Do not fail state change methods if source pins are not connected.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 7905cc975f60ff7a95f33941df9052b22eba4b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7905cc975f60ff7a95f33941… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 17 11:37:53 2020 -0600 wineqtdecoder: Do not fail state change methods if source pins are not connected. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 20 ++++++++------------ dlls/wineqtdecoder/qtvdecoder.c | 26 +++++++++++++++++--------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index cabb090e8d3..21fa2376745 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -278,25 +278,21 @@ static void qt_splitter_destroy(struct strmbase_filter *iface) static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE_TIME time) { QTSplitter *filter = impl_from_strmbase_filter(iface); - HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr; + HRESULT hr; EnterCriticalSection(&filter->csReceive); - if (filter->pVideo_Pin) - { - if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->pVideo_Pin->pin))) - hr = pin_hr; - } - if (filter->pAudio_Pin) - { - if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->pAudio_Pin->pin))) - hr = pin_hr; - } + if (filter->pVideo_Pin && filter->pVideo_Pin->pin.pin.peer + && FAILED(hr = IMemAllocator_Commit(filter->pVideo_Pin->pin.pAllocator))) + ERR("Failed to commit video allocator, hr %#x.\n", hr); + if (filter->pAudio_Pin && filter->pAudio_Pin->pin.pin.peer + && FAILED(hr = IMemAllocator_Commit(filter->pAudio_Pin->pin.pAllocator))) + ERR("Failed to commit audio allocator, hr %#x.\n", hr); SetEvent(filter->runEvent); LeaveCriticalSection(&filter->csReceive); - return hr; + return S_OK; } static HRESULT qt_splitter_cleanup_stream(struct strmbase_filter *iface) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index a86cd432c22..0e17c067df5 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -561,16 +561,18 @@ static void video_decoder_destroy(struct strmbase_filter *iface) static HRESULT video_decoder_init_stream(struct strmbase_filter *iface) { - QTVDecoderImpl *This = impl_from_strmbase_filter(iface); + QTVDecoderImpl *filter = impl_from_strmbase_filter(iface); + HRESULT hr; OSErr err = noErr; ICMDecompressionSessionOptionsRef sessionOptions = NULL; ICMDecompressionTrackingCallbackRecord trackingCallbackRecord; trackingCallbackRecord.decompressionTrackingCallback = trackingCallback; - trackingCallbackRecord.decompressionTrackingRefCon = (void*)This; + trackingCallbackRecord.decompressionTrackingRefCon = filter; - err = ICMDecompressionSessionCreate(NULL, This->hImageDescription, sessionOptions, This->outputBufferAttributes, &trackingCallbackRecord, &This->decompressionSession); + err = ICMDecompressionSessionCreate(NULL, filter->hImageDescription, sessionOptions, + filter->outputBufferAttributes, &trackingCallbackRecord, &filter->decompressionSession); if (err != noErr) { @@ -578,18 +580,24 @@ static HRESULT video_decoder_init_stream(struct strmbase_filter *iface) return E_FAIL; } - return BaseOutputPinImpl_Active(&This->source); + if (filter->source.pin.peer && FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) + ERR("Failed to commit allocator, hr %#x.\n", hr); + + return S_OK; } static HRESULT video_decoder_cleanup_stream(struct strmbase_filter *iface) { - QTVDecoderImpl* This = impl_from_strmbase_filter(iface); + QTVDecoderImpl *filter = impl_from_strmbase_filter(iface); + + if (filter->decompressionSession) + ICMDecompressionSessionRelease(filter->decompressionSession); + filter->decompressionSession = NULL; - if (This->decompressionSession) - ICMDecompressionSessionRelease(This->decompressionSession); - This->decompressionSession = NULL; + if (filter->source.pin.peer) + IMemAllocator_Decommit(filter->source.pAllocator); - return BaseOutputPinImpl_Inactive(&This->source); + return S_OK; } static const struct strmbase_filter_ops filter_ops =

1 0

Zebediah Figura : winegstreamer: Don't fail parser_init_stream() if a source pin is not connected.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: ef7dcc7d519845f7f2d4fdd69c52e50737a21eea URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef7dcc7d519845f7f2d4fdd6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 17 11:37:52 2020 -0600 winegstreamer: Don't fail parser_init_stream() if a source pin is not connected. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 771694b4d3c..215e2704a27 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1432,7 +1432,6 @@ static void gstdemux_destroy(struct strmbase_filter *iface) static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) { struct gstdemux *filter = impl_from_strmbase_filter(iface); - HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr; const SourceSeeking *seeking; GstStateChangeReturn ret; unsigned int i; @@ -1442,12 +1441,11 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) for (i = 0; i < filter->source_count; ++i) { - if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->sources[i]->pin))) - hr = pin_hr; - } + HRESULT hr; - if (FAILED(hr)) - return hr; + if (filter->sources[i]->pin.pin.peer && FAILED(hr = IMemAllocator_Commit(filter->sources[i]->pin.pAllocator))) + ERR("Failed to commit allocator, hr %#x.\n", hr); + } if (filter->no_more_pads_event) ResetEvent(filter->no_more_pads_event); @@ -1480,7 +1478,7 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) stop_type, seeking->llStop * 100)); } - return hr; + return S_OK; } static HRESULT gstdemux_start_stream(struct strmbase_filter *iface, REFERENCE_TIME time)

1 0

Jeff Smith : user32/tests: Change misleading variable name and type.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: e92cc29d6c520ff44e73a6dc7f2807bbe78c2746 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e92cc29d6c520ff44e73a6dc… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Nov 16 08:45:28 2020 -0600 user32/tests: Change misleading variable name and type. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bf20c5c7f20..1e616e3d061 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15964,15 +15964,15 @@ static void test_PostMessage(void) flush_events(); } -static LPARAM g_broadcast_lparam; +static WPARAM g_broadcast_wparam; static LRESULT WINAPI broadcast_test_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); if (wParam == 0xbaadbeef) - g_broadcast_lparam = wParam; + g_broadcast_wparam = wParam; else - g_broadcast_lparam = 0; + g_broadcast_wparam = 0; return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); } @@ -16040,7 +16040,7 @@ static void test_broadcast(void) } /* send, broadcast */ - g_broadcast_lparam = 0xdead; + g_broadcast_wparam = 0xdead; ret = SendMessageTimeoutA(HWND_BROADCAST, messages[i], 0xbaadbeef, 0, SMTO_NORMAL, 2000, NULL); if (!ret && GetLastError() == ERROR_TIMEOUT) win_skip("broadcasting test %d, timeout\n", i); @@ -16048,18 +16048,18 @@ static void test_broadcast(void) { if (messages[i] < WM_USER || messages[i] >= 0xc000) { - ok(g_broadcast_lparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_lparam, GetLastError()); + ok(g_broadcast_wparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_wparam, GetLastError()); } else { - ok(g_broadcast_lparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_lparam, GetLastError()); + ok(g_broadcast_wparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_wparam, GetLastError()); } } /* send, topmost */ - g_broadcast_lparam = 0xdead; + g_broadcast_wparam = 0xdead; ret = SendMessageTimeoutA(HWND_TOPMOST, messages[i], 0xbaadbeef, 0, SMTO_NORMAL, 2000, NULL); if (!ret && GetLastError() == ERROR_TIMEOUT) win_skip("broadcasting test %d, timeout\n", i); @@ -16067,13 +16067,13 @@ static void test_broadcast(void) { if (messages[i] < WM_USER || messages[i] >= 0xc000) { - ok(g_broadcast_lparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_lparam, GetLastError()); + ok(g_broadcast_wparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_wparam, GetLastError()); } else { - ok(g_broadcast_lparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_lparam, GetLastError()); + ok(g_broadcast_wparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_wparam, GetLastError()); } } }

1 0

Jacek Caban : kernelbase: Move Unicode conversion from WriteConsoleA to conhost.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 4cc4ea449be5bdc78971556829b2dc83d06d74d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cc4ea449be5bdc789715568… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 17 18:58:02 2020 +0100 kernelbase: Move Unicode conversion from WriteConsoleA to conhost. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 13 ++++--------- include/wine/condrv.h | 15 ++++++++------- programs/conhost/conhost.c | 16 ++++++++++++++++ 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 9fc34e3c9bc..47329886f07 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1634,17 +1634,12 @@ BOOL WINAPI ReadConsoleW( HANDLE handle, void *buffer, DWORD length, DWORD *coun BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleA( HANDLE handle, const void *buffer, DWORD length, DWORD *written, void *reserved ) { - UINT cp = GetConsoleOutputCP(); - LPWSTR strW; - DWORD lenW; BOOL ret; - if (written) *written = 0; - lenW = MultiByteToWideChar( cp, 0, buffer, length, NULL, 0 ); - if (!(strW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) return FALSE; - MultiByteToWideChar( cp, 0, buffer, length, strW, lenW ); - ret = WriteConsoleW( handle, strW, lenW, written, 0 ); - HeapFree( GetProcessHeap(), 0, strW ); + TRACE( "(%p,%s,%d,%p,%p)\n", handle, debugstr_an(buffer, length), length, written, reserved ); + + ret = console_ioctl( handle, IOCTL_CONDRV_WRITE_FILE, (void *)buffer, length, NULL, 0, NULL ); + if (written) *written = ret ? length : 0; return ret; } diff --git a/include/wine/condrv.h b/include/wine/condrv.h index cf2524edc66..711341a2f6c 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -43,13 +43,14 @@ /* console output ioctls */ #define IOCTL_CONDRV_WRITE_CONSOLE CTL_CODE(FILE_DEVICE_CONSOLE, 30, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONDRV_READ_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 31, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CONDRV_WRITE_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 34, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONDRV_ACTIVATE CTL_CODE(FILE_DEVICE_CONSOLE, 35, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 36, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONDRV_SCROLL CTL_CODE(FILE_DEVICE_CONSOLE, 37, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_WRITE_FILE CTL_CODE(FILE_DEVICE_CONSOLE, 31, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_READ_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_WRITE_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 34, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 35, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_ACTIVATE CTL_CODE(FILE_DEVICE_CONSOLE, 36, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 37, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_SCROLL CTL_CODE(FILE_DEVICE_CONSOLE, 38, METHOD_BUFFERED, FILE_WRITE_ACCESS) /* console connection ioctls */ #define IOCTL_CONDRV_BIND_PID CTL_CODE(FILE_DEVICE_CONSOLE, 51, METHOD_BUFFERED, FILE_ANY_ACCESS) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index c7562974222..edd5fd97b40 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2292,6 +2292,22 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign if (in_size % sizeof(WCHAR) || *out_size) return STATUS_INVALID_PARAMETER; return write_console( screen_buffer, in_data, in_size / sizeof(WCHAR) ); + case IOCTL_CONDRV_WRITE_FILE: + { + unsigned int len; + WCHAR *buf; + NTSTATUS status; + + len = MultiByteToWideChar( screen_buffer->console->output_cp, 0, in_data, in_size, + NULL, 0 ); + if (!len) return STATUS_SUCCESS; + if (!(buf = malloc( len * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; + MultiByteToWideChar( screen_buffer->console->output_cp, 0, in_data, in_size, buf, len ); + status = write_console( screen_buffer, buf, len ); + free( buf ); + return status; + } + case IOCTL_CONDRV_WRITE_OUTPUT: if ((*out_size != sizeof(DWORD) && *out_size != sizeof(SMALL_RECT)) || in_size < sizeof(struct condrv_output_params))

1 0

Jacek Caban : kernel32: Import WriteFile from kernelbase.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 6a1a8bdf353ce4829308a7c2307edf417f1676a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a1a8bdf353ce4829308a7c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 17 18:58:26 2020 +0100 kernel32: Import WriteFile from kernelbase. Console special-case is no longer needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 11 ----------- dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 897d8abd14a..fc83e618c3a 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -306,17 +306,6 @@ BOOL WINAPI KERNEL32_ReadFile( HANDLE file, LPVOID buffer, DWORD count, } -/************************************************************************* - * WriteFile (KERNEL32.@) - */ -BOOL WINAPI KERNEL32_WriteFile( HANDLE file, LPCVOID buffer, DWORD count, - LPDWORD result, LPOVERLAPPED overlapped ) -{ - if (is_console_handle( file )) return WriteConsoleA( file, buffer, count, result, NULL ); - return WriteFile( file, buffer, count, result, overlapped ); -} - - /*********************************************************************** * DosDateTimeToFileTime (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5508a10f9a0..d0a273fe39e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1630,7 +1630,7 @@ @ stdcall -import WriteConsoleOutputCharacterW(long ptr long long ptr) @ stdcall -import WriteConsoleOutputW(long ptr long long ptr) @ stdcall -import WriteConsoleW(long ptr long ptr ptr) -@ stdcall WriteFile(long ptr long ptr ptr) KERNEL32_WriteFile +@ stdcall -import WriteFile(long ptr long ptr ptr) @ stdcall -import WriteFileEx(long ptr long ptr ptr) @ stdcall -import WriteFileGather(long ptr long ptr ptr) @ stdcall WritePrivateProfileSectionA(str str str)

1 0

Zhiyi Zhang : winex11.drv: Clarify parent in struct x11drv_win_data comments.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: ae79a91902857f186b02e97ae81708cc19574e63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae79a91902857f186b02e97a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 17 17:05:33 2020 +0800 winex11.drv: Clarify parent in struct x11drv_win_data comments. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/x11drv.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 173d94b9efa..45855976607 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -563,9 +563,9 @@ struct x11drv_win_data HWND hwnd; /* hwnd that this private data belongs to */ Window whole_window; /* X window for the complete window */ Window client_window; /* X window for the client area */ - RECT window_rect; /* USER window rectangle relative to parent */ - RECT whole_rect; /* X window rectangle for the whole window relative to parent */ - RECT client_rect; /* client area relative to parent */ + RECT window_rect; /* USER window rectangle relative to win32 parent window client area */ + RECT whole_rect; /* X window rectangle for the whole window relative to win32 parent window client area */ + RECT client_rect; /* client area relative to win32 parent window client area */ XIC xic; /* X input context */ BOOL managed : 1; /* is window managed? */ BOOL mapped : 1; /* is window mapped? (in either normal or iconic state) */

1 0

Paul Gofman : ntdll: Avoid overwriting parameters with context in call_user_apc_dispatcher() on x86.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 2002aa15f476b4bb9039d5e47dfa2e3c0be58ee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2002aa15f476b4bb9039d5e4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 12 17:20:10 2020 +0300 ntdll: Avoid overwriting parameters with context in call_user_apc_dispatcher() on x86. Fixes crash in 32 bit kernel32 file test. The crash is not always reproducible as the issue depends on stack layout. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 4d8eeb2072c..58b79940773 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1688,15 +1688,18 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movl %esp,%ebx\n\t" "cmpl %esp,%esi\n\t" "cmovbl %esi,%esp\n\t" + "pushl 20(%ebx)\n\t" /* func */ + "pushl 16(%ebx)\n\t" /* arg2 */ + "pushl 12(%ebx)\n\t" /* arg1 */ + "movl 8(%ebx),%ebx\n\t" /* ctx */ "movl $0x00010007,(%esi)\n\t" /* context.ContextFlags = CONTEXT_FULL */ "pushl %esi\n\t" /* context */ "pushl $0xfffffffe\n\t" "call " __ASM_STDCALL("NtGetContextThread",8) "\n\t" "movl $0xc0,0xb0(%esi)\n" /* context.Eax = STATUS_USER_APC */ - "movl 20(%ebx),%eax\n\t" /* func */ - "movl 16(%ebx),%ecx\n\t" /* arg2 */ - "movl 12(%ebx),%edx\n\t" /* arg1 */ - "movl 8(%ebx),%ebx\n\t" /* ctx */ + "popl %edx\n\t" + "popl %ecx\n\t" + "popl %eax\n\t" "leal -20(%esi),%esp\n\t" "movl %eax,16(%esp)\n" /* func */ "2:\tmovl %ecx,12(%esp)\n\t" /* arg2 */

1 0

Nikolay Sivov : evr/presenter: Implement sample presenting functionality.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 4b87269d003039090648d942f1bb94532bea0306 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b87269d003039090648d942… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 17 13:41:40 2020 +0300 evr/presenter: Implement sample presenting functionality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 324 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 273 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b87269d003039090648…

1 0