wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Jacek Caban : ntdll/tests: Add more NtQueryInformationFile tests.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 6c2ac81084f4e8d66ab3f4361710680f0fdcc74b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c2ac81084f4e8d66ab3f436… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 23 17:45:31 2018 +0200 ntdll/tests: Add more NtQueryInformationFile tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 7eef55c..c340839 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -69,6 +69,7 @@ static NTSTATUS (WINAPI *pNtWaitForKeyedEvent)( HANDLE, const void *, BOOLEAN, c static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); static NTSTATUS (WINAPI *pNtCreateIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); static NTSTATUS (WINAPI *pNtOpenIoCompletion)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES ); +static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, void *, ULONG, FILE_INFORMATION_CLASS); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -1270,6 +1271,37 @@ static void test_symboliclink(void) pNtClose(dir); } +#define test_file_info(a) _test_file_info(__LINE__,a) +static void _test_file_info(unsigned line, HANDLE handle) +{ + IO_STATUS_BLOCK io; + char buf[256]; + NTSTATUS status; + + status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), 0xdeadbeef); + ok_(__FILE__,line)(status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED, + "expected STATUS_NOT_IMPLEMENTED, got %x\n", status); + + status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileAccessInformation); + ok_(__FILE__,line)(status == STATUS_SUCCESS, "FileAccessInformation returned %x\n", status); +} + +#define test_no_file_info(a) _test_no_file_info(__LINE__,a) +static void _test_no_file_info(unsigned line, HANDLE handle) +{ + IO_STATUS_BLOCK io; + char buf[256]; + NTSTATUS status; + + status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), 0xdeadbeef); + ok_(__FILE__,line)(status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED, + "expected STATUS_NOT_IMPLEMENTED, got %x\n", status); + + status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileAccessInformation); + ok_(__FILE__,line)(status == STATUS_OBJECT_TYPE_MISMATCH, + "FileAccessInformation returned %x\n", status); +} + static void test_query_object(void) { static const WCHAR name[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s', @@ -1351,6 +1383,7 @@ static void test_query_object(void) ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(type_event) + sizeof(WCHAR), "unexpected len %u\n", len ); + test_no_file_info( handle ); pNtClose( handle ); handle = CreateEventA( NULL, FALSE, FALSE, NULL ); @@ -1361,6 +1394,7 @@ static void test_query_object(void) str = (UNICODE_STRING *)buffer; ok( str->Length == 0, "unexpected len %u\n", len ); ok( str->Buffer == NULL, "unexpected ptr %p\n", str->Buffer ); + test_no_file_info( handle ); pNtClose( handle ); GetWindowsDirectoryA( dir, MAX_PATH ); @@ -1401,6 +1435,7 @@ static void test_query_object(void) ok( len >= expected_len, "unexpected len %u\n", len ); ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + test_file_info( handle ); pNtClose( handle ); @@ -1418,6 +1453,7 @@ static void test_query_object(void) ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); DeleteFileA( file1 ); + test_file_info( handle ); pNtClose( handle ); status = pNtCreateIoCompletion( &handle, IO_COMPLETION_ALL_ACCESS, NULL, 0 ); @@ -1432,6 +1468,7 @@ static void test_query_object(void) ok( len >= expected_len, "unexpected len %u\n", len ); ok( str->Buffer && !memcmp( str->Buffer, type_iocompletion, sizeof(type_iocompletion) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + test_no_file_info( handle ); pNtClose( handle ); status = pNtCreateDirectoryObject( &handle, DIRECTORY_QUERY, NULL ); @@ -1446,6 +1483,7 @@ static void test_query_object(void) ok( len >= expected_len, "unexpected len %u\n", len ); ok( str->Buffer && !memcmp( str->Buffer, type_directory, sizeof(type_directory) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + test_no_file_info( handle ); pNtClose( handle ); size.u.LowPart = 256; @@ -1462,6 +1500,7 @@ static void test_query_object(void) ok( len >= expected_len, "unexpected len %u\n", len ); ok( str->Buffer && !memcmp( str->Buffer, type_section, sizeof(type_section) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + test_no_file_info( handle ); pNtClose( handle ); handle = CreateMailslotA( "\\\\.\\mailslot\\test_mailslot", 100, 1000, NULL ); @@ -1478,6 +1517,7 @@ static void test_query_object(void) ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_mailslot") * sizeof(WCHAR), "name too short %s\n", wine_dbgstr_w(str->Buffer) ); trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); + test_file_info( handle ); pNtClose( handle ); handle = CreateNamedPipeA( "\\\\.\\pipe\\test_pipe", PIPE_ACCESS_DUPLEX, PIPE_READMODE_BYTE, @@ -1508,6 +1548,7 @@ static void test_query_object(void) ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR), "unexpected len %u\n", len ); ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + test_file_info( handle ); client = CreateFileA( "\\\\.\\pipe\\test_pipe", GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0 ); @@ -1522,6 +1563,7 @@ static void test_query_object(void) ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR), "unexpected len %u\n", len ); ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + test_file_info( client ); pNtClose( client ); pNtClose( handle ); @@ -2064,6 +2106,7 @@ START_TEST(om) pNtReleaseKeyedEvent = (void *)GetProcAddress(hntdll, "NtReleaseKeyedEvent"); pNtCreateIoCompletion = (void *)GetProcAddress(hntdll, "NtCreateIoCompletion"); pNtOpenIoCompletion = (void *)GetProcAddress(hntdll, "NtOpenIoCompletion"); + pNtQueryInformationFile = (void *)GetProcAddress(hntdll, "NtQueryInformationFile"); test_case_sensitive(); test_namespace_pipe();

