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

Alexandre Julliard : winebuild: Support generating a .spec.o file for Windows platforms.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: e4b9a501a3ddbbfb2cd8aee6eb9330f6af91fe6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4b9a501a3ddbbfb2cd8aee6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 10:02:04 2019 +0100 winebuild: Support generating a .spec.o file for Windows platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 3 ++- tools/winebuild/res32.c | 9 ++++++--- tools/winebuild/spec32.c | 23 ++++++++++++++++++++++- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 44fa317..1d4f217 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -303,6 +303,7 @@ extern int load_res32_file( const char *name, DLLSPEC *spec ); extern void output_resources( DLLSPEC *spec ); extern void output_bin_resources( DLLSPEC *spec, unsigned int start_rva ); extern void output_spec32_file( DLLSPEC *spec ); +extern void output_pe_module( DLLSPEC *spec ); extern void output_fake_module( DLLSPEC *spec ); extern void output_def_file( DLLSPEC *spec, int include_private ); extern void load_res16_file( const char *name, DLLSPEC *spec ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index d7bc39f..781d391 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -645,7 +645,8 @@ int main(int argc, char **argv) output_spec16_file( spec ); break; case SPEC_WIN32: - output_spec32_file( spec ); + if (target_platform == PLATFORM_WINDOWS) output_pe_module( spec ); + else output_spec32_file( spec ); break; default: assert(0); } diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 16e5c65..634c933 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -441,7 +441,7 @@ void output_resources( DLLSPEC *spec ) /* output the resource directories */ output( "\n/* resources */\n\n" ); - output( "\t.data\n" ); + output( "\t.section %s\n", target_platform == PLATFORM_WINDOWS ? ".rsrc" : ".data" ); output( "\t.align %d\n", get_alignment(get_ptr_size()) ); output( ".L__wine_spec_resources:\n" ); @@ -498,9 +498,12 @@ void output_resources( DLLSPEC *spec ) output( ".L__wine_spec_res_%d:\n", i ); dump_res_data( res ); } - output( ".L__wine_spec_resources_end:\n" ); - output( "\t.byte 0\n" ); + if (target_platform != PLATFORM_WINDOWS) + { + output( ".L__wine_spec_resources_end:\n" ); + output( "\t.byte 0\n" ); + } free_resource_tree( tree ); } diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 7b4d661..d0c147d 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -384,7 +384,7 @@ void output_exports( DLLSPEC *spec ) if (!nr_exports) return; output( "\n/* export table */\n\n" ); - output( "\t.data\n" ); + output( "\t.section %s\n", target_platform == PLATFORM_WINDOWS ? ".edata" : ".data" ); output( "\t.align %d\n", get_alignment(4) ); output( ".L__wine_spec_exports:\n" ); @@ -492,6 +492,9 @@ void output_exports( DLLSPEC *spec ) output( "\t%s \"%s\"\n", get_asm_string_keyword(), odp->link_name ); } } + + if (target_platform == PLATFORM_WINDOWS) return; + output( "\t.align %d\n", get_alignment(get_ptr_size()) ); output( ".L__wine_spec_exports_end:\n" ); @@ -708,6 +711,24 @@ void output_spec32_file( DLLSPEC *spec ) /******************************************************************* + * output_pe_module + * + * Build a PE from a spec file. + */ +void output_pe_module( DLLSPEC *spec ) +{ + UsePIC = 0; + resolve_imports( spec ); + open_output_file(); + output_standard_file_header(); + output_stubs( spec ); + output_exports( spec ); + output_resources( spec ); + close_output_file(); +} + + +/******************************************************************* * output_fake_module * * Build a fake binary module from a spec file.

1 0

Alexandre Julliard : winegcc: Use a .spec.o files when building for Windows.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 4c0ea277cbbd575a362ad96f632e2a9390be65ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c0ea277cbbd575a362ad96f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 10:02:50 2019 +0100 winegcc: Use a .spec.o files when building for Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 170 ++++++++++++------------------------------------ 1 file changed, 41 insertions(+), 129 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 94d2906..79a4cbe 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -818,21 +818,6 @@ static strarray *get_winebuild_args(struct options *opts) return spec_args; } -static const char* compile_resources_to_object(struct options* opts, const strarray *resources, - const char *res_o_name) -{ - strarray *winebuild_args = get_winebuild_args( opts ); - - strarray_add( winebuild_args, "--resources" ); - strarray_add( winebuild_args, "-o" ); - strarray_add( winebuild_args, res_o_name ); - strarray_addall( winebuild_args, resources ); - - spawn( opts->prefix, winebuild_args, 0 ); - strarray_free( winebuild_args ); - return res_o_name; -} - /* check if there is a static lib associated to a given dll */ static char *find_static_lib( const char *dll ) { @@ -873,11 +858,12 @@ static void build(struct options* opts) { strarray *lib_dirs, *files; strarray *spec_args, *link_args; - char *output_file; + char *output_file, *output_path; const char *spec_o_name; const char *output_name, *spec_file, *lang; int generate_app_loader = 1; int fake_module = 0; + int is_pe = (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN); unsigned int j; /* NOTE: for the files array we'll use the following convention: @@ -900,7 +886,7 @@ static void build(struct options* opts) } /* generate app loader only for .exe */ - if (opts->shared || strendswith(output_file, ".so")) + if (opts->shared || is_pe || strendswith(output_file, ".so")) generate_app_loader = 0; if (strendswith(output_file, ".fake")) fake_module = 1; @@ -912,6 +898,7 @@ static void build(struct options* opts) else output_name = output_file; if (!strchr(output_name, '.')) output_file = strmake("%s.%s", output_file, opts->shared ? "dll" : "exe"); + output_path = is_pe ? output_file : strmake( "%s.so", output_file ); /* get the filename from the path */ if ((output_name = strrchr(output_file, '/'))) output_name++; @@ -980,118 +967,19 @@ static void build(struct options* opts) lang = file; } - /* building for Windows is completely different */ - - if (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN) - { - strarray *resources = strarray_alloc(); - char *res_o_name = NULL; - - if (opts->win16_app) - error( "Building 16-bit code is not supported for Windows\n" ); - - link_args = get_link_args( opts, output_name ); - - if (opts->shared) - { - /* run winebuild to generate the .def file */ - char *spec_def_name = get_temp_file(output_name, ".spec.def"); - spec_args = get_winebuild_args( opts ); - strarray_add(spec_args, "--def"); - strarray_add(spec_args, "-o"); - strarray_add(spec_args, spec_def_name); - if (spec_file) - { - strarray_add(spec_args, "--export"); - strarray_add(spec_args, spec_file); - } - spawn(opts->prefix, spec_args, 0); - strarray_free(spec_args); - - strarray_add(link_args, spec_def_name); - } - - strarray_add(link_args, "-o"); - strarray_add(link_args, output_file); - - for ( j = 0; j < lib_dirs->size; j++ ) - strarray_add(link_args, strmake("-L%s", lib_dirs->base[j])); - - if (!opts->nodefaultlibs) - { - add_library(opts, lib_dirs, files, "winecrt0"); - add_library(opts, lib_dirs, files, "kernel32"); - add_library(opts, lib_dirs, files, "ntdll"); - } - if (!opts->shared && opts->use_msvcrt && opts->target_platform == PLATFORM_CYGWIN) - add_library(opts, lib_dirs, files, "msvcrt"); - - for ( j = 0; j < files->size; j++ ) - { - const char* name = files->base[j] + 2; - - switch(files->base[j][1]) - { - case 'l': - case 'd': - strarray_add(link_args, strmake("-l%s", name)); - break; - case 's': - case 'o': - strarray_add(link_args, name); - break; - case 'a': - if (!opts->lib_suffix && strchr(name, '/')) - { - /* turn the path back into -Ldir -lfoo options - * this makes sure that we use the specified libs even - * when mingw adds its own import libs to the link */ - char *lib = xstrdup( name ); - char *p = strrchr( lib, '/' ); - - *p++ = 0; - if (!strncmp( p, "lib", 3 )) - { - char *ext = strrchr( p, '.' ); - - if (ext) *ext = 0; - p += 3; - strarray_add(link_args, strmake("-L%s", lib )); - strarray_add(link_args, strmake("-l%s", p )); - free( lib ); - break; - } - free( lib ); - } - strarray_add(link_args, name); - break; - case 'r': - if (!res_o_name) - { - res_o_name = get_temp_file( output_name, ".res.o" ); - strarray_add( link_args, res_o_name ); - } - strarray_add( resources, name ); - break; - } - } + if (opts->win16_app && is_pe) + error( "Building 16-bit code is not supported for Windows\n" ); - if (res_o_name) compile_resources_to_object( opts, resources, res_o_name ); + /* add the default libraries, if needed */ - spawn(opts->prefix, link_args, 0); - strarray_free (resources); - strarray_free (link_args); - strarray_free (lib_dirs); - strarray_free (files); - return; + if (!opts->nostdlib && opts->use_msvcrt && opts->target_platform != PLATFORM_WINDOWS) + { + if (!is_pe || !opts->shared) add_library(opts, lib_dirs, files, "msvcrt"); } - /* add the default libraries, if needed */ - if (!opts->nostdlib && opts->use_msvcrt) add_library(opts, lib_dirs, files, "msvcrt"); - - if (!opts->wine_objdir && !opts->nodefaultlibs) + if (!opts->wine_objdir && !opts->nodefaultlibs) { - if (opts->gui_app) + if (opts->gui_app) { add_library(opts, lib_dirs, files, "shell32"); add_library(opts, lib_dirs, files, "comdlg32"); @@ -1108,7 +996,7 @@ static void build(struct options* opts) add_library(opts, lib_dirs, files, "kernel32"); add_library(opts, lib_dirs, files, "ntdll"); } - if (!opts->nostdlib) add_library(opts, lib_dirs, files, "wine"); + if (!opts->nostdlib && !is_pe) add_library(opts, lib_dirs, files, "wine"); /* run winebuild to generate the .spec.o file */ spec_args = get_winebuild_args( opts ); @@ -1191,7 +1079,7 @@ static void build(struct options* opts) link_args = get_link_args( opts, output_name ); strarray_add(link_args, "-o"); - strarray_add(link_args, strmake("%s.so", output_file)); + strarray_add(link_args, output_path); for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(link_args, strmake("-L%s", lib_dirs->base[j])); @@ -1207,14 +1095,38 @@ static void build(struct options* opts) strarray_add(link_args, strmake("-l%s", name)); break; case 's': - case 'a': case 'o': strarray_add(link_args, name); break; + case 'a': + if (is_pe && !opts->lib_suffix && strchr(name, '/')) + { + /* turn the path back into -Ldir -lfoo options + * this makes sure that we use the specified libs even + * when mingw adds its own import libs to the link */ + char *lib = xstrdup( name ); + char *p = strrchr( lib, '/' ); + + *p++ = 0; + if (!strncmp( p, "lib", 3 )) + { + char *ext = strrchr( p, '.' ); + + if (ext) *ext = 0; + p += 3; + strarray_add(link_args, strmake("-L%s", lib )); + strarray_add(link_args, strmake("-l%s", p )); + free( lib ); + break; + } + free( lib ); + } + strarray_add(link_args, name); + break; } } - if (!opts->nostdlib) + if (!opts->nostdlib && !is_pe) { strarray_add(link_args, "-lm"); strarray_add(link_args, "-lc"); @@ -1232,7 +1144,7 @@ static void build(struct options* opts) strarray_add(prelink_args, opts->prelink); strarray_add(prelink_args, "--reloc-only"); strarray_add(prelink_args, opts->image_base); - strarray_add(prelink_args, strmake("%s.so", output_file)); + strarray_add(prelink_args, output_path); spawn(opts->prefix, prelink_args, 1); strarray_free(prelink_args); }

1 0

Zebediah Figura : quartz/tests: Add some tests for ACM wrapper pin interfaces.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 2d9d66b7b20f4ca93707177891f3df864281fc3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d9d66b7b20f4ca937071778… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 12 00:32:53 2019 -0500 quartz/tests: Add some tests for ACM wrapper pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/acmwrapper.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/quartz/tests/acmwrapper.c b/dlls/quartz/tests/acmwrapper.c index 571e78d9..a543893 100644 --- a/dlls/quartz/tests/acmwrapper.c +++ b/dlls/quartz/tests/acmwrapper.c @@ -61,6 +61,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { IBaseFilter *filter = create_acm_wrapper(); + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); @@ -80,6 +81,30 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source_id, &pin); + + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IMediaPosition, TRUE); + check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); }

