September 2020 - Wine-Commits

Alexandre Julliard : makefiles: Fix a few more object directory references.
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: 3f330361d227d03e945800625f225f58ce11dd8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f330361d227d03e94580062… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 09:55:46 2020 +0200 makefiles: Fix a few more object directory references. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 7a559302c0..7b12f1b8ac 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1479,7 +1479,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ /* check for extra targets */ if (strarray_exists( &make->extra_targets, pFile->name )) { - pFile->sourcename = filename; + pFile->sourcename = src_dir_path( make, pFile->name ); pFile->filename = obj_dir_path( make, pFile->name ); return NULL; } @@ -2404,7 +2404,7 @@ static struct strarray get_source_defines( struct makefile *make, struct incl_fi if (source->use_msvcrt) strarray_add( &ret, strmake( "-I%s", top_src_dir_path( make, "include/msvcrt" ))); for (i = 0; i < make->include_paths.count; i++) - strarray_add( &ret, strmake( "-I%s", obj_dir_path( make, make->include_paths.str[i] ))); + strarray_add( &ret, strmake( "-I%s", make->include_paths.str[i] )); strarray_addall( &ret, make->define_args ); strarray_addall( &ret, get_expanded_file_local_var( make, obj, "EXTRADEFS" )); return ret; @@ -2486,12 +2486,18 @@ static void output_symlink_rule( const char *src_name, const char *link_name ) */ static void output_srcdir_symlink( struct makefile *make, const char *obj ) { - char *src_file; + char *src_file, *dst_file, *src_name; if (!make->src_dir) return; src_file = src_dir_path( make, obj ); - output( "%s: %s\n", obj, src_file ); - output_symlink_rule( src_file, obj ); + dst_file = obj_dir_path( make, obj ); + output( "%s: %s\n", dst_file, src_file ); + + src_name = src_file; + if (src_name[0] != '/' && make->obj_dir) + src_name = concat_paths( get_relative_path( make->obj_dir, "" ), src_name ); + + output_symlink_rule( src_name, dst_file ); strarray_add( &make->all_targets, obj ); } @@ -2736,7 +2742,7 @@ static void output_source_y( struct makefile *make, struct incl_file *source, co source->filename, obj_dir_path( make, header )); strarray_add( &make->clean_files, header ); } - else output( "%s.tab.c: %s\n", obj, source->filename ); + else output( "%s.tab.c: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s -p %s_ -o $@ %s\n", bison, obj, source->filename ); } @@ -3168,8 +3174,8 @@ static void output_source_default( struct makefile *make, struct incl_file *sour strarray_add( &make->ok_files, strmake( "%s.ok", obj )); output( "%s.ok:\n", obj_dir_path( make, obj )); output( "\t%s $(RUNTESTFLAGS) -T %s -M %s -p %s%s %s && touch $@\n", - top_src_dir_path( make, "tools/runtest" ), top_obj_dir_path( make, "" ), - make->testdll, replace_extension( make->testdll, ".dll", "_test.exe" ), + top_src_dir_path( make, "tools/runtest" ), top_obj_dir_path( make, "" ), make->testdll, + obj_dir_path( make, replace_extension( make->testdll, ".dll", "_test.exe" )), make->is_cross ? "" : dll_ext, obj ); } } @@ -3538,7 +3544,7 @@ static void output_shared_lib( struct makefile *make ) for (i = 1; i < names.count; i++) { output( "%s: %s\n", obj_dir_path( make, names.str[i] ), obj_dir_path( make, names.str[i-1] )); - output_symlink_rule( obj_dir_path( make, names.str[i-1] ), obj_dir_path( make, names.str[i] )); + output_symlink_rule( names.str[i-1], obj_dir_path( make, names.str[i] )); add_install_rule( make, names.str[i], names.str[i-1], strmake( "y$(libdir)/%s", names.str[i] )); } @@ -3651,7 +3657,7 @@ static void output_programs( struct makefile *make ) for (j = 0; j < symlinks.count; j++) { output( "%s: %s\n", obj_dir_path( make, symlinks.str[j] ), obj_dir_path( make, program )); - output_symlink_rule( obj_dir_path( make, program ), obj_dir_path( make, symlinks.str[j] )); + output_symlink_rule( program, obj_dir_path( make, symlinks.str[j] )); } strarray_addall( &make->all_targets, symlinks );