1 0

Jacek Caban : server: Use default_fd_get_file_info for FileAccessInformation implementation.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 8b8eba7e6cf168541c88b9d8ef1d48af011a5dfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b8eba7e6cf168541c88b9d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 23 17:45:21 2018 +0200 server: Use default_fd_get_file_info for FileAccessInformation implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 24 ++++-------------------- server/fd.c | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index c784ee6..b571284 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2236,7 +2236,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, sizeof(FILE_STANDARD_INFORMATION), /* FileStandardInformation */ sizeof(FILE_INTERNAL_INFORMATION), /* FileInternalInformation */ sizeof(FILE_EA_INFORMATION), /* FileEaInformation */ - sizeof(FILE_ACCESS_INFORMATION), /* FileAccessInformation */ + 0, /* FileAccessInformation */ sizeof(FILE_NAME_INFORMATION), /* FileNameInformation */ sizeof(FILE_RENAME_INFORMATION)-sizeof(WCHAR), /* FileRenameInformation */ 0, /* FileLinkInformation */ @@ -2309,13 +2309,10 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, if (len < info_sizes[class]) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; - if (class != FileAccessInformation) + if ((io->u.Status = server_get_unix_fd( hFile, 0, &fd, &needs_close, NULL, NULL ))) { - if ((io->u.Status = server_get_unix_fd( hFile, 0, &fd, &needs_close, NULL, NULL ))) - { - if (io->u.Status != STATUS_BAD_DEVICE_TYPE) return io->u.Status; - return server_get_file_info( hFile, io, ptr, len, class ); - } + if (io->u.Status != STATUS_BAD_DEVICE_TYPE) return io->u.Status; + return server_get_file_info( hFile, io, ptr, len, class ); } switch (class) @@ -2358,19 +2355,6 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, info->EaSize = 0; } break; - case FileAccessInformation: - { - FILE_ACCESS_INFORMATION *info = ptr; - SERVER_START_REQ( get_object_info ) - { - req->handle = wine_server_obj_handle( hFile ); - io->u.Status = wine_server_call( req ); - if (io->u.Status == STATUS_SUCCESS) - info->AccessFlags = reply->access; - } - SERVER_END_REQ; - } - break; case FileEndOfFileInformation: if (fd_get_file_info( fd, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); else fill_file_info( &st, attr, ptr, class ); diff --git a/server/fd.c b/server/fd.c index 85d15d9..65dc8a2 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2178,7 +2178,23 @@ void no_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_ /* default get_file_info() routine */ void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ) { - set_error( STATUS_NOT_IMPLEMENTED ); + switch (info_class) + { + case FileAccessInformation: + { + FILE_ACCESS_INFORMATION info; + if (get_reply_max_size() < sizeof(info)) + { + set_error( STATUS_INFO_LENGTH_MISMATCH ); + return; + } + info.AccessFlags = get_handle_access( current->process, handle ); + set_reply_data( &info, sizeof(info) ); + break; + } + default: + set_error( STATUS_NOT_IMPLEMENTED ); + } } /* default get_volume_info() routine */

