- Wine-Commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for HTMLTxtRange.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: 1904dd0be3261ce2f0c0b7ef93053d9e735aa145 URL: https://gitlab.winehq.org/wine/wine/-/commit/1904dd0be3261ce2f0c0b7ef93053d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Aug 3 15:56:12 2023 +0300 mshtml: Use unlink and destructor in the vtbl for HTMLTxtRange. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/range.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index d55851ac87e..562dbf35b49 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -855,14 +855,8 @@ static ULONG WINAPI HTMLTxtRange_Release(IHTMLTxtRange *iface) TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - if(This->nsrange) - nsIDOMRange_Release(This->nsrange); - if(This->doc) - list_remove(&This->entry); + if(!ref) release_dispex(&This->dispex); - free(This); - } return ref; } @@ -1718,13 +1712,39 @@ static const IOleCommandTargetVtbl OleCommandTargetVtbl = { RangeCommandTarget_Exec }; +static inline HTMLTxtRange *HTMLTxtRange_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLTxtRange, dispex); +} + +static void HTMLTxtRange_unlink(DispatchEx *dispex) +{ + HTMLTxtRange *This = HTMLTxtRange_from_DispatchEx(dispex); + unlink_ref(&This->nsrange); + if(This->doc) { + This->doc = NULL; + list_remove(&This->entry); + } +} + +static void HTMLTxtRange_destructor(DispatchEx *dispex) +{ + HTMLTxtRange *This = HTMLTxtRange_from_DispatchEx(dispex); + free(This); +} + +static const dispex_static_data_vtbl_t HTMLTxtRange_dispex_vtbl = { + HTMLTxtRange_destructor, + HTMLTxtRange_unlink +}; + static const tid_t HTMLTxtRange_iface_tids[] = { IHTMLTxtRange_tid, 0 }; static dispex_static_data_t HTMLTxtRange_dispex = { L"TextRange", - NULL, + &HTMLTxtRange_dispex_vtbl, IHTMLTxtRange_tid, HTMLTxtRange_iface_tids };

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for HTMLDOMAttribute.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: 62d39e86b3ea70a066ba96b19fb3b7d639f5adf9 URL: https://gitlab.winehq.org/wine/wine/-/commit/62d39e86b3ea70a066ba96b19fb3b7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Aug 3 15:56:12 2023 +0300 mshtml: Use unlink and destructor in the vtbl for HTMLDOMAttribute. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlattr.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index b7e40a23d55..c99e39a47bd 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -79,13 +79,8 @@ static ULONG WINAPI HTMLDOMAttribute_Release(IHTMLDOMAttribute *iface) TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - assert(!This->elem); + if(!ref) release_dispex(&This->dispex); - VariantClear(&This->value); - free(This->name); - free(This); - } return ref; } @@ -480,6 +475,31 @@ static const IHTMLDOMAttribute2Vtbl HTMLDOMAttribute2Vtbl = { HTMLDOMAttribute2_cloneNode }; +static inline HTMLDOMAttribute *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMAttribute, dispex); +} + +static void HTMLDOMAttribute_unlink(DispatchEx *dispex) +{ + HTMLDOMAttribute *This = impl_from_DispatchEx(dispex); + unlink_variant(&This->value); +} + +static void HTMLDOMAttribute_destructor(DispatchEx *dispex) +{ + HTMLDOMAttribute *This = impl_from_DispatchEx(dispex); + assert(!This->elem); + VariantClear(&This->value); + free(This->name); + free(This); +} + +static const dispex_static_data_vtbl_t HTMLDOMAttribute_dispex_vtbl = { + HTMLDOMAttribute_destructor, + HTMLDOMAttribute_unlink +}; + static const tid_t HTMLDOMAttribute_iface_tids[] = { IHTMLDOMAttribute_tid, IHTMLDOMAttribute2_tid, @@ -487,7 +507,7 @@ static const tid_t HTMLDOMAttribute_iface_tids[] = { }; static dispex_static_data_t HTMLDOMAttribute_dispex = { L"Attr", - NULL, + &HTMLDOMAttribute_dispex_vtbl, DispHTMLDOMAttribute_tid, HTMLDOMAttribute_iface_tids };

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for HTMLSelectionObject.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: 159b6d75d0e293d9b1cb1ef546252946ec4acb38 URL: https://gitlab.winehq.org/wine/wine/-/commit/159b6d75d0e293d9b1cb1ef5462529… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Aug 3 15:56:12 2023 +0300 mshtml: Use unlink and destructor in the vtbl for HTMLSelectionObject. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/selection.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 03a330d3f30..cc9c0acece6 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -93,14 +93,8 @@ static ULONG WINAPI HTMLSelectionObject_Release(IHTMLSelectionObject *iface) TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - if(This->nsselection) - nsISelection_Release(This->nsselection); - if(This->doc) - list_remove(&This->entry); + if(!ref) release_dispex(&This->dispex); - free(This); - } return ref; } @@ -329,6 +323,32 @@ static const IHTMLSelectionObject2Vtbl HTMLSelectionObject2Vtbl = { HTMLSelectionObject2_get_typeDetail }; +static inline HTMLSelectionObject *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLSelectionObject, dispex); +} + +static void HTMLSelectionObject_unlink(DispatchEx *dispex) +{ + HTMLSelectionObject *This = impl_from_DispatchEx(dispex); + unlink_ref(&This->nsselection); + if(This->doc) { + This->doc = NULL; + list_remove(&This->entry); + } +} + +static void HTMLSelectionObject_destructor(DispatchEx *dispex) +{ + HTMLSelectionObject *This = impl_from_DispatchEx(dispex); + free(This); +} + +static const dispex_static_data_vtbl_t HTMLSelectionObject_dispex_vtbl = { + HTMLSelectionObject_destructor, + HTMLSelectionObject_unlink +}; + static const tid_t HTMLSelectionObject_iface_tids[] = { IHTMLSelectionObject_tid, IHTMLSelectionObject2_tid, @@ -336,7 +356,7 @@ static const tid_t HTMLSelectionObject_iface_tids[] = { }; static dispex_static_data_t HTMLSelectionObject_dispex = { L"MSSelection", - NULL, + &HTMLSelectionObject_dispex_vtbl, IHTMLSelectionObject_tid, /* FIXME: We have a test for that, but it doesn't expose IHTMLSelectionObject2 iface. */ HTMLSelectionObject_iface_tids };

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for HTMLStorage.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: 9541020f16eca589fb147c52bc59a1cad2e1dc2b URL: https://gitlab.winehq.org/wine/wine/-/commit/9541020f16eca589fb147c52bc59a1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Aug 3 15:56:12 2023 +0300 mshtml: Use unlink and destructor in the vtbl for HTMLStorage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index da97809177b..cad2b2dbd32 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -397,14 +397,8 @@ static ULONG WINAPI HTMLStorage_Release(IHTMLStorage *iface) TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - release_session_map_entry(This->session_storage); + if(!ref) release_dispex(&This->dispex); - free(This->filename); - CloseHandle(This->mutex); - release_props(This); - free(This); - } return ref; } @@ -1063,6 +1057,16 @@ static inline HTMLStorage *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLStorage, dispex); } +static void HTMLStorage_destructor(DispatchEx *dispex) +{ + HTMLStorage *This = impl_from_DispatchEx(dispex); + release_session_map_entry(This->session_storage); + free(This->filename); + CloseHandle(This->mutex); + release_props(This); + free(This); +} + static HRESULT check_item(HTMLStorage *This, const WCHAR *key) { struct session_entry *session_entry; @@ -1308,7 +1312,7 @@ static HRESULT HTMLStorage_next_dispid(DispatchEx *dispex, DISPID id, DISPID *pi } static const dispex_static_data_vtbl_t HTMLStorage_dispex_vtbl = { - NULL, + HTMLStorage_destructor, NULL, NULL, HTMLStorage_get_dispid,

