wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

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 : 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: 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

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

Wei xie : winex11: Avoid deadlock when setting cursor.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 48fb9d6a03a16e389b3d214d68356c52ad3310b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48fb9d6a03a16e389b3d214d… Author: Wei xie <xiewei(a)linuxdeepin.com> Date: Tue Mar 27 14:00:07 2018 +0800 winex11: Avoid deadlock when setting cursor. Signed-off-by: Wei xie <xiewei(a)linuxdeepin.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 6d79f06..fff3f5c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2712,8 +2712,9 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) case WM_X11DRV_SET_CURSOR: if ((data = get_win_data( hwnd ))) { - if (data->whole_window) set_window_cursor( data->whole_window, (HCURSOR)lp ); + Window win = data->whole_window; release_win_data( data ); + if (win) set_window_cursor( win, (HCURSOR)lp ); } else if (hwnd == x11drv_thread_data()->clip_hwnd) set_window_cursor( x11drv_thread_data()->clip_window, (HCURSOR)lp );

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

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

André Hentschel : wininet: Fix negated check for drain_content result (clang).
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: be002fd92b9d72163bf130ab8ade8aa4d9cdbad0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be002fd92b9d72163bf130ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 28 19:50:06 2018 +0200 wininet: Fix negated check for drain_content result (clang). Introduced with 4f40039cd785c916cd25e5e9b4a0c75dab53a50a Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d77e528..f28f7c5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5091,7 +5091,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, request->session->password, host)) { heap_free(requestString); - if(!drain_content(request, TRUE) == ERROR_SUCCESS) { + if (drain_content(request, TRUE) != ERROR_SUCCESS) + { FIXME("Could not drain content\n"); http_release_netconn(request, FALSE); } @@ -5119,7 +5120,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, NULL)) { heap_free(requestString); - if(!drain_content(request, TRUE) == ERROR_SUCCESS) { + if (drain_content(request, TRUE) != ERROR_SUCCESS) + { FIXME("Could not drain content\n"); http_release_netconn(request, FALSE); }

1 0

Matteo Bruni : d3dx9: Fix FindNextValidTechnique() when no previous technique is specified.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: 01e278a309b2eca00a26d5833c438480e5f45a12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01e278a309b2eca00a26d583… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 28 21:05:13 2018 +0200 d3dx9: Fix FindNextValidTechnique() when no previous technique is specified. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 5 +++- dlls/d3dx9_36/tests/effect.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 404a36d..a909d66 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4048,7 +4048,10 @@ static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect *iface, { tech = &base->techniques[i]; if (tech == prev_tech) + { + ++i; break; + } } } else @@ -4056,7 +4059,7 @@ static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect *iface, i = 0; } - for (++i; i < base->technique_count; ++i) + for (; i < base->technique_count; ++i) { tech = &base->techniques[i]; if (SUCCEEDED(ID3DXEffectImpl_ValidateTechnique(iface, get_technique_handle(tech)))) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 9693939..9a8a9b6 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7832,6 +7832,38 @@ static void test_create_effect_from_file(void) DestroyWindow(window); } +#if 0 +technique tech0 +{ + pass p0 + { + LightEnable[0] = FALSE; + FogEnable = FALSE; + } +} +technique tech1 +{ + pass p0 + { + LightEnable[0] = TRUE; + FogEnable = TRUE; + } +} +#endif +static const DWORD test_two_techniques_blob[] = +{ + 0xfeff0901, 0x000000ac, 0x00000000, 0x00000000, 0x00000002, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000002, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000001, 0x00000001, 0x00000003, 0x00003070, 0x00000006, 0x68636574, 0x00000030, + 0x00000001, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, + 0x00000001, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, + 0x00000003, 0x00003070, 0x00000006, 0x68636574, 0x00000031, 0x00000000, 0x00000002, 0x00000002, + 0x00000001, 0x0000004c, 0x00000000, 0x00000001, 0x00000044, 0x00000000, 0x00000002, 0x00000091, + 0x00000000, 0x00000008, 0x00000004, 0x0000000e, 0x00000000, 0x00000028, 0x00000024, 0x000000a0, + 0x00000000, 0x00000001, 0x00000098, 0x00000000, 0x00000002, 0x00000091, 0x00000000, 0x0000005c, + 0x00000058, 0x0000000e, 0x00000000, 0x0000007c, 0x00000078, 0x00000000, 0x00000000, +}; + static void test_effect_find_next_valid_technique(void) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -7868,6 +7900,30 @@ static void test_effect_find_next_valid_technique(void) return; } + hr = D3DXCreateEffectEx(device, test_two_techniques_blob, sizeof(test_two_techniques_blob), + NULL, NULL, NULL, 0, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->FindNextValidTechnique(effect, NULL, &tech); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->GetTechniqueDesc(effect, tech, &desc); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!strcmp(desc.Name, "tech0"), "Got unexpected technique %s.\n", desc.Name); + + hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->GetTechniqueDesc(effect, tech, &desc); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!strcmp(desc.Name, "tech1"), "Got unexpected technique %s.\n", desc.Name); + + hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); + ok(hr == S_FALSE, "Got result %#x.\n", hr); + hr = effect->lpVtbl->GetTechniqueDesc(effect, tech, &desc); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!strcmp(desc.Name, "tech0"), "Got unexpected technique %s.\n", desc.Name); + + effect->lpVtbl->Release(effect); + hr = D3DXCreateEffectEx(device, test_effect_unsupported_shader_blob, sizeof(test_effect_unsupported_shader_blob), NULL, NULL, NULL, 0, NULL, &effect, NULL); ok(hr == D3D_OK, "Got result %#x.\n", hr);

