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

Paul Gofman : ntdll: Add PE frame handling to KiUserExceptionDispatcher() on x64.
by Alexandre Julliard 02 Jul '20

02 Jul '20

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

Jacek Caban : mshtml.idl: Add IHTMLNamespaceCollection declaration.
by Alexandre Julliard 02 Jul '20

02 Jul '20

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 02 Jul '20

02 Jul '20

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

Jacek Caban : mshtml.idl: Add missing MoveUnitBounded to IMarkupPointer2.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: ffbee79c88545a1ff308bc9d9783f4a2d662c718 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffbee79c88545a1ff308bc9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 16:56:57 2020 +0200 mshtml.idl: Add missing MoveUnitBounded to IMarkupPointer2. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtml.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/mshtml.idl b/include/mshtml.idl index 2fd1e6f76c..77f4a9e8bb 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28449,6 +28449,10 @@ interface IMarkupPointer2 : IMarkupPointer [in] IMarkupContainer *pContainer, [in] long lMP); + HRESULT MoveUnitBounded( + [in] MOVEUNIT_ACTION muAction, + [in] IMarkupPointer *pIBoundary); + HRESULT IsInsideURL( [in] IMarkupPointer *pRight, [out] BOOL *pfResult);

1 0

Jacek Caban : mshtml: Add IMarkupServices::CreateMarkupPointer implementation.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: 5679312635c075c7fc9a8ec7c2fc3c01a509bb30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5679312635c075c7fc9a8ec7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 16:57:21 2020 +0200 mshtml: Add IMarkupServices::CreateMarkupPointer implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 6 +- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/range.c | 294 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 22 ++++ 4 files changed, 321 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5679312635c075c7fc9a…

1 0

Zebediah Figura : winegstreamer: Append a deinterlace element to the video post-processing chain.
by Alexandre Julliard 02 Jul '20

02 Jul '20

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

Zebediah Figura : d3dcompiler: Track def-use chains for anonymous nodes.
by Alexandre Julliard 02 Jul '20

02 Jul '20

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

Vijay Kiran Kamuju : include: Add xact3.h.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: 41288f5e6ae18491f2074a695b08f616e3dd979c URL: https://source.winehq.org/git/wine.git/?a=commit;h=41288f5e6ae18491f2074a69… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Mar 16 01:31:24 2020 +0100 include: Add xact3.h. Based on work by Ethan Lee and Alistair Leslie-Hughes 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/Makefile.in | 1 + include/xact3.h | 472 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 473 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=41288f5e6ae18491f207…

1 0