1 0

Jacek Caban : server: Use server_get_file_info for all info classes not implemented on client side.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 04094a66694703789768cb230f40ceed2671c0ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=04094a66694703789768cb23… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 23 17:45:06 2018 +0200 server: Use server_get_file_info for all info classes not implemented on client side. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 7 ++----- server/change.c | 2 +- server/device.c | 2 +- server/fd.c | 6 ++++++ server/file.c | 2 +- server/file.h | 1 + server/mailslot.c | 6 +++--- server/named_pipe.c | 26 ++++++++++++++++---------- server/serial.c | 2 +- server/sock.c | 2 +- 10 files changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 77d2d32..c784ee6 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2200,7 +2200,7 @@ static NTSTATUS server_get_file_info( HANDLE handle, IO_STATUS_BLOCK *io, void * io->Information = wine_server_reply_size( reply ); } SERVER_END_REQ; - if (io->u.Status == STATUS_OBJECT_TYPE_MISMATCH) + if (io->u.Status == STATUS_NOT_IMPLEMENTED) FIXME( "Unsupported info class %x\n", info_class ); return io->u.Status; @@ -2305,10 +2305,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, if (class <= 0 || class >= FileMaximumInformation) return io->u.Status = STATUS_INVALID_INFO_CLASS; if (!info_sizes[class]) - { - FIXME("Unsupported class (%d)\n", class); - return io->u.Status = STATUS_NOT_IMPLEMENTED; - } + return server_get_file_info( hFile, io, ptr, len, class ); if (len < info_sizes[class]) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; diff --git a/server/change.c b/server/change.c index 1f2f7c5..d00a885 100644 --- a/server/change.c +++ b/server/change.c @@ -187,7 +187,7 @@ static const struct fd_ops dir_fd_ops = no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ diff --git a/server/device.c b/server/device.c index dcc2946..081fd2d 100644 --- a/server/device.c +++ b/server/device.c @@ -209,7 +209,7 @@ static const struct fd_ops device_file_fd_ops = device_file_read, /* read */ device_file_write, /* write */ device_file_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ device_file_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ diff --git a/server/fd.c b/server/fd.c index 4d07797..85d15d9 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2175,6 +2175,12 @@ void no_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_ set_error( STATUS_OBJECT_TYPE_MISMATCH ); } +/* default get_file_info() routine */ +void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ) +{ + set_error( STATUS_NOT_IMPLEMENTED ); +} + /* default get_volume_info() routine */ void no_fd_get_volume_info( struct fd *fd, unsigned int info_class ) { diff --git a/server/file.c b/server/file.c index 446621a..37f7afe 100644 --- a/server/file.c +++ b/server/file.c @@ -107,7 +107,7 @@ static const struct fd_ops file_fd_ops = no_fd_read, /* read */ no_fd_write, /* write */ file_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ diff --git a/server/file.h b/server/file.h index 8a47333..c30bc96 100644 --- a/server/file.h +++ b/server/file.h @@ -112,6 +112,7 @@ extern int no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); extern int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); extern int no_fd_flush( struct fd *fd, struct async *async ); extern void no_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); +extern void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); extern void no_fd_get_volume_info( struct fd *fd, unsigned int info_class ); extern int no_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); extern int default_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); diff --git a/server/mailslot.c b/server/mailslot.c index f4c7007..95308c4 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -104,7 +104,7 @@ static const struct fd_ops mailslot_fd_ops = no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ mailslot_queue_async, /* queue_async */ @@ -159,7 +159,7 @@ static const struct fd_ops mail_writer_fd_ops = no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ @@ -214,7 +214,7 @@ static const struct fd_ops mailslot_device_fd_ops = no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ diff --git a/server/named_pipe.c b/server/named_pipe.c index ebd8c4f..f643140 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -271,7 +271,7 @@ static const struct fd_ops named_pipe_device_fd_ops = no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ named_pipe_device_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ @@ -520,12 +520,6 @@ static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned struct pipe_end *pipe_end = get_fd_user( fd ); struct named_pipe *pipe = pipe_end->pipe; - if (!pipe) - { - set_error( STATUS_PIPE_DISCONNECTED ); - return; - } - switch (info_class) { case FileNameInformation: @@ -540,13 +534,13 @@ static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned return; } - name = get_object_name( &pipe->obj, &name_len ); /* FIXME: We should be able to return on unlinked pipe */ - if (!name) + if (!pipe || !(name = get_object_name( &pipe->obj, &name_len ))) { set_error( STATUS_PIPE_DISCONNECTED ); return; } + reply_size = offsetof( FILE_NAME_INFORMATION, FileName[name_len/sizeof(WCHAR) + 1] ); if (reply_size > get_reply_max_size()) { @@ -577,6 +571,12 @@ static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned return; } + if (!pipe) + { + set_error( STATUS_PIPE_DISCONNECTED ); + return; + } + if (!(pipe_info = set_reply_data_size( sizeof(*pipe_info) ))) return; pipe_info->ReadMode = (pipe_end->flags & NAMED_PIPE_MESSAGE_STREAM_READ) ? FILE_PIPE_MESSAGE_MODE : FILE_PIPE_BYTE_STREAM_MODE; @@ -600,6 +600,12 @@ static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned return; } + if (!pipe) + { + set_error( STATUS_PIPE_DISCONNECTED ); + return; + } + if (!(pipe_info = set_reply_data_size( sizeof(*pipe_info) ))) return; pipe_info->NamedPipeType = (pipe_end->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) != 0; switch (pipe->sharing) @@ -626,7 +632,7 @@ static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned break; } default: - no_fd_get_file_info( fd, handle, info_class ); + default_fd_get_file_info( fd, handle, info_class ); } } diff --git a/server/serial.c b/server/serial.c index bb976a1..f0adf92 100644 --- a/server/serial.c +++ b/server/serial.c @@ -114,7 +114,7 @@ static const struct fd_ops serial_fd_ops = no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ serial_ioctl, /* ioctl */ serial_queue_async, /* queue_async */ diff --git a/server/sock.c b/server/sock.c index 84f54f6..a8e6e28 100644 --- a/server/sock.c +++ b/server/sock.c @@ -167,7 +167,7 @@ static const struct fd_ops sock_fd_ops = no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ sock_ioctl, /* ioctl */ sock_queue_async, /* queue_async */

