August 2015 - Wine-commits - list.winehq.org

Alexandre Julliard : Release 1.7.50.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 5ccc463a4e3ba181b96a161c3c8cd4bc0cb0e607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ccc463a4e3ba181b96a161c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 21 23:05:30 2015 +0900 Release 1.7.50. --- ANNOUNCE | 630 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 343 insertions(+), 308 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ccc463a4e3ba181b96a1…

1 0

Tag wine-1.7.50 : Alexandre Julliard : Release 1.7.50
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: refs/tags/wine-1.7.50 Tag: 05858f19782b4fc745cd296094b88606b005ea94 URL: http://source.winehq.org/git/wine.git/?a=tag;h=05858f19782b4fc745cd296094b8… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 21 23:05:30 2015 +0900 Release 1.7.50

1 0

Sebastian Lackner : server: Implement support for FileLinkInformation class in NtSetInformationFile.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 1f2a443cb4bc42b7f1934e351feff84679e3ae2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2a443cb4bc42b7f1934e351… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 21 07:25:12 2015 +0200 server: Implement support for FileLinkInformation class in NtSetInformationFile. --- dlls/ntdll/file.c | 44 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/tests/file.c | 50 +++++++++++++++++++++--------------------- include/wine/server_protocol.h | 4 ++-- server/fd.c | 33 +++++++++++++++++++++++----- server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + 7 files changed, 101 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f2a443cb4bc42b7f1934…

1 0

Sebastian Lackner : ntdll/tests: Add additional tests for calling NtOpenFile with file object as RootDirectory.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 84d2610aafb3c8b49f5ff8da71f024dc0cea615a URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d2610aafb3c8b49f5ff8da7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 21 07:25:45 2015 +0200 ntdll/tests: Add additional tests for calling NtOpenFile with file object as RootDirectory. --- dlls/ntdll/tests/file.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ad844b1..4f58788 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -297,7 +297,8 @@ static void create_file_test(void) static void open_file_test(void) { - static const WCHAR fooW[] = {'f','o','o',0}; + static const char testdata[] = "Hello World"; + static WCHAR fooW[] = {'f','o','o',0}; NTSTATUS status; HANDLE dir, root, handle, file; WCHAR path[MAX_PATH], tmpfile[MAX_PATH]; @@ -306,7 +307,8 @@ static void open_file_test(void) IO_STATUS_BLOCK io; UNICODE_STRING nameW; UINT i, len; - BOOL restart = TRUE; + BOOL ret, restart = TRUE; + DWORD numbytes; len = GetWindowsDirectoryW( path, MAX_PATH ); pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); @@ -432,6 +434,14 @@ static void open_file_test(void) GetTempFileNameW( path, fooW, 0, tmpfile ); pRtlDosPathNameToNtPathName_U( tmpfile, &nameW, NULL, NULL ); + file = CreateFileW( tmpfile, FILE_WRITE_DATA, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError() ); + numbytes = 0xdeadbeef; + ret = WriteFile( file, testdata, sizeof(testdata) - 1, &numbytes, NULL ); + ok( ret, "WriteFile failed with error %u\n", GetLastError() ); + ok( numbytes == sizeof(testdata) - 1, "failed to write all data\n" ); + CloseHandle( file ); + attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = &nameW; @@ -443,6 +453,22 @@ static void open_file_test(void) ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlFreeUnicodeString( &nameW ); + numbytes = 0xdeadbeef; + memset( data, 0, sizeof(data) ); + ret = ReadFile( file, data, sizeof(data), &numbytes, NULL ); + ok( ret, "ReadFile failed with error %u\n", GetLastError() ); + ok( numbytes == sizeof(testdata) - 1, "failed to read all data\n" ); + ok( !memcmp( data, testdata, sizeof(testdata) - 1 ), "testdata doesn't match\n" ); + + nameW.Length = sizeof(fooW) - sizeof(WCHAR); + nameW.Buffer = fooW; + attr.RootDirectory = file; + attr.ObjectName = &nameW; + status = pNtOpenFile( &root, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT ); + todo_wine ok( status == STATUS_OBJECT_PATH_NOT_FOUND, + "expected STATUS_OBJECT_PATH_NOT_FOUND, got %08x\n", status ); + nameW.Length = 0; nameW.Buffer = NULL; attr.RootDirectory = file; @@ -451,6 +477,23 @@ static void open_file_test(void) FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT ); todo_wine ok( !status, "open %s failed %x\n", wine_dbgstr_w(tmpfile), status ); + numbytes = SetFilePointer( file, 0, 0, FILE_CURRENT ); + ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); + numbytes = SetFilePointer( root, 0, 0, FILE_CURRENT ); + todo_wine ok( numbytes == 0, "SetFilePointer returned %u\n", numbytes ); + + numbytes = 0xdeadbeef; + memset( data, 0, sizeof(data) ); + ret = ReadFile( root, data, sizeof(data), &numbytes, NULL ); + todo_wine ok( ret, "ReadFile failed with error %u\n", GetLastError() ); + todo_wine ok( numbytes == sizeof(testdata) - 1, "failed to read all data\n" ); + todo_wine ok( !memcmp( data, testdata, sizeof(testdata) - 1 ), "testdata doesn't match\n" ); + + numbytes = SetFilePointer( file, 0, 0, FILE_CURRENT ); + ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); + numbytes = SetFilePointer( root, 0, 0, FILE_CURRENT ); + todo_wine ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); + CloseHandle( file ); CloseHandle( root ); DeleteFileW( tmpfile );