1 0

Alexandre Julliard : wineandroid.drv: Pass the source directory on the gradle command line.
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: 22628bcc1742273affa85cbafb0e494922f424f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22628bcc1742273affa85cba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 12:40:43 2020 +0200 wineandroid.drv: Pass the source directory on the gradle command line. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 +- dlls/wineandroid.drv/Makefile.in | 2 +- dlls/wineandroid.drv/build.gradle.in | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5c6a3e30c5..3f8196ed85 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,7 +75,7 @@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) DELAYLOADFLAG = @DELAYLOADFLAG@ PACKAGE_VERSION = @PACKAGE_VERSION@ -SED_CMD = LC_ALL=C sed -e 's,@bindir\@,${bindir},g' -e 's,@dlldir\@,${dlldir},g' -e 's,@srcdir\@,${srcdir},g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' +SED_CMD = LC_ALL=C sed -e 's,@bindir\@,${bindir},g' -e 's,@dlldir\@,${dlldir},g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' api_manext = 3w WINELOADER_PROGRAMS = @WINELOADER_PROGRAMS@ WINELOADER_DEPENDS = @WINELOADER_DEPENDS@ diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index aab69c88de..cb352e38c9 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -18,5 +18,5 @@ SVG_SRCS = \ EXTRA_TARGETS = wine-debug.apk wine-debug.apk: build.gradle $(srcdir)/AndroidManifest.xml $(srcdir)/WineActivity.java $(srcdir)/wine.svg - gradle -q assembleDebug + gradle -q -Psrcdir=$(srcdir) assembleDebug mv build/outputs/apk/wine-debug.apk $@ diff --git a/dlls/wineandroid.drv/build.gradle.in b/dlls/wineandroid.drv/build.gradle.in index 8ae2fb4764..47b9f7a177 100644 --- a/dlls/wineandroid.drv/build.gradle.in +++ b/dlls/wineandroid.drv/build.gradle.in @@ -39,7 +39,7 @@ def add_icon_task( dir, scale ) outputs.dir( outdir ) doFirst { outdir.mkdirs() } def png = new File( outdir, "wine.png" ) - def svg = new File( "@srcdir@", "wine.svg" ) + def svg = new File( srcdir, "wine.svg" ) inputs.file( svg ) outputs.file( png ) commandLine "rsvg-convert", "-z", scale, "-o", png, svg @@ -97,10 +97,10 @@ android sourceSets { main.assets.srcDirs = [ "assets" ] - main.java.srcDirs = [ "@srcdir@" ] + main.java.srcDirs = [ srcdir ] main.jniLibs.srcDirs = [ "lib" ] main.java.excludes = [ "build" ] main.res.srcDirs = [ "res" ] - main.manifest.srcFile "@srcdir@/AndroidManifest.xml" + main.manifest.srcFile srcdir + "/AndroidManifest.xml" } }

1 0

