February 2018 - Wine-Commits

Jacek Caban : server: Share security descriptor among all pipe instances.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 1ce2201ed8bab2569b5cd1dbed7ae7665f76a515 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ce2201ed8bab2569b5cd1db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 26 19:25:08 2018 +0100 server: Share security descriptor among all pipe instances. Based on patch by Jonathan Doron. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 21 ++++++++++---------- server/named_pipe.c | 52 +++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 55 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 235ab12..5cbf6e7 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1209,7 +1209,7 @@ static void test_file_info(void) CloseHandle( client ); } -static PSECURITY_DESCRIPTOR get_security_descriptor(HANDLE handle) +static PSECURITY_DESCRIPTOR get_security_descriptor(HANDLE handle, BOOL todo) { SECURITY_DESCRIPTOR *sec_desc; ULONG length = 0; @@ -1217,8 +1217,10 @@ static PSECURITY_DESCRIPTOR get_security_descriptor(HANDLE handle) status = NtQuerySecurityObject(handle, GROUP_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION, NULL, 0, &length); + todo_wine_if(todo && status == STATUS_PIPE_DISCONNECTED) ok(status == STATUS_BUFFER_TOO_SMALL, "Failed to query object security descriptor length: %08x\n", status); + if(status != STATUS_BUFFER_TOO_SMALL) return NULL; ok(length != 0, "length = 0\n"); sec_desc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, length); @@ -1295,7 +1297,8 @@ static void _test_group(unsigned line, HANDLE handle, SID *expected_sid, BOOL to PSID group_sid; NTSTATUS status; - sec_desc = get_security_descriptor(handle); + sec_desc = get_security_descriptor(handle, todo); + if (!sec_desc) return; status = RtlGetGroupSecurityDescriptor(sec_desc, &group_sid, &defaulted); ok_(__FILE__,line)(status == STATUS_SUCCESS, @@ -1351,13 +1354,13 @@ static void test_security_info(void) ok(status == STATUS_SUCCESS, "NtSetSecurityObject failed: %08x\n", status); test_group(server, world_sid, FALSE); - test_group(client, world_sid, TRUE); + test_group(client, world_sid, FALSE); /* new instance of pipe server has the same security descriptor */ server2 = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE, 10, 0x20000, 0x20000, 0, NULL); ok(server2 != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError()); - test_group(server2, world_sid, TRUE); + test_group(server2, world_sid, FALSE); /* set client group, server changes as well */ ret = SetSecurityDescriptorGroup(sec_desc, local_sid, FALSE); @@ -1366,8 +1369,8 @@ static void test_security_info(void) ok(status == STATUS_SUCCESS, "NtSetSecurityObject failed: %08x\n", status); test_group(server, local_sid, FALSE); - test_group(client, local_sid, TRUE); - test_group(server2, local_sid, TRUE); + test_group(client, local_sid, FALSE); + test_group(server2, local_sid, FALSE); CloseHandle(server); /* SD is preserved after closing server object */ @@ -1378,19 +1381,17 @@ static void test_security_info(void) client = CreateFileA(PIPENAME, GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, NULL); ok(client != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); - test_group(client, local_sid, TRUE); + test_group(client, local_sid, FALSE); ret = DisconnectNamedPipe(server); ok(ret, "DisconnectNamedPipe failed: %u\n", GetLastError()); /* disconnected server may be queried for security info, but client does not */ - test_group(server, local_sid, TRUE); + test_group(server, local_sid, FALSE); status = NtQuerySecurityObject(client, GROUP_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION, NULL, 0, &length); - todo_wine ok(status == STATUS_PIPE_DISCONNECTED, "NtQuerySecurityObject returned %08x\n", status); status = NtSetSecurityObject(client, GROUP_SECURITY_INFORMATION, sec_desc); - todo_wine ok(status == STATUS_PIPE_DISCONNECTED, "NtQuerySecurityObject returned %08x\n", status); /* attempting to create another pipe instance with specified sd fails */ diff --git a/server/named_pipe.c b/server/named_pipe.c index c6b37ce..c77b07f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -150,6 +150,9 @@ static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); /* server end functions */ static void pipe_server_dump( struct object *obj, int verbose ); +static struct security_descriptor *pipe_server_get_sd( struct object *obj ); +static int pipe_server_set_sd( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info ); static void pipe_server_destroy( struct object *obj); static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static void pipe_server_get_file_info( struct fd *fd, unsigned int info_class ); @@ -166,8 +169,8 @@ static const struct object_ops pipe_server_ops = no_signal, /* signal */ pipe_end_get_fd, /* get_fd */ default_fd_map_access, /* map_access */ - default_get_sd, /* get_sd */ - default_set_sd, /* set_sd */ + pipe_server_get_sd, /* get_sd */ + pipe_server_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ @@ -193,6 +196,9 @@ static const struct fd_ops pipe_server_fd_ops = /* client end functions */ static void pipe_client_dump( struct object *obj, int verbose ); +static struct security_descriptor *pipe_client_get_sd( struct object *obj ); +static int pipe_client_set_sd( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info ); static void pipe_client_destroy( struct object *obj ); static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static void pipe_client_get_file_info( struct fd *fd, unsigned int info_class ); @@ -209,8 +215,8 @@ static const struct object_ops pipe_client_ops = no_signal, /* signal */ pipe_end_get_fd, /* get_fd */ default_fd_map_access, /* map_access */ - default_get_sd, /* get_sd */ - default_set_sd, /* set_sd */ + pipe_client_get_sd, /* get_sd */ + pipe_client_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ @@ -583,6 +589,36 @@ static void pipe_end_get_file_info( struct fd *fd, struct named_pipe *pipe, unsi } } +static struct security_descriptor *pipe_server_get_sd( struct object *obj ) +{ + struct pipe_server *server = (struct pipe_server *) obj; + return default_get_sd( &server->pipe->obj ); +} + +static struct security_descriptor *pipe_client_get_sd( struct object *obj ) +{ + struct pipe_client *client = (struct pipe_client *) obj; + if (client->server) return default_get_sd( &client->server->pipe->obj ); + set_error( STATUS_PIPE_DISCONNECTED ); + return NULL; +} + +static int pipe_server_set_sd( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info ) +{ + struct pipe_server *server = (struct pipe_server *) obj; + return default_set_sd( &server->pipe->obj, sd, set_info ); +} + +static int pipe_client_set_sd( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info ) +{ + struct pipe_client *client = (struct pipe_client *) obj; + if (client->server) return default_set_sd( &client->server->pipe->obj, sd, set_info ); + set_error( STATUS_PIPE_DISCONNECTED ); + return 0; +} + static void pipe_server_get_file_info( struct fd *fd, unsigned int info_class ) { struct pipe_server *server = get_fd_user( fd ); @@ -1170,6 +1206,10 @@ DECL_HANDLER(create_named_pipe) pipe->timeout = req->timeout; pipe->flags = req->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE; pipe->sharing = req->sharing; + if (sd) default_set_sd( &pipe->obj, sd, OWNER_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | + SACL_SECURITY_INFORMATION ); } else { @@ -1193,10 +1233,6 @@ DECL_HANDLER(create_named_pipe) { reply->handle = alloc_handle( current->process, server, req->access, objattr->attributes ); server->pipe->instances++; - if (sd) default_set_sd( &server->pipe_end.obj, sd, OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION ); release_object( server ); }

1 0

Zebediah Figura : quartz/tests: Add a test for IGraphBuilder_Connect().
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 6c0954d60fdc77df8f9198969a6697145b5b4e4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c0954d60fdc77df8f919896… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 27 00:01:28 2018 -0600 quartz/tests: Add a test for IGraphBuilder_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 17b2df1..8e9d17e 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -431,6 +431,49 @@ static void rungraph(IFilterGraph2 *graph) ok(hr==1, "Releasing mediacontrol returned: %x\n", hr); } +static void test_graph_builder_connect(WCHAR *filename) +{ + static const WCHAR outputW[] = {'O','u','t','p','u','t',0}; + static const WCHAR inW[] = {'I','n',0}; + IBaseFilter *source_filter, *video_filter; + IPin *pin_in, *pin_out; + IFilterGraph2 *graph; + IVideoWindow *window; + HRESULT hr; + + graph = create_graph(); + + hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, &IID_IVideoWindow, (void **)&window); + ok(hr == S_OK, "Failed to create VideoRenderer: %#x\n", hr); + + hr = IFilterGraph2_AddSourceFilter(graph, filename, NULL, &source_filter); + ok(hr == S_OK, "AddSourceFilter failed: %#x\n", hr); + + hr = IVideoWindow_QueryInterface(window, &IID_IBaseFilter, (void **)&video_filter); + ok(hr == S_OK, "QueryInterface(IBaseFilter) failed: %#x\n", hr); + hr = IFilterGraph2_AddFilter(graph, video_filter, NULL); + ok(hr == S_OK, "AddFilter failed: %#x\n", hr); + + hr = IBaseFilter_FindPin(source_filter, outputW, &pin_out); + ok(hr == S_OK, "FindPin failed: %#x\n", hr); + hr = IBaseFilter_FindPin(video_filter, inW, &pin_in); + ok(hr == S_OK, "FindPin failed: %#x\n", hr); + hr = IFilterGraph2_Connect(graph, pin_out, pin_in); + + if (hr != VFW_E_NO_ACCEPTABLE_TYPES) + { + ok(SUCCEEDED(hr), "Connect failed: %#x\n", hr); + rungraph(graph); + } + + IPin_Release(pin_in); + IPin_Release(pin_out); + IBaseFilter_Release(source_filter); + IBaseFilter_Release(video_filter); + IVideoWindow_Release(window); + IFilterGraph2_Release(graph); +} + static void test_render_run(const WCHAR *file) { IFilterGraph2 *graph; @@ -463,6 +506,8 @@ static void test_render_run(const WCHAR *file) refs = IFilterGraph2_Release(graph); ok(!refs, "Graph has %u references\n", refs); + test_graph_builder_connect(filename); + /* check reference leaks */ h = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); ok(h != INVALID_HANDLE_VALUE, "CreateFile failed: err=%d\n", GetLastError());

