November 2019 - Wine-Commits

Nikolay Sivov : comsvcs: Implement BindToObject() for "new" moniker.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: 5e32397cdee1c0ea5a7de7c6e8157ddad8a605b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e32397cdee1c0ea5a7de7c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 11 10:36:51 2019 +0300 comsvcs: Implement BindToObject() for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/comsvcs/tests/comsvcs.c | 8 ++------ 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 86ffe2587b..827a6e8e5e 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -551,9 +551,42 @@ static HRESULT WINAPI new_moniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *si static HRESULT WINAPI new_moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riid, void **ret) { - FIXME("%p, %p, %p, %s, %p.\n", iface, pbc, pmkToLeft, debugstr_guid(riid), ret); + struct new_moniker *moniker = impl_from_IMoniker(iface); + IClassActivator *activator; + IClassFactory *factory; + BIND_OPTS2 bindopts; + MULTI_QI qi; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %p, %s, %p.\n", iface, pbc, pmkToLeft, debugstr_guid(riid), ret); + + bindopts.cbStruct = sizeof(bindopts); + if (FAILED(hr = IBindCtx_GetBindOptions(pbc, (BIND_OPTS *)&bindopts))) + return hr; + + if (!pmkToLeft) + { + qi.pIID = riid; + qi.pItf = NULL; + qi.hr = S_OK; + hr = CoCreateInstanceEx(&moniker->clsid, NULL, bindopts.dwClassContext, bindopts.pServerInfo, 1, &qi); + *ret = qi.pItf; + } + else + { + if (SUCCEEDED(hr = IMoniker_BindToObject(pmkToLeft, pbc, NULL, &IID_IClassActivator, (void **)&activator))) + { + hr = IClassActivator_GetClassObject(activator, &moniker->clsid, bindopts.dwClassContext, bindopts.locale, riid, ret); + IClassActivator_Release(activator); + } + else if (SUCCEEDED(hr = IMoniker_BindToObject(pmkToLeft, pbc, NULL, &IID_IClassFactory, (void **)&factory))) + { + hr = IClassFactory_CreateInstance(factory, NULL, riid, ret); + IClassFactory_Release(factory); + } + } + + return hr; } static HRESULT WINAPI new_moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riid, diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index d94b99afd1..29de7cfe97 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -352,10 +352,8 @@ todo_wine ok(hr == MK_E_UNAVAILABLE, "Unexpected hr %#x.\n", hr); hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&obj); -todo_wine ok(hr == S_OK, "Failed to bind to object, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(obj); + IUnknown_Release(obj); hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&obj); todo_wine @@ -423,10 +421,8 @@ todo_wine bind_opts.dwClassContext = CLSCTX_INPROC_SERVER; hr = CoGetObject(L"new:msxml2.domdocument", (BIND_OPTS *)&bind_opts, &IID_IXMLDOMDocument, (void **)&obj); -todo_wine ok(hr == S_OK, "Failed to create object, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(obj); + IUnknown_Release(obj); IBindCtx_Release(bindctx); }

1 0

Nikolay Sivov : comsvcs/tests: Add some tests for "new" moniker interfaction with bind context.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: bfbd3ed44f4dd1ae5e62659e70a895239be663fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfbd3ed44f4dd1ae5e62659e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 11 10:36:52 2019 +0300 comsvcs/tests: Add some tests for "new" moniker interfaction with bind context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/tests/comsvcs.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 29de7cfe97..d75cbfc642 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -58,6 +58,15 @@ DEFINE_EXPECT(driver_DestroyResource); DEFINE_EXPECT(driver_ResetResource); DEFINE_EXPECT(driver_Release); +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + HRESULT driver_DestroyResource_ret = S_OK; static HRESULT WINAPI driver_QueryInterface(IDispenserDriver *iface, REFIID riid, void **object) @@ -270,6 +279,7 @@ static void create_dispenser(void) static void test_new_moniker(void) { IMoniker *moniker, *moniker2, *inverse, *class_moniker; + IRunningObjectTable *rot; IUnknown *obj, *obj2; BIND_OPTS2 bind_opts; ULARGE_INTEGER size; @@ -425,6 +435,32 @@ todo_wine IUnknown_Release(obj); IBindCtx_Release(bindctx); + + /* Returned object is not bound to context. */ + hr = CreateBindCtx(0, &bindctx); + ok(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); + + eaten = 0; + hr = MkParseDisplayName(bindctx, L"new:msxml2.domdocument", &eaten, &moniker); + ok(hr == S_OK, "Failed to parse display name, hr %#x.\n", hr); + ok(eaten, "Unexpected eaten length %u.\n", eaten); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&obj); + ok(hr == S_OK, "Failed to bind to object, hr %#x.\n", hr); + EXPECT_REF(obj, 1); + + hr = IBindCtx_GetRunningObjectTable(bindctx, &rot); + ok(hr == S_OK, "Failed to get rot, hr %#x.\n", hr); + + hr = IRunningObjectTable_GetObject(rot, moniker, &obj2); +todo_wine + ok(hr == MK_E_UNAVAILABLE, "Unexpected hr %#x.\n", hr); + + IRunningObjectTable_Release(rot); + + IUnknown_Release(obj); + + IBindCtx_Release(bindctx); } START_TEST(comsvcs)