1 0

Zebediah Figura : quartz/tests: Clean up tests for IPersistPropertyBag on the DirectSound renderer.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: fd2412fbe5ff8d9d1da743f18b688fc246d251b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd2412fbe5ff8d9d1da743f1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 12 00:32:54 2019 -0500 quartz/tests: Clean up tests for IPersistPropertyBag on the DirectSound renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 91 ++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 59 deletions(-) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index c350192..f633129 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -1,5 +1,5 @@ /* - * Unit tests for DSound Renderer functions + * DirectSound renderer filter unit tests * * Copyright (C) 2010 Maarten Lankhorst for CodeWeavers * Copyright (C) 2007 Google (Lei Zhang) @@ -20,12 +20,11 @@ */ #define COBJMACROS - -#include "wine/test.h" #include "dshow.h" #include "initguid.h" #include "dsound.h" #include "amaudio.h" +#include "wine/test.h" #define QI_SUCCEED(iface, riid, ppv) hr = IUnknown_QueryInterface(iface, &riid, (LPVOID*)&ppv); \ ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); \ @@ -55,64 +54,43 @@ static void release_dsound_renderer(void) ok(hr == 0, "IUnknown_Release failed with %x\n", hr); } -static HRESULT WINAPI PB_QueryInterface(IPropertyBag *iface, REFIID riid, void **ppv) -{ - ok(0, "Should not be called\n"); - *ppv = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI PB_AddRef(IPropertyBag *iface) +static void test_property_bag(void) { - ok(0, "Should not be called\n"); - return 2; -} + IPersistPropertyBag *ppb; + ICreateDevEnum *devenum; + IEnumMoniker *enummon; + IPropertyBag *propbag; + IMoniker *mon; + HRESULT hr; -static ULONG WINAPI PB_Release(IPropertyBag *iface) -{ - ok(0, "Should not be called\n"); - return 1; -} + CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC_SERVER, + &IID_ICreateDevEnum, (void **)&devenum); + ICreateDevEnum_CreateClassEnumerator(devenum, &CLSID_AudioRendererCategory, &enummon, 0); -static HRESULT WINAPI PB_Read(IPropertyBag *iface, LPCOLESTR name, VARIANT *var, IErrorLog *log) -{ - static const WCHAR dsguid[] = { 'D','S','G','u','i','d', 0 }; - char temp[50]; - WideCharToMultiByte(CP_ACP, 0, name, -1, temp, sizeof(temp)-1, NULL, NULL); - temp[sizeof(temp)-1] = 0; - trace("Trying to read %s, type %u\n", temp, var->n1.n2.vt); - if (!lstrcmpW(name, dsguid)) + while (IEnumMoniker_Next(enummon, 1, &mon, NULL) == S_OK) { - static const WCHAR defaultplayback[] = - { - '{','D','E','F','0','0','0','0','0','-', - '9','C','6','D','-','4','7','E','D','-', - 'A','A','F','1','-','4','D','D','A','8', - 'F','2','B','5','C','0','3','}',0 - }; - ok(var->n1.n2.vt == VT_BSTR, "Wrong type asked: %u\n", var->n1.n2.vt); - var->n1.n2.n3.bstrVal = SysAllocString(defaultplayback); - return S_OK; + hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, + &IID_IPersistPropertyBag, (void **)&ppb); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr != S_OK) break; + + IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&propbag); + + hr = IPersistPropertyBag_InitNew(ppb); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPersistPropertyBag_Load(ppb, propbag, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPersistPropertyBag_Release(ppb); + IPropertyBag_Release(propbag); + IMoniker_Release(mon); } - ok(0, "Unknown property '%s' queried\n", temp); - return E_FAIL; -} -static HRESULT WINAPI PB_Write(IPropertyBag *iface, LPCOLESTR name, VARIANT *var) -{ - ok(0, "Should not be called\n"); - return E_FAIL; + IEnumMoniker_Release(enummon); + ICreateDevEnum_Release(devenum); } -static IPropertyBagVtbl PB_Vtbl = -{ - PB_QueryInterface, - PB_AddRef, - PB_Release, - PB_Read, - PB_Write -}; - static void test_query_interface(void) { HRESULT hr; @@ -140,12 +118,6 @@ static void test_query_interface(void) QI_SUCCEED(pDSRender, IID_IDirectSound3DBuffer, ds3dbuf); RELEASE_EXPECT(ds3dbuf, 1); QI_SUCCEED(pDSRender, IID_IPersistPropertyBag, ppb); - if (ppb) - { - IPropertyBag bag = { &PB_Vtbl }; - hr = IPersistPropertyBag_Load(ppb, &bag, NULL); - ok(hr == S_OK, "Couldn't load default device: %08x\n", hr); - } RELEASE_EXPECT(ppb, 1); } QI_SUCCEED(pDSRender, IID_IMediaPosition, pMediaPosition); @@ -224,6 +196,7 @@ START_TEST(dsoundrender) if (!create_dsound_renderer()) return; + test_property_bag(); test_query_interface(); test_basefilter();

