February 2023 - Wine-commits

Ivan Chikish : winegstreamer: Add missing *out=NULL in unknown_inner_QueryInterface.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: efc7a42bd5cf6297d6d51e4ad0556ba2f4f1bba0 URL: https://gitlab.winehq.org/wine/wine/-/commit/efc7a42bd5cf6297d6d51e4ad0556b… Author: Ivan Chikish <nekotekina(a)gmail.com> Date: Wed Feb 8 03:14:49 2023 +0300 winegstreamer: Add missing *out=NULL in unknown_inner_QueryInterface. QueryInterface should set *out to NULL on failure. Also change the log level on failure to FIXME. --- dlls/winegstreamer/wm_reader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 18b0e8a90bc..50e2c5fc175 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1700,7 +1700,8 @@ static HRESULT WINAPI unknown_inner_QueryInterface(IUnknown *iface, REFIID iid, *out = &reader->IWMReaderTimecode_iface; else { - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; return E_NOINTERFACE; }

1 0

Ivan Chikish : wmvcore: Add missing *out=NULL in WMReader_QueryInterface.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: d6ccab8ecd507b54aab59028c1e64e75687c03bc URL: https://gitlab.winehq.org/wine/wine/-/commit/d6ccab8ecd507b54aab59028c1e64e… Author: Ivan Chikish <nekotekina(a)gmail.com> Date: Wed Feb 8 03:17:14 2023 +0300 wmvcore: Add missing *out=NULL in WMReader_QueryInterface. QueryInterface should set *out to NULL on failure. Also change the log level on failure to FIXME. --- dlls/wmvcore/async_reader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/async_reader.c b/dlls/wmvcore/async_reader.c index a51018260b1..47de592c95c 100644 --- a/dlls/wmvcore/async_reader.c +++ b/dlls/wmvcore/async_reader.c @@ -544,7 +544,8 @@ static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID iid, void *out = &reader->IReferenceClock_iface; else { - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; return E_NOINTERFACE; }

1 0

Ivan Chikish : wmvcore/tests: Check out value for NULL in check_interface.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: 2ae2d2fd07ad90804be33baf9e5974162f49b951 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ae2d2fd07ad90804be33baf9e5974… Author: Ivan Chikish <nekotekina(a)gmail.com> Date: Wed Feb 8 15:45:35 2023 +0300 wmvcore/tests: Check out value for NULL in check_interface. --- dlls/wmvcore/tests/wmvcore.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index ae6071159f6..f07abb8d4bb 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -134,7 +134,7 @@ static WCHAR *load_resource(const WCHAR *name) static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOOL supported) { HRESULT hr, expected_hr; - IUnknown *unknown = iface, *out; + IUnknown *unknown = iface, *out = (IUnknown *)0xbeef; expected_hr = supported ? S_OK : E_NOINTERFACE; @@ -142,6 +142,8 @@ static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOO ok_(__FILE__, line)(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); if (SUCCEEDED(hr)) IUnknown_Release(out); + else if (!supported) + ok_(__FILE__, line)(out == NULL, "Expected out == NULL\n"); return hr; }

1 0

