wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Gijs Vermeulen : wmvcore: Move IWMSyncReader implementation to separate file.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 477dc82c4466b073af9a091ecd58dda83b3219ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=477dc82c4466b073af9a091e… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Mar 5 14:19:01 2021 +0100 wmvcore: Move IWMSyncReader implementation to separate file. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/Makefile.in | 1 + dlls/wmvcore/reader.c | 312 ------------------------------------------ dlls/wmvcore/syncreader.c | 337 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 338 insertions(+), 312 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=477dc82c4466b073af9a…

1 0

Francois Gouget : configure: Fix the libsane pkg-config name.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 74c0da2d71e95f3e6bd6c8b440652933771b27d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74c0da2d71e95f3e6bd6c8b4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 5 17:53:31 2021 +0100 configure: Fix the libsane pkg-config name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 12 ++++++------ configure.ac | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 13eecaf05d7..3b5a50cef53 100755 --- a/configure +++ b/configure @@ -2685,8 +2685,8 @@ Some influential environment variables: GNUTLS_CFLAGS C compiler flags for gnutls, overriding pkg-config GNUTLS_LIBS Linker flags for gnutls, overriding pkg-config - SANE_CFLAGS C compiler flags for libsane, overriding pkg-config - SANE_LIBS Linker flags for libsane, overriding pkg-config + SANE_CFLAGS C compiler flags for sane-backends, overriding pkg-config + SANE_LIBS Linker flags for sane-backends, overriding pkg-config USB_CFLAGS C compiler flags for libusb-1.0, overriding pkg-config USB_LIBS Linker flags for libusb-1.0, overriding pkg-config GPHOTO2_CFLAGS @@ -13684,19 +13684,19 @@ if test "x$with_sane" != "xno" then if ${SANE_CFLAGS:+false} :; then : if ${PKG_CONFIG+:} false; then : - SANE_CFLAGS=`$PKG_CONFIG --cflags libsane 2>/dev/null` + SANE_CFLAGS=`$PKG_CONFIG --cflags sane-backends 2>/dev/null` fi fi test "$cross_compiling" = yes || SANE_CFLAGS=${SANE_CFLAGS:-`${SANE_CONFIG:-sane-config} --cflags 2>/dev/null`} if ${SANE_LIBS:+false} :; then : if ${PKG_CONFIG+:} false; then : - SANE_LIBS=`$PKG_CONFIG --libs libsane 2>/dev/null` + SANE_LIBS=`$PKG_CONFIG --libs sane-backends 2>/dev/null` fi fi test "$cross_compiling" = yes || SANE_LIBS=${SANE_LIBS:-`${SANE_CONFIG:-sane-config} --ldflags 2>/dev/null`} -$as_echo "$as_me:${as_lineno-$LINENO}: libsane cflags: $SANE_CFLAGS" >&5 -$as_echo "$as_me:${as_lineno-$LINENO}: libsane libs: $SANE_LIBS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: sane-backends cflags: $SANE_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: sane-backends libs: $SANE_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $SANE_CFLAGS" ac_fn_c_check_header_mongrel "$LINENO" "sane/sane.h" "ac_cv_header_sane_sane_h" "$ac_includes_default" diff --git a/configure.ac b/configure.ac index 6a4e9568c40..8ed3b0c2669 100644 --- a/configure.ac +++ b/configure.ac @@ -1435,7 +1435,7 @@ WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], dnl **** Check for SANE **** if test "x$with_sane" != "xno" then - WINE_PACKAGE_FLAGS(SANE,[libsane],,[`${SANE_CONFIG:-sane-config} --cflags 2>/dev/null`],[`${SANE_CONFIG:-sane-config} --ldflags 2>/dev/null`], + WINE_PACKAGE_FLAGS(SANE,[sane-backends],,[`${SANE_CONFIG:-sane-config} --cflags 2>/dev/null`],[`${SANE_CONFIG:-sane-config} --ldflags 2>/dev/null`], [AC_CHECK_HEADER(sane/sane.h, [WINE_CHECK_SONAME(sane,sane_init,,[SANE_CFLAGS=""],[$SANE_LIBS])], [SANE_CFLAGS=""])])

1 0

Giovanni Mascellani : d2d1: Implement D2D1ConvertColorSpace().
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 2cb681e740f9c95d4bb806e8986c5db9c8809b94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cb681e740f9c95d4bb806e8… Author: Giovanni Mascellani <wine(a)mascellani.eu> Date: Fri Mar 5 16:40:09 2021 +0100 d2d1: Implement D2D1ConvertColorSpace(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/d2d1_private.h | 7 ++++ dlls/d2d1/factory.c | 77 +++++++++++++++++++++++++++++++++++ dlls/d2d1/tests/d2d1.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++ include/d2d1_1.idl | 2 + 5 files changed, 189 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2cb681e740f9c95d4bb8…

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 12a890329a3d387a9086c4d041fe0c9e50674d66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12a890329a3d387a9086c4d0… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Fri Mar 5 11:56:37 2021 +0100 po: Update Dutch translation. Add aclui translation and fix typo in winecfg Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/po/nl.po b/po/nl.po index 7f33637cf23..9ada91f8700 100644 --- a/po/nl.po +++ b/po/nl.po @@ -19,26 +19,20 @@ msgid "Security" msgstr "Beveiliging" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Gebruikersnaam:" +msgstr "&Groeps- of gebruikersnamen:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Geel" +msgstr "Toestaan" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Weigeren" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "Toegang geweigerd" +msgstr "Rechten voor %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -16169,7 +16163,7 @@ msgid "" "or per-application settings in those tabs as well." msgstr "" "Voor elk programma kan Wine apart de Windows versie instellen. Dit tabblad " -"isgekoppeld aan de tabbladen 'Bibliotheken' en 'Grafisch'. Hierdoor kan per " +"is gekoppeld aan de tabbladen 'Bibliotheken' en 'Grafisch'. Hierdoor kan per " "programma de standaardinstellingen of programmaspecifieke instellingen " "gebruikt worden."

1 0

Hans Leidekker : wbemprox: Make system restore naming consistent with the other method implementations.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 65c0f308ba1528a3d27f3803e0b9fda09aac56fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=65c0f308ba1528a3d27f3803… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 11:22:59 2021 +0100 wbemprox: Make system restore naming consistent with the other method implementations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 ++- dlls/wbemprox/sysrestore.c | 10 +++++----- dlls/wbemprox/wbemprox_private.h | 10 +++++----- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ddec2a0daf8..dbf9173d21d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -962,7 +962,8 @@ static const struct record_stdregprov data_stdregprov[] = static const struct record_sysrestore data_sysrestore[] = { - { NULL, NULL, 0, 0, 0, create_restore_point, disable_restore, enable_restore, get_last_restore_status, restore } + { NULL, NULL, 0, 0, 0, sysrestore_create, sysrestore_disable, sysrestore_enable, sysrestore_get_last_status, + sysrestore_restore } }; static UINT16 systemenclosure_chassistypes[] = diff --git a/dlls/wbemprox/sysrestore.c b/dlls/wbemprox/sysrestore.c index 80950c675bd..f84d9625ae4 100644 --- a/dlls/wbemprox/sysrestore.c +++ b/dlls/wbemprox/sysrestore.c @@ -31,19 +31,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); -HRESULT create_restore_point( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) +HRESULT sysrestore_create( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) { FIXME("stub\n"); return S_OK; } -HRESULT disable_restore( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) +HRESULT sysrestore_disable( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) { FIXME("stub\n"); return S_OK; } -HRESULT enable_restore( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) +HRESULT sysrestore_enable( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) { VARIANT drive, retval; IWbemClassObject *sig, *out_params = NULL; @@ -93,13 +93,13 @@ HRESULT enable_restore( IWbemClassObject *obj, IWbemContext *context, IWbemClass return hr; } -HRESULT get_last_restore_status( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) +HRESULT sysrestore_get_last_status( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) { FIXME("stub\n"); return E_NOTIMPL; } -HRESULT restore( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) +HRESULT sysrestore_restore( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) { FIXME("stub\n"); return S_OK; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 5ccbed18023..fec67f47e1b 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -258,11 +258,11 @@ HRESULT service_start_service(IWbemClassObject *obj, IWbemContext *context, IWbe HRESULT service_stop_service(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; HRESULT security_get_sd(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; HRESULT security_set_sd(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; -HRESULT create_restore_point(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; -HRESULT disable_restore(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; -HRESULT enable_restore(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; -HRESULT get_last_restore_status(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; -HRESULT restore(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; +HRESULT sysrestore_create(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; +HRESULT sysrestore_disable(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; +HRESULT sysrestore_enable(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; +HRESULT sysrestore_get_last_status(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; +HRESULT sysrestore_restore(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW( const WCHAR *src ) {

1 0

Hans Leidekker : wbemprox: Trace the context parameter in method implementations.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 51e49a5eeb62ae30189de75dbef53562c3753ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51e49a5eeb62ae30189de75d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 11:22:58 2021 +0100 wbemprox: Trace the context parameter in method implementations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/process.c | 2 +- dlls/wbemprox/reg.c | 14 +++++++------- dlls/wbemprox/security.c | 2 +- dlls/wbemprox/service.c | 8 ++++---- dlls/wbemprox/sysrestore.c | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wbemprox/process.c b/dlls/wbemprox/process.c index a9057daa384..2f11530da2f 100644 --- a/dlls/wbemprox/process.c +++ b/dlls/wbemprox/process.c @@ -68,7 +68,7 @@ HRESULT process_get_owner( IWbemClassObject *obj, IWbemContext *context, IWbemCl IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p, %p\n", obj, in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = create_signature( L"Win32_Process", L"GetOwner", PARAM_OUT, &sig ); if (hr != S_OK) return hr; diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index e5a45b1b600..5cdd857a48f 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -122,7 +122,7 @@ HRESULT reg_create_key( IWbemClassObject *obj, IWbemContext *context, IWbemClass IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; @@ -221,7 +221,7 @@ HRESULT reg_enum_key( IWbemClassObject *obj, IWbemContext *context, IWbemClassOb IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; @@ -332,7 +332,7 @@ HRESULT reg_enum_values( IWbemClassObject *obj, IWbemContext *context, IWbemClas IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; @@ -423,7 +423,7 @@ HRESULT reg_get_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbem IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; @@ -505,7 +505,7 @@ HRESULT reg_set_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbem IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; @@ -588,7 +588,7 @@ HRESULT reg_set_dwordvalue( IWbemClassObject *obj, IWbemContext *context, IWbemC IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; @@ -658,7 +658,7 @@ HRESULT reg_delete_key( IWbemClassObject *obj, IWbemContext *context, IWbemClass IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; diff --git a/dlls/wbemprox/security.c b/dlls/wbemprox/security.c index 82e45060714..eee8b09369e 100644 --- a/dlls/wbemprox/security.c +++ b/dlls/wbemprox/security.c @@ -138,7 +138,7 @@ HRESULT security_get_sd( IWbemClassObject *obj, IWbemContext *context, IWbemClas SECURITY_DESCRIPTOR *sd; DWORD sd_size; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = create_signature( L"__SystemSecurity", L"GetSD", PARAM_OUT, &sig ); diff --git a/dlls/wbemprox/service.c b/dlls/wbemprox/service.c index 4c909713dc3..1ee0c9903ec 100644 --- a/dlls/wbemprox/service.c +++ b/dlls/wbemprox/service.c @@ -82,7 +82,7 @@ HRESULT service_pause_service( IWbemClassObject *obj, IWbemContext *context, IWb IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p, %p\n", obj, in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( obj, L"Name", 0, &name, NULL, NULL ); if (hr != S_OK) return hr; @@ -127,7 +127,7 @@ HRESULT service_resume_service( IWbemClassObject *obj, IWbemContext *context, IW IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p, %p\n", obj, in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( obj, L"Name", 0, &name, NULL, NULL ); if (hr != S_OK) return hr; @@ -196,7 +196,7 @@ HRESULT service_start_service( IWbemClassObject *obj, IWbemContext *context, IWb IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p, %p\n", obj, in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( obj, L"Name", 0, &name, NULL, NULL ); if (hr != S_OK) return hr; @@ -241,7 +241,7 @@ HRESULT service_stop_service( IWbemClassObject *obj, IWbemContext *context, IWbe IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p, %p\n", obj, in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( obj, L"Name", 0, &name, NULL, NULL ); if (hr != S_OK) return hr; diff --git a/dlls/wbemprox/sysrestore.c b/dlls/wbemprox/sysrestore.c index 8092dd7227e..80950c675bd 100644 --- a/dlls/wbemprox/sysrestore.c +++ b/dlls/wbemprox/sysrestore.c @@ -49,7 +49,7 @@ HRESULT enable_restore( IWbemClassObject *obj, IWbemContext *context, IWbemClass IWbemClassObject *sig, *out_params = NULL; HRESULT hr; - TRACE("%p, %p\n", in, out); + TRACE("%p, %p, %p, %p\n", obj, context, in, out); hr = IWbemClassObject_Get( in, L"Drive", 0, &drive, NULL, NULL ); if (hr != S_OK) return hr;

1 0

Hans Leidekker : wbemprox: Fix memory leaks on error paths.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 8c528d8d315afb3c0ebdc5149e3b6b41068286b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c528d8d315afb3c0ebdc514… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 11:22:57 2021 +0100 wbemprox: Fix memory leaks on error paths. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/reg.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index edcdb1902f1..e5a45b1b600 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -430,7 +430,11 @@ HRESULT reg_get_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbem hr = IWbemClassObject_Get( in, L"sSubKeyName", 0, &subkey, NULL, NULL ); if (hr != S_OK) return hr; hr = IWbemClassObject_Get( in, L"sValueName", 0, &name, NULL, NULL ); - if (hr != S_OK) return hr; + if (hr != S_OK) + { + VariantClear( &subkey ); + return hr; + } hr = create_signature( L"StdRegProv", L"GetStringValue", PARAM_OUT, &sig ); if (hr != S_OK) @@ -508,9 +512,18 @@ HRESULT reg_set_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbem hr = IWbemClassObject_Get( in, L"sSubKeyName", 0, &subkey, NULL, NULL ); if (hr != S_OK) return hr; hr = IWbemClassObject_Get( in, L"sValueName", 0, &name, NULL, NULL ); - if (hr != S_OK) return hr; + if (hr != S_OK) + { + VariantClear( &subkey ); + return hr; + } hr = IWbemClassObject_Get( in, L"sValue", 0, &value, NULL, NULL ); - if (hr != S_OK) return hr; + if (hr != S_OK) + { + VariantClear( &name ); + VariantClear( &subkey ); + return hr; + } hr = create_signature( L"StdRegProv", L"SetStringValue", PARAM_OUT, &sig ); if (hr != S_OK) @@ -582,9 +595,18 @@ HRESULT reg_set_dwordvalue( IWbemClassObject *obj, IWbemContext *context, IWbemC hr = IWbemClassObject_Get( in, L"sSubKeyName", 0, &subkey, NULL, NULL ); if (hr != S_OK) return hr; hr = IWbemClassObject_Get( in, L"sValueName", 0, &name, NULL, NULL ); - if (hr != S_OK) return hr; + if (hr != S_OK) + { + VariantClear( &subkey ); + return hr; + } hr = IWbemClassObject_Get( in, L"uValue", 0, &value, NULL, NULL ); - if (hr != S_OK) return hr; + if (hr != S_OK) + { + VariantClear( &name ); + VariantClear( &subkey ); + return hr; + } hr = create_signature( L"StdRegProv", L"SetDWORDValue", PARAM_OUT, &sig ); if (hr != S_OK)

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_shader().
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: eda716682b47d7716a9d530255916fa3c674d841 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eda716682b47d7716a9d5302… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 21:29:50 2021 -0600 wined3d: Introduce wined3d_device_context_set_shader(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 86 ++++++++++-------------------------------- dlls/wined3d/wined3d.spec | 2 + dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.h | 4 ++ 4 files changed, 25 insertions(+), 68 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e6ac3621d4e..06329293261 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2081,25 +2081,33 @@ struct wined3d_vertex_declaration * CDECL wined3d_device_get_vertex_declaration( return device->cs->c.state->vertex_declaration; } -void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) +void CDECL wined3d_device_context_set_shader(struct wined3d_device_context *context, + enum wined3d_shader_type type, struct wined3d_shader *shader) { - struct wined3d_state *state = device->cs->c.state; + struct wined3d_state *state = context->state; struct wined3d_shader *prev; - TRACE("device %p, shader %p.\n", device, shader); + TRACE("context %p, type %#x, shader %p.\n", context, type, shader); - prev = state->shader[WINED3D_SHADER_TYPE_VERTEX]; + prev = state->shader[type]; if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - state->shader[WINED3D_SHADER_TYPE_VERTEX] = shader; - wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_VERTEX, shader); + state->shader[type] = shader; + wined3d_device_context_emit_set_shader(context, type, shader); if (prev) wined3d_shader_decref(prev); } +void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) +{ + TRACE("device %p, shader %p.\n", device, shader); + + return wined3d_device_context_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_VERTEX, shader); +} + struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wined3d_device *device) { TRACE("device %p.\n", device); @@ -2321,21 +2329,9 @@ static void wined3d_device_set_vs_consts_f(struct wined3d_device *device, void CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_state *state = device->cs->c.state; - struct wined3d_shader *prev; - TRACE("device %p, shader %p.\n", device, shader); - prev = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - if (shader == prev) - return; - - if (shader) - wined3d_shader_incref(shader); - state->shader[WINED3D_SHADER_TYPE_PIXEL] = shader; - wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_PIXEL, shader); - if (prev) - wined3d_shader_decref(prev); + return wined3d_device_context_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_PIXEL, shader); } struct wined3d_shader * CDECL wined3d_device_get_pixel_shader(const struct wined3d_device *device) @@ -2431,20 +2427,9 @@ static void wined3d_device_set_ps_consts_f(struct wined3d_device *device, void CDECL wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_state *state = device->cs->c.state; - struct wined3d_shader *prev; - TRACE("device %p, shader %p.\n", device, shader); - prev = state->shader[WINED3D_SHADER_TYPE_HULL]; - if (shader == prev) - return; - if (shader) - wined3d_shader_incref(shader); - state->shader[WINED3D_SHADER_TYPE_HULL] = shader; - wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_HULL, shader); - if (prev) - wined3d_shader_decref(prev); + return wined3d_device_context_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_HULL, shader); } struct wined3d_shader * CDECL wined3d_device_get_hull_shader(const struct wined3d_device *device) @@ -2487,20 +2472,9 @@ struct wined3d_sampler * CDECL wined3d_device_get_hs_sampler(const struct wined3 void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_state *state = device->cs->c.state; - struct wined3d_shader *prev; - TRACE("device %p, shader %p.\n", device, shader); - prev = state->shader[WINED3D_SHADER_TYPE_DOMAIN]; - if (shader == prev) - return; - if (shader) - wined3d_shader_incref(shader); - state->shader[WINED3D_SHADER_TYPE_DOMAIN] = shader; - wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_DOMAIN, shader); - if (prev) - wined3d_shader_decref(prev); + return wined3d_device_context_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_DOMAIN, shader); } struct wined3d_shader * CDECL wined3d_device_get_domain_shader(const struct wined3d_device *device) @@ -2543,20 +2517,9 @@ struct wined3d_sampler * CDECL wined3d_device_get_ds_sampler(const struct wined3 void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_state *state = device->cs->c.state; - struct wined3d_shader *prev; - TRACE("device %p, shader %p.\n", device, shader); - prev = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; - if (shader == prev) - return; - if (shader) - wined3d_shader_incref(shader); - state->shader[WINED3D_SHADER_TYPE_GEOMETRY] = shader; - wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_GEOMETRY, shader); - if (prev) - wined3d_shader_decref(prev); + return wined3d_device_context_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_GEOMETRY, shader); } struct wined3d_shader * CDECL wined3d_device_get_geometry_shader(const struct wined3d_device *device) @@ -2598,20 +2561,9 @@ struct wined3d_sampler * CDECL wined3d_device_get_gs_sampler(const struct wined3 void CDECL wined3d_device_set_compute_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_state *state = device->cs->c.state; - struct wined3d_shader *prev; - TRACE("device %p, shader %p.\n", device, shader); - prev = state->shader[WINED3D_SHADER_TYPE_COMPUTE]; - if (shader == prev) - return; - if (shader) - wined3d_shader_incref(shader); - state->shader[WINED3D_SHADER_TYPE_COMPUTE] = shader; - wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_COMPUTE, shader); - if (prev) - wined3d_shader_decref(prev); + return wined3d_device_context_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_COMPUTE, shader); } struct wined3d_shader * CDECL wined3d_device_get_compute_shader(const struct wined3d_device *device) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6b6480cec8f..f1d477af703 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -166,6 +166,8 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) +@ cdecl wined3d_device_context_set_shader(ptr long ptr) + @ cdecl wined3d_output_find_closest_matching_mode(ptr ptr) @ cdecl wined3d_output_get_adapter(ptr) @ cdecl wined3d_output_get_desc(ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a16da66b309..ee00530981c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -89,7 +89,6 @@ struct wined3d_adapter; struct wined3d_buffer_vk; struct wined3d_context; struct wined3d_context_vk; -struct wined3d_device_context; struct wined3d_gl_info; struct wined3d_state; struct wined3d_swapchain_gl; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0d67e8c89d1..030e3fdcb67 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2214,6 +2214,7 @@ struct wined3d_blend_state; struct wined3d_buffer; struct wined3d_depth_stencil_state; struct wined3d_device; +struct wined3d_device_context; struct wined3d_output; struct wined3d_palette; struct wined3d_query; @@ -2547,6 +2548,9 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); +void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *context, + enum wined3d_shader_type type, struct wined3d_shader *shader); + HRESULT __cdecl wined3d_output_find_closest_matching_mode(const struct wined3d_output *output, struct wined3d_display_mode *mode); struct wined3d_adapter * __cdecl wined3d_output_get_adapter(const struct wined3d_output *output);

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_shader().
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: f1842d5ba44c9309b015275b0f599f7be7d99cf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1842d5ba44c9309b015275b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 21:29:49 2021 -0600 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_shader(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 ++++--- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d67582116b0..5176c635cf5 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1622,16 +1622,17 @@ static void wined3d_cs_exec_set_shader(struct wined3d_cs *cs, const void *data) device_invalidate_state(cs->c.device, STATE_COMPUTE_SHADER_RESOURCE_BINDING); } -void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type type, struct wined3d_shader *shader) +void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, + enum wined3d_shader_type type, struct wined3d_shader *shader) { struct wined3d_cs_set_shader *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_SHADER; op->type = type; op->shader = shader; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_blend_state(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f4811e26018..e6ac3621d4e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1959,7 +1959,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) { - wined3d_cs_emit_set_shader(device->cs, i, state->shader[i]); + wined3d_device_context_emit_set_shader(&device->cs->c, i, state->shader[i]); for (j = 0; j < MAX_CONSTANT_BUFFERS; ++j) { wined3d_cs_emit_set_constant_buffer(device->cs, i, j, state->cb[i][j]); @@ -2095,7 +2095,7 @@ void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struc if (shader) wined3d_shader_incref(shader); state->shader[WINED3D_SHADER_TYPE_VERTEX] = shader; - wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_VERTEX, shader); + wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_VERTEX, shader); if (prev) wined3d_shader_decref(prev); } @@ -2333,7 +2333,7 @@ void CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct if (shader) wined3d_shader_incref(shader); state->shader[WINED3D_SHADER_TYPE_PIXEL] = shader; - wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_PIXEL, shader); + wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_PIXEL, shader); if (prev) wined3d_shader_decref(prev); } @@ -2442,7 +2442,7 @@ void CDECL wined3d_device_set_hull_shader(struct wined3d_device *device, struct if (shader) wined3d_shader_incref(shader); state->shader[WINED3D_SHADER_TYPE_HULL] = shader; - wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_HULL, shader); + wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_HULL, shader); if (prev) wined3d_shader_decref(prev); } @@ -2498,7 +2498,7 @@ void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struc if (shader) wined3d_shader_incref(shader); state->shader[WINED3D_SHADER_TYPE_DOMAIN] = shader; - wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_DOMAIN, shader); + wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_DOMAIN, shader); if (prev) wined3d_shader_decref(prev); } @@ -2554,7 +2554,7 @@ void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, str if (shader) wined3d_shader_incref(shader); state->shader[WINED3D_SHADER_TYPE_GEOMETRY] = shader; - wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_GEOMETRY, shader); + wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_GEOMETRY, shader); if (prev) wined3d_shader_decref(prev); } @@ -2609,7 +2609,7 @@ void CDECL wined3d_device_set_compute_shader(struct wined3d_device *device, stru if (shader) wined3d_shader_incref(shader); state->shader[WINED3D_SHADER_TYPE_COMPUTE] = shader; - wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_COMPUTE, shader); + wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_COMPUTE, shader); if (prev) wined3d_shader_decref(prev); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 66757b30a16..a16da66b309 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4774,8 +4774,6 @@ void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_count, const RECT *rects) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type type, - struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, @@ -4815,6 +4813,9 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d cs->c.ops->push_constants(&cs->c, p, start_idx, count, constants); } +void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, + struct wined3d_shader *shader) DECLSPEC_HIDDEN; + static inline void wined3d_resource_wait_idle(struct wined3d_resource *resource) { const struct wined3d_cs *cs = resource->device->cs;

1 0

Zebediah Figura : wined3d: Move the "state" field from struct wined3d_device to struct wined3d_device_context.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 94607a1598bc2ed2f74566f9eb9c56043dbd0116 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94607a1598bc2ed2f74566f9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 21:29:48 2021 -0600 wined3d: Move the "state" field from struct wined3d_device to struct wined3d_device_context. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 18 ++-- dlls/wined3d/device.c | 189 +++++++++++++++++++---------------------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 103 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94607a1598bc2ed2f745…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021