October 2020 - Wine-Commits

Michael Stefaniuc : wbemprox: Use wide-char string literals.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 99392eafaac89d39a69cc31e178eec211de40b74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99392eafaac89d39a69cc31e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 14 23:22:01 2020 +0200 wbemprox: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8daa55eaeb4..590714b826b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1320,7 +1320,7 @@ static enum fill_status fill_bios( struct table *table, const struct expr *cond static enum fill_status fill_cdromdrive( struct table *table, const struct expr *cond ) { - WCHAR drive[3], root[] = {'A',':','\\',0}; + WCHAR drive[3], root[] = L"A:\\"; struct record_cdromdrive *rec; UINT i, row = 0, offset = 0; DWORD drives = GetLogicalDrives(); @@ -1846,7 +1846,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c { struct record_datafile *rec; UINT i, len, row = 0, offset = 0, num_expected_rows; - WCHAR *glob = NULL, *path = NULL, *new_path, root[] = {'A',':','\\',0}; + WCHAR *glob = NULL, *path = NULL, *new_path, root[] = L"A:\\"; DWORD drives = GetLogicalDrives(); WIN32_FIND_DATAW data; HANDLE handle; @@ -1974,7 +1974,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr * { struct record_directory *rec; UINT i, len, row = 0, offset = 0, num_expected_rows; - WCHAR *glob = NULL, *path = NULL, *new_path, root[] = {'A',':','\\',0}; + WCHAR *glob = NULL, *path = NULL, *new_path, root[] = L"A:\\"; DWORD drives = GetLogicalDrives(); WIN32_FIND_DATAW data; HANDLE handle; @@ -2071,7 +2071,7 @@ done: static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) { - WCHAR root[] = {'\\','\\','.','\\','A',':',0}; + WCHAR root[] = L"\\\\.\\A:"; ULARGE_INTEGER free; DISK_GEOMETRY_EX info; HANDLE handle; @@ -2130,7 +2130,7 @@ done: static enum fill_status fill_diskdrive( struct table *table, const struct expr *cond ) { static const WCHAR fmtW[] = L"\\\\\\\\.\\\\PHYSICALDRIVE%u"; - WCHAR device_id[ARRAY_SIZE( fmtW ) + 10], root[] = {'A',':','\\',0}; + WCHAR device_id[ARRAY_SIZE( fmtW ) + 10], root[] = L"A:\\"; struct record_diskdrive *rec; UINT i, row = 0, offset = 0, index = 0, type; UINT64 size = 1024 * 1024 * 1024; @@ -2283,7 +2283,7 @@ static WCHAR *get_filesystem( const WCHAR *root ) static enum fill_status fill_diskpartition( struct table *table, const struct expr *cond ) { - WCHAR device_id[32], root[] = {'A',':','\\',0}; + WCHAR device_id[32], root[] = L"A:\\"; struct record_diskpartition *rec; UINT i, row = 0, offset = 0, type, index = 0; UINT64 size = 1024 * 1024 * 1024; @@ -2435,7 +2435,7 @@ static WCHAR *get_volumeserialnumber( const WCHAR *root ) static enum fill_status fill_logicaldisk( struct table *table, const struct expr *cond ) { - WCHAR device_id[3], root[] = {'A',':','\\',0}; + WCHAR device_id[3], root[] = L"A:\\"; struct record_logicaldisk *rec; UINT i, row = 0, offset = 0, type; UINT64 size = 1024 * 1024 * 1024;

1 0

Zebediah Figura : wine.inf: IsInstalled is a DWORD value.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: cb8d58598b3b95f21ebc1d4f325cced930fedceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb8d58598b3b95f21ebc1d4f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 17 10:01:30 2020 -0500 wine.inf: IsInstalled is a DWORD value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50016 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index ff9a221feaa..fba071fe0d8 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -764,19 +764,19 @@ HKCU,Software\Microsoft\Protected Storage System Provider,,16 ; Some apps requires at least four subkeys of Active Setup\Installed Components HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},,2,"DirectDrawEx" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"ComponentID",2,"DirectDrawEx" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"IsInstalled",2,1 +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"IsInstalled",0x10003,1 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Version",2,"4,71,1113,0" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},,2,"HTML Help" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"ComponentID",2,"HTMLHelp" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"IsInstalled",2,1 +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"IsInstalled",0x10003,1 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Version",2,"4,74,9273,0" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},,2,"Windows Media Player" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"ComponentID",2,"wmp" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"IsInstalled",2,1 +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"IsInstalled",0x10003,1 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Version",2,"12,0,7601,18840"

1 0

Michael Stefaniuc : wbemprox: Use 0 terminated WCHAR strings in wql.y.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: a03b796cc24edf7861a4499cd1ba6d53b9d7b8cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=a03b796cc24edf7861a4499c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 14 23:22:02 2020 +0200 wbemprox: Use 0 terminated WCHAR strings in wql.y. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/wql.y | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index f5b249aaba4..95c8d8fe817 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -637,38 +637,25 @@ struct wql_keyword #define MIN_TOKEN_LEN 2 #define MAX_TOKEN_LEN 11 -static const WCHAR andW[] = {'A','N','D'}; -static const WCHAR associatorsW[] = {'A','S','S','O','C','I','A','T','O','R','S'}; -static const WCHAR byW[] = {'B','Y'}; -static const WCHAR falseW[] = {'F','A','L','S','E'}; -static const WCHAR fromW[] = {'F','R','O','M'}; -static const WCHAR isW[] = {'I','S'}; -static const WCHAR likeW[] = {'L','I','K','E'}; -static const WCHAR notW[] = {'N','O','T'}; -static const WCHAR nullW[] = {'N','U','L','L'}; -static const WCHAR ofW[] = {'O','F'}; -static const WCHAR orW[] = {'O','R'}; -static const WCHAR selectW[] = {'S','E','L','E','C','T'}; -static const WCHAR trueW[] = {'T','R','U','E'}; -static const WCHAR whereW[] = {'W','H','E','R','E'}; - +#define X(str) str, ARRAY_SIZE(str) - 1 static const struct wql_keyword keyword_table[] = { - { andW, ARRAY_SIZE(andW), TK_AND }, - { associatorsW, ARRAY_SIZE(associatorsW), TK_ASSOCIATORS }, - { byW, ARRAY_SIZE(byW), TK_BY }, - { falseW, ARRAY_SIZE(falseW), TK_FALSE }, - { fromW, ARRAY_SIZE(fromW), TK_FROM }, - { isW, ARRAY_SIZE(isW), TK_IS }, - { likeW, ARRAY_SIZE(likeW), TK_LIKE }, - { notW, ARRAY_SIZE(notW), TK_NOT }, - { nullW, ARRAY_SIZE(nullW), TK_NULL }, - { ofW, ARRAY_SIZE(ofW), TK_OF }, - { orW, ARRAY_SIZE(orW), TK_OR }, - { selectW, ARRAY_SIZE(selectW), TK_SELECT }, - { trueW, ARRAY_SIZE(trueW), TK_TRUE }, - { whereW, ARRAY_SIZE(whereW), TK_WHERE } + { X(L"AND"), TK_AND }, + { X(L"ASSOCIATORS"), TK_ASSOCIATORS }, + { X(L"BY"), TK_BY }, + { X(L"FALSE"), TK_FALSE }, + { X(L"FROM"), TK_FROM }, + { X(L"IS"), TK_IS }, + { X(L"LIKE"), TK_LIKE }, + { X(L"NOT"), TK_NOT }, + { X(L"NULL"), TK_NULL }, + { X(L"OF"), TK_OF }, + { X(L"OR"), TK_OR }, + { X(L"SELECT"), TK_SELECT }, + { X(L"TRUE"), TK_TRUE }, + { X(L"WHERE"), TK_WHERE } }; +#undef X static int __cdecl cmp_keyword( const void *arg1, const void *arg2 ) {

1 0

Roman Pišl : kernelbase: Fix comment and trace message in console.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: c8af17187ef48816cdf42ced5ade7ee5d8d2842a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8af17187ef48816cdf42ced… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sun Oct 18 12:47:42 2020 +0200 kernelbase: Fix comment and trace message in console. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index d387b49c534..71c594b3c18 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -351,7 +351,7 @@ BOOL WINAPI AllocConsole(void) memset(&console_si, 0, sizeof(console_si)); console_si.cb = sizeof(console_si); - /* setup a view arguments for wineconsole (it'll use them as default values) */ + /* setup a view arguments for conhost (it'll use them as default values) */ if (app_si.dwFlags & STARTF_USECOUNTCHARS) { console_si.dwFlags |= STARTF_USECOUNTCHARS; @@ -386,7 +386,7 @@ BOOL WINAPI AllocConsole(void) if (!init_console_std_handles( !(app_si.dwFlags & STARTF_USESTDHANDLES) )) goto error; RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = console; - TRACE( "Started wineconsole pid=%08x tid=%08x\n", pi.dwProcessId, pi.dwThreadId ); + TRACE( "Started conhost pid=%08x tid=%08x\n", pi.dwProcessId, pi.dwThreadId ); CloseHandle( server ); RtlLeaveCriticalSection( &console_section );

1 0

Nikolay Sivov : mf/tests: Add a test for EVRConfig_ handling for already initialized presenter.
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: bfeae85fdd210ebecd69923ad172fb490c784f21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfeae85fdd210ebecd69923a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 16 16:38:08 2020 +0300 mf/tests: Add a test for EVRConfig_ handling for already initialized presenter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 465bd7e3c43..7dc325424a6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -39,6 +39,7 @@ DEFINE_GUID(MFVideoFormat_ABGR32, 0x00000020, 0x0000, 0x0010, 0x80, 0x00, 0x00, #include "mferror.h" #include "mfidl.h" #include "initguid.h" +#include "uuids.h" #include "mmdeviceapi.h" #include "audioclient.h" #include "evr.h" @@ -3237,6 +3238,7 @@ static void test_evr(void) { IMFVideoSampleAllocatorCallback *allocator_callback; IMFStreamSink *stream_sink, *stream_sink2; + IMFVideoDisplayControl *display_control; IMFMediaType *media_type, *media_type2; IMFMediaEventGenerator *ev_generator; IMFVideoSampleAllocator *allocator; @@ -3292,6 +3294,15 @@ static void test_evr(void) hr = IMFAttributes_GetCount(attributes, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!count, "Unexpected count %u.\n", count); + /* Rendering preferences are not immediately propagated to the presenter. */ + hr = IMFAttributes_SetUINT32(attributes, &EVRConfig_ForceBob, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = MFGetService((IUnknown *)sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoDisplayControl_GetRenderingPrefs(display_control, &flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!flags, "Unexpected flags %#x.\n", flags); + IMFVideoDisplayControl_Release(display_control); IMFAttributes_Release(attributes); /* Primary stream type handler. */

1 0

Nikolay Sivov : mf/evr: Add per-stream lock.
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: bd86e9341657f47a19f608c47f488f39d3703c86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd86e9341657f47a19f608c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 16 16:38:09 2020 +0300 mf/evr: Add per-stream lock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index af9bd9e0e42..ac80193ddd6 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -47,6 +47,7 @@ struct video_stream struct video_renderer *parent; IMFMediaEventQueue *event_queue; IMFVideoSampleAllocator *allocator; + CRITICAL_SECTION cs; }; struct video_renderer @@ -213,6 +214,7 @@ static ULONG WINAPI video_stream_sink_Release(IMFStreamSink *iface) IMFMediaEventQueue_Release(stream->event_queue); if (stream->allocator) IMFVideoSampleAllocator_Release(stream->allocator); + DeleteCriticalSection(&stream->cs); heap_free(stream); } @@ -260,20 +262,23 @@ static HRESULT WINAPI video_stream_sink_QueueEvent(IMFStreamSink *iface, MediaEv static HRESULT WINAPI video_stream_sink_GetMediaSink(IMFStreamSink *iface, IMFMediaSink **sink) { struct video_stream *stream = impl_from_IMFStreamSink(iface); + HRESULT hr = S_OK; TRACE("%p, %p.\n", iface, sink); + EnterCriticalSection(&stream->cs); if (!stream->parent) - return MF_E_STREAMSINK_REMOVED; - - if (!sink) - return E_POINTER; - - /* FIXME: not entirely safe if sink is being shut down. */ - *sink = &stream->parent->IMFMediaSink_iface; - IMFMediaSink_AddRef(*sink); + hr = MF_E_STREAMSINK_REMOVED; + else if (!sink) + hr = E_POINTER; + else + { + *sink = &stream->parent->IMFMediaSink_iface; + IMFMediaSink_AddRef(*sink); + } + LeaveCriticalSection(&stream->cs); - return S_OK; + return hr; } static HRESULT WINAPI video_stream_sink_GetIdentifier(IMFStreamSink *iface, DWORD *id) @@ -533,6 +538,7 @@ static HRESULT video_renderer_stream_create(struct video_renderer *renderer, uns stream->IMFMediaTypeHandler_iface.lpVtbl = &video_stream_type_handler_vtbl; stream->IMFGetService_iface.lpVtbl = &video_stream_get_service_vtbl; stream->refcount = 1; + InitializeCriticalSection(&stream->cs); if (FAILED(hr = MFCreateEventQueue(&stream->event_queue))) goto failed; @@ -894,10 +900,15 @@ static HRESULT WINAPI video_renderer_sink_Shutdown(IMFMediaSink *iface) /* Detach streams from the sink. */ for (i = 0; i < renderer->stream_count; ++i) { - IMFMediaSink_Release(&renderer->streams[i]->parent->IMFMediaSink_iface); - renderer->streams[i]->parent = NULL; - IMFMediaEventQueue_Shutdown(renderer->streams[i]->event_queue); - IMFStreamSink_Release(&renderer->streams[i]->IMFStreamSink_iface); + struct video_stream *stream = renderer->streams[i]; + + EnterCriticalSection(&stream->cs); + stream->parent = NULL; + LeaveCriticalSection(&stream->cs); + + IMFMediaEventQueue_Shutdown(stream->event_queue); + IMFStreamSink_Release(&stream->IMFStreamSink_iface); + IMFMediaSink_Release(iface); renderer->streams[i] = NULL; } heap_free(renderer->streams);

1 0

Zebediah Figura : ws2_32/tests: Remove some workarounds for no longer supported versions of Windows.
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: 102c7903ead405d3236dfd843d40b96c38d784ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=102c7903ead405d3236dfd84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 16 14:57:28 2020 -0500 ws2_32/tests: Remove some workarounds for no longer supported versions of Windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 86 +++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 55 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 834cca71960..9143518f4e8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1048,8 +1048,8 @@ static void WINAPI event_client ( client_params *par ) break; } n = recv ( mem->s, recv_p, min ( recv_last - recv_p, par->buflen ), 0 ); - if ( n < 0 && ( err = WSAGetLastError()) != WSAEWOULDBLOCK ) - ok ( 0, "event_client (%x): read error: %d\n", id, err ); + ok(n >= 0 || WSAGetLastError() == WSAEWOULDBLOCK, + "event_client (%x): got error %u\n", id, WSAGetLastError()); } } @@ -1364,16 +1364,15 @@ static void test_set_getsockopt(void) for( i = 0; i < ARRAY_SIZE(linger_testvals);i++) { size = sizeof(lingval); lingval = linger_testvals[i]; - err = setsockopt(s, SOL_SOCKET, SO_LINGER, (char *) &lingval, size); - if( !err) - err = getsockopt(s, SOL_SOCKET, SO_LINGER, (char *) &lingval, &size); - ok( !err, "get/setsockopt(SO_LINGER) failed error: %d\n", WSAGetLastError()); - ok( !lingval.l_onoff == !linger_testvals[i].l_onoff && - (lingval.l_linger == linger_testvals[i].l_linger || - (!lingval.l_linger && !linger_testvals[i].l_onoff)) - , "getsockopt(SO_LINGER #%d) returned wrong value %d,%d not %d,%d\n", i, - lingval.l_onoff, lingval.l_linger, - linger_testvals[i].l_onoff, linger_testvals[i].l_linger); + err = setsockopt(s, SOL_SOCKET, SO_LINGER, (char *)&lingval, size); + ok(!err, "Test %u: failed to set SO_LINGER, error %u\n", i, WSAGetLastError()); + err = getsockopt(s, SOL_SOCKET, SO_LINGER, (char *)&lingval, &size); + ok(!err, "Test %u: failed to get SO_LINGER, error %u\n", i, WSAGetLastError()); + ok(!lingval.l_onoff == !linger_testvals[i].l_onoff, "Test %u: expected %d, got %d\n", + i, linger_testvals[i].l_onoff, lingval.l_onoff); + if (lingval.l_onoff) + ok(lingval.l_linger == linger_testvals[i].l_linger, "Test %u: expected %d, got %d\n", + i, linger_testvals[i].l_linger, lingval.l_linger); } size = sizeof(lingval); @@ -2583,8 +2582,7 @@ static void test_WSASocket(void) sock = WSASocketA(AF_IPX, SOCK_DGRAM, NSPROTO_IPX, NULL, 0, 0); if (sock == INVALID_SOCKET) { - err = WSAGetLastError(); - ok(err == WSAEAFNOSUPPORT || broken(err == WSAEPROTONOSUPPORT), "Expected 10047, received %d\n", err); + ok(WSAGetLastError() == WSAEAFNOSUPPORT, "got error %u\n", WSAGetLastError()); skip("IPX is not supported\n"); } else @@ -3752,11 +3750,7 @@ static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len, BOOL non if (!nonblock) ok(!ret, "connecting to accepting socket failed %d\n", WSAGetLastError()); else if (ret == SOCKET_ERROR) - { - DWORD error = WSAGetLastError(); - ok(error == WSAEWOULDBLOCK || error == WSAEINPROGRESS, - "expected 10035 or 10036, got %d\n", error); - } + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); return connector; } @@ -4648,13 +4642,11 @@ static void test_ioctlsocket(void) ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &arg, 0, NULL, 0, &arg, NULL, NULL); ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); - ret = WSAGetLastError(); - ok(ret == WSAEFAULT || broken(ret == WSAEINVAL), "expected WSAEFAULT, got %d instead\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, NULL, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); - ret = WSAGetLastError(); - ok(ret == WSAEFAULT || broken(ret == WSAEINVAL), "expected WSAEFAULT, got %d instead\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); make_keepalive(kalive, 0, 0, 0); ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); @@ -4835,8 +4827,8 @@ static void test_send(void) bytes_sent = 0; WSASetLastError(12345); ret = WSASend(dst, &buf, 1, &bytes_sent, 0, &ov, NULL); - ok((ret == SOCKET_ERROR && WSAGetLastError() == ERROR_IO_PENDING) || broken(bytes_sent == buflen), - "Failed to start overlapped send %d - %d - %d/%d\n", ret, WSAGetLastError(), bytes_sent, buflen); + ok(ret == SOCKET_ERROR, "expected failure\n"); + ok(WSAGetLastError() == ERROR_IO_PENDING, "wrong error %u\n", WSAGetLastError()); /* don't check for completion yet, we may need to drain the buffer while still sending */ set_blocking(src, FALSE); @@ -6087,8 +6079,8 @@ static void test_WSARecv(void) ok(dwret == WAIT_OBJECT_0, "Waiting for disconnect event failed with %d + errno %d\n", dwret, GetLastError()); bret = GetOverlappedResult((HANDLE)dest, &ov, &bytesReturned, FALSE); - todo_wine ok(!bret && (GetLastError() == ERROR_NETNAME_DELETED || broken(GetLastError() == ERROR_IO_INCOMPLETE) /* win9x */), - "Did not get disconnect event: %d, error %d\n", bret, GetLastError()); + todo_wine ok(!bret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED, "got error %u\n", GetLastError()); ok(bytesReturned == 0, "Bytes received is %d\n", bytesReturned); closesocket(dest); dest = INVALID_SOCKET; @@ -6105,17 +6097,17 @@ static void test_WSARecv(void) addr.sin_family = AF_INET; addr.sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(server, (struct sockaddr *)&addr, sizeof(addr)); - if (iret) goto end; + ok(!iret, "failed to bind, error %u\n", WSAGetLastError()); len = sizeof(addr); iret = getsockname(server, (struct sockaddr *)&addr, &len); - if (iret) goto end; + ok(!iret, "failed to get address, error %u\n", WSAGetLastError()); iret = listen(server, 1); - if (iret) goto end; + ok(!iret, "failed to listen, error %u\n", WSAGetLastError()); iret = connect(src, (struct sockaddr *)&addr, sizeof(addr)); - if (iret) goto end; + ok(!iret, "failed to connect, error %u\n", WSAGetLastError()); len = sizeof(addr); dest = accept(server, (struct sockaddr *)&addr, &len); @@ -6772,7 +6764,7 @@ static void test_GetAddrInfoW(void) result2 = NULL; ret = GetAddrInfoW(idn_domain, NULL, NULL, &result2); - if (ret == WSAHOST_NOT_FOUND && broken(1)) + if (broken(ret == WSAHOST_NOT_FOUND)) { FreeAddrInfoW(result); win_skip("IDN resolution not supported in Win <= 7\n"); @@ -8590,9 +8582,6 @@ static void test_WSAAsyncGetServByPort(void) HANDLE ret; char buffer[MAXGETHOSTSTRUCT]; - if (!hwnd) - return; - /* FIXME: The asynchronous window messages should be tested. */ /* Parameters are not checked when initiating the asynchronous operation. */ @@ -8620,9 +8609,6 @@ static void test_WSAAsyncGetServByName(void) HANDLE ret; char buffer[MAXGETHOSTSTRUCT]; - if (!hwnd) - return; - /* FIXME: The asynchronous window messages should be tested. */ /* Parameters are not checked when initiating the asynchronous operation. */ @@ -9391,19 +9377,13 @@ static void test_completion_port(void) bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED || - GetLastError() == ERROR_OPERATION_ABORTED || - GetLastError() == ERROR_CONNECTION_ABORTED || - GetLastError() == ERROR_PIPE_NOT_CONNECTED /* win 2000 */, - "Last error was %d\n", GetLastError()); + todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED + || GetLastError() == ERROR_CONNECTION_ABORTED, "got error %u\n", GetLastError()); ok(key == 125, "Key is %lu\n", key); ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT || - olp->Internal == (ULONG)STATUS_CANCELLED || - olp->Internal == (ULONG)STATUS_CONNECTION_ABORTED || - olp->Internal == (ULONG)STATUS_PIPE_DISCONNECTED /* win 2000 */), - "Internal status is %lx\n", olp ? olp->Internal : 0); + todo_wine ok((NTSTATUS)olp->Internal == STATUS_CANCELLED + || (NTSTATUS)olp->Internal == STATUS_CONNECTION_ABORTED, "got status %#lx\n", olp->Internal); SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -9550,14 +9530,10 @@ todo_wine ok(error == WSAEFAULT, "expected 10014, got %d\n", error); ret = WSALookupServiceBeginW(qs, 0, &hnd); - error = WSAGetLastError(); ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); -todo_wine - ok(error == WSAEINVAL - || broken(error == ERROR_INVALID_PARAMETER) /* == XP */ - || broken(error == WSAEFAULT) /* == NT */ - || broken(error == WSASERVICE_NOT_FOUND) /* == 2000 */, - "expected 10022, got %d\n", error); + todo_wine ok(WSAGetLastError() == ERROR_INVALID_PARAMETER + || broken(WSAGetLastError() == WSASERVICE_NOT_FOUND) /* win10 1809 */, + "got error %u\n", WSAGetLastError()); ret = WSALookupServiceEnd(NULL); error = WSAGetLastError();

1 0

Zebediah Figura : ws2_32/tests: Rewrite the CF_DEFER test in test_AcceptEx().
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: d1461b622eaf5acd1515e9c8925134e6d878d3fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1461b622eaf5acd1515e9c8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 16 14:57:27 2020 -0500 ws2_32/tests: Rewrite the CF_DEFER test in test_AcceptEx(). The previous test in fact regularly failed on Windows, hidden by the presence of broken(), since both sockets could be connected before the listener was signaled. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 92 ++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 58 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ba03e16ebb1..834cca71960 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7413,18 +7413,14 @@ static void test_ConnectEx(void) static void test_AcceptEx(void) { - SOCKET listener = INVALID_SOCKET; - SOCKET acceptor = INVALID_SOCKET; - SOCKET connector = INVALID_SOCKET; - SOCKET connector2 = INVALID_SOCKET; + SOCKET listener, acceptor, acceptor2, connector, connector2; struct sockaddr_in bindAddress, peerAddress, *readBindAddress, *readRemoteAddress; int socklen, optlen; GUID acceptExGuid = WSAID_ACCEPTEX, getAcceptExGuid = WSAID_GETACCEPTEXSOCKADDRS; LPFN_ACCEPTEX pAcceptEx = NULL; LPFN_GETACCEPTEXSOCKADDRS pGetAcceptExSockaddrs = NULL; fd_set fds_accept, fds_send; - struct timeval timeout = {0,10}; /* wait for 10 milliseconds */ - int got, conn1, i; + static const struct timeval timeout = {1, 0}; DWORD bytesReturned, connect_time; char buffer[1024], ipbuffer[32]; OVERLAPPED overlapped; @@ -7703,66 +7699,47 @@ todo_wine iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); - FD_ZERO ( &fds_accept ); - FD_ZERO ( &fds_send ); + buffer[0] = '0'; - FD_SET ( listener, &fds_accept ); - FD_SET ( connector, &fds_send ); + FD_ZERO(&fds_accept); + FD_SET(listener, &fds_accept); + iret = select(0, &fds_accept, NULL, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - buffer[0] = '0'; - got = 0; - conn1 = 0; + acceptor2 = WSAAccept(listener, NULL, NULL, AlwaysDeferConditionFunc, 0); + ok(acceptor2 == INVALID_SOCKET, "expected failure\n"); + ok(WSAGetLastError() == WSATRY_AGAIN, "got error %u\n", WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, + sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); - for (i = 0; i < 4000; ++i) - { - fd_set fds_openaccept = fds_accept, fds_opensend = fds_send; + FD_ZERO(&fds_send); + FD_SET(connector, &fds_send); + iret = select(0, NULL, &fds_send, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - wsa_ok ( ( select ( 0, &fds_openaccept, &fds_opensend, NULL, &timeout ) ), SOCKET_ERROR !=, - "acceptex test(%d): could not select on socket, errno %d\n" ); + iret = send(connector, "1", 1, 0); + ok(iret == 1, "got ret %d, error %u\n", iret, WSAGetLastError()); - /* check for incoming requests */ - if ( FD_ISSET ( listener, &fds_openaccept ) ) { - got++; - if (got == 1) { - SOCKET tmp = WSAAccept(listener, NULL, NULL, (LPCONDITIONPROC) AlwaysDeferConditionFunc, 0); - ok(tmp == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection, %d\n", WSAGetLastError()); - bret = pAcceptEx(listener, acceptor, buffer, 0, - sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, - &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); - } - else if (got == 2) { - /* this should be socket #2 */ - SOCKET tmp = accept(listener, NULL, NULL); - ok(tmp != INVALID_SOCKET, "accept failed %d\n", WSAGetLastError()); - closesocket(tmp); - } - else { - ok(FALSE, "Got more than 2 connections?\n"); - } - } - if ( conn1 && FD_ISSET ( connector2, &fds_opensend ) ) { - /* Send data on second socket, and stop */ - send(connector2, "2", 1, 0); - FD_CLR ( connector2, &fds_send ); + iret = connect(connector2, (struct sockaddr *)&bindAddress, sizeof(bindAddress)); + ok(iret == SOCKET_ERROR, "expected failure\n"); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - break; - } - if ( FD_ISSET ( connector, &fds_opensend ) ) { - /* Once #1 is connected, allow #2 to connect */ - conn1 = 1; + iret = select(0, &fds_accept, NULL, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - send(connector, "1", 1, 0); - FD_CLR ( connector, &fds_send ); + acceptor2 = accept(listener, NULL, NULL); + ok(acceptor2 != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(acceptor2); - iret = connect(connector2, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); - FD_SET ( connector2, &fds_send ); - } - } + FD_ZERO(&fds_send); + FD_SET(connector2, &fds_send); + iret = select(0, NULL, &fds_send, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - ok (got == 2 || broken(got == 1) /* NT4 */, - "Did not get both connections, got %d\n", got); + iret = send(connector2, "2", 1, 0); + ok(iret == 1, "got ret %d, error %u\n", iret, WSAGetLastError()); dwret = WaitForSingleObject(overlapped.hEvent, 0); ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); @@ -7774,7 +7751,6 @@ todo_wine set_blocking(acceptor, TRUE); iret = recv( acceptor, buffer, 2, 0); ok(iret == 1, "Failed to get data, %d, errno: %d\n", iret, WSAGetLastError()); - ok(buffer[0] == '1', "The wrong first client was accepted by acceptex: %c != 1\n", buffer[0]); closesocket(connector);

1 0

Nikolay Sivov : mf/evr: Implement stream state change events.
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: 5a68001d695dd21348d9045be00ae9b8e2abf926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a68001d695dd21348d9045b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 16 16:38:11 2020 +0300 mf/evr: Implement stream state change events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 84 insertions(+), 8 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 0cd13c25501..957d0e0f797 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -35,6 +35,13 @@ enum video_renderer_flags EVR_PRESENTER_INITED_SERVICES = 0x8, }; +enum video_renderer_state +{ + EVR_STATE_STOPPED = 0, + EVR_STATE_RUNNING, + EVR_STATE_PAUSED, +}; + enum video_stream_flags { EVR_STREAM_PREROLLING = 0x1, @@ -77,6 +84,7 @@ struct video_renderer IMFTransform *mixer; IMFVideoPresenter *presenter; unsigned int flags; + unsigned int state; struct video_stream **streams; size_t stream_size; @@ -1338,30 +1346,98 @@ static ULONG WINAPI video_renderer_clock_sink_Release(IMFClockStateSink *iface) static HRESULT WINAPI video_renderer_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME systime, LONGLONG offset) { - FIXME("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + size_t i; - return E_NOTIMPL; + TRACE("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); + + EnterCriticalSection(&renderer->cs); + + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStarted, &GUID_NULL, S_OK, NULL); + + EnterCriticalSection(&stream->cs); + if (!(stream->flags & EVR_STREAM_PREROLLED)) + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkRequestSample, + &GUID_NULL, S_OK, NULL); + stream->flags |= EVR_STREAM_PREROLLED; + LeaveCriticalSection(&stream->cs); + } + renderer->state = EVR_STATE_RUNNING; + + LeaveCriticalSection(&renderer->cs); + + return S_OK; } static HRESULT WINAPI video_renderer_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, debugstr_time(systime)); + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + size_t i; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_time(systime)); + + EnterCriticalSection(&renderer->cs); + + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStopped, &GUID_NULL, S_OK, NULL); + + EnterCriticalSection(&stream->cs); + stream->flags &= ~EVR_STREAM_PREROLLED; + LeaveCriticalSection(&stream->cs); + } + renderer->state = EVR_STATE_STOPPED; + + LeaveCriticalSection(&renderer->cs); + + return S_OK; } static HRESULT WINAPI video_renderer_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, debugstr_time(systime)); + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + size_t i; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_time(systime)); + + EnterCriticalSection(&renderer->cs); + + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkPaused, &GUID_NULL, S_OK, NULL); + } + renderer->state = EVR_STATE_PAUSED; + + LeaveCriticalSection(&renderer->cs); + + return S_OK; } static HRESULT WINAPI video_renderer_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, debugstr_time(systime)); + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + size_t i; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_time(systime)); + + EnterCriticalSection(&renderer->cs); + + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStarted, &GUID_NULL, S_OK, NULL); + } + renderer->state = EVR_STATE_RUNNING; + + LeaveCriticalSection(&renderer->cs); + + return S_OK; } static HRESULT WINAPI video_renderer_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate)