Alex Henrie : msi: Annotate memory allocation functions with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: 9df04bfdb03a3017f532e70a047ee83290dbc257 URL: https://gitlab.winehq.org/wine/wine/-/commit/9df04bfdb03a3017f532e70a047ee8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 8 00:03:35 2023 -0700 msi: Annotate memory allocation functions with __WINE_(DEALLOC|MALLOC). --- dlls/msi/msipriv.h | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 92c406b8ec5..3a67fddc9c7 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -783,7 +783,7 @@ extern string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strre extern UINT msi_save_string_table( const string_table *st, IStorage *storage, UINT *bytes_per_strref ) DECLSPEC_HIDDEN; extern UINT msi_get_string_table_codepage( const string_table *st ) DECLSPEC_HIDDEN; extern UINT msi_set_string_table_codepage( string_table *st, UINT codepage ) DECLSPEC_HIDDEN; -extern WCHAR *msi_strdupW( const WCHAR *value, int len ) DECLSPEC_HIDDEN; +extern WCHAR *msi_strdupW( const WCHAR *value, int len ) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; extern BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ) DECLSPEC_HIDDEN; extern MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table ) DECLSPEC_HIDDEN; @@ -854,7 +854,7 @@ extern UINT copy_remote_record(const struct wire_record *rec, MSIHANDLE handle) /* stream internals */ extern void enum_stream_names( IStorage *stg ) DECLSPEC_HIDDEN; -extern LPWSTR encode_streamname(BOOL bTable, LPCWSTR in) DECLSPEC_HIDDEN; +extern WCHAR *encode_streamname(BOOL is_table, const WCHAR *in) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; extern BOOL decode_streamname(LPCWSTR in, LPWSTR out) DECLSPEC_HIDDEN; /* database internals */ @@ -942,7 +942,7 @@ extern UINT MSIREG_OpenClassesUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, extern UINT MSIREG_DeleteLocalClassesProductKey(LPCWSTR szProductCode) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteLocalClassesFeaturesKey(LPCWSTR szProductCode) DECLSPEC_HIDDEN; extern UINT msi_locate_product(LPCWSTR szProduct, MSIINSTALLCONTEXT *context) DECLSPEC_HIDDEN; -extern LPWSTR msi_reg_get_val_str( HKEY hkey, LPCWSTR name ) DECLSPEC_HIDDEN; +extern WCHAR *msi_reg_get_val_str( HKEY hkey, const WCHAR *name ) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; extern BOOL msi_reg_get_val_dword( HKEY hkey, LPCWSTR name, DWORD *val) DECLSPEC_HIDDEN; extern DWORD msi_version_str_to_dword(LPCWSTR p) DECLSPEC_HIDDEN; @@ -963,9 +963,10 @@ extern void msi_dialog_unregister_class( void ) DECLSPEC_HIDDEN; /* summary information */ extern UINT msi_get_suminfo( IStorage *stg, UINT uiUpdateCount, MSISUMMARYINFO **si ) DECLSPEC_HIDDEN; extern UINT msi_get_db_suminfo( MSIDATABASE *db, UINT uiUpdateCount, MSISUMMARYINFO **si ) DECLSPEC_HIDDEN; -extern LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ) DECLSPEC_HIDDEN; +extern WCHAR *msi_suminfo_dup_string( MSISUMMARYINFO *si, + UINT property ) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; extern INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ) DECLSPEC_HIDDEN; -extern LPWSTR msi_get_suminfo_product( IStorage *stg ) DECLSPEC_HIDDEN; +extern WCHAR *msi_get_suminfo_product( IStorage *stg ) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; extern UINT msi_add_suminfo( MSIDATABASE *db, LPWSTR **records, int num_records, int num_columns ) DECLSPEC_HIDDEN; extern UINT msi_export_suminfo( MSIDATABASE *db, HANDLE handle ) DECLSPEC_HIDDEN; extern UINT msi_load_suminfo_properties( MSIPACKAGE *package ) DECLSPEC_HIDDEN; @@ -1021,27 +1022,30 @@ extern UINT ACTION_MsiUnpublishAssemblies(MSIPACKAGE *package) DECLSPEC_HIDDEN; /* Helpers */ extern DWORD deformat_string(MSIPACKAGE *package, LPCWSTR ptr, WCHAR** data ) DECLSPEC_HIDDEN; -extern WCHAR *msi_dup_record_field(MSIRECORD *row, INT index) DECLSPEC_HIDDEN; -extern LPWSTR msi_dup_property( MSIDATABASE *db, LPCWSTR prop ) DECLSPEC_HIDDEN; +extern WCHAR *msi_dup_record_field( MSIRECORD *row, INT index ) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; +extern WCHAR *msi_dup_property( MSIDATABASE *db, const WCHAR *prop ) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; extern UINT msi_set_property( MSIDATABASE *, const WCHAR *, const WCHAR *, int ) DECLSPEC_HIDDEN; extern UINT msi_get_property( MSIDATABASE *, LPCWSTR, LPWSTR, LPDWORD ) DECLSPEC_HIDDEN; extern int msi_get_property_int( MSIDATABASE *package, LPCWSTR prop, int def ) DECLSPEC_HIDDEN; -extern WCHAR *msi_resolve_source_folder(MSIPACKAGE *package, const WCHAR *name, MSIFOLDER **folder) DECLSPEC_HIDDEN; +extern WCHAR *msi_resolve_source_folder(MSIPACKAGE *package, const WCHAR *name, + MSIFOLDER **folder) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; extern void msi_resolve_target_folder(MSIPACKAGE *package, const WCHAR *name, BOOL load_prop) DECLSPEC_HIDDEN; -extern WCHAR *msi_normalize_path(const WCHAR *) DECLSPEC_HIDDEN; -extern WCHAR *msi_resolve_file_source(MSIPACKAGE *package, MSIFILE *file) DECLSPEC_HIDDEN; +extern WCHAR *msi_normalize_path(const WCHAR *) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; +extern WCHAR *msi_resolve_file_source(MSIPACKAGE *package, + MSIFILE *file) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; extern const WCHAR *msi_get_target_folder(MSIPACKAGE *package, const WCHAR *name) DECLSPEC_HIDDEN; extern void msi_reset_source_folders( MSIPACKAGE *package ) DECLSPEC_HIDDEN; extern MSICOMPONENT *msi_get_loaded_component(MSIPACKAGE *package, const WCHAR *Component) DECLSPEC_HIDDEN; extern MSIFEATURE *msi_get_loaded_feature(MSIPACKAGE *package, const WCHAR *Feature) DECLSPEC_HIDDEN; extern MSIFILE *msi_get_loaded_file(MSIPACKAGE *package, const WCHAR *file) DECLSPEC_HIDDEN; extern MSIFOLDER *msi_get_loaded_folder(MSIPACKAGE *package, const WCHAR *dir) DECLSPEC_HIDDEN; -extern WCHAR *msi_create_temp_file(MSIDATABASE *db) DECLSPEC_HIDDEN; +extern WCHAR *msi_create_temp_file(MSIDATABASE *db) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; extern void msi_free_action_script(MSIPACKAGE *package, UINT script) DECLSPEC_HIDDEN; -extern WCHAR *msi_build_icon_path(MSIPACKAGE *, const WCHAR *) DECLSPEC_HIDDEN; -extern WCHAR * WINAPIV msi_build_directory_name(DWORD , ...) DECLSPEC_HIDDEN; +extern WCHAR *msi_build_icon_path(MSIPACKAGE *, const WCHAR *) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; +extern WCHAR * WINAPIV msi_build_directory_name(DWORD , ...) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; extern void msi_reduce_to_long_filename(WCHAR *) DECLSPEC_HIDDEN; -extern WCHAR *msi_create_component_advertise_string(MSIPACKAGE *, MSICOMPONENT *, const WCHAR *) DECLSPEC_HIDDEN; +extern WCHAR *msi_create_component_advertise_string(MSIPACKAGE *, MSICOMPONENT *, + const WCHAR *) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; extern void ACTION_UpdateComponentStates(MSIPACKAGE *package, MSIFEATURE *feature) DECLSPEC_HIDDEN; extern UINT msi_register_unique_action(MSIPACKAGE *, const WCHAR *) DECLSPEC_HIDDEN; extern BOOL msi_action_is_unique(const MSIPACKAGE *, const WCHAR *) DECLSPEC_HIDDEN; @@ -1055,13 +1059,13 @@ extern UINT msi_uninstall_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN extern void msi_destroy_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern BOOL msi_is_global_assembly(MSICOMPONENT *) DECLSPEC_HIDDEN; extern IAssemblyEnum *msi_create_assembly_enum(MSIPACKAGE *, const WCHAR *) DECLSPEC_HIDDEN; -extern WCHAR *msi_get_assembly_path(MSIPACKAGE *, const WCHAR *) DECLSPEC_HIDDEN; +extern WCHAR *msi_get_assembly_path(MSIPACKAGE *, const WCHAR *) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; extern WCHAR **msi_split_string(const WCHAR *, WCHAR) DECLSPEC_HIDDEN; extern UINT msi_set_original_database_property(MSIDATABASE *, const WCHAR *) DECLSPEC_HIDDEN; -extern WCHAR *msi_get_error_message(MSIDATABASE *, int) DECLSPEC_HIDDEN; +extern WCHAR *msi_get_error_message(MSIDATABASE *, int) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; extern UINT msi_strncpyWtoA(const WCHAR *str, int len, char *buf, DWORD *sz, BOOL remote) DECLSPEC_HIDDEN; extern UINT msi_strncpyW(const WCHAR *str, int len, WCHAR *buf, DWORD *sz) DECLSPEC_HIDDEN; -extern WCHAR *msi_get_package_code(MSIDATABASE *db) DECLSPEC_HIDDEN; +extern WCHAR *msi_get_package_code(MSIDATABASE *db) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; /* wrappers for filesystem functions */ static inline void msi_disable_fs_redirection( MSIPACKAGE *package ) @@ -1086,7 +1090,8 @@ extern BOOL msi_create_full_path( MSIPACKAGE *, const WCHAR * ) DECLSPEC_HIDDEN; extern DWORD msi_get_disk_file_size( MSIPACKAGE *, const WCHAR * ) DECLSPEC_HIDDEN; extern VS_FIXEDFILEINFO *msi_get_disk_file_version( MSIPACKAGE *, const WCHAR * ) DECLSPEC_HIDDEN; extern UINT msi_get_filehash( MSIPACKAGE *, const WCHAR *, MSIFILEHASHINFO * ) DECLSPEC_HIDDEN; -extern WCHAR *msi_get_font_file_version( MSIPACKAGE *, const WCHAR * ) DECLSPEC_HIDDEN; +extern WCHAR *msi_get_font_file_version( MSIPACKAGE *, + const WCHAR * ) __WINE_DEALLOC(free) __WINE_MALLOC DECLSPEC_HIDDEN; /* media */