1 0

Nikolay Sivov : dxgi: Add partial implementation for dxgi_adapter_GetDesc2 () and dxgi_adapter_GetDesc3().
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 1e8d17d0a4ce5dfd892e70ba8cb131dc56989528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e8d17d0a4ce5dfd892e70ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 24 08:22:03 2018 +0300 dxgi: Add partial implementation for dxgi_adapter_GetDesc2() and dxgi_adapter_GetDesc3(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 57 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index a913870..b96904e 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -147,18 +147,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc1(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC1 *desc) +static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_DESC3 *desc) { - struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); struct wined3d_adapter_identifier adapter_id; char description[128]; HRESULT hr; - TRACE("iface %p, desc %p.\n", iface, desc); - - if (!desc) - return E_INVALIDARG; - adapter_id.driver_size = 0; adapter_id.description = description; adapter_id.description_size = sizeof(description); @@ -187,13 +181,16 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc1(IWineDXGIAdapter *iface, desc->SharedSystemMemory = 0; /* FIXME */ desc->AdapterLuid = adapter_id.adapter_luid; desc->Flags = 0; + desc->GraphicsPreemptionGranularity = 0; /* FIXME */ + desc->ComputePreemptionGranularity = 0; /* FIXME */ return hr; } static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) { - DXGI_ADAPTER_DESC1 desc1; + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); + DXGI_ADAPTER_DESC3 desc3; HRESULT hr; TRACE("iface %p, desc %p.\n", iface, desc); @@ -201,8 +198,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, D if (!desc) return E_INVALIDARG; - if (SUCCEEDED(hr = dxgi_adapter_GetDesc1(iface, &desc1))) - memcpy(desc, &desc1, sizeof(*desc)); + if (SUCCEEDED(hr = dxgi_adapter_get_desc(adapter, &desc3))) + memcpy(desc, &desc3, sizeof(*desc)); return hr; } @@ -249,11 +246,38 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda return S_OK; } +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc1(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC1 *desc) +{ + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); + DXGI_ADAPTER_DESC3 desc3; + HRESULT hr; + + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + return E_INVALIDARG; + + if (SUCCEEDED(hr = dxgi_adapter_get_desc(adapter, &desc3))) + memcpy(desc, &desc3, sizeof(*desc)); + + return hr; +} + static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc2(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC2 *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); + DXGI_ADAPTER_DESC3 desc3; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + return E_INVALIDARG; + + if (SUCCEEDED(hr = dxgi_adapter_get_desc(adapter, &desc3))) + memcpy(desc, &desc3, sizeof(*desc)); + + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_adapter_RegisterHardwareContentProtectionTeardownStatusEvent( @@ -304,9 +328,14 @@ static void STDMETHODCALLTYPE dxgi_adapter_UnregisterVideoMemoryBudgetChangeNoti static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC3 *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + return E_INVALIDARG; + + return dxgi_adapter_get_desc(adapter, desc); } static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl =

