July 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : d3dcompiler: Track def-use chains for anonymous nodes.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: 8bd5fe30014c2aa60f0c4570db4ef936e8c51245 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bd5fe30014c2aa60f0c4570… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 29 18:55:35 2020 -0500 d3dcompiler: Track def-use chains for anonymous nodes. This is useful for replacing one instruction with another of a different type, which is useful for some optimizations such as constant folding. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 33 ++++++++++++++++---- dlls/d3dcompiler_43/hlsl.y | 49 +++++++++++++++--------------- dlls/d3dcompiler_43/utils.c | 50 ++++++++++++++++++------------- 3 files changed, 83 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bd5fe30014c2aa60f0c…

1 0

Zebediah Figura : winegstreamer: Append a deinterlace element to the video post-processing chain.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: eadcba79251f616b8028e2e39ee71985ee5d863b URL: https://source.winehq.org/git/wine.git/?a=commit;h=eadcba79251f616b8028e2e3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 1 12:10:01 2020 -0500 winegstreamer: Append a deinterlace element to the video post-processing chain. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30366 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5697d2c0e0..e6f00842df 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -995,7 +995,16 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * if (!strcmp(typename, "video/x-raw")) { - GstElement *vconv, *flip; + GstElement *vconv, *flip, *deinterlace; + + /* DirectShow can express interlaced video, but downstream filters can't + * necessarily consume it. In particular, the video renderer can't. */ + if (!(deinterlace = gst_element_factory_make("deinterlace", NULL))) + { + ERR("Failed to create deinterlace, are %u-bit GStreamer \"base\" plugins installed?\n", + 8 * (int)sizeof(void *)); + goto out; + } /* decodebin considers many YUV formats to be "raw", but some quartz * filters can't handle those. Also, videoflip can't handle all "raw" @@ -1018,14 +1027,18 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * goto out; } - gst_bin_add(GST_BIN(This->container), vconv); /* bin takes ownership */ + /* The bin takes ownership of these elements. */ + gst_bin_add(GST_BIN(This->container), deinterlace); + gst_element_sync_state_with_parent(deinterlace); + gst_bin_add(GST_BIN(This->container), vconv); gst_element_sync_state_with_parent(vconv); - gst_bin_add(GST_BIN(This->container), flip); /* bin takes ownership */ + gst_bin_add(GST_BIN(This->container), flip); gst_element_sync_state_with_parent(flip); + gst_element_link(deinterlace, vconv); gst_element_link(vconv, flip); - pin->post_sink = gst_element_get_static_pad(vconv, "sink"); + pin->post_sink = gst_element_get_static_pad(deinterlace, "sink"); pin->post_src = gst_element_get_static_pad(flip, "src"); pin->flip = flip; }

1 0

Jacek Caban : mshtml.idl: Add IHTMLNamespaceCollection declaration.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: e89ef980948e92ea6044da00eb956e13f9f3f0f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e89ef980948e92ea6044da00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 16:56:33 2020 +0200 mshtml.idl: Add IHTMLNamespaceCollection declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 5 +++++ include/mshtml.idl | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 87b8877f4e..4b76d99996 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -4714,4 +4714,9 @@ /* IDocumentRange */ #define DISPID_IDOCUMENTRANGE_CREATERANGE DISPID_OMDOCUMENT+111 +/* IHTMLNamespaceCollection */ +#define DISPID_IHTMLNAMESPACECOLLECTION_LENGTH DISPID_NAMESPACE_COLLECTION +#define DISPID_IHTMLNAMESPACECOLLECTION_ITEM DISPID_VALUE +#define DISPID_IHTMLNAMESPACECOLLECTION_ADD DISPID_NAMESPACE_COLLECTION+1 + #endif /* __MSHTMDID_H__ */ diff --git a/include/mshtml.idl b/include/mshtml.idl index ba7ef0db16..2fd1e6f76c 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28003,6 +28003,61 @@ interface IDOMMessageEvent : IDispatch [in] IHTMLWindow2 *source); } + +/***************************************************************************** + * IHTMLNamespaceCollection interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f6b8-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLNamespaceCollection : IDispatch +{ + [propget, id(DISPID_IHTMLNAMESPACECOLLECTION_LENGTH)] + HRESULT length([out, retval] long *p); + + [id(DISPID_IHTMLNAMESPACECOLLECTION_ITEM)] + HRESULT item( + [in] VARIANT index, + [out, retval] IDispatch **ppNamespace); + + [id(DISPID_IHTMLNAMESPACECOLLECTION_ADD)] + HRESULT add( + [in] BSTR bstrNamespace, + [in] BSTR bstrUrn, + [in, optional] VARIANT implementationUrl, + [out, retval] IDispatch **ppNamespace); +} + +/***************************************************************************** + * DispHTMLNamespaceCollection dispinterface + */ +[ + hidden, + uuid(3050f550-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLNamespaceCollection +{ +properties: +methods: + [propget, id(DISPID_IHTMLNAMESPACECOLLECTION_LENGTH)] + long length(); + + [id(DISPID_IHTMLNAMESPACECOLLECTION_ITEM)] + IDispatch *item([in] VARIANT index); + + [id(DISPID_IHTMLNAMESPACECOLLECTION_ADD)] + IDispatch *add( + [in] BSTR bstrNamespace, + [in] BSTR bstrUrn, + [in, optional] VARIANT implementationUrl); + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch *constructor(); +} + /***************************************************************************** * ILineInfo interface */