1 0

Jason Millard : vbscript: Fix memory leak in Split().
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: f8b76d3da549f8f08a0413de438f929702a380af URL: https://gitlab.winehq.org/wine/wine/-/commit/f8b76d3da549f8f08a0413de438f92… Author: Jason Millard <jsm174(a)gmail.com> Date: Wed Feb 8 11:06:24 2023 -0500 vbscript: Fix memory leak in Split(). --- dlls/vbscript/global.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 8c2e5b85982..7ca2c2b9c72 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2578,12 +2578,12 @@ static HRESULT Global_Join(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, V static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - BSTR str, string, delimiter = NULL; + BSTR string, delimiter = NULL; int count, max, mode, len, start, end, ret, delimiterlen = 1; int i, *indices = NULL, *new_indices, indices_max = 8; SAFEARRAYBOUND bounds; SAFEARRAY *sa = NULL; - VARIANT *data, var; + VARIANT *data; HRESULT hres = S_OK; TRACE("%s %u...\n", debugstr_variant(args), args_cnt); @@ -2691,19 +2691,13 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, start = 0; for (i = 0; i < count; i++) { - str = SysAllocStringLen(string + start, indices[i] - start); - if (!str) { + V_VT(&data[i]) = VT_BSTR; + V_BSTR(&data[i]) = SysAllocStringLen(string + start, indices[i] - start); + + if (!V_BSTR(&data[i])) { hres = E_OUTOFMEMORY; break; } - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = str; - - hres = VariantCopyInd(data+i, &var); - if(FAILED(hres)) { - SafeArrayUnaccessData(sa); - goto error; - } start = indices[i]+delimiterlen; } SafeArrayUnaccessData(sa);