1 0

Nikolay Sivov : dxgi: Add IDXGIAdapter4 stub.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 7e7d03ed590af0c3379875bbfe7f717d87224da7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e7d03ed590af0c3379875bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 24 08:22:02 2018 +0300 dxgi: Add IDXGIAdapter4 stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 + dlls/dxgi/adapter.c | 10 ++++++++++ include/wine/winedxgi.idl | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 771e923..787fe87 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -30,6 +30,7 @@ #include "winuser.h" #include "objbase.h" +#include "dxgi1_6.h" #include "d3d11_4.h" #ifdef D3D11_INIT_GUID #include "initguid.h" diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 0079759..a913870 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -34,6 +34,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IWineDXGIAdapter *i TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IWineDXGIAdapter) + || IsEqualGUID(iid, &IID_IDXGIAdapter4) || IsEqualGUID(iid, &IID_IDXGIAdapter3) || IsEqualGUID(iid, &IID_IDXGIAdapter2) || IsEqualGUID(iid, &IID_IDXGIAdapter1) @@ -301,6 +302,13 @@ static void STDMETHODCALLTYPE dxgi_adapter_UnregisterVideoMemoryBudgetChangeNoti FIXME("iface %p, cookie %#x stub!\n", iface, cookie); } +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC3 *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = { dxgi_adapter_QueryInterface, @@ -325,6 +333,8 @@ static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = dxgi_adapter_SetVideoMemoryReservation, dxgi_adapter_RegisterVideoMemoryBudgetChangeNotificationEvent, dxgi_adapter_UnregisterVideoMemoryBudgetChangeNotification, + /* IDXGIAdapter4 methods */ + dxgi_adapter_GetDesc3, }; struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 3a1d6fa..fccf45d 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -18,7 +18,7 @@ #pragma makedep header -import "dxgi1_5.idl"; +import "dxgi1_6.idl"; [ object, @@ -56,7 +56,7 @@ interface IWineDXGIDeviceParent : IUnknown local, uuid(17399d75-964e-4c03-99f8-9d4fd196dd62) ] -interface IWineDXGIAdapter : IDXGIAdapter3 +interface IWineDXGIAdapter : IDXGIAdapter4 { }

1 0

Matteo Bruni : wined3d: Invalidate shader resource bindings when blitting.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: a27dbb2d5c27e6d932fc4b0839d3adb1c9d74a13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a27dbb2d5c27e6d932fc4b08… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 23 19:08:50 2018 +0200 wined3d: Invalidate shader resource bindings when blitting. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 37abf19..bdd291b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2846,6 +2846,8 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine } context_invalidate_state(context, STATE_SAMPLER(sampler)); } + context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); + context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) {

1 0

Alex Henrie : dwmapi: Add stub DwmpGetColorizationParameters.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 32f3918108e1fa911bc3e28f7350940aa56b7b0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=32f3918108e1fa911bc3e28f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 23 21:43:39 2018 -0600 dwmapi: Add stub DwmpGetColorizationParameters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43177 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 27523b7..23380a9 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -20,7 +20,7 @@ 124 stub -noname DwmpRegisterThumbnail 125 stub DwmpDxBindSwapChain 126 stub DwmpDxUnbindSwapChain -127 stub -noname DwmpGetColorizationParameters +127 stdcall -noname DwmpGetColorizationParameters(ptr) 128 stub DwmpDxgiIsThreadDesktopComposited 129 stub -noname DwmpDxgiDisableRedirection 130 stub -noname DwmpDxgiEnableRedirection diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 76e225f..c1ee067 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -286,3 +286,12 @@ HRESULT WINAPI DwmSetIconicThumbnail(HWND hwnd, HBITMAP hbmp, DWORD flags) FIXME("(%p %p %x) stub\n", hwnd, hbmp, flags); return S_OK; }; + +/********************************************************************** + * DwmpGetColorizationParameters (DWMAPI.@) + */ +HRESULT WINAPI DwmpGetColorizationParameters(void *params) +{ + FIXME("(%p) stub\n", params); + return E_NOTIMPL; +}

