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

Jacek Caban : wininet: Fixed connection_pool_cs declaration.
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: 89f1d8c58a67e62be18b6d48fc1aa871c77d626a URL: http://source.winehq.org/git/wine.git/?a=commit;h=89f1d8c58a67e62be18b6d48f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 7 18:24:05 2017 +0200 wininet: Fixed connection_pool_cs declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 02f6609..ef9f144 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -212,7 +212,7 @@ static CRITICAL_SECTION connection_pool_cs; static CRITICAL_SECTION_DEBUG connection_pool_debug = { 0, 0, &connection_pool_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + { &connection_pool_debug.ProcessLocksList, &connection_pool_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": connection_pool_cs") } }; static CRITICAL_SECTION connection_pool_cs = { &connection_pool_debug, -1, 0, 0, 0, 0 };

1 0

Alexandre Julliard : Release 2.12.
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: a94938819280aa52fbc545911ca70a6c3a83ab49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a94938819280aa52fbc545911… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 7 21:07:22 2017 +0200 Release 2.12. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 584 ++++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 310 insertions(+), 294 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a94938819280aa52fbc54…

1 0

Tag wine-2.12 : Alexandre Julliard : Release 2.12
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: refs/tags/wine-2.12 Tag: 2240874e0c16ecd33eaad834313bd3b9a79586ce URL: http://source.winehq.org/git/wine.git/?a=tag;h=2240874e0c16ecd33eaad834313b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 7 21:07:22 2017 +0200 Release 2.12

1 0

Zebediah Figura : msi: Don't increment the refcount when creating dialogs.
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: 5da9250394facb73148ddc7646753a6e730b5206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da9250394facb73148ddc764… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 6 22:37:01 2017 -0500 msi: Don't increment the refcount when creating dialogs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index fc9c24c..c3b74e6 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3916,7 +3916,6 @@ static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_di return NULL; strcpyW( dialog->name, name ); dialog->parent = parent; - msiobj_addref( &package->hdr ); dialog->package = package; dialog->event_handler = event_handler; dialog->finished = 0; @@ -3927,7 +3926,6 @@ static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_di rec = msi_get_dialog_record( dialog ); if( !rec ) { - msiobj_release( &package->hdr ); msi_free( dialog ); return NULL; } @@ -4054,7 +4052,6 @@ void msi_dialog_destroy( msi_dialog *dialog ) msi_free( dialog->control_default ); msi_free( dialog->control_cancel ); - msiobj_release( &dialog->package->hdr ); dialog->package = NULL; msi_free( dialog ); }

1 0

