March 2018 - Wine-commits - list.winehq.org

André Hentschel : winex11: Build helper functions only when needed.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 4f547e784a7505090bb41d353891451e163f7ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f547e784a7505090bb41d35… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 27 18:41:58 2018 +0200 winex11: Build helper functions only when needed. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/bitblt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 6a858c1..165633c 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1588,6 +1588,7 @@ static inline UINT get_color_component( UINT color, UINT mask ) return (color * mask / 255) << shift; } +#ifdef HAVE_LIBXSHAPE static inline void flush_rgn_data( HRGN rgn, RGNDATA *data ) { HRGN tmp = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); @@ -1609,6 +1610,7 @@ static inline void add_row( HRGN rgn, RGNDATA *data, int x, int y, int len ) if (data->rdh.nCount * sizeof(RECT) > data->rdh.nRgnSize - sizeof(RECT)) flush_rgn_data( rgn, data ); } +#endif /*********************************************************************** * update_surface_region

1 0

Jacek Caban : server: Don' t change iosb without associated async in wake_message.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: bb9c4198fcfcd0d9ecf75a822caa65f17f666b05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb9c4198fcfcd0d9ecf75a82… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 22:46:27 2018 +0200 server: Don't change iosb without associated async in wake_message. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index c77b07f..a6f5fb6 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -356,13 +356,12 @@ static void wake_message( struct pipe_message *message ) struct async *async = message->async; message->async = NULL; + if (!async) return; + message->iosb->status = STATUS_SUCCESS; message->iosb->result = message->iosb->in_size; - if (async) - { - async_terminate( async, message->iosb->result ? STATUS_ALERTED : STATUS_SUCCESS ); - release_object( async ); - } + async_terminate( async, message->iosb->result ? STATUS_ALERTED : STATUS_SUCCESS ); + release_object( async ); } static void free_message( struct pipe_message *message ) @@ -768,7 +767,7 @@ static void reselect_write_queue( struct pipe_end *pipe_end ) else { avail += message->iosb->in_size - message->read_pos; - if (message->iosb->status == STATUS_PENDING && (avail <= reader->buffer_size || !message->iosb->in_size)) + if (message->async && (avail <= reader->buffer_size || !message->iosb->in_size)) wake_message( message ); } }

1 0

Jacek Caban : server: Add a helper for queuing pipe message.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: a588a5a39754fdeb7bacb9047c55f9aeec9429d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a588a5a39754fdeb7bacb904… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 22:46:32 2018 +0200 server: Add a helper for queuing pipe message. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index a6f5fb6..d7467dc 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -351,6 +351,18 @@ static void set_server_state( struct pipe_server *server, enum pipe_state state } +static struct pipe_message *queue_message( struct pipe_end *pipe_end, struct iosb *iosb ) +{ + struct pipe_message *message; + + if (!(message = mem_alloc( sizeof(*message) ))) return NULL; + message->iosb = (struct iosb *)grab_object( iosb ); + message->async = NULL; + message->read_pos = 0; + list_add_tail( &pipe_end->message_queue, &message->entry ); + return message; +} + static void wake_message( struct pipe_message *message ) { struct async *async = message->async; @@ -794,26 +806,26 @@ static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) static int pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) { - struct pipe_end *write_end = get_fd_user( fd ); - struct pipe_end *read_end = write_end->connection; + struct pipe_end *pipe_end = get_fd_user( fd ); struct pipe_message *message; + struct iosb *iosb; - if (!read_end) + if (!pipe_end->connection) { set_error( STATUS_PIPE_DISCONNECTED ); return 0; } - if (!(write_end->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) && !get_req_data_size()) return 1; + if (!(pipe_end->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) && !get_req_data_size()) return 1; - if (!(message = mem_alloc( sizeof(*message) ))) return 0; - message->async = (struct async *)grab_object( async ); - message->iosb = async_get_iosb( async ); - message->read_pos = 0; - list_add_tail( &read_end->message_queue, &message->entry ); + iosb = async_get_iosb( async ); + message = queue_message( pipe_end->connection, iosb ); + release_object( iosb ); + if (!message) return 0; - queue_async( &write_end->write_q, async ); - reselect_write_queue( write_end ); + message->async = (struct async *)grab_object( async ); + queue_async( &pipe_end->write_q, async ); + reselect_write_queue( pipe_end ); set_error( STATUS_PENDING ); return 1; }

