November 2019 - Wine-Commits

Alexandre Julliard : kernel32: Move EnumTimeFormats functions to kernelbase.
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: 50d15730dfa3f44bee722e777989d03b86bc35ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=50d15730dfa3f44bee722e77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 16 20:11:21 2019 +0100 kernel32: Move EnumTimeFormats functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/lcformat.c | 122 ---------------------------------------- dlls/kernel32/locale.c | 19 +++++++ dlls/kernelbase/kernelbase.spec | 6 +- dlls/kernelbase/locale.c | 64 +++++++++++++++++++++ 5 files changed, 88 insertions(+), 127 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a7043c223d..3f6943a29d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -426,8 +426,8 @@ @ stdcall -import EnumSystemLocalesEx(ptr long long ptr) @ stdcall -import EnumSystemLocalesW(ptr long) @ stdcall EnumTimeFormatsA(ptr long long) -@ stdcall EnumTimeFormatsEx(ptr wstr long long) -@ stdcall EnumTimeFormatsW(ptr long long) +@ stdcall -import EnumTimeFormatsEx(ptr wstr long long) +@ stdcall -import EnumTimeFormatsW(ptr long long) @ stdcall EnumUILanguagesA(ptr long long) @ stdcall -import EnumUILanguagesW(ptr long long) # @ stub EnumerateLocalComputerNamesA diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 6a6a5174c0..28e305a8ee 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1780,128 +1780,6 @@ enum enum_callback_type { CALLBACK_ENUMPROCEXEX }; -struct enumtimeformats_context { - enum enum_callback_type type; /* callback kind */ - union { - TIMEFMT_ENUMPROCW callback; /* user callback pointer */ - TIMEFMT_ENUMPROCEX callbackex; - } u; - LCID lcid; /* locale of interest */ - DWORD flags; - LPARAM lParam; - BOOL unicode; /* A vs W callback type, only for regular and Ex callbacks */ -}; - -static BOOL NLS_EnumTimeFormats(struct enumtimeformats_context *ctxt) -{ - WCHAR bufW[256]; - char bufA[256]; - LCTYPE lctype; - INT ret; - - if (!ctxt->u.callback) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - switch (ctxt->flags & ~LOCALE_USE_CP_ACP) - { - case 0: - lctype = LOCALE_STIMEFORMAT; - break; - case TIME_NOSECONDS: - lctype = LOCALE_SSHORTTIME; - break; - default: - FIXME("Unknown time format (%d)\n", ctxt->flags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - lctype |= ctxt->flags & LOCALE_USE_CP_ACP; - if (ctxt->unicode) - ret = GetLocaleInfoW(ctxt->lcid, lctype, bufW, ARRAY_SIZE(bufW)); - else - ret = GetLocaleInfoA(ctxt->lcid, lctype, bufA, ARRAY_SIZE(bufA)); - - if (ret) - { - switch (ctxt->type) - { - case CALLBACK_ENUMPROC: - ctxt->u.callback(ctxt->unicode ? bufW : (WCHAR*)bufA); - break; - case CALLBACK_ENUMPROCEX: - ctxt->u.callbackex(bufW, ctxt->lParam); - break; - default: - ; - } - } - - return TRUE; -} - -/************************************************************************** - * EnumTimeFormatsA (KERNEL32.@) - * - * FIXME: MSDN mentions only LOCALE_USE_CP_ACP, should we handle - * LOCALE_NOUSEROVERRIDE here as well? - */ -BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA proc, LCID lcid, DWORD flags) -{ - struct enumtimeformats_context ctxt; - - /* EnumTimeFormatsA doesn't support flags, EnumTimeFormatsW does. */ - if (flags & ~LOCALE_USE_CP_ACP) - { - SetLastError(ERROR_INVALID_FLAGS); - return FALSE; - } - - ctxt.type = CALLBACK_ENUMPROC; - ctxt.u.callback = (TIMEFMT_ENUMPROCW)proc; - ctxt.lcid = lcid; - ctxt.flags = flags; - ctxt.unicode = FALSE; - - return NLS_EnumTimeFormats(&ctxt); -} - -/************************************************************************** - * EnumTimeFormatsW (KERNEL32.@) - */ -BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) -{ - struct enumtimeformats_context ctxt; - - ctxt.type = CALLBACK_ENUMPROC; - ctxt.u.callback = proc; - ctxt.lcid = lcid; - ctxt.flags = flags; - ctxt.unicode = TRUE; - - return NLS_EnumTimeFormats(&ctxt); -} - -/************************************************************************** - * EnumTimeFormatsEx (KERNEL32.@) - */ -BOOL WINAPI EnumTimeFormatsEx(TIMEFMT_ENUMPROCEX proc, const WCHAR *locale, DWORD flags, LPARAM lParam) -{ - struct enumtimeformats_context ctxt; - - ctxt.type = CALLBACK_ENUMPROCEX; - ctxt.u.callbackex = proc; - ctxt.lcid = LocaleNameToLCID(locale, 0); - ctxt.flags = flags; - ctxt.lParam = lParam; - ctxt.unicode = TRUE; - - return NLS_EnumTimeFormats(&ctxt); -} - struct enumcalendar_context { enum enum_callback_type type; /* callback kind */ union { diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index f3468949f7..d7f32cbfda 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -66,6 +66,8 @@ extern BOOL WINAPI Internal_EnumLanguageGroupLocales( LANGGROUPLOCALE_ENUMPROCW extern BOOL WINAPI Internal_EnumSystemCodePages( CODEPAGE_ENUMPROCW proc, DWORD flags, BOOL unicode ); extern BOOL WINAPI Internal_EnumSystemLanguageGroups( LANGUAGEGROUP_ENUMPROCW proc, DWORD flags, LONG_PTR param, BOOL unicode ); +extern BOOL WINAPI Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags, + BOOL unicode, BOOL ex, LPARAM lparam ); extern BOOL WINAPI Internal_EnumUILanguages( UILANGUAGE_ENUMPROCW proc, DWORD flags, LONG_PTR param, BOOL unicode ); @@ -3648,6 +3650,23 @@ BOOL WINAPI EnumDateFormatsA(DATEFMT_ENUMPROCA proc, LCID lcid, DWORD flags) return Internal_EnumDateFormats( (DATEFMT_ENUMPROCW)proc, lcid, flags, FALSE, FALSE, FALSE, 0 ); } +/************************************************************************** + * EnumTimeFormatsA (KERNEL32.@) + * + * FIXME: MSDN mentions only LOCALE_USE_CP_ACP, should we handle + * LOCALE_NOUSEROVERRIDE here as well? + */ +BOOL WINAPI EnumTimeFormatsA( TIMEFMT_ENUMPROCA proc, LCID lcid, DWORD flags ) +{ + /* EnumTimeFormatsA doesn't support flags, EnumTimeFormatsW does. */ + if (flags & ~LOCALE_USE_CP_ACP) + { + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + return Internal_EnumTimeFormats( (TIMEFMT_ENUMPROCW)proc, lcid, flags, FALSE, FALSE, 0 ); +} + /****************************************************************************** * InvalidateNLSCache (KERNEL32.@) * diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 1cea884e9b..546a52c7ef 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -318,8 +318,8 @@ @ stdcall EnumSystemLocalesA(ptr long) @ stdcall EnumSystemLocalesEx(ptr long long ptr) @ stdcall EnumSystemLocalesW(ptr long) -@ stdcall EnumTimeFormatsEx(ptr wstr long long) kernel32.EnumTimeFormatsEx -@ stdcall EnumTimeFormatsW(ptr long long) kernel32.EnumTimeFormatsW +@ stdcall EnumTimeFormatsEx(ptr wstr long long) +@ stdcall EnumTimeFormatsW(ptr long long) @ stdcall EnumUILanguagesW(ptr long long) # @ stub EnumerateStateAtomValues # @ stub EnumerateStateContainerItems @@ -830,7 +830,7 @@ @ stdcall Internal_EnumSystemCodePages(ptr long long) @ stdcall Internal_EnumSystemLanguageGroups(ptr long ptr long) @ stub Internal_EnumSystemLocales -@ stub Internal_EnumTimeFormats +@ stdcall Internal_EnumTimeFormats(ptr long long long long long) @ stdcall Internal_EnumUILanguages(ptr long long long) # @ stub InternetTimeFromSystemTimeA # @ stub InternetTimeFromSystemTimeW diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2e1e76c4d7..473e6e2391 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -244,6 +244,50 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumSystemLanguageGroups( LANGUAGEGROUP_E } +/************************************************************************** + * Internal_EnumTimeFormats (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags, + BOOL unicode, BOOL ex, LPARAM lparam ) +{ + WCHAR buffer[256]; + LCTYPE lctype; + INT ret; + + if (!proc) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + switch (flags & ~LOCALE_USE_CP_ACP) + { + case 0: + lctype = LOCALE_STIMEFORMAT; + break; + case TIME_NOSECONDS: + lctype = LOCALE_SSHORTTIME; + break; + default: + FIXME( "Unknown time format %x\n", flags ); + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + lctype |= flags & LOCALE_USE_CP_ACP; + if (unicode) + ret = GetLocaleInfoW( lcid, lctype, buffer, ARRAY_SIZE(buffer) ); + else + ret = GetLocaleInfoA( lcid, lctype, (char *)buffer, sizeof(buffer) ); + + if (ret) + { + if (ex) ((TIMEFMT_ENUMPROCEX)proc)( buffer, lparam ); + else proc( buffer ); + } + return TRUE; +} + + /****************************************************************************** * Internal_EnumUILanguages (kernelbase.@) */ @@ -475,6 +519,26 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumSystemLocalesEx( LOCALE_ENUMPROCEX proc, DWORD } +/************************************************************************** + * EnumTimeFormatsW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH EnumTimeFormatsW( TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags ) +{ + return Internal_EnumTimeFormats( proc, lcid, flags, TRUE, FALSE, 0 ); +} + + +/************************************************************************** + * EnumTimeFormatsEx (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH EnumTimeFormatsEx( TIMEFMT_ENUMPROCEX proc, const WCHAR *locale, + DWORD flags, LPARAM lparam ) +{ + LCID lcid = LocaleNameToLCID( locale, 0 ); + return Internal_EnumTimeFormats( (TIMEFMT_ENUMPROCW)proc, lcid, flags, TRUE, TRUE, lparam ); +} + + /****************************************************************************** * FindStringOrdinal (kernelbase.@) */

