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

[PATCH 2/6] dmstyle: Rename IDirectMusicTrack8Impl to track_chord
by Alistair Leslie-Hughes 12 Nov '19

12 Nov '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmstyle/chordtrack.c | 81 +++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 42 deletions(-) diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index 70056e5677..fc62ee85c7 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -40,7 +40,7 @@ static inline IDirectMusicChordTrack *impl_from_IDirectMusicTrack8(IDirectMusicT return CONTAINING_RECORD(iface, IDirectMusicChordTrack, IDirectMusicTrack8_iface); } -static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, +static HRESULT WINAPI track_chord_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { IDirectMusicChordTrack *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 track_chord_AddRef(IDirectMusicTrack8 *iface) { IDirectMusicChordTrack *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 track_chord_Release(IDirectMusicTrack8 *iface) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); @@ -88,7 +88,7 @@ static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) return ref; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, +static HRESULT WINAPI track_chord_Init(IDirectMusicTrack8 *iface, IDirectMusicSegment *pSegment) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -96,7 +96,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface, +static HRESULT WINAPI track_chord_InitPlay(IDirectMusicTrack8 *iface, IDirectMusicSegmentState *pSegmentState, IDirectMusicPerformance *pPerformance, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { @@ -105,14 +105,14 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData) +static HRESULT WINAPI track_chord_EndPlay(IDirectMusicTrack8 *iface, void *pStateData) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p): stub\n", This, pStateData); return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, void *pStateData, +static HRESULT WINAPI track_chord_Play(IDirectMusicTrack8 *iface, void *pStateData, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { @@ -121,7 +121,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, +static HRESULT WINAPI track_chord_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -133,7 +133,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, +static HRESULT WINAPI track_chord_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, void *pParam) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -141,8 +141,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface, - REFGUID rguidType) +static HRESULT WINAPI track_chord_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -161,7 +160,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 return DMUS_E_TYPE_UNSUPPORTED; } -static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, +static HRESULT WINAPI track_chord_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID rguidNotificationType) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -169,7 +168,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTra return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, +static HRESULT WINAPI track_chord_RemoveNotificationType(IDirectMusicTrack8 *iface, REFGUID rguidNotificationType) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -177,7 +176,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, +static HRESULT WINAPI track_chord_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -185,7 +184,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MU return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *pStateData, +static HRESULT WINAPI track_chord_PlayEx(IDirectMusicTrack8 *iface, void *pStateData, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { @@ -195,9 +194,8 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, v return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface, - REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME *prtNext, void *pParam, - void *pStateData, DWORD dwFlags) +static HRESULT WINAPI track_chord_GetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType, + REFERENCE_TIME rtTime, REFERENCE_TIME *prtNext, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), @@ -205,8 +203,8 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *ifac return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface, - REFGUID rguidType, REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) +static HRESULT WINAPI track_chord_SetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType, + REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), @@ -214,7 +212,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *ifac return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context, +static HRESULT WINAPI track_chord_Compose(IDirectMusicTrack8 *iface, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **track) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -223,9 +221,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, - IDirectMusicTrack **ppResultTrack) +static HRESULT WINAPI track_chord_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *pNewTrack, + MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup, IDirectMusicTrack **ppResultTrack) { IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); @@ -233,24 +230,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 + track_chord_QueryInterface, + track_chord_AddRef, + track_chord_Release, + track_chord_Init, + track_chord_InitPlay, + track_chord_EndPlay, + track_chord_Play, + track_chord_GetParam, + track_chord_SetParam, + track_chord_IsParamSupported, + track_chord_AddNotificationType, + track_chord_RemoveNotificationType, + track_chord_Clone, + track_chord_PlayEx, + track_chord_GetParamEx, + track_chord_SetParamEx, + track_chord_Compose, + track_chord_Join }; static HRESULT parse_chordtrack_list(IDirectMusicChordTrack *This, DMUS_PRIVATE_CHUNK *pChunk, -- 2.17.1

1 0

[PATCH 0/4] Set the scan code prefix when necessary.
by Derek Lesho 11 Nov '19

11 Nov '19

I'm not sure if this is the best way to solve this issue, should we somehow move this behavior to user32? Thanks to @AntiUltimate on the VKx discord for finding out that this was the cause of the linked wine bug. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=45148 Derek Lesho (4): winex11: Set the scan code prefix when necessary. winemac: Set the scan code prefix when necessary. wineandroid: Set the scan code prefix when necessary. users/tests: Test scan code prefix for MAPVK_VK_TO_VSC. dlls/user32/tests/input.c | 10 ++++++++++ dlls/wineandroid.drv/keyboard.c | 9 ++++++++- dlls/winemac.drv/keyboard.c | 9 ++++++++- dlls/winex11.drv/keyboard.c | 9 ++++++++- 4 files changed, 34 insertions(+), 3 deletions(-) -- 2.23.0