1 0

Zebediah Figura : quartz/tests: Clean up test_query_interface().
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: cbb7fd5256f90e0ad42c6ba1ce58734ee8a4c3f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbb7fd5256f90e0ad42c6ba1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 12 00:32:55 2019 -0500 quartz/tests: Clean up test_query_interface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 192 +++++++++++++++++++++------------------ 1 file changed, 106 insertions(+), 86 deletions(-) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index f633129..f631cd2 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -26,104 +26,122 @@ #include "amaudio.h" #include "wine/test.h" -#define QI_SUCCEED(iface, riid, ppv) hr = IUnknown_QueryInterface(iface, &riid, (LPVOID*)&ppv); \ - ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); \ - ok(ppv != NULL, "Pointer is NULL\n"); - -#define RELEASE_EXPECT(iface, num) if (iface) { \ - hr = IUnknown_Release((IUnknown*)iface); \ - ok(hr == num, "IUnknown_Release should return %d, got %d\n", num, hr); \ +static IBaseFilter *create_dsound_render(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; } -static IUnknown *pDSRender = NULL; +static HRESULT WINAPI property_bag_QueryInterface(IPropertyBag *iface, REFIID iid, void **out) +{ + ok(0, "Unexpected call (iid %s).\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} -static BOOL create_dsound_renderer(void) +static ULONG WINAPI property_bag_AddRef(IPropertyBag *iface) { - HRESULT hr; + ok(0, "Unexpected call.\n"); + return 2; +} - hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (LPVOID*)&pDSRender); - return (hr == S_OK && pDSRender != NULL); +static ULONG WINAPI property_bag_Release(IPropertyBag *iface) +{ + ok(0, "Unexpected call.\n"); + return 1; } -static void release_dsound_renderer(void) +static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, const WCHAR *name, VARIANT *var, IErrorLog *log) { - HRESULT hr; + static const WCHAR dsguidW[] = {'D','S','G','u','i','d',0}; + WCHAR guidstr[39]; + + ok(!lstrcmpW(name, dsguidW), "Got unexpected name %s.\n", wine_dbgstr_w(name)); + ok(V_VT(var) == VT_BSTR, "Got unexpected type %u.\n", V_VT(var)); + StringFromGUID2(&DSDEVID_DefaultPlayback, guidstr, ARRAY_SIZE(guidstr)); + V_BSTR(var) = SysAllocString(guidstr); + return S_OK; +} - hr = IUnknown_Release(pDSRender); - ok(hr == 0, "IUnknown_Release failed with %x\n", hr); +static HRESULT WINAPI property_bag_Write(IPropertyBag *iface, const WCHAR *name, VARIANT *var) +{ + ok(0, "Unexpected call (name %s).\n", wine_dbgstr_w(name)); + return E_FAIL; } +static const IPropertyBagVtbl property_bag_vtbl = +{ + property_bag_QueryInterface, + property_bag_AddRef, + property_bag_Release, + property_bag_Read, + property_bag_Write, +}; + static void test_property_bag(void) { + IPropertyBag property_bag = {&property_bag_vtbl}; IPersistPropertyBag *ppb; - ICreateDevEnum *devenum; - IEnumMoniker *enummon; - IPropertyBag *propbag; - IMoniker *mon; HRESULT hr; + ULONG ref; - CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC_SERVER, - &IID_ICreateDevEnum, (void **)&devenum); - ICreateDevEnum_CreateClassEnumerator(devenum, &CLSID_AudioRendererCategory, &enummon, 0); + hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, + &IID_IPersistPropertyBag, (void **)&ppb); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr != S_OK) return; - while (IEnumMoniker_Next(enummon, 1, &mon, NULL) == S_OK) - { - hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, - &IID_IPersistPropertyBag, (void **)&ppb); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr != S_OK) break; + hr = IPersistPropertyBag_InitNew(ppb); + ok(hr == S_OK, "Got hr %#x.\n", hr); - IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&propbag); + hr = IPersistPropertyBag_Load(ppb, &property_bag, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IPersistPropertyBag_InitNew(ppb); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IPersistPropertyBag_Release(ppb); + ok(!ref, "Got unexpected refcount %d.\n", ref); +} - hr = IPersistPropertyBag_Load(ppb, propbag, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; - IPersistPropertyBag_Release(ppb); - IPropertyBag_Release(propbag); - IMoniker_Release(mon); - } + expected_hr = supported ? S_OK : E_NOINTERFACE; - IEnumMoniker_Release(enummon); - ICreateDevEnum_Release(devenum); + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); } -static void test_query_interface(void) +static void test_interfaces(void) { - HRESULT hr; - IBaseFilter *pBaseFilter = NULL; - IBasicAudio *pBasicAudio = NULL; - IMediaPosition *pMediaPosition = NULL; - IMediaSeeking *pMediaSeeking = NULL; - IQualityControl *pQualityControl = NULL; - IPersistPropertyBag *ppb = NULL; - IDirectSound3DBuffer *ds3dbuf = NULL; - IReferenceClock *clock = NULL; - IAMDirectSound *pAMDirectSound = NULL; - - QI_SUCCEED(pDSRender, IID_IBaseFilter, pBaseFilter); - RELEASE_EXPECT(pBaseFilter, 1); - QI_SUCCEED(pDSRender, IID_IBasicAudio, pBasicAudio); - RELEASE_EXPECT(pBasicAudio, 1); - QI_SUCCEED(pDSRender, IID_IMediaSeeking, pMediaSeeking); - RELEASE_EXPECT(pMediaSeeking, 1); - QI_SUCCEED(pDSRender, IID_IReferenceClock, clock); - RELEASE_EXPECT(clock, 1); - QI_SUCCEED(pDSRender, IID_IAMDirectSound, pAMDirectSound); - RELEASE_EXPECT( pAMDirectSound, 1); - todo_wine { - QI_SUCCEED(pDSRender, IID_IDirectSound3DBuffer, ds3dbuf); - RELEASE_EXPECT(ds3dbuf, 1); - QI_SUCCEED(pDSRender, IID_IPersistPropertyBag, ppb); - RELEASE_EXPECT(ppb, 1); - } - QI_SUCCEED(pDSRender, IID_IMediaPosition, pMediaPosition); - RELEASE_EXPECT(pMediaPosition, 1); - QI_SUCCEED(pDSRender, IID_IQualityControl, pQualityControl); - RELEASE_EXPECT(pQualityControl, 1); + IBaseFilter *filter = create_dsound_render(); + + check_interface(filter, &IID_IAMDirectSound, TRUE); + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IBasicAudio, TRUE); + todo_wine check_interface(filter, &IID_IDirectSound3DBuffer, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IMediaPosition, TRUE); + check_interface(filter, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + todo_wine check_interface(filter, &IID_IPersistPropertyBag, TRUE); + check_interface(filter, &IID_IQualityControl, TRUE); + check_interface(filter, &IID_IReferenceClock, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IKsPropertySet, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IQualProp, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + IBaseFilter_Release(filter); } static void test_pin(IPin *pin) @@ -145,19 +163,11 @@ static void test_pin(IPin *pin) static void test_basefilter(void) { IEnumPins *pin_enum = NULL; - IBaseFilter *base = NULL; + IBaseFilter *base = create_dsound_render(); IPin *pins[2]; ULONG ref; HRESULT hr; - IUnknown_QueryInterface(pDSRender, &IID_IBaseFilter, (void **)&base); - if (base == NULL) - { - /* test_query_interface handles this case */ - skip("No IBaseFilter\n"); - return; - } - hr = IBaseFilter_EnumPins(base, NULL); ok(hr == E_POINTER, "hr = %08x and not E_POINTER\n", hr); @@ -192,15 +202,25 @@ static void test_basefilter(void) START_TEST(dsoundrender) { + IBaseFilter *filter; + HRESULT hr; + CoInitialize(NULL); - if (!create_dsound_renderer()) + + hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + if (hr == VFW_E_NO_AUDIO_HARDWARE) + { + skip("No audio hardware.\n"); + CoUninitialize(); return; + } + ok(hr == S_OK, "Got hr %#x.\n", hr); + IBaseFilter_Release(filter); test_property_bag(); - test_query_interface(); + test_interfaces(); test_basefilter(); - release_dsound_renderer(); - CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Add some tests for IBaseFilter_EnumPins() on the DirectSound renderer.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 294af5ee91a5585e0ba858bcf3e6e77782965775 URL: https://source.winehq.org/git/wine.git/?a=commit;h=294af5ee91a5585e0ba858bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 12 00:32:56 2019 -0500 quartz/tests: Add some tests for IBaseFilter_EnumPins() on the DirectSound renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 100 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index f631cd2..aa24d33 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -35,6 +35,13 @@ static IBaseFilter *create_dsound_render(void) return filter; } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + static HRESULT WINAPI property_bag_QueryInterface(IPropertyBag *iface, REFIID iid, void **out) { ok(0, "Unexpected call (iid %s).\n", wine_dbgstr_guid(iid)); @@ -144,6 +151,98 @@ static void test_interfaces(void) IBaseFilter_Release(filter); } +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_dsound_render(); + IEnumPins *enum1, *enum2; + ULONG count, ref; + IPin *pins[2]; + HRESULT hr; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -220,6 +319,7 @@ START_TEST(dsoundrender) test_property_bag(); test_interfaces(); + test_enum_pins(); test_basefilter(); CoUninitialize();