Matteo Bruni : d3d11: Report D3D11_FORMAT_SUPPORT_TEXTURECUBE in CheckFormatSupport().
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: 4993651e9dced194c12402e4d084220569dc14bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4993651e9dced194c12402e4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 10 21:20:38 2020 +0200 d3d11: Report D3D11_FORMAT_SUPPORT_TEXTURECUBE in CheckFormatSupport(). 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/d3d11/device.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index a6f4e6badb..880c8b6595 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3332,15 +3332,17 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * { enum wined3d_resource_type rtype; unsigned int bind_flags; + unsigned int usage; D3D11_FORMAT_SUPPORT flag; } flag_mapping[] = { - {WINED3D_RTYPE_TEXTURE_1D, WINED3D_BIND_SHADER_RESOURCE, D3D11_FORMAT_SUPPORT_TEXTURE1D}, - {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, D3D11_FORMAT_SUPPORT_TEXTURE2D}, - {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, D3D11_FORMAT_SUPPORT_TEXTURE3D}, - {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, D3D11_FORMAT_SUPPORT_RENDER_TARGET}, - {WINED3D_RTYPE_NONE, WINED3D_BIND_DEPTH_STENCIL, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL}, + {WINED3D_RTYPE_TEXTURE_1D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE1D}, + {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE2D}, + {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE3D}, + {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_LEGACY_CUBEMAP, D3D11_FORMAT_SUPPORT_TEXTURECUBE}, + {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, 0, D3D11_FORMAT_SUPPORT_RENDER_TARGET}, + {WINED3D_RTYPE_NONE, WINED3D_BIND_DEPTH_STENCIL, 0, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL}, }; HRESULT hr; @@ -3364,7 +3366,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * for (i = 0; i < ARRAY_SIZE(flag_mapping); ++i) { hr = wined3d_check_device_format(wined3d, wined3d_adapter, params.device_type, - WINED3DFMT_UNKNOWN, 0, flag_mapping[i].bind_flags, flag_mapping[i].rtype, wined3d_format); + WINED3DFMT_UNKNOWN, flag_mapping[i].usage, flag_mapping[i].bind_flags, flag_mapping[i].rtype, wined3d_format); if (hr == WINED3DERR_NOTAVAILABLE || hr == WINED3DOK_NOMIPGEN) continue; if (hr != WINED3D_OK)

1 0

Alexandre Julliard : makefiles: Remove support for generating a single makefile.
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: 9a542f9ddadf769541b9592205e0aadf288cbca1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a542f9ddadf769541b95922… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 10:00:31 2020 +0200 makefiles: Remove support for generating a single makefile. We need to handle all makefiles at once for proper import lib dependencies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 44 ++++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 7b12f1b8ac..e675b800a8 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1841,12 +1841,7 @@ static struct makefile *parse_makefile( const char *path ) struct makefile *make = xmalloc( sizeof(*make) ); memset( make, 0, sizeof(*make) ); - if (path) - { - make->top_obj_dir = get_relative_path( path, "" ); - make->base_dir = path; - if (!strcmp( make->base_dir, "." )) make->base_dir = NULL; - } + make->base_dir = path; file = open_input_makefile( make ); while ((buffer = get_line( file ))) @@ -4286,6 +4281,8 @@ static void load_sources( struct makefile *make ) struct strarray value; struct incl_file *file; + if (make->base_dir) make->top_obj_dir = get_relative_path( make->base_dir, "" ); + if (root_src_dir) { make->top_src_dir = concat_paths( make->top_obj_dir, root_src_dir ); @@ -4488,6 +4485,8 @@ int main( int argc, char *argv[] ) exit( 0 ); } + if (argc > 1) fatal_error( "Directory arguments not supported in this mode\n" ); + atexit( cleanup_files ); signal( SIGTERM, exit_on_signal ); signal( SIGINT, exit_on_signal ); @@ -4539,31 +4538,20 @@ int main( int argc, char *argv[] ) if (!tools_ext) tools_ext = ""; if (!man_ext) man_ext = "3w"; - if (argc == 1) - { - disabled_dirs = get_expanded_make_var_array( top_makefile, "DISABLED_SUBDIRS" ); - top_makefile->subdirs = get_expanded_make_var_array( top_makefile, "SUBDIRS" ); - top_makefile->submakes = xmalloc( top_makefile->subdirs.count * sizeof(*top_makefile->submakes) ); - - for (i = 0; i < top_makefile->subdirs.count; i++) - top_makefile->submakes[i] = parse_makefile( top_makefile->subdirs.str[i] ); + disabled_dirs = get_expanded_make_var_array( top_makefile, "DISABLED_SUBDIRS" ); + top_makefile->subdirs = get_expanded_make_var_array( top_makefile, "SUBDIRS" ); + top_makefile->submakes = xmalloc( top_makefile->subdirs.count * sizeof(*top_makefile->submakes) ); - load_sources( top_makefile ); - for (i = 0; i < top_makefile->subdirs.count; i++) - load_sources( top_makefile->submakes[i] ); + for (i = 0; i < top_makefile->subdirs.count; i++) + top_makefile->submakes[i] = parse_makefile( top_makefile->subdirs.str[i] ); - for (i = 0; i < top_makefile->subdirs.count; i++) - output_dependencies( top_makefile->submakes[i] ); + load_sources( top_makefile ); + for (i = 0; i < top_makefile->subdirs.count; i++) + load_sources( top_makefile->submakes[i] ); - output_dependencies( top_makefile ); - return 0; - } + for (i = 0; i < top_makefile->subdirs.count; i++) + output_dependencies( top_makefile->submakes[i] ); - for (i = 1; i < argc; i++) - { - struct makefile *make = parse_makefile( argv[i] ); - load_sources( make ); - output_dependencies( make ); - } + output_dependencies( top_makefile ); return 0; }