1 0

Jacek Caban : mshtml: Add IHTMLDocument4::namespaces property implementation.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: 2406590472620fbef8e7eb94f2e2f6ade8562d85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2406590472620fbef8e7eb94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 16:56:48 2020 +0200 mshtml: Add IHTMLDocument4::namespaces property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 25 +++++-- dlls/mshtml/mshtml_private.h | 4 ++ dlls/mshtml/omnavigator.c | 154 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 23 +++++++ 4 files changed, 202 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2406590472620fbef8e7…

1 0

Piotr Caban : msi: Install feature when new component is added.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: 877540b522c46134aa1b843519fa5694adb187ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=877540b522c46134aa1b8435… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 1 10:44:00 2020 +0200 msi: Install feature when new component is added. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49350 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 112 ++++++++++++++++++++++++++++++++++++++++++++----- dlls/msi/msipriv.h | 2 + dlls/msi/patch.c | 5 +++ dlls/msi/tests/patch.c | 2 +- 4 files changed, 110 insertions(+), 11 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index bc7fecbd73..d02860e4d7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1374,6 +1374,49 @@ static UINT load_all_patches(MSIPACKAGE *package) return rc; } +static UINT iterate_patched_component( MSIRECORD *row, LPVOID param ) +{ + MSIPACKAGE *package = param; + const WCHAR *name; + MSICOMPONENT *c; + + name = MSI_RecordGetString( row, 1 ); + TRACE( "found patched component: %s\n", wine_dbgstr_w(name) ); + c = msi_get_loaded_component( package, name ); + if (!c) + return ERROR_SUCCESS; + + c->updated = 1; + if (!wcscmp( MSI_RecordGetString( row, 2 ), L"INSERT" )) + c->added = 1; + return ERROR_SUCCESS; +} + +static void mark_patched_components( MSIPACKAGE *package ) +{ + static const WCHAR select[] = L"SELECT `Row`, `Column` FROM `_TransformView` WHERE `Table`='Component'"; + MSIQUERY *q; + UINT r; + + r = MSI_OpenQuery( package->db, &q, select ); + if (r != ERROR_SUCCESS) + return; + + MSI_IterateRecords( q, NULL, iterate_patched_component, package ); + msiobj_release( &q->hdr ); + + while (1) + { + r = MSI_OpenQuery( package->db, &q, L"ALTER TABLE `_TransformView` FREE" ); + if (r != ERROR_SUCCESS) + return; + r = MSI_ViewExecute( q, NULL ); + msiobj_release( &q->hdr ); + if (r != ERROR_SUCCESS) + return; + } +} + static UINT load_folder_persistence( MSIPACKAGE *package, MSIFOLDER *folder ) { static const WCHAR query[] = { @@ -1518,6 +1561,7 @@ static UINT ACTION_CostInitialize(MSIPACKAGE *package) msi_load_all_features( package ); load_all_files( package ); load_all_patches( package ); + mark_patched_components( package ); load_all_media( package ); return ERROR_SUCCESS; @@ -1802,12 +1846,6 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) } } } - LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - { - if (feature->Feature_Parent) continue; - disable_children( feature, level ); - follow_parent( feature ); - } } else if (!msi_get_property_int( package->db, szInstalled, 0 )) { @@ -1834,15 +1872,69 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) } } } - /* disable child features of unselected parent or follow parent */ + } + else + { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - if (feature->Feature_Parent) continue; - disable_children( feature, level ); - follow_parent( feature ); + ComponentList *cl; + MSIFEATURE *cur; + + if (!is_feature_selected( feature, level )) continue; + if (feature->ActionRequest != INSTALLSTATE_UNKNOWN) continue; + + LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) + { + if (!cl->component->updated && !cl->component->added) + continue; + + cur = feature; + while (cur) + { + if (cur->ActionRequest != INSTALLSTATE_UNKNOWN) + break; + + if (cur->Installed != INSTALLSTATE_ABSENT) + { + cur->Action = cur->Installed; + cur->ActionRequest = cur->Installed; + } + else if (!cl->component->added) + { + break; + } + else if (cur->Attributes & msidbFeatureAttributesFavorSource) + { + cur->Action = INSTALLSTATE_SOURCE; + cur->ActionRequest = INSTALLSTATE_SOURCE; + } + else if (cur->Attributes & msidbFeatureAttributesFavorAdvertise) + { + cur->Action = INSTALLSTATE_ADVERTISED; + cur->ActionRequest = INSTALLSTATE_ADVERTISED; + } + else + { + cur->Action = INSTALLSTATE_LOCAL; + cur->ActionRequest = INSTALLSTATE_LOCAL; + } + + if (!cur->Feature_Parent) + break; + cur = msi_get_loaded_feature(package, cur->Feature_Parent); + } + } } } + /* disable child features of unselected parent or follow parent */ + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) + { + if (feature->Feature_Parent) continue; + disable_children( feature, level ); + follow_parent( feature ); + } + /* now we want to set component state based based on feature state */ LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index dbe833e613..a1b7f033c3 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -544,6 +544,8 @@ typedef struct tagMSICOMPONENT unsigned int hasAdvertisedFeature:1; unsigned int hasLocalFeature:1; unsigned int hasSourceFeature:1; + unsigned int added:1; + unsigned int updated:1; } MSICOMPONENT; typedef struct tagComponentList diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index 1233ec306b..67da577841 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -274,9 +274,14 @@ static UINT apply_substorage_transform( MSIPACKAGE *package, MSIDATABASE *patch_ { ret = check_transform_applicable( package, stg ); if (ret == ERROR_SUCCESS) + { + msi_table_apply_transform( package->db, stg, MSITRANSFORM_ERROR_VIEWTRANSFORM ); msi_table_apply_transform( package->db, stg, 0 ); + } else + { TRACE("substorage transform %s wasn't applicable\n", debugstr_w(name)); + } IStorage_Release( stg ); } else diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index a846defef4..87f64d6c83 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -844,7 +844,7 @@ static void test_simple_patch( void ) size = get_pf_file_size( "msitest\\patch.txt" ); ok( size == 1002, "expected 1002, got %u\n", size ); size = get_pf_file_size( "msitest\\file.txt" ); - todo_wine ok( size == 1000, "expected 1000, got %u\n", size ); + ok( size == 1000, "expected 1000, got %u\n", size ); /* show that MsiOpenPackage applies registered patches */ r = MsiOpenPackageA( path, &hpackage );

1 0

Paul Gofman : ntdll: Don't reset rsp to context->Rsp until exception data is copied.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: 69b6572338396134a3e20189cb35445d68757ebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=69b6572338396134a3e20189… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 2 11:06:04 2020 +0300 ntdll: Don't reset rsp to context->Rsp until exception data is copied. Context record may be stored on stack below context stack. This happens, e. g., with RtlRaiseException(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 5334a4d7cc..cb0fdfb00f 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1979,17 +1979,18 @@ __ASM_GLOBAL_FUNC( user_exception_dispatcher_trampoline, void WINAPI do_call_user_exception_dispatcher(EXCEPTION_RECORD *rec, CONTEXT *context, struct stack_layout *stack) { - memcpy(&stack->context, context, sizeof(*context)); + memmove(&stack->context, context, sizeof(*context)); memcpy(&stack->rec, rec, sizeof(*rec)); user_exception_dispatcher_trampoline( stack, pKiUserExceptionDispatcher ); } __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, - "movq 0x98(%rdx),%rsp\n\t" /* context->Rsp */ - "and $~0xf,%rsp\n\t" - "sub $0x630,%rsp\n\t" /* sizeof(struct stack_layout) */ - "movq %rsp,%r8\n\t" + "movq 0x98(%rdx),%r8\n\t" /* context->Rsp */ + "andq $~0xf,%r8\n\t" + "subq $0x630,%r8\n\t" /* sizeof(struct stack_layout) */ + "cmpq %r8,%rsp\n\t" + "cmovbq %r8,%rsp\n\t" "jmp " __ASM_NAME("do_call_user_exception_dispatcher") "\n\t") /***********************************************************************

1 0

Paul Gofman : ntdll: Add PE frame handling to KiUserExceptionDispatcher() on x64.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: c02b63fb60458ec750e5991a7491235861c40061 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c02b63fb60458ec750e5991a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 2 15:34:47 2020 +0300 ntdll: Add PE frame handling to KiUserExceptionDispatcher() on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index b575d63857..dde0bb7339 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -588,15 +588,22 @@ __ASM_GLOBAL_FUNC( KiUserExceptionDispatcher, "mov %rbp,-0x10(%rcx)\n\t" "mov %rdi,-0x18(%rcx)\n\t" "mov %rsi,-0x20(%rcx)\n\t" - "mov %rcx,%rbp\n\t" + "lea -0x10(%rcx),%rbp\n\t" "mov %rsp,%rdx\n\t" /* context */ "lea 0x4f0(%rsp),%rcx\n\t" /* rec */ + __ASM_SEH(".seh_pushreg %rbp\n\t") + __ASM_SEH(".seh_setframe %rbp,0\n\t") + __ASM_SEH(".seh_pushreg %rdi\n\t") + __ASM_SEH(".seh_pushreg %rsi\n\t") + __ASM_SEH(".seh_endprologue\n\t") + __ASM_CFI(".cfi_signal_frame\n\t") - __ASM_CFI(".cfi_def_cfa %rbp,0\n\t") - __ASM_CFI(".cfi_rel_offset %rip,-0x8\n\t") - __ASM_CFI(".cfi_rel_offset %rbp,-0x10\n\t") - __ASM_CFI(".cfi_rel_offset %rdi,-0x18\n\t") - __ASM_CFI(".cfi_rel_offset %rsi,-0x20\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 0x10\n\t") + __ASM_CFI(".cfi_def_cfa %rbp,0x10\n\t") + __ASM_CFI(".cfi_rel_offset %rip,0x8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0x0\n\t") + __ASM_CFI(".cfi_rel_offset %rdi,-0x8\n\t") + __ASM_CFI(".cfi_rel_offset %rsi,-0x10\n\t") "call " __ASM_NAME("dispatch_exception") "\n\t" "int3")

1 0

Piotr Caban : msi: Test adding new feature in patch.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: cc8bc83e9ecd2aba8e322a974af268e715fbd372 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc8bc83e9ecd2aba8e322a97… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 1 10:43:13 2020 +0200 msi: Test adding new feature in patch. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/patch.c | 126 ++++++++++++++++++++++++++++++------------------- 1 file changed, 77 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cc8bc83e9ecd2aba8e32…

1 0

Vijay Kiran Kamuju : include: Add IXACT3SoundBank definition.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: 56f3ca3f767c2cd6a22139c393fd5051be588a71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56f3ca3f767c2cd6a22139c3… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jul 1 23:19:03 2020 +0200 include: Add IXACT3SoundBank definition. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xact3.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/xact3.h b/include/xact3.h index 8b9c3967cf..cdb91d145d 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -542,6 +542,49 @@ DECLARE_INTERFACE(IXACT3Wave) #define IXACT3Wave_GetProperties(p,a) (p)->GetProperties(a) #endif +#define XACT_FLAG_SOUNDBANK_STOP_IMMEDIATE XACT_FLAG_STOP_IMMEDIATE +#define XACT_SOUNDBANKSTATE_INUSE XACT_STATE_INUSE + +/***************************************************************************** + * IXACT3SoundBank interface + */ +#define INTERFACE IXACT3SoundBank +DECLARE_INTERFACE(IXACT3SoundBank) +{ + /*** IXACT3SoundBank methods ***/ + STDMETHOD_(XACTINDEX,GetCueIndex)(THIS_ PCSTR szFriendlyName) PURE; + STDMETHOD(GetNumCues)(THIS_ XACTINDEX *pnNumCues) PURE; + STDMETHOD(GetCueProperties)(THIS_ XACTINDEX nCueIndex, LPXACT_CUE_PROPERTIES pProperties) PURE; + STDMETHOD(Prepare)(THIS_ XACTINDEX nCueIndex, DWORD dwFlags, XACTTIME timeOffset, IXACT3Cue **ppCue) PURE; + STDMETHOD(Play)(THIS_ XACTINDEX nCueIndex, DWORD dwFlags, XACTTIME timeOffset, IXACT3Cue **ppCue) PURE; + STDMETHOD(Stop)(THIS_ XACTINDEX nCueIndex, DWORD dwFlags) PURE; + STDMETHOD(Destroy)(THIS) PURE; + STDMETHOD(GetState)(THIS_ DWORD *pdwState) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IXACT3SoundBank methods ***/ +#define IXACT3SoundBank_GetCueIndex(p,a) (p)->lpVtbl->GetCueIndex(p,a) +#define IXACT3SoundBank_GetNumCues(p,a) (p)->lpVtbl->GetNumCues(p,a) +#define IXACT3SoundBank_GetCueProperties(p,a,b) (p)->lpVtbl->GetCueProperties(p,a,b) +#define IXACT3SoundBank_Prepare(p,a,b,c,d) (p)->lpVtbl->Prepare(p,a,b,c,d) +#define IXACT3SoundBank_Play(p,a,b,c,d) (p)->lpVtbl->Play(p,a,b,c,d) +#define IXACT3SoundBank_Stop(p,a,b) (p)->lpVtbl->Stop(p,a,b) +#define IXACT3SoundBank_Destroy(p) (p)->lpVtbl->Destroy(p) +#define IXACT3SoundBank_GetState(p,a) (p)->lpVtbl->GetState(p,a) +#else +/*** IXACT3SoundBank methods ***/ +#define IXACT3SoundBank_GetCueIndex(p,a) (p)->GetCueIndex(a) +#define IXACT3SoundBank_GetNumCues(p,a) (p)->GetNumCues(a) +#define IXACT3SoundBank_GetCueProperties(p,a,b) (p)->GetCueProperties(a,b) +#define IXACT3SoundBank_Prepare(p,a,b,c,d) (p)->Prepare(a,b,c,d) +#define IXACT3SoundBank_Play(p,a,b,c,d) (p)->Play(a,b,c,d) +#define IXACT3SoundBank_Stop(p,a,b) (p)->Stop(a,b) +#define IXACT3SoundBank_Destroy(p) (p)->Destroy() +#define IXACT3SoundBank_GetState(p,a) (p)->GetState(a) +#endif + #define XACT_FLAG_ENGINE_CREATE_MANAGEDATA XACT_FLAG_MANAGEDATA #define XACT_FLAG_ENGINE_STOP_IMMEDIATE XACT_FLAG_STOP_IMMEDIATE

1 0

Piotr Caban : msi: Remove no longer needed parameter from TABLE_remove_column.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: d579b17eb425ac5e28f9263ebf302ea2282996ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d579b17eb425ac5e28f9263e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 1 10:43:05 2020 +0200 msi: Remove no longer needed parameter from TABLE_remove_column. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 3febcb3aa9..27f3763d34 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1949,7 +1949,7 @@ static UINT TABLE_add_ref(struct tagMSIVIEW *view) return InterlockedIncrement(&tv->table->ref_count); } -static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT number) +static UINT TABLE_remove_column(struct tagMSIVIEW *view, UINT number) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; MSIRECORD *rec = NULL; @@ -1974,7 +1974,7 @@ static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT num if (!rec) return ERROR_OUTOFMEMORY; - MSI_RecordSetStringW(rec, 1, table); + MSI_RecordSetStringW(rec, 1, tv->name); MSI_RecordSetInteger(rec, 2, number); r = TABLE_CreateView(tv->db, szColumns, &columns); @@ -1992,7 +1992,7 @@ static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT num if (r != ERROR_SUCCESS) goto done; - msi_update_table_columns(tv->db, table); + msi_update_table_columns(tv->db, tv->name); done: msiobj_release(&rec->hdr); @@ -2016,8 +2016,7 @@ static UINT TABLE_release(struct tagMSIVIEW *view) { if (tv->table->colinfo[i].type & MSITYPE_TEMPORARY) { - r = TABLE_remove_column(view, tv->table->colinfo[i].tablename, - tv->table->colinfo[i].number); + r = TABLE_remove_column(view, tv->table->colinfo[i].number); if (r != ERROR_SUCCESS) break; } @@ -2145,8 +2144,7 @@ static UINT TABLE_drop(struct tagMSIVIEW *view) for (i = tv->table->col_count - 1; i >= 0; i--) { - r = TABLE_remove_column(view, tv->table->colinfo[i].tablename, - tv->table->colinfo[i].number); + r = TABLE_remove_column(view, tv->table->colinfo[i].number); if (r != ERROR_SUCCESS) return r; }

1 0