1 0

Zebediah Figura : ws2_32/tests: Add more tests for passing short buffers to AcceptEx().
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: 0c249e6125fc9dc6ee86b4ef6ae0d9fa2fc6291b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c249e6125fc9dc6ee86b4ef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 16 14:57:31 2020 -0500 ws2_32/tests: Add more tests for passing short buffers to AcceptEx(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 105 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 98 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e92442eb00d..5fb85bfaa60 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7334,6 +7334,7 @@ static void test_AcceptEx(void) DWORD dwret; memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); listener = socket(AF_INET, SOCK_STREAM, 0); ok(listener != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); @@ -7341,9 +7342,6 @@ static void test_AcceptEx(void) acceptor = socket(AF_INET, SOCK_STREAM, 0); ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - connector = socket(AF_INET, SOCK_STREAM, 0); - ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - memset(&bindAddress, 0, sizeof(bindAddress)); bindAddress.sin_family = AF_INET; bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); @@ -7408,8 +7406,101 @@ todo_wine "AcceptEx on too small local address size returned %d + errno %d\n", bret, WSAGetLastError()); ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); - bret = CancelIo((HANDLE) listener); - ok(bret, "Failed to cancel pending accept socket\n"); + + connector = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(connector != -1, "failed to create socket, error %u\n", WSAGetLastError()); + iret = connect(connector, (struct sockaddr *)&bindAddress, sizeof(bindAddress)); + ok(!iret, "failed to connect, error %u\n", WSAGetLastError()); + iret = getsockname(connector, (struct sockaddr *)&peerAddress, &remoteSize); + ok(!iret, "getsockname failed, error %u\n", WSAGetLastError()); + + dwret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(!dwret, "wait failed\n"); + bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); + ok(bret, "got error %u\n", GetLastError()); + ok(!(NTSTATUS)overlapped.Internal, "got %#lx\n", overlapped.Internal); + ok(!bytesReturned, "got size %u\n", bytesReturned); + + readBindAddress = readRemoteAddress = (struct sockaddr_in *)0xdeadbeef; + localSize = remoteSize = 0xdeadbeef; + pGetAcceptExSockaddrs(buffer, 0, 0, sizeof(struct sockaddr_in) + 16, + (struct sockaddr **)&readBindAddress, &localSize, (struct sockaddr **)&readRemoteAddress, &remoteSize); + todo_wine ok(readBindAddress == (struct sockaddr_in *)0xdeadbeef, "got local addr %p\n", readBindAddress); + ok(!memcmp(readRemoteAddress, &peerAddress, sizeof(peerAddress)), "remote addr didn't match\n"); + todo_wine ok(localSize == 0xdeadbeef, "got local size %u\n", localSize); + ok(remoteSize == sizeof(struct sockaddr_in), "got remote size %u\n", remoteSize); + + closesocket(connector); + closesocket(acceptor); + + acceptor = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(acceptor != -1, "failed to create socket, error %u\n", WSAGetLastError()); + + overlapped.Internal = 0xdeadbeef; + bret = pAcceptEx(listener, acceptor, buffer, 0, 3, + sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret && WSAGetLastError() == ERROR_IO_PENDING, "got %d, error %u\n", bret, WSAGetLastError()); + ok((NTSTATUS)overlapped.Internal == STATUS_PENDING, "got %#lx\n", overlapped.Internal); + + connector = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(connector != -1, "failed to create socket, error %u\n", WSAGetLastError()); + iret = connect(connector, (struct sockaddr *)&bindAddress, sizeof(bindAddress)); + ok(!iret, "failed to connect, error %u\n", WSAGetLastError()); + + dwret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(!dwret, "wait failed\n"); + bytesReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); + todo_wine ok(!bret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError()); + todo_wine ok((NTSTATUS)overlapped.Internal == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", overlapped.Internal); + ok(!bytesReturned, "got size %u\n", bytesReturned); + + closesocket(acceptor); + + /* The above connection request is not accepted. */ + acceptor = accept(listener, NULL, NULL); + todo_wine ok(acceptor != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(acceptor); + + closesocket(connector); + + acceptor = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(acceptor != -1, "failed to create socket, error %u\n", WSAGetLastError()); + + overlapped.Internal = 0xdeadbeef; + bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 4, + sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret && WSAGetLastError() == ERROR_IO_PENDING, "got %d, error %u\n", bret, WSAGetLastError()); + ok((NTSTATUS)overlapped.Internal == STATUS_PENDING, "got %#lx\n", overlapped.Internal); + + connector = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(connector != -1, "failed to create socket, error %u\n", WSAGetLastError()); + iret = connect(connector, (struct sockaddr *)&bindAddress, sizeof(bindAddress)); + ok(!iret, "failed to connect, error %u\n", WSAGetLastError()); + + dwret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(!dwret, "wait failed\n"); + bytesReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); + todo_wine ok(!bret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError()); + todo_wine ok((NTSTATUS)overlapped.Internal == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", overlapped.Internal); + ok(!bytesReturned, "got size %u\n", bytesReturned); + + closesocket(acceptor); + + /* The above connection request is not accepted. */ + acceptor = accept(listener, NULL, NULL); + todo_wine ok(acceptor != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(acceptor); + + closesocket(connector); + + acceptor = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(acceptor != -1, "failed to create socket, error %u\n", WSAGetLastError()); overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 15, @@ -7447,8 +7538,6 @@ todo_wine ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "AcceptEx on a NULL overlapped " "returned %d + errno %d\n", bret, WSAGetLastError()); - overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, @@ -7499,6 +7588,8 @@ todo_wine ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); } + connector = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(connector != -1, "failed to create socket, error %u\n", WSAGetLastError()); overlapped.Internal = 0xdeadbeef; iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError());

1 0

Zebediah Figura : ws2_32/tests: Fix a test failure on w10pro64.
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: 2aebe0b628a171abd2ffb63054e3d3d0da60dd05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aebe0b628a171abd2ffb630… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 16 14:57:30 2020 -0500 ws2_32/tests: Fix a test failure on w10pro64. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 63 ++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e917705d3d1..e92442eb00d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6268,7 +6268,7 @@ static BOOL poll_isset(WSAPOLLFD *fds, int max, SOCKET s, int rev) static void test_WSAPoll(void) { - int ix, ret, err, poll_timeout; + int ix, ret, err; SOCKET fdListen, fdRead, fdWrite; struct sockaddr_in address; socklen_t len; @@ -6315,19 +6315,18 @@ static void test_WSAPoll(void) address.sin_family = AF_INET; len = sizeof(address); fdListen = setup_server_socket(&address, &len); - poll_timeout = 100; /* When no events are pending poll returns 0 with no error */ POLL_CLEAR(); POLL_SET(fdListen, POLLIN); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 100); ok(ret == 0, "expected 0, got %d\n", ret); /* Test listening socket connection attempt notifications */ fdWrite = setup_connector_socket(&address, len, TRUE); POLL_CLEAR(); POLL_SET(fdListen, POLLIN | POLLOUT); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 100); ok(ret == 1, "expected 1, got %d\n", ret); ok(POLL_ISSET(fdListen, POLLRDNORM), "fdListen socket events incorrect\n"); len = sizeof(address); @@ -6339,7 +6338,7 @@ static void test_WSAPoll(void) POLL_SET(fdListen, POLLIN | POLLOUT); POLL_SET(fdRead, POLLIN | POLLOUT); POLL_SET(fdWrite, POLLIN | POLLOUT); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 100); ok(ret == 2, "expected 2, got %d\n", ret); ok(POLL_ISSET(fdWrite, POLLWRNORM), "fdWrite socket events incorrect\n"); ok(POLL_ISSET(fdRead, POLLWRNORM), "fdRead socket events incorrect\n"); @@ -6355,7 +6354,7 @@ static void test_WSAPoll(void) POLL_CLEAR(); POLL_SET(fdListen, POLLIN | POLLOUT); POLL_SET(fdRead, POLLIN); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 100); ok(ret == 1, "expected 1, got %d\n", ret); ok(POLL_ISSET(fdRead, POLLRDNORM), "fdRead socket events incorrect\n"); ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), 0); @@ -6368,7 +6367,7 @@ static void test_WSAPoll(void) POLL_CLEAR(); POLL_SET(fdListen, POLLIN | POLLOUT); POLL_SET(fdRead, POLLIN); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 100); ok(ret == 1, "expected 1, got %d\n", ret); ok(POLL_ISSET(fdRead, POLLRDBAND), "fdRead socket events incorrect\n"); tmp_buf[0] = 0xAF; @@ -6385,7 +6384,7 @@ static void test_WSAPoll(void) POLL_CLEAR(); POLL_SET(fdListen, POLLIN | POLLOUT); POLL_SET(fdRead, POLLIN | POLLOUT); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 100); ok(ret == 1, "expected 1, got %d\n", ret); tmp_buf[0] = 0xAF; SetLastError(0xdeadbeef); @@ -6402,34 +6401,34 @@ static void test_WSAPoll(void) POLL_CLEAR(); POLL_SET(fdListen, POLLIN | POLLOUT); POLL_SET(fdWrite, POLLIN); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 100); ok(ret == 1, "expected 1, got %d\n", ret); ok(POLL_ISSET(fdWrite, POLLHUP), "fdWrite socket events incorrect\n"); ret = recv(fdWrite, tmp_buf, sizeof(tmp_buf), 0); ok(ret == 0, "expected 0, got %d\n", ret); - - /* When a connection is attempted to a non-listening socket due to a bug - * in the MS code it will never be notified. This is a long standing issue - * that will never be fixed for compatibility reasons so we have to deal - * with it manually. */ ret = closesocket(fdWrite); ok(ret == 0, "expected 0, got %d\n", ret); ret = closesocket(fdListen); ok(ret == 0, "expected 0, got %d\n", ret); - len = sizeof(address); - fdWrite = setup_connector_socket(&address, len, TRUE); - POLL_CLEAR(); - POLL_SET(fdWrite, POLLIN | POLLOUT); - poll_timeout = 2000; - ret = pWSAPoll(fds, ix, poll_timeout); -todo_wine - ok(ret == 0, "expected 0, got %d\n", ret); - len = sizeof(id); - id = 0xdeadbeef; - err = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); - ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); - closesocket(fdWrite); + + /* The following WSAPoll() call times out on versions older than w10pro64, + * but even on w10pro64 it takes over 2 seconds for an error to be reported, + * so make the test interactive-only. */ + if (winetest_interactive) + { + len = sizeof(address); + fdWrite = setup_connector_socket(&address, len, TRUE); + POLL_CLEAR(); + POLL_SET(fdWrite, POLLIN | POLLOUT); + ret = pWSAPoll(fds, ix, 10000); + ok(ret == 1, "expected 0, got %d\n", ret); + len = sizeof(id); + id = 0xdeadbeef; + err = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); + closesocket(fdWrite); + } /* Try poll() on a closed socket after connection */ tcp_socketpair(&fdRead, &fdWrite); @@ -6437,12 +6436,12 @@ todo_wine POLL_CLEAR(); POLL_SET(fdWrite, POLLIN | POLLOUT); POLL_SET(fdRead, POLLIN | POLLOUT); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 2000); ok(ret == 1, "expected 1, got %d\n", ret); ok(POLL_ISSET(fdRead, POLLNVAL), "fdRead socket events incorrect\n"); POLL_CLEAR(); POLL_SET(fdWrite, POLLIN | POLLOUT); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 2000); ok(ret == 1, "expected 1, got %d\n", ret); todo_wine ok(POLL_ISSET(fdWrite, POLLWRNORM | POLLHUP) || broken(POLL_ISSET(fdWrite, POLLWRNORM)) /* <= 2008 */, @@ -6455,7 +6454,7 @@ todo_wine ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); POLL_CLEAR(); POLL_SET(fdWrite, POLLIN | POLLOUT); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 2000); ok(ret == 1, "expected 1, got %d\n", ret); ok(POLL_ISSET(fdWrite, POLLWRNORM), "fdWrite socket events incorrect\n"); WaitForSingleObject (thread_handle, 1000); @@ -6466,7 +6465,7 @@ todo_wine ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); POLL_CLEAR(); POLL_SET(fdWrite, POLLIN); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 2000); ok(ret == 1, "expected 1, got %d\n", ret); ok(POLL_ISSET(fdWrite, POLLNVAL), "fdWrite socket events incorrect\n"); WaitForSingleObject (thread_handle, 1000);

1 0

Zebediah Figura : ws2_32/tests: Remove workarounds from test_events().
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: ff8b5a51d7e961ec506d1695a139c0a6079a3fd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff8b5a51d7e961ec506d1695… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 16 14:57:29 2020 -0500 ws2_32/tests: Remove workarounds from test_events(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 182 +++++++++++++---------------------------------- 1 file changed, 48 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff8b5a51d7e961ec506d…

1 0

Nikolay Sivov : mf/evr: Implement NotifyPreroll().
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: 4e11368295174a7dc39647b19fb172bb0770e9b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e11368295174a7dc39647b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 16 16:38:10 2020 +0300 mf/evr: Implement NotifyPreroll(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index ac80193ddd6..0cd13c25501 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -35,6 +35,12 @@ enum video_renderer_flags EVR_PRESENTER_INITED_SERVICES = 0x8, }; +enum video_stream_flags +{ + EVR_STREAM_PREROLLING = 0x1, + EVR_STREAM_PREROLLED = 0x2, +}; + struct video_renderer; struct video_stream @@ -44,6 +50,7 @@ struct video_stream IMFGetService IMFGetService_iface; LONG refcount; unsigned int id; + unsigned int flags; struct video_renderer *parent; IMFMediaEventQueue *event_queue; IMFVideoSampleAllocator *allocator; @@ -318,8 +325,19 @@ static HRESULT WINAPI video_stream_sink_GetMediaTypeHandler(IMFStreamSink *iface static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFSample *sample) { + struct video_stream *stream = impl_from_IMFStreamSink(iface); + FIXME("%p, %p.\n", iface, sample); + EnterCriticalSection(&stream->cs); + if (stream->flags & EVR_STREAM_PREROLLING) + { + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkPrerolled, &GUID_NULL, S_OK, NULL); + stream->flags &= ~EVR_STREAM_PREROLLING; + stream->flags |= EVR_STREAM_PREROLLED; + } + LeaveCriticalSection(&stream->cs); + return E_NOTIMPL; } @@ -958,9 +976,34 @@ static ULONG WINAPI video_renderer_preroll_Release(IMFMediaSinkPreroll *iface) static HRESULT WINAPI video_renderer_preroll_NotifyPreroll(IMFMediaSinkPreroll *iface, MFTIME start_time) { - FIXME("%p, %s.\n", iface, debugstr_time(start_time)); + struct video_renderer *renderer = impl_from_IMFMediaSinkPreroll(iface); + HRESULT hr = S_OK; + size_t i; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_time(start_time)); + + EnterCriticalSection(&renderer->cs); + if (renderer->flags & EVR_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + { + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + + EnterCriticalSection(&stream->cs); + if (!(stream->flags & (EVR_STREAM_PREROLLING | EVR_STREAM_PREROLLED))) + { + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkRequestSample, + &GUID_NULL, S_OK, NULL); + stream->flags |= EVR_STREAM_PREROLLING; + } + LeaveCriticalSection(&stream->cs); + } + } + LeaveCriticalSection(&renderer->cs); + + return hr; } static const IMFMediaSinkPrerollVtbl video_renderer_preroll_vtbl =

1 0

Huw Davies : riched20: Pass and return a paragraph ptr in the paragraph joining function.
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: 434feab6a29706797d61499989b5ce445e02a3b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=434feab6a29706797d614999… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 16 12:08:10 2020 +0100 riched20: Pass and return a paragraph ptr in the paragraph joining function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.h | 3 +- dlls/riched20/para.c | 129 ++++++++++++++++++++++--------------------------- dlls/riched20/undo.c | 2 +- 4 files changed, 62 insertions(+), 74 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index cce4755257c..22da616731f 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -369,7 +369,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, keepFirstParaFormat = TRUE; } } - ME_JoinParagraphs(editor, c.pPara, keepFirstParaFormat); + para_join( editor, &c.pPara->member.para, keepFirstParaFormat ); /* ME_SkipAndPropagateCharOffset(p->pRun, shift); */ ME_CheckCharOffsets(editor); nChars -= (eollen < nChars) ? eollen : nChars; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index b0c3ec46214..ad7978c1f9d 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -198,8 +198,6 @@ void ME_SendRequestResize(ME_TextEditor *editor, BOOL force) DECLSPEC_HIDDEN; ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *run) DECLSPEC_HIDDEN; void ME_GetSelectionParas(ME_TextEditor *editor, ME_DisplayItem **para, ME_DisplayItem **para_end) DECLSPEC_HIDDEN; void ME_MakeFirstParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, - BOOL keepFirstParaFormat) DECLSPEC_HIDDEN; void ME_DumpParaStyle(ME_Paragraph *s) DECLSPEC_HIDDEN; void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) DECLSPEC_HIDDEN; BOOL ME_SetSelectionParaFormat(ME_TextEditor *editor, const PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; @@ -209,6 +207,7 @@ void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_ int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; ME_Run *para_end_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_first_fmt ) DECLSPEC_HIDDEN; void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 7251d1620a6..41debcac1bd 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -654,66 +654,60 @@ ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, return new_para; } -/* join tp with tp->member.para.next_para, keeping tp's style; this - * is consistent with the original */ -ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, - BOOL keepFirstParaFormat) +/* join para with the next para keeping para's style using the paragraph fmt + specified in use_first_fmt */ +ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_first_fmt ) { - ME_DisplayItem *pNext, *pFirstRunInNext, *pRun, *pTmp, *pCell = NULL; + ME_DisplayItem *tmp, *pCell = NULL; + ME_Paragraph *next = para_next( para ); + ME_Run *end_run, *next_first_run, *tmp_run; int i, shift; int end_len; CHARFORMAT2W fmt; ME_Cursor startCur, endCur; ME_String *eol_str; - assert(tp->type == diParagraph); - assert(tp->member.para.next_para); - assert(tp->member.para.next_para->type == diParagraph); + assert( next && para_next( next ) ); /* Clear any cached para numbering following this paragraph */ - if (tp->member.para.fmt.wNumbering) - para_num_clear_list( editor, &tp->member.para, &tp->member.para.fmt ); + if (para->fmt.wNumbering) para_num_clear_list( editor, para, &para->fmt ); - pNext = tp->member.para.next_para; + end_run = para_end_run( para ); + next_first_run = para_first_run( next ); - /* Need to locate end-of-paragraph run here, in order to know end_len */ - pRun = ME_FindItemBack(pNext, diRunOrParagraph); - - assert(pRun); - assert(pRun->type == diRun); - assert(pRun->member.run.nFlags & MERF_ENDPARA); - - end_len = pRun->member.run.len; - eol_str = ME_VSplitString( tp->member.para.text, pRun->member.run.nCharOfs ); - ME_AppendString( tp->member.para.text, pNext->member.para.text->szData, pNext->member.para.text->nLen ); + end_len = end_run->len; + eol_str = ME_VSplitString( para->text, end_run->nCharOfs ); + ME_AppendString( para->text, next->text->szData, next->text->nLen ); /* null char format operation to store the original char format for the ENDPARA run */ ME_InitCharFormat2W(&fmt); - endCur.pPara = pNext; - endCur.pRun = ME_FindItemFwd(pNext, diRun); - endCur.nOffset = 0; - startCur = endCur; - ME_PrevRun(&startCur.pPara, &startCur.pRun, TRUE); + startCur.pPara = para_get_di( para ); + startCur.pRun = run_get_di( end_run ); + endCur.pPara = para_get_di( next ); + endCur.pRun = run_get_di( next_first_run ); + startCur.nOffset = endCur.nOffset = 0; + ME_SetCharFormat(editor, &startCur, &endCur, &fmt); - if (!editor->bEmulateVersion10) { /* v4.1 */ + if (!editor->bEmulateVersion10) /* v4.1 */ + { /* Table cell/row properties are always moved over from the removed para. */ - tp->member.para.nFlags = pNext->member.para.nFlags; - tp->member.para.pCell = pNext->member.para.pCell; + para->nFlags = next->nFlags; + para->pCell = next->pCell; /* Remove cell boundary if it is between the end paragraph run and the next * paragraph display item. */ - for (pTmp = pRun->next; pTmp != pNext; pTmp = pTmp->next) + for (tmp = run_get_di( end_run ); tmp != para_get_di( next ); tmp = tmp->next) { - if (pTmp->type == diCell) + if (tmp->type == diCell) { - pCell = pTmp; + pCell = tmp; break; } } } - add_undo_split_para( editor, &pNext->member.para, eol_str, pCell ? &pCell->member.cell : NULL ); + add_undo_split_para( editor, next, eol_str, pCell ? &pCell->member.cell : NULL ); if (pCell) { @@ -725,63 +719,58 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, ME_DestroyDisplayItem( pCell ); } - if (!keepFirstParaFormat) + if (!use_first_fmt) { - add_undo_set_para_fmt( editor, &tp->member.para ); - tp->member.para.fmt = pNext->member.para.fmt; - tp->member.para.border = pNext->member.para.border; + add_undo_set_para_fmt( editor, para ); + para->fmt = next->fmt; + para->border = next->border; } - shift = pNext->member.para.nCharOfs - tp->member.para.nCharOfs - end_len; - - pFirstRunInNext = ME_FindItemFwd(pNext, diRunOrParagraph); - - assert(pFirstRunInNext->type == diRun); + shift = next->nCharOfs - para->nCharOfs - end_len; /* Update selection cursors so they don't point to the removed end * paragraph run, and point to the correct paragraph. */ - for (i=0; i < editor->nCursors; i++) { - if (editor->pCursors[i].pRun == pRun) { - editor->pCursors[i].pRun = pFirstRunInNext; + for (i = 0; i < editor->nCursors; i++) + { + if (editor->pCursors[i].pRun == run_get_di( end_run )) + { + editor->pCursors[i].pRun = run_get_di( next_first_run ); editor->pCursors[i].nOffset = 0; - } else if (editor->pCursors[i].pPara == pNext) { - editor->pCursors[i].pPara = tp; } + else if (editor->pCursors[i].pPara == para_get_di( next )) + editor->pCursors[i].pPara = para_get_di( para ); } - pTmp = pNext; - do { - pTmp = ME_FindItemFwd(pTmp, diRunOrParagraphOrEnd); - if (pTmp->type != diRun) - break; - TRACE("shifting %s by %d (previous %d)\n", debugstr_run( &pTmp->member.run ), shift, pTmp->member.run.nCharOfs); - pTmp->member.run.nCharOfs += shift; - pTmp->member.run.para = &tp->member.para; - } while(1); + for (tmp_run = next_first_run; tmp_run; tmp_run = run_next( tmp_run )) + { + TRACE( "shifting %s by %d (previous %d)\n", debugstr_run( tmp_run ), shift, tmp_run->nCharOfs ); + tmp_run->nCharOfs += shift; + tmp_run->para = para; + } /* Fix up the para's eop_run ptr */ - tp->member.para.eop_run = pNext->member.para.eop_run; + para->eop_run = next->eop_run; - ME_Remove(pRun); - ME_DestroyDisplayItem(pRun); + ME_Remove( run_get_di( end_run ) ); + ME_DestroyDisplayItem( run_get_di( end_run) ); - if (editor->pLastSelStartPara == pNext) - editor->pLastSelStartPara = tp; - if (editor->pLastSelEndPara == pNext) - editor->pLastSelEndPara = tp; + if (editor->pLastSelStartPara == para_get_di( next )) + editor->pLastSelStartPara = para_get_di( para ); + if (editor->pLastSelEndPara == para_get_di( next )) + editor->pLastSelEndPara = para_get_di( para ); - tp->member.para.next_para = pNext->member.para.next_para; - pNext->member.para.next_para->member.para.prev_para = tp; - ME_Remove(pNext); - destroy_para(editor, pNext); + para->next_para = next->next_para; + next->next_para->member.para.prev_para = para_get_di( para ); + ME_Remove( para_get_di(next) ); + destroy_para( editor, para_get_di( next ) ); - ME_PropagateCharOffset(tp->member.para.next_para, -end_len); + ME_PropagateCharOffset( para->next_para, -end_len ); ME_CheckCharOffsets(editor); editor->nParagraphs--; - para_mark_rewrap( editor, &tp->member.para ); - return tp; + para_mark_rewrap( editor, para ); + return para; } ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *item) { diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 5616c64005a..72e3b74f4c8 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -373,7 +373,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) { ME_Cursor tmp; cursor_from_char_ofs( editor, undo->u.join_paras.pos, &tmp ); - ME_JoinParagraphs(editor, tmp.pPara, TRUE); + para_join( editor, &tmp.pPara->member.para, TRUE ); break; } case undo_split_para:

1 0

Michael Stefaniuc : taskmgr: There's no need to GetProcAddress() IsHungAppWindow().
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: 054be18f75c42d654464888747d377829da5c1c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=054be18f75c42d6544648887… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 15 23:09:39 2020 +0200 taskmgr: There's no need to GetProcAddress() IsHungAppWindow(). It's available since Win2K. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/applpage.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index 5a005290be4..6b2e04077c2 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -238,10 +238,6 @@ static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) HICON hIcon; WCHAR wszText[256]; BOOL bLargeIcon = TaskManagerSettings.View_LargeIcons; - BOOL bHung = FALSE; - typedef int (__stdcall *IsHungAppWindowProc)(HWND); - IsHungAppWindowProc IsHungAppWindow; - /* Skip our window */ if (hWnd == hMainWnd) @@ -270,14 +266,7 @@ static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) if (!hIcon) hIcon = LoadIconW(hInst, bLargeIcon ? MAKEINTRESOURCEW(IDI_WINDOW) : MAKEINTRESOURCEW(IDI_WINDOWSM)); - bHung = FALSE; - - IsHungAppWindow = (IsHungAppWindowProc)(FARPROC)GetProcAddress(GetModuleHandleW(wszUser32), "IsHungAppWindow"); - - if (IsHungAppWindow) - bHung = IsHungAppWindow(hWnd); - - AddOrUpdateHwnd(hWnd, wszText, hIcon, bHung); + AddOrUpdateHwnd(hWnd, wszText, hIcon, IsHungAppWindow(hWnd)); return TRUE; }

1 0

Huw Davies : riched20: Pass a run ptr to, and return a para ptr from, the para splitting function.
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: f758d1effd0869c43ad82910dd3bd2e30f0807f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f758d1effd0869c43ad82910… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 16 12:08:09 2020 +0100 riched20: Pass a run ptr to, and return a para ptr from, the para splitting function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.h | 14 ++++++++------ dlls/riched20/para.c | 38 +++++++++++++++++++------------------- dlls/riched20/table.c | 10 +++++----- dlls/riched20/undo.c | 20 ++++++++++---------- 5 files changed, 43 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f758d1effd0869c43ad8…

1 0

