February 2018 - Wine-commits

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

27 Feb '18

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: Fix a use-after-free in FilterGraph2_Connect().
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: e5db13a8c89b557d380abc41dc8999d6f644de40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5db13a8c89b557d380abc41… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 27 00:01:27 2018 -0600 quartz: Fix a use-after-free in FilterGraph2_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index f9bc47b..0113674 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1049,6 +1049,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, if (IsEqualGUID(&clsid, &FilterCLSID)) { /* Skip filter (same as the one the output pin belongs to) */ IBaseFilter_Release(pfilter); + pfilter = NULL; goto error; }

1 0

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

27 Feb '18

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

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

27 Feb '18

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: 12c6ac5fd7b679816d414262c57f288d0ece57d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12c6ac5fd7b679816d414262… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon Feb 26 22:11:49 2018 +0200 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 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index f853ed4..8713732 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,11 +1,11 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015, 2016, 2017. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-12-05 08:41+0300\n" +"PO-Revision-Date: 2018-02-26 22:09+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" @@ -6674,10 +6674,8 @@ msgid "Connection reset by peer.\n" msgstr "Sujungimas nutrauktas kito serverio.\n" #: winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "Pranešimas 0x%1 nerastas faile %2.\n" +msgstr "Joks parašas nerastas faile.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Sebastian Lackner : server: Keep reference to terminated async in free_async_queue.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: 1356afed5a2e5a6ca2cfd2e4df9a4888f2a85205 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1356afed5a2e5a6ca2cfd2e4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Feb 26 19:14:24 2018 +0100 server: Keep reference to terminated async in free_async_queue. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/async.c b/server/async.c index 4f1bcf1..adbadc5 100644 --- a/server/async.c +++ b/server/async.c @@ -192,10 +192,12 @@ void free_async_queue( struct async_queue *queue ) LIST_FOR_EACH_ENTRY_SAFE( async, next, &queue->queue, struct async, queue_entry ) { + grab_object( &async->obj ); if (!async->completion) async->completion = fd_get_completion( async->fd, &async->comp_key ); async->fd = NULL; async_terminate( async, STATUS_HANDLES_CLOSED ); async->queue = NULL; + release_object( &async->obj ); } }

1 0

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

27 Feb '18

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

Roderick Colenbrander : winevulkan: Add initial Wine vulkan header.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: 460174e53a86524a75988e661a1b2cacc12f7d59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=460174e53a86524a75988e66… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Feb 26 19:42:11 2018 +0100 winevulkan: Add initial Wine vulkan header. This file is directly generated from Vulkan's vk.xml. It contains Core and extension Vulkan types and functions. 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/make_vulkan | 1188 ++++++++ dlls/winevulkan/vk.xml | 6514 +++++++++++++++++++++++++++++++++++++++++++ include/wine/vulkan.h | 2423 ++++++++++++++++ 3 files changed, 10125 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=460174e53a86524a7598…

1 0

Roderick Colenbrander : winevulkan: Add stub ICD.
by Alexandre Julliard 27 Feb '18

27 Feb '18

Module: wine Branch: master Commit: fcc7af83229ee46a177311a658b7ec92ee4d8d50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcc7af83229ee46a177311a6… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Feb 26 19:42:12 2018 +0100 winevulkan: Add stub ICD. 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> --- configure | 2 ++ configure.ac | 1 + dlls/winevulkan/Makefile.in | 6 +++++ dlls/winevulkan/version.rc | 27 ++++++++++++++++++++++ dlls/winevulkan/vulkan.c | 51 +++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/winevulkan.spec | 2 ++ 6 files changed, 89 insertions(+) diff --git a/configure b/configure index 7ef096d..10ca89a 100755 --- a/configure +++ b/configure @@ -1537,6 +1537,7 @@ enable_wineoss_drv enable_wineps_drv enable_winepulse_drv enable_wineqtdecoder +enable_winevulkan enable_winex11_drv enable_wing32 enable_winhttp @@ -19036,6 +19037,7 @@ wine_fn_config_dll wineps.drv enable_wineps_drv wine_fn_config_dll wineps16.drv16 enable_win16 wine_fn_config_dll winepulse.drv enable_winepulse_drv wine_fn_config_dll wineqtdecoder enable_wineqtdecoder +wine_fn_config_dll winevulkan enable_winevulkan wine_fn_config_dll winex11.drv enable_winex11_drv wine_fn_config_dll wing.dll16 enable_win16 wine_fn_config_dll wing32 enable_wing32 diff --git a/configure.ac b/configure.ac index 7b796ef..02937ca 100644 --- a/configure.ac +++ b/configure.ac @@ -3690,6 +3690,7 @@ WINE_CONFIG_DLL(wineps.drv) WINE_CONFIG_DLL(wineps16.drv16,enable_win16) WINE_CONFIG_DLL(winepulse.drv) WINE_CONFIG_DLL(wineqtdecoder) +WINE_CONFIG_DLL(winevulkan) WINE_CONFIG_DLL(winex11.drv) WINE_CONFIG_DLL(wing.dll16,enable_win16) WINE_CONFIG_DLL(wing32) diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in new file mode 100644 index 0000000..0bffb48 --- /dev/null +++ b/dlls/winevulkan/Makefile.in @@ -0,0 +1,6 @@ +MODULE = winevulkan.dll + +C_SRCS = \ + vulkan.c + +RC_SRCS = version.rc diff --git a/dlls/winevulkan/version.rc b/dlls/winevulkan/version.rc new file mode 100644 index 0000000..a62ea75 --- /dev/null +++ b/dlls/winevulkan/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2017 Roderick Colenbrander + * + * 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 "config.h" /* Needed to get PACKAGE_VERSION */ + +#define WINE_FILEDESCRIPTION_STR "Wine Vulkan ICD" +#define WINE_FILENAME_STR "winevulkan.dll" +#define WINE_FILEVERSION_STR PACKAGE_VERSION +#define WINE_PRODUCTVERSION_STR PACKAGE_VERSION +#define WINE_PRODUCTNAME_STR "Wine Vulkan" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c new file mode 100644 index 0000000..cac907c --- /dev/null +++ b/dlls/winevulkan/vulkan.c @@ -0,0 +1,51 @@ +/* Wine Vulkan ICD implementation + * + * Copyright 2017 Roderick Colenbrander + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" +#include "wine/vulkan.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vulkan); + +void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *name) +{ + FIXME("stub: %p %s\n", instance, debugstr_a(name)); + return NULL; +} + +VkResult WINAPI wine_vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *supported_version) +{ + FIXME("stub: %p\n", supported_version); + return VK_ERROR_INCOMPATIBLE_DRIVER; +} + +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + break; + } + return TRUE; +} diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec new file mode 100644 index 0000000..8b87834 --- /dev/null +++ b/dlls/winevulkan/winevulkan.spec @@ -0,0 +1,2 @@ +@ stdcall vk_icdGetInstanceProcAddr(ptr str) wine_vk_icdGetInstanceProcAddr +@ stdcall vk_icdNegotiateLoaderICDInterfaceVersion(ptr) wine_vk_icdNegotiateLoaderICDInterfaceVersion

1 0

Roderick Colenbrander : winevulkan: Implement vk_icdNegotiateICDInterfaceVersion.
by Alexandre Julliard 27 Feb '18

27 Feb '18

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