November 2019 - Wine-devel - list.winehq.org

[PATCH 1/7] dnsapi: Increase buffer size to fix format-overflow warning.
by Rémi Bernon 14 Nov '19

14 Nov '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dnsapi/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index e601191c5de..f540662dfd2 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -71,7 +71,7 @@ static const char *dns_section_to_str( ns_sect section ) case ns_s_ar: return "Additional"; default: { - static char tmp[5]; + static char tmp[11]; FIXME( "unknown section: 0x%02x\n", section ); sprintf( tmp, "0x%02x", section ); return tmp; -- 2.24.0.rc2

4 14

[PATCH 1/4] wined3d: Introduce wined3d_stateblock_set_light().
by Zebediah Figura 14 Nov '19

14 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 41 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 933ad46a93d..bf1e577f85c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1640,6 +1640,44 @@ HRESULT CDECL wined3d_stateblock_set_stream_source_freq(struct wined3d_statebloc stateblock->changed.streamFreq |= 1u << stream_idx; return WINED3D_OK; } +HRESULT CDECL wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock, + UINT light_idx, const struct wined3d_light *light) +{ + struct wined3d_light_info *object = NULL; + + TRACE("stateblock %p, light_idx %u, light %p.\n", stateblock, light_idx, light); + + /* Check the parameter range. Need for speed most wanted sets junk lights + * which confuse the GL driver. */ + if (!light) + return WINED3DERR_INVALIDCALL; + + switch (light->type) + { + case WINED3D_LIGHT_POINT: + case WINED3D_LIGHT_SPOT: + case WINED3D_LIGHT_GLSPOT: + /* Incorrect attenuation values can cause the gl driver to crash. + * Happens with Need for speed most wanted. */ + if (light->attenuation0 < 0.0f || light->attenuation1 < 0.0f || light->attenuation2 < 0.0f) + { + WARN("Attenuation is negative, returning WINED3DERR_INVALIDCALL.\n"); + return WINED3DERR_INVALIDCALL; + } + break; + + case WINED3D_LIGHT_DIRECTIONAL: + case WINED3D_LIGHT_PARALLELPOINT: + /* Ignores attenuation */ + break; + + default: + WARN("Light type out of range, returning WINED3DERR_INVALIDCALL.\n"); + return WINED3DERR_INVALIDCALL; + } + + return wined3d_light_state_set_light(&stateblock->stateblock_state.light_state, light_idx, light, &object); +} static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a4caebe7185..8591aa51648 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -267,6 +267,7 @@ @ cdecl wined3d_stateblock_set_blend_factor(ptr ptr) @ cdecl wined3d_stateblock_set_clip_plane(ptr long ptr) @ cdecl wined3d_stateblock_set_index_buffer(ptr ptr long) +@ cdecl wined3d_stateblock_set_light(ptr long ptr) @ cdecl wined3d_stateblock_set_material(ptr ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) @ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a05305f4d6c..33f668f9347 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2675,6 +2675,8 @@ HRESULT __cdecl wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *sta UINT plane_idx, const struct wined3d_vec4 *plane); void __cdecl wined3d_stateblock_set_index_buffer(struct wined3d_stateblock *stateblock, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id); +HRESULT __cdecl wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock, + UINT light_idx, const struct wined3d_light *light); void __cdecl wined3d_stateblock_set_material(struct wined3d_stateblock *stateblock, const struct wined3d_material *material); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); HRESULT __cdecl wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock, -- 2.23.0

2 7

[PATCH 3/3] sapi: Add IConnectionPointContainer stub for ISpVoice.
by Jactry Zeng 14 Nov '19