Huw Davies : riched20: Use paragraph and run ptrs in the paragraph splitting function.
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: d3fb8b29c111c3d383e461bf58e305699e10330f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3fb8b29c111c3d383e461bf… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 16 12:08:08 2020 +0100 riched20: Use paragraph and run ptrs in the paragraph splitting function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 98 +++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 50 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 49cf4ad3063..e9246fa7cf7 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -516,12 +516,9 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, ME_Style *style, const WCHAR *eol_str, int eol_len, int paraFlags) { - ME_DisplayItem *next_para = NULL; - ME_DisplayItem *run_para = NULL; - ME_Paragraph *new_para = para_create( editor ); - ME_Run *end_run; + ME_Paragraph *new_para = para_create( editor ), *old_para, *next_para; + ME_Run *end_run, *next_run; int ofs, i; - ME_DisplayItem *pp; int run_flags = MERF_ENDPARA; if (!editor->bEmulateVersion10) { /* v4.1 */ @@ -536,66 +533,67 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, assert(!(paraFlags & (MEPF_CELL|MEPF_ROWSTART|MEPF_ROWEND))); } assert(run->type == diRun); - run_para = ME_GetParagraph(run); - assert(run_para->member.para.fmt.cbSize == sizeof(PARAFORMAT2)); + old_para = &ME_GetParagraph( run )->member.para; + assert( old_para->fmt.cbSize == sizeof(PARAFORMAT2) ); /* Clear any cached para numbering following this paragraph */ - if (run_para->member.para.fmt.wNumbering) - para_num_clear_list( editor, &run_para->member.para, &run_para->member.para.fmt ); + if (old_para->fmt.wNumbering) + para_num_clear_list( editor, old_para, &old_para->fmt ); - new_para->text = ME_VSplitString( run_para->member.para.text, run->member.run.nCharOfs ); + new_para->text = ME_VSplitString( old_para->text, run->member.run.nCharOfs ); end_run = run_create( style, run_flags ); ofs = end_run->nCharOfs = run->member.run.nCharOfs; end_run->len = eol_len; end_run->para = run->member.run.para; - ME_AppendString( run_para->member.para.text, eol_str, eol_len ); - next_para = run_para->member.para.next_para; - assert(next_para == ME_FindItemFwd(run_para, diParagraphOrEnd)); + ME_AppendString( old_para->text, eol_str, eol_len ); + next_para = &old_para->next_para->member.para; - add_undo_join_paras( editor, run_para->member.para.nCharOfs + ofs ); + add_undo_join_paras( editor, old_para->nCharOfs + ofs ); /* Update selection cursors to point to the correct paragraph. */ - for (i = 0; i < editor->nCursors; i++) { - if (editor->pCursors[i].pPara == run_para && + for (i = 0; i < editor->nCursors; i++) + { + if (editor->pCursors[i].pPara == para_get_di( old_para ) && run->member.run.nCharOfs <= editor->pCursors[i].pRun->member.run.nCharOfs) { editor->pCursors[i].pPara = para_get_di( new_para ); } } - /* the new paragraph will have a different starting offset, so let's update its runs */ - pp = run; - while(pp->type == diRun) { - pp->member.run.nCharOfs -= ofs; - pp->member.run.para = new_para; - pp = ME_FindItemFwd(pp, diRunOrParagraphOrEnd); + /* the new paragraph will have a different starting offset, so update its runs */ + for (next_run = &run->member.run; next_run; next_run = run_next( next_run )) + { + next_run->nCharOfs -= ofs; + next_run->para = new_para; } - new_para->nCharOfs = run_para->member.para.nCharOfs + ofs; + + new_para->nCharOfs = old_para->nCharOfs + ofs; new_para->nCharOfs += eol_len; new_para->nFlags = 0; para_mark_rewrap( editor, new_para ); /* FIXME initialize format style and call ME_SetParaFormat blah blah */ - new_para->fmt = run_para->member.para.fmt; - new_para->border = run_para->member.para.border; + new_para->fmt = old_para->fmt; + new_para->border = old_para->border; /* insert paragraph into paragraph double linked list */ - new_para->prev_para = run_para; - new_para->next_para = next_para; - run_para->member.para.next_para = para_get_di( new_para ); - next_para->member.para.prev_para = para_get_di( new_para ); + new_para->prev_para = para_get_di( old_para ); + new_para->next_para = para_get_di( next_para ); + old_para->next_para = para_get_di( new_para ); + next_para->prev_para = para_get_di( new_para ); /* insert end run of the old paragraph, and new paragraph, into DI double linked list */ ME_InsertBefore( run, para_get_di( new_para ) ); ME_InsertBefore( para_get_di( new_para ), run_get_di( end_run ) ); /* Fix up the paras' eop_run ptrs */ - new_para->eop_run = run_para->member.para.eop_run; - run_para->member.para.eop_run = end_run; + new_para->eop_run = old_para->eop_run; + old_para->eop_run = end_run; - if (!editor->bEmulateVersion10) { /* v4.1 */ - if (paraFlags & (MEPF_ROWSTART|MEPF_CELL)) + if (!editor->bEmulateVersion10) /* v4.1 */ + { + if (paraFlags & (MEPF_ROWSTART | MEPF_CELL)) { ME_DisplayItem *cell = ME_MakeDI(diCell); ME_InsertBefore( para_get_di( new_para ), cell ); @@ -603,32 +601,32 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, cell->member.cell.next_cell = NULL; if (paraFlags & MEPF_ROWSTART) { - run_para->member.para.nFlags |= MEPF_ROWSTART; + old_para->nFlags |= MEPF_ROWSTART; cell->member.cell.prev_cell = NULL; - cell->member.cell.parent_cell = run_para->member.para.pCell; - if (run_para->member.para.pCell) - cell->member.cell.nNestingLevel = run_para->member.para.pCell->member.cell.nNestingLevel + 1; + cell->member.cell.parent_cell = old_para->pCell; + if (old_para->pCell) + cell->member.cell.nNestingLevel = old_para->pCell->member.cell.nNestingLevel + 1; else cell->member.cell.nNestingLevel = 1; } else { - cell->member.cell.prev_cell = run_para->member.para.pCell; + cell->member.cell.prev_cell = old_para->pCell; assert(cell->member.cell.prev_cell); cell->member.cell.prev_cell->member.cell.next_cell = cell; - assert(run_para->member.para.nFlags & MEPF_CELL); - assert(!(run_para->member.para.nFlags & MEPF_ROWSTART)); + assert( old_para->nFlags & MEPF_CELL ); + assert( !(old_para->nFlags & MEPF_ROWSTART) ); cell->member.cell.nNestingLevel = cell->member.cell.prev_cell->member.cell.nNestingLevel; cell->member.cell.parent_cell = cell->member.cell.prev_cell->member.cell.parent_cell; } } else if (paraFlags & MEPF_ROWEND) { - run_para->member.para.nFlags |= MEPF_ROWEND; - run_para->member.para.pCell = run_para->member.para.pCell->member.cell.parent_cell; - new_para->pCell = run_para->member.para.pCell; - assert(run_para->member.para.prev_para->member.para.nFlags & MEPF_CELL); - assert(!(run_para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART)); + old_para->nFlags |= MEPF_ROWEND; + old_para->pCell = old_para->pCell->member.cell.parent_cell; + new_para->pCell = old_para->pCell; + assert( old_para->prev_para->member.para.nFlags & MEPF_CELL ); + assert( !(old_para->prev_para->member.para.nFlags & MEPF_ROWSTART) ); if (new_para->pCell != new_para->next_para->member.para.pCell && new_para->next_para->member.para.pCell && !new_para->next_para->member.para.pCell->member.cell.prev_cell) @@ -637,20 +635,20 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, new_para->nFlags |= MEPF_ROWSTART; } } - else new_para->pCell = run_para->member.para.pCell; + else new_para->pCell = old_para->pCell; - table_update_flags( &run_para->member.para ); + table_update_flags( old_para ); table_update_flags( new_para ); } /* force rewrap of the */ - if (run_para->member.para.prev_para->type == diParagraph) - para_mark_rewrap( editor, &run_para->member.para.prev_para->member.para ); + if (old_para->prev_para->type == diParagraph) + para_mark_rewrap( editor, &old_para->prev_para->member.para ); para_mark_rewrap( editor, &new_para->prev_para->member.para ); /* we've added the end run, so we need to modify nCharOfs in the next paragraphs */ - ME_PropagateCharOffset(next_para, eol_len); + ME_PropagateCharOffset( para_get_di( next_para ), eol_len ); editor->nParagraphs++; return para_get_di( new_para );

1 0

Huw Davies : riched20: Return a paragraph ptr from the paragraph creation function.
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: 9b3a538c35628e069a2b7af8439e19cc91e4d66c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b3a538c35628e069a2b7af8… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 16 12:08:07 2020 +0100 riched20: Return a paragraph ptr from the paragraph creation function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 92 +++++++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 2d5072e232e..49cf4ad3063 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -29,14 +29,14 @@ void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ) para_mark_add( editor, para ); } -static ME_DisplayItem *make_para(ME_TextEditor *editor) +static ME_Paragraph *para_create( ME_TextEditor *editor ) { ME_DisplayItem *item = ME_MakeDI(diParagraph); ME_SetDefaultParaFormat(editor, &item->member.para.fmt); item->member.para.nFlags = MEPF_REWRAP; - return item; + return &item->member.para; } void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) @@ -130,7 +130,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) LOGFONTW lf; HFONT hf; ME_TextBuffer *text = editor->pBuffer; - ME_DisplayItem *para = make_para(editor); + ME_Paragraph *para = para_create( editor ); ME_Run *run; ME_Style *style; int eol_len; @@ -175,25 +175,25 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) } eol_len = editor->bEmulateVersion10 ? 2 : 1; - para->member.para.text = ME_MakeStringN( cr_lf, eol_len ); + para->text = ME_MakeStringN( cr_lf, eol_len ); run = run_create( style, MERF_ENDPARA ); run->nCharOfs = 0; run->len = eol_len; - run->para = &para->member.para; - para->member.para.eop_run = run; + run->para = para; + para->eop_run = run; - ME_InsertBefore(text->pLast, para); - ME_InsertBefore(text->pLast, run_get_di( run )); - para->member.para.prev_para = text->pFirst; - para->member.para.next_para = text->pLast; - text->pFirst->member.para.next_para = para; - text->pLast->member.para.prev_para = para; + ME_InsertBefore( text->pLast, para_get_di( para) ); + ME_InsertBefore( text->pLast, run_get_di( run ) ); + para->prev_para = text->pFirst; + para->next_para = text->pLast; + text->pFirst->member.para.next_para = para_get_di( para ); + text->pLast->member.para.prev_para = para_get_di( para ); text->pLast->member.para.nCharOfs = editor->bEmulateVersion10 ? 2 : 1; wine_rb_init( &editor->marked_paras, para_mark_compare ); - para_mark_add( editor, &para->member.para ); + para_mark_add( editor, para ); ME_DestroyContext(&c); } @@ -518,7 +518,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, { ME_DisplayItem *next_para = NULL; ME_DisplayItem *run_para = NULL; - ME_DisplayItem *new_para = make_para(editor); + ME_Paragraph *new_para = para_create( editor ); ME_Run *end_run; int ofs, i; ME_DisplayItem *pp; @@ -543,7 +543,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, if (run_para->member.para.fmt.wNumbering) para_num_clear_list( editor, &run_para->member.para, &run_para->member.para.fmt ); - new_para->member.para.text = ME_VSplitString( run_para->member.para.text, run->member.run.nCharOfs ); + new_para->text = ME_VSplitString( run_para->member.para.text, run->member.run.nCharOfs ); end_run = run_create( style, run_flags ); ofs = end_run->nCharOfs = run->member.run.nCharOfs; @@ -560,7 +560,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, if (editor->pCursors[i].pPara == run_para && run->member.run.nCharOfs <= editor->pCursors[i].pRun->member.run.nCharOfs) { - editor->pCursors[i].pPara = new_para; + editor->pCursors[i].pPara = para_get_di( new_para ); } } @@ -568,38 +568,38 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, pp = run; while(pp->type == diRun) { pp->member.run.nCharOfs -= ofs; - pp->member.run.para = &new_para->member.para; + pp->member.run.para = new_para; pp = ME_FindItemFwd(pp, diRunOrParagraphOrEnd); } - new_para->member.para.nCharOfs = run_para->member.para.nCharOfs + ofs; - new_para->member.para.nCharOfs += eol_len; - new_para->member.para.nFlags = 0; - para_mark_rewrap( editor, &new_para->member.para ); + new_para->nCharOfs = run_para->member.para.nCharOfs + ofs; + new_para->nCharOfs += eol_len; + new_para->nFlags = 0; + para_mark_rewrap( editor, new_para ); /* FIXME initialize format style and call ME_SetParaFormat blah blah */ - new_para->member.para.fmt = run_para->member.para.fmt; - new_para->member.para.border = run_para->member.para.border; + new_para->fmt = run_para->member.para.fmt; + new_para->border = run_para->member.para.border; /* insert paragraph into paragraph double linked list */ - new_para->member.para.prev_para = run_para; - new_para->member.para.next_para = next_para; - run_para->member.para.next_para = new_para; - next_para->member.para.prev_para = new_para; + new_para->prev_para = run_para; + new_para->next_para = next_para; + run_para->member.para.next_para = para_get_di( new_para ); + next_para->member.para.prev_para = para_get_di( new_para ); /* insert end run of the old paragraph, and new paragraph, into DI double linked list */ - ME_InsertBefore(run, new_para); - ME_InsertBefore( new_para, run_get_di( end_run )); + ME_InsertBefore( run, para_get_di( new_para ) ); + ME_InsertBefore( para_get_di( new_para ), run_get_di( end_run ) ); /* Fix up the paras' eop_run ptrs */ - new_para->member.para.eop_run = run_para->member.para.eop_run; + new_para->eop_run = run_para->member.para.eop_run; run_para->member.para.eop_run = end_run; if (!editor->bEmulateVersion10) { /* v4.1 */ if (paraFlags & (MEPF_ROWSTART|MEPF_CELL)) { ME_DisplayItem *cell = ME_MakeDI(diCell); - ME_InsertBefore(new_para, cell); - new_para->member.para.pCell = cell; + ME_InsertBefore( para_get_di( new_para ), cell ); + new_para->pCell = cell; cell->member.cell.next_cell = NULL; if (paraFlags & MEPF_ROWSTART) { @@ -610,7 +610,9 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, cell->member.cell.nNestingLevel = run_para->member.para.pCell->member.cell.nNestingLevel + 1; else cell->member.cell.nNestingLevel = 1; - } else { + } + else + { cell->member.cell.prev_cell = run_para->member.para.pCell; assert(cell->member.cell.prev_cell); cell->member.cell.prev_cell->member.cell.next_cell = cell; @@ -619,37 +621,39 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, cell->member.cell.nNestingLevel = cell->member.cell.prev_cell->member.cell.nNestingLevel; cell->member.cell.parent_cell = cell->member.cell.prev_cell->member.cell.parent_cell; } - } else if (paraFlags & MEPF_ROWEND) { + } + else if (paraFlags & MEPF_ROWEND) + { run_para->member.para.nFlags |= MEPF_ROWEND; run_para->member.para.pCell = run_para->member.para.pCell->member.cell.parent_cell; - new_para->member.para.pCell = run_para->member.para.pCell; + new_para->pCell = run_para->member.para.pCell; assert(run_para->member.para.prev_para->member.para.nFlags & MEPF_CELL); assert(!(run_para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART)); - if (new_para->member.para.pCell != new_para->member.para.next_para->member.para.pCell - && new_para->member.para.next_para->member.para.pCell - && !new_para->member.para.next_para->member.para.pCell->member.cell.prev_cell) + if (new_para->pCell != new_para->next_para->member.para.pCell + && new_para->next_para->member.para.pCell + && !new_para->next_para->member.para.pCell->member.cell.prev_cell) { /* Row starts just after the row that was ended. */ - new_para->member.para.nFlags |= MEPF_ROWSTART; + new_para->nFlags |= MEPF_ROWSTART; } - } else { - new_para->member.para.pCell = run_para->member.para.pCell; } + else new_para->pCell = run_para->member.para.pCell; + table_update_flags( &run_para->member.para ); - table_update_flags( &new_para->member.para ); + table_update_flags( new_para ); } /* force rewrap of the */ if (run_para->member.para.prev_para->type == diParagraph) para_mark_rewrap( editor, &run_para->member.para.prev_para->member.para ); - para_mark_rewrap( editor, &new_para->member.para.prev_para->member.para ); + para_mark_rewrap( editor, &new_para->prev_para->member.para ); /* we've added the end run, so we need to modify nCharOfs in the next paragraphs */ ME_PropagateCharOffset(next_para, eol_len); editor->nParagraphs++; - return new_para; + return para_get_di( new_para ); } /* join tp with tp->member.para.next_para, keeping tp's style; this

1 0

Paul Gofman : wined3d: Add GPU information for NVIDIA GeForce GTX 1080 Mobile.
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: 18d1b2453f5f45ee694a1c4ffaa9e5448e3c3e73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18d1b2453f5f45ee694a1c4f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Oct 15 01:21:53 2020 +0300 wined3d: Add GPU information for NVIDIA GeForce GTX 1080 Mobile. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 108a190bf61..c11fa22cc38 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -441,6 +441,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_KEPLER, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_KEPLER, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080M, "NVIDIA GeForce GTX 1080M", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080TI, "NVIDIA GeForce GTX 1080 Ti", DRIVER_NVIDIA_KEPLER, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_KEPLER, 12288}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANV, "NVIDIA TITAN V", DRIVER_NVIDIA_KEPLER, 12288}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 901c809d875..6d7dcbc91dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2967,6 +2967,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, + CARD_NVIDIA_GEFORCE_GTX1080M = 0x1be0, CARD_NVIDIA_GEFORCE_GTX1080TI = 0x1b06, CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_NVIDIA_TITANV = 0x1d81,

1 0

Michael Stefaniuc : taskmgr: SwitchToThisWindow() is available, remove alternate code path.
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: ef10cd8b6da2ff4a032aebd0f345cdcb8b42d1c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef10cd8b6da2ff4a032aebd0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 15 23:09:40 2020 +0200 taskmgr: SwitchToThisWindow() is available, remove alternate code path. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/applpage.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index 6b2e04077c2..b35881c2323 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -47,8 +47,6 @@ static int nApplicationPageHeight; static HANDLE hApplicationPageEvent = NULL; /* When this event becomes signaled then we refresh the app list */ static BOOL bSortAscending = TRUE; -static const WCHAR wszUser32[] = {'U','S','E','R','3','2','.','D','L','L',0}; - static void ApplicationPageUpdate(void) { /* Enable or disable the "End Task" & "Switch To" buttons */ @@ -743,19 +741,7 @@ void ApplicationPage_OnSwitchTo(void) } } if (pAPLI) { - typedef void (WINAPI *PROCSWITCHTOTHISWINDOW) (HWND, BOOL); - PROCSWITCHTOTHISWINDOW SwitchToThisWindow; - - HMODULE hUser32 = GetModuleHandleW(wszUser32); - SwitchToThisWindow = (PROCSWITCHTOTHISWINDOW)GetProcAddress(hUser32, "SwitchToThisWindow"); - if (SwitchToThisWindow) { - SwitchToThisWindow(pAPLI->hWnd, TRUE); - } else { - if (IsIconic(pAPLI->hWnd)) - ShowWindow(pAPLI->hWnd, SW_RESTORE); - BringWindowToTop(pAPLI->hWnd); - SetForegroundWindow(pAPLI->hWnd); - } + SwitchToThisWindow(pAPLI->hWnd, TRUE); if (TaskManagerSettings.MinimizeOnUse) ShowWindow(hMainWnd, SW_MINIMIZE); }

1 0

Huw Davies : riched20: Pass a paragraph ptr to the table update flags function.
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: wine Branch: master Commit: 77f1894f21a872394e3d92872cbf78e705c8b470 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f1894f21a872394e3d9287… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 16 12:08:06 2020 +0100 riched20: Pass a paragraph ptr to the table update flags function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 431f89faed3..2d5072e232e 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -211,23 +211,20 @@ void ME_MarkAllForWrapping(ME_TextEditor *editor) ME_MarkForWrapping(editor, editor->pBuffer->pFirst->member.para.next_para, editor->pBuffer->pLast); } -static void ME_UpdateTableFlags(ME_DisplayItem *para) +static void table_update_flags( ME_Paragraph *para ) { - para->member.para.fmt.dwMask |= PFM_TABLE|PFM_TABLEROWDELIMITER; - if (para->member.para.pCell) { - para->member.para.nFlags |= MEPF_CELL; - } else { - para->member.para.nFlags &= ~MEPF_CELL; - } - if (para->member.para.nFlags & MEPF_ROWEND) { - para->member.para.fmt.wEffects |= PFE_TABLEROWDELIMITER; - } else { - para->member.para.fmt.wEffects &= ~PFE_TABLEROWDELIMITER; - } - if (para->member.para.nFlags & (MEPF_ROWSTART|MEPF_CELL|MEPF_ROWEND)) - para->member.para.fmt.wEffects |= PFE_TABLE; - else - para->member.para.fmt.wEffects &= ~PFE_TABLE; + para->fmt.dwMask |= PFM_TABLE | PFM_TABLEROWDELIMITER; + + if (para->pCell) para->nFlags |= MEPF_CELL; + else para->nFlags &= ~MEPF_CELL; + + if (para->nFlags & MEPF_ROWEND) para->fmt.wEffects |= PFE_TABLEROWDELIMITER; + else para->fmt.wEffects &= ~PFE_TABLEROWDELIMITER; + + if (para->nFlags & (MEPF_ROWSTART | MEPF_CELL | MEPF_ROWEND)) + para->fmt.wEffects |= PFE_TABLE; + else + para->fmt.wEffects &= ~PFE_TABLE; } static inline BOOL para_num_same_list( const PARAFORMAT2 *item, const PARAFORMAT2 *base ) @@ -638,8 +635,8 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, } else { new_para->member.para.pCell = run_para->member.para.pCell; } - ME_UpdateTableFlags(run_para); - ME_UpdateTableFlags(new_para); + table_update_flags( &run_para->member.para ); + table_update_flags( &new_para->member.para ); } /* force rewrap of the */

1 0

Zebediah Figura : vkd3d-shader: Avoid reading past the end of the buffer in vkd3d_shader_trace() (Valgrind).
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: vkd3d Branch: master Commit: 86cf5145dc58b00b7311c4f3651601233024fb8e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=86cf5145dc58b00b7311c4f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 15 10:44:44 2020 -0500 vkd3d-shader: Avoid reading past the end of the buffer in vkd3d_shader_trace() (Valgrind). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 9b49ca1..e9c462e 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1618,16 +1618,17 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code void vkd3d_shader_trace(void *data) { - const char *p, *q; + const char *p, *q, *end; struct vkd3d_shader_code code; if (vkd3d_dxbc_binary_to_text(data, &code) != VKD3D_OK) return; - for (p = code.code; *p; p = q) + end = (const char *)code.code + code.size; + for (p = code.code; p < end; p = q) { - if (!(q = strstr(p, "\n"))) - q = p + strlen(p); + if (!(q = memchr(p, '\n', end - p))) + q = end; else ++q; TRACE(" %.*s", (int)(q - p), p);

1 0

Zebediah Figura : vkd3d-shader: Avoid reading past the end of the buffer in vkd3d_string_buffer_trace() (Valgrind).
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: vkd3d Branch: master Commit: dffff8bdbc97acbbaab8bd0e860190ea4987984c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dffff8bdbc97acbbaab8bd0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 15 10:44:45 2020 -0500 vkd3d-shader: Avoid reading past the end of the buffer in vkd3d_string_buffer_trace() (Valgrind). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 7c3885e..664110e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -93,15 +93,15 @@ static int VKD3D_PRINTF_FUNC(2, 3) vkd3d_string_buffer_printf(struct vkd3d_strin static void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function) { - const char *p, *q; + const char *p, *q, *end = buffer->buffer + buffer->content_size; if (!TRACE_ON()) return; - for (p = buffer->buffer; *p; p = q) + for (p = buffer->buffer; p < end; p = q) { - if (!(q = strchr(p, '\n'))) - q = p + strlen(p); + if (!(q = memchr(p, '\n', end - p))) + q = end; else ++q; vkd3d_dbg_printf(VKD3D_DBG_LEVEL_TRACE, function, "%.*s", (int)(q - p), p);

1 0

Zebediah Figura : include: Clarify that struct vkd3d_shader_code is not null-terminated.
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: vkd3d Branch: master Commit: 5d9398e10ca38df956e746d4ee51f6c71d56819a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5d9398e10ca38df956e746d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 15 15:24:32 2020 -0500 include: Clarify that struct vkd3d_shader_code is not null-terminated. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7b95896..74e2eb0 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -155,7 +155,13 @@ enum vkd3d_shader_visibility /** A generic structure containing a GPU shader, in text or byte-code format. */ struct vkd3d_shader_code { - /** Pointer to the code. */ + /** + * Pointer to the code. Note that textual formats are not null-terminated. + * Therefore \a size should not include a null terminator, when this + * structure is passed as input to a vkd3d-shader function, and the + * allocated string will not include a null terminator when this structure + * is used as output. + */ const void *code; /** Size of \a code, in bytes. */ size_t size;

1 0

Zebediah Figura : vkd3d-shader: Adjust the API for struct vkd3d_shader_macro.
by Alexandre Julliard Oct. 16, 2020

Oct. 16, 2020

Module: vkd3d Branch: master Commit: 1c2344818d433adc2d2d88379611544770cef2bc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1c2344818d433adc2d2d883… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 15 15:27:25 2020 -0500 vkd3d-shader: Adjust the API for struct vkd3d_shader_macro. To more closely match the behaviour of D3D_SHADER_MACRO. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 74e2eb0..03225d3 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -635,12 +635,16 @@ struct vkd3d_shader_spirv_domain_shader_target_info struct vkd3d_shader_macro { /** - * A null-terminated string containing the name of a macro. This macro must - * not be a parameterized (i.e. function-like) macro. If this field is not a - * valid macro identifier, it will be ignored. + * Pointer to a null-terminated string containing the name of a macro. This + * macro must not be a parameterized (i.e. function-like) macro. If this + * field is not a valid macro identifier, this macro will be ignored. */ const char *name; - /** A null-terminated string containing the expansion of the macro. */ + /** + * Optional pointer to a null-terminated string containing the expansion of + * the macro. This field may be set to NULL, in which case the macro has an + * empty expansion. + */ const char *value; }; @@ -713,7 +717,7 @@ struct vkd3d_shader_preprocess_info * be expanded as if a corresponding #define statement were prepended to the * source code. * - * If the same macro is specified multiple times, only the first value is + * If the same macro is specified multiple times, only the last value is * used. */ const struct vkd3d_shader_macro *macros;

1 0

Jacek Caban : conhost: Remove no longer needed non-blocking IOCTL_CONDRV_READ_INPUT.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 01c17ca26027d055c5e983c8d76d60647bf7f24d URL: https://source.winehq.org/git/wine.git/?a=commit;h=01c17ca26027d055c5e983c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:59 2020 +0200 conhost: Remove no longer needed non-blocking IOCTL_CONDRV_READ_INPUT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 3 +-- programs/conhost/conhost.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 345241a44fd..2b3c6c3315a 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1373,8 +1373,7 @@ BOOL WINAPI ReadConsoleInputA( HANDLE handle, INPUT_RECORD *buffer, DWORD length */ BOOL WINAPI ReadConsoleInputW( HANDLE handle, INPUT_RECORD *buffer, DWORD length, DWORD *count ) { - int blocking = 1; - if (!console_ioctl( handle, IOCTL_CONDRV_READ_INPUT, &blocking, sizeof(blocking), + if (!console_ioctl( handle, IOCTL_CONDRV_READ_INPUT, NULL, 0, buffer, length * sizeof(*buffer), count )) return FALSE; *count /= sizeof(*buffer); diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 8fb28e18ba9..3b4255ea310 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2358,11 +2358,9 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, case IOCTL_CONDRV_READ_INPUT: { - unsigned int blocking; - if (in_size && in_size != sizeof(blocking)) return STATUS_INVALID_PARAMETER; + if (in_size) return STATUS_INVALID_PARAMETER; ensure_tty_input_thread( console ); - blocking = in_size && *(unsigned int *)in_data; - if (blocking && !console->record_count && *out_size) + if (!console->record_count && *out_size) { TRACE( "pending read\n" ); console->read_ioctl = IOCTL_CONDRV_READ_INPUT;

1 0

Austin English : qedit: Add a version resource.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: c130054120cffe595e21f43d5e7d2202f23c91a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c130054120cffe595e21f43d… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 14 03:36:22 2020 -0500 qedit: Add a version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/Makefile.in | 2 ++ dlls/qedit/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in index 4891328c7a9..4eb57322f5e 100644 --- a/dlls/qedit/Makefile.in +++ b/dlls/qedit/Makefile.in @@ -11,3 +11,5 @@ C_SRCS = \ timeline.c IDL_SRCS = qedit_classes.idl + +RC_SRCS = version.rc diff --git a/dlls/qedit/version.rc b/dlls/qedit/version.rc new file mode 100644 index 00000000000..dd5f3ccbc7f --- /dev/null +++ b/dlls/qedit/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine qedit" +#define WINE_FILENAME_STR "qedit.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Jacek Caban : kernel32: Move FlushConsoleInputBuffer to kernelbase.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: ea8fa3174cba57df1120438724ddb8d41442c2ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea8fa3174cba57df11204387… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:49 2020 +0200 kernel32: Move FlushConsoleInputBuffer to kernelbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 9 --------- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/console.c | 9 +++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index f9d24f5c885..4b74c1183ca 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -148,15 +148,6 @@ HANDLE WINAPI GetConsoleInputWaitHandle(void) } -/*********************************************************************** - * FlushConsoleInputBuffer (KERNEL32.@) - */ -BOOL WINAPI FlushConsoleInputBuffer( HANDLE handle ) -{ - return DeviceIoControl( handle, IOCTL_CONDRV_FLUSH, NULL, 0, NULL, 0, NULL, NULL ); -} - - /*********************************************************************** * SetConsoleTitleA (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 08a64955123..79964c7a9b3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -517,7 +517,7 @@ @ stdcall -import FlsFree(long) @ stdcall -import FlsGetValue(long) @ stdcall -import FlsSetValue(long ptr) -@ stdcall FlushConsoleInputBuffer(long) +@ stdcall -import FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) KERNEL32_FlushFileBuffers @ stdcall -import FlushInstructionCache(long long long) @ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index d073b77eaa3..345241a44fd 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1704,6 +1704,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleW( HANDLE handle, const void *buffer, } +/*********************************************************************** + * FlushConsoleInputBuffer (kernelbase.@) + */ +BOOL WINAPI FlushConsoleInputBuffer( HANDLE handle ) +{ + return console_ioctl( handle, IOCTL_CONDRV_FLUSH, NULL, 0, NULL, 0, NULL ); +} + + /*********************************************************************** * Beep (kernelbase.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e55194f2041..9c7babde7fd 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -381,7 +381,7 @@ @ stdcall FlsFree(long) @ stdcall FlsGetValue(long) @ stdcall FlsSetValue(long ptr) -@ stdcall FlushConsoleInputBuffer(long) kernel32.FlushConsoleInputBuffer +@ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) @ stdcall FlushInstructionCache(long long long) @ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers

1 0

Damjan Jovanovic : riched20: Implement ITextRange/ITextSelection Copy and Cut.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: aa1ef09fefafd785b21bfe458da45df0521c0057 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa1ef09fefafd785b21bfe45… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Oct 15 10:39:42 2020 +0100 riched20: Implement ITextRange/ITextSelection Copy and Cut. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 84 ++++++++++++++++++++++++++----------------- dlls/riched20/editor.h | 2 ++ dlls/riched20/richole.c | 51 +++++++++++++++++++++----- dlls/riched20/tests/richole.c | 74 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 170 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa1ef09fefafd785b21b…

1 0

Huw Davies : riched20: Simplify the char offset from run offset function.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 120ee0de1b1d947e96ec3b5290b5f5212f9c4cff URL: https://source.winehq.org/git/wine.git/?a=commit;h=120ee0de1b1d947e96ec3b52… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 15 10:39:39 2020 +0100 riched20: Simplify the char offset from run offset function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 6 +++--- dlls/riched20/editor.h | 2 +- dlls/riched20/run.c | 13 +++++-------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 30441658311..d9bcea84f74 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4322,15 +4322,15 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } cursor_from_char_ofs( editor, wParam, &cursor ); item = ME_RowStart( cursor.pRun ); - nThisLineOfs = ME_CharOfsFromRunOfs( editor, cursor.pPara, ME_FindItemFwd( item, diRun ), 0 ); + nThisLineOfs = run_char_ofs( &ME_FindItemFwd( item, diRun )->member.run, 0 ); item_end = ME_FindItemFwd(item, diStartRowOrParagraphOrEnd); if (item_end->type == diStartRow) - nNextLineOfs = ME_CharOfsFromRunOfs(editor, cursor.pPara, ME_FindItemFwd( item_end, diRun ), 0); + nNextLineOfs = run_char_ofs( &ME_FindItemFwd( item_end, diRun )->member.run, 0 ); else { ME_DisplayItem *endRun = ME_FindItemBack(item_end, diRun); assert(endRun && endRun->member.run.nFlags & MERF_ENDPARA); - nNextLineOfs = item_end->member.para.nCharOfs - endRun->member.run.len; + nNextLineOfs = run_char_ofs( &endRun->member.run, 0 ); } nChars = nNextLineOfs - nThisLineOfs; TRACE("EM_LINELENGTH(%ld)==%d\n", wParam, nChars); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 163be9c8179..0503a671ea1 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -120,6 +120,7 @@ int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; /* run.c */ void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ) DECLSPEC_HIDDEN; +int run_char_ofs( ME_Run *run, int ofs ) DECLSPEC_HIDDEN; ME_Run *run_create( ME_Style *s, int nFlags ) DECLSPEC_HIDDEN; ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags ) DECLSPEC_HIDDEN; @@ -140,7 +141,6 @@ ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx, int *pAscent, int *pDescent) DECLSPEC_HIDDEN; -int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, const ME_DisplayItem *pRun, int nOfs) DECLSPEC_HIDDEN; void ME_SkipAndPropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 92d0721247c..22a5db8610b 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -187,18 +187,15 @@ void ME_CheckCharOffsets(ME_TextEditor *editor) } /****************************************************************************** - * ME_CharOfsFromRunOfs + * run_char_ofs * - * Converts a character position relative to the start of the run, to a + * Converts a character position relative to the start of the run to a * character position relative to the start of the document. - * Kind of a "local to global" offset conversion. */ -int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, - const ME_DisplayItem *pRun, int nOfs) + +int run_char_ofs( ME_Run *run, int ofs ) { - assert(pRun && pRun->type == diRun); - assert(pPara && pPara->type == diParagraph); - return pPara->member.para.nCharOfs + pRun->member.run.nCharOfs + nOfs; + return run->para->nCharOfs + run->nCharOfs + ofs; } /******************************************************************************

1 0

Nikolay Sivov : evr/tests: Add a mixer tests for clearing output in idle state.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: d91a82ac8db314ff8c04544bf0402434e218b8f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d91a82ac8db314ff8c04544b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 15 16:19:55 2020 +0300 evr/tests: Add a mixer tests for clearing output in idle state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 100 insertions(+), 3 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index d0e39cb47c9..9124109c07f 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1994,16 +1994,82 @@ static void test_mixer_zorder(void) IMFTransform_Release(mixer); } +static IDirect3DSurface9 * create_surface(IDirect3DDeviceManager9 *manager, unsigned int width, + unsigned int height) +{ + IDirectXVideoAccelerationService *service; + IDirect3DSurface9 *surface = NULL; + IDirect3DDevice9 *device; + HANDLE handle; + HRESULT hr; + + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_LockDevice(manager, handle, &device, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, + (void **)&service); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirectXVideoAccelerationService_CreateSurface(service, width, height, 0, D3DFMT_A8R8G8B8, + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDirectXVideoAccelerationService_Release(service); + + hr = IDirect3DDevice9_ColorFill(device, surface, NULL, D3DCOLOR_ARGB(0x10, 0xff, 0x00, 0x00)); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDirect3DDevice9_Release(device); + + hr = IDirect3DDeviceManager9_UnlockDevice(manager, handle, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + return surface; +} + +/* Format is assumed as 32bpp */ +static DWORD get_surface_color(IDirect3DSurface9 *surface, unsigned int x, unsigned int y) +{ + D3DLOCKED_RECT locked_rect = { 0 }; + D3DSURFACE_DESC desc; + DWORD *row, color; + HRESULT hr; + + hr = IDirect3DSurface9_GetDesc(surface, &desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(x < desc.Width && y < desc.Height, "Invalid coordinate.\n"); + if (x >= desc.Width || y >= desc.Height) return 0; + + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + row = (DWORD *)((char *)locked_rect.pBits + y * locked_rect.Pitch); + color = row[x]; + + hr = IDirect3DSurface9_UnlockRect(surface); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + return color; +} + static void test_mixer_samples(void) { IDirect3DDeviceManager9 *manager; MFT_OUTPUT_DATA_BUFFER buffer; + IDirect3DSurface9 *surface; + IMFDesiredSample *desired; IDirect3DDevice9 *device; IMFMediaType *video_type; + DWORD color, status; IMFTransform *mixer; IMFSample *sample; IDirect3D9 *d3d; - DWORD status; HWND window; UINT token; HRESULT hr; @@ -2030,8 +2096,6 @@ static void test_mixer_samples(void) hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)manager); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IDirect3DDeviceManager9_Release(manager); - video_type = create_video_type(&MFVideoFormat_RGB32); hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480); @@ -2052,6 +2116,7 @@ static void test_mixer_samples(void) todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + /* It needs a sample with a backing surface. */ hr = MFCreateSample(&sample); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -2062,9 +2127,41 @@ todo_wine IMFSample_Release(sample); + surface = create_surface(manager, 64, 64); + + hr = MFCreateVideoSampleFromSurface((IUnknown *)surface, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&desired); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + buffer.pSample = sample; + hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); +todo_wine + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "Unexpected hr %#x.\n", hr); + + color = get_surface_color(surface, 0, 0); + ok(color == D3DCOLOR_ARGB(0x10, 0xff, 0x00, 0x00), "Unexpected color %#x.\n", color); + + /* Streaming is not started yet. Output is colored black, but only if desired timestamps were set. */ + IMFDesiredSample_SetDesiredSampleTimeAndDuration(desired, 100, 0); + + hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + color = get_surface_color(surface, 0, 0); +todo_wine + ok(!color, "Unexpected color %#x.\n", color); + + IMFSample_Release(sample); + + IDirect3DSurface9_Release(surface); + IMFTransform_Release(mixer); IDirect3DDevice9_Release(device); + IDirect3DDeviceManager9_Release(manager); done: IDirect3D9_Release(d3d);