1 0

Hans Leidekker : secur32: Also copy user function tables in nego_SpInitLsaModeContext() and nego_SpAcceptLsaModeContext().
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: ff5db66c43015468c616e58b127fb09000038212 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff5db66c43015468c616e58b127fb0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 4 10:23:24 2023 +0200 secur32: Also copy user function tables in nego_SpInitLsaModeContext() and nego_SpAcceptLsaModeContext(). --- dlls/secur32/negotiate.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index 323d14e9eaa..0f7d047dd60 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -225,6 +225,8 @@ static NTSTATUS NTAPI nego_SpInitLsaModeContext( LSA_SEC_HANDLE credential, LSA_ if (!(new_ctxt = ctxt = calloc( 1, sizeof(*ctxt) ))) return SEC_E_INSUFFICIENT_MEMORY; ctxt->krb = cred->krb; ctxt->ntlm = cred->ntlm; + ctxt->user_krb = cred->user_krb; + ctxt->user_ntlm = cred->user_ntlm; } if (!handle) return SEC_E_INVALID_HANDLE; @@ -278,6 +280,8 @@ static NTSTATUS NTAPI nego_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential, LS if (!(new_ctxt = ctxt = calloc( 1, sizeof(*ctxt) ))) return SEC_E_INSUFFICIENT_MEMORY; ctxt->krb = cred->krb; ctxt->ntlm = cred->ntlm; + ctxt->user_krb = cred->user_krb; + ctxt->user_ntlm = cred->user_ntlm; } if (!handle) return SEC_E_INVALID_HANDLE;