1 0

Zebediah Figura : quartz/tests: Avoid using global variables.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 71fb9e65cff6ef06c80cec18425f31b848c79a82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71fb9e65cff6ef06c80cec18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 27 00:01:26 2018 -0600 quartz/tests: Avoid using global variables. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 111 ++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71fb9e65cff6ef06c80c…

1 0

Zebediah Figura : quartz/tests: Test IMediaControl on a fully connected graph.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 7db3e3c2dd1c717064c33ca80fbb9a988be82a63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7db3e3c2dd1c717064c33ca8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 27 00:01:25 2018 -0600 quartz/tests: Test IMediaControl on a fully connected graph. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 168 +++++++++++++++------------------------- 1 file changed, 63 insertions(+), 105 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 5fd3107..1f2fe20 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -283,6 +283,68 @@ static void test_basic_video(void) IBasicVideo_Release(pbv); } +static void test_mediacontrol(void) +{ + IMediaSeeking *seeking; + IMediaFilter *filter; + IMediaControl *control; + LONGLONG pos; + GUID format; + HRESULT hr; + + IGraphBuilder_SetDefaultSyncSource(pgraph); + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaSeeking, (void**) &seeking); + ok(hr == S_OK, "QueryInterface(IMediaControl) failed: %08x\n", hr); + + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaFilter, (void**) &filter); + ok(hr == S_OK, "QueryInterface(IMediaFilter) failed: %08x\n", hr); + + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaControl, (void**) &control); + ok(hr == S_OK, "QueryInterface(IMediaControl) failed: %08x\n", hr); + + format = GUID_NULL; + hr = IMediaSeeking_GetTimeFormat(seeking, &format); + ok(hr == S_OK, "GetTimeFormat failed: %#x\n", hr); + ok(IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME), "got %s\n", wine_dbgstr_guid(&format)); + + pos = 0xdeadbeef; + hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, NULL); + ok(hr == S_OK, "ConvertTimeFormat failed: %#x\n", hr); + ok(pos == 0x123456789a, "got %s\n", wine_dbgstr_longlong(pos)); + + pos = 0xdeadbeef; + hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, &TIME_FORMAT_MEDIA_TIME, 0x123456789a, NULL); + ok(hr == S_OK, "ConvertTimeFormat failed: %#x\n", hr); + ok(pos == 0x123456789a, "got %s\n", wine_dbgstr_longlong(pos)); + + pos = 0xdeadbeef; + hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, &TIME_FORMAT_MEDIA_TIME); + ok(hr == S_OK, "ConvertTimeFormat failed: %#x\n", hr); + ok(pos == 0x123456789a, "got %s\n", wine_dbgstr_longlong(pos)); + + hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); + ok(hr == S_OK, "GetCurrentPosition failed: %#x\n", hr); + ok(pos == 0, "got %s\n", wine_dbgstr_longlong(pos)); + + hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_ReturnTime, NULL, AM_SEEKING_NoPositioning); + ok(hr == S_OK, "SetPositions failed: %#x\n", hr); + hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_NoPositioning, NULL, AM_SEEKING_ReturnTime); + ok(hr == S_OK, "SetPositions failed: %#x\n", hr); + + IMediaFilter_SetSyncSource(filter, NULL); + pos = 0xdeadbeef; + hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); + ok(hr == S_OK, "GetCurrentPosition failed: %#x\n", hr); + ok(pos == 0, "got %s\n", wine_dbgstr_longlong(pos)); + + hr = IMediaControl_GetState(control, 1000, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + + IMediaControl_Release(control); + IMediaSeeking_Release(seeking); + IMediaFilter_Release(filter); +} + static void rungraph(void) { HRESULT hr; @@ -304,6 +366,7 @@ static void rungraph(void) IMediaFilter_Release(pmf); test_basic_video(); + test_mediacontrol(); hr = IMediaControl_Run(pmc); ok(hr==S_FALSE, "Cannot run the graph returned: %x\n", hr); @@ -555,109 +618,6 @@ static void test_graph_builder(void) releasefiltergraph(); } -static void test_graph_builder_addfilter(void) -{ - HRESULT hr; - IBaseFilter *pF = NULL; - static const WCHAR testFilterW[] = {'t','e','s','t','F','i','l','t','e','r',0}; - - if (!createfiltergraph()) - return; - - hr = IGraphBuilder_AddFilter(pgraph, NULL, testFilterW); - ok(hr == E_POINTER, "IGraphBuilder_AddFilter returned: %x\n", hr); - - /* create video filter */ - hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, - &IID_IBaseFilter, (LPVOID*)&pF); - ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); - ok(pF != NULL, "pF is NULL\n"); - if (!pF) { - skip("failed to created filter, skipping\n"); - return; - } - - hr = IGraphBuilder_AddFilter(pgraph, pF, NULL); - ok(hr == S_OK, "IGraphBuilder_AddFilter returned: %x\n", hr); - IBaseFilter_Release(pF); -} - -static void test_mediacontrol(void) -{ - HRESULT hr; - LONGLONG pos = 0xdeadbeef; - GUID format = GUID_NULL; - IMediaSeeking *seeking = NULL; - IMediaFilter *filter = NULL; - IMediaControl *control = NULL; - - IGraphBuilder_SetDefaultSyncSource(pgraph); - hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaSeeking, (void**) &seeking); - ok(hr == S_OK, "QueryInterface IMediaControl failed: %08x\n", hr); - if (FAILED(hr)) - return; - - hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaFilter, (void**) &filter); - ok(hr == S_OK, "QueryInterface IMediaFilter failed: %08x\n", hr); - if (FAILED(hr)) - { - IMediaSeeking_Release(seeking); - return; - } - - hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaControl, (void**) &control); - ok(hr == S_OK, "QueryInterface IMediaControl failed: %08x\n", hr); - if (FAILED(hr)) - { - IMediaSeeking_Release(seeking); - IMediaFilter_Release(filter); - return; - } - - format = GUID_NULL; - hr = IMediaSeeking_GetTimeFormat(seeking, &format); - ok(hr == S_OK, "GetTimeFormat failed: %08x\n", hr); - ok(IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME), "GetTimeFormat: unexpected format %s\n", wine_dbgstr_guid(&format)); - - pos = 0xdeadbeef; - hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, NULL); - ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); - ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%s)\n", wine_dbgstr_longlong(pos)); - - pos = 0xdeadbeef; - hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, &TIME_FORMAT_MEDIA_TIME, 0x123456789a, NULL); - ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); - ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%s)\n", wine_dbgstr_longlong(pos)); - - pos = 0xdeadbeef; - hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, &TIME_FORMAT_MEDIA_TIME); - ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); - ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%s)\n", wine_dbgstr_longlong(pos)); - - hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); - ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); - ok(pos == 0, "Position != 0 (%s)\n", wine_dbgstr_longlong(pos)); - - hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_ReturnTime, NULL, AM_SEEKING_NoPositioning); - ok(hr == S_OK, "SetPositions failed: %08x\n", hr); - hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_NoPositioning, NULL, AM_SEEKING_ReturnTime); - ok(hr == S_OK, "SetPositions failed: %08x\n", hr); - - IMediaFilter_SetSyncSource(filter, NULL); - pos = 0xdeadbeef; - hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); - ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); - ok(pos == 0, "Position != 0 (%s)\n", wine_dbgstr_longlong(pos)); - - hr = IMediaControl_GetState(control, 1000, NULL); - ok(hr == E_POINTER, "GetState expected %08x, got %08x\n", E_POINTER, hr); - - IMediaControl_Release(control); - IMediaSeeking_Release(seeking); - IMediaFilter_Release(filter); - releasefiltergraph(); -} - static void test_filter_graph2(void) { HRESULT hr; @@ -2344,8 +2304,6 @@ START_TEST(filtergraph) test_render_run(avifile); test_render_run(mpegfile); test_graph_builder(); - test_graph_builder_addfilter(); - test_mediacontrol(); test_filter_graph2(); test_render_filter_priority(); test_aggregate_filter_graph();