1 0

Jacek Caban : kernelbase: Move console code page validation to conhost.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 1d8c2d28cb2ec313d1b5c1f762624be776a3dca7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d8c2d28cb2ec313d1b5c1f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:20:09 2020 +0200 kernelbase: Move console code page validation to conhost. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 16 ++-------------- programs/conhost/conhost.c | 6 ++++++ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 2b3c6c3315a..d387b49c534 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -637,7 +637,7 @@ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleCP(void) if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL )) return 0; - return info.input_cp ? info.input_cp : GetOEMCP(); + return info.input_cp; } @@ -710,7 +710,7 @@ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleOutputCP(void) if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL )) return 0; - return info.output_cp ? info.output_cp : GetOEMCP(); + return info.output_cp; } @@ -1092,12 +1092,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCP( UINT cp ) { struct condrv_input_info_params params = { SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE }; - if (!IsValidCodePage( cp )) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - params.info.input_cp = cp; return console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_SET_INPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); @@ -1237,12 +1231,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleOutputCP( UINT cp ) { struct condrv_input_info_params params = { SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE }; - if (!IsValidCodePage( cp )) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - params.info.output_cp = cp; return console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_SET_INPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 3b4255ea310..6985a9ca0b0 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2407,9 +2407,15 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, TRACE( "set info\n" ); if (in_size != sizeof(*params) || *out_size) return STATUS_INVALID_PARAMETER; if (params->mask & SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE) + { + if (!IsValidCodePage( params->info.input_cp )) return STATUS_INVALID_PARAMETER; console->input_cp = params->info.input_cp; + } if (params->mask & SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE) + { + if (!IsValidCodePage( params->info.output_cp )) return STATUS_INVALID_PARAMETER; console->output_cp = params->info.output_cp; + } return STATUS_SUCCESS; }

1 0

Nikolay Sivov : mf/evr: Add attributes store for the sink.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: f0c2b0d2fcd20490d806357f3c14083717552f0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0c2b0d2fcd20490d806357f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 15 16:19:53 2020 +0300 mf/evr: Add attributes store for the sink. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 353 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 12 ++ 2 files changed, 365 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0c2b0d2fcd20490d806…

1 0

Alistair Leslie-Hughes : sapi: Return a default token in ISpVoice::GetVoice
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 6eaa2d2df2a17a8b24d46e1224abd9df5b07d9b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eaa2d2df2a17a8b24d46e12… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 15 20:39:55 2020 +1100 sapi: Return a default token in ISpVoice::GetVoice GetVoice returns a default voice when one is not active. This stops a crash on startup with Scrivener. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 584c3d56b70..77e54e079ac 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -561,7 +561,7 @@ static HRESULT WINAPI spvoice_GetVoice(ISpVoice *iface, ISpObjectToken **token) { FIXME("(%p, %p): stub.\n", iface, token); - return E_NOTIMPL; + return token_create(NULL, &IID_ISpObjectToken, (void **)token); } static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWORD flags, ULONG *number)

1 0

Huw Davies : riched20: Remove InternalInsertTextFromCursor().
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: fe0a7a78db232f1d8cac35732eca86e0ee895b51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe0a7a78db232f1d8cac3573… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 15 10:39:40 2020 +0100 riched20: Remove InternalInsertTextFromCursor(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 110 ++++++++++++++++++++++---------------------------- 1 file changed, 49 insertions(+), 61 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index d66dd57383b..4764dec8f33 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -460,20 +460,6 @@ BOOL ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars) nChars, FALSE); } -static ME_DisplayItem * -ME_InternalInsertTextFromCursor(ME_TextEditor *editor, int nCursor, - const WCHAR *str, int len, ME_Style *style, - int flags) -{ - ME_Cursor *p = &editor->pCursors[nCursor]; - - editor->bCaretAtEnd = FALSE; - - assert(p->pRun->type == diRun); - - return run_get_di( run_insert( editor, p, style, str, len, flags ) ); -} - static struct re_object* create_re_object(const REOBJECT *reo) { struct re_object *reobj = heap_alloc(sizeof(*reobj)); @@ -489,96 +475,98 @@ static struct re_object* create_re_object(const REOBJECT *reo) void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCursor) { - ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); - ME_DisplayItem *di; - WCHAR space = ' '; - ME_DisplayItem *di_prev = NULL; - struct re_object *reobj_prev = NULL; - + ME_Style *style = ME_GetInsertStyle( editor, nCursor ); + ME_Run *run, *prev; + const WCHAR space = ' '; + struct re_object *reobj_prev = NULL; + ME_Cursor *cursor = editor->pCursors + nCursor; + /* FIXME no no no */ if (ME_IsSelection(editor)) ME_DeleteSelection(editor); - di = ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, - MERF_GRAPHICS); - di->member.run.reobj = create_re_object(reo); + run = run_insert( editor, cursor, style, &space, 1, MERF_GRAPHICS ); + editor->bCaretAtEnd = FALSE; + + run->reobj = create_re_object( reo ); - di_prev = di; - while (ME_PrevRun(NULL, &di_prev, TRUE)) + prev = run; + while ((prev = run_prev_all_paras( prev ))) { - if (di_prev->member.run.reobj) + if (prev->reobj) { - reobj_prev = di_prev->member.run.reobj; + reobj_prev = prev->reobj; break; } } if (reobj_prev) - list_add_after(&reobj_prev->entry, &di->member.run.reobj->entry); + list_add_after(&reobj_prev->entry, &run->reobj->entry); else - list_add_head(&editor->reobj_list, &di->member.run.reobj->entry); + list_add_head(&editor->reobj_list, &run->reobj->entry); - ME_ReleaseStyle(pStyle); + ME_ReleaseStyle( style ); } void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor) { - ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); - WCHAR space = ' '; + ME_Style *style = ME_GetInsertStyle( editor, nCursor ); + const WCHAR space = ' '; + ME_Cursor *cursor = editor->pCursors + nCursor; /* FIXME no no no */ if (ME_IsSelection(editor)) ME_DeleteSelection(editor); - ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, - MERF_ENDROW); - ME_ReleaseStyle(pStyle); + run_insert( editor, cursor, style, &space, 1, MERF_ENDROW ); + editor->bCaretAtEnd = FALSE; + + ME_ReleaseStyle( style ); } void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, - const WCHAR *str, int len, ME_Style *style) + const WCHAR *str, int len, ME_Style *style) { const WCHAR *pos; - ME_Cursor *p = NULL; + ME_Cursor *cursor = editor->pCursors + nCursor; int oldLen; /* FIXME really HERE ? */ if (ME_IsSelection(editor)) ME_DeleteSelection(editor); - /* FIXME: is this too slow? */ - /* Didn't affect performance for WM_SETTEXT (around 50sec/30K) */ oldLen = ME_GetTextLength(editor); /* text operations set modified state */ editor->nModifyStep = 1; + editor->bCaretAtEnd = FALSE; assert(style); - assert(nCursor>=0 && nCursor<editor->nCursors); - if (len == -1) - len = lstrlenW(str); + if (len == -1) len = lstrlenW( str ); /* grow the text limit to fit our text */ - if(editor->nTextLimit < oldLen +len) - editor->nTextLimit = oldLen + len; + if (editor->nTextLimit < oldLen + len) editor->nTextLimit = oldLen + len; pos = str; while (len) { /* FIXME this sucks - no respect for unicode (what else can be a line separator in unicode?) */ - while(pos - str < len && *pos != '\r' && *pos != '\n' && *pos != '\t') + while (pos - str < len && *pos != '\r' && *pos != '\n' && *pos != '\t') pos++; - if (pos != str) { /* handle text */ - ME_InternalInsertTextFromCursor(editor, nCursor, str, pos-str, style, 0); - } else if (*pos == '\t') { /* handle tabs */ - WCHAR tab = '\t'; - ME_InternalInsertTextFromCursor(editor, nCursor, &tab, 1, style, MERF_TAB); + if (pos != str) /* handle text */ + run_insert( editor, cursor, style, str, pos - str, 0 ); + else if (*pos == '\t') /* handle tabs */ + { + const WCHAR tab = '\t'; + run_insert( editor, cursor, style, &tab, 1, MERF_TAB ); pos++; - } else { /* handle EOLs */ + } + else /* handle EOLs */ + { ME_Run *end_run, *run, *prev; ME_Paragraph *new_para; int eol_len = 0; @@ -596,7 +584,9 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, eol_len = 3; else eol_len = 1; - } else { + } + else + { assert(*pos == '\n'); eol_len = 1; } @@ -605,8 +595,8 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, if (!editor->bEmulateVersion10 && eol_len == 3) { /* handle special \r\r\n sequence (richedit 2.x and higher only) */ - WCHAR space = ' '; - ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, style, 0); + const WCHAR space = ' '; + run_insert( editor, cursor, style, &space, 1, 0 ); } else { @@ -618,17 +608,15 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, eol_len = 1; } - p = &editor->pCursors[nCursor]; - - if (p->nOffset == p->pRun->member.run.len) + if (cursor->nOffset == cursor->pRun->member.run.len) { - run = run_next( &p->pRun->member.run ); - if (!run) run = &p->pRun->member.run; + run = run_next( &cursor->pRun->member.run ); + if (!run) run = &cursor->pRun->member.run; } else { - if (p->nOffset) run_split( editor, p ); - run = &p->pRun->member.run; + if (cursor->nOffset) run_split( editor, cursor ); + run = &cursor->pRun->member.run; } new_para = &ME_SplitParagraph( editor, run_get_di( run ), style, eol_str, eol_len, 0 )->member.para;

1 0

Austin English : qasf: Add a version resource.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 1737a7878f034534fb8eb908e6940cffe55494b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1737a7878f034534fb8eb908… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 14 03:38:41 2020 -0500 qasf: Add a version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/Makefile.in | 2 ++ dlls/qasf/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/qasf/Makefile.in b/dlls/qasf/Makefile.in index 39239d38aea..928bf04d80e 100644 --- a/dlls/qasf/Makefile.in +++ b/dlls/qasf/Makefile.in @@ -10,3 +10,5 @@ C_SRCS = \ IDL_SRCS = \ qasf_classes.idl + +RC_SRCS = version.rc diff --git a/dlls/qasf/version.rc b/dlls/qasf/version.rc new file mode 100644 index 00000000000..dab46194395 --- /dev/null +++ b/dlls/qasf/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine qasf" +#define WINE_FILENAME_STR "qasf.dll" +#define WINE_FILEVERSION 9,0,0,4503 +#define WINE_FILEVERSION_STR "9.0.0.4503" +#define WINE_PRODUCTVERSION 9,0,0,4503 +#define WINE_PRODUCTVERSION_STR "9.0.0.4503" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : dsdmo: Add a version resource.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 8a70e7eba178614ccaa992bf5551d5986dd0d953 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a70e7eba178614ccaa992bf… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 14 03:39:27 2020 -0500 dsdmo: Add a version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/Makefile.in | 2 ++ dlls/dsdmo/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in index d184b025ad0..d86dbbd804a 100644 --- a/dlls/dsdmo/Makefile.in +++ b/dlls/dsdmo/Makefile.in @@ -8,3 +8,5 @@ C_SRCS = \ IDL_SRCS = \ dsdmo.idl + +RC_SRCS = version.rc diff --git a/dlls/dsdmo/version.rc b/dlls/dsdmo/version.rc new file mode 100644 index 00000000000..77cc1728fbf --- /dev/null +++ b/dlls/dsdmo/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dsdmo" +#define WINE_FILENAME_STR "dsdmo.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Jacek Caban : kernel32: Import FlushFileBuffers from kernelbase.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 7fe55d2f7a66d60f3bf4890f59311920f1cc3608 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fe55d2f7a66d60f3bf4890f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:53 2020 +0200 kernel32: Import FlushFileBuffers 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 | 14 -------------- dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 4ba80a624d8..dfedb443412 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -319,20 +319,6 @@ BOOL WINAPI KERNEL32_WriteFile( HANDLE file, LPCVOID buffer, DWORD count, } -/************************************************************************* - * FlushFileBuffers (KERNEL32.@) - */ -BOOL WINAPI KERNEL32_FlushFileBuffers( HANDLE file ) -{ - IO_STATUS_BLOCK iosb; - - /* this will fail (as expected) for an output handle */ - if (is_console_handle( file )) return FlushConsoleInputBuffer( file ); - - return set_ntstatus( NtFlushBuffersFile( file, &iosb )); -} - - /*********************************************************************** * DosDateTimeToFileTime (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 79964c7a9b3..5508a10f9a0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -518,7 +518,7 @@ @ stdcall -import FlsGetValue(long) @ stdcall -import FlsSetValue(long ptr) @ stdcall -import FlushConsoleInputBuffer(long) -@ stdcall FlushFileBuffers(long) KERNEL32_FlushFileBuffers +@ stdcall -import FlushFileBuffers(long) @ stdcall -import FlushInstructionCache(long long long) @ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers @ stdcall -import FlushViewOfFile(ptr long)

1 0

Dmitry Timoshkov : advapi32/tests: Add QueryServiceStatusEx test for the EventLog service.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: de679af492ed93d70c99dff7f7cfc01cc8f25eb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de679af492ed93d70c99dff7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 29 19:28:52 2020 +0300 advapi32/tests: Add QueryServiceStatusEx test for the EventLog service. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 22 ++++++++++++++++++++++ include/winsvc.h | 3 +++ 2 files changed, 25 insertions(+) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 817d0cb9ab0..d216e096207 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2684,6 +2684,7 @@ static void test_EventLog(void) DWORD size; BOOL ret; QUERY_SERVICE_CONFIGA *config; + SERVICE_STATUS_PROCESS status; scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_READ); ok(scm_handle != NULL, "OpenSCManager error %u\n", GetLastError()); @@ -2719,6 +2720,27 @@ todo_wine HeapFree(GetProcessHeap(), 0, config); + memset(&status, 0, sizeof(status)); + size = sizeof(status); + ret = QueryServiceStatusEx(svc_handle, SC_STATUS_PROCESS_INFO, (BYTE *)&status, size, &size); + ok(ret, "QueryServiceStatusEx error %u\n", GetLastError()); + ok(status.dwServiceType == SERVICE_WIN32_SHARE_PROCESS || + status.dwServiceType == (SERVICE_WIN32_SHARE_PROCESS | SERVICE_WIN32_OWN_PROCESS) /* Win10 */, + "got %#x\n", status.dwServiceType); + ok(status.dwCurrentState == SERVICE_RUNNING, "got %#x\n", status.dwCurrentState); +todo_wine + ok(status.dwControlsAccepted == SERVICE_ACCEPT_SHUTDOWN /* XP */ || + status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN) /* 2008 */ || + status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_TIMECHANGE | SERVICE_ACCEPT_SHUTDOWN), + "got %#x\n", status.dwControlsAccepted); + ok(status.dwWin32ExitCode == 0, "got %#x\n", status.dwWin32ExitCode); + ok(status.dwServiceSpecificExitCode == 0, "got %#x\n", status.dwServiceSpecificExitCode); + ok(status.dwCheckPoint == 0, "got %#x\n", status.dwCheckPoint); + ok(status.dwWaitHint == 0, "got %#x\n", status.dwWaitHint); + ok(status.dwProcessId != 0, "got %#x\n", status.dwProcessId); + ok(status.dwServiceFlags == 0 || status.dwServiceFlags == SERVICE_RUNS_IN_SYSTEM_PROCESS /* XP */, + "got %#x\n", status.dwServiceFlags); + CloseServiceHandle(svc_handle); CloseServiceHandle(scm_handle); } diff --git a/include/winsvc.h b/include/winsvc.h index aa5e9f1ae88..768ba5bf9b8 100644 --- a/include/winsvc.h +++ b/include/winsvc.h @@ -85,6 +85,8 @@ static const WCHAR SERVICES_FAILED_DATABASEW[] = { 'S','e','r','v','i','c','e',' #define SERVICE_ACCEPT_POWEREVENT 0x00000040 #define SERVICE_ACCEPT_SESSIONCHANGE 0x00000080 #define SERVICE_ACCEPT_PRESHUTDOWN 0x00000100 +#define SERVICE_ACCEPT_TIMECHANGE 0x00000200 +#define SERVICE_ACCEPT_TRIGGEREVENT 0x00000400 /* Service Control Manager Object access types */ #define SC_MANAGER_CONNECT 0x0001 @@ -124,6 +126,7 @@ static const WCHAR SERVICES_FAILED_DATABASEW[] = { 'S','e','r','v','i','c','e',' #define SERVICE_NO_CHANGE 0xffffffff +#define SERVICE_RUNS_IN_SYSTEM_PROCESS 0x00000001 /* Handle types */

1 0

Aaron Hill : cmd: Set errorlevel to 0 when 'call' is invoked with an empty string.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 8e54cad6a15b3901a748fa228d1a7e456911b9ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e54cad6a15b3901a748fa22… Author: Aaron Hill <aa1ronham(a)gmail.com> Date: Mon Oct 12 17:36:05 2020 -0400 cmd: Set errorlevel to 0 when 'call' is invoked with an empty string. Previously, invoking 'call' with an empty string would leave errorlevel unchanged. Reset errorlevel to 0 to match the behavior of the Windows 'cmd.exe'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49982 Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 3 +++ programs/cmd/wcmdmain.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 73b0917c275..c7418b759e4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -3149,6 +3149,9 @@ echo %ErrorLevel% should be 7 if errorlevel 7 echo setting var worked too well, bad call :setError 3 echo %ErrorLevel% should still be 7 +rem Verify that (call ) sets errorlevel to 0 +(call ) +if errorlevel 1 echo errorlevel should have been 0 echo ------------ Testing GOTO ------------ if a==a goto dest1 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 47e43fcd675..2b55a39dca3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1053,6 +1053,11 @@ void WCMD_run_program (WCHAR *command, BOOL called) firstParam = WCMD_parameter(command, 0, NULL, FALSE, TRUE); if (!firstParam) return; + if (!firstParam[0]) { + errorlevel = 0; + return; + } + /* Calculate the search path and stem to search for */ if (wcspbrk (firstParam, delims) == NULL) { /* No explicit path given, search path */ static const WCHAR curDir[] = {'.',';','\0'};

1 0

Huw Davies : riched20: Simplify the cursor from char offset function.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 57c2580a73b49c5f2dc035e6327f06ee590cbe85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c2580a73b49c5f2dc035e6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 15 10:39:38 2020 +0100 riched20: Simplify the cursor from char offset function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 4 +-- dlls/riched20/editor.c | 47 ++++++++++++++------------- dlls/riched20/editor.h | 4 +-- dlls/riched20/richole.c | 84 +++++++++++++++++++++++++++---------------------- dlls/riched20/run.c | 66 ++++++++++++++------------------------ dlls/riched20/txtsrv.c | 2 +- dlls/riched20/undo.c | 12 +++---- 7 files changed, 103 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=57c2580a73b49c5f2dc0…

1 0

Nikolay Sivov : mf/evr: Add default attributes on sink creation.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 602a3085e3630487b5a1957c1e4a9aab2cbed343 URL: https://source.winehq.org/git/wine.git/?a=commit;h=602a3085e3630487b5a1957c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 15 16:19:54 2020 +0300 mf/evr: Add default attributes on sink creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 12 ++++++++++++ dlls/mf/tests/mf.c | 1 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 7665725405e..af9bd9e0e42 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1896,6 +1896,18 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IMFTransform_Release(mixer); IMFVideoPresenter_Release(presenter); + /* Default attributes */ + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_ForceBob, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_AllowDropToBob, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_ForceThrottle, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_AllowDropToThrottle, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_ForceHalfInterlace, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_AllowDropToHalfInterlace, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_ForceScaling, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_AllowScaling, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_ForceBatching, 0); + IMFAttributes_SetUINT32(object->attributes, &EVRConfig_AllowBatching, 0); + *obj = (IUnknown *)&object->IMFMediaSink_iface; return S_OK; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index fa3d8111338..465bd7e3c43 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3291,7 +3291,6 @@ static void test_evr(void) IUnknown_Release(unk); hr = IMFAttributes_GetCount(attributes, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(!!count, "Unexpected count %u.\n", count); IMFAttributes_Release(attributes);

1 0

Jacek Caban : kernel32/tests: Add more FlushConsoleInputBuffer tests.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 591cb80dea8c094539b4bc4ab640b00538c6e06a URL: https://source.winehq.org/git/wine.git/?a=commit;h=591cb80dea8c094539b4bc4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:30 2020 +0200 kernel32/tests: Add more FlushConsoleInputBuffer tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index ddd5bfcb4c4..495fa1b9e57 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1970,6 +1970,63 @@ static void test_WriteConsoleInputW(HANDLE input_handle) ok(ret == TRUE, "Expected SetConsoleMode to return TRUE, got %d\n", ret); } +static void test_FlushConsoleInputBuffer(HANDLE input, HANDLE output) +{ + INPUT_RECORD record; + DWORD count; + BOOL ret; + + ret = FlushConsoleInputBuffer(input); + ok(ret, "FlushConsoleInputBuffer failed: %u\n", GetLastError()); + + ret = GetNumberOfConsoleInputEvents(input, &count); + ok(ret, "GetNumberOfConsoleInputEvents failed: %u\n", GetLastError()); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + record.EventType = KEY_EVENT; + record.Event.KeyEvent.bKeyDown = 1; + record.Event.KeyEvent.wRepeatCount = 1; + record.Event.KeyEvent.wVirtualKeyCode = VK_RETURN; + record.Event.KeyEvent.wVirtualScanCode = VK_RETURN; + record.Event.KeyEvent.uChar.UnicodeChar = '\r'; + record.Event.KeyEvent.dwControlKeyState = 0; + ret = WriteConsoleInputW(input, &record, 1, &count); + ok(ret, "WriteConsoleInputW failed: %u\n", GetLastError()); + + ret = GetNumberOfConsoleInputEvents(input, &count); + ok(ret, "GetNumberOfConsoleInputEvents failed: %u\n", GetLastError()); + ok(count == 1, "Expected count to be 0, got %u\n", count); + + ret = FlushConsoleInputBuffer(input); + ok(ret, "FlushConsoleInputBuffer failed: %u\n", GetLastError()); + + ret = GetNumberOfConsoleInputEvents(input, &count); + ok(ret, "GetNumberOfConsoleInputEvents failed: %u\n", GetLastError()); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + ret = WriteConsoleInputW(input, &record, 1, &count); + ok(ret, "WriteConsoleInputW failed: %u\n", GetLastError()); + + ret = GetNumberOfConsoleInputEvents(input, &count); + ok(ret, "GetNumberOfConsoleInputEvents failed: %u\n", GetLastError()); + ok(count == 1, "Expected count to be 0, got %u\n", count); + + ret = FlushFileBuffers(input); + ok(ret, "FlushFileBuffers failed: %u\n", GetLastError()); + + ret = GetNumberOfConsoleInputEvents(input, &count); + ok(ret, "GetNumberOfConsoleInputEvents failed: %u\n", GetLastError()); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + ret = FlushConsoleInputBuffer(output); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "FlushConsoleInputBuffer returned: %x(%u)\n", + ret, GetLastError()); + + ret = FlushFileBuffers(output); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "FlushFileBuffers returned: %x(%u)\n", + ret, GetLastError()); +} + static void test_WriteConsoleOutputCharacterA(HANDLE output_handle) { static const char output[] = {'a', 0}; @@ -4269,6 +4326,7 @@ START_TEST(console) test_GetNumberOfConsoleInputEvents(hConIn); test_WriteConsoleInputA(hConIn); test_WriteConsoleInputW(hConIn); + test_FlushConsoleInputBuffer(hConIn, hConOut); test_WriteConsoleOutputCharacterA(hConOut); test_WriteConsoleOutputCharacterW(hConOut); test_WriteConsoleOutputAttribute(hConOut);

1 0

Jacek Caban : server: Implement console input flush in server.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 746ece1a086f8fb721766fc8a4677606e722e4c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=746ece1a086f8fb721766fc8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:43 2020 +0200 server: Implement console input flush in server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/server/console.c b/server/console.c index 8ac3a08abc7..d1e3cae8919 100644 --- a/server/console.c +++ b/server/console.c @@ -3,6 +3,7 @@ * * Copyright (C) 1998 Alexandre Julliard * 2001 Eric Pouech + * Copyright 2020 Jacek Caban for CodeWeavers * * * This library is free software; you can redistribute it and/or @@ -96,6 +97,7 @@ static const struct object_ops console_input_ops = }; static enum server_fd_type console_get_fd_type( struct fd *fd ); +static int console_input_flush( struct fd *fd, struct async *async ); static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct fd_ops console_input_fd_ops = @@ -105,7 +107,7 @@ static const struct fd_ops console_input_fd_ops = console_get_fd_type, /* get_fd_type */ no_fd_read, /* read */ no_fd_write, /* write */ - no_fd_flush, /* flush */ + console_input_flush, /* flush */ no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ console_input_ioctl, /* ioctl */ @@ -409,7 +411,7 @@ static int queue_host_ioctl( struct console_server *server, unsigned int code, u list_add_tail( &server->queue, &ioctl->entry ); wake_up( &server->obj, 0 ); if (async) set_error( STATUS_PENDING ); - return 0; + return 1; } static void disconnect_console_server( struct console_server *server ) @@ -831,6 +833,18 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * } } +static int console_input_flush( struct fd *fd, struct async *async ) +{ + struct console_input *console = get_fd_user( fd ); + + if (!console->server) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return queue_host_ioctl( console->server, IOCTL_CONDRV_FLUSH, 0, NULL, NULL ); +} + static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct screen_buffer *screen_buffer = get_fd_user( fd );

1 0