1 0

Alex Henrie : dwmapi: Fill in function names of documented ordinals.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 6955e368f477ac962d93494cbfc4ca3ef9b17b0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6955e368f477ac962d93494c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 23 21:43:38 2018 -0600 dwmapi: Fill in function names of documented ordinals. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 3744719..27523b7 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -1,33 +1,33 @@ 100 stub DwmpDxGetWindowSharedSurface 101 stub DwmpDxUpdateWindowSharedSurface 102 stdcall DwmEnableComposition(long) -103 stub @ -104 stub @ -105 stub @ -106 stub @ -107 stub @ -108 stub @ -109 stub @ -110 stub @ -112 stub @ -113 stub @ -114 stub @ -115 stub @ -118 stub @ -119 stub @ -120 stub @ -121 stub @ -124 stub @ +103 stub -noname DwmpRestartComposition +104 stub -noname DwmpSetColorizationColor +105 stub -noname DwmpStartOrStopFlip3D +106 stub -noname DwmpIsCompositionCapable +107 stub -noname DwmpGetGlobalState +108 stub -noname DwmpEnableRedirection +109 stub -noname DwmpOpenGraphicsStream +110 stub -noname DwmpCloseGraphicsStream +112 stub -noname DwmpSetGraphicsStreamTransformHint +113 stub -noname DwmpActivateLivePreview +114 stub -noname DwmpQueryThumbnailType +115 stub -noname DwmpStartupViaUserInit +118 stub -noname DwmpGetAssessment +119 stub -noname DwmpGetAssessmentUsage +120 stub -noname DwmpSetAssessmentUsage +121 stub -noname DwmpIsSessionDWM +124 stub -noname DwmpRegisterThumbnail 125 stub DwmpDxBindSwapChain 126 stub DwmpDxUnbindSwapChain -127 stub @ +127 stub -noname DwmpGetColorizationParameters 128 stub DwmpDxgiIsThreadDesktopComposited -129 stub @ -130 stub @ -131 stub @ -132 stub @ +129 stub -noname DwmpDxgiDisableRedirection +130 stub -noname DwmpDxgiEnableRedirection +131 stub -noname DwmpSetColorizationParameters +132 stub -noname DwmpGetCompositionTimingInfoEx 133 stub DwmpDxUpdateWindowRedirectionBltSurface -134 stub @ +134 stub -noname DwmpDxSetContentHostingInformation 135 stub DwmpRenderFlick 136 stub DwmpAllocateSecurityDescriptor 137 stub DwmpFreeSecurityDescriptor

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: ec8425bab43e285a343c7329676a46438f368baa URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec8425bab43e285a343c7329… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Oct 24 08:55:58 2018 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/po/lt.po b/po/lt.po index 4c56e9b..b714392 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-10-06 08:19+0300\n" +"PO-Revision-Date: 2018-10-24 08:54+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" @@ -309,25 +309,23 @@ msgstr "Atsisakoma..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "liko %1!u! %2" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "liko %1!u! %2 ir %3!u! %4" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "S&ekundės" +msgstr "sek." #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "min." #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "val." #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s"

1 0

Jactry Zeng : kernel32: Don't check a discarded variable.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: ebc0e5ffb595d92bca7a38a3710e494662298e96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebc0e5ffb595d92bca7a38a3… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Oct 24 13:30:17 2018 +0800 kernel32: Don't check a discarded variable. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 32e7517..799519e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2146,7 +2146,7 @@ static NTSTATUS exec_loader( const RTL_USER_PROCESS_PARAMETERS *params, int sock wine_exec_wine_binary( loader, argv, getenv("WINELOADER") ); } #ifdef __APPLE__ - while (errno == ENOTSUP && exec_only && terminate_main_thread()); + while (errno == ENOTSUP && terminate_main_thread()); #else while (0); #endif

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
61
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 October 2018