1 0

Jason Millard : vbscript: Fix memory leak in Split().
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: a6847dd9fb3d9ce876e59e776b2a17f6b26bdf3f URL: https://gitlab.winehq.org/wine/wine/-/commit/a6847dd9fb3d9ce876e59e776b2a17… Author: Jason Millard <jsm174(a)gmail.com> Date: Wed Feb 8 13:06:08 2023 -0500 vbscript: Fix memory leak in Split(). --- dlls/vbscript/interp.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index b3be3bea6cf..4881efa9454 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1375,24 +1375,31 @@ static HRESULT interp_redim_preserve(exec_ctx_t *ctx) if(array == NULL || array->cDims == 0) { /* can initially allocate the array */ array = SafeArrayCreate(VT_VARIANT, dim_cnt, bounds); - VariantClear(v); - V_VT(v) = VT_ARRAY|VT_VARIANT; - V_ARRAY(v) = array; - return S_OK; + if(!array) + hres = E_OUTOFMEMORY; + else { + VariantClear(v); + V_VT(v) = VT_ARRAY|VT_VARIANT; + V_ARRAY(v) = array; + } } else if(array->cDims != dim_cnt) { /* can't otherwise change the number of dimensions */ TRACE("Can't resize %s, cDims %d != %d\n", debugstr_w(identifier), array->cDims, dim_cnt); - return MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); + hres = MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); } else { /* can resize the last dimensions (if others match */ for(i = 0; i+1 < dim_cnt; ++i) { if(array->rgsabound[array->cDims - 1 - i].cElements != bounds[i].cElements) { TRACE("Can't resize %s, bound[%d] %ld != %ld\n", debugstr_w(identifier), i, array->rgsabound[i].cElements, bounds[i].cElements); - return MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); + hres = MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); + break; } } - return SafeArrayRedim(array, &bounds[dim_cnt-1]); + if(SUCCEEDED(hres)) + hres = SafeArrayRedim(array, &bounds[dim_cnt-1]); } + free(bounds); + return hres; } static HRESULT interp_step(exec_ctx_t *ctx)