Jacek Caban : kernel32: Use new IOCTL_CONDRV_SCROLL ioctl for FlushConsoleInputBuffer implementation.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 6f05b299bce211ef11dd5b046da4247e111cb91d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f05b299bce211ef11dd5b04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:19:36 2020 +0200 kernel32: Use new IOCTL_CONDRV_SCROLL ioctl for FlushConsoleInputBuffer implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 28 +--------------------------- include/wine/condrv.h | 1 + programs/conhost/conhost.c | 10 ++++++++-- 3 files changed, 10 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 2b46fe5589f..f9d24f5c885 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -148,38 +148,12 @@ HANDLE WINAPI GetConsoleInputWaitHandle(void) } -/****************************************************************************** - * read_console_input - * - * Helper function for ReadConsole, ReadConsoleInput and FlushConsoleInputBuffer - * - * Returns - * 0 for error, 1 for no INPUT_RECORD ready, 2 with INPUT_RECORD ready - */ -enum read_console_input_return {rci_error = 0, rci_timeout = 1, rci_gotone = 2}; - -static enum read_console_input_return read_console_input(HANDLE handle, PINPUT_RECORD ir, DWORD timeout) -{ - int blocking = timeout != 0; - DWORD read_bytes; - - if (!DeviceIoControl( handle, IOCTL_CONDRV_READ_INPUT, &blocking, sizeof(blocking), ir, sizeof(*ir), &read_bytes, NULL )) - return rci_error; - return read_bytes ? rci_gotone : rci_timeout; -} - - /*********************************************************************** * FlushConsoleInputBuffer (KERNEL32.@) */ BOOL WINAPI FlushConsoleInputBuffer( HANDLE handle ) { - enum read_console_input_return last; - INPUT_RECORD ir; - - while ((last = read_console_input(handle, &ir, 0)) == rci_gotone); - - return last == rci_timeout; + return DeviceIoControl( handle, IOCTL_CONDRV_FLUSH, NULL, 0, NULL, 0, NULL, NULL ); } diff --git a/include/wine/condrv.h b/include/wine/condrv.h index eed8bc5bfcf..cf2524edc66 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -39,6 +39,7 @@ #define IOCTL_CONDRV_SET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 17, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_CONDRV_CTRL_EVENT CTL_CODE(FILE_DEVICE_CONSOLE, 18, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_CONDRV_BEEP CTL_CODE(FILE_DEVICE_CONSOLE, 19, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_CONDRV_FLUSH CTL_CODE(FILE_DEVICE_CONSOLE, 20, METHOD_BUFFERED, FILE_ANY_ACCESS) /* console output ioctls */ #define IOCTL_CONDRV_WRITE_CONSOLE CTL_CODE(FILE_DEVICE_CONSOLE, 30, METHOD_BUFFERED, FILE_WRITE_ACCESS) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index a93f9be73b2..8fb28e18ba9 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2321,8 +2321,8 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign return scroll_output( screen_buffer, in_data ); default: - FIXME( "unsupported ioctl %x\n", code ); - return STATUS_NOT_SUPPORTED; + WARN( "invalid ioctl %x\n", code ); + return STATUS_INVALID_HANDLE; } } @@ -2439,6 +2439,12 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, } return STATUS_SUCCESS; + case IOCTL_CONDRV_FLUSH: + if (in_size || *out_size) return STATUS_INVALID_PARAMETER; + TRACE( "flush\n" ); + console->record_count = 0; + return STATUS_SUCCESS; + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Huw Davies : riched20: Use a run ptr in GetXForArrow().
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: a9a2a68be96ede0c62dbd259cb2d1f6a7f0ec20d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9a2a68be96ede0c62dbd259… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 15 10:39:41 2020 +0100 riched20: Use a run ptr in GetXForArrow(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 4764dec8f33..ffea3ee0c35 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1215,21 +1215,23 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) static int ME_GetXForArrow(ME_TextEditor *editor, ME_Cursor *pCursor) { - ME_DisplayItem *pRun = pCursor->pRun; + ME_Run *run = &pCursor->pRun->member.run; int x; if (editor->nUDArrowX != -1) x = editor->nUDArrowX; - else { + else + { if (editor->bCaretAtEnd) { - pRun = ME_FindItemBack(pRun, diRun); - assert(pRun); - x = pRun->member.run.pt.x + pRun->member.run.nWidth; + run = run_prev_all_paras( run ); + assert( run ); + x = run->pt.x + run->nWidth; } - else { - x = pRun->member.run.pt.x; - x += ME_PointFromChar(editor, &pRun->member.run, pCursor->nOffset, TRUE); + else + { + x = run->pt.x; + x += ME_PointFromChar( editor, run, pCursor->nOffset, TRUE ); } editor->nUDArrowX = x; }

1 0

Huw Davies : riched20: Use run ptrs in GetCharFormat().
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 1994d21ddb45341ef84f6381331f6bc2cf7ebd52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1994d21ddb45341ef84f6381… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 15 10:39:37 2020 +0100 riched20: Use run ptrs in GetCharFormat(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/run.c | 67 ++++++++++++++++++++++------------------------------- 1 file changed, 28 insertions(+), 39 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index a5888960f38..75195e343ed 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -816,9 +816,9 @@ void ME_SetCharFormat( ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, } } -static void ME_GetRunCharFormat(ME_TextEditor *editor, ME_DisplayItem *run, CHARFORMAT2W *pFmt) +static void run_copy_char_fmt( ME_Run *run, CHARFORMAT2W *fmt ) { - ME_CopyCharFormat(pFmt, &run->member.run.style->fmt); + ME_CopyCharFormat( fmt, &run->style->fmt ); } /****************************************************************************** @@ -856,33 +856,25 @@ void ME_GetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) * Returns the style consisting of those attributes which are consistently set * in the whole character range. */ -void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, - const ME_Cursor *to, CHARFORMAT2W *pFmt) +void ME_GetCharFormat( ME_TextEditor *editor, const ME_Cursor *from, + const ME_Cursor *to, CHARFORMAT2W *fmt ) { - ME_DisplayItem *run, *run_end; + ME_Run *run, *run_end, *prev_run; CHARFORMAT2W tmp; - run = from->pRun; + run = &from->pRun->member.run; /* special case - if selection is empty, take previous char's formatting */ if (from->pRun == to->pRun && from->nOffset == to->nOffset) { - if (!from->nOffset) - { - ME_DisplayItem *tmp_run = ME_FindItemBack(run, diRunOrParagraph); - if (tmp_run->type == diRun) { - ME_GetRunCharFormat(editor, tmp_run, pFmt); - return; - } - } - ME_GetRunCharFormat(editor, run, pFmt); + if (!from->nOffset && (prev_run = run_prev( run ))) run = prev_run; + run_copy_char_fmt( run, fmt ); return; } - run_end = to->pRun; - if (!to->nOffset) - run_end = ME_FindItemBack(run_end, diRun); + run_end = &to->pRun->member.run; + if (!to->nOffset) run_end = run_prev_all_paras( run_end ); - ME_GetRunCharFormat(editor, run, pFmt); + run_copy_char_fmt( run, fmt ); if (run == run_end) return; @@ -891,40 +883,37 @@ void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, DWORD dwAttribs = CFM_SIZE | CFM_FACE | CFM_COLOR | CFM_UNDERLINETYPE; DWORD dwEffects = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_STRIKEOUT | CFM_PROTECTED | CFM_LINK | CFM_SUPERSCRIPT; - run = ME_FindItemFwd(run, diRun); + run = run_next_all_paras( run ); - ZeroMemory(&tmp, sizeof(tmp)); + memset( &tmp, 0, sizeof(tmp) ); tmp.cbSize = sizeof(tmp); - ME_GetRunCharFormat(editor, run, &tmp); + run_copy_char_fmt( run, &tmp ); assert((tmp.dwMask & dwAttribs) == dwAttribs); /* reset flags that differ */ - if (pFmt->yHeight != tmp.yHeight) - pFmt->dwMask &= ~CFM_SIZE; - if (pFmt->dwMask & CFM_FACE) + if (fmt->yHeight != tmp.yHeight) fmt->dwMask &= ~CFM_SIZE; + if (fmt->dwMask & CFM_FACE) { if (!(tmp.dwMask & CFM_FACE)) - pFmt->dwMask &= ~CFM_FACE; - else if (wcscmp(pFmt->szFaceName, tmp.szFaceName) || - pFmt->bPitchAndFamily != tmp.bPitchAndFamily) - pFmt->dwMask &= ~CFM_FACE; + fmt->dwMask &= ~CFM_FACE; + else if (wcscmp( fmt->szFaceName, tmp.szFaceName ) || + fmt->bPitchAndFamily != tmp.bPitchAndFamily) + fmt->dwMask &= ~CFM_FACE; } - if (pFmt->yHeight != tmp.yHeight) - pFmt->dwMask &= ~CFM_SIZE; - if (pFmt->bUnderlineType != tmp.bUnderlineType) - pFmt->dwMask &= ~CFM_UNDERLINETYPE; - if (pFmt->dwMask & CFM_COLOR) + if (fmt->yHeight != tmp.yHeight) fmt->dwMask &= ~CFM_SIZE; + if (fmt->bUnderlineType != tmp.bUnderlineType) fmt->dwMask &= ~CFM_UNDERLINETYPE; + if (fmt->dwMask & CFM_COLOR) { - if (!((pFmt->dwEffects&CFE_AUTOCOLOR) & (tmp.dwEffects&CFE_AUTOCOLOR))) + if (!((fmt->dwEffects&CFE_AUTOCOLOR) & (tmp.dwEffects&CFE_AUTOCOLOR))) { - if (pFmt->crTextColor != tmp.crTextColor) - pFmt->dwMask &= ~CFM_COLOR; + if (fmt->crTextColor != tmp.crTextColor) + fmt->dwMask &= ~CFM_COLOR; } } - pFmt->dwMask &= ~((pFmt->dwEffects ^ tmp.dwEffects) & dwEffects); - pFmt->dwEffects = tmp.dwEffects; + fmt->dwMask &= ~((fmt->dwEffects ^ tmp.dwEffects) & dwEffects); + fmt->dwEffects = tmp.dwEffects; } while(run != run_end); }

1 0

Michael Stefaniuc : msisip: Use wide-char string literals.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 0e8c432051b09d3bc3558ba2dc94392724c80d14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e8c432051b09d3bc3558ba2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 14 23:21:59 2020 +0200 msisip: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msisip/main.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index aabea78ae62..11893f149c3 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -52,21 +52,13 @@ static GUID mySubject = { 0x000c10f1, 0x0000, 0x0000, */ HRESULT WINAPI DllRegisterServer(void) { - static WCHAR msisip[] = { 'M','S','I','S','I','P','.','D','L','L',0 }; - static WCHAR getSignedDataMsg[] = { 'M','s','i','S','I','P','G','e','t', - 'S','i','g','n','e','d','D','a','t','a','M','s','g',0 }; - static WCHAR putSignedDataMsg[] = { 'M','s','i','S','I','P','P','u','t', - 'S','i','g','n','e','d','D','a','t','a','M','s','g',0 }; - static WCHAR createIndirectData[] = { 'M','s','i','S','I','P', - 'C','r','e','a','t','e','I','n','d','i','r','e','c','t','D','a','t','a', - 0 }; - static WCHAR verifyIndirectData[] = { 'M','s','i','S','I','P', - 'V','e','r','i','f','y','I','n','d','i','r','e','c','t','D','a','t','a', - 0 }; - static WCHAR removeSignedDataMsg[] = { 'M','s','i','S','I','P','R','e','m', - 'o','v','e','S','i','g','n','e','d','D','a','t','a','M','s','g', 0 }; - static WCHAR isMyTypeOfFile[] = { 'M','s','i','S','I','P', - 'I','s','M','y','T','y','p','e','O','f','F','i','l','e',0 }; + static WCHAR msisip[] = L"MSISIP.DLL"; + static WCHAR getSignedDataMsg[] = L"MsiSIPGetSignedDataMsg"; + static WCHAR putSignedDataMsg[] = L"MsiSIPPutSignedDataMsg"; + static WCHAR createIndirectData[] = L"MsiSIPCreateIndirectData"; + static WCHAR verifyIndirectData[] = L"MsiSIPVerifyIndirectData"; + static WCHAR removeSignedDataMsg[] = L"MsiSIPRemoveSignedDataMsg"; + static WCHAR isMyTypeOfFile[] = L"MsiSIPIsMyTypeOfFile"; SIP_ADD_NEWPROVIDER prov; @@ -100,8 +92,6 @@ BOOL WINAPI MsiSIPGetSignedDataMsg(SIP_SUBJECTINFO *pSubjectInfo, DWORD *pdwEncodingType, DWORD dwIndex, DWORD *pcbSignedDataMsg, BYTE *pbSignedDataMsg) { - static const WCHAR digitalSig[] = { 5,'D','i','g','i','t','a','l', - 'S','i','g','n','a','t','u','r','e',0 }; BOOL ret = FALSE; IStorage *stg = NULL; HRESULT r; @@ -120,7 +110,7 @@ BOOL WINAPI MsiSIPGetSignedDataMsg(SIP_SUBJECTINFO *pSubjectInfo, goto end; } - r = IStorage_OpenStream(stg, digitalSig, 0, + r = IStorage_OpenStream(stg, L"\5DigitalSignature", 0, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stm); if (FAILED(r)) {

1 0

Michael Stefaniuc : spoolss: Use wide-char string literals.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 6873f8f1d07bf4569436f84d180a3789ee594600 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6873f8f1d07bf4569436f84d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 14 23:22:00 2020 +0200 spoolss: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/spoolss/router.c | 2 +- dlls/spoolss/spoolss_main.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 764721b202c..24314b1f23a 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -151,7 +151,7 @@ static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 }; /* ################################ */ -static WCHAR localsplW[] = {'l','o','c','a','l','s','p','l','.','d','l','l',0}; +static WCHAR localsplW[] = L"localspl.dll"; /****************************************************************** * strdupW [internal] diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index 61c565d2faa..bee58755eee 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(spoolss); static HMODULE hwinspool; -static const WCHAR winspooldrvW[] = {'w','i','n','s','p','o','o','l','.','d','r','v',0}; - /****************************************************************************** * */ @@ -232,7 +230,7 @@ BOOL WINAPI SplInitializeWinSpoolDrv(LPVOID * table) TRACE("(%p)\n", table); - hwinspool = LoadLibraryW(winspooldrvW); + hwinspool = LoadLibraryW(L"winspool.drv"); if (!hwinspool) return FALSE; table[0] = (void *) GetProcAddress(hwinspool, "OpenPrinterW");

1 0

Alexandre Julliard : ntdll: Make NtGetNlsSectionPtr() into a proper Nt syscall.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 54c31d5332a71d785db1b73cf3be41818adeab8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=54c31d5332a71d785db1b73c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 20:17:46 2020 +0200 ntdll: Make NtGetNlsSectionPtr() into a proper Nt syscall. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 12 +-- dlls/ntdll/locale.c | 184 +------------------------------------------ dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/unix/env.c | 153 ++++++++++++++++++++++++++++++++--- 4 files changed, 151 insertions(+), 202 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54c31d5332a71d785db1…

1 0

Alexandre Julliard : server: Create the NLS directory.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 892780a5d255136622f6c6402545cc85110be057 URL: https://source.winehq.org/git/wine.git/?a=commit;h=892780a5d255136622f6c640… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 20:14:14 2020 +0200 server: Create the NLS directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/directory.c b/server/directory.c index 4d6978f61af..6f8fb179808 100644 --- a/server/directory.c +++ b/server/directory.c @@ -249,12 +249,14 @@ static void create_session( unsigned int id ) static const WCHAR dir_bnolinksW[] = {'B','N','O','L','I','N','K','S'}; static const WCHAR dir_bnoW[] = {'B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s'}; static const WCHAR dir_dosdevicesW[] = {'D','o','s','D','e','v','i','c','e','s'}; + static const WCHAR dir_nlsW[] = {'N','L','S'}; static const WCHAR dir_windowsW[] = {'W','i','n','d','o','w','s'}; static const WCHAR dir_winstationsW[] = {'W','i','n','d','o','w','S','t','a','t','i','o','n','s'}; static const struct unicode_str dir_sessions_str = {dir_sessionsW, sizeof(dir_sessionsW)}; static const struct unicode_str dir_bnolinks_str = {dir_bnolinksW, sizeof(dir_bnolinksW)}; static const struct unicode_str dir_bno_str = {dir_bnoW, sizeof(dir_bnoW)}; static const struct unicode_str dir_dosdevices_str = {dir_dosdevicesW, sizeof(dir_dosdevicesW)}; + static const struct unicode_str dir_nls_str = {dir_nlsW, sizeof(dir_nlsW)}; static const struct unicode_str dir_windows_str = {dir_windowsW, sizeof(dir_windowsW)}; static const struct unicode_str dir_winstations_str = {dir_winstationsW, sizeof(dir_winstationsW)}; @@ -278,6 +280,7 @@ static void create_session( unsigned int id ) dir_bno_global = create_directory( &root_directory->obj, &dir_bno_str, OBJ_PERMANENT, HASH_SIZE, NULL ); dir_sessions = create_directory( &root_directory->obj, &dir_sessions_str, OBJ_PERMANENT, HASH_SIZE, NULL ); dir_bnolinks = create_directory( &dir_sessions->obj, &dir_bnolinks_str, OBJ_PERMANENT, HASH_SIZE, NULL ); + release_object( create_directory( &root_directory->obj, &dir_nls_str, OBJ_PERMANENT, HASH_SIZE, NULL )); release_object( dir_bno_global ); release_object( dir_bnolinks ); release_object( dir_sessions );

1 0

Michael Stefaniuc : lz32/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 15, 2020

Oct. 15, 2020

Module: wine Branch: master Commit: 14012ea2bbfb9eef4f9eaf30f8f74698facf51ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=14012ea2bbfb9eef4f9eaf30… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 14 23:22:03 2020 +0200 lz32/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/lz32/tests/lzexpand_main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index c37f3fa47e7..3c80bc09a6b 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -30,23 +30,23 @@ /* Compressed file names end with underscore. */ static char filename [] = "testfile.xxx"; static char filename_[] = "testfile.xx_"; -static WCHAR filenameW [] = {'t','e','s','t','f','i','l','e','.','x','x','x',0}; -static WCHAR filenameW_[] = {'t','e','s','t','f','i','l','e','.','x','x','_',0}; +static WCHAR filenameW [] = L"testfile.xxx"; +static WCHAR filenameW_[] = L"testfile.xx_"; static char dotless [] = "dotless"; static char dotless_[] = "dotless._"; -static WCHAR dotlessW [] = {'d','o','t','l','e','s','s', 0}; -static WCHAR dotlessW_[] = {'d','o','t','l','e','s','s','.','_', 0}; +static WCHAR dotlessW [] = L"dotless"; +static WCHAR dotlessW_[] = L"dotless._"; static char extless [] = "extless."; static char extless_[] = "extless._"; -static WCHAR extlessW [] = {'e','x','t','l','e','s','s','.', 0}; -static WCHAR extlessW_[] = {'e','x','t','l','e','s','s','.','_', 0}; +static WCHAR extlessW [] = L"extless."; +static WCHAR extlessW_[] = L"extless._"; static char _terminated [] = "_terminated.xxxx_"; static char _terminated_[] = "_terminated.xxxx_"; -static WCHAR _terminatedW [] = {'_','t','e','r','m','i','n','a','t','e','d','.','x','x','x','x','_', 0}; -static WCHAR _terminatedW_[] = {'_','t','e','r','m','i','n','a','t','e','d','.','x','x','x','x','_', 0}; +static WCHAR _terminatedW [] = L"_terminated.xxxx_"; +static WCHAR _terminatedW_[] = L"_terminated.xxxx_"; static char filename2[] = "testfile.yyy"; @@ -700,7 +700,7 @@ static void test_LZOpenFileW(void) OFSTRUCT test; DWORD retval; INT file; - static WCHAR badfilenameW[] = {'b','a','d','f','i','l','e','n','a','m','e','.','x','t','n',0}; + static WCHAR badfilenameW[] = L"badfilename.xtn"; char expected[MAX_PATH]; SetLastError(0xfaceabee);

1 0

Jacek Caban : conhost: Remove no longer needed condrv_input_info fields.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: e909986e6ea5ecd49b2b847f321ad89b2ae4f6f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e909986e6ea5ecd49b2b847f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:58:39 2020 +0200 conhost: Remove no longer needed condrv_input_info fields. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 4 ---- programs/conhost/conhost.c | 12 ++++-------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index f4ed77a69b..eed8bc5bfc 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -82,10 +82,6 @@ struct condrv_input_info { unsigned int input_cp; /* console input codepage */ unsigned int output_cp; /* console output codepage */ - unsigned int history_mode; /* whether we duplicate lines in history */ - unsigned int history_size; /* number of lines in history */ - unsigned int history_index; /* number of used lines in history */ - unsigned int edition_mode; /* index to the edition mode flavors */ unsigned int input_count; /* number of available input records */ condrv_handle_t win; /* renderer window handle */ }; diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index b8f954acb5..a93f9be73b 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2396,14 +2396,10 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, TRACE( "get info\n" ); if (in_size || *out_size != sizeof(*info)) return STATUS_INVALID_PARAMETER; if (!(info = alloc_ioctl_buffer( sizeof(*info )))) return STATUS_NO_MEMORY; - info->history_mode = console->history_mode; - info->history_size = console->history_size; - info->history_index = console->history_index; - info->edition_mode = console->edition_mode; - info->input_cp = console->input_cp; - info->output_cp = console->output_cp; - info->win = condrv_handle( console->win ); - info->input_count = console->record_count; + info->input_cp = console->input_cp; + info->output_cp = console->output_cp; + info->win = condrv_handle( console->win ); + info->input_count = console->record_count; return STATUS_SUCCESS; }

1 0

Jacek Caban : conhost: Remove no longer needed SET_CONSOLE_OUTPUT_INFO flags.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: ef2e281dc26c4eb4fb4bc09deb3b3dbf5f2e73fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef2e281dc26c4eb4fb4bc09d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:58:25 2020 +0200 conhost: Remove no longer needed SET_CONSOLE_OUTPUT_INFO flags. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 4 +--- programs/conhost/conhost.c | 25 ------------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 72aecedd38..f4ed77a69b 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -154,9 +154,7 @@ struct condrv_output_info_params #define SET_CONSOLE_OUTPUT_INFO_ATTR 0x0008 #define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x0010 #define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x0020 -#define SET_CONSOLE_OUTPUT_INFO_FONT 0x0040 -#define SET_CONSOLE_OUTPUT_INFO_COLORTABLE 0x0080 -#define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0100 +#define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0040 /* IOCTL_CONDRV_FILL_OUTPUT params */ struct condrv_fill_output_params diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 9b082dffc2..b8f954acb5 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1731,7 +1731,6 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, const struct condrv_output_info_params *params, size_t extra_size ) { const struct condrv_output_info *info = &params->info; - WCHAR *font_name; NTSTATUS status; TRACE( "%p\n", screen_buffer ); @@ -1825,30 +1824,6 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, screen_buffer->max_width = info->max_width; screen_buffer->max_height = info->max_height; } - if (params->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE) - { - memcpy( screen_buffer->color_map, info->color_map, sizeof(screen_buffer->color_map) ); - } - if (params->mask & SET_CONSOLE_OUTPUT_INFO_FONT) - { - screen_buffer->font.width = info->font_width; - screen_buffer->font.height = info->font_height; - screen_buffer->font.weight = info->font_weight; - screen_buffer->font.pitch_family = info->font_pitch_family; - if (extra_size) - { - const WCHAR *params_font = (const WCHAR *)(params + 1); - extra_size = extra_size / sizeof(WCHAR) * sizeof(WCHAR); - font_name = malloc( extra_size ); - if (font_name) - { - memcpy( font_name, params_font, extra_size ); - free( screen_buffer->font.face_name ); - screen_buffer->font.face_name = font_name; - screen_buffer->font.face_len = extra_size; - } - } - } if (is_active( screen_buffer )) {

1 0

Jacek Caban : conhost: Remove no longer needed CHAR_INFO_MODE_TEXTSTDATTR.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: d7e831c1123cca7785a6b8813f4991b42f9473e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7e831c1123cca7785a6b881… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:58:17 2020 +0200 conhost: Remove no longer needed CHAR_INFO_MODE_TEXTSTDATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 1 - programs/conhost/conhost.c | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 602b499114..72aecedd38 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -115,7 +115,6 @@ enum char_info_mode CHAR_INFO_MODE_TEXT, /* characters only */ CHAR_INFO_MODE_ATTR, /* attributes only */ CHAR_INFO_MODE_TEXTATTR, /* both characters and attributes */ - CHAR_INFO_MODE_TEXTSTDATTR, /* characters but use standard attributes */ }; /* IOCTL_CONDRV_GET_OUTPUT_INFO result */ diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 9c780d4951..9b082dffc2 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1963,10 +1963,6 @@ static NTSTATUS write_output( struct screen_buffer *screen_buffer, const struct case CHAR_INFO_MODE_TEXTATTR: *dest = *(const char_info_t *)src; break; - case CHAR_INFO_MODE_TEXTSTDATTR: - dest->ch = *(const WCHAR *)src; - dest->attr = screen_buffer->attr; - break; default: return STATUS_INVALID_PARAMETER; } @@ -2131,13 +2127,6 @@ static NTSTATUS fill_output( struct screen_buffer *screen_buffer, const struct c dest[i].attr = params->attr; } break; - case CHAR_INFO_MODE_TEXTSTDATTR: - for (i = 0; i < count; i++) - { - dest[i].ch = params->ch; - dest[i].attr = screen_buffer->attr; - } - break; default: return STATUS_INVALID_PARAMETER; }

1 0

Jacek Caban : conhost: Remove no longer needed SET_CONSOLE_INPUT_INFO flags.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: bed3b61b498af5339f53ecc23937ff3b81b196d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bed3b61b498af5339f53ecc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:58:10 2020 +0200 conhost: Remove no longer needed SET_CONSOLE_INPUT_INFO flags. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 8 ++------ programs/conhost/conhost.c | 45 --------------------------------------------- 2 files changed, 2 insertions(+), 51 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index efcfc1a5b9..602b499114 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -97,12 +97,8 @@ struct condrv_input_info_params struct condrv_input_info info; /* input_info */ }; -#define SET_CONSOLE_INPUT_INFO_EDITION_MODE 0x01 -#define SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE 0x02 -#define SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE 0x04 -#define SET_CONSOLE_INPUT_INFO_WIN 0x08 -#define SET_CONSOLE_INPUT_INFO_HISTORY_MODE 0x10 -#define SET_CONSOLE_INPUT_INFO_HISTORY_SIZE 0x20 +#define SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE 0x01 +#define SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE 0x02 /* IOCTL_CONDRV_WRITE_OUTPUT and IOCTL_CONDRV_READ_OUTPUT params */ struct condrv_output_params diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index dc508a2fd7..9c780d4951 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2448,55 +2448,10 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, const struct condrv_input_info_params *params = in_data; TRACE( "set info\n" ); if (in_size != sizeof(*params) || *out_size) return STATUS_INVALID_PARAMETER; - if (params->mask & SET_CONSOLE_INPUT_INFO_HISTORY_MODE) - { - console->history_mode = params->info.history_mode; - } - if ((params->mask & SET_CONSOLE_INPUT_INFO_HISTORY_SIZE) && - console->history_size != params->info.history_size) - { - struct history_line **mem = NULL; - int i, delta; - - if (params->info.history_size) - { - if (!(mem = malloc( params->info.history_size * sizeof(*mem) ))) - return STATUS_NO_MEMORY; - memset( mem, 0, params->info.history_size * sizeof(*mem) ); - } - - delta = (console->history_index > params->info.history_size) - ? (console->history_index - params->info.history_size) : 0; - - for (i = delta; i < console->history_index; i++) - { - mem[i - delta] = console->history[i]; - console->history[i] = NULL; - } - console->history_index -= delta; - - for (i = 0; i < console->history_size; i++) - free( console->history[i] ); - free( console->history ); - console->history = mem; - console->history_size = params->info.history_size; - } - if (params->mask & SET_CONSOLE_INPUT_INFO_EDITION_MODE) - { - console->edition_mode = params->info.edition_mode; - } if (params->mask & SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE) - { console->input_cp = params->info.input_cp; - } if (params->mask & SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE) - { console->output_cp = params->info.output_cp; - } - if (params->mask & SET_CONSOLE_INPUT_INFO_WIN) - { - console->win = wine_server_ptr_handle( params->info.win ); - } return STATUS_SUCCESS; }

1 0

Jacek Caban : conhost: Fix check for the last history index in edit_line_find_history.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: a7066c66a646a828c16c33e67174ea1918053eac URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7066c66a646a828c16c33e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:57:58 2020 +0200 conhost: Fix check for the last history index in edit_line_find_history. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50000 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 3ff6363017..dc508a2fd7 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -659,7 +659,7 @@ static void edit_line_find_in_history( struct console *console ) unsigned int len, oldoffset; WCHAR *line; - if (ctx->history_index && ctx->history_index == console->history_index + 1) + if (ctx->history_index && ctx->history_index == console->history_index) { start_pos--; ctx->history_index--;

1 0

Huw Davies : riched20: Return a run ptr from the run splitting function.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 0b01b40a7c827c8a1509e60b5eb1c7f2c9a3bcf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b01b40a7c827c8a1509e60b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 11:17:14 2020 +0100 riched20: Return a run ptr from the run splitting function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 6 ++++-- dlls/riched20/editor.h | 2 +- dlls/riched20/run.c | 16 ++++++++-------- dlls/riched20/table.c | 4 ++-- dlls/riched20/undo.c | 4 ++-- dlls/riched20/wrap.c | 4 ++-- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 1c3f4b1652..5f7d52aa4c 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -607,7 +607,9 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, /* handle special \r\r\n sequence (richedit 2.x and higher only) */ WCHAR space = ' '; ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, style, 0); - } else { + } + else + { const WCHAR cr = '\r', *eol_str = str; if (!editor->bEmulateVersion10) @@ -625,7 +627,7 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, } else { - if (p->nOffset) ME_SplitRunSimple(editor, p); + if (p->nOffset) run_split( editor, p ); run = &p->pRun->member.run; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 244010df73..7ae0b5341b 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -132,7 +132,7 @@ int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset, BOOL visua int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; BOOL ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; void run_join( ME_TextEditor *editor, ME_Run *run ) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; +ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx, int *pAscent, int *pDescent) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 84b851039b..3f550d8d99 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -268,12 +268,12 @@ void run_join( ME_TextEditor *editor, ME_Run *run ) } /****************************************************************************** - * ME_SplitRunSimple + * run_split * * Does the most basic job of splitting a run into two - it does not * update the positions and extents. */ -ME_DisplayItem *ME_SplitRunSimple( ME_TextEditor *editor, ME_Cursor *cursor ) +ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) { ME_Run *run = &cursor->pRun->member.run, *new_run; int i; @@ -303,7 +303,7 @@ ME_DisplayItem *ME_SplitRunSimple( ME_TextEditor *editor, ME_Cursor *cursor ) } } para_mark_rewrap( editor, run->para ); - return run_get_di( run ); + return run; } /****************************************************************************** @@ -359,7 +359,7 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, } else { - ME_SplitRunSimple( editor, cursor ); + run_split( editor, cursor ); insert_before = cursor->pRun; } } @@ -756,12 +756,12 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C start_run = ME_FindItemFwd( start->pRun, diRun ); else if (start->nOffset) { - /* SplitRunSimple may or may not update the cursors, depending on whether they + /* run_split() may or may not update the cursors, depending on whether they * are selection cursors, but we need to make sure they are valid. */ int split_offset = start->nOffset; - ME_DisplayItem *split_run = ME_SplitRunSimple(editor, start); + ME_Run *split_run = run_split( editor, start ); start_run = start->pRun; - if (end && end->pRun == split_run) + if (end && &end->pRun->member.run == split_run) { end->pRun = start->pRun; end->nOffset -= split_offset; @@ -774,7 +774,7 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C end_run = ME_FindItemFwd( end->pRun, diRun ); else { - if (end->nOffset) ME_SplitRunSimple(editor, end); + if (end->nOffset) run_split( editor, end ); end_run = end->pRun; } } diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 615145b85e..95b0fb0a8a 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -66,8 +66,8 @@ static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); ME_DisplayItem *tp; ME_Cursor* cursor = &editor->pCursors[nCursor]; - if (cursor->nOffset) - ME_SplitRunSimple(editor, cursor); + + if (cursor->nOffset) run_split( editor, cursor ); tp = ME_SplitParagraph(editor, cursor->pRun, pStyle, eol_str, eol_len, paraFlags); ME_ReleaseStyle(pStyle); diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index c6b898b2dd..55574dc412 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -383,9 +383,9 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) ME_DisplayItem *this_para, *new_para; BOOL bFixRowStart; int paraFlags = undo->u.split_para.flags & (MEPF_ROWSTART|MEPF_CELL|MEPF_ROWEND); + ME_CursorFromCharOfs(editor, undo->u.split_para.pos, &tmp); - if (tmp.nOffset) - ME_SplitRunSimple(editor, &tmp); + if (tmp.nOffset) run_split( editor, &tmp ); this_para = tmp.pPara; bFixRowStart = this_para->member.para.nFlags & MEPF_ROWSTART; if (bFixRowStart) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index fda1d99557..393b1784d4 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -139,7 +139,7 @@ static ME_Run *split_run_extents( ME_WrapContext *wc, ME_Run *run, int nVChar ) TRACE("Before split: %s(%d, %d)\n", debugstr_run( run ), run->pt.x, run->pt.y); - ME_SplitRunSimple(editor, &cursor); + run_split( editor, &cursor ); run2 = &cursor.pRun->member.run; run2->script_analysis = run->script_analysis; @@ -776,7 +776,7 @@ static HRESULT itemize_para( ME_Context *c, ME_Paragraph *para ) if (run->nCharOfs + run->len > items[cur_item+1].iCharPos) { ME_Cursor cursor = {para_get_di( para ), run_get_di( run ), items[cur_item+1].iCharPos - run->nCharOfs}; - ME_SplitRunSimple( c->editor, &cursor ); + run_split( c->editor, &cursor ); } }