1 0

Michael Stefaniuc : dmband/tests: Add IDirectMusicObject::ParseDescriptor( ) tests.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 0994e22932d34c934ba12b7193701cf6364245a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0994e22932d34c934ba12b71… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 27 00:38:37 2018 +0100 dmband/tests: Add IDirectMusicObject::ParseDescriptor() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/tests/dmband.c | 199 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index f3042ea..6c615f6 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -27,6 +27,7 @@ #include "ole2.h" #include "initguid.h" #include "dmusici.h" +#include "dmusicf.h" #include "dmplugin.h" DEFINE_GUID(IID_IDirectMusicBandTrackPrivate, 0x53466056, 0x6dc4, 0x11d1, 0xbf, 0x7b, 0x00, 0xc0, 0x4f, 0xbf, 0x8f, 0xef); @@ -242,6 +243,203 @@ static void test_bandtrack(void) while (IDirectMusicTrack8_Release(dmt8)); } +struct chunk { + FOURCC id; + DWORD size; + FOURCC type; +}; + +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + +/* Generate a RIFF file format stream from an array of FOURCC ids. + RIFF and LIST need to be followed by the form type respectively list type, + followed by the chunks of the list and terminated with 0. */ +static IStream *gen_riff_stream(const FOURCC *ids) +{ + static const LARGE_INTEGER zero; + int level = -1; + DWORD *sizes[4]; /* Stack for the sizes of RIFF and LIST chunks */ + char riff[1024]; + char *p = riff; + struct chunk *ck; + IStream *stream; + + do { + ck = (struct chunk *)p; + ck->id = *ids++; + switch (ck->id) { + case 0: + *sizes[level] = p - (char *)sizes[level] - sizeof(DWORD); + level--; + break; + case FOURCC_LIST: + case FOURCC_RIFF: + level++; + sizes[level] = &ck->size; + ck->type = *ids++; + p += sizeof(*ck); + break; + case DMUS_FOURCC_GUID_CHUNK: + ck->size = sizeof(GUID_NULL); + p += CHUNK_HDR_SIZE; + memcpy(p, &GUID_NULL, sizeof(GUID_NULL)); + p += ck->size; + break; + case DMUS_FOURCC_VERSION_CHUNK: + { + DMUS_VERSION ver = {5, 8}; + + ck->size = sizeof(ver); + p += CHUNK_HDR_SIZE; + memcpy(p, &ver, sizeof(ver)); + p += ck->size; + break; + } + default: + { + /* Just convert the FOURCC id to a WCHAR string */ + WCHAR *s; + + ck->size = 5 * sizeof(WCHAR); + p += CHUNK_HDR_SIZE; + s = (WCHAR *)p; + s[0] = (char)(ck->id); + s[1] = (char)(ck->id >> 8); + s[2] = (char)(ck->id >> 16); + s[3] = (char)(ck->id >> 24); + s[4] = 0; + p += ck->size; + } + } + } while (level >= 0); + + ck = (struct chunk *)riff; + CreateStreamOnHGlobal(NULL, TRUE, &stream); + IStream_Write(stream, riff, ck->size + CHUNK_HDR_SIZE, NULL); + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + + return stream; +} + +static void test_parsedescriptor(void) +{ + IDirectMusicObject *dmo; + IStream *stream; + DMUS_OBJECTDESC desc = {0}; + HRESULT hr; + DWORD valid; + const WCHAR s_inam[] = {'I','N','A','M','\0'}; + const WCHAR s_unam[] = {'U','N','A','M','\0'}; + const FOURCC alldesc[] = + { + FOURCC_RIFF, DMUS_FOURCC_BAND_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, + DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, DMUS_FOURCC_UCOP_CHUNK, + DMUS_FOURCC_UCMT_CHUNK, DMUS_FOURCC_USBJ_CHUNK, 0, DMUS_FOURCC_VERSION_CHUNK, + DMUS_FOURCC_GUID_CHUNK, 0 + }; + const FOURCC dupes[] = + { + FOURCC_RIFF, DMUS_FOURCC_BAND_FORM, DMUS_FOURCC_CATEGORY_CHUNK, DMUS_FOURCC_CATEGORY_CHUNK, + DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_GUID_CHUNK, + DMUS_FOURCC_GUID_CHUNK, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, 0, + FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, mmioFOURCC('I','N','A','M'), 0, 0 + }; + FOURCC empty[] = {FOURCC_RIFF, DMUS_FOURCC_BAND_FORM, 0}; + FOURCC inam[] = + { + FOURCC_RIFF, DMUS_FOURCC_BAND_FORM, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, + mmioFOURCC('I','N','A','M'), 0, 0 + }; + + hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void **)&dmo); + ok(hr == S_OK, "DirectMusicBand create failed: %08x, expected S_OK\n", hr); + + /* Nothing loaded */ + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", + desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicBand), + "Got class guid %s, expected CLSID_DirectMusicBand\n", + wine_dbgstr_guid(&desc.guidClass)); + + /* Empty RIFF stream */ + stream = gen_riff_stream(empty); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicBand), + "Got class guid %s, expected CLSID_DirectMusicBand\n", + wine_dbgstr_guid(&desc.guidClass)); + IStream_Release(stream); + + /* Wrong form */ + empty[1] = DMUS_FOURCC_CONTAINER_FORM; + stream = gen_riff_stream(empty); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + todo_wine ok(hr == DMUS_E_INVALID_BAND, + "ParseDescriptor failed: %08x, expected DMUS_E_INVALID_BAND\n", hr); + + /* All desc chunks, extra DMUS_OBJ_DATE */ + stream = gen_riff_stream(alldesc); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION|DMUS_OBJ_DATE; + todo_wine ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", + desc.dwValidData, valid); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicBand), + "Got class guid %s, expected CLSID_DirectMusicBand\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + wine_dbgstr_w(desc.wszName)); + ok(!desc.ftDate.dwHighDateTime && !desc.ftDate.dwLowDateTime, + "Got file time %08x %08x, expected 0\n", desc.ftDate.dwHighDateTime, + desc.ftDate.dwLowDateTime); + IStream_Release(stream); + + /* UNFO list with INAM */ + inam[3] = DMUS_FOURCC_UNFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), + "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); + ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + /* INFO list with INAM */ + inam[3] = DMUS_FOURCC_INFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + IStream_Release(stream); + + /* Duplicated chunks */ + stream = gen_riff_stream(dupes); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION|DMUS_OBJ_DATE; + todo_wine ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", + desc.dwValidData, valid); + ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + IDirectMusicObject_Release(dmo); +} + START_TEST(dmband) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -257,6 +455,7 @@ START_TEST(dmband) test_COM_bandtrack(); test_dmband(); test_bandtrack(); + test_parsedescriptor(); CoUninitialize(); }