1 0

Alexandre Julliard : winedump: Initial support for dumping PE dynamic relocations.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: cd7e86599ef44a306fe493511c6725261a7d5d3b URL: https://gitlab.winehq.org/wine/wine/-/commit/cd7e86599ef44a306fe493511c6725… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 8 12:10:13 2023 +0100 winedump: Initial support for dumping PE dynamic relocations. --- include/winnt.h | 59 +++++++++++++++++++ tools/winedump/main.c | 2 +- tools/winedump/pe.c | 159 ++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 214 insertions(+), 6 deletions(-)

1 0

Alexandre Julliard : gitlab: Force updating configure.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: 42daeba8b8eb58fbe9a12f71ed14672cacc92eaa URL: https://gitlab.winehq.org/wine/wine/-/commit/42daeba8b8eb58fbe9a12f71ed1467… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 8 17:32:19 2023 +0100 gitlab: Force updating configure. --- tools/gitlab/build-linux | 2 +- tools/gitlab/build-mac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/gitlab/build-linux b/tools/gitlab/build-linux index 659ff0a0c17..d77ca9cdb8e 100755 --- a/tools/gitlab/build-linux +++ b/tools/gitlab/build-linux @@ -7,7 +7,7 @@ set -Eeuxo pipefail ./tools/make_requests ./tools/make_makefiles -autoreconf +autoreconf -f cd build64 ../configure -q -C --enable-win64 --enable-werror --with-mingw diff --git a/tools/gitlab/build-mac b/tools/gitlab/build-mac index 20c1054150e..5c37aa6bcc9 100755 --- a/tools/gitlab/build-mac +++ b/tools/gitlab/build-mac @@ -7,7 +7,7 @@ set -Eeuxo pipefail ./tools/make_requests ./tools/make_makefiles -autoreconf +autoreconf -f cd build64 ../configure -C --enable-win64 --with-mingw BISON=/usr/local/opt/bison/bin/bison

1 0

Alex Henrie : ole32: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: da403f0b31636c8dbb8c73ad751cd650c9c14390 URL: https://gitlab.winehq.org/wine/wine/-/commit/da403f0b31636c8dbb8c73ad751cd6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 7 22:07:21 2023 -0700 ole32: Avoid calling RtlInitUnicodeString on a static constant. --- dlls/ole32/compobj.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 8d2591c1211..1eb5dc6e8f5 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -252,7 +252,7 @@ static HKEY create_classes_root_hkey(DWORD access) { HKEY hkey, ret = 0; OBJECT_ATTRIBUTES attr; - UNICODE_STRING name; + UNICODE_STRING name = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\Classes"); attr.Length = sizeof(attr); attr.RootDirectory = 0; @@ -260,7 +260,6 @@ static HKEY create_classes_root_hkey(DWORD access) attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &name, L"\\Registry\\Machine\\Software\\Classes" ); if (create_key( &hkey, access, &attr )) return 0; TRACE( "%s -> %p\n", debugstr_w(attr.ObjectName->Buffer), hkey );

1 0

