wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Sebastian Lackner : windowscodecs/tests: Fix test condition which is always true.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: c0f5d024ca0d2b1248b9ba0478f4678c5e981a4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f5d024ca0d2b1248b9ba047… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jun 25 03:17:47 2015 +0200 windowscodecs/tests: Fix test condition which is always true. --- dlls/windowscodecs/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 8a22970..64ccab5 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -223,7 +223,7 @@ static void test_pixelformat_info(void) memset(value, 0xaa, 256 * sizeof(WCHAR)); hr = IWICComponentInfo_GetAuthor(info, len-1, value, NULL); ok(hr == E_INVALIDARG, "GetAuthor failed, hr=%x\n", hr); - ok(value[0] = 0xaaaa, "string modified\n"); + ok(value[0] == 0xaaaa, "string modified\n"); len = 0xdeadbeef; memset(value, 0xaa, 256 * sizeof(WCHAR));

1 0

Michael Stefaniuc : dmcompos: Move struct definitions to the files that need them.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: bf117ec5f418b1e9caa669fb79945938f8e00cb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf117ec5f418b1e9caa669fb7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:41:01 2015 +0200 dmcompos: Move struct definitions to the files that need them. --- dlls/dmcompos/chordmaptrack.c | 8 ++++++++ dlls/dmcompos/dmcompos_private.h | 34 ---------------------------------- dlls/dmcompos/signposttrack.c | 8 ++++++++ 3 files changed, 16 insertions(+), 34 deletions(-) diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index c282d9d..6773b9d 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_AddRef (LPPERSISTST /***************************************************************************** * IDirectMusicChordMapTrack implementation */ +typedef struct IDirectMusicChordMapTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicChordMapTrack; + /* IDirectMusicChordMapTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicChordMapTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicChordMapTrack, UnknownVtbl, iface); diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index 6a80445..8e67a18 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -43,12 +43,6 @@ #include "dmusics.h" /***************************************************************************** - * Interfaces - */ -typedef struct IDirectMusicChordMapTrack IDirectMusicChordMapTrack; -typedef struct IDirectMusicSignPostTrack IDirectMusicSignPostTrack; - -/***************************************************************************** * ClassFactory */ extern HRESULT WINAPI create_dmchordmap(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; @@ -56,34 +50,6 @@ extern HRESULT WINAPI create_dmcomposer(REFIID riid, void **ret_iface) DECLSPEC_ extern HRESULT WINAPI create_dmchordmaptrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; extern HRESULT WINAPI create_dmsignposttrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -/***************************************************************************** - * IDirectMusicChordMapTrack implementation structure - */ -struct IDirectMusicChordMapTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicChordMapTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - -/***************************************************************************** - * IDirectMusicSignPostTrack implementation structure - */ -struct IDirectMusicSignPostTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicSignPostTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - /********************************************************************** * Dll lifetime tracking declaration for dmcompos.dll */ diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index 0fe9c4b..ed7b706 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_AddRef (LPPERSISTST /***************************************************************************** * IDirectMusicSignPostTrack implementation */ +typedef struct IDirectMusicSignPostTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicSignPostTrack; + /* IDirectMusicSignPostTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicSignPostTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSignPostTrack, UnknownVtbl, iface);

1 0

Michael Stefaniuc : dmcompos/tests: Add some basic IDirectMusicTrack8 tests.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 1e421a26fbb458b3383d8df0e85b56ce8d40dc19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e421a26fbb458b3383d8df0e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:39:44 2015 +0200 dmcompos/tests: Add some basic IDirectMusicTrack8 tests. --- dlls/dmcompos/tests/dmcompos.c | 75 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index c4cf386..b0646a7 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -273,6 +273,42 @@ static void test_chordmaptrack(void) &IID_IDirectMusicTrack8, (void**)&dmt8); ok(hr == S_OK, "DirectMusicChordMapTrack create failed: %08x, expected S_OK\n", hr); + /* IDirectMusicTrack8 */ + hr = IDirectMusicTrack8_Init(dmt8, NULL); + ok(hr == S_OK, "IDirectMusicTrack8_Init failed: %08x\n", hr); + hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); + ok(hr == S_OK, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); + ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == S_OK, "IDirectMusicTrack8_Play failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); @@ -304,6 +340,45 @@ static void test_signposttrack(void) &IID_IDirectMusicTrack8, (void**)&dmt8); ok(hr == S_OK, "DirectMusicSignPostTrack create failed: %08x, expected S_OK\n", hr); + /* IDirectMusicTrack8 */ + hr = IDirectMusicTrack8_Init(dmt8, NULL); + ok(hr == S_OK, "IDirectMusicTrack8_Init failed: %08x\n", hr); + if (0) { + /* Crashes on Windows */ + hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); + ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == S_OK, "IDirectMusicTrack8_Play failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + } + /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);

