wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

Sebastian Lackner : wine.inf: Fix timezone for America/Tijuana.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: 78e7eac8f6aa2625e01f40403140618b61f83d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78e7eac8f6aa2625e01f40403… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 28 02:45:41 2015 +0200 wine.inf: Fix timezone for America/Tijuana. The dates were changed some time ago. DST starts now on the second Sunday in March and ends on the first Sunday in November. --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index ca71aef..1e4de94 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2843,7 +2843,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"TZI",1,e0,01,00,00,00, HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Display",,"America/Tijuana" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Dlt",,"Pacific Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Std",,"Pacific Standard Time (Mexico)" -HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"Display",,"Europe/Paris" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"Dlt",,"Romance Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"Std",,"Romance Standard Time"

1 0

Sebastian Lackner : wine.inf: Fix timezone for America/St_Johns.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: 39431ecedfa8a336d6ca1fa6827374beeb81944c URL: http://source.winehq.org/git/wine.git/?a=commit;h=39431ecedfa8a336d6ca1fa68… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 28 02:45:03 2015 +0200 wine.inf: Fix timezone for America/St_Johns. Clocks are changed at 02:00 and not 00:01. --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c7ab3c5..ca71aef 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2823,7 +2823,7 @@ HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time,"TZI",1,30,fd,ff,ff HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"Display",,"America/St_Johns" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"Dlt",,"Newfoundland Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"Std",,"Newfoundland Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"TZI",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"TZI",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"Display",,"Asia/Irkutsk" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"Dlt",,"North Asia East Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"Std",,"North Asia East Standard Time"

1 0

Sebastian Lackner : wine.inf: Fix timezone for Africa/Windhoek.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: ca0ad57f34eb95627c541be2a3d25c7b32c9c319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca0ad57f34eb95627c541be2a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 28 02:44:30 2015 +0200 wine.inf: Fix timezone for Africa/Windhoek. According to the publicly available information, DST should start on the first Sunday in September, not the second. --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index fc14f4d..c7ab3c5 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2811,7 +2811,7 @@ HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"TZI",1,98,fe,f HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"Display",,"Africa/Windhoek" HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"Dlt",,"Namibia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"Std",,"Namibia Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"Display",,"Asia/Katmandu" HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"Dlt",,"Nepal Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"Std",,"Nepal Standard Time"

1 0

Sebastian Lackner : wine.inf: Remove deprecated daylight saving time information for various timezones.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: 5184155dfadbdcde9ff95558fd4eba1314f32bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5184155dfadbdcde9ff95558f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 28 02:12:21 2015 +0200 wine.inf: Remove deprecated daylight saving time information for various timezones. The following timezones do not have daylight saving time anymore. Asia/Baghdad - last DST in 2007 Asia/Yerevan - last DST in 2011 Europe/Minsk - last DST in 2011 Asia/Yekaterinburg - last DST in 2011 Asia/Novosibirsk - last DST in 2011 Asia/Irkutsk - last DST in 2011 Asia/Krasnoyarsk - last DST in 2011 Europe/Moscow - last DST in 2011, changed in 2014 Asia/Vladivostok - last DST in 2011 Australia/Perth - last DST in 2009 Asia/Yakutsk - last DST in 2011 --- loader/wine.inf.in | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5184155dfadbdcde9ff95…

1 0

