July 2020 - Wine-commits - list.winehq.org

Jacek Caban : kernelbase: Use IOCTL_CONDRV_WRITE_OUTPUT in WriteConsoleOutputAttribute.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 30453f0acf8bdca4dec5de38d08a776b933256c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30453f0acf8bdca4dec5de38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 17:31:39 2020 +0200 kernelbase: Use IOCTL_CONDRV_WRITE_OUTPUT in WriteConsoleOutputAttribute. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index a79644723a..01f326cb81 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1533,6 +1533,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputW( HANDLE handle, const CHAR_INF BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputAttribute( HANDLE handle, const WORD *attr, DWORD length, COORD coord, DWORD *written ) { + struct condrv_write_output_params *params; + size_t size; BOOL ret; TRACE( "(%p,%p,%d,%dx%d,%p)\n", handle, attr, length, coord.X, coord.Y, written ); @@ -1544,17 +1546,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputAttribute( HANDLE handle, const } *written = 0; - SERVER_START_REQ( write_console_output ) - { - req->handle = console_handle_unmap( handle ); - req->x = coord.X; - req->y = coord.Y; - req->mode = CHAR_INFO_MODE_ATTR; - req->wrap = TRUE; - wine_server_add_data( req, attr, length * sizeof(WORD) ); - if ((ret = !wine_server_call_err( req ))) *written = reply->written; - } - SERVER_END_REQ; + size = sizeof(*params) + length * sizeof(WORD); + if (!(params = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; + params->mode = CHAR_INFO_MODE_ATTR; + params->x = coord.X; + params->y = coord.Y; + params->width = 0; + memcpy( params + 1, attr, length * sizeof(*attr) ); + ret = console_ioctl( handle, IOCTL_CONDRV_WRITE_OUTPUT, params, size, written, sizeof(*written), NULL ); + HeapFree( GetProcessHeap(), 0, params ); return ret; }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_WRITE_OUTPUT in WriteConsoleOutputCharacterW.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: db886f09236759141a95183be83c666cac5f9a64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db886f09236759141a95183b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 17:31:47 2020 +0200 kernelbase: Use IOCTL_CONDRV_WRITE_OUTPUT in WriteConsoleOutputCharacterW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 01f326cb81..b7443ce9ae 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1600,6 +1600,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterA( HANDLE handle, LPCST BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterW( HANDLE handle, LPCWSTR str, DWORD length, COORD coord, DWORD *written ) { + struct condrv_write_output_params *params; + size_t size; BOOL ret; TRACE( "(%p,%s,%d,%dx%d,%p)\n", handle, debugstr_wn(str, length), length, coord.X, coord.Y, written ); @@ -1611,16 +1613,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterW( HANDLE handle, LPCWS } *written = 0; - SERVER_START_REQ( write_console_output ) - { - req->handle = console_handle_unmap( handle ); - req->x = coord.X; - req->y = coord.Y; - req->mode = CHAR_INFO_MODE_TEXT; - req->wrap = TRUE; - wine_server_add_data( req, str, length * sizeof(WCHAR) ); - if ((ret = !wine_server_call_err( req ))) *written = reply->written; - } - SERVER_END_REQ; + size = sizeof(*params) + length * sizeof(WCHAR); + if (!(params = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; + params->mode = CHAR_INFO_MODE_TEXT; + params->x = coord.X; + params->y = coord.Y; + params->width = 0; + memcpy( params + 1, str, length * sizeof(*str) ); + ret = console_ioctl( handle, IOCTL_CONDRV_WRITE_OUTPUT, params, size, written, sizeof(*written), NULL ); + HeapFree( GetProcessHeap(), 0, params ); return ret; }

1 0

Jacek Caban : kernel32: Use IOCTL_CONDRV_WRITE_OUTPUT in CONSOLE_WriteChars.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 98bee7881a30eb01fb3d633f008957919a4aa71b URL: https://source.winehq.org/git/wine.git/?a=commit;h=98bee7881a30eb01fb3d633f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 17:31:56 2020 +0200 kernel32: Use IOCTL_CONDRV_WRITE_OUTPUT in CONSOLE_WriteChars. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index f75a894717..8fc158ac22 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -689,25 +689,24 @@ LONG CALLBACK CONSOLE_HandleCtrlC( EXCEPTION_POINTERS *eptr ) * WriteConsoleOutput helper: hides server call semantics * writes a string at a given pos with standard attribute */ -static int CONSOLE_WriteChars(HANDLE hCon, LPCWSTR lpBuffer, int nc, COORD* pos) -{ - int written = -1; - - if (!nc) return 0; - - SERVER_START_REQ( write_console_output ) - { - req->handle = console_handle_unmap(hCon); - req->x = pos->X; - req->y = pos->Y; - req->mode = CHAR_INFO_MODE_TEXTSTDATTR; - req->wrap = FALSE; - wine_server_add_data( req, lpBuffer, nc * sizeof(WCHAR) ); - if (!wine_server_call_err( req )) written = reply->written; - } - SERVER_END_REQ; - - if (written > 0) pos->X += written; +static int CONSOLE_WriteChars(HANDLE handle, const WCHAR *str, size_t length, COORD *coord) +{ + struct condrv_write_output_params *params; + DWORD written = 0, size; + + if (!length) return 0; + + size = sizeof(*params) + length * sizeof(WCHAR); + if (!(params = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; + params->mode = CHAR_INFO_MODE_TEXTSTDATTR; + params->x = coord->X; + params->y = coord->Y; + params->width = 0; + memcpy( params + 1, str, length * sizeof(*str) ); + if (DeviceIoControl( handle, IOCTL_CONDRV_WRITE_OUTPUT, params, size, + &written, sizeof(written), NULL, NULL )) + coord->X += written; + HeapFree( GetProcessHeap(), 0, params ); return written; }

1 0

Jacek Caban : server: Remove no longer used write_console_output request.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 9f3e9d464da8806acd185783f4d2350dd675fd2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f3e9d464da8806acd185783… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 17:32:12 2020 +0200 server: Remove no longer used write_console_output request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 8 ++++ include/wine/server_protocol.h | 33 +---------------- server/console.c | 84 ------------------------------------------ server/protocol.def | 22 ----------- server/request.h | 12 ------ server/trace.c | 20 ---------- 6 files changed, 9 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f3e9d464da8806acd18…

1 0

Matteo Bruni : wined3d: Get rid of default label in debug_cs_op() switch.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 399e01f9e56911cd136f34a75beab63e28d7c889 URL: https://source.winehq.org/git/wine.git/?a=commit;h=399e01f9e56911cd136f34a7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 22 19:00:58 2020 +0200 wined3d: Get rid of default label in debug_cs_op() switch. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b87003c53b..908daa22a5 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -510,9 +510,8 @@ static const char *debug_cs_op(enum wined3d_cs_op op) WINED3D_TO_STR(WINED3D_CS_OP_GENERATE_MIPMAPS); WINED3D_TO_STR(WINED3D_CS_OP_STOP); #undef WINED3D_TO_STR - default: - return wine_dbg_sprintf("UNKNOWN_OP(%#x)", op); } + return wine_dbg_sprintf("UNKNOWN_OP(%#x)", op); } static void wined3d_cs_exec_nop(struct wined3d_cs *cs, const void *data)

1 0

Brendan Shanks : winemac.drv: Build cocoa_window.m with GL_SILENCE_DEPRECATION.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 737c54dca02f2d8780258eae24c223a7de5fa1cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=737c54dca02f2d8780258eae… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jul 22 15:47:37 2020 -0700 winemac.drv: Build cocoa_window.m with GL_SILENCE_DEPRECATION. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index edbfab518e..9c2ffb1623 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -20,6 +20,7 @@ #include "config.h" +#define GL_SILENCE_DEPRECATION #import <Carbon/Carbon.h> #import <CoreVideo/CoreVideo.h> #ifdef HAVE_METAL_METAL_H

1 0

Brendan Shanks : winemac.drv: Fix warnings for constants deprecated by macOS 10.14.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: f9dc364b4e76a613dde1bd0757c6c15f3030f7b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9dc364b4e76a613dde1bd07… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jul 22 15:49:57 2020 -0700 winemac.drv: Fix warnings for constants deprecated by macOS 10.14. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_clipboard.m | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index 39c3b8f872..30f3097c3d 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -23,6 +23,14 @@ #import "cocoa_event.h" #import "cocoa_window.h" +#if !defined(MAC_OS_X_VERSION_10_14) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_14 +/* For older SDKs, #define the new names of constants deprecated/renamed in macOS 10.14. */ +#define NSBitmapImageFileTypeBMP NSBMPFileType +#define NSBitmapImageFileTypeGIF NSGIFFileType +#define NSBitmapImageFileTypeJPEG NSJPEGFileType +#define NSBitmapImageFileTypePNG NSPNGFileType +#define NSBitmapImageFileTypeTIFF NSTIFFFileType +#endif static int owned_change_count = -1; static int change_count = -1; @@ -86,11 +94,11 @@ CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) dispatch_once(&BitmapOutputTypesInitOnce, ^{ NSArray* bitmapFileTypes = [NSArray arrayWithObjects: - [NSNumber numberWithUnsignedInteger:NSTIFFFileType], - [NSNumber numberWithUnsignedInteger:NSPNGFileType], - [NSNumber numberWithUnsignedInteger:NSBMPFileType], - [NSNumber numberWithUnsignedInteger:NSGIFFileType], - [NSNumber numberWithUnsignedInteger:NSJPEGFileType], + [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeTIFF], + [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypePNG], + [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeBMP], + [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeGIF], + [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeJPEG], nil]; BitmapOutputTypes = [[NSArray alloc] initWithObjects:@"public.tiff", @"public.png",

1 0

Zebediah Figura : quartz: Allow the arguments to IMediaSeeking::GetPositions() to be NULL.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 11df839b69a37b001e05a2dae433209efd100c36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11df839b69a37b001e05a2da… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 22 18:29:21 2020 -0500 quartz: Allow the arguments to IMediaSeeking::GetPositions() to be NULL. This allows "UNDER NIGHT IN-BIRTH Exe:Late" to render video. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 18 ++++++++++-------- dlls/quartz/tests/filtergraph.c | 6 +++--- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 7d6463c1f3..b691fd79fc 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2441,16 +2441,18 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * return hr; } -static HRESULT WINAPI MediaSeeking_GetPositions(IMediaSeeking *iface, LONGLONG *pCurrent, - LONGLONG *pStop) +static HRESULT WINAPI MediaSeeking_GetPositions(IMediaSeeking *iface, + LONGLONG *current, LONGLONG *stop) { - struct filter_graph *This = impl_from_IMediaSeeking(iface); - HRESULT hr; + struct filter_graph *graph = impl_from_IMediaSeeking(iface); + HRESULT hr = S_OK; - TRACE("(%p/%p)->(%p, %p)\n", This, iface, pCurrent, pStop); - hr = IMediaSeeking_GetCurrentPosition(iface, pCurrent); - if (SUCCEEDED(hr)) - hr = IMediaSeeking_GetStopPosition(iface, pStop); + TRACE("graph %p, current %p, stop %p.\n", graph, current, stop); + + if (current) + hr = IMediaSeeking_GetCurrentPosition(iface, current); + if (SUCCEEDED(hr) && stop) + hr = IMediaSeeking_GetStopPosition(iface, stop); return hr; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 9219b30cec..4fcd27b291 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4098,14 +4098,14 @@ static void test_graph_seeking(void) ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); hr = IMediaSeeking_GetPositions(seeking, NULL, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaSeeking_GetPositions(seeking, NULL, &stop); - todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); current = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!current, "Got time %s.\n", wine_dbgstr_longlong(time)); hr = IMediaSeeking_GetCurrentPosition(seeking, NULL);

1 0

Zebediah Figura : quartz: Correctly convert reference time to REFTIME in IBasicVideo::get_AvgTimePerFrame().
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: ead0e8e5cfcfa3a56217c4f535e960ba99b2485b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ead0e8e5cfcfa3a56217c4f5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 22 18:29:22 2020 -0500 quartz: Correctly convert reference time to REFTIME in IBasicVideo::get_AvgTimePerFrame(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/window.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ac2cadc4b1..9e6a618a36 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2702,7 +2702,7 @@ static void test_basic_video(void) reftime = 0.0; hr = IBasicVideo_get_AvgTimePerFrame(video, &reftime); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(reftime == 0.02, "Got frame rate %.16e.\n", reftime); + ok(reftime == 0.02, "Got frame rate %.16e.\n", reftime); l = 0xdeadbeef; hr = IBasicVideo_get_BitRate(video, &l); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 092ee87132..789c5e429a 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3717,7 +3717,7 @@ static void test_basic_video(void) reftime = 0.0; hr = IBasicVideo_get_AvgTimePerFrame(video, &reftime); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(compare_double(reftime, 0.02, 1 << 28), "Got frame rate %.16e.\n", reftime); + ok(compare_double(reftime, 0.02, 1 << 28), "Got frame rate %.16e.\n", reftime); l = 0xdeadbeef; hr = IBasicVideo_get_BitRate(video, &l); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index a5ff4979ef..07e042eccd 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -755,7 +755,7 @@ static HRESULT WINAPI basic_video_get_AvgTimePerFrame(IBasicVideo *iface, REFTIM TRACE("window %p, reftime %p.\n", window, reftime); - *reftime = get_video_format(window)->AvgTimePerFrame; + *reftime = (double)get_video_format(window)->AvgTimePerFrame / 1e7; return S_OK; }

1 0

Zebediah Figura : winegstreamer: Check for failure from gst_video_info_set_format().
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: ddd43e0a80bfd4c2e6f3ec650ed4b7d37890c46d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd43e0a80bfd4c2e6f3ec65… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 22 18:29:23 2020 -0500 winegstreamer: Check for failure from gst_video_info_set_format(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a32b0b0e41..1aa564f212 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -413,7 +413,11 @@ static GstCaps *amt_to_gst_caps_video(const AM_MEDIA_TYPE *mt) return NULL; } - gst_video_info_set_format(&info, format, vih->bmiHeader.biWidth, vih->bmiHeader.biHeight); + if (!gst_video_info_set_format(&info, format, vih->bmiHeader.biWidth, vih->bmiHeader.biHeight)) + { + ERR("Failed to set format.\n"); + return NULL; + } if ((caps = gst_video_info_to_caps(&info))) { /* Clear some fields that shouldn't prevent us from connecting. */

1 0