1 0

Andrey Gusev : d3dx11: Add D3DX11CreateTextureFromFileA/W stub.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: 8dedf244f615b68d9013cd1aa77c0edff0d517a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dedf244f615b68d9013cd1a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Mar 24 16:40:22 2018 +0200 d3dx11: Add D3DX11CreateTextureFromFileA/W stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 4 ++-- dlls/d3dx11_43/d3dx11_43.spec | 4 ++-- dlls/d3dx11_43/texture.c | 20 ++++++++++++++++++++ include/d3dx11tex.h | 8 ++++++++ 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index f05e02c..cb1f780 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -20,8 +20,8 @@ @ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) d3dx11_43.D3DX11CreateShaderResourceViewFromMemory @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW -@ stub D3DX11CreateTextureFromFileA -@ stub D3DX11CreateTextureFromFileW +@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileA +@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileW @ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 1cafaa6..76a3916 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -20,8 +20,8 @@ @ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW -@ stub D3DX11CreateTextureFromFileA -@ stub D3DX11CreateTextureFromFileW +@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) +@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) @ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index fe291d9..6aaf8a7 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -35,6 +35,26 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co return E_NOTIMPL; } +HRESULT WINAPI D3DX11CreateTextureFromFileA(ID3D11Device *device, const char *filename, + D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, + HRESULT *hresult) +{ + FIXME("device %p, filename %s, load_info %p, pump %p, texture %p, hresult %p stub.\n", + device, debugstr_a(filename), load_info, pump, texture, hresult); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *filename, + D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, + HRESULT *hresult) +{ + FIXME("device %p, filename %s, load_info %p, pump %p, texture %p, hresult %p stub.\n", + device, debugstr_w(filename), load_info, pump, texture, hresult); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data, SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult) diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index 584a3bd..4f792ec 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -111,6 +111,14 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11ShaderResourceView **view, HRESULT *hresult); +HRESULT WINAPI D3DX11CreateTextureFromFileA(ID3D11Device *device, const char *filename, + D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, + HRESULT *hresult); + +HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *filename, + D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, + HRESULT *hresult); + HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult);

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018