1 0

Alexandre Julliard : kernel32: Move EnumCalendarInfo functions to kernelbase.
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: 42ed9797b1929fc5917bd967f7062cab953fab55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42ed9797b1929fc5917bd967… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 16 21:00:08 2019 +0100 kernel32: Move EnumCalendarInfo functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/lcformat.c | 261 ---------------------------------------- dlls/kernel32/locale.c | 19 +++ dlls/kernelbase/kernelbase.spec | 8 +- dlls/kernelbase/locale.c | 86 +++++++++++++ 5 files changed, 112 insertions(+), 268 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=42ed9797b1929fc5917b…

1 0

Zebediah Figura : strmbase: Get rid of the unused "cs" parameter to strmbase_video_init().
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: 70d2ba7482c61270f84a2e69992d1682771d698e URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d2ba7482c61270f84a2e69… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 16 11:20:13 2019 -0600 strmbase: Get rid of the unused "cs" parameter to strmbase_video_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 3 +-- dlls/quartz/vmr9.c | 3 +-- dlls/strmbase/video.c | 3 +-- include/wine/strmbase.h | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index b21cc281b9..449bd31f68 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -771,8 +771,7 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out) if (FAILED(hr)) goto fail; - hr = strmbase_video_init(&pVideoRenderer->baseControlVideo, - &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.filter.csFilter, + hr = strmbase_video_init(&pVideoRenderer->baseControlVideo, &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) goto fail; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 1a4f85c87c..a2ed46d05d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2239,8 +2239,7 @@ static HRESULT vmr_create(IUnknown *outer, void **out, const CLSID *clsid) goto fail; hr = strmbase_video_init(&pVMR->baseControlVideo, &pVMR->renderer.filter, - &pVMR->renderer.filter.csFilter, &pVMR->renderer.sink.pin, - &renderer_BaseControlVideoFuncTable); + &pVMR->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) goto fail; diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index d1ebbdf235..081794e9b3 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -648,11 +648,10 @@ static const IBasicVideoVtbl basic_video_vtbl = }; HRESULT WINAPI strmbase_video_init(BaseControlVideo *video, struct strmbase_filter *filter, - CRITICAL_SECTION *cs, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) + struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) { video->IBasicVideo_iface.lpVtbl = &basic_video_vtbl; video->pFilter = filter; - video->pInterfaceLock = cs; video->pPin = pin; video->pFuncsTable = func_table; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index f92a375a56..7f9d2cb64d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -477,7 +477,6 @@ typedef struct tagBaseControlVideo IBasicVideo IBasicVideo_iface; struct strmbase_filter *pFilter; - CRITICAL_SECTION* pInterfaceLock; struct strmbase_pin *pPin; const struct BaseControlVideoFuncTable* pFuncsTable; @@ -509,7 +508,7 @@ typedef struct BaseControlVideoFuncTable { } BaseControlVideoFuncTable; HRESULT WINAPI strmbase_video_init(BaseControlVideo *video, struct strmbase_filter *filter, - CRITICAL_SECTION *cs, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table); + struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table); HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo); #endif #endif