14 Nov '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/sapi/tests/tts.c | 8 ++++++ dlls/sapi/tts.c | 62 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 2d62a9651d..092ea40c3b 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -37,6 +37,7 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) static void test_interfaces(void) { ISpeechVoice *speech_voice, *speech_voice2; + IConnectionPointContainer *container; ISpVoice *spvoice, *spvoice2; IDispatch *dispatch; IUnknown *unk; @@ -82,6 +83,13 @@ static void test_interfaces(void) ISpVoice_Release(spvoice2); ISpVoice_Release(spvoice); + hr = ISpeechVoice_QueryInterface(speech_voice, &IID_IConnectionPointContainer, + (void **)&container); + ok(hr == S_OK, "ISpeechVoice_QueryInterface failed: %#x.\n", hr); + EXPECT_REF(speech_voice, 2); + EXPECT_REF(container, 2); + IConnectionPointContainer_Release(container); + ISpeechVoice_Release(speech_voice); } diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 8f1ecd1894..584c3d56b7 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -38,6 +38,7 @@ struct speech_voice { ISpeechVoice ISpeechVoice_iface; ISpVoice ISpVoice_iface; + IConnectionPointContainer IConnectionPointContainer_iface; LONG ref; }; @@ -51,6 +52,11 @@ static inline struct speech_voice *impl_from_ISpVoice(ISpVoice *iface) return CONTAINING_RECORD(iface, struct speech_voice, ISpVoice_iface); } +static inline struct speech_voice *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) +{ + return CONTAINING_RECORD(iface, struct speech_voice, IConnectionPointContainer_iface); +} + /* ISpeechVoice interface */ static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID iid, void **obj) { @@ -64,6 +70,8 @@ static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID ii *obj = &This->ISpeechVoice_iface; else if (IsEqualIID(iid, &IID_ISpVoice)) *obj = &This->ISpVoice_iface; + else if (IsEqualIID(iid, &IID_IConnectionPointContainer)) + *obj = &This->IConnectionPointContainer_iface; else { *obj = NULL; @@ -726,6 +734,59 @@ static const ISpVoiceVtbl spvoice_vtbl = spvoice_DisplayUI }; +/* IConnectionPointContainer interface */ +static HRESULT WINAPI container_QueryInterface(IConnectionPointContainer *iface, REFIID iid, void **obj) +{ + struct speech_voice *This = impl_from_IConnectionPointContainer(iface); + + TRACE("(%p, %s %p).\n", iface, debugstr_guid(iid), obj); + + return ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj); +} + +static ULONG WINAPI container_AddRef(IConnectionPointContainer *iface) +{ + struct speech_voice *This = impl_from_IConnectionPointContainer(iface); + + TRACE("(%p).\n", iface); + + return ISpeechVoice_AddRef(&This->ISpeechVoice_iface); +} + +static ULONG WINAPI container_Release(IConnectionPointContainer *iface) +{ + struct speech_voice *This = impl_from_IConnectionPointContainer(iface); + + TRACE("(%p).\n", iface); + + return ISpeechVoice_Release(&This->ISpeechVoice_iface); +} + +static HRESULT WINAPI container_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **enum_cp) +{ + FIXME("(%p, %p): stub.\n", iface, enum_cp); + + return E_NOTIMPL; +} + +static HRESULT WINAPI container_FindConnectionPoint(IConnectionPointContainer *iface, REFIID riid, + IConnectionPoint **cp) +{ + FIXME("(%p, %s, %p): stub.\n", iface, debugstr_guid(riid), cp); + + return E_NOTIMPL; +} + +const static IConnectionPointContainerVtbl container_vtbl = +{ + container_QueryInterface, + container_AddRef, + container_Release, + container_EnumConnectionPoints, + container_FindConnectionPoint +}; + HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj) { struct speech_voice *This = heap_alloc(sizeof(*This)); @@ -734,6 +795,7 @@ HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj) if (!This) return E_OUTOFMEMORY; This->ISpeechVoice_iface.lpVtbl = &speech_voice_vtbl; This->ISpVoice_iface.lpVtbl = &spvoice_vtbl; + This->IConnectionPointContainer_iface.lpVtbl = &container_vtbl; This->ref = 1; hr = ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj); -- 2.24.0

2 1

[PATCH 2/3] sapi: Implement ISpVoice stub.
by Jactry Zeng 14 Nov '19

