wine-commits December 2019

wine-commits@winehq.org

1 participants
635 discussions

Hans Leidekker : wusa: Parse assembly manifests.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: bf46a167114ce24712c56a9c050ed216dfeaf671 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf46a167114ce24712c56a9c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 2 10:11:50 2019 +0100 wusa: Parse assembly manifests. Based on patches by Michael Müller and Sebastian Lackner. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/Makefile.in | 5 +- programs/wusa/main.c | 87 +++++++ programs/wusa/manifest.c | 567 ++++++++++++++++++++++++++++++++++++++++++++++ programs/wusa/wusa.h | 65 ++++++ 4 files changed, 722 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf46a167114ce24712c5…

1 0

Hans Leidekker : wusa: Add support for extracting MSU files.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 9934b25313e1a54ea3bd96b38c748ba86ab3fb5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9934b25313e1a54ea3bd96b3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 2 10:11:49 2019 +0100 wusa: Add support for extracting MSU files. Based on patches by Michael Müller and Sebastian Lackner. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/Makefile.in | 1 + programs/wusa/main.c | 369 +++++++++++++++++++++++++++++++++++++++++++++- programs/wusa/wusa.h | 62 ++++++++ 3 files changed, 427 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9934b25313e1a54ea3bd…

1 0

Jactry Zeng : sapi: Implement ISpStream stub.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: b276bd58a7b03e5328cbbd4d4a88c3c89b583f69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b276bd58a7b03e5328cbbd4d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Nov 18 10:19:00 2019 +0800 sapi: Implement ISpStream stub. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/automation.c | 180 +++++++++++++++++++++++++++++++++++++++++++ dlls/sapi/tests/automation.c | 6 ++ 2 files changed, 186 insertions(+) diff --git a/dlls/sapi/automation.c b/dlls/sapi/automation.c index 429f2ed3a6..7a9fa17f8f 100644 --- a/dlls/sapi/automation.c +++ b/dlls/sapi/automation.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(sapi); struct file_stream { ISpeechFileStream ISpeechFileStream_iface; + ISpStream ISpStream_iface; LONG ref; }; @@ -45,6 +46,11 @@ static inline struct file_stream *impl_from_ISpeechFileStream(ISpeechFileStream return CONTAINING_RECORD(iface, struct file_stream, ISpeechFileStream_iface); } +static inline struct file_stream *impl_from_ISpStream(ISpStream *iface) +{ + return CONTAINING_RECORD(iface, struct file_stream, ISpStream_iface); +} + /* ISpeechFileStream interface */ static HRESULT WINAPI file_stream_QueryInterface(ISpeechFileStream *iface, REFIID iid, void **obj) { @@ -57,6 +63,8 @@ static HRESULT WINAPI file_stream_QueryInterface(ISpeechFileStream *iface, REFII IsEqualIID(iid, &IID_ISpeechBaseStream) || IsEqualIID(iid, &IID_ISpeechFileStream)) *obj = &This->ISpeechFileStream_iface; + else if (IsEqualIID(iid, &IID_ISpStream)) + *obj = &This->ISpStream_iface; else { *obj = NULL; @@ -194,6 +202,177 @@ const static ISpeechFileStreamVtbl file_stream_vtbl = file_stream_Close }; +/* ISpStream interface */ +static HRESULT WINAPI spstream_QueryInterface(ISpStream *iface, REFIID iid, void **obj) +{ + struct file_stream *This = impl_from_ISpStream(iface); + + TRACE("(%p, %s, %p).\n", iface, debugstr_guid(iid), obj); + + return ISpeechFileStream_QueryInterface(&This->ISpeechFileStream_iface, iid, obj); +} + +static ULONG WINAPI spstream_AddRef(ISpStream *iface) +{ + struct file_stream *This = impl_from_ISpStream(iface); + + TRACE("(%p).\n", iface); + + return ISpeechFileStream_AddRef(&This->ISpeechFileStream_iface); +} + +static ULONG WINAPI spstream_Release(ISpStream *iface) +{ + struct file_stream *This = impl_from_ISpStream(iface); + + TRACE("(%p).\n", iface); + + return ISpeechFileStream_Release(&This->ISpeechFileStream_iface); +} + +static HRESULT WINAPI spstream_Read(ISpStream *iface, void *pv, ULONG cb, ULONG *read) +{ + FIXME("(%p, %p, %d, %p): stub.\n", iface, pv, cb, read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Write(ISpStream *iface, const void *pv, ULONG cb, ULONG *written) +{ + FIXME("(%p, %p, %d, %p): stub.\n", iface, pv, cb, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Seek(ISpStream *iface, LARGE_INTEGER mode, DWORD origin, ULARGE_INTEGER *position) +{ + FIXME("(%p, %s, %d, %p): stub.\n", iface, wine_dbgstr_longlong(mode.QuadPart), origin, position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_SetSize(ISpStream *iface, ULARGE_INTEGER size) +{ + FIXME("(%p, %s): stub.\n", iface, wine_dbgstr_longlong(size.QuadPart)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_CopyTo(ISpStream *iface, IStream *stream, ULARGE_INTEGER cb, + ULARGE_INTEGER *read, ULARGE_INTEGER *written) +{ + FIXME("(%p, %p, %s, %p, %p): stub.\n", iface, stream, wine_dbgstr_longlong(cb.QuadPart), + read, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Commit(ISpStream *iface, DWORD flag) +{ + FIXME("(%p, %d): stub.\n", iface, flag); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Revert(ISpStream *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_LockRegion(ISpStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER cb, DWORD type) +{ + FIXME("(%p, %s, %s, %d): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart), + wine_dbgstr_longlong(cb.QuadPart), type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_UnlockRegion(ISpStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER cb, DWORD type) +{ + FIXME("(%p, %s, %s, %d): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart), + wine_dbgstr_longlong(cb.QuadPart), type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Stat(ISpStream *iface, STATSTG *statstg, DWORD flag) +{ + FIXME("(%p, %p, %d): stub.\n", iface, statstg, flag); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Clone(ISpStream *iface, IStream **stream) +{ + FIXME("(%p, %p): stub.\n", iface, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_GetFormat(ISpStream *iface, GUID *format, WAVEFORMATEX **wave) +{ + FIXME("(%p, %p, %p): stub.\n", iface, format, wave); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_SetBaseStream(ISpStream *iface, IStream *stream, REFGUID format, + const WAVEFORMATEX *wave) +{ + FIXME("(%p, %p, %s, %p): stub.\n", iface, stream, debugstr_guid(format), wave); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_GetBaseStream(ISpStream *iface, IStream **stream) +{ + FIXME("(%p, %p): stub.\n", iface, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_BindToFile(ISpStream *iface, LPCWSTR filename, SPFILEMODE mode, + const GUID *format, const WAVEFORMATEX* wave, + ULONGLONG interest) +{ + FIXME("(%p, %s, %d, %s, %p, %s): stub.\n", iface, debugstr_w(filename), mode, debugstr_guid(format), + wave, wine_dbgstr_longlong(interest)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Close(ISpStream *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +const static ISpStreamVtbl spstream_vtbl = +{ + spstream_QueryInterface, + spstream_AddRef, + spstream_Release, + spstream_Read, + spstream_Write, + spstream_Seek, + spstream_SetSize, + spstream_CopyTo, + spstream_Commit, + spstream_Revert, + spstream_LockRegion, + spstream_UnlockRegion, + spstream_Stat, + spstream_Clone, + spstream_GetFormat, + spstream_SetBaseStream, + spstream_GetBaseStream, + spstream_BindToFile, + spstream_Close +}; + HRESULT file_stream_create(IUnknown *outer, REFIID iid, void **obj) { struct file_stream *This = heap_alloc(sizeof(*This)); @@ -201,6 +380,7 @@ HRESULT file_stream_create(IUnknown *outer, REFIID iid, void **obj) if (!This) return E_OUTOFMEMORY; This->ISpeechFileStream_iface.lpVtbl = &file_stream_vtbl; + This->ISpStream_iface.lpVtbl = &spstream_vtbl; This->ref = 1; hr = ISpeechFileStream_QueryInterface(&This->ISpeechFileStream_iface, iid, obj); diff --git a/dlls/sapi/tests/automation.c b/dlls/sapi/tests/automation.c index 57b6c7a375..c584b4ac2c 100644 --- a/dlls/sapi/tests/automation.c +++ b/dlls/sapi/tests/automation.c @@ -30,6 +30,7 @@ static void test_interfaces(void) ISpeechFileStream *filestream; ISpeechBaseStream *basestream; IDispatch *dispatch; + ISpStream *spstrem; IUnknown *unk; HRESULT hr; @@ -52,6 +53,11 @@ static void test_interfaces(void) ok(hr == S_OK, "Failed to create ISpeechBaseStream interface: %#x.\n", hr); ISpeechBaseStream_Release(basestream); + hr = CoCreateInstance(&CLSID_SpFileStream, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpStream, (void **)&spstrem); + ok(hr == S_OK, "Failed to create ISpStream interface: %#x.\n", hr); + + ISpStream_Release(spstrem); ISpeechFileStream_Release(filestream); }

1 0

Jactry Zeng : sapi: Implement ISpeechFileStream stub.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 28121b494b633c36105da2b75350c40de6b197c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28121b494b633c36105da2b7… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Nov 18 10:18:40 2019 +0800 sapi: Implement ISpeechFileStream stub. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/Makefile.in | 1 + dlls/sapi/automation.c | 210 +++++++++++++++++++++++++++++++++++++++++++ dlls/sapi/main.c | 3 + dlls/sapi/sapi_classes.idl | 13 +++ dlls/sapi/sapi_private.h | 1 + dlls/sapi/tests/Makefile.in | 1 + dlls/sapi/tests/automation.c | 63 +++++++++++++ include/sapi.idl | 34 +++++++ include/sapiaut.idl | 29 ++++++ 9 files changed, 355 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28121b494b633c36105d…

1 0

Jactry Zeng : sapi: Add IConnectionPointContainer stub for ISpVoice.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: e31b56b578abbc0657a80731d03aedd7b4fa65b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e31b56b578abbc0657a80731… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Nov 18 10:18:21 2019 +0800 sapi: Add IConnectionPointContainer stub for ISpVoice. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 e4b4e79943..26d13ec96a 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);

1 0

Jactry Zeng : sapi: Implement ISpVoice stub.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 58b20d1db7888a8039f3b97b5715c26ede4d6387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58b20d1db7888a8039f3b97b… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Nov 18 10:18:07 2019 +0800 sapi: Implement ISpVoice stub. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tests/tts.c | 24 +++- dlls/sapi/tts.c | 329 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 352 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=58b20d1db7888a8039f3…

1 0

Jactry Zeng : sapi: Implement ISpeechVoice stub.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 474a20a0b0a315594456aba88e60374e481dd6b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=474a20a0b0a315594456aba8… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Nov 18 10:17:51 2019 +0800 sapi: Implement ISpeechVoice stub. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/Makefile.in | 3 +- dlls/sapi/main.c | 3 + dlls/sapi/sapi_classes.idl | 13 ++ dlls/sapi/sapi_private.h | 1 + dlls/sapi/tests/Makefile.in | 3 +- dlls/sapi/tests/tts.c | 71 ++++++++ dlls/sapi/tts.c | 414 ++++++++++++++++++++++++++++++++++++++++++++ include/sapi.idl | 11 +- 8 files changed, 516 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=474a20a0b0a315594456…

1 0

Rémi Bernon : widl: Cast freed pointers to void* to fix discarded-array-qualifiers warning.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 1491453ea9f1610e60b65acca41269d3c4ac7c8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1491453ea9f1610e60b65acc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 13 14:51:22 2019 +0100 widl: Cast freed pointers to void* to fix discarded-array-qualifiers warning. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f37c7b0d67..9b8aa1a322 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4286,7 +4286,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const { print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); indent++; - print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); + print_file(file, indent, "__frame->_StubMsg.pfnFree((void*)%s%s);\n", local_var_prefix, var->name); } } else @@ -4361,7 +4361,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const print_phase_function(file, indent, array_type, local_var_prefix, phase, var, start_offset); print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); indent++; - print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); + print_file(file, indent, "__frame->_StubMsg.pfnFree((void*)%s%s);\n", local_var_prefix, var->name); break; } } @@ -4463,7 +4463,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const { print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); indent++; - print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); + print_file(file, indent, "__frame->_StubMsg.pfnFree((void*)%s%s);\n", local_var_prefix, var->name); indent--; } break;

1 0

Derek Lesho : users/tests: Test scan code prefix for MAPVK_VK_TO_VSC_EX.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 11ef39af39fef20032b08a09380c5a5ce30254e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11ef39af39fef20032b08a09… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Nov 12 14:50:19 2019 -0600 users/tests: Test scan code prefix for MAPVK_VK_TO_VSC_EX. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d0e7603811..ddaf7541e4 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1873,6 +1873,16 @@ static void test_key_map(void) vkey, numpad_scan); } } + + /* test the scan code prefixes of the right variant of a keys */ + s = MapVirtualKeyExA(VK_RCONTROL, MAPVK_VK_TO_VSC, kl); + ok(s >> 8 == 0x00, "Scan code prefixes should not be returned when not using MAPVK_VK_TO_VSC_EX %#1x\n", s >> 8); + s = MapVirtualKeyExA(VK_RCONTROL, MAPVK_VK_TO_VSC_EX, kl); + ok(s >> 8 == 0xE0 || broken(s == 0), "Scan code prefix for VK_RCONTROL should be 0xE0 when MAPVK_VK_TO_VSC_EX is set, was %#1x\n", s >> 8); + s = MapVirtualKeyExA(VK_RMENU, MAPVK_VK_TO_VSC_EX, kl); + ok(s >> 8 == 0xE0 || broken(s == 0), "Scan code prefix for VK_RMENU should be 0xE0 when MAPVK_VK_TO_VSC_EX is set, was %#1x\n", s >> 8); + s = MapVirtualKeyExA(VK_RSHIFT, MAPVK_VK_TO_VSC_EX, kl); + ok(s >> 8 == 0x00 || broken(s == 0), "The scan code shouldn't have a prefix, got %#1x\n", s >> 8); } #define shift 1

1 0

Derek Lesho : wineandroid: Set the scan code prefix when necessary.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 6da06330876fde9afaf546844518851fc8b67871 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6da06330876fde9afaf54684… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Nov 12 14:50:18 2019 -0600 wineandroid: Set the scan code prefix when necessary. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 2c37c42e0d..a0f3257f74 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -932,6 +932,11 @@ UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) break; } if (code < ARRAY_SIZE( vkey_to_scancode )) ret = vkey_to_scancode[code]; + + /* set scan code prefix */ + if (maptype == MAPVK_VK_TO_VSC_EX && + (code == VK_RCONTROL || code == VK_RMENU)) + ret |= 0xe000; break; case MAPVK_VSC_TO_VK: case MAPVK_VSC_TO_VK_EX:

1 0

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 December 2019