1 0

Gabriel Ivăncescu : mshtml: Unlink variants using a helper function.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: 392a15cdc9b6797c64c54126acb72ea932b6d41e URL: https://gitlab.winehq.org/wine/wine/-/commit/392a15cdc9b6797c64c54126acb72e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Aug 3 15:56:12 2023 +0300 mshtml: Unlink variants using a helper function. And move the clear to the destructor. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 2 +- dlls/mshtml/htmlevent.c | 18 ++++++++++++++++-- dlls/mshtml/htmlwindow.c | 4 +++- dlls/mshtml/mshtml_private.h | 6 ++++++ 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 09782fb83c9..6bd2c9cf6cb 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -2030,8 +2030,8 @@ void dispex_unlink(DispatchEx *This) return; for(prop = This->dynamic_data->props; prop < This->dynamic_data->props + This->dynamic_data->prop_cnt; prop++) { - VariantClear(&prop->var); prop->flags |= DYNPROP_DELETED; + unlink_variant(&prop->var); } if(This->dynamic_data->func_disps) { diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 2c518464246..6b5ea716a75 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2462,7 +2462,14 @@ static void DOMCustomEvent_unlink(DispatchEx *dispex) { DOMCustomEvent *custom_event = DOMCustomEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); DOMEvent_unlink(&custom_event->event.dispex); + unlink_variant(&custom_event->detail); +} + +static void DOMCustomEvent_destructor(DispatchEx *dispex) +{ + DOMCustomEvent *custom_event = DOMCustomEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); VariantClear(&custom_event->detail); + DOMEvent_destructor(dispex); } typedef struct { @@ -2607,7 +2614,14 @@ static void DOMMessageEvent_unlink(DispatchEx *dispex) { DOMMessageEvent *message_event = DOMMessageEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); DOMEvent_unlink(&message_event->event.dispex); + unlink_variant(&message_event->data); +} + +static void DOMMessageEvent_destructor(DispatchEx *dispex) +{ + DOMMessageEvent *message_event = DOMMessageEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); VariantClear(&message_event->data); + DOMEvent_destructor(dispex); } static void DOMMessageEvent_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) @@ -3038,7 +3052,7 @@ static dispex_static_data_t DOMPageTransitionEvent_dispex = { }; static const dispex_static_data_vtbl_t DOMCustomEvent_dispex_vtbl = { - DOMEvent_destructor, + DOMCustomEvent_destructor, DOMCustomEvent_unlink }; @@ -3056,7 +3070,7 @@ static dispex_static_data_t DOMCustomEvent_dispex = { }; static const dispex_static_data_vtbl_t DOMMessageEvent_dispex_vtbl = { - DOMEvent_destructor, + DOMMessageEvent_destructor, DOMMessageEvent_unlink }; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9ebea7f8b57..a90a0da2dde 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3777,7 +3777,7 @@ static void HTMLWindow_unlink(DispatchEx *dispex) IHTMLStorage_Release(local_storage); } IHTMLPerformanceTiming_Release(&This->performance_timing->IHTMLPerformanceTiming_iface); - VariantClear(&This->performance); + unlink_variant(&This->performance); } static void HTMLWindow_destructor(DispatchEx *dispex) @@ -3785,6 +3785,8 @@ static void HTMLWindow_destructor(DispatchEx *dispex) HTMLInnerWindow *This = impl_from_DispatchEx(dispex); unsigned i; + VariantClear(&This->performance); + for(i = 0; i < This->global_prop_cnt; i++) free(This->global_props[i].name); free(This->global_props); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ff6294749cd..6d57a314870 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1497,6 +1497,12 @@ static inline void unlink_ref(void *p) } } +static inline void unlink_variant(VARIANT *v) +{ + if(V_VT(v) == VT_DISPATCH || V_VT(v) == VT_UNKNOWN) + unlink_ref(&V_UNKNOWN(v)); +} + #ifdef __i386__ extern void *call_thiscall_func; #endif