Sebastian Lackner : d3d9/tests: Fix compile error with gcc 4.9.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: cf9c3fed1886ccc04784d708e0f1b839d1f9debf URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9c3fed1886ccc04784d708e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 24 17:03:19 2015 +0200 d3d9/tests: Fix compile error with gcc 4.9. --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 08362e1..14b80d5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -540,7 +540,7 @@ done: static void test_specular_lighting(void) { static const unsigned int vertices_side = 5; - static const unsigned int indices_count = (vertices_side - 1) * (vertices_side - 1) * 2 * 3; + const unsigned int indices_count = (vertices_side - 1) * (vertices_side - 1) * 2 * 3; static const DWORD fvf = D3DFVF_XYZ | D3DFVF_NORMAL; static const D3DMATRIX mat = {{{

1 0

Michael Stefaniuc : dmscript: Get rid of the extra pointer to a DMUS_OBJECTDESC.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: 26623d30f4d51a9925ae858cffefef3b4b3e1158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26623d30f4d51a9925ae858cf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 28 00:17:31 2015 +0200 dmscript: Get rid of the extra pointer to a DMUS_OBJECTDESC. --- dlls/dmscript/script.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 78273c6..98b9759 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -40,7 +40,6 @@ typedef struct IDirectMusicScriptImpl { struct dmobject dmobj; LONG ref; IDirectMusicPerformance *pPerformance; - DMUS_OBJECTDESC *pDesc; DMUS_IO_SCRIPT_HEADER *pHeader; DMUS_IO_VERSION *pVersion; WCHAR *pwzLanguage; @@ -98,7 +97,6 @@ static ULONG WINAPI IDirectMusicScriptImpl_Release(IDirectMusicScript *iface) HeapFree(GetProcessHeap(), 0, This->pVersion); HeapFree(GetProcessHeap(), 0, This->pwzLanguage); HeapFree(GetProcessHeap(), 0, This->pwzSource); - HeapFree(GetProcessHeap(), 0, This->pDesc); HeapFree(GetProcessHeap(), 0, This); DMSCRIPT_UnlockModule(); } @@ -439,20 +437,20 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS } case DMUS_FOURCC_GUID_CHUNK: { TRACE_(dmfile)(": GUID chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read (pStm, &This->pDesc->guidObject, Chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT; + IStream_Read (pStm, &This->dmobj.desc.guidObject, Chunk.dwSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: { TRACE_(dmfile)(": version chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read (pStm, &This->pDesc->vVersion, Chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION; + IStream_Read (pStm, &This->dmobj.desc.vVersion, Chunk.dwSize, NULL); break; } case DMUS_FOURCC_CATEGORY_CHUNK: { TRACE_(dmfile)(": category chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_CATEGORY; - IStream_Read (pStm, This->pDesc->wszCategory, Chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_CATEGORY; + IStream_Read (pStm, This->dmobj.desc.wszCategory, Chunk.dwSize, NULL); break; } case FOURCC_RIFF: { @@ -520,8 +518,8 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS case mmioFOURCC('I','N','A','M'): case DMUS_FOURCC_UNAM_CHUNK: { TRACE_(dmfile)(": name chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, This->pDesc->wszName, Chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME; + IStream_Read (pStm, This->dmobj.desc.wszName, Chunk.dwSize, NULL); break; } case mmioFOURCC('I','A','R','T'): @@ -635,7 +633,6 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, dmobject_init(&obj->dmobj, &CLSID_DirectMusicScript, (IUnknown*)&obj->IDirectMusicScript_iface); obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - obj->pDesc = &obj->dmobj.desc; DMSCRIPT_LockModule(); hr = IDirectMusicScript_QueryInterface(&obj->IDirectMusicScript_iface, lpcGUID, ppobj);

1 0

Michael Stefaniuc : dmscript: Use the generic DirectMusicObject implementation for DMScript.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: 71b28e2e1c80fa9a12e98179ed36ba77a8cb234e URL: http://source.winehq.org/git/wine.git/?a=commit;h=71b28e2e1c80fa9a12e98179e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 28 00:15:18 2015 +0200 dmscript: Use the generic DirectMusicObject implementation for DMScript. --- dlls/dmscript/Makefile.in | 1 + dlls/dmscript/dmobject.c | 185 +++++++++++++++++++++++++++++++++++++++ dlls/dmscript/dmobject.h | 55 ++++++++++++ dlls/dmscript/dmscript_private.h | 9 -- dlls/dmscript/script.c | 154 ++++++++------------------------ 5 files changed, 278 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71b28e2e1c80fa9a12e98…

1 0

Michael Stefaniuc : dmloader: Remove superfluous "IDirectMusicContainer" from method names.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: 149859b00290f229242ac28c61b245283b9c3f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=149859b00290f229242ac28c6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 28 00:14:10 2015 +0200 dmloader: Remove superfluous "IDirectMusicContainer" from method names. --- dlls/dmloader/container.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 2e15a71..ab43c6b 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -184,7 +184,9 @@ static inline IDirectMusicContainerImpl *impl_from_IDirectMusicObject(IDirectMus return CONTAINING_RECORD(iface, IDirectMusicContainerImpl, dmobj.IDirectMusicObject_iface); } -static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicObject_ParseDescriptor (LPDIRECTMUSICOBJECT iface, LPSTREAM pStream, LPDMUS_OBJECTDESC pDesc) { +static HRESULT WINAPI IDirectMusicObjectImpl_ParseDescriptor(IDirectMusicObject *iface, + IStream *pStream, DMUS_OBJECTDESC *pDesc) +{ IDirectMusicContainerImpl *This = impl_from_IDirectMusicObject(iface); WINE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[1], ListCount[1]; @@ -359,7 +361,7 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { dmobj_IDirectMusicObject_Release, dmobj_IDirectMusicObject_GetDescriptor, dmobj_IDirectMusicObject_SetDescriptor, - IDirectMusicContainerImpl_IDirectMusicObject_ParseDescriptor + IDirectMusicObjectImpl_ParseDescriptor }; /* IPersistStream part: */ @@ -368,7 +370,8 @@ static inline IDirectMusicContainerImpl *impl_from_IPersistStream(IPersistStream return CONTAINING_RECORD(iface, IDirectMusicContainerImpl, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) { +static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +{ IDirectMusicContainerImpl *This = impl_from_IPersistStream(iface); WINE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; @@ -792,7 +795,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IDirectMusicContainerImpl_IPersistStream_Load, + IPersistStreamImpl_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax };

1 0

Michael Stefaniuc : dmloader: Add and use a generic IPersistStream_GetClassID.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: 8c6c7f6b49bc5b611784695a40410a81a74975c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c6c7f6b49bc5b611784695a4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 28 00:13:38 2015 +0200 dmloader: Add and use a generic IPersistStream_GetClassID. --- dlls/dmloader/container.c | 15 +-------------- dlls/dmloader/dmobject.c | 15 +++++++++++++++ dlls/dmloader/dmobject.h | 2 ++ dlls/dmloader/tests/loader.c | 2 ++ dlls/dmusic/dmobject.c | 15 +++++++++++++++ dlls/dmusic/dmobject.h | 2 ++ 6 files changed, 37 insertions(+), 14 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 7356bc8..2e15a71 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -368,19 +368,6 @@ static inline IDirectMusicContainerImpl *impl_from_IPersistStream(IPersistStream return CONTAINING_RECORD(iface, IDirectMusicContainerImpl, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - IDirectMusicContainerImpl *This = impl_from_IPersistStream(iface); - - TRACE("(%p, %p)\n", This, pClassID); - if (IsBadWritePtr (pClassID, sizeof(CLSID))) { - ERR(": pClassID bad write pointer\n"); - return E_POINTER; - } - - *pClassID = CLSID_DirectMusicContainer; - return S_OK; -} - static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) { IDirectMusicContainerImpl *This = impl_from_IPersistStream(iface); WINE_CHUNK Chunk; @@ -803,7 +790,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_QueryInterface, dmobj_IPersistStream_AddRef, dmobj_IPersistStream_Release, - IDirectMusicContainerImpl_IPersistStream_GetClassID, + dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, IDirectMusicContainerImpl_IPersistStream_Load, unimpl_IPersistStream_Save, diff --git a/dlls/dmloader/dmobject.c b/dlls/dmloader/dmobject.c index 4afd5b9..cabb6f7 100644 --- a/dlls/dmloader/dmobject.c +++ b/dlls/dmloader/dmobject.c @@ -1,5 +1,6 @@ /* * Base IDirectMusicObject Implementation + * Keep in sync with the master in dlls/dmusic/dmobject.c * * Copyright (C) 2003-2004 Rok Mandeljc * Copyright (C) 2014 Michael Stefaniuc @@ -134,6 +135,20 @@ ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) return IUnknown_Release(This->outer_unk); } +HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) +{ + struct dmobject *This = impl_from_IPersistStream(iface); + + TRACE("(%p, %p)\n", This, class); + + if (!class) + return E_POINTER; + + *class = This->desc.guidClass; + + return S_OK; +} + /* IPersistStream methods not implemented in native */ HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) { diff --git a/dlls/dmloader/dmobject.h b/dlls/dmloader/dmobject.h index 3574939..ad6bf6d 100644 --- a/dlls/dmloader/dmobject.h +++ b/dlls/dmloader/dmobject.h @@ -1,5 +1,6 @@ /* * Base IDirectMusicObject Implementation + * Keep in sync with the master in dlls/dmusic/dmobject.h * * Copyright (C) 2014 Michael Stefaniuc * @@ -42,6 +43,7 @@ HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID void **ret_iface) DECLSPEC_HIDDEN; ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface) DECLSPEC_HIDDEN; ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) DECLSPEC_HIDDEN; +HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) DECLSPEC_HIDDEN; /* IPersistStream methods not implemented in native */ HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index b2ba8fe..4b141f3 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -267,6 +267,8 @@ static void test_container(void) /* IPersistStream */ hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, NULL); + ok(hr == E_POINTER, "IPersistStream_GetClassID failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, &class); ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); ok(IsEqualGUID(&class, &CLSID_DirectMusicContainer), diff --git a/dlls/dmusic/dmobject.c b/dlls/dmusic/dmobject.c index 4afd5b9..cabb6f7 100644 --- a/dlls/dmusic/dmobject.c +++ b/dlls/dmusic/dmobject.c @@ -1,5 +1,6 @@ /* * Base IDirectMusicObject Implementation + * Keep in sync with the master in dlls/dmusic/dmobject.c * * Copyright (C) 2003-2004 Rok Mandeljc * Copyright (C) 2014 Michael Stefaniuc @@ -134,6 +135,20 @@ ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) return IUnknown_Release(This->outer_unk); } +HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) +{ + struct dmobject *This = impl_from_IPersistStream(iface); + + TRACE("(%p, %p)\n", This, class); + + if (!class) + return E_POINTER; + + *class = This->desc.guidClass; + + return S_OK; +} + /* IPersistStream methods not implemented in native */ HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) { diff --git a/dlls/dmusic/dmobject.h b/dlls/dmusic/dmobject.h index 3574939..ad6bf6d 100644 --- a/dlls/dmusic/dmobject.h +++ b/dlls/dmusic/dmobject.h @@ -1,5 +1,6 @@ /* * Base IDirectMusicObject Implementation + * Keep in sync with the master in dlls/dmusic/dmobject.h * * Copyright (C) 2014 Michael Stefaniuc * @@ -42,6 +43,7 @@ HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID void **ret_iface) DECLSPEC_HIDDEN; ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface) DECLSPEC_HIDDEN; ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) DECLSPEC_HIDDEN; +HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) DECLSPEC_HIDDEN; /* IPersistStream methods not implemented in native */ HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface,

1 0

Michael Stefaniuc : dmloader/tests: Add more DirectMusicCollection tests.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: d9e0c9fb8214f2fe6b751e767e76b2a0e1a0f6a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e0c9fb8214f2fe6b751e767… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 28 00:12:52 2015 +0200 dmloader/tests: Add more DirectMusicCollection tests. --- dlls/dmloader/tests/loader.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 8886be7..b2ba8fe 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -222,7 +222,9 @@ static void test_COM_container(void) static void test_container(void) { IDirectMusicContainer *dmc; + IDirectMusicObject *dmo; IPersistStream *ps; + DMUS_OBJECTDESC desc; CLSID class = { 0 }; ULARGE_INTEGER size; HRESULT hr; @@ -231,6 +233,37 @@ static void test_container(void) &IID_IDirectMusicContainer, (void**)&dmc); ok(hr == S_OK, "DirectMusicContainer create failed: %08x, expected S_OK\n", hr); + /* IDirectMusicObject */ + hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + hr = IDirectMusicObject_GetDescriptor(dmo, NULL); + ok(hr == E_POINTER, "IDirectMusicObject_GetDescriptor: expected E_POINTER, got %08x\n", hr); + hr = IDirectMusicObject_SetDescriptor(dmo, NULL); + ok(hr == E_POINTER, "IDirectMusicObject_SetDescriptor: expected E_POINTER, got %08x\n", hr); + ZeroMemory(&desc, sizeof(desc)); + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "IDirectMusicObject_GetDescriptor failed: %08x\n", hr); + ZeroMemory(&desc, sizeof(desc)); + desc.dwSize = 1; /* size is ignored */ + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "IDirectMusicObject_GetDescriptor failed: %08x\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, + "Fresh object has more valid data (%08x) than DMUS_OBJ_CLASS\n", desc.dwValidData); + /* DMUS_OBJ_CLASS is immutable */ + desc.dwValidData = DMUS_OBJ_CLASS; + desc.dwSize = 1; /* size is ignored */ + hr = IDirectMusicObject_SetDescriptor(dmo, &desc); + ok(hr == S_FALSE , "IDirectMusicObject_SetDescriptor failed: %08x\n", hr); + ok(!desc.dwValidData, "dwValidData wasn't cleared: %08x\n", desc.dwValidData); + desc.dwValidData = DMUS_OBJ_CLASS; + desc.guidClass = CLSID_DirectMusicSegment; + hr = IDirectMusicObject_SetDescriptor(dmo, &desc); + ok(hr == S_FALSE && !desc.dwValidData, "IDirectMusicObject_SetDescriptor failed: %08x\n", hr); + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "IDirectMusicObject_GetDescriptor failed: %08x\n", hr); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicContainer), + "guidClass changed, should be CLSID_DirectMusicContainer\n"); + /* IPersistStream */ hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
46
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 April 2015