1 0

Alistair Leslie-Hughes : dinput: Keyboard device doesn't support property DIPROP_VIDPID.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: f10f98cfa2b956c73e48b83936a44e4a92c7409d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f10f98cfa2b956c73e48b839… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 10 08:58:47 2019 +0000 dinput: Keyboard device doesn't support property DIPROP_VIDPID. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/keyboard.c | 1 + dlls/dinput/tests/keyboard.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index b5e665933e..47f28cac52 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -577,6 +577,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, memcpy(ps->wsz, didoi.tszName, sizeof(ps->wsz)); return hr; } + case (DWORD_PTR) DIPROP_VIDPID: case (DWORD_PTR) DIPROP_RANGE: return DIERR_UNSUPPORTED; default: diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 84e6fed078..1cd31e0318 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -258,6 +258,7 @@ static void test_get_prop(IDirectInputA *pDI, HWND hwnd) HRESULT hr; IDirectInputDeviceA *pKeyboard = NULL; DIPROPRANGE diprg; + DIPROPDWORD vidpid; hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); @@ -272,6 +273,15 @@ static void test_get_prop(IDirectInputA *pDI, HWND hwnd) hr = IDirectInputDevice_GetProperty(pKeyboard, DIPROP_RANGE, &diprg.diph); ok(hr == DIERR_UNSUPPORTED, "IDirectInputDevice_GetProperty() did not return DIPROP_RANGE but: %08x\n", hr); + memset(&vidpid, 0, sizeof(vidpid)); + vidpid.diph.dwSize = sizeof(DIPROPDWORD); + vidpid.diph.dwHeaderSize = sizeof(DIPROPHEADER); + vidpid.diph.dwHow = DIPH_DEVICE; + vidpid.diph.dwObj = 0; + + hr = IDirectInputDevice_GetProperty(pKeyboard, DIPROP_VIDPID, &vidpid.diph); + ok(hr == DIERR_UNSUPPORTED, "got %08x\n", hr); + IUnknown_Release(pKeyboard); }

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.1.117.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: 54acff1227488bae34e4bd7d7ad01c67a23f21b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54acff1227488bae34e4bd7d… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Oct 30 13:00:04 2019 -0700 winevulkan: Update to VK spec version 1.1.117. Adds int16 types needed for spec update. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 6 +- dlls/winevulkan/vulkan_thunks.c | 76 +- dlls/winevulkan/vulkan_thunks.h | 2 + include/wine/vulkan.h | 1527 +++++++++++++++++++++------------------ 4 files changed, 903 insertions(+), 708 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54acff1227488bae34e4…

1 0