Zebediah Figura : msi: Implement UI messages for dialogs.
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: 3033daec1119e3d9543caa69c4f390a3a4eb88b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3033daec1119e3d9543caa69c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 6 22:42:00 2017 -0500 msi: Implement UI messages for dialogs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 74 +++++++++--------- dlls/msi/custom.c | 2 +- dlls/msi/dialog.c | 55 +++++++++++++- dlls/msi/msi.rc | 3 +- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 7 ++ dlls/msi/resource.h | 1 + dlls/msi/tests/package.c | 130 ++++++++++++++++++++++++++++++- po/ar.po | 191 ++++++++++++++++++++++++---------------------- po/bg.po | 191 ++++++++++++++++++++++++---------------------- po/ca.po | 191 ++++++++++++++++++++++++---------------------- po/cs.po | 191 ++++++++++++++++++++++++---------------------- po/da.po | 191 ++++++++++++++++++++++++---------------------- po/de.po | 191 ++++++++++++++++++++++++---------------------- po/el.po | 191 ++++++++++++++++++++++++---------------------- po/en.po | 194 +++++++++++++++++++++++++---------------------- po/en_US.po | 194 +++++++++++++++++++++++++---------------------- po/eo.po | 191 ++++++++++++++++++++++++---------------------- po/es.po | 191 ++++++++++++++++++++++++---------------------- po/fa.po | 191 ++++++++++++++++++++++++---------------------- po/fi.po | 191 ++++++++++++++++++++++++---------------------- po/fr.po | 191 ++++++++++++++++++++++++---------------------- po/he.po | 191 ++++++++++++++++++++++++---------------------- po/hi.po | 191 ++++++++++++++++++++++++---------------------- po/hr.po | 191 ++++++++++++++++++++++++---------------------- po/hu.po | 191 ++++++++++++++++++++++++---------------------- po/it.po | 191 ++++++++++++++++++++++++---------------------- po/ja.po | 191 ++++++++++++++++++++++++---------------------- po/ko.po | 191 ++++++++++++++++++++++++---------------------- po/lt.po | 191 ++++++++++++++++++++++++---------------------- po/ml.po | 191 ++++++++++++++++++++++++---------------------- po/nb_NO.po | 191 ++++++++++++++++++++++++---------------------- po/nl.po | 191 ++++++++++++++++++++++++---------------------- po/or.po | 191 ++++++++++++++++++++++++---------------------- po/pa.po | 191 ++++++++++++++++++++++++---------------------- po/pl.po | 191 ++++++++++++++++++++++++---------------------- po/pt_BR.po | 191 ++++++++++++++++++++++++---------------------- po/pt_PT.po | 191 ++++++++++++++++++++++++---------------------- po/rm.po | 191 ++++++++++++++++++++++++---------------------- po/ro.po | 191 ++++++++++++++++++++++++---------------------- po/ru.po | 191 ++++++++++++++++++++++++---------------------- po/sk.po | 191 ++++++++++++++++++++++++---------------------- po/sl.po | 191 ++++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 191 ++++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 191 ++++++++++++++++++++++++---------------------- po/sv.po | 191 ++++++++++++++++++++++++---------------------- po/te.po | 191 ++++++++++++++++++++++++---------------------- po/th.po | 191 ++++++++++++++++++++++++---------------------- po/tr.po | 191 ++++++++++++++++++++++++---------------------- po/uk.po | 191 ++++++++++++++++++++++++---------------------- po/wa.po | 191 ++++++++++++++++++++++++---------------------- po/wine.pot | 191 ++++++++++++++++++++++++---------------------- po/zh_CN.po | 191 ++++++++++++++++++++++++---------------------- po/zh_TW.po | 191 ++++++++++++++++++++++++---------------------- 54 files changed, 4785 insertions(+), 4280 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3033daec1119e3d9543ca…

1 0