1 0

Ilia Docin : sane.ds: Add array of resolutions support.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: b43ba81e17ef7b191af30948842596fca54559a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/b43ba81e17ef7b191af30948842596… Author: Ilia Docin <ilya.docin(a)contentai.ru> Date: Fri Aug 4 12:06:06 2023 +0300 sane.ds: Add array of resolutions support. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55378 --- dlls/sane.ds/capability.c | 58 +++++++++++++++++++++++++++++++++++------------ dlls/sane.ds/options.c | 13 ++--------- dlls/sane.ds/sane_i.h | 2 +- 3 files changed, 46 insertions(+), 27 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 15ca4ea740a..312876cd8e6 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -143,27 +143,35 @@ static TW_UINT16 msg_get_range(pTW_CAPABILITY pCapability, TW_UINT16 type, return TWCC_SUCCESS; } -static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) +static TW_UINT16 msg_get_array(pTW_CAPABILITY pCapability, TW_UINT16 type, const int *values, int value_count) { TW_ARRAY *a; - static const UINT16 supported_caps[] = { CAP_SUPPORTEDCAPS, CAP_XFERCOUNT, CAP_UICONTROLLABLE, - CAP_AUTOFEED, CAP_FEEDERENABLED, - ICAP_XFERMECH, ICAP_PIXELTYPE, ICAP_UNITS, ICAP_BITDEPTH, ICAP_COMPRESSION, ICAP_PIXELFLAVOR, - ICAP_XRESOLUTION, ICAP_YRESOLUTION, ICAP_PHYSICALHEIGHT, ICAP_PHYSICALWIDTH, ICAP_SUPPORTEDSIZES }; + TW_UINT32 *p32; + TW_UINT16 *p16; - pCapability->hContainer = GlobalAlloc (0, FIELD_OFFSET( TW_ARRAY, ItemList[sizeof(supported_caps)] )); + pCapability->hContainer = 0; pCapability->ConType = TWON_ARRAY; + if (type == TWTY_INT16 || type == TWTY_UINT16) + pCapability->hContainer = GlobalAlloc (0, FIELD_OFFSET( TW_ARRAY, ItemList[value_count * sizeof(TW_UINT16)])); + else if (type == TWTY_INT32 || type == TWTY_UINT32) + pCapability->hContainer = GlobalAlloc (0, FIELD_OFFSET( TW_ARRAY, ItemList[value_count * sizeof(TW_UINT32)])); + if (pCapability->hContainer) { - UINT16 *u; TW_UINT32 i; a = GlobalLock (pCapability->hContainer); - a->ItemType = TWTY_UINT16; - a->NumItems = ARRAY_SIZE(supported_caps); - u = (UINT16 *) a->ItemList; + a->ItemType = type; + a->NumItems = value_count; + p16 = (TW_UINT16 *) a->ItemList; + p32 = (TW_UINT32 *) a->ItemList; for (i = 0; i < a->NumItems; i++) - u[i] = supported_caps[i]; + { + if (type == TWTY_INT16 || type == TWTY_UINT16) + p16[i] = values[i]; + else if (type == TWTY_INT32 || type == TWTY_UINT32) + p32[i] = values[i]; + } GlobalUnlock (pCapability->hContainer); return TWCC_SUCCESS; } @@ -171,6 +179,16 @@ static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) return TWCC_LOWMEMORY; } +static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) +{ + static const int supported_caps[] = { CAP_SUPPORTEDCAPS, CAP_XFERCOUNT, CAP_UICONTROLLABLE, + CAP_AUTOFEED, CAP_FEEDERENABLED, + ICAP_XFERMECH, ICAP_PIXELTYPE, ICAP_UNITS, ICAP_BITDEPTH, ICAP_COMPRESSION, ICAP_PIXELFLAVOR, + ICAP_XRESOLUTION, ICAP_YRESOLUTION, ICAP_PHYSICALHEIGHT, ICAP_PHYSICALWIDTH, ICAP_SUPPORTEDSIZES }; + + return msg_get_array(pCapability, TWTY_UINT16, supported_caps, sizeof(supported_caps) / sizeof(supported_caps[0])); +} + /* ICAP_XFERMECH */ static TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action) @@ -518,7 +536,7 @@ static TW_UINT16 SANE_ICAPResolution (pTW_CAPABILITY pCapability, TW_UINT16 acti int current_resolution; TW_FIX32 *default_res; const char *best_option_name; - int minval, maxval, quantval; + struct option_descriptor opt; TRACE("ICAP_%cRESOLUTION\n", cap == ICAP_XRESOLUTION ? 'X' : 'Y'); @@ -565,10 +583,20 @@ static TW_UINT16 SANE_ICAPResolution (pTW_CAPABILITY pCapability, TW_UINT16 acti break; case MSG_GET: - twCC = sane_option_probe_resolution(best_option_name, &minval, &maxval, &quantval); + twCC = sane_option_probe_resolution(best_option_name, &opt); if (twCC == TWCC_SUCCESS) - twCC = msg_get_range(pCapability, TWTY_FIX32, - minval, maxval, quantval == 0 ? 1 : quantval, default_res->Whole, current_resolution); + { + if (opt.constraint_type == CONSTRAINT_RANGE) + twCC = msg_get_range(pCapability, TWTY_FIX32, + opt.constraint.range.min, opt.constraint.range.max, + opt.constraint.range.quant == 0 ? 1 : opt.constraint.range.quant, + default_res->Whole, current_resolution); + else if (opt.constraint_type == CONSTRAINT_WORD_LIST) + twCC = msg_get_array(pCapability, TWTY_UINT32, &(opt.constraint.word_list[1]), + opt.constraint.word_list[0]); + else + twCC = TWCC_CAPUNSUPPORTED; + } break; case MSG_SET: diff --git a/dlls/sane.ds/options.c b/dlls/sane.ds/options.c index 52e73a99925..30ca441fd28 100644 --- a/dlls/sane.ds/options.c +++ b/dlls/sane.ds/options.c @@ -107,18 +107,9 @@ TW_UINT16 sane_option_set_str(const char *option_name, char *val, BOOL *needs_re return rc; } -TW_UINT16 sane_option_probe_resolution(const char *option_name, int *minval, int *maxval, int *quant) +TW_UINT16 sane_option_probe_resolution(const char *option_name, struct option_descriptor *opt) { - struct option_descriptor opt; - TW_UINT16 rc = sane_find_option(option_name, TYPE_INT, &opt); - - if (rc != TWCC_SUCCESS) return rc; - if (opt.constraint_type != CONSTRAINT_RANGE) return TWCC_CAPUNSUPPORTED; - - *minval = opt.constraint.range.min; - *maxval = opt.constraint.range.max; - *quant = opt.constraint.range.quant; - return rc; + return sane_find_option(option_name, TYPE_INT, opt); } TW_UINT16 sane_option_probe_mode(TW_UINT16 *current, TW_UINT32 *choices, int *count) diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index db71b87995e..571917944e1 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -200,7 +200,7 @@ TW_UINT16 sane_option_get_int( const char *option_name, int *val ) DECLSPEC_HIDD TW_UINT16 sane_option_set_int( const char *option_name, int val, BOOL *reload ) DECLSPEC_HIDDEN; TW_UINT16 sane_option_get_str( const char *option_name, char *val, int len ) DECLSPEC_HIDDEN; TW_UINT16 sane_option_set_str( const char *option_name, char *val, BOOL *reload ) DECLSPEC_HIDDEN; -TW_UINT16 sane_option_probe_resolution( const char *option_name, int *minval, int *maxval, int *quant) DECLSPEC_HIDDEN; +TW_UINT16 sane_option_probe_resolution( const char *option_name, struct option_descriptor *opt ) DECLSPEC_HIDDEN; TW_UINT16 sane_option_probe_mode(TW_UINT16 *current, TW_UINT32 *choices, int *count) DECLSPEC_HIDDEN; TW_UINT16 sane_option_get_bool( const char *option_name, BOOL *val ) DECLSPEC_HIDDEN; TW_UINT16 sane_option_set_bool( const char *option_name, BOOL val ) DECLSPEC_HIDDEN;

1 0

Biswapriyo Nath : include: Add missing default value in IXAudio2.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: 26e72a7580be52251a7d54334b0882be01f39f6a URL: https://gitlab.winehq.org/wine/wine/-/commit/26e72a7580be52251a7d54334b0882… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Aug 2 01:51:32 2023 +0530 include: Add missing default value in IXAudio2. This was removed in 14c44d0b0a2fc0ead5bc75615864ff850a44c4d5 commit. --- include/xaudio2.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/xaudio2.idl b/include/xaudio2.idl index d0e781fe1c6..277fc450469 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -555,7 +555,7 @@ interface IXAudio2 : IUnknown #endif [in, defaultvalue(NULL)] const XAUDIO2_EFFECT_CHAIN* pEffectChain #if XAUDIO2_VER >= 8 - , AUDIO_STREAM_CATEGORY category + , [in, defaultvalue(AudioCategory_GameEffects)] AUDIO_STREAM_CATEGORY category #endif );

1 0

Piotr Caban : winedump: Support REG_QWORD values in regf files.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: e2414b55b6ffab465229f9234f89d7f61ba2ac51 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2414b55b6ffab465229f9234f89d7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 18:45:18 2023 +0200 winedump: Support REG_QWORD values in regf files. --- tools/winedump/reg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index 9d227f29253..f100eb47171 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -258,9 +258,10 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) printf("%s", !data ? "\"\"" : get_unicode_str((const WCHAR *)data, data_size / sizeof(WCHAR))); break; + case REG_QWORD: case REG_BINARY: - printf("hex:"); - len += 4; /* strlen("hex:") */ + printf("hex%s:", val->data_type == REG_QWORD ? "(b)" : ""); + len += 4 + (val->data_type == REG_QWORD ? 3 : 0); for (i = 0; i < data_size; i++) { if (i)

1 0

Piotr Caban : winedump: Support dumping UTF16 value names in regf files.
by Alexandre Julliard Aug. 4, 2023

Aug. 4, 2023

Module: wine Branch: master Commit: 49c40d502cc142dffa1260347c6a53c209b9f8a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/49c40d502cc142dffa1260347c6a53… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 18:40:51 2023 +0200 winedump: Support dumping UTF16 value names in regf files. --- tools/winedump/reg.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index baa298784e3..9d227f29253 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -201,27 +201,34 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) if (!val || memcmp(&val->signature, "vk", 2)) return FALSE; - if (!(val->flags & VAL_COMP_NAME) && val->name_size) - { - printf("unsupported value flags: %x\n", val->flags); - return FALSE; - } if (!(val->data_size & 0x80000000) && val->data_size > 4 * BLOCK_SIZE) { printf("Warning: data blocks not supported\n"); return TRUE; } - if (val->name_size) + if (val->name_size && !(val->flags & VAL_COMP_NAME)) + { + name = PRD(hive_off + off + sizeof(*val), val->name_size); + if (!name) + return FALSE; + name = get_unicode_str((WCHAR *)name, val->name_size / sizeof(WCHAR)); + len = strlen(name) + 1; + + printf("%s=", name); + } + else if (val->name_size) { name = PRD(hive_off + off + sizeof(*val), val->name_size); if (!name) return FALSE; + len = val->name_size + 3; printf("\"%.*s\"=", val->name_size, name); } else { + len = 2; printf("@="); } @@ -253,7 +260,7 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) break; case REG_BINARY: printf("hex:"); - len = val->name_size + 7; /* strlen("\"\"=hex:") */ + len += 4; /* strlen("hex:") */ for (i = 0; i < data_size; i++) { if (i)

1 0