1 0

Nikolay Sivov : comctl32/tests: Add a test for TTN_SHOW order.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 7d9cf7f4b51a137ad8488a8f441d1a444a459d46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d9cf7f4b51a137ad8488a8f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 27 01:28:35 2018 +0300 comctl32/tests: Add a test for TTN_SHOW order. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tooltips.c | 108 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index c260e3d..7f37d5f 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -25,9 +25,18 @@ #include "wine/test.h" #include "v6util.h" +#include "msg.h" #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +enum seq_index +{ + PARENT_SEQ_INDEX = 0, + NUM_MSG_SEQUENCES +}; + +static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; + static void test_create_tooltip(BOOL is_v6) { HWND parent, hwnd; @@ -264,17 +273,51 @@ static void test_customdraw(void) { static const CHAR testcallbackA[] = "callback"; +static RECT g_ttip_rect; static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { + static LONG defwndproc_counter = 0; + struct message msg; + LRESULT ret; + if (message == WM_NOTIFY && lParam) { NMTTDISPINFOA *ttnmdi = (NMTTDISPINFOA*)lParam; + NMHDR *hdr = (NMHDR *)lParam; + RECT rect; - if (ttnmdi->hdr.code == TTN_GETDISPINFOA) + if (hdr->code != NM_CUSTOMDRAW) + { + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + msg.id = hdr->code; + add_message(sequences, PARENT_SEQ_INDEX, &msg); + } + + switch (hdr->code) + { + case TTN_GETDISPINFOA: lstrcpyA(ttnmdi->lpszText, testcallbackA); + break; + case TTN_SHOW: + GetWindowRect(hdr->hwndFrom, &rect); + todo_wine + ok(!EqualRect(&g_ttip_rect, &rect), "Unexpected window rectangle.\n"); + break; + } } - return DefWindowProcA(hwnd, message, wParam, lParam); + defwndproc_counter++; + if (IsWindowUnicode(hwnd)) + ret = DefWindowProcW(hwnd, message, wParam, lParam); + else + ret = DefWindowProcA(hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; } static void register_parent_wnd_class(void) @@ -1134,11 +1177,70 @@ static void test_TTM_ADDTOOL(BOOL is_v6) DestroyWindow(hwnd); } +static const struct message ttn_show_parent_seq[] = +{ + { WM_NOTIFY, sent|id, 0, 0, TTN_SHOW }, + { 0 } +}; + +static void test_TTN_SHOW(void) +{ + HWND hwndTip, hwnd; + TTTOOLINFOA ti; + RECT rect; + BOOL ret; + + hwnd = create_parent_window(); + ok(hwnd != NULL, "Failed to create parent window.\n"); + + /* Put cursor outside the window */ + GetWindowRect(hwnd, &rect); + SetCursorPos(rect.right + 200, 0); + + ShowWindow(hwnd, SW_SHOWNORMAL); + flush_events(100); + + /* Create tooltip */ + hwndTip = CreateWindowExA(WS_EX_TOPMOST, TOOLTIPS_CLASSA, NULL, TTS_ALWAYSTIP, 10, 10, 300, 300, + hwnd, NULL, NULL, 0); + ok(hwndTip != NULL, "Failed to create tooltip window.\n"); + + SetWindowPos(hwndTip, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + ti.cbSize = sizeof(TTTOOLINFOA); + ti.hwnd = hwnd; + ti.hinst = GetModuleHandleA(NULL); + ti.uFlags = TTF_SUBCLASS; + ti.uId = 0x1234abcd; + ti.lpszText = (LPSTR)"This is a test tooltip"; + ti.lParam = 0xdeadbeef; + GetClientRect(hwnd, &ti.rect); + ret = SendMessageA(hwndTip, TTM_ADDTOOLA, 0, (LPARAM)&ti); + ok(ret, "Failed to add a tool.\n"); + + /* Make tooltip appear quickly */ + SendMessageA(hwndTip, TTM_SETDELAYTIME, TTDT_INITIAL, MAKELPARAM(1, 0)); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + /* Put cursor inside window, tooltip will appear immediately */ + GetWindowRect(hwnd, &rect); + SetCursorPos((rect.left + rect.right) / 2, (rect.top + rect.bottom) / 2); + flush_events(200); + + ok_sequence(sequences, PARENT_SEQ_INDEX, ttn_show_parent_seq, "TTN_SHOW parent seq", FALSE); + + DestroyWindow(hwndTip); + DestroyWindow(hwnd); +} + START_TEST(tooltips) { ULONG_PTR ctx_cookie; HANDLE hCtx; + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); + LoadLibraryA("comctl32.dll"); register_parent_wnd_class(); @@ -1153,6 +1255,7 @@ START_TEST(tooltips) test_setinfo(FALSE); test_margin(); test_TTM_ADDTOOL(FALSE); + test_TTN_SHOW(); if (!load_v6_module(&ctx_cookie, &hCtx)) return; @@ -1164,6 +1267,7 @@ START_TEST(tooltips) test_setinfo(TRUE); test_margin(); test_TTM_ADDTOOL(TRUE); + test_TTN_SHOW(); unload_v6_module(ctx_cookie, hCtx); }