1 0

Jacek Caban : server: Remove no longer used console renderer object.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 70c1d4fcaa846a8f69ef21d0a5b2c070c668b589 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70c1d4fcaa846a8f69ef21d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:57:24 2020 +0200 server: Remove no longer used console renderer object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 52 ----------- programs/conhost/conhost.c | 5 +- server/console.c | 213 +-------------------------------------------- server/trace.c | 3 +- 4 files changed, 4 insertions(+), 269 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=70c1d4fcaa846a8f69ef…

1 0

Nikolay Sivov : evr/sample: Add a surface buffer on sample creation.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 208520f8d956dc2ea88c3461c6c6e57001b4b648 URL: https://source.winehq.org/git/wine.git/?a=commit;h=208520f8d956dc2ea88c3461… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 16:03:11 2020 +0300 evr/sample: Add a surface buffer on sample creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 190 ++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/evr/tests/evr.c | 20 ++++-- 2 files changed, 202 insertions(+), 8 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 5427833a2c..668e675da2 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -48,6 +48,16 @@ static const char *debugstr_time(LONGLONG time) return wine_dbg_sprintf("%s", rev); } +struct surface_buffer +{ + IMFMediaBuffer IMFMediaBuffer_iface; + IMFGetService IMFGetService_iface; + LONG refcount; + + IUnknown *surface; + ULONG length; +}; + struct video_sample { IMFSample IMFSample_iface; @@ -80,6 +90,16 @@ static struct video_sample *impl_from_IMFDesiredSample(IMFDesiredSample *iface) return CONTAINING_RECORD(iface, struct video_sample, IMFDesiredSample_iface); } +static struct surface_buffer *impl_from_IMFMediaBuffer(IMFMediaBuffer *iface) +{ + return CONTAINING_RECORD(iface, struct surface_buffer, IMFMediaBuffer_iface); +} + +static struct surface_buffer *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct surface_buffer, IMFGetService_iface); +} + struct sample_allocator { IMFVideoSampleAllocator IMFVideoSampleAllocator_iface; @@ -929,16 +949,171 @@ static const IMFDesiredSampleVtbl desired_video_sample_vtbl = desired_video_sample_Clear, }; +static HRESULT WINAPI surface_buffer_QueryInterface(IMFMediaBuffer *iface, REFIID riid, void **obj) +{ + struct surface_buffer *buffer = impl_from_IMFMediaBuffer(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFMediaBuffer) || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = &buffer->IMFMediaBuffer_iface; + } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &buffer->IMFGetService_iface; + } + else + { + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; +} + +static ULONG WINAPI surface_buffer_AddRef(IMFMediaBuffer *iface) +{ + struct surface_buffer *buffer = impl_from_IMFMediaBuffer(iface); + ULONG refcount = InterlockedIncrement(&buffer->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI surface_buffer_Release(IMFMediaBuffer *iface) +{ + struct surface_buffer *buffer = impl_from_IMFMediaBuffer(iface); + ULONG refcount = InterlockedDecrement(&buffer->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + IUnknown_Release(buffer->surface); + heap_free(buffer); + } + + return refcount; +} + +static HRESULT WINAPI surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **data, DWORD *maxlength, DWORD *length) +{ + TRACE("%p, %p, %p, %p.\n", iface, data, maxlength, length); + + return E_NOTIMPL; +} + +static HRESULT WINAPI surface_buffer_Unlock(IMFMediaBuffer *iface) +{ + TRACE("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI surface_buffer_GetCurrentLength(IMFMediaBuffer *iface, DWORD *length) +{ + struct surface_buffer *buffer = impl_from_IMFMediaBuffer(iface); + + TRACE("%p.\n", iface); + + *length = buffer->length; + + return S_OK; +} + +static HRESULT WINAPI surface_buffer_SetCurrentLength(IMFMediaBuffer *iface, DWORD length) +{ + struct surface_buffer *buffer = impl_from_IMFMediaBuffer(iface); + + TRACE("%p.\n", iface); + + buffer->length = length; + + return S_OK; +} + +static HRESULT WINAPI surface_buffer_GetMaxLength(IMFMediaBuffer *iface, DWORD *length) +{ + TRACE("%p.\n", iface); + + return E_NOTIMPL; +} + +static const IMFMediaBufferVtbl surface_buffer_vtbl = +{ + surface_buffer_QueryInterface, + surface_buffer_AddRef, + surface_buffer_Release, + surface_buffer_Lock, + surface_buffer_Unlock, + surface_buffer_GetCurrentLength, + surface_buffer_SetCurrentLength, + surface_buffer_GetMaxLength, +}; + +static HRESULT WINAPI surface_buffer_gs_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct surface_buffer *buffer = impl_from_IMFGetService(iface); + return IMFMediaBuffer_QueryInterface(&buffer->IMFMediaBuffer_iface, riid, obj); +} + +static ULONG WINAPI surface_buffer_gs_AddRef(IMFGetService *iface) +{ + struct surface_buffer *buffer = impl_from_IMFGetService(iface); + return IMFMediaBuffer_AddRef(&buffer->IMFMediaBuffer_iface); +} + +static ULONG WINAPI surface_buffer_gs_Release(IMFGetService *iface) +{ + struct surface_buffer *buffer = impl_from_IMFGetService(iface); + return IMFMediaBuffer_Release(&buffer->IMFMediaBuffer_iface); +} + +static HRESULT WINAPI surface_buffer_gs_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IMFGetServiceVtbl surface_buffer_gs_vtbl = +{ + surface_buffer_gs_QueryInterface, + surface_buffer_gs_AddRef, + surface_buffer_gs_Release, + surface_buffer_gs_GetService, +}; + +static HRESULT create_surface_buffer(IUnknown *surface, IMFMediaBuffer **buffer) +{ + struct surface_buffer *object; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IMFMediaBuffer_iface.lpVtbl = &surface_buffer_vtbl; + object->IMFGetService_iface.lpVtbl = &surface_buffer_gs_vtbl; + object->refcount = 1; + object->surface = surface; + IUnknown_AddRef(object->surface); + + *buffer = &object->IMFMediaBuffer_iface; + + return S_OK; +} + HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sample) { struct video_sample *object; + IMFMediaBuffer *buffer = NULL; HRESULT hr; TRACE("%p, %p.\n", surface, sample); - if (surface) - FIXME("Create surface buffer.\n"); - if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -953,6 +1128,15 @@ HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sam return hr; } + if (surface && FAILED(hr = create_surface_buffer(surface, &buffer))) + { + IMFSample_Release(&object->IMFSample_iface); + return hr; + } + + if (buffer) + IMFSample_AddBuffer(object->sample, buffer); + *sample = &object->IMFSample_iface; return S_OK; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index b924ac2d9b..69ee2d3d96 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -750,6 +750,10 @@ static void test_surface_sample(void) IDirect3DSwapChain9_Release(swapchain); + hr = MFCreateVideoSampleFromSurface(NULL, &sample); + ok(hr == S_OK, "Failed to create surface sample, hr %#x.\n", hr); + IMFSample_Release(sample); + hr = MFCreateVideoSampleFromSurface((IUnknown *)backbuffer, &sample); ok(hr == S_OK, "Failed to create surface sample, hr %#x.\n", hr); @@ -808,7 +812,6 @@ static void test_surface_sample(void) count = 0; hr = IMFSample_GetBufferCount(sample, &count); ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); -todo_wine ok(count == 1, "Unexpected attribute count.\n"); hr = IMFSample_GetTotalLength(sample, &length); @@ -822,11 +825,8 @@ todo_wine ok(hr == MF_E_NO_SAMPLE_TIMESTAMP, "Unexpected hr %#x.\n", hr); hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -if (SUCCEEDED(hr)) -{ hr = IMFMediaBuffer_GetMaxLength(buffer, &length); ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); @@ -834,9 +834,19 @@ if (SUCCEEDED(hr)) ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); ok(!length, "Unexpected length %u.\n", length); + hr = IMFMediaBuffer_SetCurrentLength(buffer, 16); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer, &length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + ok(length == 16, "Unexpected length %u.\n", length); + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); @@ -861,7 +871,7 @@ if (SUCCEEDED(hr)) ok(!count, "Unexpected attribute count.\n"); IMFMediaBuffer_Release(buffer); -} + hr = IMFSample_GetSampleFlags(sample, &flags); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Huw Davies : riched20: Return a run ptr from the run insert function.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 579618c0d7a552d6396c4391e1b9e133da26b647 URL: https://source.winehq.org/git/wine.git/?a=commit;h=579618c0d7a552d6396c4391… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 11:17:18 2020 +0100 riched20: Return a run ptr from the run insert function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.h | 5 +++-- dlls/riched20/run.c | 49 ++++++++++++++++++++++++++++--------------------- dlls/riched20/undo.c | 7 +++---- 4 files changed, 35 insertions(+), 28 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index c56e5961f7..c5fa51894e 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -471,7 +471,7 @@ ME_InternalInsertTextFromCursor(ME_TextEditor *editor, int nCursor, assert(p->pRun->type == diRun); - return ME_InsertRunAtCursor(editor, p, style, str, len, flags); + return run_get_di( run_insert( editor, p, style, str, len, flags ) ); } static struct re_object* create_re_object(const REOBJECT *reo) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index b41d0f7db6..1a9f3fd6fb 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -119,8 +119,8 @@ int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; /* run.c */ ME_Run *run_create( ME_Style *s, int nFlags ) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, - ME_Style *style, const WCHAR *str, int len, int flags) DECLSPEC_HIDDEN; +ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, + ME_Style *style, const WCHAR *str, int len, int flags ) DECLSPEC_HIDDEN; void ME_CheckCharOffsets(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_PropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; /* this one accounts for 1/2 char tolerance */ @@ -133,6 +133,7 @@ void run_join( ME_TextEditor *editor, ME_Run *run ) DECLSPEC_HIDDEN; ME_Run *run_next( ME_Run *run ) DECLSPEC_HIDDEN; ME_Run *run_next_all_paras( ME_Run *run ) DECLSPEC_HIDDEN; ME_Run *run_prev( ME_Run *run ) DECLSPEC_HIDDEN; +ME_Run *run_prev_all_paras( ME_Run *run ) DECLSPEC_HIDDEN; ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index ed0273395c..a5888960f3 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -57,6 +57,16 @@ ME_Run *run_next_all_paras( ME_Run *run ) return NULL; } +ME_Run *run_prev_all_paras( ME_Run *run ) +{ + ME_DisplayItem *item = run_get_di( run ), *dummy = para_get_di( run->para ); + + if (ME_PrevRun( &dummy, &item, TRUE )) + return &item->member.run; + + return NULL; +} + /****************************************************************************** * ME_CanJoinRuns * @@ -347,56 +357,53 @@ ME_Run *run_create( ME_Style *s, int flags ) } /****************************************************************************** - * ME_InsertRunAtCursor + * run_insert * * Inserts a new run with given style, flags and content at a given position, * which is passed as a cursor structure (which consists of a run and * a run-relative character offset). */ -ME_DisplayItem * -ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, - const WCHAR *str, int len, int flags) +ME_Run *run_insert( ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, + const WCHAR *str, int len, int flags ) { - ME_DisplayItem *insert_before = cursor->pRun, *prev; - ME_Run *run; + ME_Run *insert_before = &cursor->pRun->member.run, *run, *prev; if (cursor->nOffset) { - if (cursor->nOffset == cursor->pRun->member.run.len) + if (cursor->nOffset == insert_before->len) { - insert_before = ME_FindItemFwd( cursor->pRun, diRun ); - if (!insert_before) insert_before = cursor->pRun; /* Always insert before the final eop run */ + insert_before = run_next_all_paras( insert_before ); + if (!insert_before) insert_before = &cursor->pRun->member.run; /* Always insert before the final eop run */ } else { run_split( editor, cursor ); - insert_before = cursor->pRun; + insert_before = &cursor->pRun->member.run; } } - add_undo_delete_run( editor, insert_before->member.run.para->nCharOfs + - insert_before->member.run.nCharOfs, len ); + add_undo_delete_run( editor, insert_before->para->nCharOfs + insert_before->nCharOfs, len ); run = run_create( style, flags ); - run->nCharOfs = insert_before->member.run.nCharOfs; + run->nCharOfs = insert_before->nCharOfs; run->len = len; - run->para = insert_before->member.run.para; + run->para = insert_before->para; ME_InsertString( run->para->text, run->nCharOfs, str, len ); - ME_InsertBefore( insert_before, run_get_di( run ) ); + ME_InsertBefore( run_get_di( insert_before ), run_get_di( run ) ); TRACE("Shift length:%d\n", len); - ME_PropagateCharOffset( insert_before, len ); - para_mark_rewrap( editor, insert_before->member.run.para ); + ME_PropagateCharOffset( run_get_di( insert_before ), len ); + para_mark_rewrap( editor, insert_before->para ); /* Move any cursors that were at the end of the previous run to the end of the inserted run */ - prev = ME_FindItemBack( run_get_di( run ), diRun ); + prev = run_prev_all_paras( run ); if (prev) { int i; for (i = 0; i < editor->nCursors; i++) { - if (editor->pCursors[i].pRun == prev && - editor->pCursors[i].nOffset == prev->member.run.len) + if (editor->pCursors[i].pRun == run_get_di( prev ) && + editor->pCursors[i].nOffset == prev->len) { editor->pCursors[i].pRun = run_get_di( run ); editor->pCursors[i].nOffset = len; @@ -404,7 +411,7 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, } } - return run_get_di( run ); + return run; } static BOOL run_is_splittable( const ME_Run *run ) diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 55574dc412..1f5c7ae4cd 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -357,10 +357,9 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) { ME_Cursor tmp; ME_CursorFromCharOfs(editor, undo->u.insert_run.pos, &tmp); - ME_InsertRunAtCursor(editor, &tmp, undo->u.insert_run.style, - undo->u.insert_run.str, - undo->u.insert_run.len, - undo->u.insert_run.flags); + run_insert( editor, &tmp, undo->u.insert_run.style, + undo->u.insert_run.str, undo->u.insert_run.len, + undo->u.insert_run.flags ); break; } case undo_delete_run:

1 0