Vijay Kiran Kamuju : include: Add IXACT3Cue definition.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: 057eaf13851b256b756ff1ec9d01473dc5254775 URL: https://source.winehq.org/git/wine.git/?a=commit;h=057eaf13851b256b756ff1ec… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jul 1 23:07:28 2020 +0200 include: Add IXACT3Cue 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 | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/include/xact3.h b/include/xact3.h index f869077534..46f3bc467d 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -206,6 +206,57 @@ typedef struct XACT_STREAMING_PARAMETERS typedef const XACT_STREAMING_PARAMETERS *LPCXACT_STREAMING_PARAMETERS; typedef const XACT_WAVE_STREAMING_PARAMETERS *LPCXACT_WAVE_STREAMING_PARAMETERS; +typedef struct XACT_CUE_PROPERTIES +{ + char friendlyName[XACT_CUE_NAME_LENGTH]; + BOOL interactive; + XACTINDEX iaVariableIndex; + XACTINDEX numVariations; + XACTINSTANCELIMIT maxInstances; + XACTINSTANCELIMIT currentInstances; +} XACT_CUE_PROPERTIES, *LPXACT_CUE_PROPERTIES; + +typedef struct XACT_TRACK_PROPERTIES +{ + XACTTIME duration; + XACTINDEX numVariations; + XACTCHANNEL numChannels; + XACTINDEX waveVariation; + XACTLOOPCOUNT loopCount; +} XACT_TRACK_PROPERTIES, *LPXACT_TRACK_PROPERTIES; + +typedef struct XACT_VARIATION_PROPERTIES +{ + XACTINDEX index; + XACTVARIATIONWEIGHT weight; + XACTVARIABLEVALUE iaVariableMin; + XACTVARIABLEVALUE iaVariableMax; + BOOL linger; +} XACT_VARIATION_PROPERTIES, *LPXACT_VARIATION_PROPERTIES; + +typedef struct XACT_SOUND_PROPERTIES +{ + XACTCATEGORY category; + BYTE priority; + XACTPITCH pitch; + XACTVOLUME volume; + XACTINDEX numTracks; + XACT_TRACK_PROPERTIES arrTrackProperties[1]; +} XACT_SOUND_PROPERTIES, *LPXACT_SOUND_PROPERTIES; + +typedef struct XACT_SOUND_VARIATION_PROPERTIES +{ + XACT_VARIATION_PROPERTIES variationProperties; + XACT_SOUND_PROPERTIES soundProperties; +} XACT_SOUND_VARIATION_PROPERTIES, *LPXACT_SOUND_VARIATION_PROPERTIES; + +typedef struct XACT_CUE_INSTANCE_PROPERTIES +{ + DWORD allocAttributes; + XACT_CUE_PROPERTIES cueProperties; + XACT_SOUND_VARIATION_PROPERTIES activeVariationProperties; +} XACT_CUE_INSTANCE_PROPERTIES, *LPXACT_CUE_INSTANCE_PROPERTIES; + typedef struct XACTCHANNELMAPENTRY { XACTCHANNEL InputChannel; @@ -368,6 +419,69 @@ typedef const XACT_RUNTIME_PARAMETERS *LPCXACT_RUNTIME_PARAMETERS; #include <poppack.h> +#define XACT_FLAG_CUE_STOP_RELEASE XACT_FLAG_STOP_RELEASE +#define XACT_FLAG_CUE_STOP_IMMEDIATE XACT_FLAG_STOP_IMMEDIATE + +#define XACT_CUESTATE_CREATED XACT_STATE_CREATED +#define XACT_CUESTATE_PREPARING XACT_STATE_PREPARING +#define XACT_CUESTATE_PREPARED XACT_STATE_PREPARED +#define XACT_CUESTATE_PLAYING XACT_STATE_PLAYING +#define XACT_CUESTATE_STOPPING XACT_STATE_STOPPING +#define XACT_CUESTATE_STOPPED XACT_STATE_STOPPED +#define XACT_CUESTATE_PAUSED XACT_STATE_PAUSED + +/***************************************************************************** + * IXACT3Cue interface + */ +#define INTERFACE IXACT3Cue +DECLARE_INTERFACE(IXACT3Cue) +{ + /*** IXACT3Cue methods ***/ + STDMETHOD(Play)(THIS) PURE; + STDMETHOD(Stop)(THIS_ DWORD pdwFlags) PURE; + STDMETHOD(GetState)(THIS_ DWORD *pdwState) PURE; + STDMETHOD(Destroy)(THIS) PURE; + STDMETHOD(SetMatrixCoefficients)(THIS_ UINT32 uSrcChannelCount, UINT32 uDstChannelCount, float *pMatrixCoefficients) PURE; + STDMETHOD_(XACTVARIABLEINDEX,GetVariableIndex)(THIS_ PCSTR szFriendlyName) PURE; + STDMETHOD(SetVariable)(THIS_ XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE nValue) PURE; + STDMETHOD(GetVariable)(THIS_ XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE *nValue) PURE; + STDMETHOD(Pause)(THIS_ BOOL fPause) PURE; + STDMETHOD(GetProperties)(THIS_ LPXACT_CUE_INSTANCE_PROPERTIES *ppProperties) PURE; + STDMETHOD(SetOutputVoices)(THIS_ const XAUDIO2_VOICE_SENDS *pSendList) PURE; + STDMETHOD(SetOutputVoiceMatrix)(THIS_ IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, UINT32 DestinationChannels, const float *pLevelMatrix) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IXACT3Cue methods ***/ +#define IXACT3Cue_Play(p) (p)->lpVtbl->Destroy(p) +#define IXACT3Cue_Stop(p,a) (p)->lpVtbl->Stop(p,a) +#define IXACT3Cue_GetState(p,a) (p)->lpVtbl->GetState(p,a) +#define IXACT3Cue_Destroy(p) (p)->lpVtbl->Destroy(p) +#define IXACT3Cue_SetMatrixCoefficients(p,a,b,c) (p)->lpVtbl->SetMatrixCoefficients(p,a,b,c) +#define IXACT3Cue_GetVariableIndex(p,a) (p)->lpVtbl->GetVariableIndex(p,a) +#define IXACT3Cue_SetVariable(p,a,b) (p)->lpVtbl->SetVariable(p,a,b) +#define IXACT3Cue_GetVariable(p,a,b) (p)->lpVtbl->GetVariable(p,a,b) +#define IXACT3Cue_Pause(p,a) (p)->lpVtbl->Pause(p,a) +#define IXACT3Cue_GetProperties(p,a) (p)->lpVtbl->GetProperties(p,a) +#define IXACT3Cue_SetOutputVoices(p,a) (p)->lpVtbl->SetOutputVoices(p,a) +#define IXACT3Cue_SetOutputVoiceMatrix(p,a,b,c,d) (p)->lpVtbl->SetOutputVoiceMatrix(p,a,b,c,d) +#else +/*** IXACT3Cue methods ***/ +#define IXACT3Cue_Play(p) (p)->Destroy() +#define IXACT3Cue_Stop(p,a) (p)->Stop(a) +#define IXACT3Cue_GetState(p,a) (p)->Stop(a) +#define IXACT3Cue_Destroy(p) (p)->Destroy() +#define IXACT3Cue_SetMatrixCoefficients(p,a,b,c) (p)->SetMatrixCoefficients(a,b,c) +#define IXACT3Cue_GetVariableIndex(p,a) (p)->GetVariableIndex(a) +#define IXACT3Cue_SetVariable(p,a,b) (p)->SetVariable(a,b) +#define IXACT3Cue_GetVariable(p,a,b) (p)->GetVariable(a,b) +#define IXACT3Cue_Pause(p,a) (p)->Pause(a) +#define IXACT3Cue_GetProperties(p,a) (p)->GetProperties(a) +#define IXACT3Cue_SetOutputVoices(p,a) (p)->SetOutputVoices(a) +#define IXACT3Cue_SetOutputVoiceMatrix(p,a,b,c,d) (p)->SetOutputVoiceMatrix(a,b,c,d) +#endif + #define XACT_FLAG_ENGINE_CREATE_MANAGEDATA XACT_FLAG_MANAGEDATA #define XACT_FLAG_ENGINE_STOP_IMMEDIATE XACT_FLAG_STOP_IMMEDIATE