14 Nov '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/sapi/tests/tts.c | 24 ++- dlls/sapi/tts.c | 329 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 352 insertions(+), 1 deletion(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 8d13ed0053..2d62a9651d 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -36,7 +36,8 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) static void test_interfaces(void) { - ISpeechVoice *speech_voice; + ISpeechVoice *speech_voice, *speech_voice2; + ISpVoice *spvoice, *spvoice2; IDispatch *dispatch; IUnknown *unk; HRESULT hr; @@ -60,6 +61,27 @@ static void test_interfaces(void) EXPECT_REF(speech_voice, 1); IUnknown_Release(unk); + hr = CoCreateInstance(&CLSID_SpVoice, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpVoice, (void **)&spvoice); + ok(hr == S_OK, "Failed to create ISpVoice interface: %#x.\n", hr); + EXPECT_REF(spvoice, 1); + EXPECT_REF(speech_voice, 1); + + hr = ISpVoice_QueryInterface(spvoice, &IID_ISpeechVoice, (void **)&speech_voice2); + ok(hr == S_OK, "ISpVoice_QueryInterface failed: %#x.\n", hr); + EXPECT_REF(speech_voice2, 2); + EXPECT_REF(spvoice, 2); + EXPECT_REF(speech_voice, 1); + ISpeechVoice_Release(speech_voice2); + + hr = ISpeechVoice_QueryInterface(speech_voice, &IID_ISpVoice, (void **)&spvoice2); + ok(hr == S_OK, "ISpeechVoice_QueryInterface failed: %#x.\n", hr); + EXPECT_REF(speech_voice, 2); + EXPECT_REF(spvoice2, 2); + EXPECT_REF(spvoice, 1); + ISpVoice_Release(spvoice2); + ISpVoice_Release(spvoice); + ISpeechVoice_Release(speech_voice); } diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 4000db11f5..8f1ecd1894 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(sapi); struct speech_voice { ISpeechVoice ISpeechVoice_iface; + ISpVoice ISpVoice_iface; LONG ref; }; @@ -45,6 +46,11 @@ static inline struct speech_voice *impl_from_ISpeechVoice(ISpeechVoice *iface) return CONTAINING_RECORD(iface, struct speech_voice, ISpeechVoice_iface); } +static inline struct speech_voice *impl_from_ISpVoice(ISpVoice *iface) +{ + return CONTAINING_RECORD(iface, struct speech_voice, ISpVoice_iface); +} + /* ISpeechVoice interface */ static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID iid, void **obj) { @@ -56,6 +62,8 @@ static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID ii IsEqualIID(iid, &IID_IDispatch) || IsEqualIID(iid, &IID_ISpeechVoice)) *obj = &This->ISpeechVoice_iface; + else if (IsEqualIID(iid, &IID_ISpVoice)) + *obj = &This->ISpVoice_iface; else { *obj = NULL; @@ -398,6 +406,326 @@ static const ISpeechVoiceVtbl speech_voice_vtbl = speech_voice_DisplayUI, }; +/* ISpVoice interface */ +static HRESULT WINAPI spvoice_QueryInterface(ISpVoice *iface, REFIID iid, void **obj) +{ + struct speech_voice *This = impl_from_ISpVoice(iface); + + TRACE("(%p, %s %p).\n", iface, debugstr_guid(iid), obj); + + return ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj); +} + +static ULONG WINAPI spvoice_AddRef(ISpVoice *iface) +{ + struct speech_voice *This = impl_from_ISpVoice(iface); + + TRACE("(%p).\n", iface); + + return ISpeechVoice_AddRef(&This->ISpeechVoice_iface); +} + +static ULONG WINAPI spvoice_Release(ISpVoice *iface) +{ + struct speech_voice *This = impl_from_ISpVoice(iface); + + TRACE("(%p).\n", iface); + + return ISpeechVoice_Release(&This->ISpeechVoice_iface); +} + +static HRESULT WINAPI spvoice_SetNotifySink(ISpVoice *iface, ISpNotifySink *sink) +{ + FIXME("(%p, %p): stub.\n", iface, sink); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetNotifyWindowMessage(ISpVoice *iface, HWND hwnd, UINT msg, + WPARAM wparam, LPARAM lparam) +{ + FIXME("(%p, %p, %u, %lx, %lx): stub.\n", iface, hwnd, msg, wparam, lparam); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetNotifyCallbackFunction(ISpVoice *iface, SPNOTIFYCALLBACK *callback, + WPARAM wparam, LPARAM lparam) +{ + FIXME("(%p, %p, %lx, %lx): stub.\n", iface, callback, wparam, lparam); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetNotifyCallbackInterface(ISpVoice *iface, ISpNotifyCallback *callback, + WPARAM wparam, LPARAM lparam) +{ + FIXME("(%p, %p, %lx, %lx): stub.\n", iface, callback, wparam, lparam); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetNotifyWin32Event(ISpVoice *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_WaitForNotifyEvent(ISpVoice *iface, DWORD milliseconds) +{ + FIXME("(%p, %d): stub.\n", iface, milliseconds); + + return E_NOTIMPL; +} + +static HANDLE WINAPI spvoice_GetNotifyEventHandle(ISpVoice *iface) +{ + FIXME("(%p): stub.\n", iface); + + return NULL; +} + +static HRESULT WINAPI spvoice_SetInterest(ISpVoice *iface, ULONGLONG event, ULONGLONG queued) +{ + FIXME("(%p, %s, %s): stub.\n", iface, wine_dbgstr_longlong(event), wine_dbgstr_longlong(queued)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetEvents(ISpVoice *iface, ULONG count, SPEVENT *array, ULONG *fetched) +{ + FIXME("(%p, %u, %p, %p): stub.\n", iface, count, array, fetched); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetInfo(ISpVoice *iface, SPEVENTSOURCEINFO *info) +{ + FIXME("(%p, %p): stub.\n", iface, info); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetOutput(ISpVoice *iface, IUnknown *unk, BOOL changes) +{ + FIXME("(%p, %p, %d: stub.\n)", iface, unk, changes); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetOutputObjectToken(ISpVoice *iface, ISpObjectToken **token) +{ + FIXME("(%p, %p): stub.\n", iface, token); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetOutputStream(ISpVoice *iface, ISpStreamFormat **stream) +{ + FIXME("(%p, %p): stub.\n", iface, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_Pause(ISpVoice *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_Resume(ISpVoice *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetVoice(ISpVoice *iface, ISpObjectToken *token) +{ + FIXME("(%p, %p): stub.\n", iface, token); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetVoice(ISpVoice *iface, ISpObjectToken **token) +{ + FIXME("(%p, %p): stub.\n", iface, token); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWORD flags, ULONG *number) +{ + FIXME("(%p, %p, %#x, %p): stub.\n", iface, contents, flags, number); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SpeakStream(ISpVoice *iface, IStream *stream, DWORD flags, ULONG *number) +{ + FIXME("(%p, %p, %#x, %p): stub.\n", iface, stream, flags, number); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetStatus(ISpVoice *iface, SPVOICESTATUS *status, WCHAR **bookmark) +{ + FIXME("(%p, %p, %p): stub.\n", iface, status, bookmark); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_Skip(ISpVoice *iface, const WCHAR *type, LONG items, ULONG *skipped) +{ + FIXME("(%p, %s, %d, %p): stub.\n", iface, debugstr_w(type), items, skipped); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetPriority(ISpVoice *iface, SPVPRIORITY priority) +{ + FIXME("(%p, %d): stub.\n", iface, priority); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetPriority(ISpVoice *iface, SPVPRIORITY *priority) +{ + FIXME("(%p, %p): stub.\n", iface, priority); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetAlertBoundary(ISpVoice *iface, SPEVENTENUM boundary) +{ + FIXME("(%p, %d): stub.\n", iface, boundary); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetAlertBoundary(ISpVoice *iface, SPEVENTENUM *boundary) +{ + FIXME("(%p, %p): stub.\n", iface, boundary); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetRate(ISpVoice *iface, LONG adjust) +{ + FIXME("(%p, %d): stub.\n", iface, adjust); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetRate(ISpVoice *iface, LONG *adjust) +{ + FIXME("(%p, %p): stub.\n", iface, adjust); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetVolume(ISpVoice *iface, USHORT volume) +{ + FIXME("(%p, %d): stub.\n", iface, volume); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetVolume(ISpVoice *iface, USHORT *volume) +{ + FIXME("(%p, %p): stub.\n", iface, volume); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_WaitUntilDone(ISpVoice *iface, ULONG timeout) +{ + FIXME("(%p, %d): stub.\n", iface, timeout); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetSyncSpeakTimeout(ISpVoice *iface, ULONG timeout) +{ + FIXME("(%p, %d): stub.\n", iface, timeout); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetSyncSpeakTimeout(ISpVoice *iface, ULONG *timeout) +{ + FIXME("(%p, %p): stub.\n", iface, timeout); + + return E_NOTIMPL; +} + +static HANDLE WINAPI spvoice_SpeakCompleteEvent(ISpVoice *iface) +{ + FIXME("(%p): stub.\n", iface); + + return NULL; +} + +static HRESULT WINAPI spvoice_IsUISupported(ISpVoice *iface, const WCHAR *type, void *extra, + ULONG count, BOOL *supported) +{ + FIXME("(%p, %p, %p, %d, %p): stub.\n", iface, type, extra, count, supported); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_DisplayUI(ISpVoice *iface, HWND parent, const WCHAR *title, + const WCHAR *type, void *extra, ULONG count) +{ + FIXME("(%p, %p, %p, %p, %p, %d): stub.\n", iface, parent, title, type, extra, count); + + return E_NOTIMPL; +} + +static const ISpVoiceVtbl spvoice_vtbl = +{ + spvoice_QueryInterface, + spvoice_AddRef, + spvoice_Release, + spvoice_SetNotifySink, + spvoice_SetNotifyWindowMessage, + spvoice_SetNotifyCallbackFunction, + spvoice_SetNotifyCallbackInterface, + spvoice_SetNotifyWin32Event, + spvoice_WaitForNotifyEvent, + spvoice_GetNotifyEventHandle, + spvoice_SetInterest, + spvoice_GetEvents, + spvoice_GetInfo, + spvoice_SetOutput, + spvoice_GetOutputObjectToken, + spvoice_GetOutputStream, + spvoice_Pause, + spvoice_Resume, + spvoice_SetVoice, + spvoice_GetVoice, + spvoice_Speak, + spvoice_SpeakStream, + spvoice_GetStatus, + spvoice_Skip, + spvoice_SetPriority, + spvoice_GetPriority, + spvoice_SetAlertBoundary, + spvoice_GetAlertBoundary, + spvoice_SetRate, + spvoice_GetRate, + spvoice_SetVolume, + spvoice_GetVolume, + spvoice_WaitUntilDone, + spvoice_SetSyncSpeakTimeout, + spvoice_GetSyncSpeakTimeout, + spvoice_SpeakCompleteEvent, + spvoice_IsUISupported, + spvoice_DisplayUI +}; + HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj) { struct speech_voice *This = heap_alloc(sizeof(*This)); @@ -405,6 +733,7 @@ HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj) if (!This) return E_OUTOFMEMORY; This->ISpeechVoice_iface.lpVtbl = &speech_voice_vtbl; + This->ISpVoice_iface.lpVtbl = &spvoice_vtbl; This->ref = 1; hr = ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj); -- 2.24.0