1 0

Sebastian Lackner : server: Implement open_file_object for rootdir pointing to file object.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: ec851647e2a65f9f2c7e20091f44a9e7b95da855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec851647e2a65f9f2c7e20091… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 21 07:26:44 2015 +0200 server: Implement open_file_object for rootdir pointing to file object. --- dlls/ntdll/tests/file.c | 16 ++++++++-------- server/fd.c | 29 ++++++++++++++++++++--------- server/file.c | 23 ++++++++++++++++++++++- server/file.h | 1 + 4 files changed, 51 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 4f58788..d68be15 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -466,8 +466,8 @@ static void open_file_test(void) attr.ObjectName = &nameW; status = pNtOpenFile( &root, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT ); - todo_wine ok( status == STATUS_OBJECT_PATH_NOT_FOUND, - "expected STATUS_OBJECT_PATH_NOT_FOUND, got %08x\n", status ); + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, + "expected STATUS_OBJECT_PATH_NOT_FOUND, got %08x\n", status ); nameW.Length = 0; nameW.Buffer = NULL; @@ -475,24 +475,24 @@ static void open_file_test(void) attr.ObjectName = &nameW; status = pNtOpenFile( &root, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT ); - todo_wine ok( !status, "open %s failed %x\n", wine_dbgstr_w(tmpfile), status ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(tmpfile), status ); numbytes = SetFilePointer( file, 0, 0, FILE_CURRENT ); ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); numbytes = SetFilePointer( root, 0, 0, FILE_CURRENT ); - todo_wine ok( numbytes == 0, "SetFilePointer returned %u\n", numbytes ); + ok( numbytes == 0, "SetFilePointer returned %u\n", numbytes ); numbytes = 0xdeadbeef; memset( data, 0, sizeof(data) ); ret = ReadFile( root, data, sizeof(data), &numbytes, NULL ); - todo_wine ok( ret, "ReadFile failed with error %u\n", GetLastError() ); - todo_wine ok( numbytes == sizeof(testdata) - 1, "failed to read all data\n" ); - todo_wine ok( !memcmp( data, testdata, sizeof(testdata) - 1 ), "testdata doesn't match\n" ); + ok( ret, "ReadFile failed with error %u\n", GetLastError() ); + ok( numbytes == sizeof(testdata) - 1, "failed to read all data\n" ); + ok( !memcmp( data, testdata, sizeof(testdata) - 1 ), "testdata doesn't match\n" ); numbytes = SetFilePointer( file, 0, 0, FILE_CURRENT ); ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); numbytes = SetFilePointer( root, 0, 0, FILE_CURRENT ); - todo_wine ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); + ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); CloseHandle( file ); CloseHandle( root ); diff --git a/server/fd.c b/server/fd.c index 86dc128..fef4827 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1717,7 +1717,7 @@ void set_fd_user( struct fd *fd, const struct fd_ops *user_ops, struct object *u fd->user = user; } -static char *dup_fd_name( struct fd *root, const char *name ) +char *dup_fd_name( struct fd *root, const char *name ) { char *ret; @@ -2386,19 +2386,30 @@ DECL_HANDLER(open_file_object) get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) - return; - - if ((obj = open_object_dir( root, &name, req->attributes, NULL ))) { - if ((result = obj->ops->open_file( obj, req->access, req->sharing, req->options ))) + if (get_error() != STATUS_OBJECT_TYPE_MISMATCH) return; + if (!(obj = (struct object *)get_file_obj( current->process, req->rootdir, 0 ))) return; + if (name.len) { - reply->handle = alloc_handle( current->process, result, req->access, req->attributes ); - release_object( result ); + release_object( obj ); + set_error( STATUS_OBJECT_PATH_NOT_FOUND ); + return; } - release_object( obj ); + clear_error(); + } + else + { + obj = open_object_dir( root, &name, req->attributes, NULL ); + if (root) release_object( root ); + if (!obj) return; } - if (root) release_object( root ); + if ((result = obj->ops->open_file( obj, req->access, req->sharing, req->options ))) + { + reply->handle = alloc_handle( current->process, result, req->access, req->attributes ); + release_object( result ); + } + release_object( obj ); } /* get the Unix name from a file handle */ diff --git a/server/file.c b/server/file.c index e70304f..a07ca16 100644 --- a/server/file.c +++ b/server/file.c @@ -68,6 +68,8 @@ static struct object_type *file_get_type( struct object *obj ); static struct fd *file_get_fd( struct object *obj ); static struct security_descriptor *file_get_sd( struct object *obj ); static int file_set_sd( struct object *obj, const struct security_descriptor *sd, unsigned int set_info ); +static struct object *file_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); static void file_destroy( struct object *obj ); static int file_get_poll_events( struct fd *fd ); @@ -89,7 +91,7 @@ static const struct object_ops file_ops = file_get_sd, /* get_sd */ file_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ - no_open_file, /* open_file */ + file_open_file, /* open_file */ fd_close_handle, /* close_handle */ file_destroy /* destroy */ }; @@ -605,6 +607,25 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd return 1; } +static struct object *file_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + struct file *file = (struct file *)obj; + struct object *new_file = NULL; + char *unix_name; + + assert( obj->ops == &file_ops ); + + if ((unix_name = dup_fd_name( file->fd, "" ))) + { + new_file = create_file( NULL, unix_name, strlen(unix_name), access, + sharing, FILE_OPEN, options, 0, NULL ); + free( unix_name ); + } + else set_error( STATUS_OBJECT_TYPE_MISMATCH ); + return new_file; +} + static void file_destroy( struct object *obj ) { struct file *file = (struct file *)obj; diff --git a/server/file.h b/server/file.h index b5e0ca7..b59de1c 100644 --- a/server/file.h +++ b/server/file.h @@ -81,6 +81,7 @@ extern void unlock_fd( struct fd *fd, file_pos_t offset, file_pos_t count ); extern void allow_fd_caching( struct fd *fd ); extern void set_fd_signaled( struct fd *fd, int signaled ); extern int is_fd_signaled( struct fd *fd ); +extern char *dup_fd_name( struct fd *root, const char *name ); extern int default_fd_signaled( struct object *obj, struct wait_queue_entry *entry ); extern unsigned int default_fd_map_access( struct object *obj, unsigned int access );

1 0

Hugh McMaster : uninstaller: Add help switch and usage information.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: fb01bc0428c9331ad3bcc53467a5a9f52058c4f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb01bc0428c9331ad3bcc5346… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 21 16:00:23 2015 +1000 uninstaller: Add help switch and usage information. --- po/ar.po | 22 ++++++++++++++++++++++ po/bg.po | 22 ++++++++++++++++++++++ po/ca.po | 22 ++++++++++++++++++++++ po/cs.po | 22 ++++++++++++++++++++++ po/da.po | 22 ++++++++++++++++++++++ po/de.po | 22 ++++++++++++++++++++++ po/el.po | 22 ++++++++++++++++++++++ po/en.po | 36 ++++++++++++++++++++++++++++++++++++ po/en_US.po | 36 ++++++++++++++++++++++++++++++++++++ po/eo.po | 22 ++++++++++++++++++++++ po/es.po | 22 ++++++++++++++++++++++ po/fa.po | 22 ++++++++++++++++++++++ po/fi.po | 22 ++++++++++++++++++++++ po/fr.po | 22 ++++++++++++++++++++++ po/he.po | 22 ++++++++++++++++++++++ po/hi.po | 22 ++++++++++++++++++++++ po/hr.po | 22 ++++++++++++++++++++++ po/hu.po | 22 ++++++++++++++++++++++ po/it.po | 22 ++++++++++++++++++++++ po/ja.po | 22 ++++++++++++++++++++++ po/ko.po | 22 ++++++++++++++++++++++ po/lt.po | 22 ++++++++++++++++++++++ po/ml.po | 22 ++++++++++++++++++++++ po/nb_NO.po | 22 ++++++++++++++++++++++ po/nl.po | 22 ++++++++++++++++++++++ po/or.po | 22 ++++++++++++++++++++++ po/pa.po | 22 ++++++++++++++++++++++ po/pl.po | 25 ++++++++++++++++++++++++- po/pt_BR.po | 22 ++++++++++++++++++++++ po/pt_PT.po | 22 ++++++++++++++++++++++ po/rm.po | 22 ++++++++++++++++++++++ po/ro.po | 22 ++++++++++++++++++++++ po/ru.po | 22 ++++++++++++++++++++++ po/sk.po | 22 ++++++++++++++++++++++ po/sl.po | 22 ++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 22 ++++++++++++++++++++++ po/sr_RS(a)latin.po | 22 ++++++++++++++++++++++ po/sv.po | 22 ++++++++++++++++++++++ po/te.po | 22 ++++++++++++++++++++++ po/th.po | 22 ++++++++++++++++++++++ po/tr.po | 22 ++++++++++++++++++++++ po/uk.po | 22 ++++++++++++++++++++++ po/wa.po | 22 ++++++++++++++++++++++ po/wine.pot | 22 ++++++++++++++++++++++ po/zh_CN.po | 22 ++++++++++++++++++++++ po/zh_TW.po | 22 ++++++++++++++++++++++ programs/uninstaller/main.c | 10 ++++++++-- programs/uninstaller/resource.h | 2 ++ programs/uninstaller/uninstaller.rc | 10 ++++++++++ 49 files changed, 1062 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb01bc0428c9331ad3bcc…

1 0

Józef Kucia : d3d11: Add ID3D11Device stub interface.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 2d13e0f10c4383cdc2a57e8849cea3afb1de8d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d13e0f10c4383cdc2a57e884… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 21 00:07:52 2015 +0200 d3d11: Add ID3D11Device stub interface. --- dlls/d3d10core/d3d10core_private.h | 2 + dlls/d3d10core/device.c | 411 +++++++++++++++++++++++++++++++++++++ dlls/dxgi/tests/device.c | 2 +- 3 files changed, 414 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d13e0f10c4383cdc2a57…

1 0

Józef Kucia : d3d11: Move d3d10core to d3d11.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: a9cb14dd715470760b959873e91d128d44a325ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9cb14dd715470760b959873e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 21 00:07:53 2015 +0200 d3d11: Move d3d10core to d3d11. --- configure | 2 +- configure.ac | 2 +- dlls/d3d10core/Makefile.in | 13 +-- dlls/d3d10core/d3d10core_main.c | 96 ++++-------------- dlls/d3d11/Makefile.in | 13 ++- dlls/{d3d10core => d3d11}/async.c | 4 +- dlls/{d3d10core => d3d11}/buffer.c | 4 +- dlls/d3d11/d3d11.spec | 4 +- dlls/d3d11/d3d11_main.c | 109 ++++++++++++++++++++- .../d3d10core_private.h => d3d11/d3d11_private.h} | 8 +- dlls/{d3d10core => d3d11}/device.c | 4 +- dlls/{d3d10core => d3d11}/inputlayout.c | 4 +- dlls/{d3d10core => d3d11}/shader.c | 4 +- dlls/{d3d10core => d3d11}/state.c | 4 +- dlls/{d3d10core => d3d11}/texture.c | 4 +- dlls/{d3d10core => d3d11}/utils.c | 4 +- dlls/{d3d10core => d3d11}/view.c | 4 +- dlls/dxgi/dxgi_main.c | 8 +- 18 files changed, 168 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9cb14dd715470760b959…