1 0

Zebediah Figura : strmbase: Get rid of the unused segment fields from struct strmbase_pin.
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: 21ac839711f766098e5b9d5164fe11e9e1a1f0b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21ac839711f766098e5b9d51… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 16 11:20:14 2019 -0600 strmbase: Get rid of the unused segment fields from struct strmbase_pin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 23 +++++++---------------- include/wine/strmbase.h | 2 -- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 2d98168418..9a88246a7f 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -333,16 +333,10 @@ HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, return E_NOTIMPL; /* to tell caller that all input pins connected to all output pins */ } -HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) +HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { - struct strmbase_pin *This = impl_from_IPin(iface); - TRACE("iface %p, start %s, stop %s, rate %.16e.\n", - iface, debugstr_time(tStart), debugstr_time(tStop), dRate); - - This->tStart = tStart; - This->tStop = tStop; - This->dRate = dRate; + iface, debugstr_time(start), debugstr_time(stop), rate); return S_OK; } @@ -696,7 +690,6 @@ void strmbase_source_init(struct strmbase_source *pin, const IPinVtbl *vtbl, str { memset(pin, 0, sizeof(*pin)); pin->pin.IPin_iface.lpVtbl = vtbl; - pin->pin.dRate = 1.0; pin->pin.filter = filter; pin->pin.dir = PINDIR_OUTPUT; lstrcpyW(pin->pin.name, name); @@ -843,17 +836,16 @@ static HRESULT deliver_newsegment(IPin *pin, LPVOID data) return IPin_NewSegment(pin, args->tStart, args->tStop, args->rate); } -HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) +HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { - BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); newsegmentargs args; TRACE("iface %p, start %s, stop %s, rate %.16e.\n", - iface, debugstr_time(tStart), debugstr_time(tStop), dRate); + iface, debugstr_time(start), debugstr_time(stop), rate); - args.tStart = This->pin.tStart = tStart; - args.tStop = This->pin.tStop = tStop; - args.rate = This->pin.dRate = dRate; + args.tStart = start; + args.tStop = stop; + args.rate = rate; return SendFurther( iface, deliver_newsegment, &args, NULL ); } @@ -994,7 +986,6 @@ void strmbase_sink_init(BaseInputPin *pin, const IPinVtbl *vtbl, struct strmbase { memset(pin, 0, sizeof(*pin)); pin->pin.IPin_iface.lpVtbl = vtbl; - pin->pin.dRate = 1.0; pin->pin.filter = filter; pin->pin.dir = PINDIR_INPUT; lstrcpyW(pin->pin.name, name); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 7f9d2cb64d..f87b726d0a 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -38,8 +38,6 @@ struct strmbase_pin WCHAR name[128]; IPin *peer; AM_MEDIA_TYPE mtCurrent; - REFERENCE_TIME tStart, tStop; - double dRate; const struct BasePinFuncTable* pFuncsTable; };

1 0

Zebediah Figura : d3d8: Track WINED3D_RS_POINTSIZE_MIN and WINED3D_RS_ZENABLE in the primary stateblock.
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: 9fb7c84b15250e6420f5e365914f8a9720c64e86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fb7c84b15250e6420f5e365… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 16 17:26:31 2019 -0600 d3d8: Track WINED3D_RS_POINTSIZE_MIN and WINED3D_RS_ZENABLE in the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 92b67b9274..17d8a726c7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -922,6 +922,9 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, implicit_swapchain = wined3d_swapchain_get_parent(device->implicit_swapchain); implicit_swapchain->swap_interval = wined3dswapinterval_from_d3d(present_parameters->FullScreen_PresentationInterval); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_POINTSIZE_MIN, 0); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); @@ -3710,6 +3713,9 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine wined3d_swapchain_incref(wined3d_swapchain); IDirect3DSwapChain8_Release(&d3d_swapchain->IDirect3DSwapChain8_iface); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0);