Zebediah Figura : oleaut32: Manually construct a stub buffer for dispinterfaces.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: bf859fb09bba29ac1fbc9c8d92377399573afc50 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf859fb09bba29ac1fbc9c8d923773… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 16:02:57 2022 -0600 oleaut32: Manually construct a stub buffer for dispinterfaces. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53926 --- dlls/oleaut32/oleaut.c | 114 ++++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/tests/tmarshal.c | 17 +++++- 2 files changed, 127 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 858622c833c..92a9f12661b 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdarg.h> #include <stdio.h> #include <string.h> @@ -34,6 +35,7 @@ #include "ole2.h" #include "olectl.h" #include "oleauto.h" +#include "rpcproxy.h" #include "initguid.h" #include "typelib.h" #include "oleaut32_oaidl.h" @@ -999,6 +1001,114 @@ static HRESULT dispatch_create_stub(IUnknown *server, IRpcStubBuffer **stub) return hr; } +struct dispinterface_stub +{ + CInterfaceStubVtbl stub_vtbl; + CStdStubBuffer stub_buffer; +}; + +static struct dispinterface_stub *impl_from_IRpcStubBuffer(IRpcStubBuffer *iface) +{ + return CONTAINING_RECORD(&iface->lpVtbl, struct dispinterface_stub, stub_buffer.lpVtbl); +} + +static ULONG WINAPI dispinterface_stub_Release(IRpcStubBuffer *iface) +{ + struct dispinterface_stub *stub = impl_from_IRpcStubBuffer(iface); + unsigned int refcount = InterlockedDecrement(&stub->stub_buffer.RefCount); + + TRACE("%p decreasing refcount to %u.\n", stub, refcount); + + if (!refcount) + { + /* Copied from NdrCStdStubBuffer_Release(), but supposedly incorrect + * according to the comment there. */ + IRpcStubBuffer_Disconnect(iface); + + free(stub); + } + return refcount; +} + +extern const ExtendedProxyFileInfo oleaut32_oaidl_ProxyFileInfo; + +static const CInterfaceStubVtbl *find_idispatch_stub_vtbl(void) +{ + CInterfaceStubVtbl *const *vtbl; + + for (vtbl = oleaut32_oaidl_ProxyFileInfo.pStubVtblList; *vtbl; ++vtbl) + { + if (IsEqualGUID((*vtbl)->header.piid, &IID_IDispatch)) + return *vtbl; + } + + assert(0); + return NULL; +} + +/* Normal dispinterfaces have an IID specified by the IDL compiler as DIID_*, + * but are otherwise identical to IDispatch. Unfortunately, such interfaces may + * not actually support IDispatch in QueryInterface. + * + * This becomes a problem, since CreateStub() was designed such that, for some + * reason, the caller need not actually pass the interface matching "iid". As + * such the standard rpcrt4 implementation will query the server for the + * relevant IID. + * + * This means that we cannot just pass IID_IDispatch with the object, even + * though it is in theory an IDispatch. However, while the standard stub + * constructor is not exported from rpcrt4, all of the vtbl methods are, and + * the type is public, so we *can* manually create it ourselves, bypassing the + * QueryInterface check. + * + * This relies on some rpcrt4 implementation details. + */ +static HRESULT dispinterface_create_stub(IUnknown *server, const GUID *iid, IRpcStubBuffer **stub) +{ + const CInterfaceStubVtbl *stub_vtbl = find_idispatch_stub_vtbl(); + struct dispinterface_stub *object; + void *dispatch; + HRESULT hr; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + /* It's possible we can just assume that "server" is already the + * dispinterface type—we don't have tests for this—but since rpcrt4 queries + * (which we do have tests for) it makes sense for us to match that + * behaviour. */ + if (FAILED(hr = IUnknown_QueryInterface(server, iid, &dispatch))) + { + ERR("Object does not support interface %s.\n", debugstr_guid(iid)); + free(object); + return hr; + } + + object->stub_vtbl.header = stub_vtbl->header; + object->stub_vtbl.Vtbl.QueryInterface = CStdStubBuffer_QueryInterface; + object->stub_vtbl.Vtbl.AddRef = CStdStubBuffer_AddRef; + object->stub_vtbl.Vtbl.Release = dispinterface_stub_Release; + object->stub_vtbl.Vtbl.Connect = CStdStubBuffer_Connect; + object->stub_vtbl.Vtbl.Disconnect = CStdStubBuffer_Disconnect; + object->stub_vtbl.Vtbl.Invoke = CStdStubBuffer_Invoke; + object->stub_vtbl.Vtbl.IsIIDSupported = CStdStubBuffer_IsIIDSupported; + object->stub_vtbl.Vtbl.CountRefs = CStdStubBuffer_CountRefs; + object->stub_vtbl.Vtbl.DebugServerQueryInterface = CStdStubBuffer_DebugServerQueryInterface; + object->stub_vtbl.Vtbl.DebugServerRelease = CStdStubBuffer_DebugServerRelease; + object->stub_buffer.lpVtbl = &object->stub_vtbl.Vtbl; + object->stub_buffer.RefCount = 1; + object->stub_buffer.pvServerObject = dispatch; + /* rpcrt4 will also fill pPSFactory, but it never uses it except in the + * Release method (which we reimplement). It's only to keep a reference to + * the module to implement NdrDllCanUnloadNow(). We use the default + * DllCanUnloadNow() from winecrt0, which always returns S_FALSE, so don't + * bother filling pPSFactory. */ + + TRACE("Created stub %p.\n", object); + *stub = (IRpcStubBuffer *)&object->stub_buffer.lpVtbl; + return S_OK; +} + static HRESULT WINAPI dispatch_typelib_ps_CreateStub(IPSFactoryBuffer *iface, REFIID iid, IUnknown *server, IRpcStubBuffer **stub) { @@ -1022,10 +1132,10 @@ static HRESULT WINAPI dispatch_typelib_ps_CreateStub(IPSFactoryBuffer *iface, if (attr->typekind == TKIND_INTERFACE || (attr->wTypeFlags & TYPEFLAG_FDUAL)) hr = CreateStubFromTypeInfo(typeinfo, iid, server, stub); else - hr = dispatch_create_stub(server, stub); + hr = dispinterface_create_stub(server, iid, stub); if (FAILED(hr)) - ERR("Failed to create proxy, hr %#lx.\n", hr); + ERR("Failed to create stub, hr %#lx.\n", hr); ITypeInfo_ReleaseTypeAttr(typeinfo, attr); ITypeInfo_Release(typeinfo); diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 53861870e78..5ffc103c7eb 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -17,6 +17,7 @@ * */ +#include <stdbool.h> #include <math.h> #define COBJMACROS @@ -394,6 +395,7 @@ struct disp_obj { ISomethingFromDispatch ISomethingFromDispatch_iface; LONG ref; + bool support_idispatch; }; static inline struct disp_obj *impl_from_ISomethingFromDispatch(ISomethingFromDispatch *iface) @@ -403,6 +405,11 @@ static inline struct disp_obj *impl_from_ISomethingFromDispatch(ISomethingFromDi static HRESULT WINAPI disp_obj_QueryInterface(ISomethingFromDispatch *iface, REFIID iid, void **out) { + struct disp_obj *obj = impl_from_ISomethingFromDispatch(iface); + + if (!obj->support_idispatch) + ok(!IsEqualGUID(iid, &IID_IDispatch), "Expected no query for IDispatch.\n"); + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IDispatch) || IsEqualGUID(iid, &IID_ISomethingFromDispatch) || IsEqualGUID(iid, &DIID_ItestIF4)) @@ -475,14 +482,20 @@ static const ISomethingFromDispatchVtbl disp_obj_vtbl = disp_obj_anotherfn, }; -static ISomethingFromDispatch *create_disp_obj(void) +static ISomethingFromDispatch *create_disp_obj2(bool support_idispatch) { struct disp_obj *obj = CoTaskMemAlloc(sizeof(*obj)); obj->ISomethingFromDispatch_iface.lpVtbl = &disp_obj_vtbl; obj->ref = 1; + obj->support_idispatch = support_idispatch; return &obj->ISomethingFromDispatch_iface; } +static ISomethingFromDispatch *create_disp_obj(void) +{ + return create_disp_obj2(true); +} + struct coclass_obj { ICoclass1 ICoclass1_iface; @@ -3710,7 +3723,7 @@ static void test_marshal_dispinterface(void) { static const LARGE_INTEGER zero; - ISomethingFromDispatch *disp_obj = create_disp_obj(); + ISomethingFromDispatch *disp_obj = create_disp_obj2(false); ITypeInfo *typeinfo = NULL; IDispatch *proxy_disp; IStream *stream;

1 0