1 0

Alexandre Julliard : wineandroid.drv: Load libwine dynamically.
by Alexandre Julliard Sept. 11, 2020

Sept. 11, 2020

Module: wine Branch: master Commit: 4935576d4a5cb13bc58eebfca1ca43bc43866ff9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4935576d4a5cb13bc58eebfc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 11:43:21 2020 +0200 wineandroid.drv: Load libwine dynamically. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 1 - dlls/wineandroid.drv/android.h | 4 ++-- dlls/wineandroid.drv/device.c | 4 ++-- dlls/wineandroid.drv/init.c | 17 ++++++++++++++--- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index fcc988b211..aab69c88de 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,6 +1,5 @@ MODULE = wineandroid.drv IMPORTS = uuid ole32 user32 gdi32 advapi32 ntoskrnl -EXTRALIBS = -lwine C_SRCS = \ device.c \ diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index befaa3c27d..7db10d87f1 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -155,7 +155,7 @@ union event_data int send_event( const union event_data *data ) DECLSPEC_HIDDEN; -extern JavaVM *wine_get_java_vm(void); -extern jobject wine_get_java_object(void); +extern JavaVM * (*p_wine_get_java_vm)(void); +extern jobject (*p_wine_get_java_object)(void); #endif /* __WINE_ANDROID_H */ diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index c9321c4899..c2eb63382a 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -687,7 +687,7 @@ static int status_to_android_error( NTSTATUS status ) static jobject load_java_method( jmethodID *method, const char *name, const char *args ) { - jobject object = wine_get_java_object(); + jobject object = p_wine_get_java_object(); if (!*method) { @@ -1163,7 +1163,7 @@ static DWORD CALLBACK device_thread( void *arg ) TRACE( "starting process %x\n", GetCurrentProcessId() ); - if (!(java_vm = wine_get_java_vm())) return 0; /* not running under Java */ + if (!(java_vm = p_wine_get_java_vm())) return 0; /* not running under Java */ init_java_thread( java_vm ); diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 7b2850e452..43d4de0d6d 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -104,7 +104,7 @@ void set_screen_dpi( DWORD dpi ) */ static void fetch_display_metrics(void) { - if (wine_get_java_vm()) return; /* for Java threads it will be set when the top view is created */ + if (p_wine_get_java_vm()) return; /* for Java threads it will be set when the top view is created */ SERVER_START_REQ( get_window_rectangles ) { @@ -620,16 +620,27 @@ static void load_android_libs(void) #undef DECL_FUNCPTR #undef LOAD_FUNCPTR +JavaVM * (*p_wine_get_java_vm)(void) = NULL; +jobject (*p_wine_get_java_object)(void) = NULL; + static BOOL process_attach(void) { jclass class; - jobject object = wine_get_java_object(); + jobject object; JNIEnv *jni_env; JavaVM *java_vm; + void *libwine; + + if (!(libwine = dlopen( "libwine.so", RTLD_NOW ))) return FALSE; + + p_wine_get_java_vm = dlsym( libwine, "wine_get_java_vm" ); + p_wine_get_java_object = dlsym( libwine, "wine_get_java_object" ); + + object = p_wine_get_java_object(); load_hardware_libs(); - if ((java_vm = wine_get_java_vm())) /* running under Java */ + if ((java_vm = p_wine_get_java_vm())) /* running under Java */ { #ifdef __i386__ WORD old_fs;

1 0

Paul Gofman : d3dcompiler/tests: Test d3d12 interface in test_reflection_bound_resources().
by Alexandre Julliard Sept. 10, 2020