1 0

Michael Stefaniuc : dmime: The Wave track supports two additional param types.
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: d65f1e55a20c35b0a6cf35b308052e4fc2e76d90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d65f1e55a20c35b0a6cf35b3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 18 00:57:18 2019 +0100 dmime: The Wave track supports two additional param types. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/wavetrack.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index a679ed60ab..5869c9e72d 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -136,20 +136,27 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rgu return S_OK; } -static HRESULT WINAPI wave_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI wave_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); - if (IsEqualGUID (rguidType, &GUID_Disable_Auto_Download) - || IsEqualGUID (rguidType, &GUID_Download) - || IsEqualGUID (rguidType, &GUID_DownloadToAudioPath) - || IsEqualGUID (rguidType, &GUID_Enable_Auto_Download)) { - TRACE("param supported\n"); - return S_OK; - } - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); + static const REFGUID valid[] = { + &GUID_Disable_Auto_Download, + &GUID_Download, + &GUID_DownloadToAudioPath, + &GUID_Enable_Auto_Download, + &GUID_Unload, + &GUID_UnloadFromAudioPath + }; + unsigned int i; + + TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); + + for (i = 0; i < ARRAY_SIZE(valid); i++) + if (IsEqualGUID(type, valid[i])) + return S_OK; + + TRACE("param unsupported\n"); + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI wave_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype)