2 1

[PATCH v2 1/7] wined3d: Add extra memory management fields to struct wined3d_adapter.
by Conor McCarthy 14 Nov '19

14 Nov '19

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 4 +++- dlls/wined3d/adapter_vk.c | 4 +++- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/directx.c | 11 +++++++---- dlls/wined3d/wined3d_private.h | 10 +++++++++- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 7018c6da..2cc6aaf9 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3881,7 +3881,9 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, TRACE("Reporting (fake) driver version 0x%08x-0x%08x.\n", driver_info->version_high, driver_info->version_low); - adapter->vram_bytes_used = 0; + memset(&adapter->memory_usage, 0, sizeof(adapter->memory_usage)); + adapter->memory_events = NULL; + adapter->event_count = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(driver_info->vram_bytes)); if (gl_info->supported[EXT_MEMORY_OBJECT]) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 21163a20..81526ade 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1180,7 +1180,9 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, VK_CALL(vkGetPhysicalDeviceMemoryProperties(adapter_vk->physical_device, &memory_properties)); adapter_vk_init_driver_info(adapter, &properties2.properties, &memory_properties); - adapter->vram_bytes_used = 0; + memset(&adapter->memory_usage, 0, sizeof(adapter->memory_usage)); + adapter->memory_events = NULL; + adapter->event_count = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); memcpy(&adapter->driver_uuid, id_properties.driverUUID, sizeof(adapter->driver_uuid)); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2a4d3778..3f525e8e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1202,10 +1202,10 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device TRACE("Emulating 0x%s bytes. 0x%s used, returning 0x%s left.\n", wine_dbgstr_longlong(driver_info->vram_bytes), - wine_dbgstr_longlong(device->adapter->vram_bytes_used), - wine_dbgstr_longlong(driver_info->vram_bytes - device->adapter->vram_bytes_used)); + wine_dbgstr_longlong(device->adapter->memory_usage[0].bytes_used), + wine_dbgstr_longlong(driver_info->vram_bytes - device->adapter->memory_usage[0].bytes_used)); - return min(UINT_MAX, driver_info->vram_bytes - device->adapter->vram_bytes_used); + return min(UINT_MAX, driver_info->vram_bytes - device->adapter->memory_usage[0].bytes_used); } void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 902cc444..fa991d36 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -146,16 +146,17 @@ static HRESULT wined3d_output_init(struct wined3d_output *output, const WCHAR *d /* Adjust the amount of used texture memory */ UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) { - adapter->vram_bytes_used += amount; + adapter->memory_usage[0].bytes_used += amount; TRACE("Adjusted used adapter memory by 0x%s to 0x%s.\n", wine_dbgstr_longlong(amount), - wine_dbgstr_longlong(adapter->vram_bytes_used)); - return adapter->vram_bytes_used; + wine_dbgstr_longlong(adapter->memory_usage[0].bytes_used)); + return adapter->memory_usage[0].bytes_used; } void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) { wined3d_output_cleanup(&adapter->output); + heap_free(adapter->memory_events); heap_free(adapter->formats); } @@ -2778,7 +2779,9 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, return NULL; wined3d_driver_info_init(&adapter->driver_info, &gpu_description, 0, 0); - adapter->vram_bytes_used = 0; + memset(&adapter->memory_usage, 0, sizeof(adapter->memory_usage)); + adapter->memory_events = NULL; + adapter->event_count = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); if (!wined3d_adapter_init(adapter, ordinal, &wined3d_adapter_no3d_ops)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f86853e9..65e7d43f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2868,6 +2868,12 @@ struct wined3d_output D3DDDI_VIDEO_PRESENT_SOURCE_ID vidpn_source_id; }; +struct wined3d_adapter_memory_usage +{ + UINT64 bytes_used; + UINT64 bytes_reserved; +}; + /* The adapter structure */ struct wined3d_adapter { @@ -2879,7 +2885,9 @@ struct wined3d_adapter struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; struct wined3d_output output; - UINT64 vram_bytes_used; + struct wined3d_adapter_memory_usage memory_usage[2]; + HANDLE *memory_events; + DWORD event_count; GUID driver_uuid; GUID device_uuid; LUID luid; -- 2.23.0

2 7

[PATCH] shell32: Fix definitions for FOLDERID_ProgramFilesX64 and FOLDERID_ProgramFilesCommonX64 on 64-bit.
by Hans Leidekker 14 Nov '19

14 Nov '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/shell32/shellpath.c | 12 ++++++++++++ dlls/shell32/tests/shellpath.c | 22 ++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 8c6e8a89b2..d9d65cbaed 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2697,9 +2697,15 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x54 */ &FOLDERID_ProgramFilesX64, +#ifdef _WIN64 + CSIDL_Type_CurrVer, + ProgramFilesDirW, + Program_FilesW, +#else CSIDL_Type_NonExistent, NULL, NULL, +#endif KF_CATEGORY_FIXED, /* category */ ProgramFilesX64W, /* name */ @@ -2717,9 +2723,15 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x55 */ &FOLDERID_ProgramFilesCommonX64, +#ifdef _WIN64 + CSIDL_Type_CurrVer, + ProgramFilesCommonX64W, + Program_Files_Common_FilesW, +#else CSIDL_Type_NonExistent, NULL, NULL, +#endif KF_CATEGORY_FIXED, /* category */ ProgramFilesCommonX64W, /* name */ diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index f768f44c8b..262714a9f3 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1932,6 +1932,28 @@ if (0) { /* crashes */ hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, len + 1); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + + path = NULL; + hr = pSHGetKnownFolderPath(&FOLDERID_ProgramFilesX64, 0, NULL, &path); +#ifdef _WIN64 + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(path != NULL, "path not set\n"); + CoTaskMemFree(path); +#else + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(path == NULL, "path set\n"); +#endif + + path = NULL; + hr = pSHGetKnownFolderPath(&FOLDERID_ProgramFilesCommonX64, 0, NULL, &path); +#ifdef _WIN64 + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path != NULL, "path not set\n"); + CoTaskMemFree(path); +#else + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(path == NULL, "path set\n"); +#endif } static BOOL is_in_strarray(const WCHAR *needle, const char *hay) -- 2.20.1

1 0

[PATCH] msvcrt: Fix scanf file locking when returning EOF.
by Erich E. Hoover 14 Nov '19

14 Nov '19

2 1

[PATCH resend] advapi32/tests: Remove a todo_wine.
by Zebediah Figura 14 Nov '19

14 Nov '19

This seems to have been fixed by recent changes to CreateProcess() implementation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/tests/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index aa9a69fed2..bd70ecaddf 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1793,7 +1793,7 @@ static void test_wow64(void) ok(!!service, "Failed to create service, error %u.\n", GetLastError()); ret = StartServiceA(service, 0, NULL); ok(!ret, "Expected failure.\n"); - todo_wine ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "Got error %u.\n", GetLastError()); + ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "Got error %u.\n", GetLastError()); ret = DeleteService(service); ok(ret, "Failed to delete service, error %u.\n", GetLastError()); -- 2.24.0