Alistair Leslie-Hughes : dmband: Rename IDirectMusicTrack8Impl to band_track.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: 9f90994b2fdd183830dce7435c5f59570d52a7a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f90994b2fdd183830dce743… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 10 17:23:39 2019 +0100 dmband: Rename IDirectMusicTrack8Impl to band_track. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/bandtrack.c | 79 ++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index eb62ec11ce..a0305bdb28 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -40,7 +40,7 @@ static inline IDirectMusicBandTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr return CONTAINING_RECORD(iface, IDirectMusicBandTrack, IDirectMusicTrack8_iface); } -static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, +static HRESULT WINAPI band_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -63,7 +63,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 * return S_OK; } -static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) +static ULONG WINAPI band_track_AddRef(IDirectMusicTrack8 *iface) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); @@ -73,7 +73,7 @@ static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) return ref; } -static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) +static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); @@ -88,15 +88,14 @@ static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) return ref; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, - IDirectMusicSegment *pSegment) +static HRESULT WINAPI band_track_Init(IDirectMusicTrack8 *iface, IDirectMusicSegment *pSegment) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p): stub\n", This, pSegment); return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface, +static HRESULT WINAPI band_track_InitPlay(IDirectMusicTrack8 *iface, IDirectMusicSegmentState *segment_state, IDirectMusicPerformance *performance, void **state_data, DWORD virtual_track8id, DWORD flags) { @@ -107,14 +106,14 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData) +static HRESULT WINAPI band_track_EndPlay(IDirectMusicTrack8 *iface, void *pStateData) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p): stub\n", This, pStateData); return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, void *state_data, +static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_data, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD flags, IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state, DWORD virtual_id) @@ -133,7 +132,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, +static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -141,7 +140,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, +static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, void *pParam) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -149,8 +148,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface, - REFGUID rguidType) +static HRESULT WINAPI band_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -178,8 +176,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 return DMUS_E_TYPE_UNSUPPORTED; } -static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, - REFGUID notiftype) +static HRESULT WINAPI band_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -187,7 +184,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTra return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, +static HRESULT WINAPI band_track_RemoveNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -196,7 +193,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, +static HRESULT WINAPI band_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -204,7 +201,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MU return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *state_data, +static HRESULT WINAPI band_track_PlayEx(IDirectMusicTrack8 *iface, void *state_data, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD flags, IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state, DWORD virtual_id) @@ -217,7 +214,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, v return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface, +static HRESULT WINAPI band_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME *rtNext, void *param, void *state_data, DWORD flags) { @@ -229,8 +226,8 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *ifac return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface, - REFGUID rguidType, REFERENCE_TIME rtTime, void *param, void *state_data, DWORD flags) +static HRESULT WINAPI band_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType, + REFERENCE_TIME rtTime, void *param, void *state_data, DWORD flags) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -240,7 +237,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *ifac return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context, +static HRESULT WINAPI band_track_Compose(IDirectMusicTrack8 *iface, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **track) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -249,8 +246,8 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, - IDirectMusicTrack *pNewTrack, MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup, +static HRESULT WINAPI band_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *pNewTrack, + MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup, IDirectMusicTrack **ppResultTrack) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -259,24 +256,24 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, } static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { - IDirectMusicTrack8Impl_QueryInterface, - IDirectMusicTrack8Impl_AddRef, - IDirectMusicTrack8Impl_Release, - IDirectMusicTrack8Impl_Init, - IDirectMusicTrack8Impl_InitPlay, - IDirectMusicTrack8Impl_EndPlay, - IDirectMusicTrack8Impl_Play, - IDirectMusicTrack8Impl_GetParam, - IDirectMusicTrack8Impl_SetParam, - IDirectMusicTrack8Impl_IsParamSupported, - IDirectMusicTrack8Impl_AddNotificationType, - IDirectMusicTrack8Impl_RemoveNotificationType, - IDirectMusicTrack8Impl_Clone, - IDirectMusicTrack8Impl_PlayEx, - IDirectMusicTrack8Impl_GetParamEx, - IDirectMusicTrack8Impl_SetParamEx, - IDirectMusicTrack8Impl_Compose, - IDirectMusicTrack8Impl_Join + band_track_QueryInterface, + band_track_AddRef, + band_track_Release, + band_track_Init, + band_track_InitPlay, + band_track_EndPlay, + band_track_Play, + band_track_GetParam, + band_track_SetParam, + band_track_IsParamSupported, + band_track_AddNotificationType, + band_track_RemoveNotificationType, + band_track_Clone, + band_track_PlayEx, + band_track_GetParamEx, + band_track_SetParamEx, + band_track_Compose, + band_track_Join }; /* IDirectMusicBandTrack IPersistStream part: */

1 0