Sept. 10, 2020

Module: wine Branch: master Commit: 1690b6b47501b9bddd07d38aa6ef09daae32cf72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1690b6b47501b9bddd07d38a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 10 14:09:09 2020 +0300 d3dcompiler/tests: Test d3d12 interface in test_reflection_bound_resources(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/reflection.c | 293 ++++++++++++++++++++++----------- 1 file changed, 201 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1690b6b47501b9bddd07…

1 0

Alex Henrie : comdlg32: Fix error precedence in IFileDialog2_SetFileTypes.
by Alexandre Julliard Sept. 10, 2020

Sept. 10, 2020

Module: wine Branch: master Commit: 1a0470443d12f6fc4c241a93af5bc34aa03b34b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a0470443d12f6fc4c241a93… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 9 23:40:26 2020 -0600 comdlg32: Fix error precedence in IFileDialog2_SetFileTypes. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 6 +++--- dlls/comdlg32/tests/itemdlg.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 1ae20ca782..f17c2f926d 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -2402,12 +2402,12 @@ static HRESULT WINAPI IFileDialog2_fnSetFileTypes(IFileDialog2 *iface, UINT cFil UINT i; TRACE("%p (%d, %p)\n", This, cFileTypes, rgFilterSpec); - if(This->filterspecs) - return E_UNEXPECTED; - if(!rgFilterSpec) return E_INVALIDARG; + if(This->filterspecs) + return E_UNEXPECTED; + if(!cFileTypes) return S_OK; diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 6ee0d5fc3d..c38457a0a1 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -675,6 +675,8 @@ static void test_basics(void) ok(hr == S_OK, "got 0x%08x.\n", hr); hr = IFileOpenDialog_SetFileTypes(pfod, 0, filterspec); ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); + hr = IFileOpenDialog_SetFileTypes(pfod, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); hr = IFileOpenDialog_SetFileTypeIndex(pfod, 0); ok(hr == S_OK, "got 0x%08x.\n", hr); hr = IFileOpenDialog_GetFileTypeIndex(pfod, &filetype);

1 0

Chao Long : ntdll: Fix a ImagePathName memory leak (Valgrind).
by Alexandre Julliard Sept. 10, 2020

Sept. 10, 2020

Module: wine Branch: master Commit: 655ab7a84f1442ebc185a09acd06611cac1a3eb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=655ab7a84f1442ebc185a09a… Author: Chao Long <longchao(a)uniontech.com> Date: Thu Sep 10 11:09:34 2020 +0800 ntdll: Fix a ImagePathName memory leak (Valgrind). Signed-off-by: Chao Long <longchao(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 06e7c1bb37..933792317d 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -1250,6 +1250,7 @@ void init_user_process_params(void) params->Environment = env; NtCurrentTeb()->Peb->ProcessParameters = params; + RtlFreeUnicodeString( &initial_params.ImagePathName ); RtlFreeUnicodeString( &cmdline ); RtlReleasePath( load_path );

1 0

Hans Leidekker : crypt32: Store CERT_KEY_CONTEXT in a platform independent way.
by Alexandre Julliard Sept. 10, 2020

Sept. 10, 2020

Module: wine Branch: master Commit: 49165c25e8dff9ab3c49f55081669eb5d00b78b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49165c25e8dff9ab3c49f550… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 10 15:20:11 2020 +0200 crypt32: Store CERT_KEY_CONTEXT in a platform independent way. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49792 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 34 ++++++++++++++++++++++++++++++---- dlls/crypt32/crypt32_private.h | 8 ++++++++ dlls/crypt32/serialize.c | 7 +++++++ 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index e4cab01cd9..13d8df9258 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -428,6 +428,13 @@ static BOOL CertContext_CopyParam(void *pvData, DWORD *pcbData, const void *pb, return ret; } +void CRYPT_ConvertKeyContext(const struct store_CERT_KEY_CONTEXT *src, CERT_KEY_CONTEXT *dst) +{ + dst->cbSize = sizeof(*dst); + dst->hCryptProv = src->hCryptProv; + dst->dwKeySpec = src->dwKeySpec; +} + static BOOL CertContext_GetProperty(cert_t *cert, DWORD dwPropId, void *pvData, DWORD *pcbData) { @@ -441,7 +448,16 @@ static BOOL CertContext_GetProperty(cert_t *cert, DWORD dwPropId, else ret = FALSE; if (ret) + { + CERT_KEY_CONTEXT ctx; + if (dwPropId == CERT_KEY_CONTEXT_PROP_ID) + { + CRYPT_ConvertKeyContext((const struct store_CERT_KEY_CONTEXT *)blob.pbData, &ctx); + blob.pbData = (BYTE *)&ctx; + blob.cbData = ctx.cbSize; + } ret = CertContext_CopyParam(pvData, pcbData, blob.pbData, blob.cbData); + } else { /* Implicit properties */ @@ -732,6 +748,19 @@ static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties return ret; } +static BOOL CertContext_SetKeyContextProperty(CONTEXT_PROPERTY_LIST *properties, + const CERT_KEY_CONTEXT *keyContext) +{ + struct store_CERT_KEY_CONTEXT ctx; + + ctx.cbSize = sizeof(ctx); + ctx.hCryptProv = keyContext->hCryptProv; + ctx.dwKeySpec = keyContext->dwKeySpec; + + return ContextPropertyList_SetProperty(properties, CERT_KEY_CONTEXT_PROP_ID, + (const BYTE *)&ctx, ctx.cbSize); +} + static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId, DWORD dwFlags, const void *pvData) { @@ -790,7 +819,6 @@ static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId, } break; case CERT_KEY_CONTEXT_PROP_ID: - { if (pvData) { const CERT_KEY_CONTEXT *keyContext = pvData; @@ -801,8 +829,7 @@ static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId, ret = FALSE; } else - ret = ContextPropertyList_SetProperty(cert->base.properties, dwPropId, - (const BYTE *)keyContext, keyContext->cbSize); + ret = CertContext_SetKeyContextProperty(cert->base.properties, pvData); } else { @@ -810,7 +837,6 @@ static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId, ret = TRUE; } break; - } case CERT_KEY_PROV_INFO_PROP_ID: if (pvData) ret = CertContext_SetKeyProvInfoProperty(cert->base.properties, pvData); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index d92eb1a157..c552bdf949 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -378,6 +378,14 @@ BOOL CRYPT_ReadSerializedStoreFromBlob(const CRYPT_DATA_BLOB *blob, */ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) DECLSPEC_HIDDEN; +struct store_CERT_KEY_CONTEXT +{ + DWORD cbSize; + DWORD64 hCryptProv; + DWORD dwKeySpec; +}; +void CRYPT_ConvertKeyContext(const struct store_CERT_KEY_CONTEXT *src, CERT_KEY_CONTEXT *dst) DECLSPEC_HIDDEN; + /** * String functions */ diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index e8ccc4a06e..7f7a4bc369 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -280,6 +280,13 @@ static BOOL CRYPT_ReadContextProp( hdr->propID, 0, pbElement); break; } + case CERT_KEY_CONTEXT_PROP_ID: + { + CERT_KEY_CONTEXT ctx; + CRYPT_ConvertKeyContext((struct store_CERT_KEY_CONTEXT *)pbElement, &ctx); + ret = contextInterface->setProp(context, hdr->propID, 0, &ctx); + break; + } default: ret = FALSE; }