1 0

Vijay Kiran Kamuju : include: Add IXACT3Wave definition.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: b4a59b3ffc2c4123a68a0cbc5a7802b02c9d8e8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4a59b3ffc2c4123a68a0cbc… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jul 1 23:14:50 2020 +0200 include: Add IXACT3Wave 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 | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/include/xact3.h b/include/xact3.h index 46f3bc467d..8b9c3967cf 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -331,6 +331,23 @@ typedef struct XACT_NOTIFICATION_CUE } XACT_NOTIFICATION_CUE, *LPXACT_NOTIFICATION_CUE; typedef const XACT_NOTIFICATION_CUE *LPCXACT_NOTIFICATION_CUE; +typedef struct XACT_WAVE_PROPERTIES +{ + char friendlyName[WAVEBANK_ENTRYNAME_LENGTH]; + WAVEBANKMINIWAVEFORMAT format; + DWORD durationInSamples; + WAVEBANKSAMPLEREGION loopRegion; + BOOL streaming; +} XACT_WAVE_PROPERTIES, *LPXACT_WAVE_PROPERTIES; +typedef const XACT_WAVE_PROPERTIES *LPCXACT_WAVE_PROPERTIES; + +typedef struct XACT_WAVE_INSTANCE_PROPERTIES +{ + XACT_WAVE_PROPERTIES properties; + BOOL backgroundMusic; +} XACT_WAVE_INSTANCE_PROPERTIES, *LPXACT_WAVE_INSTANCE_PROPERTIES; +typedef const XACT_WAVE_INSTANCE_PROPERTIES *LPCXACT_WAVE_INSTANCE_PROPERTIES; + typedef struct XACT_NOTIFICATION_MARKER { XACTINDEX cueIndex; @@ -482,6 +499,49 @@ DECLARE_INTERFACE(IXACT3Cue) #define IXACT3Cue_SetOutputVoiceMatrix(p,a,b,c,d) (p)->SetOutputVoiceMatrix(a,b,c,d) #endif +/***************************************************************************** + * IXACT3Wave interface + */ +#define INTERFACE IXACT3Wave +DECLARE_INTERFACE(IXACT3Wave) +{ + /*** IXACT3Wave methods ***/ + STDMETHOD(Destroy)(THIS) PURE; + STDMETHOD(Play)(THIS) PURE; + STDMETHOD(Stop)(THIS_ DWORD pdwFlags) PURE; + STDMETHOD(Pause)(THIS_ BOOL fPause) PURE; + STDMETHOD(GetState)(THIS_ DWORD *pdwState) PURE; + STDMETHOD(SetPitch)(THIS_ XACTPITCH pitch) PURE; + STDMETHOD(SetVolume)(THIS_ XACTVOLUME volume) PURE; + STDMETHOD(SetMatrixCoefficients)(THIS_ UINT32 uSrcChannelCount, UINT32 uDstChannelCount, float *pMatrixCoefficients) PURE; + STDMETHOD(GetProperties)(THIS_ LPXACT_WAVE_INSTANCE_PROPERTIES pProperties) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IXACT3Wave methods ***/ +#define IXACT3Wave_Destroy(p) (p)->lpVtbl->Destroy(p) +#define IXACT3Wave_Play(p) (p)->lpVtbl->Destroy(p) +#define IXACT3Wave_Stop(p,a) (p)->lpVtbl->Stop(p,a) +#define IXACT3Wave_Pause(p,a) (p)->lpVtbl->Pause(p,a) +#define IXACT3Wave_GetState(p,a) (p)->lpVtbl->GetState(p,a) +#define IXACT3Wave_SetPitch(p,a) (p)->lpVtbl->SetPitch(p,a) +#define IXACT3Wave_SetVolume(p,a) (p)->lpVtbl->SetVolume(p,a) +#define IXACT3Wave_SetMatrixCoefficients(p,a,b,c) (p)->lpVtbl->SetMatrixCoefficients(p,a,b,c) +#define IXACT3Wave_GetProperties(p,a) (p)->lpVtbl->GetProperties(p,a) +#else +/*** IXACT3Wave methods ***/ +#define IXACT3Wave_Destroy(p) (p)->Destroy() +#define IXACT3Wave_Play(p) (p)->Destroy() +#define IXACT3Wave_Stop(p,a) (p)->Stop(a) +#define IXACT3Wave_Pause(p,a) (p)->Pause(a) +#define IXACT3Wave_GetState(p,a) (p)->Stop(a) +#define IXACT3Wave_SetPitch(p,a) (p)->SetVariable(a) +#define IXACT3Wave_SetVolume(p,a) (p)->SetVolume(a) +#define IXACT3Wave_SetMatrixCoefficients(p,a,b,c) (p)->SetMatrixCoefficients(a,b,c) +#define IXACT3Wave_GetProperties(p,a) (p)->GetProperties(a) +#endif + #define XACT_FLAG_ENGINE_CREATE_MANAGEDATA XACT_FLAG_MANAGEDATA #define XACT_FLAG_ENGINE_STOP_IMMEDIATE XACT_FLAG_STOP_IMMEDIATE

1 0