Alistair Leslie-Hughes : dmscript: Script track IPersistStream IsDirty return S_FALSE.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: e437e48254e0febb9914a8f6ee4cb86a45942c6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e437e48254e0febb9914a8f6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 10 05:40:13 2019 +0000 dmscript: Script track IPersistStream IsDirty return S_FALSE. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/scripttrack.c | 2 +- dlls/dmscript/tests/dmscript.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index bc8e8ce595..47fe3ef0d2 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -277,7 +277,7 @@ static HRESULT WINAPI IPersistStreamImpl_GetClassID(IPersistStream *iface, CLSID static HRESULT WINAPI IPersistStreamImpl_IsDirty(IPersistStream *iface) { - return E_NOTIMPL; + return S_FALSE; } static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index ef2c17c3ca..d372f39d9e 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -227,7 +227,7 @@ static void test_scripttrack(void) /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); - todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE);

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.1.114.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: 9126cd623e78d1feee1c16e088c6ebd2f3b9bc92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9126cd623e78d1feee1c16e0… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Oct 30 13:00:03 2019 -0700 winevulkan: Update to VK spec version 1.1.114. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 17 ++ include/wine/vulkan.h | 354 +++++++++++++++++++++++----------------- 3 files changed, 219 insertions(+), 154 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9126cd623e78d1feee1c…

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.1.113.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: 7e736b5903d3d078bbf7bb6a509536a942f6b9a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e736b5903d3d078bbf7bb6a… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Oct 30 13:00:01 2019 -0700 winevulkan: Update to VK spec version 1.1.113. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 260 ++++++- dlls/winevulkan/vulkan_thunks.h | 46 ++ include/wine/vulkan.h | 1631 +++++++++++++++++++++++---------------- 4 files changed, 1252 insertions(+), 687 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e736b5903d3d078bbf7…

1 0

Liam Middlebrook : winevulkan: Don't add alias structs to struct-extensions list.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: b5752327125bc5f8bc6de16bb0bffe0fc096c973 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5752327125bc5f8bc6de16b… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Oct 30 13:00:00 2019 -0700 winevulkan: Don't add alias structs to struct-extensions list. This resolves compilation errors relating to duplicate case values for alias structures when building against spec version 1.1.106. An example of one of these errors has been included below: vulkan_thunks.c: In function ‘convert_VkDeviceCreateInfo_struct_chain’: vulkan_thunks.c:1997:9: error: duplicate case value case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES: ^~~~ vulkan_thunks.c:1377:9: note: previously used here case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES: ^~~~ Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3b80005c58..92be0941ed 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2962,6 +2962,13 @@ class VkRegistry(object): for struct in structs: struct.set_type_info(self.types) + # Alias structures have enum values equivalent to those of the + # structure which they are aliased against. we need to ignore alias + # structs when populating the struct extensions list, otherwise we + # will create duplicate case entries. + if struct.alias: + continue + for structextend in struct.structextends: s = self.types[structextend]["data"] s.struct_extensions.append(struct)

1 0

Derek Lesho : winevulkan: Mark members of required structs as required recursively.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: 410f5623e706b5b9b914c3934c8070872bc1d3c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=410f5623e706b5b9b914c393… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Oct 30 16:12:36 2019 -0500 winevulkan: Mark members of required structs as required recursively. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 4f1c03cc7c..3b80005c58 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2718,6 +2718,16 @@ class VkRegistry(object): elif "value" in enum_elem.keys(): self.consts.append(VkConstant(enum_elem.attrib["name"], enum_elem.attrib["value"])) + @staticmethod + def _require_type(type_info): + if type_info.is_alias(): + type_info = type_info.alias + type_info.required = True + if type(type_info) == VkStruct: + for member in type_info.members: + if "data" in member.type_info: + VkRegistry._require_type(member.type_info["data"]) + def _parse_extensions(self, root): """ Parse extensions section and pull in any types and commands for this extensioin. """ extensions = [] @@ -2771,10 +2781,7 @@ class VkRegistry(object): for t in require.findall("type"): type_info = self.types[t.attrib["name"]]["data"] - if type_info.is_alias(): - type_info = type_info.alias - type_info.required = True - + self._require_type(type_info) feature = require.attrib.get("feature") if feature and not self._is_feature_supported(feature): continue

1 0