2 6

[PATCH] ntdll: Support only ASCII digits in iswdigit implementation.
by Jacek Caban 11 Nov '19

11 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/string.c | 29 +++++++++++++++++++++++++++++ dlls/ntdll/wcstring.c | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-)

2 2

[PATCH v3] msvcrt/tests: Add iswdigit tests.
by Jacek Caban 11 Nov '19

11 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)

2 1

[PATCH 4/4] winegcc: Check if linker supports -Wl,-delayload before using it.
by Jacek Caban 11 Nov '19

11 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)

1 0

[PATCH 2/4] makedep: Use -Wl,-delayload option for winebuild delayimports.
by Jacek Caban 11 Nov '19

11 Nov '19

Also fixes winebuild to correctly handle module extensions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Splitting winebuild changes would cause invalid state between commits. dlls/setupapi/Makefile.in | 2 +- tools/makedep.c | 20 +++++++++++++++++--- tools/winebuild/import.c | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-)

1 0

[PATCH 1/4] winegcc: Add support for -Wl,-delayload argument.
by Jacek Caban 11 Nov '19

11 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)

1 0

[PATCH 1/5] wined3d: Check if destination texture has GPU access in glsl_blitter_supported().
by Paul Gofman 11 Nov '19

11 Nov '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/glsl_shader.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 73904ca728..05a45a046a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13590,14 +13590,20 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi return FALSE; } + if (!(dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) + { + TRACE("Destination resource does not have GPU access.\n"); + return FALSE; + } + /* We don't necessarily want to blit from resources without * WINED3D_RESOURCE_ACCESS_GPU, but that may be the only way to decompress * compressed textures. */ decompress = (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); - if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) + if (!decompress && !(src_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) { - TRACE("Source or destination resource does not have GPU access.\n"); + TRACE("Source resource does not have GPU access.\n"); return FALSE; } -- 2.23.0

4 17

[website] German translation, remembering Józef Kucia
by Julian Rüger 11 Nov '19

11 Nov '19

Farewell, Józef! Signed-off-by: Julian Rüger <jr98(a)gmx.net>

2 2

[PATCH 01/10] kernelbase: Add stub for SetThreadDescription().
by Conor McCarthy 11 Nov '19

11 Nov '19

Used by Hitman 2. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- .../api-ms-win-core-processthreads-l1-1-3.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/thread.c | 10 ++++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec index 3b57e1c8..6f0c4fa7 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec @@ -5,6 +5,6 @@ @ stub GetThreadSelectedCpuSets @ stub SetProcessDefaultCpuSets @ stub SetProcessInformation -@ stub SetThreadDescription +@ stdcall SetThreadDescription(ptr wstr) kernel32.SetThreadDescription @ stdcall SetThreadIdealProcessor(long long) kernel32.SetThreadIdealProcessor @ stub SetThreadSelectedCpuSets diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 23c25b7a..88708845 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1447,6 +1447,7 @@ @ stdcall SetTermsrvAppInstallMode(long) @ stdcall SetThreadAffinityMask(long long) @ stdcall -import SetThreadContext(long ptr) +@ stdcall -import SetThreadDescription(ptr wstr) @ stdcall -import SetThreadErrorMode(long ptr) @ stdcall SetThreadExecutionState(long) @ stdcall -import SetThreadGroupAffinity(long ptr ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index c1fa4795..a86a3fe2 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1478,7 +1478,7 @@ @ stdcall SetSystemTime(ptr) @ stdcall SetSystemTimeAdjustment(long long) kernel32.SetSystemTimeAdjustment @ stdcall SetThreadContext(long ptr) -# @ stub SetThreadDescription +@ stdcall SetThreadDescription(ptr wstr) @ stdcall SetThreadErrorMode(long ptr) @ stdcall SetThreadGroupAffinity(long ptr ptr) @ stdcall SetThreadIdealProcessor(long long) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 0cac2b69..4775f69c 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -387,6 +387,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetThreadContext( HANDLE thread, const CONTEXT *co } +/*********************************************************************** + * SetThreadDescription (kernelbase.@) + */ +HRESULT WINAPI DECLSPEC_HOTPATCH SetThreadDescription( HANDLE thread, PCWSTR description ) +{ + FIXME( "(%p %s): stub\n", thread, wine_dbgstr_w( description ) ); + return E_NOTIMPL; +} + + /*********************************************************************** * SetThreadErrorMode (kernelbase.@) */ -- 2.23.0

4 22