Alistair Leslie-Hughes : include: Define IDirectSoundFXI3DL2Reverb interface.
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: 4dc3dad62193854d7f9390ec408f72e7707d045f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc3dad62193854d7f9390ec4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 4 05:16:11 2017 +0000 include: Define IDirectSoundFXI3DL2Reverb interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dsound.h | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/include/dsound.h b/include/dsound.h index fa23e86..d4f3918 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -103,6 +103,12 @@ DEFINE_GUID(IID_IDirectSoundFullDuplex, 0xEDCB4C7A,0xDAAB,0x4216,0xA4,0x2E,0x6C, typedef struct IDirectSoundFullDuplex *LPDIRECTSOUNDFULLDUPLEX,**LPLPDIRECTSOUNDFULLDUPLEX; #define IID_IDirectSoundFullDuplex8 IID_IDirectSoundFullDuplex +DEFINE_GUID(IID_IDirectSoundFXI3DL2Reverb, 0x4b166a6a, 0x0d66, 0x43f3, 0x80, 0xe3, 0xee, 0x62, 0x80, 0xde, 0xe1, 0xa4); +typedef struct IDirectSoundFXI3DL2Reverb *LPDIRECTSOUNDFXI3DL2REVERB; +#define IDirectSoundFXI3DL2Reverb8 IDirectSoundFXI3DL2Reverb +#define IID_IDirectSoundFXI3DL2Reverb8 IID_IDirectSoundFXI3DL2Reverb +typedef struct IDirectSoundFXI3DL2Reverb8 *LPDIRECTSOUNDFXI3DL2REVERB8; + DEFINE_GUID(DSDEVID_DefaultPlayback, 0xDEF00000,0x9C6D,0x47Ed,0xAA,0xF1,0x4D,0xDA,0x8F,0x2B,0x5C,0x03); DEFINE_GUID(DSDEVID_DefaultCapture, 0xDEF00001,0x9C6D,0x47Ed,0xAA,0xF1,0x4D,0xDA,0x8F,0x2B,0x5C,0x03); DEFINE_GUID(DSDEVID_DefaultVoicePlayback,0xDEF00002,0x9C6D,0x47Ed,0xAA,0xF1,0x4D,0xDA,0x8F,0x2B,0x5C,0x03); @@ -398,6 +404,24 @@ typedef struct _DSCBCAPS } DSCBCAPS, *LPDSCBCAPS; typedef const DSCBCAPS *LPCDSCBCAPS; +typedef struct _DSFXI3DL2Reverb +{ + LONG lRoom; + LONG lRoomHF; + FLOAT flRoomRolloffFactor; + FLOAT flDecayTime; + FLOAT flDecayHFRatio; + LONG lReflections; + FLOAT flReflectionsDelay; + LONG lReverb; + FLOAT flReverbDelay; + FLOAT flDiffusion; + FLOAT flDensity; + FLOAT flHFReference; +} DSFXI3DL2Reverb, *LPDSFXI3DL2Reverb; + +typedef const DSFXI3DL2Reverb *LPCDSFXI3DL2Reverb; + #define DSCCAPS_EMULDRIVER DSCAPS_EMULDRIVER #define DSCCAPS_CERTIFIED DSCAPS_CERTIFIED #define DSCCAPS_MULTIPLECAPTURE 0x00000001 @@ -1214,6 +1238,46 @@ DECLARE_INTERFACE_(IDirectSoundFullDuplex,IUnknown) #define IDirectSoundFullDuplex_Initialize(p,a,b,c,d,e,f,g,h) (p)->Initialize(a,b,c,d,e,f,g,h) #endif + +/***************************************************************************** + * IDirectSoundFXI3DL2Reverb interface + */ +#define INTERFACE IDirectSoundFXI3DL2Reverb +DECLARE_INTERFACE_(IDirectSoundFXI3DL2Reverb,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID, void**) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + /*** IDirectSoundFXI3DL2Reverb methods ***/ + STDMETHOD(SetAllParameters)(THIS_ LPCDSFXI3DL2Reverb reverb) PURE; + STDMETHOD(GetAllParameters)(THIS_ LPDSFXI3DL2Reverb reverb) PURE; + STDMETHOD(SetPreset)(THIS_ DWORD preset) PURE; + STDMETHOD(GetPreset)(THIS_ DWORD *preset) PURE; + STDMETHOD(SetQuality)(THIS_ LONG quality) PURE; + STDMETHOD(GetQuality)(THIS_ LONG *quality) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +#define IDirectSoundFXI3DL2Reverb_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirectSoundFXI3DL2Reverb_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirectSoundFXI3DL2Reverb_Release(p) (p)->lpVtbl->Release(p) +#define IDirectSoundFXI3DL2Reverb_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) +#define IDirectSoundFXI3DL2Reverb_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) +#define IDirectSoundFXI3DL2Reverb_SetPreset(p,a) (p)->lpVtbl->SetPreset(p,a) +#define IDirectSoundFXI3DL2Reverb_GetPreset(p,a) (p)->lpVtbl->GetPreset(p,a) +#else +#define IDirectSoundFXI3DL2Reverb_QueryInterface(p,a,b) (p)->QueryInterface(a,b) +#define IDirectSoundFXI3DL2Reverb_AddRef(p) (p)->AddRef() +#define IDirectSoundFXI3DL2Reverb_Release(p) (p)->Release() +#define IDirectSoundFXI3DL2Reverb_SetAllParameters(p,a) (p)->SetAllParameters(a) +#define IDirectSoundFXI3DL2Reverb_GetAllParameters(p,a) (p)->GetAllParameters(a) +#define IDirectSoundFXI3DL2Reverb_SetPreset(p,a) (p)->SetPreset(a) +#define IDirectSoundFXI3DL2Reverb_GetPreset(p,a) (p)->GetPreset(a) +#endif + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */

1 0

Alistair Leslie-Hughes : wmvcore: Support IWMReaderNetworkConfig1/ 2 interfaces in IWMReader.
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: 34b9b1002ebdfc3e1f06ba0633aa1a8cd7b49a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b9b1002ebdfc3e1f06ba063… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 6 23:34:37 2017 +0000 wmvcore: Support IWMReaderNetworkConfig1/2 interfaces in IWMReader. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 4 +- dlls/wmvcore/wmvcore_main.c | 425 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 427 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34b9b1002ebdfc3e1f06b…

1 0

Alistair Leslie-Hughes : mfreadwrite: Implement MFCreateSourceReaderFromByteStream.
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: bf0cad095fabea99dd84d00144aa7c01782b513f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf0cad095fabea99dd84d0014… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 6 02:38:10 2017 +0000 mfreadwrite: Implement MFCreateSourceReaderFromByteStream. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 172 ++++++++++++++++++++++++++++++++++++++ dlls/mfreadwrite/mfreadwrite.spec | 2 +- include/mfreadwrite.idl | 2 + 3 files changed, 175 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index d3feeaf..e09120d 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -20,8 +20,11 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "mfreadwrite.h" #include "wine/debug.h" @@ -50,3 +53,172 @@ HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAt return E_NOTIMPL; } + +typedef struct _srcreader +{ + IMFSourceReader IMFSourceReader_iface; + LONG ref; +} srcreader; + +static inline srcreader *impl_from_IMFSourceReader(IMFSourceReader *iface) +{ + return CONTAINING_RECORD(iface, srcreader, IMFSourceReader_iface); +} + +static HRESULT WINAPI src_reader_QueryInterface(IMFSourceReader *iface, REFIID riid, void **out) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFSourceReader)) + { + *out = &This->IMFSourceReader_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI src_reader_AddRef(IMFSourceReader *iface) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI src_reader_GetStreamSelection(IMFSourceReader *iface, DWORD index, BOOL *selected) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x, %p\n", This, index, selected); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWORD index, BOOL selected) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x, %d\n", This, index, selected); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWORD index, DWORD typeindex, + IMFMediaType **type) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x, %d, %p\n", This, index, typeindex, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_GetCurrentMediaType(IMFSourceReader *iface, DWORD index, IMFMediaType **type) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x, %p\n", This, index, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_SetCurrentMediaType(IMFSourceReader *iface, DWORD index, DWORD *reserved, + IMFMediaType *type) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x, %p, %p\n", This, index, reserved, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFGUID format, REFPROPVARIANT position) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, %s, %p\n", This, debugstr_guid(format), position); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, + DWORD flags, DWORD *actualindex, DWORD *sampleflags, LONGLONG *timestamp, + IMFSample **sample) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x, 0x%08x, %p, %p, %p, %p\n", This, index, flags, actualindex, + sampleflags, timestamp, sample); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_Flush(IMFSourceReader *iface, DWORD index) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x\n", This, index); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_GetServiceForStream(IMFSourceReader *iface, DWORD index, REFGUID service, + REFIID riid, void **object) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x, %s, %s, %p\n", This, index, debugstr_guid(service), debugstr_guid(riid), object); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_GetPresentationAttribute(IMFSourceReader *iface, DWORD index, + REFGUID guid, PROPVARIANT *attr) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x, %s, %p\n", This, index, debugstr_guid(guid), attr); + return E_NOTIMPL; +} + +struct IMFSourceReaderVtbl srcreader_vtbl = +{ + src_reader_QueryInterface, + src_reader_AddRef, + src_reader_Release, + src_reader_GetStreamSelection, + src_reader_SetStreamSelection, + src_reader_GetNativeMediaType, + src_reader_GetCurrentMediaType, + src_reader_SetCurrentMediaType, + src_reader_SetCurrentPosition, + src_reader_ReadSample, + src_reader_Flush, + src_reader_GetServiceForStream, + src_reader_GetPresentationAttribute +}; + +HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttributes *attributes, IMFSourceReader **reader) +{ + srcreader *object; + + TRACE("%p, %p, %p\n", stream, attributes, reader); + + object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + object->ref = 1; + object->IMFSourceReader_iface.lpVtbl = &srcreader_vtbl; + + *reader = &object->IMFSourceReader_iface; + return S_OK; +} diff --git a/dlls/mfreadwrite/mfreadwrite.spec b/dlls/mfreadwrite/mfreadwrite.spec index 70b95a8..4272b71 100644 --- a/dlls/mfreadwrite/mfreadwrite.spec +++ b/dlls/mfreadwrite/mfreadwrite.spec @@ -2,6 +2,6 @@ @ stub DllGetClassObject @ stub MFCreateSinkWriterFromMediaSink @ stub MFCreateSinkWriterFromURL -@ stub MFCreateSourceReaderFromByteStream +@ stdcall MFCreateSourceReaderFromByteStream(ptr ptr ptr) @ stdcall MFCreateSourceReaderFromMediaSource(ptr ptr ptr) @ stub MFCreateSourceReaderFromURL diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index c8816cd..dd8c124 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -93,5 +93,7 @@ interface IMFSinkWriter : IUnknown HRESULT GetStatistics([in] DWORD index, [out] MF_SINK_WRITER_STATISTICS *stats); }; +cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttributes *attributes," ) +cpp_quote( " IMFSourceReader **reader);" ) cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes," ) cpp_quote( " IMFSourceReader **reader);" )

1 0

Martin Storsjo : ntdll: Handle IMAGE_REL_BASED_DIR64 for arm64 in the same way as for x86_64.
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: 114d8aded773bdb8ea76f4dcf418a2d7f2d33d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=114d8aded773bdb8ea76f4dcf… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Jul 7 13:39:23 2017 +0300 ntdll: Handle IMAGE_REL_BASED_DIR64 for arm64 in the same way as for x86_64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 518a99f..dd1f74c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2476,7 +2476,7 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count case IMAGE_REL_BASED_HIGHLOW: *(int *)((char *)page + offset) += delta; break; -#ifdef __x86_64__ +#ifdef _WIN64 case IMAGE_REL_BASED_DIR64: *(INT_PTR *)((char *)page + offset) += delta; break;

1 0

Alistair Leslie-Hughes : mmdevapi/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: f6bd39f03e2c74650896b631f949964d778050d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bd39f03e2c74650896b631f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 5 02:36:55 2017 +0000 mmdevapi/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 9393f7b..e394d59 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -338,8 +338,8 @@ static void test_audioclient(void) (UINT)(t2/10000), (UINT)(t2 % 10000)); ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000) || broken(t2 == 0) /* (!) win10 */, - "Latency < default period, delta %dus (%x%08x vs %x%08x)\n", - (LONG)((t2-t1)/10), (DWORD)(t2 >> 32), (DWORD)t2, (DWORD)(t1 >> 32), (DWORD)t1); + "Latency < default period, delta %dus (%s vs %s)\n", + (LONG)((t2-t1)/10), wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t1)); /* Native appears to add the engine period to the HW latency in shared mode */ if(t2 == 0) win10 = TRUE;

1 0