1 0

Michael Stefaniuc : dmime: SegTrigger track supports all param types, even invalid ones.
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: 9b0512de26635b7943b564a3a0e7fe77ab1d198d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b0512de26635b7943b564a3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 18 00:57:17 2019 +0100 dmime: SegTrigger track supports all param types, even invalid ones. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segtriggertrack.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 3050a5031b..7e1d75aa05 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -156,11 +156,7 @@ static HRESULT WINAPI segment_track_IsParamSupported(IDirectMusicTrack8 *iface, TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); - if (IsEqualGUID(type, &GUID_IDirectMusicStyle)) - return S_OK; - - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + return S_OK; } static HRESULT WINAPI segment_track_AddNotificationType(IDirectMusicTrack8 *iface,

1 0

Michael Stefaniuc : dmime/tests: Check all IDirectMusicTrack_IsParamSupported() types.
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: 1f5e2b7815595dc4538e4cb60518aa90e1ab087d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f5e2b7815595dc4538e4cb6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 18 00:57:19 2019 +0100 dmime/tests: Check all IDirectMusicTrack_IsParamSupported() types. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/dmime.c | 82 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 20 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 944a278dbb..3fb0e8afd8 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -532,24 +532,62 @@ static void test_track(void) CLSID classid; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + } param_types[] = { + { X(GUID_BandParam) }, + { X(GUID_ChordParam) }, + { X(GUID_Clear_All_Bands) }, + { X(GUID_CommandParam) }, + { X(GUID_CommandParam2) }, + { X(GUID_CommandParamNext) }, + { X(GUID_ConnectToDLSCollection) }, + { X(GUID_Disable_Auto_Download) }, + { X(GUID_DisableTempo) }, + { X(GUID_DisableTimeSig) }, + { X(GUID_Download) }, + { X(GUID_DownloadToAudioPath) }, + { X(GUID_Enable_Auto_Download) }, + { X(GUID_EnableTempo) }, + { X(GUID_EnableTimeSig) }, + { X(GUID_IDirectMusicBand) }, + { X(GUID_IDirectMusicChordMap) }, + { X(GUID_IDirectMusicStyle) }, + { X(GUID_MuteParam) }, + { X(GUID_Play_Marker) }, + { X(GUID_RhythmParam) }, + { X(GUID_SeedVariations) }, + { X(GUID_StandardMIDIFile) }, + { X(GUID_TempoParam) }, + { X(GUID_TimeSignature) }, + { X(GUID_Unload) }, + { X(GUID_UnloadFromAudioPath) }, + { X(GUID_Valid_Start_Time) }, + { X(GUID_Variations) }, + { X(GUID_NULL) } + }; +#undef X #define X(class) &CLSID_ ## class, #class const struct { REFCLSID clsid; const char *name; - BOOL has_param; + /* bitfield with supported param types */ + unsigned int has_params; } class[] = { - { X(DirectMusicLyricsTrack), TRUE }, - { X(DirectMusicMarkerTrack), TRUE }, - { X(DirectMusicParamControlTrack), TRUE }, - { X(DirectMusicSegmentTriggerTrack), TRUE }, - { X(DirectMusicSeqTrack), FALSE }, - { X(DirectMusicSysExTrack), FALSE }, - { X(DirectMusicTempoTrack), TRUE }, - { X(DirectMusicTimeSigTrack), TRUE }, - { X(DirectMusicWaveTrack), TRUE } + { X(DirectMusicLyricsTrack), 0 }, + { X(DirectMusicMarkerTrack), 0x8080000 }, + { X(DirectMusicParamControlTrack), 0 }, + { X(DirectMusicSegmentTriggerTrack), 0x3fffffff }, + { X(DirectMusicSeqTrack), ~0 }, /* param methods not implemented */ + { X(DirectMusicSysExTrack), ~0 }, /* param methods not implemented */ + { X(DirectMusicTempoTrack), 0x802100 }, + { X(DirectMusicTimeSigTrack), 0x1004200 }, + { X(DirectMusicWaveTrack), 0x6001c80 } }; #undef X - unsigned int i; + unsigned int i, j; for (i = 0; i < ARRAY_SIZE(class); i++) { trace("Testing %s\n", class[i].name); @@ -558,7 +596,18 @@ static void test_track(void) ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); /* IDirectMusicTrack */ - if (!class[i].has_param) { + if (class[i].has_params != ~0) { + for (j = 0; j < ARRAY_SIZE(param_types); j++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt, param_types[j].type); + if (class[i].has_params & (1 << j)) + ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + param_types[j].name, hr); + else + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[j].name, hr); + } + } else { hr = IDirectMusicTrack_GetParam(dmt, NULL, 0, NULL, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack_GetParam failed: %08x\n", hr); hr = IDirectMusicTrack_SetParam(dmt, NULL, 0, NULL); @@ -569,13 +618,6 @@ static void test_track(void) hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle); ok(hr == E_NOTIMPL, "got: %08x\n", hr); } - else { - hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle); - if (class[i].clsid == &CLSID_DirectMusicSegmentTriggerTrack) - ok(hr == S_OK, "got: %08x\n", hr); - else - ok(hr == DMUS_E_TYPE_UNSUPPORTED, "got: %08x\n", hr); - } if (class[i].clsid != &CLSID_DirectMusicMarkerTrack && class[i].clsid != &CLSID_DirectMusicTimeSigTrack) { hr = IDirectMusicTrack_AddNotificationType(dmt, NULL); @@ -591,7 +633,7 @@ static void test_track(void) if (hr == S_OK) { hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); - if (!class[i].has_param) { + if (class[i].has_params == ~0) { hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0);