1 0

Michael Müller : kernelbase: Add stub for QuirkIsEnabled.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 7d9c95269b0b84bda0d063b3dd560b10b28c6b85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d9c95269b0b84bda0d063b3… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Feb 27 04:21:26 2018 +0000 kernelbase: Add stub for QuirkIsEnabled. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-quirks-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/main.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec index e8f77c7..1485512 100644 --- a/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec +++ b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec @@ -1,6 +1,6 @@ @ stub QuirkGetData @ stub QuirkGetData2 -@ stub QuirkIsEnabled +@ stdcall QuirkIsEnabled(ptr) kernelbase.QuirkIsEnabled @ stub QuirkIsEnabled2 @ stdcall QuirkIsEnabled3(ptr ptr) kernelbase.QuirkIsEnabled3 @ stub QuirkIsEnabledForPackage diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 1a6f1ff..aa67372 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1223,7 +1223,7 @@ @ stdcall QueueUserWorkItem(ptr ptr long) kernel32.QueueUserWorkItem # @ stub QuirkGetData # @ stub QuirkGetData2 -# @ stub QuirkIsEnabled +@ stdcall QuirkIsEnabled(ptr) # @ stub QuirkIsEnabled2 @ stdcall QuirkIsEnabled3(ptr ptr) # @ stub QuirkIsEnabledForPackage diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index 9c89ff4..6871aca 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -1,4 +1,5 @@ /* + * Copyright 2016 Michael Müller * Copyright 2017 Andrey Gusev * * This library is free software; you can redistribute it and/or @@ -76,6 +77,15 @@ LONG WINAPI AppPolicyGetWindowingModel(HANDLE token, AppPolicyWindowingModel *po } /*********************************************************************** + * QuirkIsEnabled (KERNELBASE.@) + */ +BOOL WINAPI QuirkIsEnabled(void *arg) +{ + FIXME("(%p): stub\n", arg); + return FALSE; +} + +/*********************************************************************** * QuirkIsEnabled3 (KERNELBASE.@) */ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)