1 0

Jacek Caban : server: Add FSCTL_PIPE_TRANSCEIVE implementation.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: c9833f89e50d34b57c42b7e34cbf08e1a2f2279c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9833f89e50d34b57c42b7e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 22:46:38 2018 +0200 server: Add FSCTL_PIPE_TRANSCEIVE implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 57 insertions(+), 8 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index d7467dc..3d260c7 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -900,6 +900,61 @@ static int pipe_end_peek( struct pipe_end *pipe_end ) return 1; } +static int pipe_end_transceive( struct pipe_end *pipe_end, struct async *async ) +{ + struct pipe_message *message; + struct iosb *iosb; + + if ((pipe_end->flags & (NAMED_PIPE_MESSAGE_STREAM_WRITE | NAMED_PIPE_MESSAGE_STREAM_READ)) + != (NAMED_PIPE_MESSAGE_STREAM_WRITE | NAMED_PIPE_MESSAGE_STREAM_READ)) + { + set_error( STATUS_INVALID_READ_MODE ); + return 0; + } + + if (!pipe_end->connection) + { + set_error( STATUS_PIPE_BROKEN ); + return 0; + } + + /* not allowed if we already have read data buffered */ + if (!list_empty( &pipe_end->message_queue )) + { + set_error( STATUS_PIPE_BUSY ); + return 0; + } + + iosb = async_get_iosb( async ); + /* ignore output buffer copy transferred because of METHOD_NEITHER */ + iosb->in_size -= iosb->out_size; + /* transaction never blocks on write, so just queue a message without async */ + message = queue_message( pipe_end->connection, iosb ); + release_object( iosb ); + if (!message) return 0; + reselect_read_queue( pipe_end->connection ); + + queue_async( &pipe_end->read_q, async ); + reselect_read_queue( pipe_end ); + set_error( STATUS_PENDING ); + return 1; +} + +static int pipe_end_ioctl( struct pipe_end *pipe_end, ioctl_code_t code, struct async *async ) +{ + switch(code) + { + case FSCTL_PIPE_PEEK: + return pipe_end_peek( pipe_end ); + + case FSCTL_PIPE_TRANSCEIVE: + return pipe_end_transceive( pipe_end, async ); + + default: + return default_fd_ioctl( pipe_end->fd, code, async ); + } +} + static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct pipe_server *server = get_fd_user( fd ); @@ -955,11 +1010,8 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as } return 1; - case FSCTL_PIPE_PEEK: - return pipe_end_peek( &server->pipe_end ); - default: - return default_fd_ioctl( fd, code, async ); + return pipe_end_ioctl( &server->pipe_end, code, async ); } } @@ -973,11 +1025,8 @@ static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *as set_error( STATUS_ILLEGAL_FUNCTION ); return 0; - case FSCTL_PIPE_PEEK: - return pipe_end_peek( &client->pipe_end ); - default: - return default_fd_ioctl( fd, code, async ); + return pipe_end_ioctl( &client->pipe_end, code, async ); } }

1 0