1 0

Józef Kucia : d3d11: Implement D3D11CreateDevice.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: b2f5fad4b640e178a1d9d04bec5a7c218045b9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f5fad4b640e178a1d9d04be… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 21 00:07:54 2015 +0200 d3d11: Implement D3D11CreateDevice. --- dlls/d3d11/d3d11_main.c | 113 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 108 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 577391a..d56b35a 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -146,12 +146,115 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device, - D3D_FEATURE_LEVEL *feature_level, ID3D11DeviceContext **context) + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context) { - FIXME("adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %#x, sdk_version %u, " - "device %p, feature_level %p, context %p stub!\n", adapter, debug_d3d_driver_type(driver_type), swrast, - flags, feature_levels, levels, sdk_version, device, feature_level, context); - return E_OUTOFMEMORY; + IDXGIFactory *factory; + HRESULT hr; + + TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %u, sdk_version %u, " + "device %p, obtained_feature_level %p, immediate_context %p.\n", + adapter, debug_d3d_driver_type(driver_type), swrast, flags, feature_levels, levels, sdk_version, + device, obtained_feature_level, immediate_context); + + if (adapter) + { + IDXGIAdapter_AddRef(adapter); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + if (FAILED(hr)) + { + WARN("Failed to get dxgi factory, returning %#x.\n", hr); + return hr; + } + } + else + { + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); + if (FAILED(hr)) + { + WARN("Failed to create dxgi factory, returning %#x.\n", hr); + return hr; + } + + switch(driver_type) + { + case D3D_DRIVER_TYPE_HARDWARE: + { + hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); + if (FAILED(hr)) + { + WARN("No adapters found, returning %#x.\n", hr); + IDXGIFactory_Release(factory); + return hr; + } + break; + } + + case D3D_DRIVER_TYPE_NULL: + FIXME("NULL device not implemented, falling back to refrast.\n"); + /* fall through, for now */ + case D3D_DRIVER_TYPE_REFERENCE: + { + HMODULE refrast = LoadLibraryA("d3d11ref.dll"); + if (!refrast) + { + WARN("Failed to load refrast, returning E_FAIL.\n"); + IDXGIFactory_Release(factory); + return E_FAIL; + } + hr = IDXGIFactory_CreateSoftwareAdapter(factory, refrast, &adapter); + FreeLibrary(refrast); + if (FAILED(hr)) + { + WARN("Failed to create a software adapter, returning %#x.\n", hr); + IDXGIFactory_Release(factory); + return hr; + } + break; + } + + case D3D_DRIVER_TYPE_SOFTWARE: + { + if (!swrast) + { + WARN("Software device requested, but NULL swrast passed, returning E_FAIL.\n"); + IDXGIFactory_Release(factory); + return E_FAIL; + } + hr = IDXGIFactory_CreateSoftwareAdapter(factory, swrast, &adapter); + if (FAILED(hr)) + { + WARN("Failed to create a software adapter, returning %#x.\n", hr); + IDXGIFactory_Release(factory); + return hr; + } + break; + } + + default: + FIXME("Unhandled driver type %#x.\n", driver_type); + IDXGIFactory_Release(factory); + return E_FAIL; + } + } + + hr = D3D11CoreCreateDevice(factory, adapter, flags, feature_levels, levels, device); + IDXGIAdapter_Release(adapter); + IDXGIFactory_Release(factory); + if (FAILED(hr)) + { + WARN("Failed to create a device, returning %#x.\n", hr); + return hr; + } + + TRACE("Created ID3D11Device %p.\n", *device); + + if (obtained_feature_level) + *obtained_feature_level = ID3D11Device_GetFeatureLevel(*device); + + if (immediate_context) + ID3D11Device_GetImmediateContext(*device, immediate_context); + + return hr; } HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type,

1 0

Józef Kucia : d3d11: Rename d3d10_device to d3d_device.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: e29a0cf41729afd89bfd098d9a2bac76d83f96c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e29a0cf41729afd89bfd098d9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 21 00:07:56 2015 +0200 d3d11: Rename d3d10_device to d3d_device. --- dlls/d3d11/async.c | 2 +- dlls/d3d11/buffer.c | 2 +- dlls/d3d11/d3d11_main.c | 4 +- dlls/d3d11/d3d11_private.h | 40 ++++----- dlls/d3d11/device.c | 206 ++++++++++++++++++++++----------------------- dlls/d3d11/inputlayout.c | 2 +- dlls/d3d11/shader.c | 6 +- dlls/d3d11/state.c | 16 ++-- dlls/d3d11/texture.c | 4 +- dlls/d3d11/view.c | 6 +- 10 files changed, 144 insertions(+), 144 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e29a0cf41729afd89bfd0…

1 0