1 0

Michael Stefaniuc : dmband/tests: Check all IDirectMusicTrack_IsParamSupported() types.
by Alexandre Julliard Nov. 18, 2019

Nov. 18, 2019

Module: wine Branch: master Commit: 7d534d829902c021e4972ac22e83efb3ecaa2093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d534d829902c021e4972ac2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 18 00:57:20 2019 +0100 dmband/tests: Check all IDirectMusicTrack_IsParamSupported() types. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/tests/dmband.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 29d0668219..459d00ed1d 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -181,6 +181,44 @@ static void test_bandtrack(void) CLSID class; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + BOOL supported; + } param_types[] = { + { X(GUID_BandParam), TRUE }, + { X(GUID_ChordParam), FALSE }, + { X(GUID_Clear_All_Bands), TRUE }, + { X(GUID_CommandParam), FALSE }, + { X(GUID_CommandParam2), FALSE }, + { X(GUID_CommandParamNext), FALSE }, + { X(GUID_ConnectToDLSCollection), TRUE }, + { X(GUID_Disable_Auto_Download), TRUE }, + { X(GUID_DisableTempo), FALSE }, + { X(GUID_DisableTimeSig), FALSE }, + { X(GUID_Download), TRUE }, + { X(GUID_DownloadToAudioPath), TRUE }, + { X(GUID_Enable_Auto_Download), TRUE }, + { X(GUID_EnableTempo), FALSE }, + { X(GUID_EnableTimeSig), FALSE }, + { X(GUID_IDirectMusicBand), TRUE }, + { X(GUID_IDirectMusicChordMap), FALSE }, + { X(GUID_IDirectMusicStyle), FALSE }, + { X(GUID_MuteParam), FALSE }, + { X(GUID_Play_Marker), FALSE }, + { X(GUID_RhythmParam), FALSE }, + { X(GUID_SeedVariations), FALSE }, + { X(GUID_StandardMIDIFile), TRUE }, + { X(GUID_TempoParam), FALSE }, + { X(GUID_TimeSignature), FALSE }, + { X(GUID_Unload), TRUE }, + { X(GUID_UnloadFromAudioPath), TRUE }, + { X(GUID_Valid_Start_Time), FALSE }, + { X(GUID_Variations), FALSE }, + }; +#undef X + unsigned int i; hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt8); @@ -203,8 +241,20 @@ static void test_bandtrack(void) hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); } + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + for (i = 0; i < ARRAY_SIZE(param_types); i++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[i].type); + if (param_types[i].supported) + ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + param_types[i].name, hr); + else + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[i].name, hr); + } + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL);

1 0

Alexandre Julliard : Wine release 4.20
by Alexandre Julliard Nov. 15, 2019

Nov. 15, 2019

Module: website Branch: master Commit: 19e82fb9d5402e41d5409ee698b03630013fe80a URL: https://source.winehq.org/git/website.git/?a=commit;h=19e82fb9d5402e41d5409… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 15 23:55:37 2019 +0100 Wine release 4.20 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019111501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2019111501.xml b/news/en/2019111501.xml new file mode 100644 index 00000000..4f78e8ef --- /dev/null +++ b/news/en/2019111501.xml @@ -0,0 +1,16 @@ +<news> +<date>November 15, 2019</date> +<title>Wine 4.20 Released</title> +<body> + The Wine development release 4.20 is now available. + <a href="{$root}/announce/4.20">What's new</a> in this release: +<ul> + <li>New version of the Mono engine with an FNA update.</li> + <li>Code persistence in VBScript and JScript.</li> + <li>Vulkan spec updates.</li> + <li>Improved support for LLVM MinGW.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.20.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0