1 0

Zebediah Figura : strmbase: Correct pin IDs for renderers.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 4f16a137dab794f1a51dde6c2460b78fda79cc55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f16a137dab794f1a51dde6c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 12 00:32:57 2019 -0500 strmbase: Correct pin IDs for renderers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 2 +- dlls/quartz/dsoundrender.c | 9 +++++++-- dlls/quartz/nullrenderer.c | 10 ++++++---- dlls/quartz/videorenderer.c | 9 +++++---- dlls/quartz/vmr9.c | 14 +++++++++----- dlls/strmbase/renderer.c | 29 ++++------------------------- include/wine/strmbase.h | 5 +++-- 7 files changed, 35 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f16a137dab794f1a51d…

1 0

Nikolay Sivov : imm32: Fix output buffer length handling for no-conversion case of GCS_COMPSTR.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: fd7cda93a33c9f65a6c1d1d530738c9fe4b9edf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd7cda93a33c9f65a6c1d1d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 7 11:23:36 2019 +0300 imm32: Fix output buffer length handling for no-conversion case of GCS_COMPSTR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 28 +++++++++++++++++----------- dlls/imm32/tests/imm32.c | 25 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 96a11ab..a385d88 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1206,23 +1206,29 @@ BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) /* Helpers for the GetCompositionString functions */ -static INT CopyCompStringIMEtoClient(InputContextData *data, LPBYTE source, INT slen, LPBYTE target, INT tlen, - BOOL unicode ) +/* Source encoding is defined by context, source length is always given in respective characters. Destination buffer + length is always in bytes. */ +static INT CopyCompStringIMEtoClient(const InputContextData *data, const void *src, INT src_len, void *dst, + INT dst_len, BOOL unicode) { - INT rc; + int char_size = unicode ? sizeof(WCHAR) : sizeof(char); + INT ret; - if (is_himc_ime_unicode(data) && !unicode) - rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)source, slen, (LPSTR)target, tlen, NULL, NULL); - else if (!is_himc_ime_unicode(data) && unicode) - rc = MultiByteToWideChar(CP_ACP, 0, (LPSTR)source, slen, (LPWSTR)target, tlen) * sizeof(WCHAR); + if (is_himc_ime_unicode(data) ^ unicode) + { + if (unicode) + ret = MultiByteToWideChar(CP_ACP, 0, src, src_len, dst, dst_len); + else + ret = WideCharToMultiByte(CP_ACP, 0, src, src_len, dst, dst_len, NULL, NULL); + ret *= char_size; + } else { - int dlen = (unicode)?sizeof(WCHAR):sizeof(CHAR); - memcpy( target, source, min(slen,tlen)*dlen); - rc = slen*dlen; + ret = min(src_len * char_size, dst_len); + memcpy(dst, src, ret); } - return rc; + return ret; } static INT CopyCompAttrIMEtoClient(InputContextData *data, LPBYTE source, INT slen, LPBYTE ssource, INT sslen, diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index ee1aeb3..d15fa9c 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -448,6 +448,31 @@ static void test_ImmGetCompositionString(void) ok(len*sizeof(WCHAR)==wlen,"GCS_COMPATTR(W) not returning correct count\n"); len = ImmGetCompositionStringA(imc, GCS_COMPATTR, NULL, 0); ok(len==alen,"GCS_COMPATTR(A) not returning correct count\n"); + + /* Get strings with exactly matching buffer sizes. */ + memset(wstring, 0x1a, sizeof(wstring)); + memset(cstring, 0x1a, sizeof(cstring)); + + len = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, alen); + ok(len == alen, "Unexpected length %d.\n", len); + ok(cstring[alen] == 0x1a, "Unexpected buffer contents.\n"); + + len = ImmGetCompositionStringW(imc, GCS_COMPSTR, wstring, wlen); + ok(len == wlen, "Unexpected length %d.\n", len); + ok(wstring[wlen/sizeof(WCHAR)] == 0x1a1a, "Unexpected buffer contents.\n"); + + /* Get strings with exactly smaller buffer sizes. */ + memset(wstring, 0x1a, sizeof(wstring)); + memset(cstring, 0x1a, sizeof(cstring)); + + /* Returns 0 but still fills buffer. */ + len = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, alen - 1); + ok(!len, "Unexpected length %d.\n", len); + ok(cstring[0] == 'w', "Unexpected buffer contents %s.\n", cstring); + + len = ImmGetCompositionStringW(imc, GCS_COMPSTR, wstring, wlen - 1); + ok(len == wlen - 1, "Unexpected length %d.\n", len); + ok(!memcmp(wstring, string, wlen - 1), "Unexpected buffer contents.\n"); } else win_skip("Composition string isn't available\n");