Huw Davies : riched20: Use run ptrs in SetCharFormat().
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 1797d2124a15371464a19c51ef1d475ad320add5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1797d2124a15371464a19c51… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 11:17:17 2020 +0100 riched20: Use run ptrs in SetCharFormat(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 5 +++-- dlls/riched20/run.c | 38 ++++++++++++++++++++++++-------------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7ae0b5341b..b41d0f7db6 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -76,8 +76,6 @@ ME_DisplayItem *ME_MakeDI(ME_DIType type) DECLSPEC_HIDDEN; void ME_DestroyDisplayItem(ME_DisplayItem *item) DECLSPEC_HIDDEN; void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN; void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) DECLSPEC_HIDDEN; -ME_Run *run_prev( ME_Run *run ) DECLSPEC_HIDDEN; -ME_Run *run_next( ME_Run *run ) DECLSPEC_HIDDEN; /* string.c */ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; @@ -132,6 +130,9 @@ int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset, BOOL visua int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; BOOL ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; void run_join( ME_TextEditor *editor, ME_Run *run ) DECLSPEC_HIDDEN; +ME_Run *run_next( ME_Run *run ) DECLSPEC_HIDDEN; +ME_Run *run_next_all_paras( ME_Run *run ) DECLSPEC_HIDDEN; +ME_Run *run_prev( ME_Run *run ) DECLSPEC_HIDDEN; ME_Run *run_split( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 3f550d8d99..ed0273395c 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -47,6 +47,16 @@ ME_Run *run_prev( ME_Run *run ) return NULL; } +ME_Run *run_next_all_paras( ME_Run *run ) +{ + ME_DisplayItem *item = run_get_di( run ), *dummy = para_get_di( run->para ); + + if (ME_NextRun( &dummy, &item, TRUE )) + return &item->member.run; + + return NULL; +} + /****************************************************************************** * ME_CanJoinRuns * @@ -745,22 +755,22 @@ void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) * * If no text is selected, then nothing is done. */ -void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt) +void ME_SetCharFormat( ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *fmt ) { - ME_DisplayItem *run, *start_run = start->pRun, *end_run = NULL; + ME_Run *run, *start_run = &start->pRun->member.run, *end_run = NULL; if (end && start->pRun == end->pRun && start->nOffset == end->nOffset) return; if (start->nOffset == start->pRun->member.run.len) - start_run = ME_FindItemFwd( start->pRun, diRun ); + start_run = run_next_all_paras( &start->pRun->member.run ); else if (start->nOffset) { /* run_split() may or may not update the cursors, depending on whether they * are selection cursors, but we need to make sure they are valid. */ int split_offset = start->nOffset; ME_Run *split_run = run_split( editor, start ); - start_run = start->pRun; + start_run = &start->pRun->member.run; if (end && &end->pRun->member.run == split_run) { end->pRun = start->pRun; @@ -771,26 +781,26 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C if (end) { if (end->nOffset == end->pRun->member.run.len) - end_run = ME_FindItemFwd( end->pRun, diRun ); + end_run = run_next_all_paras( &end->pRun->member.run ); else { if (end->nOffset) run_split( editor, end ); - end_run = end->pRun; + end_run = &end->pRun->member.run; } } - for (run = start_run; run != end_run; run = ME_FindItemFwd( run, diRun )) + for (run = start_run; run != end_run; run = run_next_all_paras( run )) { - ME_Style *new_style = ME_ApplyStyle(editor, run->member.run.style, pFmt); - ME_Paragraph *para = run->member.run.para; + ME_Style *new_style = ME_ApplyStyle( editor, run->style, fmt ); + ME_Paragraph *para = run->para; - add_undo_set_char_fmt( editor, run->member.run.para->nCharOfs + run->member.run.nCharOfs, - run->member.run.len, &run->member.run.style->fmt ); - ME_ReleaseStyle(run->member.run.style); - run->member.run.style = new_style; + add_undo_set_char_fmt( editor, para->nCharOfs + run->nCharOfs, + run->len, &run->style->fmt ); + ME_ReleaseStyle( run->style ); + run->style = new_style; /* The para numbering style depends on the eop style */ - if ((run->member.run.nFlags & MERF_ENDPARA) && para->para_num.style) + if ((run->nFlags & MERF_ENDPARA) && para->para_num.style) { ME_ReleaseStyle(para->para_num.style); para->para_num.style = NULL;

1 0

Huw Davies : riched20: Don't return the diTextStart paragraph from para_prev().
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: bfac43798bbe3b74b6eeced4251e7a81fe58043e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfac43798bbe3b74b6eeced4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 11:17:16 2020 +0100 riched20: Don't return the diTextStart paragraph from para_prev(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 6 ++---- dlls/riched20/para.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 5f7d52aa4c..c56e5961f7 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -774,12 +774,10 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) { para = run->para; /* Skip empty start of table row paragraph */ - if (para_prev( para )->nFlags & MEPF_ROWSTART) + if (para_prev( para ) && para_prev( para )->nFlags & MEPF_ROWSTART) para = para_prev( para ); /* Paragraph breaks are treated as separate words */ - if (para_get_di( para_prev( para ) )->type == diTextStart) - return FALSE; - + if (!para_prev( para )) return FALSE; para = para_prev( para ); run = para_end_run( para ); } diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 99ce170663..431f89faed 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -64,7 +64,7 @@ ME_Paragraph *para_next( ME_Paragraph *para ) ME_Paragraph *para_prev( ME_Paragraph *para ) { - if (para->prev_para) return &para->prev_para->member.para; + if (para->prev_para && para->prev_para->type == diParagraph) return &para->prev_para->member.para; return NULL; }

1 0

Nikolay Sivov : evr: Add already implemented functions from mfplat.dll.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 5abdd39838bfcf48623ee7ff0f1b682e421c291d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5abdd39838bfcf48623ee7ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 16:03:08 2020 +0300 evr: Add already implemented functions from mfplat.dll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index aa83929565..dcf062cf5a 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -3,14 +3,14 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stub MFConvertColorInfoFromDXVA -@ stub MFConvertColorInfoToDXVA +@ stdcall -import MFConvertColorInfoToDXVA(ptr ptr) @ stub MFConvertFromFP16Array @ stub MFConvertToFP16Array -@ stub MFCopyImage +@ stdcall -import MFCopyImage(ptr long ptr long long long) @ stub MFCreateDXSurfaceBuffer @ stub MFCreateVideoMediaType @ stub MFCreateVideoMediaTypeFromBitMapInfoHeader -@ stub MFCreateVideoMediaTypeFromSubtype +@ stdcall -import MFCreateVideoMediaTypeFromSubtype(ptr ptr) @ stub MFCreateVideoMediaTypeFromVideoInfoHeader2 @ stub MFCreateVideoMediaTypeFromVideoInfoHeader @ stdcall MFCreateVideoMixer(ptr ptr ptr ptr) @@ -20,7 +20,7 @@ @ stdcall MFCreateVideoPresenter(ptr ptr ptr ptr) @ stdcall MFCreateVideoSampleAllocator(ptr ptr) @ stdcall MFCreateVideoSampleFromSurface(ptr ptr) -@ stub MFGetPlaneSize +@ stdcall -import MFGetPlaneSize(long long long ptr) @ stub MFGetStrideForBitmapInfoHeader @ stub MFGetUncompressedVideoFormat @ stub MFInitVideoFormat

1 0

Huw Davies : riched20: Don't mark the diTextStart paragraph as requiring repainting.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 02f4a178ffc80b1ff4beb6e3c4ad569b2ca18cd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02f4a178ffc80b1ff4beb6e3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 11:17:15 2020 +0100 riched20: Don't mark the diTextStart paragraph as requiring repainting. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 393b1784d4..26f1c30b83 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1049,8 +1049,6 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) else totalWidth = max(totalWidth, para->nWidth); - if (!para->nCharOfs) - update_repaint( para_prev( para ), &repaint ); update_repaint( para, &repaint ); adjust_para_y( para, &c, &repaint );

1 0

Hans Leidekker : dssenh: Implement CPGenKey.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 90bb4fe34b5cc78e5e5daef9398337a78a3f46e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90bb4fe34b5cc78e5e5daef9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 11:03:57 2020 +0200 dssenh: Implement CPGenKey. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 143 ++++++++++++++++++++++++++++++++++----------- dlls/dssenh/tests/dssenh.c | 109 +++++++++++++++++----------------- 2 files changed, 164 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90bb4fe34b5cc78e5e5d…

1 0

Hans Leidekker : dssenh: Implement CPVerifySignature.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 52ad894784eb745a74759d2f560b6ef632385e17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52ad894784eb745a74759d2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 11:03:56 2020 +0200 dssenh: Implement CPVerifySignature. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index da269807bf..752189d15b 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -759,7 +759,24 @@ BOOL WINAPI CPSignHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD keyspec, const BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *sig, DWORD siglen, HCRYPTKEY hpubkey, const WCHAR *desc, DWORD flags ) { - return FALSE; + struct hash *hash = (struct hash *)hhash; + struct key *key = (struct key *)hpubkey; + UCHAR hashval[MAX_HASH_LEN]; + ULONG hashlen = sizeof(hashval); + + TRACE( "%p, %p, %p, %u %p, %s, %08x\n", (void *)hprov, (void *)hhash, sig, siglen, (void *)hpubkey, + debugstr_w(desc), flags ); + + if (hash->magic != MAGIC_HASH || key->magic != MAGIC_KEY) return FALSE; + if (flags) + { + FIXME( "flags %08x not supported\n", flags ); + return FALSE; + } + + if (!CPGetHashParam( hprov, hhash, HP_HASHVAL, hashval, &hashlen, 0 )) return FALSE; + + return !BCryptVerifySignature( key->handle, NULL, hashval, hashlen, (UCHAR *)sig, siglen, 0 ); } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

1 0

Henri Verbeet : wined3d: Use wined3d_get_primary_adapter_luid() if we didn't get a valid LUID from Vulkan.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: c677a0b04432666a328ef6acd0e0dc5a034521e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c677a0b04432666a328ef6ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 14 14:25:07 2020 +0330 wined3d: Use wined3d_get_primary_adapter_luid() if we didn't get a valid LUID from Vulkan. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index beda271c32..3fb9e4ce4b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2242,7 +2242,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, struct wined3d_adapter *adapter = &adapter_vk->a; VkPhysicalDeviceIDProperties id_properties; VkPhysicalDeviceProperties2 properties2; - LUID *luid = NULL; + LUID primary_luid, *luid = NULL; TRACE("adapter_vk %p, ordinal %u, wined3d_creation_flags %#x.\n", adapter_vk, ordinal, wined3d_creation_flags); @@ -2274,6 +2274,8 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, if (id_properties.deviceLUIDValid) luid = (LUID *)id_properties.deviceLUID; + else if (ordinal == 0 && wined3d_get_primary_adapter_luid(&primary_luid)) + luid = &primary_luid; if (!wined3d_adapter_init(adapter, ordinal, luid, &wined3d_adapter_vk_ops)) {

1 0

Alexandre Julliard : winebuild: Add __imp_ label on the import data for delayed imports.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 3eaf036b101ba7909ed5f60b3afef9161a2231ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eaf036b101ba7909ed5f60b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 14 21:25:39 2020 +0200 winebuild: Add __imp_ label on the import data for delayed imports. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 0369efa803..62d9844e36 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -959,6 +959,7 @@ static void output_delayed_imports( const DLLSPEC *spec ) { struct import_func *func = &import->imports[j]; const char *name = func->name ? func->name : func->export_name; + output( "__imp_%s:\n", asm_name( name )); output( "\t%s .L__wine_delay_imp_%s_%s\n", get_asm_ptr_keyword(), import->c_name, name ); }

1 0

Jacek Caban : console: Don't allow blocking read ioctls on screen buffer object.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: d3f09b862a3f6b19bbfeba7183c2ced06c030f72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3f09b862a3f6b19bbfeba71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:57:51 2020 +0200 console: Don't allow blocking read ioctls on screen buffer object. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49997 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 18 ++++++++++++++++++ server/console.c | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index da62fd3eb2..ddd5bfcb4c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2981,6 +2981,7 @@ static void test_ReadConsole(HANDLE input) { DWORD ret, bytes; char buf[1024]; + HANDLE output; SetLastError(0xdeadbeef); ret = GetFileSize(input, NULL); @@ -3015,6 +3016,23 @@ static void test_ReadConsole(HANDLE input) GetLastError() == ERROR_NOACCESS, /* Win 8, 10 */ "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", bytes); + + output = CreateFileA("CONOUT$", GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(output != INVALID_HANDLE_VALUE, "Could not open console\n"); + + ret = ReadConsoleW(output, buf, sizeof(buf) / sizeof(WCHAR), &bytes, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "ReadConsoleW returned %x(%u)\n", ret, GetLastError()); + + ret = ReadConsoleA(output, buf, sizeof(buf), &bytes, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "ReadConsoleA returned %x(%u)\n", ret, GetLastError()); + + ret = ReadFile(output, buf, sizeof(buf), &bytes, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "ReadFile returned %x(%u)\n", ret, GetLastError()); + + CloseHandle(output); } static void test_GetCurrentConsoleFont(HANDLE std_output) diff --git a/server/console.c b/server/console.c index 184d98d166..8ac3a08abc 100644 --- a/server/console.c +++ b/server/console.c @@ -848,7 +848,8 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * return 1; default: - if (!screen_buffer->input || !screen_buffer->input->server || code >> 16 != FILE_DEVICE_CONSOLE) + if (!screen_buffer->input || !screen_buffer->input->server || code >> 16 != FILE_DEVICE_CONSOLE || + is_blocking_read_ioctl( code )) { set_error( STATUS_INVALID_HANDLE ); return 0;

1 0

Nikolay Sivov : evr/sample: Implement GetService() for surface buffers.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 0ff8a57257c4c9138f8ecf71f45cd41edbcd7671 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ff8a57257c4c9138f8ecf71… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 16:03:12 2020 +0300 evr/sample: Implement GetService() for surface buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 9 +++++++-- dlls/evr/tests/evr.c | 12 +++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 668e675da2..cd6cef001a 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -1075,9 +1075,14 @@ static ULONG WINAPI surface_buffer_gs_Release(IMFGetService *iface) static HRESULT WINAPI surface_buffer_gs_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) { - FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + struct surface_buffer *buffer = impl_from_IMFGetService(iface); - return E_NOTIMPL; + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + if (IsEqualGUID(service, &MR_BUFFER_SERVICE)) + return IUnknown_QueryInterface(buffer->surface, riid, obj); + + return E_NOINTERFACE; } static const IMFGetServiceVtbl surface_buffer_gs_vtbl = diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 69ee2d3d96..d0e39cb47c 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -718,7 +718,7 @@ todo_wine static void test_surface_sample(void) { - IDirect3DSurface9 *backbuffer = NULL; + IDirect3DSurface9 *backbuffer = NULL, *surface; IMFDesiredSample *desired_sample; IMFMediaBuffer *buffer, *buffer2; LONGLONG duration, time1, time2; @@ -870,6 +870,16 @@ static void test_surface_sample(void) ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); ok(!count, "Unexpected attribute count.\n"); + hr = MFGetService((IUnknown *)buffer, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(surface == backbuffer, "Unexpected instance.\n"); + IDirect3DSurface9_Release(surface); + + hr = MFGetService((IUnknown *)buffer, &MR_BUFFER_SERVICE, &IID_IUnknown, (void **)&surface); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(surface == backbuffer, "Unexpected instance.\n"); + IDirect3DSurface9_Release(surface); + IMFMediaBuffer_Release(buffer); hr = IMFSample_GetSampleFlags(sample, &flags);

1 0

Jacek Caban : kernel32/tests: Use current console input in test_ReadConsole.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 1668db80abe44a833ab3de888d235be53a02f0dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1668db80abe44a833ab3de88… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:57:37 2020 +0200 kernel32/tests: Use current console input in test_ReadConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index b5878fe8a2..da62fd3eb2 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2977,21 +2977,13 @@ static void test_ReadConsoleOutput(HANDLE console) ok(ch == 'z', "unexpected char %c/%x\n", ch, ch); } -static void test_ReadConsole(void) +static void test_ReadConsole(HANDLE input) { - HANDLE std_input; DWORD ret, bytes; char buf[1024]; - std_input = GetStdHandle(STD_INPUT_HANDLE); - SetLastError(0xdeadbeef); - ret = GetFileSize(std_input, NULL); - if (GetLastError() == 0xdeadbeef) - { - skip("stdin is redirected\n"); - return; - } + ret = GetFileSize(input, NULL); ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#x\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_INVALID_FUNCTION, /* Win 8, 10 */ @@ -2999,7 +2991,7 @@ static void test_ReadConsole(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = ReadFile(std_input, buf, -128, &bytes, NULL); + ret = ReadFile(input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || GetLastError() == ERROR_NOACCESS, /* Win 8, 10 */ @@ -3008,7 +3000,7 @@ static void test_ReadConsole(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = ReadConsoleA(std_input, buf, -128, &bytes, NULL); + ret = ReadConsoleA(input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || GetLastError() == ERROR_NOACCESS, /* Win 8, 10 */ @@ -3017,7 +3009,7 @@ static void test_ReadConsole(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = ReadConsoleW(std_input, buf, -128, &bytes, NULL); + ret = ReadConsoleW(input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || GetLastError() == ERROR_NOACCESS, /* Win 8, 10 */ @@ -4213,7 +4205,7 @@ START_TEST(console) ok(sbi.dwSize.Y == size, "Unexpected buffer size: %d instead of %d\n", sbi.dwSize.Y, size); if (!ret) return; - test_ReadConsole(); + test_ReadConsole(hConIn); /* Non interactive tests */ testCursor(hConOut, sbi.dwSize); /* test parameters (FIXME: test functionality) */

1 0

Jacek Caban : server: Remove no longer needed console_input_events_append.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: a40474fa18b1c3a8cd95719328420f7a8e6b7682 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a40474fa18b1c3a8cd957193… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:57:02 2020 +0200 server: Remove no longer needed console_input_events_append. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 55 +------------------------------------------------------ 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/server/console.c b/server/console.c index 9bcacff2c6..2df9ab17bf 100644 --- a/server/console.c +++ b/server/console.c @@ -470,52 +470,6 @@ static int get_renderer_events( struct console_input_events* evts, struct async return 1; } -/* add an event to the console's renderer events list */ -static void console_input_events_append( struct console_input* console, - struct condrv_renderer_event* evt) -{ - struct console_input_events* evts; - int collapsed = FALSE; - struct async *async; - - if (!(evts = console->evt)) return; - /* to be done even when evt has been generated by the renderer ? */ - - /* try to collapse evt into current queue's events */ - if (evts->num_used) - { - struct condrv_renderer_event* last = &evts->events[evts->num_used - 1]; - - if (last->event == CONSOLE_RENDERER_UPDATE_EVENT && - evt->event == CONSOLE_RENDERER_UPDATE_EVENT) - { - /* if two update events overlap, collapse them into a single one */ - if (last->u.update.bottom + 1 >= evt->u.update.top && - evt->u.update.bottom + 1 >= last->u.update.top) - { - last->u.update.top = min(last->u.update.top, evt->u.update.top); - last->u.update.bottom = max(last->u.update.bottom, evt->u.update.bottom); - collapsed = TRUE; - } - } - } - if (!collapsed) - { - if (evts->num_used == evts->num_alloc) - { - evts->num_alloc += 16; - evts->events = realloc( evts->events, evts->num_alloc * sizeof(*evt) ); - assert(evts->events); - } - evts->events[evts->num_used++] = *evt; - } - while (evts->num_used && (async = find_pending_async( &evts->read_q ))) - { - get_renderer_events( evts, async ); - release_object( async ); - } -} - static struct object *create_console_input_events(void) { struct console_input_events* evt; @@ -680,14 +634,7 @@ int free_console( struct process *process ) if (!console) return 0; process->console = NULL; - if (--console->num_proc == 0 && console->renderer) - { - /* all processes have terminated... tell the renderer to terminate too */ - struct condrv_renderer_event evt; - evt.event = CONSOLE_RENDERER_EXIT_EVENT; - memset(&evt.u, 0, sizeof(evt.u)); - console_input_events_append( console, &evt ); - } + console->num_proc--; release_object( console ); return 1;

1 0

Paul Gofman : server: Add SeTcbPrivilege (SE_TCB_NAME) to the list of admin privileges.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 9df7a2efc3cd5b84e494bf73f4d56bc7a0d3d408 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9df7a2efc3cd5b84e494bf73… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Oct 14 16:19:17 2020 +0300 server: Add SeTcbPrivilege (SE_TCB_NAME) to the list of admin privileges. Fixes Origin client update failure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/token.c b/server/token.c index 26d9708f2c..3032085143 100644 --- a/server/token.c +++ b/server/token.c @@ -42,6 +42,7 @@ #define MAX_SUBAUTH_COUNT 1 const LUID SeIncreaseQuotaPrivilege = { 5, 0 }; +const LUID SeTcbPrivilege = { 7, 0 }; const LUID SeSecurityPrivilege = { 8, 0 }; const LUID SeTakeOwnershipPrivilege = { 9, 0 }; const LUID SeLoadDriverPrivilege = { 10, 0 }; @@ -865,6 +866,7 @@ struct token *token_create_admin( void ) const LUID_AND_ATTRIBUTES admin_privs[] = { { SeChangeNotifyPrivilege , SE_PRIVILEGE_ENABLED }, + { SeTcbPrivilege , 0 }, { SeSecurityPrivilege , 0 }, { SeBackupPrivilege , 0 }, { SeRestorePrivilege , 0 },

1 0

Nikolay Sivov : evr/sample: Implement IMFDesiredSample.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 1cb37f7e80ed6f2b17e1938a45bdc8b03a933f10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cb37f7e80ed6f2b17e1938a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 16:03:10 2020 +0300 evr/sample: Implement IMFDesiredSample. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 42 ++++++++++++++++++++++++++++++++++++++---- dlls/evr/tests/evr.c | 31 ++++++++++++++++++++++++++++++- 2 files changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 1073fb1f38..5427833a2c 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -59,6 +59,10 @@ struct video_sample IMFAsyncResult *tracked_result; LONG tracked_refcount; + + LONGLONG desired_time; + LONGLONG desired_duration; + BOOL desired_set; }; static struct video_sample *impl_from_IMFSample(IMFSample *iface) @@ -869,20 +873,50 @@ static ULONG WINAPI desired_video_sample_Release(IMFDesiredSample *iface) static HRESULT WINAPI desired_video_sample_GetDesiredSampleTimeAndDuration(IMFDesiredSample *iface, LONGLONG *sample_time, LONGLONG *sample_duration) { - FIXME("%p, %p, %p.\n", iface, sample_time, sample_duration); + struct video_sample *sample = impl_from_IMFDesiredSample(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, sample_time, sample_duration); + + if (!sample_time || !sample_duration) + return E_POINTER; + + IMFSample_LockStore(sample->sample); + if (sample->desired_set) + { + *sample_time = sample->desired_time; + *sample_duration = sample->desired_duration; + } + else + hr = MF_E_NOT_AVAILABLE; + IMFSample_UnlockStore(sample->sample); + + return hr; } static void WINAPI desired_video_sample_SetDesiredSampleTimeAndDuration(IMFDesiredSample *iface, LONGLONG sample_time, LONGLONG sample_duration) { - FIXME("%p, %s, %s.\n", iface, debugstr_time(sample_time), debugstr_time(sample_duration)); + struct video_sample *sample = impl_from_IMFDesiredSample(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_time(sample_time), debugstr_time(sample_duration)); + + IMFSample_LockStore(sample->sample); + sample->desired_set = TRUE; + sample->desired_time = sample_time; + sample->desired_duration = sample_duration; + IMFSample_UnlockStore(sample->sample); } static void WINAPI desired_video_sample_Clear(IMFDesiredSample *iface) { - FIXME("%p.\n", iface); + struct video_sample *sample = impl_from_IMFDesiredSample(iface); + + TRACE("%p.\n", iface); + + IMFSample_LockStore(sample->sample); + sample->desired_set = FALSE; + IMFSample_UnlockStore(sample->sample); } static const IMFDesiredSampleVtbl desired_video_sample_vtbl = diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 2d4cdc832a..b924ac2d9b 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -721,11 +721,11 @@ static void test_surface_sample(void) IDirect3DSurface9 *backbuffer = NULL; IMFDesiredSample *desired_sample; IMFMediaBuffer *buffer, *buffer2; + LONGLONG duration, time1, time2; IDirect3DSwapChain9 *swapchain; DWORD flags, count, length; IDirect3DDevice9 *device; IMFSample *sample; - LONGLONG duration; IDirect3D9 *d3d; IUnknown *unk; HWND window; @@ -764,8 +764,37 @@ static void test_surface_sample(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!count, "Unexpected attribute count %u.\n", count); + hr = IMFDesiredSample_GetDesiredSampleTimeAndDuration(desired_sample, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFDesiredSample_GetDesiredSampleTimeAndDuration(desired_sample, NULL, &time2); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFDesiredSample_GetDesiredSampleTimeAndDuration(desired_sample, &time1, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFDesiredSample_GetDesiredSampleTimeAndDuration(desired_sample, &time1, &time2); + ok(hr == MF_E_NOT_AVAILABLE, "Unexpected hr %#x.\n", hr); + IMFDesiredSample_SetDesiredSampleTimeAndDuration(desired_sample, 123, 456); + time1 = time2 = 0; + hr = IMFDesiredSample_GetDesiredSampleTimeAndDuration(desired_sample, &time1, &time2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(time1 == 123 && time2 == 456, "Unexpected time values.\n"); + + IMFDesiredSample_SetDesiredSampleTimeAndDuration(desired_sample, 0, 0); + + time1 = time2 = 1; + hr = IMFDesiredSample_GetDesiredSampleTimeAndDuration(desired_sample, &time1, &time2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(time1 == 0 && time2 == 0, "Unexpected time values.\n"); + + IMFDesiredSample_Clear(desired_sample); + + hr = IMFDesiredSample_GetDesiredSampleTimeAndDuration(desired_sample, &time1, &time2); + ok(hr == MF_E_NOT_AVAILABLE, "Unexpected hr %#x.\n", hr); + hr = IMFSample_GetCount(sample, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!count, "Unexpected attribute count %u.\n", count);

1 0

Nikolay Sivov : evr: Partially implement MFCreateVideoSampleFromSurface().
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: db8f8591140edbe8ed97624ce392c857bb5c7053 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db8f8591140edbe8ed97624c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 16:03:09 2020 +0300 evr: Partially implement MFCreateVideoSampleFromSurface(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 7 - dlls/evr/sample.c | 701 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 98 ++++++- 3 files changed, 796 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db8f8591140edbe8ed97…

1 0

Hans Leidekker : dssenh: Implement CPSignHash.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: d176e537b3878e853ef6030e5ce9f0ad67396e72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d176e537b3878e853ef6030e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 11:03:55 2020 +0200 dssenh: Implement CPSignHash. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 34 +++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 12 +++++++----- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index b575689ab1..da269807bf 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -718,10 +718,42 @@ BOOL WINAPI CPDeriveKey( HCRYPTPROV hprov, ALG_ID algid, HCRYPTHASH hhash, DWORD return FALSE; } +static DWORD get_signature_length( DWORD algid ) +{ + switch (algid) + { + case AT_SIGNATURE: + case CALG_DSS_SIGN: return 40; + default: + FIXME( "unhandled algorithm %u\n", algid ); + return 0; + } +} + +#define MAX_HASH_LEN 20 BOOL WINAPI CPSignHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD keyspec, const WCHAR *desc, DWORD flags, BYTE *sig, DWORD *siglen ) { - return FALSE; + struct container *container = (struct container *)hprov; + struct hash *hash = (struct hash *)hhash; + UCHAR hashval[MAX_HASH_LEN]; + ULONG len, hashlen = sizeof(hashval); + + TRACE( "%p, %p, %u, %s, %08x, %p, %p\n", (void *)hprov, (void *)hhash, keyspec, debugstr_w(desc), flags, sig, + siglen ); + + if (container->magic != MAGIC_CONTAINER || !container->sign_key) return FALSE; + if (hash->magic != MAGIC_HASH) return FALSE; + + if (!(len = get_signature_length( container->sign_key->algid ))) return FALSE; + if (!CPGetHashParam( hprov, hhash, HP_HASHVAL, hashval, &hashlen, 0 )) return FALSE; + if (*siglen < len) + { + *siglen = len; + return TRUE; + } + + return !BCryptSignHash( container->sign_key->handle, NULL, hashval, hashlen, sig, *siglen, siglen, 0 ); } BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *sig, DWORD siglen, HCRYPTKEY hpubkey, diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 6ad1522592..c2ab37d288 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -889,12 +889,8 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t ok(!memcmp(hashValue1, hashValue2, hashLen2), "Hashes were not identical.\n"); /* Sign hash 1 */ + signLen1 = 0; result = CryptSignHashA(hHash1, AT_SIGNATURE, NULL, 0, NULL, &signLen1); - if (!result) - { - skip("skipping sign tests\n"); - return; - } ok(result, "Failed to get signature length, got %x\n", GetLastError()); ok(signLen1 == 40, "Expected a 40-byte signature, got %d\n", signLen1); @@ -902,6 +898,7 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t ok(result, "Failed to sign hash, got %x\n", GetLastError()); /* Sign hash 2 */ + signLen2 = 0; result = CryptSignHashA(hHash2, AT_SIGNATURE, NULL, 0, NULL, &signLen2); ok(result, "Failed to get signature length, got %x\n", GetLastError()); ok(signLen2 == 40, "Expected a 40-byte signature, got %d\n", signLen2); @@ -943,6 +940,11 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t /* Verify signed hash 1 */ result = CryptVerifySignatureA(hHash1, signValue1, sizeof(signValue1), pubKey, NULL, 0); + if (!result) + { + skip("skipping sign tests\n"); + return; + } ok(result, "Failed to verify signature, got %x\n", GetLastError()); result = CryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash2);

1 0

Hans Leidekker : dssenh: Implement CPExportKey.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: e1374be7363d89be0e8f002ee4f6309e129d7184 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1374be7363d89be0e8f002e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 11:03:54 2020 +0200 dssenh: Implement CPExportKey. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 38f249ef04..b575689ab1 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #include <stdarg.h> #include "windef.h" @@ -469,7 +468,29 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DWORD blobtype, DWORD flags, BYTE *data, DWORD *len ) { - return FALSE; + struct key *key = (struct key *)hkey; + + TRACE( "%p, %p, %p, %08x, %08x, %p, %p\n", (void *)hprov, (void *)hkey, (void *)hexpkey, blobtype, flags, + data, len ); + + if (key->magic != MAGIC_KEY) return FALSE; + if (hexpkey) + { + FIXME( "export key not supported\n" ); + return FALSE; + } + if (blobtype != PUBLICKEYBLOB) + { + FIXME( "blob type %u not supported\n", blobtype ); + return FALSE; + } + if (flags) + { + FIXME( "flags %08x not supported\n", flags ); + return FALSE; + } + + return !BCryptExportKey( key->handle, NULL, LEGACY_DSA_V2_PUBLIC_BLOB, data, *len, len, 0 ); } static struct key *duplicate_key( const struct key *key )

1 0

Georg Lehmann : winevulkan: Generate helpers for wrapped handles.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: e2518f6887f981f8f8f89807a0ca2bfba65dbeca URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2518f6887f981f8f8f89807… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 13 19:28:35 2020 +0200 winevulkan: Generate helpers for wrapped handles. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 81 ++++++++++++++++++++++++++++++++++------ dlls/winevulkan/vulkan.c | 21 +---------- dlls/winevulkan/vulkan_private.h | 3 ++ dlls/winevulkan/vulkan_thunks.c | 32 ++++++++++++++++ 4 files changed, 106 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e2518f6887f981f8f8f8…

1 0

Georg Lehmann : winevulkan: Store a mapping from native handles to wrappers.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: af3d292343034b87403b1c8738e29bd3479fe87e URL: https://source.winehq.org/git/wine.git/?a=commit;h=af3d292343034b87403b1c87… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 13 19:28:36 2020 +0200 winevulkan: Store a mapping from native handles to wrappers. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 74 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 26 ++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 3d1e8bd0ab..c140ff3a0e 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -66,11 +66,59 @@ static VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *version); void WINAPI wine_vkGetPhysicalDeviceProperties(VkPhysicalDevice physical_device, VkPhysicalDeviceProperties *properties); +#define WINE_VK_ADD_DISPATCHABLE_MAPPING(instance, object, native_handle) \ + wine_vk_add_handle_mapping((instance), (uint64_t) (uintptr_t) (object), (uint64_t) (uintptr_t) (native_handle), &(object)->mapping) +#define WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, native_handle) \ + wine_vk_add_handle_mapping((instance), (uint64_t) (uintptr_t) (object), (uint64_t) (native_handle), &(object)->mapping) +static void wine_vk_add_handle_mapping(struct VkInstance_T *instance, uint64_t wrapped_handle, + uint64_t native_handle, struct wine_vk_mapping *mapping) +{ + if (instance->enable_wrapper_list) + { + mapping->native_handle = native_handle; + mapping->wine_wrapped_handle = wrapped_handle; + AcquireSRWLockExclusive(&instance->wrapper_lock); + list_add_tail(&instance->wrappers, &mapping->link); + ReleaseSRWLockExclusive(&instance->wrapper_lock); + } +} + +#define WINE_VK_REMOVE_HANDLE_MAPPING(instance, object) \ + wine_vk_remove_handle_mapping((instance), &(object)->mapping) +static void wine_vk_remove_handle_mapping(struct VkInstance_T *instance, struct wine_vk_mapping *mapping) +{ + if (instance->enable_wrapper_list) + { + AcquireSRWLockExclusive(&instance->wrapper_lock); + list_remove(&mapping->link); + ReleaseSRWLockExclusive(&instance->wrapper_lock); + } +} + +static uint64_t wine_vk_get_wrapper(struct VkInstance_T *instance, uint64_t native_handle) +{ + struct wine_vk_mapping *mapping; + uint64_t result = 0; + + AcquireSRWLockShared(&instance->wrapper_lock); + LIST_FOR_EACH_ENTRY(mapping, &instance->wrappers, struct wine_vk_mapping, link) + { + if (mapping->native_handle == native_handle) + { + result = mapping->wine_wrapped_handle; + break; + } + } + ReleaseSRWLockShared(&instance->wrapper_lock); + return result; +} + static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) { if (!phys_dev) return; + WINE_VK_REMOVE_HANDLE_MAPPING(phys_dev->instance, phys_dev); heap_free(phys_dev->extensions); heap_free(phys_dev); } @@ -91,6 +139,8 @@ static struct VkPhysicalDevice_T *wine_vk_physical_device_alloc(struct VkInstanc object->instance = instance; object->phys_dev = phys_dev; + WINE_VK_ADD_DISPATCHABLE_MAPPING(instance, object, phys_dev); + res = instance->funcs.p_vkEnumerateDeviceExtensionProperties(phys_dev, NULL, &num_host_properties, NULL); if (res != VK_SUCCESS) @@ -169,6 +219,7 @@ static void wine_vk_free_command_buffers(struct VkDevice_T *device, device->funcs.p_vkFreeCommandBuffers(device->device, pool->command_pool, 1, &buffers[i]->command_buffer); list_remove(&buffers[i]->pool_link); + WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, buffers[i]); heap_free(buffers[i]); } } @@ -212,6 +263,8 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, { device->funcs.p_vkGetDeviceQueue(device->device, family_index, i, &queue->queue); } + + WINE_VK_ADD_DISPATCHABLE_MAPPING(device->phys_dev->instance, queue, queue->queue); } return queues; @@ -294,6 +347,8 @@ static void wine_vk_device_free(struct VkDevice_T *device) unsigned int i; for (i = 0; i < device->max_queue_families; i++) { + if (device->queues[i] && device->queues[i]->queue) + WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, device->queues[i]); heap_free(device->queues[i]); } heap_free(device->queues); @@ -302,6 +357,7 @@ static void wine_vk_device_free(struct VkDevice_T *device) if (device->device && device->funcs.p_vkDestroyDevice) { + WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, device); device->funcs.p_vkDestroyDevice(device->device, NULL /* pAllocator */); } @@ -466,7 +522,10 @@ static void wine_vk_instance_free(struct VkInstance_T *instance) } if (instance->instance) + { vk_funcs->p_vkDestroyInstance(instance->instance, NULL /* allocator */); + WINE_VK_REMOVE_HANDLE_MAPPING(instance, instance); + } heap_free(instance); } @@ -512,6 +571,7 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, list_add_tail(&pool->command_buffers, &buffers[i]->pool_link); res = device->funcs.p_vkAllocateCommandBuffers(device->device, &allocate_info_host, &buffers[i]->command_buffer); + WINE_VK_ADD_DISPATCHABLE_MAPPING(device->phys_dev->instance, buffers[i], buffers[i]->command_buffer); if (res != VK_SUCCESS) { ERR("Failed to allocate command buffer, res=%d.\n", res); @@ -589,6 +649,7 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, return VK_ERROR_OUT_OF_HOST_MEMORY; object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; + object->phys_dev = phys_dev; res = wine_vk_device_convert_create_info(create_info, &create_info_host); if (res != VK_SUCCESS) @@ -597,6 +658,7 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, res = phys_dev->instance->funcs.p_vkCreateDevice(phys_dev->phys_dev, &create_info_host, NULL /* allocator */, &object->device); wine_vk_device_free_create_info(&create_info_host); + WINE_VK_ADD_DISPATCHABLE_MAPPING(phys_dev->instance, object, object->device); if (res != VK_SUCCESS) { WARN("Failed to create device, res=%d.\n", res); @@ -678,6 +740,8 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, return VK_ERROR_OUT_OF_HOST_MEMORY; } object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; + list_init(&object->wrappers); + InitializeSRWLock(&object->wrapper_lock); res = wine_vk_instance_convert_create_info(create_info, &create_info_host, object); if (res != VK_SUCCESS) @@ -695,6 +759,8 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, return res; } + WINE_VK_ADD_DISPATCHABLE_MAPPING(object, object, object->instance); + /* Load all instance functions we are aware of. Note the loader takes care * of any filtering for extensions which were not requested, but which the * ICD may support. @@ -1129,9 +1195,14 @@ VkResult WINAPI wine_vkCreateCommandPool(VkDevice device, const VkCommandPoolCre res = device->funcs.p_vkCreateCommandPool(device->device, info, NULL, &object->command_pool); if (res == VK_SUCCESS) + { + WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(device->phys_dev->instance, object, object->command_pool); *command_pool = wine_cmd_pool_to_handle(object); + } else + { heap_free(object); + } return res; } @@ -1156,9 +1227,12 @@ void WINAPI wine_vkDestroyCommandPool(VkDevice device, VkCommandPool handle, */ LIST_FOR_EACH_ENTRY_SAFE(buffer, cursor, &pool->command_buffers, struct VkCommandBuffer_T, pool_link) { + WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, buffer); heap_free(buffer); } + WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, pool); + device->funcs.p_vkDestroyCommandPool(device->device, pool->command_pool, NULL); heap_free(pool); } diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index bf09401c52..959a813a21 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -60,6 +60,16 @@ struct wine_vk_base UINT_PTR loader_magic; }; +/* Some extensions have callbacks for those we need to be able to + * get the wine wrapper for a native handle + */ +struct wine_vk_mapping +{ + struct list link; + uint64_t native_handle; + uint64_t wine_wrapped_handle; +}; + struct VkCommandBuffer_T { struct wine_vk_base base; @@ -67,18 +77,22 @@ struct VkCommandBuffer_T VkCommandBuffer command_buffer; /* native command buffer */ struct list pool_link; + struct wine_vk_mapping mapping; }; struct VkDevice_T { struct wine_vk_base base; struct vulkan_device_funcs funcs; + struct VkPhysicalDevice_T *phys_dev; /* parent */ VkDevice device; /* native device */ struct VkQueue_T **queues; uint32_t max_queue_families; unsigned int quirks; + + struct wine_vk_mapping mapping; }; struct VkInstance_T @@ -93,7 +107,13 @@ struct VkInstance_T struct VkPhysicalDevice_T **phys_devs; uint32_t phys_dev_count; + VkBool32 enable_wrapper_list; + struct list wrappers; + SRWLOCK wrapper_lock; + unsigned int quirks; + + struct wine_vk_mapping mapping; }; struct VkPhysicalDevice_T @@ -104,6 +124,8 @@ struct VkPhysicalDevice_T VkExtensionProperties *extensions; uint32_t extension_count; + + struct wine_vk_mapping mapping; }; struct VkQueue_T @@ -113,6 +135,8 @@ struct VkQueue_T VkQueue queue; /* native queue */ VkDeviceQueueCreateFlags flags; + + struct wine_vk_mapping mapping; }; struct wine_cmd_pool @@ -120,6 +144,8 @@ struct wine_cmd_pool VkCommandPool command_pool; struct list command_buffers; + + struct wine_vk_mapping mapping; }; static inline struct wine_cmd_pool *wine_cmd_pool_from_handle(VkCommandPool handle)

1 0

Hans Leidekker : bcrypt: Add support for duplicating asymmetric keys.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 6decf1730509b9aa697e0fd4c6fdd5da63c9af37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6decf1730509b9aa697e0fd4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 11:03:53 2020 +0200 bcrypt: Add support for duplicating asymmetric keys. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 97 +++++++++++++++++++++++-------------------- dlls/bcrypt/gnutls.c | 94 +++++++++++++++++++++++++++++++++++++++++ dlls/bcrypt/macos.c | 7 ++++ 4 files changed, 155 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6decf1730509b9aa697e…

1 0

Zebediah Figura : strmbase: Print colorimetry information in strmbase_dump_media_type().
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: ff01e58f732e027164a95189d29d5c794c32754c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff01e58f732e027164a95189… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 13 23:30:26 2020 -0500 strmbase: Print colorimetry information in strmbase_dump_media_type(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 9 ++++++ include/dvdmedia.h | 1 + include/dxva.h | 82 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index c2560352aa..9544d1b8ba 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -21,6 +21,7 @@ #include "strmbase_private.h" #include "dvdmedia.h" +#include "dxva.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); @@ -132,6 +133,14 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt) if (vih->dwCopyProtectFlags) TRACE("copy-protection flags %#x, ", vih->dwCopyProtectFlags); TRACE("aspect ratio %u/%u, ", vih->dwPictAspectRatioX, vih->dwPictAspectRatioY); if (vih->u.dwControlFlags) TRACE("control flags %#x, ", vih->u.dwControlFlags); + if (vih->u.dwControlFlags & AMCONTROL_COLORINFO_PRESENT) + { + const DXVA_ExtendedFormat *colorimetry = (const DXVA_ExtendedFormat *)&vih->u.dwControlFlags; + + TRACE("chroma site %#x, range %#x, matrix %#x, lighting %#x, primaries %#x, transfer function %#x, ", + colorimetry->VideoChromaSubsampling, colorimetry->NominalRange, colorimetry->VideoTransferMatrix, + colorimetry->VideoLighting, colorimetry->VideoPrimaries, colorimetry->VideoTransferFunction); + } TRACE("size %dx%d, %u planes, %u bpp, compression %s, image size %u", vih->bmiHeader.biWidth, vih->bmiHeader.biHeight, vih->bmiHeader.biPlanes, vih->bmiHeader.biBitCount, debugstr_fourcc(vih->bmiHeader.biCompression), diff --git a/include/dvdmedia.h b/include/dvdmedia.h index daf1c9d37c..6e625b472f 100644 --- a/include/dvdmedia.h +++ b/include/dvdmedia.h @@ -22,6 +22,7 @@ #define AMCONTROL_USED 0x00000001 #define AMCONTROL_PAD_TO_4x3 0x00000002 #define AMCONTROL_PAD_TO_16x9 0x00000004 +#define AMCONTROL_COLORINFO_PRESENT 0x00000080 typedef struct tagVIDEOINFOHEADER2 { RECT rcSource; diff --git a/include/dxva.h b/include/dxva.h index 25354f5887..4f18f2e60d 100644 --- a/include/dxva.h +++ b/include/dxva.h @@ -565,6 +565,88 @@ typedef struct _DXVA_Status_VPx #include <poppack.h> +typedef enum _DXVA_VideoChromaSubsampling +{ + DXVA_VideoChromaSubsampling_Vertically_AlignedChromaPlanes = 0x1, + DXVA_VideoChromaSubsampling_Vertically_Cosited = 0x2, + DXVA_VideoChromaSubsampling_Horizontally_Cosited = 0x4, + DXVA_VideoChromaSubsampling_ProgressiveChroma = 0x8, + + DXVA_VideoChromaSubsampling_Unknown = 0, + DXVA_VideoChromaSubsampling_Cosited = DXVA_VideoChromaSubsampling_Vertically_AlignedChromaPlanes + | DXVA_VideoChromaSubsampling_Vertically_Cosited + | DXVA_VideoChromaSubsampling_Horizontally_Cosited, + DXVA_VideoChromaSubsampling_DV_PAL = DXVA_VideoChromaSubsampling_Vertically_Cosited + | DXVA_VideoChromaSubsampling_Horizontally_Cosited, + DXVA_VideoChromaSubsampling_MPEG1 = DXVA_VideoChromaSubsampling_Vertically_AlignedChromaPlanes, + DXVA_VideoChromaSubsampling_MPEG2 = DXVA_VideoChromaSubsampling_Vertically_AlignedChromaPlanes + | DXVA_VideoChromaSubsampling_Horizontally_Cosited, +} DXVA_VideoChromaSubsampling; + +typedef enum _DXVA_NominalRange +{ + DXVA_NominalRange_Unknown = 0, + DXVA_NominalRange_0_255 = 1, + DXVA_NominalRange_16_235 = 2, + DXVA_NominalRange_48_208 = 3, + DXVA_NominalRange_Normal = DXVA_NominalRange_0_255, + DXVA_NominalRange_Wide = DXVA_NominalRange_16_235, +} DXVA_NominalRange; + +typedef enum _DXVA_VideoTransferMatrix +{ + DXVA_VideoTransferMatrix_Unknown = 0, + DXVA_VideoTransferMatrix_BT709 = 1, + DXVA_VideoTransferMatrix_BT601 = 2, + DXVA_VideoTransferMatrix_SMPTE240M = 3, +} DXVA_VideoTransferMatrix; + +typedef enum _DXVA_VideoLighting +{ + DXVA_VideoLighting_Unknown = 0, + DXVA_VideoLighting_bright = 1, + DXVA_VideoLighting_office = 2, + DXVA_VideoLighting_dim = 3, + DXVA_VideoLighting_dark = 4, +} DXVA_VideoLighting; + +typedef enum _DXVA_VideoPrimaries +{ + DXVA_VideoPrimaries_Unknown = 0, + DXVA_VideoPrimaries_reserved = 1, + DXVA_VideoPrimaries_BT709 = 2, + DXVA_VideoPrimaries_BT470_2_SysM = 3, + DXVA_VideoPrimaries_BT470_2_SysBG = 4, + DXVA_VideoPrimaries_SMPTE170M = 5, + DXVA_VideoPrimaries_SMPTE420M = 6, + DXVA_VideoPrimaries_EBU3213 = 7, + DXVA_VideoPrimaries_SMPTE_C = 8, +} DXVA_VideoPrimaries; + +typedef enum _DXVA_VideoTransferFunction +{ + DXVA_VideoTransFunc_Unknown = 0, + DXVA_VideoTransFunc_10 = 1, + DXVA_VideoTransFunc_18 = 2, + DXVA_VideoTransFunc_20 = 3, + DXVA_VideoTransFunc_22 = 4, + DXVA_VideoTransFunc_22_709 = 5, + DXVA_VideoTransFunc_22_240M = 6, + DXVA_VideoTransFunc_22_8bit_sRGB = 7, + DXVA_VideoTransFunc_28 = 8, +} DXVA_VideoTransferFunction; + +typedef struct _DXVA_ExtendedFormat +{ + UINT SampleFormat : 8; + UINT VideoChromaSubsampling : 4; + DXVA_NominalRange NominalRange : 3; + DXVA_VideoTransferMatrix VideoTransferMatrix : 3; + DXVA_VideoLighting VideoLighting : 4; + DXVA_VideoPrimaries VideoPrimaries : 5; + DXVA_VideoTransferFunction VideoTransferFunction : 5; +} DXVA_ExtendedFormat; + #ifdef __cplusplus } #endif

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: af33515989384d4090444c7c5d49776ddc16c5e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af33515989384d4090444c7c… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Oct 14 12:01:19 2020 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index fb345e143e..b9003e98d4 100644 --- a/po/lt.po +++ b/po/lt.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-10-08 00:09+0300\n" +"PO-Revision-Date: 2020-10-14 12:00+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10562,16 +10562,12 @@ msgid "Egypt Daylight Time" msgstr "Egipto vasaros laikas" #: dlls/tzres/tzres.rc:104 -#, fuzzy -#| msgid "Central Standard Time (Mexico)" msgid "Eastern Standard Time (Mexico)" -msgstr "Centrinis juostinis laikas (Meksika)" +msgstr "Rytinis juostinis laikas (Meksika)" #: dlls/tzres/tzres.rc:105 -#, fuzzy -#| msgid "Central Daylight Time (Mexico)" msgid "Eastern Daylight Time (Mexico)" -msgstr "Centrinis vasaros laikas (Meksika)" +msgstr "Rytinis vasaros laikas (Meksika)" #: dlls/tzres/tzres.rc:148 msgid "Mauritius Standard Time"

1 0

Paul Gofman : kernelbase: Fix status check in GetExitCodeProcess().
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 976fa1b4919ded326c7322a623120881a584d8aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=976fa1b4919ded326c7322a6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Oct 14 11:20:08 2020 +0300 kernelbase: Fix status check in GetExitCodeProcess(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 0f707f82d1..57f0721f39 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -746,7 +746,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetExitCodeProcess( HANDLE process, LPDWORD exit_c PROCESS_BASIC_INFORMATION pbi; status = NtQueryInformationProcess( process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); - if (status && exit_code) *exit_code = pbi.ExitStatus; + if (!status && exit_code) *exit_code = pbi.ExitStatus; return set_ntstatus( status ); }

1 0

Myah Caron : kernelbase: Remove DECLSPEC_HOTPATCH for GetCommandLine[AW].
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: 8a1933bbe40b67d22d919861deed9a7a68684433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a1933bbe40b67d22d919861… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Tue Oct 13 19:43:31 2020 +0000 kernelbase: Remove DECLSPEC_HOTPATCH for GetCommandLine[AW]. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48861 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index d5fedb4495..0f707f82d1 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1278,7 +1278,7 @@ BOOL WINAPI BaseFlushAppcompatCache(void) /*********************************************************************** * GetCommandLineA (kernelbase.@) */ -LPSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineA(void) +LPSTR WINAPI GetCommandLineA(void) { return command_lineA; } @@ -1287,7 +1287,7 @@ LPSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineA(void) /*********************************************************************** * GetCommandLineW (kernelbase.@) */ -LPWSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineW(void) +LPWSTR WINAPI GetCommandLineW(void) { return command_lineW; }

1 0

Myah Caron : kernelbase: Use command_lineW for GetCommandLineW.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: d01d3b749d7d99c75f29396fd79fab735ced2b2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d01d3b749d7d99c75f29396f… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Tue Oct 13 19:43:01 2020 +0000 kernelbase: Use command_lineW for GetCommandLineW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48861 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 11 +++++++++++ dlls/kernelbase/process.c | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 109322d684..7c6a0ff0a8 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -872,6 +872,7 @@ static void test_CommandLine(void) PROCESS_INFORMATION info; STARTUPINFOA startup; BOOL ret; + LPWSTR cmdline, cmdline_backup; memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -1074,6 +1075,16 @@ static void test_CommandLine(void) ret = CreateProcessA(NULL, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(!ret, "CreateProcessA unexpectedly succeeded\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + + /* Test whether GetCommandLineW reads directly from TEB or from a cached address */ + cmdline = GetCommandLineW(); + ok(cmdline == NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer, "Expected address from TEB, got %p\n", cmdline); + + cmdline_backup = cmdline; + NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer = NULL; + cmdline = GetCommandLineW(); + ok(cmdline == cmdline_backup, "Expected cached address from TEB, got %p\n", cmdline); + NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer = cmdline_backup; } static void test_Directory(void) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index e7998c00f2..d5fedb4495 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1289,7 +1289,7 @@ LPSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineA(void) */ LPWSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineW(void) { - return NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer; + return command_lineW; }

1 0

Georg Lehmann : winevulkan: Implement VK_EXT_debug_utils.
by Alexandre Julliard Oct. 14, 2020

Oct. 14, 2020

Module: wine Branch: master Commit: bff6bc6a79ffc3a915219a6dfe64c9bcabaaeceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bff6bc6a79ffc3a915219a6d… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 13 19:28:37 2020 +0200 winevulkan: Implement VK_EXT_debug_utils. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49813 Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 10 +- dlls/winevulkan/vulkan.c | 207 +++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 29 ++++++ dlls/winevulkan/vulkan_thunks.c | 190 +++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 83 +++++++++++++++- include/wine/vulkan.h | 109 +++++++++++++++++++++ 6 files changed, 626 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bff6bc6a79ffc3a91521…

1 0

Paul Gofman : ntdll/tests: Test getting and setting AVX registers for the other thread.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 4e52f7ca865abf22c299501447805ab435399e27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e52f7ca865abf22c2995014… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 9 16:03:55 2020 +0300 ntdll/tests: Test getting and setting AVX registers for the other thread. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 362 ++++++++++++++++++++++++++++++------------- 1 file changed, 253 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4e52f7ca865abf22c299…

1 0

Paul Gofman : ntdll/tests: Test AVX context with debugger.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: fa409a91b0f13e478a43c9adc84d3c870bbae432 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa409a91b0f13e478a43c9ad… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 9 16:03:56 2020 +0300 ntdll/tests: Test AVX context with debugger. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 144 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 127 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 07b813ac1f..b2331b739a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -189,6 +189,67 @@ static BOOL is_wow64; static BOOL have_vectored_api; static int test_stage; +#if defined(__i386__) || defined(__x86_64__) +static void test_debugger_xstate(HANDLE thread, CONTEXT *ctx, int stage) +{ + char context_buffer[sizeof(CONTEXT) + sizeof(CONTEXT_EX) + sizeof(XSTATE) + 63]; + CONTEXT_EX *c_ex; + NTSTATUS status; + YMMCONTEXT *ymm; + CONTEXT *xctx; + DWORD length; + XSTATE *xs; + M128A *xmm; + BOOL bret; + + if (!pRtlGetEnabledExtendedFeatures || !pRtlGetEnabledExtendedFeatures(1 << XSTATE_AVX)) + return; + + if (stage == 14) + return; + + length = sizeof(context_buffer); + bret = pInitializeContext(context_buffer, ctx->ContextFlags | CONTEXT_XSTATE, &xctx, &length); + ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + + ymm = pLocateXStateFeature(xctx, XSTATE_AVX, &length); + ok(!!ymm, "Got zero ymm.\n"); + memset(ymm, 0xcc, sizeof(*ymm)); + + xmm = pLocateXStateFeature(xctx, XSTATE_LEGACY_SSE, &length); + ok(length == sizeof(*xmm) * (sizeof(void *) == 8 ? 16 : 8), "Got unexpected length %#x.\n", length); + ok(!!xmm, "Got zero xmm.\n"); + memset(xmm, 0xcc, length); + + status = pNtGetContextThread(thread, xctx); + ok(!status, "NtSetContextThread failed with 0x%x\n", status); + + c_ex = (CONTEXT_EX *)(xctx + 1); + xs = (XSTATE *)((char *)c_ex + c_ex->XState.Offset); + ok((xs->Mask & 7) == 4 || broken(!xs->Mask) /* Win7 */, + "Got unexpected xs->Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + + ok(xmm[0].Low == 0x200000001, "Got unexpected data %s.\n", wine_dbgstr_longlong(xmm[0].Low)); + ok(xmm[0].High == 0x400000003, "Got unexpected data %s.\n", wine_dbgstr_longlong(xmm[0].High)); + + ok(ymm->Ymm0.Low == 0x600000005 || broken(!xs->Mask && ymm->Ymm0.Low == 0xcccccccccccccccc) /* Win7 */, + "Got unexpected data %s.\n", wine_dbgstr_longlong(ymm->Ymm0.Low)); + ok(ymm->Ymm0.High == 0x800000007 || broken(!xs->Mask && ymm->Ymm0.High == 0xcccccccccccccccc) /* Win7 */, + "Got unexpected data %s.\n", wine_dbgstr_longlong(ymm->Ymm0.High)); + + xmm = pLocateXStateFeature(ctx, XSTATE_LEGACY_SSE, &length); + ok(!!xmm, "Got zero xmm.\n"); + + xmm[0].Low = 0x2828282828282828; + xmm[0].High = xmm[0].Low; + ymm->Ymm0.Low = 0x4848484848484848; + ymm->Ymm0.High = ymm->Ymm0.Low; + + status = pNtSetContextThread(thread, xctx); + ok(!status, "NtSetContextThread failed with 0x%x\n", status); +} +#endif + #ifdef __i386__ #ifndef __WINE_WINTRNL_H @@ -1055,7 +1116,7 @@ static void test_debugger(void) sizeof(stage), &size_read); ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); - ctx.ContextFlags = CONTEXT_FULL; + ctx.ContextFlags = CONTEXT_FULL | CONTEXT_EXTENDED_REGISTERS; status = pNtGetContextThread(pi.hThread, &ctx); ok(!status, "NtGetContextThread failed with 0x%x\n", status); @@ -1156,6 +1217,10 @@ static void test_debugger(void) if (stage == 12|| stage == 13) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } + else if (stage == 14 || stage == 15) + { + test_debugger_xstate(pi.hThread, &ctx, stage); + } else ok(FALSE, "unexpected stage %x\n", stage); @@ -3331,6 +3396,10 @@ static void test_debugger(void) if (stage == 12|| stage == 13) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } + else if (stage == 14 || stage == 15) + { + test_debugger_xstate(pi.hThread, &ctx, stage); + } else ok(FALSE, "unexpected stage %x\n", stage); @@ -5957,6 +6026,57 @@ static void test_breakpoint(DWORD numexc) pRtlRemoveVectoredExceptionHandler(vectored_handler); } +#if defined(__i386__) || defined(__x86_64__) +static BYTE except_code_set_ymm0[] = +{ +#ifdef __x86_64__ + 0x48, +#endif + 0xb8, /* mov imm,%ax */ + 0x00, 0x00, 0x00, 0x00, +#ifdef __x86_64__ + 0x00, 0x00, 0x00, 0x00, +#endif + + 0xc5, 0xfc, 0x10, 0x00, /* vmovups (%ax),%ymm0 */ + 0xcc, /* int3 */ + 0xc5, 0xfc, 0x11, 0x00, /* vmovups %ymm0,(%ax) */ + 0xc3, /* ret */ +}; + +static void test_debuggee_xstate(void) +{ + void (CDECL *func)(void) = code_mem; + unsigned int address_offset, i; + unsigned int data[8]; + + if (!pRtlGetEnabledExtendedFeatures || !pRtlGetEnabledExtendedFeatures(1 << XSTATE_AVX)) + { + memcpy(code_mem, breakpoint_code, sizeof(breakpoint_code)); + func(); + return; + } + + memcpy(code_mem, except_code_set_ymm0, sizeof(except_code_set_ymm0)); + address_offset = sizeof(void *) == 8 ? 2 : 1; + *(void **)((BYTE *)code_mem + address_offset) = data; + + for (i = 0; i < ARRAY_SIZE(data); ++i) + data[i] = i + 1; + + func(); + + for (i = 0; i < 4; ++i) + ok(data[i] == (test_stage == 14 ? i + 1 : 0x28282828), + "Got unexpected data %#x, test_stage %u, i %u.\n", data[i], test_stage, i); + + for ( ; i < ARRAY_SIZE(data); ++i) + ok(data[i] == (test_stage == 14 ? i + 1 : 0x48484848) + || broken(test_stage == 15 && data[i] == i + 1) /* Win7 */, + "Got unexpected data %#x, test_stage %u, i %u.\n", data[i], test_stage, i); +} +#endif + static DWORD invalid_handle_exceptions; static LONG CALLBACK invalid_handle_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) @@ -6593,22 +6713,6 @@ static void wait_for_thread_next_suspend(HANDLE thread) static void test_extended_context(void) { - static BYTE except_code_set_ymm0[] = - { -#ifdef __x86_64__ - 0x48, -#endif - 0xb8, /* mov imm,%ax */ - 0x00, 0x00, 0x00, 0x00, -#ifdef __x86_64__ - 0x00, 0x00, 0x00, 0x00, -#endif - - 0xc5, 0xfc, 0x10, 0x00, /* vmovups (%ax),%ymm0 */ - 0xcc, /* int3 */ - 0xc5, 0xfc, 0x11, 0x00, /* vmovups %ymm0,(%ax) */ - 0xc3, /* ret */ - }; static BYTE except_code_reset_ymm_state[] = { #ifdef __x86_64__ @@ -8029,6 +8133,12 @@ START_TEST(exception) test_closehandle(1, (HANDLE)0xdeadbeef); test_stage = 13; test_closehandle(0, 0); /* Special case. */ +#if defined(__i386__) || defined(__x86_64__) + test_stage = 14; + test_debuggee_xstate(); + test_stage = 15; + test_debuggee_xstate(); +#endif /* rest of tests only run in parent */ return;

1 0

Brendan Shanks : mountmgr: Avoid unnecessary permission prompts on macOS 10.15 and newer.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 33c8a4254715c5f3b71b23fc657c6ba5eee94ce9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33c8a4254715c5f3b71b23fc… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Oct 6 13:36:28 2020 -0700 mountmgr: Avoid unnecessary permission prompts on macOS 10.15 and newer. On macOS 10.15 and newer, trying to open the device node of a removable drive will trigger an "<app> would like to access files on a removable volume" permission prompt, even if the user doesn't have permissions to access the device node (which is almost always the case). Check the value of access() (recommended by Apple for this purpose) before opening devices. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 9 +++++++++ dlls/mountmgr.sys/diskarb.c | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index ccb0685ced..6db088f11e 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -26,6 +26,7 @@ #include <stdarg.h> #include <stdio.h> #include <fcntl.h> +#include <unistd.h> #include <sys/time.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> @@ -1026,6 +1027,14 @@ static BOOL get_volume_device_info( struct volume *volume ) if (!unix_device) return FALSE; +#ifdef __APPLE__ + if (access( unix_device, R_OK )) + { + WARN("Unable to open %s, not accessible\n", debugstr_a(unix_device)); + return FALSE; + } +#endif + if (!(name = wine_get_dos_file_name( unix_device ))) { ERR("Failed to convert %s to NT, err %u\n", debugstr_a(unix_device), GetLastError()); diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 12da89d768..25e0745372 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -25,6 +25,7 @@ #include <errno.h> #include <stdarg.h> #include <stdio.h> +#include <unistd.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif @@ -150,7 +151,8 @@ static void appeared_callback( DADiskRef disk, void *context ) else if (guid_ptr) add_volume( device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr, NULL ); - if ((fd = open( device, O_RDONLY )) >= 0) + if (!access( device, R_OK ) && + (fd = open( device, O_RDONLY )) >= 0) { dk_scsi_identify_t dsi;

1 0

Arkadiusz Hiler : user32: Implement GetMouseMovePointsEx().
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: f7edc328184c4755c81dec5372b3ae5ac7b8c5df URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7edc328184c4755c81dec53… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Sat Oct 3 02:44:16 2020 +0300 user32: Implement GetMouseMovePointsEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36873 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 58 ++++++++++-- dlls/user32/tests/input.c | 200 ++++++++++++++++++++++++++++++++++++++++- include/wine/server_protocol.h | 26 +++++- server/protocol.def | 15 ++++ server/queue.c | 31 ++++++- server/request.h | 4 + server/trace.c | 31 +++++++ 7 files changed, 352 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f7edc328184c4755c81d…

1 0

Alistair Leslie-Hughes : xactengine3_7: Initial IXACT3Engine tests.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: f4a66ad257df4605e73dfea792eec55a70a04e84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4a66ad257df4605e73dfea7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 7 17:51:58 2020 +1100 xactengine3_7: Initial IXACT3Engine tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/xactengine3_7/tests/Makefile.in | 5 ++ dlls/xactengine3_7/tests/xact3.c | 100 +++++++++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+) diff --git a/configure b/configure index 31a26763ae..5672688a0d 100755 --- a/configure +++ b/configure @@ -21168,6 +21168,7 @@ wine_fn_config_makefile dlls/xactengine3_4 enable_xactengine3_4 wine_fn_config_makefile dlls/xactengine3_5 enable_xactengine3_5 wine_fn_config_makefile dlls/xactengine3_6 enable_xactengine3_6 wine_fn_config_makefile dlls/xactengine3_7 enable_xactengine3_7 +wine_fn_config_makefile dlls/xactengine3_7/tests enable_tests wine_fn_config_makefile dlls/xapofx1_1 enable_xapofx1_1 wine_fn_config_makefile dlls/xapofx1_2 enable_xapofx1_2 wine_fn_config_makefile dlls/xapofx1_3 enable_xapofx1_3 diff --git a/configure.ac b/configure.ac index 865aa924d0..a57697a0dd 100644 --- a/configure.ac +++ b/configure.ac @@ -3915,6 +3915,7 @@ WINE_CONFIG_MAKEFILE(dlls/xactengine3_4) WINE_CONFIG_MAKEFILE(dlls/xactengine3_5) WINE_CONFIG_MAKEFILE(dlls/xactengine3_6) WINE_CONFIG_MAKEFILE(dlls/xactengine3_7) +WINE_CONFIG_MAKEFILE(dlls/xactengine3_7/tests) WINE_CONFIG_MAKEFILE(dlls/xapofx1_1) WINE_CONFIG_MAKEFILE(dlls/xapofx1_2) WINE_CONFIG_MAKEFILE(dlls/xapofx1_3) diff --git a/dlls/xactengine3_7/tests/Makefile.in b/dlls/xactengine3_7/tests/Makefile.in new file mode 100644 index 0000000000..c32b256254 --- /dev/null +++ b/dlls/xactengine3_7/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = xactengine3_7.dll +IMPORTS = ole32 + +C_SRCS = \ + xact3.c diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c new file mode 100644 index 0000000000..9b0d3defb0 --- /dev/null +++ b/dlls/xactengine3_7/tests/xact3.c @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include <math.h> +#include <limits.h> +#include <float.h> + +#define COBJMACROS +#include "wine/test.h" + +#include "x3daudio.h" + +#include "initguid.h" +#include "xact3.h" + +DEFINE_GUID(IID_IXACT3Engine30, 0x9e33f661, 0x2d07, 0x43ec, 0x97, 0x04, 0xbb, 0xcb, 0x71, 0xa5, 0x49, 0x72); +DEFINE_GUID(IID_IXACT3Engine31, 0xe72c1b9a, 0xd717, 0x41c0, 0x81, 0xa6, 0x50, 0xeb, 0x56, 0xe8, 0x06, 0x49); + +DEFINE_GUID(CLSID_XACTEngine30, 0x3b80ee2a, 0xb0f5, 0x4780, 0x9e, 0x30, 0x90, 0xcb, 0x39, 0x68, 0x5b, 0x03); +DEFINE_GUID(CLSID_XACTEngine31, 0x962f5027, 0x99be, 0x4692, 0xa4, 0x68, 0x85, 0x80, 0x2c, 0xf8, 0xde, 0x61); +DEFINE_GUID(CLSID_XACTEngine32, 0xd3332f02, 0x3dd0, 0x4de9, 0x9a, 0xec, 0x20, 0xd8, 0x5c, 0x41, 0x11, 0xb6); +DEFINE_GUID(CLSID_XACTEngine33, 0x94c1affa, 0x66e7, 0x4961, 0x95, 0x21, 0xcf, 0xde, 0xf3, 0x12, 0x8d, 0x4f); +DEFINE_GUID(CLSID_XACTEngine34, 0x0977d092, 0x2d95, 0x4e43, 0x8d, 0x42, 0x9d, 0xdc, 0xc2, 0x54, 0x5e, 0xd5); +DEFINE_GUID(CLSID_XACTEngine35, 0x074b110f, 0x7f58, 0x4743, 0xae, 0xa5, 0x12, 0xf1, 0x5b, 0x50, 0x74, 0xed); +DEFINE_GUID(CLSID_XACTEngine36, 0x248d8a3b, 0x6256, 0x44d3, 0xa0, 0x18, 0x2a, 0xc9, 0x6c, 0x45, 0x9f, 0x47); + +struct xact_interfaces +{ + REFGUID clsid; + REFIID iid; + HRESULT expected; +} xact_interfaces[] = +{ + {&CLSID_XACTEngine30, &IID_IXACT3Engine30, S_OK }, + {&CLSID_XACTEngine30, &IID_IXACT3Engine31, E_NOINTERFACE}, + {&CLSID_XACTEngine30, &IID_IXACT3Engine, E_NOINTERFACE }, + + /* Version 3.1 to 3.4 use the same inteface */ + {&CLSID_XACTEngine31, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine32, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine33, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine34, &IID_IXACT3Engine31, S_OK }, + + /* Version 3.5 to 3.7 use the same inteface */ + {&CLSID_XACTEngine35, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine35, &IID_IXACT3Engine, S_OK }, + + {&CLSID_XACTEngine36, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine36, &IID_IXACT3Engine, S_OK }, + + {&CLSID_XACTEngine, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine, &IID_IXACT3Engine, S_OK }, + {&CLSID_XACTEngine, &IID_IUnknown, S_OK }, +}; + +static void test_interfaces(void) +{ + IUnknown *unk; + HRESULT hr; + int i; + + for (i = 0; i < ARRAY_SIZE(xact_interfaces); i++) + { + hr = CoCreateInstance(xact_interfaces[i].clsid, NULL, CLSCTX_INPROC_SERVER, + xact_interfaces[i].iid, (void**)&unk); + if (hr == REGDB_E_CLASSNOTREG) + { + trace("%d %s not registered. Skipping\n", i, wine_dbgstr_guid(xact_interfaces[i].clsid) ); + continue; + } + ok(hr == xact_interfaces[i].expected, "%d, Unexpected value 0x%08x\n", i, hr); + if (hr == S_OK) + IUnknown_Release(unk); + } +} + +START_TEST(xact3) +{ + CoInitialize(NULL); + + test_interfaces(); + + CoUninitialize(); +}

1 0

Paul Gofman : ntdll: Zero all FLS slots instances in RtlFlsFree().
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 7341f4ad1e771f32d8276734774bfa9ba352f259 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7341f4ad1e771f32d8276734… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 9 05:51:26 2020 +0300 ntdll: Zero all FLS slots instances in RtlFlsFree(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index cf6bddab0b..95511391d3 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -392,7 +392,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsFree( ULONG index ) { unsigned int chunk_index, idx; FLS_INFO_CHUNK *chunk; - TEB_FLS_DATA *fls; + LIST_ENTRY *entry; lock_fls_data(); @@ -410,10 +410,15 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsFree( ULONG index ) return STATUS_INVALID_PARAMETER; } - if ((fls = NtCurrentTeb()->FlsSlots) && fls->fls_data_chunks[chunk_index]) + for (entry = fls_data.fls_list_head.Flink; entry != &fls_data.fls_list_head; entry = entry->Flink) { - /* FIXME: call Fls callback */ - fls->fls_data_chunks[chunk_index][idx + 1] = NULL; + TEB_FLS_DATA *fls = CONTAINING_RECORD(entry, TEB_FLS_DATA, fls_list_entry); + + if (fls->fls_data_chunks[chunk_index]) + { + /* FIXME: call Fls callback */ + fls->fls_data_chunks[chunk_index][idx + 1] = NULL; + } } --chunk->count;

1 0

Paul Gofman : ntdll: Call FLS callbacks.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: ec1ea1ea1b2469a526f4bbc38aab404b7a2b062c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec1ea1ea1b2469a526f4bbc3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 9 05:51:27 2020 +0300 ntdll: Call FLS callbacks. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 24 +++++++++++--- dlls/kernel32/tests/loader.c | 79 ++++++++++++++++++++++++++++++++------------ dlls/ntdll/loader.c | 8 ++++- dlls/ntdll/thread.c | 40 +++++++++++++++++++--- 4 files changed, 119 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec1ea1ea1b2469a526f4…

1 0

Paul Gofman : ntdll: Support AVX registers for other thread in Nt{Get|Set}ContextThread().
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 419abd49a1f816e5a869dbf4cc81114cd516138b URL: https://source.winehq.org/git/wine.git/?a=commit;h=419abd49a1f816e5a869dbf4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 9 16:03:54 2020 +0300 ntdll: Support AVX registers for other thread in Nt{Get|Set}ContextThread(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 7 ++++++ dlls/ntdll/unix/signal_i386.c | 31 ++++++++++++++--------- dlls/ntdll/unix/signal_x86_64.c | 35 ++++++++++++++++++-------- dlls/ntdll/unix/thread.c | 36 +++++++++++++++++++++++--- dlls/ntdll/unix/unix_private.h | 56 +++++++++++++++++++++++++++++++++++------ include/wine/server_protocol.h | 5 ++++ server/protocol.def | 5 ++++ server/thread.c | 1 + server/trace.c | 6 +++++ 9 files changed, 148 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=419abd49a1f816e5a869…

1 0

Sven Baars : d3dcompiler: Fix a leak on error path (Coverity).
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 9f9fec18799bf59df6211b7294f8d338caa7f4db URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f9fec18799bf59df6211b72… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Oct 4 22:39:11 2020 +0200 d3dcompiler: Fix a leak on error path (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index df39716b49..21ad98f2b5 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1446,7 +1446,7 @@ static BOOL invert_swizzle(unsigned int *swizzle, unsigned int *writemask, unsig struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lhs, enum parse_assign_op assign_op, struct hlsl_ir_node *rhs) { - struct hlsl_ir_assignment *assign = d3dcompiler_alloc(sizeof(*assign)); + struct hlsl_ir_assignment *assign; struct hlsl_type *lhs_type; DWORD writemask = 0; @@ -1459,6 +1459,7 @@ struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lh return NULL; } + assign = d3dcompiler_alloc(sizeof(*assign)); if (!assign) { ERR("Out of memory\n");

1 0

Jacek Caban : kernelbase: Remove no longer needed free_console server call from FreeConsole.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 1b672d1013056d6a017605b8f8b7a8aca7ff16cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b672d1013056d6a017605b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:28:45 2020 +0200 kernelbase: Remove no longer needed free_console server call from FreeConsole. We can depend on closing console connection handle now. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 143644e233..d073b77eaa 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -584,7 +584,6 @@ HANDLE get_console_wait_handle( HANDLE handle ) BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) { HANDLE event; - BOOL ret; RtlEnterCriticalSection( &console_section ); @@ -599,15 +598,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) if (console_flags & CONSOLE_ERROR_HANDLE) NtClose( GetStdHandle( STD_ERROR_HANDLE )); console_flags = 0; - SERVER_START_REQ( free_console ) - { - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; if ((event = InterlockedExchangePointer( &console_wait_event, NULL ))) NtClose( event ); RtlLeaveCriticalSection( &console_section ); - return ret; + return TRUE; }

1 0

Henri Verbeet : wined3d: Clear the graphics pipeline key stencil test state when the stencil test is disabled.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: e154c95355227659524dd449e73f08a48e3b951c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e154c95355227659524dd449… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 13 17:08:54 2020 +0330 wined3d: Clear the graphics pipeline key stencil test state when the stencil test is disabled. The state itself is ignored in this case, but could still cause additional pipeline variants to be created. That's mostly a consideration for Direct3D 9 and before, since Direct3D 10 and 11 already normalise disabled stencil test state themselves. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 92b8c14e23..f125884215 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2080,6 +2080,11 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->ds_desc.back.reference = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); } + else + { + memset(&key->ds_desc.front, 0, sizeof(key->ds_desc.front)); + memset(&key->ds_desc.back, 0, sizeof(key->ds_desc.back)); + } } else {

1 0

Nikolay Sivov : mf/evr: Trigger media type negotiation through presenter for reference stream.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: 421924ae0a780e6e3304d123b68cb2214f79f626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=421924ae0a780e6e3304d123… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 15:26:45 2020 +0300 mf/evr: Trigger media type negotiation through presenter for reference stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 298d320ec0..1d55344fe1 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -419,6 +419,8 @@ static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeH return MF_E_STREAMSINK_REMOVED; hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, type, 0); + if (SUCCEEDED(hr) && !stream->id) + hr = IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); return hr; }

1 0

Jacek Caban : kernelbase: Remove window position adjustment from SetConsoleCursorPosition.
by Alexandre Julliard Oct. 13, 2020

Oct. 13, 2020

Module: wine Branch: master Commit: eca4d91cad48922f0ec881f79913e4b0162adbec URL: https://source.winehq.org/git/wine.git/?a=commit;h=eca4d91cad48922f0ec881f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 16:28:12 2020 +0200 kernelbase: Remove window position adjustment from SetConsoleCursorPosition. It's done in conhost now. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 4f511b1637..143644e233 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1183,46 +1183,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorInfo( HANDLE handle, CONSOLE_CURSO BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorPosition( HANDLE handle, COORD pos ) { struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_CURSOR_POS }; - CONSOLE_SCREEN_BUFFER_INFO info; - int w, h, do_move = 0; TRACE( "%p %d %d\n", handle, pos.X, pos.Y ); params.info.cursor_x = pos.X; params.info.cursor_y = pos.Y; - if (!console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL )) - return FALSE; - - if (!GetConsoleScreenBufferInfo( handle, &info )) return FALSE; - - /* if cursor is no longer visible, scroll the visible window... */ - w = info.srWindow.Right - info.srWindow.Left + 1; - h = info.srWindow.Bottom - info.srWindow.Top + 1; - if (pos.X < info.srWindow.Left) - { - info.srWindow.Left = min(pos.X, info.dwSize.X - w); - do_move = 1; - } - else if (pos.X > info.srWindow.Right) - { - info.srWindow.Left = max(pos.X, w) - w + 1; - do_move = 1; - } - info.srWindow.Right = info.srWindow.Left + w - 1; - - if (pos.Y < info.srWindow.Top) - { - info.srWindow.Top = min(pos.Y, info.dwSize.Y - h); - do_move = 1; - } - else if (pos.Y > info.srWindow.Bottom) - { - info.srWindow.Top = max(pos.Y, h) - h + 1; - do_move = 1; - } - info.srWindow.Bottom = info.srWindow.Top + h - 1; - - return !do_move || SetConsoleWindowInfo( handle, TRUE, &info.srWindow ); + return console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); }

1 0