2 1

[PATCH] advapi32/tests: Remove a todo_wine.
by Zebediah Figura 14 Nov '19

14 Nov '19

This seems to have been fixed by the recent changes to CreateProcess(). --- dlls/advapi32/tests/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index aa9a69fed2..bd70ecaddf 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1793,7 +1793,7 @@ static void test_wow64(void) ok(!!service, "Failed to create service, error %u.\n", GetLastError()); ret = StartServiceA(service, 0, NULL); ok(!ret, "Expected failure.\n"); - todo_wine ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "Got error %u.\n", GetLastError()); + ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "Got error %u.\n", GetLastError()); ret = DeleteService(service); ok(ret, "Failed to delete service, error %u.\n", GetLastError()); -- 2.24.0

2 1

[PATCH] wineconsole: Fix "Select all" functionality in USER backend.
by Dmitry Timoshkov 14 Nov '19

14 Nov '19

Selection is stored in character cell coords, not in pixels. "Mark" functionality behaves correctly. In order to reproduce the bug run wineconsole, press right mouse button, choose Edit -> Select all, then Edit -> Copy, and paste the result into text editor (under Wine or native). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/wineconsole/user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 28e81261e9..5cc405d5b7 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1310,8 +1310,8 @@ static LRESULT CALLBACK WCUSER_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM break; case IDS_SELECTALL: PRIVATE(data)->selectPt1.X = PRIVATE(data)->selectPt1.Y = 0; - PRIVATE(data)->selectPt2.X = (data->curcfg.sb_width - 1) * data->curcfg.cell_width; - PRIVATE(data)->selectPt2.Y = (data->curcfg.sb_height - 1) * data->curcfg.cell_height; + PRIVATE(data)->selectPt2.X = data->curcfg.sb_width - 1; + PRIVATE(data)->selectPt2.Y = data->curcfg.sb_height - 1; WCUSER_SetSelection(data, 0); PRIVATE(data)->has_selection = TRUE; break; -- 2.20.1

1 0