1 0

Roderick Colenbrander : winevulkan: Implement vk_icdNegotiateICDInterfaceVersion.
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 112e6835bbe7c3a0ff9eea51ed558fa53b177878 URL: https://source.winehq.org/git/wine.git/?a=commit;h=112e6835bbe7c3a0ff9eea51… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Feb 26 19:42:13 2018 +0100 winevulkan: Implement vk_icdNegotiateICDInterfaceVersion. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index cac907c..ef22a45 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -27,6 +27,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); +/* For now default to 4 as it felt like a reasonable version feature wise to support. + * Don't support the optional vk_icdGetPhysicalDeviceProcAddr introduced in this version + * as it is unlikely we will implement physical device extensions, which the loader is not + * aware off. Version 5 adds more extensive version checks. Something to tackle later. + */ +#define WINE_VULKAN_ICD_VERSION 4 + void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *name) { FIXME("stub: %p %s\n", instance, debugstr_a(name)); @@ -35,8 +42,21 @@ void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *na VkResult WINAPI wine_vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *supported_version) { - FIXME("stub: %p\n", supported_version); - return VK_ERROR_INCOMPATIBLE_DRIVER; + uint32_t req_version; + + TRACE("%p\n", supported_version); + + /* The spec is not clear how to handle this. Mesa drivers don't check, but it + * is probably best to not explode. VK_INCOMPLETE seems to be the closest value. + */ + if (!supported_version) + return VK_INCOMPLETE; + + req_version = *supported_version; + *supported_version = min(req_version, WINE_VULKAN_ICD_VERSION); + TRACE("Loader requested ICD version %u, returning %u\n", req_version, *supported_version); + + return VK_SUCCESS; } BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved)

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in wined3d_surface_upload_data ().
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: 78366806a0b2810ca9b16d0efb1696bffcf20de3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78366806a0b2810ca9b16d0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 27 10:13:13 2018 +0330 wined3d: Explicitly calculate the sub-resource level in wined3d_surface_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b2fddad..9dff68f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -785,7 +785,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w struct wined3d_texture *texture = surface->container; UINT update_w = src_rect->right - src_rect->left; UINT update_h = src_rect->bottom - src_rect->top; - unsigned int layer; + unsigned int level, layer; GLenum target; TRACE("surface %p, gl_info %p, format %s, src_rect %s, src_pitch %u, dst_point %s, srgb %#x, data {%#x:%p}.\n", @@ -811,6 +811,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w } target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + level = sub_resource_idx % texture->level_count; layer = sub_resource_idx / texture->level_count; if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) @@ -834,19 +835,19 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w TRACE("Uploading compressed data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, image_size %#x, addr %p.\n", - target, surface->texture_level, layer, dst_point->x, dst_point->y, + target, level, layer, dst_point->x, dst_point->y, update_w, update_h, internal, dst_slice_pitch, addr); if (dst_row_pitch == src_pitch) { if (target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glCompressedTexSubImage3D(target, surface->texture_level, dst_point->x, dst_point->y, + GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_point->x, dst_point->y, layer, update_w, update_h, 1, internal, dst_slice_pitch, addr)); } else { - GL_EXTCALL(glCompressedTexSubImage2D(target, surface->texture_level, dst_point->x, dst_point->y, + GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_point->x, dst_point->y, update_w, update_h, internal, dst_slice_pitch, addr)); } } @@ -861,12 +862,12 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w { if (target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glCompressedTexSubImage3D(target, surface->texture_level, dst_point->x, y, + GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_point->x, y, layer, update_w, format->block_height, 1, internal, dst_row_pitch, addr)); } else { - GL_EXTCALL(glCompressedTexSubImage2D(target, surface->texture_level, dst_point->x, y, + GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_point->x, y, update_w, format->block_height, internal, dst_row_pitch, addr)); } @@ -885,18 +886,18 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, type %#x, addr %p.\n", - target, surface->texture_level, layer, dst_point->x, dst_point->y, + target, level, layer, dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_pitch / format->byte_count); if (target == GL_TEXTURE_2D_ARRAY) { - GL_EXTCALL(glTexSubImage3D(target, surface->texture_level, dst_point->x, dst_point->y, + GL_EXTCALL(glTexSubImage3D(target, level, dst_point->x, dst_point->y, layer, update_w, update_h, 1, format->glFormat, format->glType, addr)); } else { - gl_info->gl_ops.gl.p_glTexSubImage2D(target, surface->texture_level, dst_point->x, dst_point->y, + gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); } gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in device_clear_render_targets ().
by Alexandre Julliard Feb. 27, 2018

Feb. 27, 2018

Module: wine Branch: master Commit: bca2fc4189f7aee48afea6471afd17f33c73d7e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bca2fc4189f7aee48afea647… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 27 10:13:11 2018 +0330 wined3d: Explicitly calculate the sub-resource level in device_clear_render_targets(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5ec0705..648e352 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -281,11 +281,11 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c } else { + unsigned int ds_level = dsv->sub_resource_idx % depth_stencil->container->level_count; + render_offscreen = TRUE; - drawable_width = wined3d_texture_get_level_pow2_width(depth_stencil->container, - depth_stencil->texture_level); - drawable_height = wined3d_texture_get_level_pow2_height(depth_stencil->container, - depth_stencil->texture_level); + drawable_width = wined3d_texture_get_level_pow2_width(depth_stencil->container, ds_level); + drawable_height = wined3d_texture_get_level_pow2_height(depth_stencil->container, ds_level); } if (depth_stencil)

1 0