1 0

Michael Stefaniuc : dmcompos: Implement the E_NOTIMPL methods of IDirectMusicTrack8.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 7090b26300bf26dbdc2d39cdfb61640d5f445d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7090b26300bf26dbdc2d39cdf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:38:37 2015 +0200 dmcompos: Implement the E_NOTIMPL methods of IDirectMusicTrack8. --- dlls/dmcompos/chordmaptrack.c | 74 ++++++++++++++++++------------ dlls/dmcompos/signposttrack.c | 103 +++++++++++++++++++++++++----------------- 2 files changed, 105 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7090b26300bf26dbdc2d3…

1 0

Michael Stefaniuc : dmcompos: IsParamSupported of DMChordMapTrack doesn' t crashes on NULL.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: d9aa14c5e07a01177a2f5493ae7746f157231992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9aa14c5e07a01177a2f5493a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:36:13 2015 +0200 dmcompos: IsParamSupported of DMChordMapTrack doesn't crashes on NULL. --- dlls/dmcompos/chordmaptrack.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index cac652c..9077c88 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -139,6 +139,10 @@ static HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_SetParam (LPDI static HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_IsParamSupported (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType) { ICOM_THIS_MULTI(IDirectMusicChordMapTrack, TrackVtbl, iface); TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + + if (!rguidType) + return E_POINTER; + if (IsEqualGUID (rguidType, &GUID_IDirectMusicChordMap)) { TRACE("param supported\n"); return S_OK;

1 0

Michael Stefaniuc : dmband/tests: Add some basic IDirectMusicTrack8 tests.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 8fae7fd4cc40679187b6bb4b7a911a7161e9aa01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fae7fd4cc40679187b6bb4b7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:32:57 2015 +0200 dmband/tests: Add some basic IDirectMusicTrack8 tests. --- dlls/dmband/tests/dmband.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 0041807..e1f00ae 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -185,6 +185,44 @@ static void test_bandtrack(void) &IID_IDirectMusicTrack8, (void**)&dmt8); ok(hr == S_OK, "DirectMusicBandTrack create failed: %08x, expected S_OK\n", hr); + /* IDirectMusicTrack8 */ + todo_wine { + hr = IDirectMusicTrack8_Init(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %08x\n", hr); + hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); + ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == DMUS_S_END, "IDirectMusicTrack8_Play failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == DMUS_S_END, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);

1 0

Michael Stefaniuc : dmband: Implement the E_NOTIMPL methods of IDirectMusicTrack8.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 6cbd743b30e758a259c9a299d6117405e5151416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cbd743b30e758a259c9a299d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:31:17 2015 +0200 dmband: Implement the E_NOTIMPL methods of IDirectMusicTrack8. --- dlls/dmband/bandtrack.c | 74 +++++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 30 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 08dde14..3c00415 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -91,6 +91,11 @@ static const IUnknownVtbl DirectMusicBandTrack_Unknown_Vtbl = { }; /* IDirectMusicBandTrack IDirectMusicTrack8 part: */ +static inline IDirectMusicBandTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicBandTrack, TrackVtbl); +} + static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); @@ -182,16 +187,22 @@ static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_IsParamSupported ( return DMUS_E_TYPE_UNSUPPORTED; } -static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) { @@ -230,10 +241,13 @@ static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_SetParamEx(LPDIREC return S_OK; } -static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - FIXME("(%p, %p, %d, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context, + DWORD trackgroup, IDirectMusicTrack **track) +{ + IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + return E_NOTIMPL; } static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { @@ -243,24 +257,24 @@ static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Join (LPDIRECTMUSI } static const IDirectMusicTrack8Vtbl DirectMusicBandTrack_DirectMusicTrack_Vtbl = { - IDirectMusicBandTrack_IDirectMusicTrack_QueryInterface, - IDirectMusicBandTrack_IDirectMusicTrack_AddRef, - IDirectMusicBandTrack_IDirectMusicTrack_Release, - IDirectMusicBandTrack_IDirectMusicTrack_Init, - IDirectMusicBandTrack_IDirectMusicTrack_InitPlay, - IDirectMusicBandTrack_IDirectMusicTrack_EndPlay, - IDirectMusicBandTrack_IDirectMusicTrack_Play, - IDirectMusicBandTrack_IDirectMusicTrack_GetParam, - IDirectMusicBandTrack_IDirectMusicTrack_SetParam, - IDirectMusicBandTrack_IDirectMusicTrack_IsParamSupported, - IDirectMusicBandTrack_IDirectMusicTrack_AddNotificationType, - IDirectMusicBandTrack_IDirectMusicTrack_RemoveNotificationType, - IDirectMusicBandTrack_IDirectMusicTrack_Clone, - IDirectMusicBandTrack_IDirectMusicTrack_PlayEx, - IDirectMusicBandTrack_IDirectMusicTrack_GetParamEx, - IDirectMusicBandTrack_IDirectMusicTrack_SetParamEx, - IDirectMusicBandTrack_IDirectMusicTrack_Compose, - IDirectMusicBandTrack_IDirectMusicTrack_Join + IDirectMusicBandTrack_IDirectMusicTrack_QueryInterface, + IDirectMusicBandTrack_IDirectMusicTrack_AddRef, + IDirectMusicBandTrack_IDirectMusicTrack_Release, + IDirectMusicBandTrack_IDirectMusicTrack_Init, + IDirectMusicBandTrack_IDirectMusicTrack_InitPlay, + IDirectMusicBandTrack_IDirectMusicTrack_EndPlay, + IDirectMusicBandTrack_IDirectMusicTrack_Play, + IDirectMusicBandTrack_IDirectMusicTrack_GetParam, + IDirectMusicBandTrack_IDirectMusicTrack_SetParam, + IDirectMusicBandTrack_IDirectMusicTrack_IsParamSupported, + IDirectMusicTrack8Impl_AddNotificationType, + IDirectMusicTrack8Impl_RemoveNotificationType, + IDirectMusicBandTrack_IDirectMusicTrack_Clone, + IDirectMusicBandTrack_IDirectMusicTrack_PlayEx, + IDirectMusicBandTrack_IDirectMusicTrack_GetParamEx, + IDirectMusicBandTrack_IDirectMusicTrack_SetParamEx, + IDirectMusicTrack8Impl_Compose, + IDirectMusicBandTrack_IDirectMusicTrack_Join }; /* IDirectMusicBandTrack IPersistStream part: */

1 0

Michael Stefaniuc : dmband: IsParamSupported method doesn' t crashes on NULL.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 6e98db3d4575e48cd688cc2e9313a77acad63018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e98db3d4575e48cd688cc2e9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:12:53 2015 +0200 dmband: IsParamSupported method doesn't crashes on NULL. --- dlls/dmband/bandtrack.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 14e368d..08dde14 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -159,6 +159,10 @@ static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_IsParamSupported ( ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + + if (!rguidType) + return E_POINTER; + if (IsEqualGUID (rguidType, &GUID_BandParam) || IsEqualGUID (rguidType, &GUID_Clear_All_Bands) || IsEqualGUID (rguidType, &GUID_ConnectToDLSCollection)

1 0

Ken Thomases : dbghelp: Parse the DWARF information in Mach-O modules.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 3a9698f4afff9e349146c126d682e00422e62064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9698f4afff9e349146c126d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:17:49 2015 -0500 dbghelp: Parse the DWARF information in Mach-O modules. At this point, this is just the .eh_frame information used for walking the stack. --- dlls/dbghelp/macho_module.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index f6e5ed3..f39b4b6 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1002,6 +1002,10 @@ BOOL macho_load_debug_info(struct module* module) macho_finish_stabs(module, &mdi.ht_symtab); + if (dwarf2_parse(module, module->reloc_delta, NULL /* FIXME: some thunks to deal with ? */, + &module->format_info[DFI_MACHO]->u.macho_info->file_map)) + ret = TRUE; + pool_destroy(&mdi.pool); return ret; } @@ -1125,6 +1129,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, HeapFree(GetProcessHeap(), 0, modfmt); goto leave; } + macho_info->module->reloc_delta = macho_info->module->module.BaseOfImage - fmap.u.macho.segs_start; macho_module_info = (void*)(modfmt + 1); macho_info->module->format_info[DFI_MACHO] = modfmt;

1 0

Ken Thomases : dbghelp: Add partial support for version 3 of DWARF CIEs which are generated by Clang /LLVM.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 500df92108ce726c177f62d8c18b4de9747b22a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=500df92108ce726c177f62d8c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:17:48 2015 -0500 dbghelp: Add partial support for version 3 of DWARF CIEs which are generated by Clang/LLVM. --- dlls/dbghelp/dwarf.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index fa9e559..03eb43b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2629,7 +2629,7 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* /* parse the CIE first */ version = dwarf2_parse_byte(ctx); - if (version != 1) + if (version != 1 && version != 3) { FIXME("unknown CIE version %u at %p\n", version, ctx->data - 1); return FALSE; @@ -2639,7 +2639,10 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* info->code_align = dwarf2_leb128_as_unsigned(ctx); info->data_align = dwarf2_leb128_as_signed(ctx); - info->retaddr_reg = dwarf2_parse_byte(ctx); + if (version == 1) + info->retaddr_reg = dwarf2_parse_byte(ctx); + else + info->retaddr_reg = dwarf2_leb128_as_unsigned(ctx); info->state.cfa_rule = RULE_CFA_OFFSET; end = NULL;

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2015