1 0

Nikolay Sivov : imm32: Fix output buffer length handling for A -> W conversion case of GCS_COMPSTR.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 0f2f72d7b9bb198a4f14c37c1b017a81b6935790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f2f72d7b9bb198a4f14c37c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 7 11:23:37 2019 +0300 imm32: Fix output buffer length handling for A -> W conversion case of GCS_COMPSTR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index a385d88..948ef78 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1217,7 +1217,7 @@ static INT CopyCompStringIMEtoClient(const InputContextData *data, const void *s if (is_himc_ime_unicode(data) ^ unicode) { if (unicode) - ret = MultiByteToWideChar(CP_ACP, 0, src, src_len, dst, dst_len); + ret = MultiByteToWideChar(CP_ACP, 0, src, src_len, dst, dst_len / sizeof(WCHAR)); else ret = WideCharToMultiByte(CP_ACP, 0, src, src_len, dst, dst_len, NULL, NULL); ret *= char_size;

1 0

Józef Kucia : d3d12: Pass IDXGIAdapter and adapter LUID to vkd3d.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 47d5dda22be190c55c7ff2566fdfd1aa126f34e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47d5dda22be190c55c7ff256… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 11 11:28:55 2019 +0100 d3d12: Pass IDXGIAdapter and adapter LUID to vkd3d. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/Makefile.in | 2 +- dlls/d3d12/d3d12_main.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in index 62fb01a..ba51960 100644 --- a/dlls/d3d12/Makefile.in +++ b/dlls/d3d12/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3d12.dll IMPORTLIB = d3d12 -IMPORTS = gdi32 user32 +IMPORTS = dxgi dxguid gdi32 user32 EXTRALIBS = $(VKD3D_LIBS) EXTRAINCL = $(VKD3D_CFLAGS) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index d6d691c..dace414 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -20,6 +20,7 @@ #include "config.h" #include "wine/port.h" +#define COBJMACROS #define VK_NO_PROTOTYPES #define VKD3D_NO_VULKAN_H #define VKD3D_NO_WIN32_TYPES @@ -30,6 +31,7 @@ #include "wine/vulkan.h" #include "wine/vulkan_driver.h" +#include "dxgi1_6.h" #include "d3d12.h" #include <vkd3d.h> @@ -116,12 +118,58 @@ static const struct vulkan_funcs *get_vk_funcs(void) return vk_funcs; } +static HRESULT d3d12_get_adapter(IUnknown **adapter, LUID *luid) +{ + DXGI_ADAPTER_DESC adapter_desc; + IDXGIFactory4 *factory = NULL; + IDXGIAdapter *dxgi_adapter; + HRESULT hr; + + if (!*adapter) + { + if (FAILED(hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory))) + { + WARN("Failed to create DXGI factory, hr %#x.\n", hr); + goto done; + } + + if (FAILED(hr = IDXGIFactory4_EnumAdapters(factory, 0, &dxgi_adapter))) + { + WARN("Failed to enumerate primary adapter, hr %#x.\n", hr); + goto done; + } + } + else if (FAILED(hr = IUnknown_QueryInterface(*adapter, &IID_IDXGIAdapter, (void **)&dxgi_adapter))) + { + WARN("Invalid adapter %p, hr %#x.\n", adapter, hr); + goto done; + } + + if (SUCCEEDED(hr = IDXGIAdapter_GetDesc(dxgi_adapter, &adapter_desc))) + { + *adapter = (IUnknown *)dxgi_adapter; + *luid = adapter_desc.AdapterLuid; + } + else + { + IDXGIAdapter_Release(dxgi_adapter); + } + +done: + if (factory) + IDXGIFactory4_Release(factory); + + return hr; +} + HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { struct vkd3d_instance_create_info instance_create_info; struct vkd3d_device_create_info device_create_info; const struct vulkan_funcs *vk_funcs; + LUID adapter_luid; + HRESULT hr; static const char * const instance_extensions[] = { @@ -142,7 +190,9 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe return E_FAIL; } - FIXME("Ignoring adapter %p.\n", adapter); + /* FIXME: Get VkPhysicalDevice for IDXGIAdapter. */ + if (FAILED(hr = d3d12_get_adapter(&adapter, &adapter_luid))) + return hr; memset(&instance_create_info, 0, sizeof(instance_create_info)); instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; @@ -161,8 +211,12 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe device_create_info.instance_create_info = &instance_create_info; device_create_info.device_extensions = device_extensions; device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); + device_create_info.parent = adapter; + device_create_info.adapter_luid = adapter_luid; - return vkd3d_create_device(&device_create_info, iid, device); + hr = vkd3d_create_device(&device_create_info, iid, device); + IUnknown_Release(adapter); + return hr; } HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size,

1 0