1 0

Gabriel Ivăncescu : msscript.ocx: Supply a stub ServiceProvider to InvokeEx in run_procedure.
by Alexandre Julliard Sept. 10, 2020

Sept. 10, 2020

Module: wine Branch: master Commit: c409ab6290fd3d9e69492e10836db153e7f6a836 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c409ab6290fd3d9e69492e10… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 10 16:32:59 2020 +0300 msscript.ocx: Supply a stub ServiceProvider to InvokeEx in run_procedure. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 47 +++++++++++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 30 ++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index ed17be90d8..70dc05f61e 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -434,6 +434,51 @@ static HRESULT parse_script_text(ScriptModule *module, BSTR script_text, DWORD f return hr; } +static HRESULT WINAPI sp_caller_QueryInterface(IServiceProvider *iface, REFIID riid, void **obj) +{ + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IServiceProvider, riid)) + *obj = iface; + else + { + FIXME("(%p)->(%s)\n", iface, debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*obj); + return S_OK; +} + +static ULONG WINAPI sp_caller_AddRef(IServiceProvider *iface) +{ + return 2; +} + +static ULONG WINAPI sp_caller_Release(IServiceProvider *iface) +{ + return 1; +} + +static HRESULT WINAPI sp_caller_QueryService(IServiceProvider *iface, REFGUID service, REFIID riid, void **obj) +{ + FIXME("(%p)->(%s %s %p): semi-stub\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + *obj = NULL; + if (IsEqualGUID(&SID_GetCaller, service)) + return S_OK; + + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl sp_caller_vtbl = { + sp_caller_QueryInterface, + sp_caller_AddRef, + sp_caller_Release, + sp_caller_QueryService +}; + +static IServiceProvider sp_caller = { &sp_caller_vtbl }; + static HRESULT run_procedure(ScriptModule *module, BSTR procedure_name, SAFEARRAY *args, VARIANT *res) { IDispatchEx *dispex; @@ -475,7 +520,7 @@ static HRESULT run_procedure(ScriptModule *module, BSTR procedure_name, SAFEARRA else { hr = IDispatchEx_InvokeEx(dispex, dispid, LOCALE_USER_DEFAULT, - DISPATCH_METHOD, &dp, res, NULL, NULL); + DISPATCH_METHOD, &dp, res, NULL, &sp_caller); IDispatchEx_Release(dispex); } } diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index a6ec0992c8..4f43764234 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -673,6 +673,10 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { + IServiceProvider *sp; + IUnknown *unk; + HRESULT hr; + CHECK_EXPECT(InvokeEx); ok(lcid == LOCALE_USER_DEFAULT, "unexpected lcid %u.\n", lcid); ok(wFlags == DISPATCH_METHOD, "unexpected wFlags %u.\n", wFlags); @@ -690,6 +694,32 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc "unexpected second parameter V_VT = %d, V_I4 = %d.\n", V_VT(pdp->rgvarg), V_I4(pdp->rgvarg)); } + ok(!!pspCaller, "unexpected NULL pspCaller.\n"); + + hr = IActiveScriptSite_QueryInterface(site, &IID_IServiceProvider, (void**)&sp); + ok(hr == S_OK, "Failed to retrieve IID_IServiceProvider from script site: 0x%08x.\n", hr); + ok(sp != pspCaller, "Same IServiceProvider objects.\n"); + IServiceProvider_Release(sp); + + hr = IServiceProvider_QueryInterface(pspCaller, &IID_IActiveScriptSite, (void**)&unk); + ok(hr == E_NOINTERFACE, "QueryInterface IActiveScriptSite returned: 0x%08x.\n", hr); + + unk = (IUnknown*)0xdeadbeef; + hr = IServiceProvider_QueryService(pspCaller, &SID_GetCaller, NULL, (void**)&unk); + ok(hr == S_OK, "QueryService failed: 0x%08x.\n", hr); + ok(!unk, "unexpected object returned %p.\n", unk); + unk = (IUnknown*)0xdeadbeef; + hr = IServiceProvider_QueryService(pspCaller, &SID_GetCaller, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryService failed: 0x%08x.\n", hr); + ok(!unk, "unexpected object returned %p.\n", unk); + sp = (IServiceProvider*)0xdeadbeef; + hr = IServiceProvider_QueryService(pspCaller, &SID_GetCaller, &IID_IServiceProvider, (void**)&sp); + ok(hr == S_OK, "QueryService failed: 0x%08x.\n", hr); + ok(!sp, "unexpected object returned %p.\n", sp); + unk = (IUnknown*)0xdeadbeef; + hr = IServiceProvider_QueryService(pspCaller, &SID_VariantConversion, &IID_IVariantChangeType, (void**)&unk); + ok(hr == E_NOINTERFACE, "QueryService returned: 0x%08x.\n", hr); + ok(!unk, "unexpected object returned %p.\n", unk); V_VT(pvarRes) = VT_I2; V_I2(pvarRes) = 42;

1 0