Jacek Caban : ntdll/tests: Add FSCTL_PIPE_TRANSCEIVE tests.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: f2cc9507aa0e414c25754c350060c0a75535040a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2cc9507aa0e414c25754c35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 22:46:44 2018 +0200 ntdll/tests: Add FSCTL_PIPE_TRANSCEIVE tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 5cbf6e7..2978274 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1109,6 +1109,35 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) CloseHandle(event); } +static void test_transceive(void) +{ + IO_STATUS_BLOCK iosb; + HANDLE caller, callee; + HANDLE event = CreateEventA( NULL, TRUE, FALSE, NULL ); + char buffer[128]; + DWORD written; + BOOL ret; + NTSTATUS status; + + if (!create_pipe_pair( &caller, &callee, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, 4096 )) return; + + status = NtFsControlFile( caller, event, NULL, NULL, &iosb, FSCTL_PIPE_TRANSCEIVE, + (BYTE*)"test", 4, buffer, sizeof(buffer) ); + ok( status == STATUS_PENDING, "NtFsControlFile(FSCTL_PIPE_TRANSCEIVE) returned %x\n", status); + ok( !is_signaled( event ), "event is signaled\n" ); + + ret = WriteFile( callee, buffer, 2, &written, NULL ); + ok(ret && written == 2, "WriteFile error %d\n", GetLastError()); + + ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); + ok( iosb.Information == 2, "wrong info %lu\n", iosb.Information ); + ok( is_signaled( event ), "event is not signaled\n" ); + + CloseHandle( caller ); + CloseHandle( callee ); +} + static void test_volume_info(void) { FILE_FS_DEVICE_INFORMATION *device_info; @@ -1464,6 +1493,7 @@ START_TEST(pipe) trace("starting message read in message mode server -> client\n"); read_pipe_test(PIPE_ACCESS_OUTBOUND, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE); + test_transceive(); test_volume_info(); test_file_info(); test_security_info();

1 0

Francois Gouget : testbot: Allow running a second, higher privilege TestAgentd.
by Alexandre Julliard 29 Mar '18

29 Mar '18

Module: tools Branch: master Commit: 5ae6b2f3401f9184e16b5c90884633d051d1972f URL: https://source.winehq.org/git/tools.git/?a=commit;h=5ae6b2f3401f9184e16b5c9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 28 01:44:05 2018 +0200 testbot: Allow running a second, higher privilege TestAgentd. By convention it shall run on $AgentPort+1. This makes it possible to run the tests in an unprivileged account, while still having a TestAgentd server with high enough privileges to adjust the VM clock. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 10 ++++++++-- testbot/lib/WineTestBot/VMs.pm | 8 +++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 88c3b58..4f69a1e 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -372,8 +372,14 @@ my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Setting the time\n"); if (!$TA->SetTime()) { - # Not a fatal error - LogTaskError("Unable to set the VM system time: ". $TA->GetLastError() .". Maybe the TestAgentd process is missing the required privileges.\n"); + # Not a fatal error. Try the next port in case the VM runs a privileged + # TestAgentd daemon there. + my $PrivilegedTA = $VM->GetAgent(1); + if (!$PrivilegedTA->SetTime()) + { + LogTaskError("Unable to set the VM system time: ". $PrivilegedTA->GetLastError() .". Maybe the TestAgentd process is missing the required privileges.\n"); + $PrivilegedTA->Disconnect(); + } } my $FileType = $Step->FileType; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index e932082..e74640b 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -208,9 +208,9 @@ sub GetDomain($) return LibvirtDomain->new($self); } -sub GetAgent($) +sub GetAgent($;$) { - my ($self) = @_; + my ($self, $Privileged) = @_; # Use either the tunnel specified in the configuration file # or autodetect the settings based on the VM's VirtURI setting. @@ -226,7 +226,9 @@ sub GetAgent($) $TunnelInfo->{sshport} = $ParsedURI->port; $TunnelInfo->{username} = $ParsedURI->userinfo; } - return TestAgent->new($self->Hostname, $AgentPort, $TunnelInfo); + my $Port = $AgentPort; + $Port++ if ($Privileged); + return TestAgent->new($self->Hostname, $Port, $TunnelInfo); } sub Status($;$)

1 0

Francois Gouget : testbot/Janitor: Simplify the deletion of users and VMs.
by Alexandre Julliard 29 Mar '18

29 Mar '18

Module: tools Branch: master Commit: 16062529a8002beca63788ad69871e273e40c2ca URL: https://source.winehq.org/git/tools.git/?a=commit;h=16062529a8002beca63788a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 28 01:44:29 2018 +0200 testbot/Janitor: Simplify the deletion of users and VMs. Handle the deleted users and deleted VMs separately. Also iterate over the tasks directly instead of going through the Jobs and Steps when checking the deleted VMs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 77 ++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 56e024a..7c4168c 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -49,6 +49,7 @@ use WineTestBot::Patches; use WineTestBot::PendingPatchSets; use WineTestBot::CGI::Sessions; use WineTestBot::RecordGroups; +use WineTestBot::Tasks; use WineTestBot::Users; use WineTestBot::VMs; @@ -195,70 +196,66 @@ if ($JobArchiveDays != 0) } } -# Purge the deleted users and VMs if they are not referenced anymore +# Purge the deleted VMs if they are not referenced anymore my $VMs = CreateVMs(); $VMs->AddFilter("Role", ["deleted"]); my %DeletedVMs; map { $DeletedVMs{$_} = 1 } @{$VMs->GetKeys()}; -my $Users = CreateUsers(); -$Users->AddFilter("Status", ["deleted"]); -my %DeletedUsers; -map { $DeletedUsers{$_} = 1 } @{$Users->GetKeys()}; - -if (%DeletedUsers or %DeletedVMs) +if (%DeletedVMs) { - foreach my $Job (@{CreateJobs()->GetItems()}) + foreach my $Task (@{CreateTasks($VMs)->GetItems()}) { - if (exists $DeletedUsers{$Job->User->Name}) + if (exists $DeletedVMs{$Task->VM->Name}) { - Trace "Keeping the ", $Job->User->Name, " account for job ", $Job->Id, "\n"; - delete $DeletedUsers{$Job->User->Name}; + Trace "Keeping the ", $Task->VM->Name, " VM for task ", join("/", @{$Task->GetMasterKey()}), "\n"; + delete $DeletedVMs{$Task->VM->Name}; + last if (!%DeletedVMs); } + } + foreach my $VMKey (keys %DeletedVMs) + { + Trace "Deleting the $VMKey VM\n"; + next if ($DryRun); - if (%DeletedVMs) + my $VM = $VMs->GetItem($VMKey); + my $ErrMessage = $VMs->DeleteItem($VM); + if (defined $ErrMessage) { - foreach my $Step (@{$Job->Steps->GetItems()}) - { - foreach my $Task (@{$Step->Tasks->GetItems()}) - { - if (exists $DeletedVMs{$Task->VM->Name}) - { - Trace "Keeping the ", $Task->VM->Name, " VM for task ", join("/", @{$Task->GetMasterKey()}), "\n"; - delete $DeletedVMs{$Task->VM->Name}; - } - } - } + Error "Unable to delete the $VMKey VM: $ErrMessage\n"; } } +} - if (%DeletedUsers) +# Purge the deleted users if they are not referenced anymore +my $Users = CreateUsers(); +$Users->AddFilter("Status", ["deleted"]); +my %DeletedUsers; +map { $DeletedUsers{$_} = 1 } @{$Users->GetKeys()}; + +if (%DeletedUsers) +{ + foreach my $Job (@{CreateJobs($Users)->GetItems()}) { - foreach my $UserName (keys %DeletedUsers) + if (exists $DeletedUsers{$Job->User->Name}) { - my $User = $Users->GetItem($UserName); - Trace "Deleting the $UserName account\n"; - next if ($DryRun); - - DeleteSessions($User); - my $ErrMessage = $Users->DeleteItem($User); - if (defined $ErrMessage) - { - Error "Unable to delete the $UserName account: $ErrMessage\n"; - } + Trace "Keeping the ", $Job->User->Name, " account for job ", $Job->Id, "\n"; + delete $DeletedUsers{$Job->User->Name}; + last if (!%DeletedUsers); } } - foreach my $VMKey (keys %DeletedVMs) + foreach my $UserKey (keys %DeletedUsers) { - my $VM = $VMs->GetItem($VMKey); - Trace "Deleting the $VMKey VM\n"; + Trace "Deleting the $UserKey account\n"; next if ($DryRun); - my $ErrMessage = $VMs->DeleteItem($VM); + my $User = $Users->GetItem($UserKey); + DeleteSessions($User); + my $ErrMessage = $Users->DeleteItem($User); if (defined $ErrMessage) { - Error "Unable to delete the $VMKey VM: $ErrMessage\n"; + Error "Unable to delete the $UserKey account: $ErrMessage\n"; } } }

1 0

Roderick Colenbrander : vulkan-1: Implement vkEnumerateInstanceExtensionProperties.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: 6ba422b3dc8908b7bb08cedd314c89b2649be2c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ba422b3dc8908b7bb08cedd… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 28 00:20:51 2018 -0700 vulkan-1: Implement vkEnumerateInstanceExtensionProperties. 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/vulkan-1/vulkan.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/vulkan-1/vulkan.c b/dlls/vulkan-1/vulkan.c index 5f974ee..fbc3d1c 100644 --- a/dlls/vulkan-1/vulkan.c +++ b/dlls/vulkan-1/vulkan.c @@ -27,11 +27,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); +VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *, uint32_t *, VkExtensionProperties *); + VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties *properties) { - FIXME("stub: %p %p %p\n", layer_name, count, properties); - return VK_ERROR_OUT_OF_HOST_MEMORY; + TRACE("%p %p %p\n", layer_name, count, properties); + + if (layer_name) + return VK_ERROR_LAYER_NOT_PRESENT; + + return wine_vkEnumerateInstanceExtensionProperties(NULL, count, properties); } VkResult WINAPI vkEnumerateInstanceLayerProperties(uint32_t *count,

1 0

Roderick Colenbrander : vulkan-1: Implement vkGetInstanceProcAddr.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: 3a6c724e904e4730adc365df03ab7a096532ed1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a6c724e904e4730adc365df… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 28 00:20:52 2018 -0700 vulkan-1: Implement vkGetInstanceProcAddr. 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/vulkan-1/vulkan.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/vulkan-1/vulkan.c b/dlls/vulkan-1/vulkan.c index fbc3d1c..6f7ab43 100644 --- a/dlls/vulkan-1/vulkan.c +++ b/dlls/vulkan-1/vulkan.c @@ -28,6 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *, uint32_t *, VkExtensionProperties *); +PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance, const char *); VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties *properties) @@ -52,8 +53,18 @@ VkResult WINAPI vkEnumerateInstanceLayerProperties(uint32_t *count, PFN_vkVoidFunction WINAPI vkGetInstanceProcAddr(VkInstance instance, const char *name) { - FIXME("stub: %p %s\n", instance, debugstr_a(name)); - return NULL; + TRACE("%p %s\n", instance, debugstr_a(name)); + + if (!strcmp(name, "vkEnumerateInstanceExtensionProperties")) + return (PFN_vkVoidFunction)vkEnumerateInstanceExtensionProperties; + + if (!strcmp(name, "vkEnumerateInstanceLayerProperties")) + return (PFN_vkVoidFunction)vkEnumerateInstanceLayerProperties; + + if (!strcmp(name, "vkGetInstanceProcAddr")) + return (PFN_vkVoidFunction)vkGetInstanceProcAddr; + + return wine_vkGetInstanceProcAddr(instance, name); } BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved)

1 0

Zhiyi Zhang : comctl32/button: Implement BCM_{GETNOTE, SETNOTE, GETNOTELENGTH} message.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: 06d2ad29aee4b1468b1a3fda47af170951737365 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06d2ad29aee4b1468b1a3fda… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 28 19:45:19 2018 +0800 comctl32/button: Implement BCM_{GETNOTE,SETNOTE,GETNOTELENGTH} message. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 86 +++++++++++++++++++++++ dlls/comctl32/tests/button.c | 158 +++++++++++++++++++++++++++++++++++++++++++ include/commctrl.h | 8 +++ 3 files changed, 252 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=06d2ad29aee4b1468b1a…

1 0