November 2020 - Wine-Devel - list.winehq.org

[PATCH] avifil32: Only add the first stream reference to the parent.
by Esme Povirk Nov. 2, 2020

Nov. 2, 2020

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- This fixes Arena Wars 2, which releases a stream too many times. dlls/avifil32/avifile.c | 4 ++-- dlls/avifil32/tests/api.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index b1654daa690..8f5c5e64562 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -699,7 +699,7 @@ static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream *iface) TRACE("(%p) ref=%d\n", This, ref); /* also add ref to parent, so that it doesn't kill us */ - if (This->paf != NULL) + if (This->paf != NULL && ref == 1) IAVIFile_AddRef(&This->paf->IAVIFile_iface); return ref; @@ -712,7 +712,7 @@ static ULONG WINAPI IAVIStream_fnRelease(IAVIStream *iface) TRACE("(%p) ref=%d\n", This, ref); - if (This->paf != NULL) + if (This->paf != NULL && ref == 0) IAVIFile_Release(&This->paf->IAVIFile_iface); return ref; diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index 66ba2051a06..23c845cb328 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -352,6 +352,12 @@ static void create_avi_file(const COMMON_AVI_HEADERS *cah, char *filename) CloseHandle(hFile); } +static ULONG get_file_refcount(PAVIFILE file) +{ + AVIFileAddRef(file); + return AVIFileRelease(file); +} + static void test_default_data(void) { COMMON_AVI_HEADERS cah; @@ -363,6 +369,7 @@ static void test_default_data(void) PAVISTREAM pStream1; AVISTREAMINFOA asi0, asi1; WAVEFORMATEX wfx; + ULONG refcount; GetTempPathA(MAX_PATH, filename); strcpy(filename+strlen(filename), testfilename); @@ -443,9 +450,34 @@ static void test_default_data(void) ok(wfx.nAvgBytesPerSec == 22050, "got %u (expected 22050)\n",wfx.nAvgBytesPerSec); ok(wfx.nBlockAlign == 2, "got %u (expected 2)\n",wfx.nBlockAlign); + refcount = get_file_refcount(pFile); + ok(refcount == 3, "got %u (expected 3)\n", refcount); + AVIStreamRelease(pStream0); + + refcount = get_file_refcount(pFile); + ok(refcount == 2, "got %u (expected 2)\n", refcount); + + AVIStreamAddRef(pStream1); + + refcount = get_file_refcount(pFile); + ok(refcount == 2, "got %u (expected 2)\n", refcount); + AVIStreamRelease(pStream1); - AVIFileRelease(pFile); + AVIStreamRelease(pStream1); + + refcount = get_file_refcount(pFile); + ok(refcount == 1, "got %u (expected 1)\n", refcount); + + refcount = AVIStreamRelease(pStream1); + ok(refcount == (ULONG)-1, "got %u (expected 4294967295)\n", refcount); + + refcount = get_file_refcount(pFile); + ok(refcount == 1, "got %u (expected 1)\n", refcount); + + refcount = AVIFileRelease(pFile); + ok(refcount == 0, "got %u (expected 0)\n", refcount); + ok(DeleteFileA(filename) !=0, "Deleting file %s failed\n", filename); } -- 2.17.1

1 0

[v2 PATCH 1/4] mfmediaengine: Keep "preload" property.
by Nikolay Sivov Nov. 2, 2020

Nov. 2, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 22 ++++++++++++++++++---- dlls/mfmediaengine/tests/mfmediaengine.c | 9 ++++++--- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index d93e2b2f38c..64f0ae6d2a1 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -87,6 +87,7 @@ struct media_engine MF_MEDIA_ENGINE_ERR error_code; HRESULT extended_code; MF_MEDIA_ENGINE_READY ready_state; + MF_MEDIA_ENGINE_PRELOAD preload; IMFMediaSession *session; IMFSourceResolver *resolver; BSTR current_source; @@ -717,16 +718,29 @@ static USHORT WINAPI media_engine_GetNetworkState(IMFMediaEngine *iface) static MF_MEDIA_ENGINE_PRELOAD WINAPI media_engine_GetPreload(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + MF_MEDIA_ENGINE_PRELOAD preload; + + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + preload = engine->preload; + LeaveCriticalSection(&engine->cs); - return MF_MEDIA_ENGINE_PRELOAD_NONE; + return preload; } static HRESULT WINAPI media_engine_SetPreload(IMFMediaEngine *iface, MF_MEDIA_ENGINE_PRELOAD preload) { - FIXME("(%p, %d): stub.\n", iface, preload); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); - return E_NOTIMPL; + TRACE("%p, %d.\n", iface, preload); + + EnterCriticalSection(&engine->cs); + engine->preload = preload; + LeaveCriticalSection(&engine->cs); + + return S_OK; } static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngine *iface, IMFMediaTimeRange **buffered) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 660e5b95331..0394bcf6a0e 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -265,17 +265,20 @@ todo_wine /* Preload mode is still accessible. */ state = IMFMediaEngine_GetPreload(media_engine); -todo_wine ok(!state, "Unexpected state %d.\n", state); hr = IMFMediaEngine_SetPreload(media_engine, MF_MEDIA_ENGINE_PRELOAD_AUTOMATIC); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_GetPreload(media_engine); -todo_wine ok(state == MF_MEDIA_ENGINE_PRELOAD_AUTOMATIC, "Unexpected state %d.\n", state); + hr = IMFMediaEngine_SetPreload(media_engine, 100); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + state = IMFMediaEngine_GetPreload(media_engine); + ok(state == 100, "Unexpected state %d.\n", state); + hr = IMFMediaEngine_GetBuffered(media_engine, &time_range); todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); -- 2.28.0

1 4

[PATCH 1/2] srvcli: Add stub dll.
by Rémi Bernon Nov. 2, 2020

Nov. 2, 2020

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- These have been in staging for a bit and in Proton 5.13, and are required by Flight Simulator. It doesn't seem to use the dlls, just loads them. configure.ac | 1 + dlls/srvcli/Makefile.in | 5 ++++ dlls/srvcli/main.c | 41 +++++++++++++++++++++++++++ dlls/srvcli/srvcli.spec | 61 +++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 109 insertions(+) create mode 100644 dlls/srvcli/Makefile.in create mode 100644 dlls/srvcli/main.c create mode 100644 dlls/srvcli/srvcli.spec diff --git a/configure.ac b/configure.ac index 2f81fd22610..45e0d6ccdb5 100644 --- a/configure.ac +++ b/configure.ac @@ -3723,6 +3723,7 @@ WINE_CONFIG_MAKEFILE(dlls/sound.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/spoolss) WINE_CONFIG_MAKEFILE(dlls/spoolss/tests) WINE_CONFIG_MAKEFILE(dlls/srclient) +WINE_CONFIG_MAKEFILE(dlls/srvcli) WINE_CONFIG_MAKEFILE(dlls/sspicli) WINE_CONFIG_MAKEFILE(dlls/stdole2.tlb) WINE_CONFIG_MAKEFILE(dlls/stdole32.tlb) diff --git a/dlls/srvcli/Makefile.in b/dlls/srvcli/Makefile.in new file mode 100644 index 00000000000..716cc1b3867 --- /dev/null +++ b/dlls/srvcli/Makefile.in @@ -0,0 +1,5 @@ +MODULE = srvcli.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = main.c diff --git a/dlls/srvcli/main.c b/dlls/srvcli/main.c new file mode 100644 index 00000000000..0df8e00d0fa --- /dev/null +++ b/dlls/srvcli/main.c @@ -0,0 +1,41 @@ +/* + * + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(srvcli); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/srvcli/srvcli.spec b/dlls/srvcli/srvcli.spec new file mode 100644 index 00000000000..821724a7d4d --- /dev/null +++ b/dlls/srvcli/srvcli.spec @@ -0,0 +1,61 @@ +@ stub I_NetDfsGetVersion +@ stub I_NetServerSetServiceBits +@ stub I_NetServerSetServiceBitsEx +@ stub LocalAliasGet +@ stub LocalFileClose +@ stub LocalFileEnum +@ stub LocalFileEnumEx +@ stub LocalFileGetInfo +@ stub LocalFileGetInfoEx +@ stub LocalServerCertificateMappingAdd +@ stub LocalServerCertificateMappingEnum +@ stub LocalServerCertificateMappingGet +@ stub LocalServerCertificateMappingRemove +@ stub LocalSessionDel +@ stub LocalSessionEnum +@ stub LocalSessionEnumEx +@ stub LocalSessionGetInfo +@ stub LocalSessionGetInfoEx +@ stub LocalShareAdd +@ stub LocalShareDelEx +@ stub LocalShareEnum +@ stub LocalShareEnumEx +@ stub LocalShareGetInfo +@ stub LocalShareGetInfoEx +@ stub LocalShareSetInfo +@ stub NetConnectionEnum +@ stub NetFileClose +@ stdcall NetFileEnum(wstr wstr wstr long ptr long ptr ptr ptr) netapi32.NetFileEnum +@ stub NetFileGetInfo +@ stub NetRemoteTOD +@ stub NetServerAliasAdd +@ stub NetServerAliasDel +@ stub NetServerAliasEnum +@ stub NetServerComputerNameAdd +@ stub NetServerComputerNameDel +@ stdcall NetServerDiskEnum(wstr long ptr long ptr ptr ptr) netapi32.NetServerDiskEnum +@ stdcall NetServerGetInfo(wstr long ptr) netapi32.NetServerGetInfo +@ stub NetServerSetInfo +@ stub NetServerStatisticsGet +@ stub NetServerTransportAdd +@ stub NetServerTransportAddEx +@ stub NetServerTransportDel +@ stub NetServerTransportEnum +@ stub NetSessionDel +@ stdcall NetSessionEnum(wstr wstr wstr long ptr long ptr ptr ptr) netapi32.NetSessionEnum +@ stub NetSessionGetInfo +@ stdcall NetShareAdd(wstr long ptr ptr) netapi32.NetShareAdd +@ stub NetShareCheck +@ stdcall NetShareDel(wstr wstr long) netapi32.NetShareDel +@ stub NetShareDelEx +@ stub NetShareDelSticky +@ stdcall NetShareEnum(wstr long ptr long ptr ptr ptr) netapi32.NetShareEnum +@ stub NetShareEnumSticky +@ stdcall NetShareGetInfo(wstr wstr long ptr) netapi32.NetShareGetInfo +@ stub NetShareSetInfo +@ stub NetpsNameCanonicalize +@ stub NetpsNameCompare +@ stub NetpsNameValidate +@ stub NetpsPathCanonicalize +@ stub NetpsPathCompare +@ stub NetpsPathType diff --git a/tools/make_specfiles b/tools/make_specfiles index efb873e2532..e7a706dad42 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -177,6 +177,7 @@ my @dll_groups = [ "netapi32", "ext-ms-win-domainjoin-netjoin-l1-1-0", + "srvcli", ], [ "ntdll", -- 2.28.0

1 1

[PATCH 1/4] msvcr110/tests: Use macro to get function address.
by Daniel Lehman Nov. 2, 2020

Nov. 2, 2020

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msvcr110/tests/msvcr110.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 09876131f07..364dd26aa82 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -39,6 +39,9 @@ static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(v static unsigned int (CDECL *p_CurrentScheduler_Id)(void); static unsigned int (CDECL *p__CurrentScheduler__Id)(void); +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(module,y) +#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) + static BOOL init(void) { HMODULE module; @@ -50,12 +53,12 @@ static BOOL init(void) return FALSE; } - p_setlocale = (void*)GetProcAddress(module, "setlocale"); - p___strncnt = (void*)GetProcAddress(module, "__strncnt"); - p_CurrentScheduler_GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?GetNumberOfVirtualProcessors(a)CurrentScheduler@Concurrency@@SAIXZ"); - p__CurrentScheduler__GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); - p_CurrentScheduler_Id = (void*)GetProcAddress(module, "?Id(a)CurrentScheduler@Concurrency@@SAIXZ"); - p__CurrentScheduler__Id = (void*)GetProcAddress(module, "?_Id(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); + SET(p_setlocale, "setlocale"); + SET(p___strncnt, "__strncnt"); + SET(p_CurrentScheduler_GetNumberOfVirtualProcessors, "?GetNumberOfVirtualProcessors(a)CurrentScheduler@Concurrency@@SAIXZ"); + SET(p__CurrentScheduler__GetNumberOfVirtualProcessors, "?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); + SET(p_CurrentScheduler_Id, "?Id(a)CurrentScheduler@Concurrency@@SAIXZ"); + SET(p__CurrentScheduler__Id, "?_Id(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); return TRUE; } -- 2.25.1

2 4

[PATCH 1/5] winegstreamer: Implement IMFMediaSource::GetCharacteristics.
by Derek Lesho Nov. 2, 2020

Nov. 2, 2020

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index dbc656a24da..913b1cc9e93 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1032,12 +1032,14 @@ static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWO { struct media_source *source = impl_from_IMFMediaSource(iface); - FIXME("(%p)->(%p): stub\n", source, characteristics); + TRACE("(%p)->(%p)\n", source, characteristics); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + *characteristics = MFMEDIASOURCE_CAN_SEEK; + + return S_OK; } static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor) -- 2.28.0

3 14

[PATCH] quartz: Implement IVMRAspectRatioControl9.
by Gijs Vermeulen Nov. 2, 2020

Nov. 2, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 23 +++++++++++++-- dlls/quartz/vmr9.c | 60 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index df18bd5f2d5..7b470c6e534 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -242,7 +242,7 @@ static void test_common_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IQualityControl, TRUE); todo_wine check_interface(filter, &IID_IQualProp, TRUE); check_interface(filter, &IID_IUnknown, TRUE); - todo_wine check_interface(filter, &IID_IVMRAspectRatioControl9, TRUE); + check_interface(filter, &IID_IVMRAspectRatioControl9, TRUE); todo_wine check_interface(filter, &IID_IVMRDeinterlaceControl9, TRUE); check_interface(filter, &IID_IVMRFilterConfig9, TRUE); check_interface(filter, &IID_IVMRMixerBitmap9, TRUE); @@ -3851,6 +3851,7 @@ static void test_windowless_size(void) }; IBaseFilter *filter = create_vmr9(VMR9Mode_Windowless); LONG width, height, aspect_width, aspect_height; + IVMRAspectRatioControl9 *aspect_ratio_control; IVMRWindowlessControl9 *windowless_control; IFilterGraph2 *graph = create_graph(); VMR9AspectRatioMode aspect_mode; @@ -3864,6 +3865,7 @@ static void test_windowless_size(void) IPin *pin; IBaseFilter_QueryInterface(filter, &IID_IVMRWindowlessControl9, (void **)&windowless_control); + IBaseFilter_QueryInterface(filter, &IID_IVMRAspectRatioControl9, (void **)&aspect_ratio_control); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); testfilter_init(&source); @@ -3902,6 +3904,11 @@ static void test_windowless_size(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(aspect_mode == VMR9ARMode_None, "Got mode %u.\n", aspect_mode); + aspect_mode = 0xdeadbeef; + hr = IVMRAspectRatioControl9_GetAspectRatioMode(aspect_ratio_control, &aspect_mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(aspect_mode == VMR9ARMode_None, "Got mode %u.\n", aspect_mode); + width = height = 0xdeadbeef; hr = IVMRWindowlessControl9_GetNativeVideoSize(windowless_control, &width, &height, NULL, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -3956,7 +3963,7 @@ static void test_windowless_size(void) SetRect(&expect, 0, 0, 640, 480); ok(EqualRect(&src, &expect), "Got window rect %s.\n", wine_dbgstr_rect(&src)); - hr = IVMRWindowlessControl9_SetAspectRatioMode(windowless_control, VMR9ARMode_LetterBox); + hr = IVMRAspectRatioControl9_SetAspectRatioMode(aspect_ratio_control, VMR9ARMode_LetterBox); ok(hr == S_OK, "Got hr %#x.\n", hr); aspect_mode = 0xdeadbeef; @@ -3964,6 +3971,17 @@ static void test_windowless_size(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(aspect_mode == VMR9ARMode_LetterBox, "Got mode %u.\n", aspect_mode); + hr = IVMRWindowlessControl9_SetAspectRatioMode(windowless_control, VMR9ARMode_None); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + aspect_mode = 0xdeadbeef; + hr = IVMRAspectRatioControl9_GetAspectRatioMode(aspect_ratio_control, &aspect_mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(aspect_mode == VMR9ARMode_None, "Got mode %u.\n", aspect_mode); + + hr = IVMRWindowlessControl9_SetAspectRatioMode(windowless_control, VMR9ARMode_LetterBox); + ok(hr == S_OK, "Got hr %#x.\n", hr); + memset(&src, 0xcc, sizeof(src)); memset(&dst, 0xcc, sizeof(dst)); hr = IVMRWindowlessControl9_GetVideoPosition(windowless_control, &src, &dst); @@ -3993,6 +4011,7 @@ out: IMemInputPin_Release(input); IPin_Release(pin); IVMRWindowlessControl9_Release(windowless_control); + IVMRAspectRatioControl9_Release(aspect_ratio_control); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); DestroyWindow(window); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index a24dbc62977..3ddef8dbed5 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -60,6 +60,7 @@ struct quartz_vmr IAMCertifiedOutputProtection IAMCertifiedOutputProtection_iface; IAMFilterMiscFlags IAMFilterMiscFlags_iface; + IVMRAspectRatioControl9 IVMRAspectRatioControl9_iface; IVMRFilterConfig IVMRFilterConfig_iface; IVMRFilterConfig9 IVMRFilterConfig9_iface; IVMRMixerBitmap9 IVMRMixerBitmap9_iface; @@ -603,6 +604,8 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IAMCertifiedOutputProtection_iface; else if (IsEqualGUID(iid, &IID_IAMFilterMiscFlags)) *out = &filter->IAMFilterMiscFlags_iface; + else if (IsEqualGUID(iid, &IID_IVMRAspectRatioControl9) && is_vmr9(filter)) + *out = &filter->IVMRAspectRatioControl9_iface; else if (IsEqualGUID(iid, &IID_IVMRFilterConfig) && !is_vmr9(filter)) *out = &filter->IVMRFilterConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRFilterConfig9) && is_vmr9(filter)) @@ -2396,6 +2399,62 @@ static const IVMRMixerBitmap9Vtbl mixer_bitmap9_vtbl = mixer_bitmap9_GetAlphaBitmapParameters, }; +static inline struct quartz_vmr *impl_from_IVMRAspectRatioControl9(IVMRAspectRatioControl9 *iface) +{ + return CONTAINING_RECORD(iface, struct quartz_vmr, IVMRAspectRatioControl9_iface); +} + +static HRESULT WINAPI aspect_ratio_control9_QueryInterface(IVMRAspectRatioControl9 *iface, REFIID iid, void **out) +{ + struct quartz_vmr *filter = impl_from_IVMRAspectRatioControl9(iface); + return IUnknown_QueryInterface(filter->renderer.filter.outer_unk, iid, out); +} + +static ULONG WINAPI aspect_ratio_control9_AddRef(IVMRAspectRatioControl9 *iface) +{ + struct quartz_vmr *filter = impl_from_IVMRAspectRatioControl9(iface); + return IUnknown_AddRef(filter->renderer.filter.outer_unk); +} + +static ULONG WINAPI aspect_ratio_control9_Release(IVMRAspectRatioControl9 *iface) +{ + struct quartz_vmr *filter = impl_from_IVMRAspectRatioControl9(iface); + return IUnknown_Release(filter->renderer.filter.outer_unk); +} + +static HRESULT WINAPI aspect_ratio_control9_GetAspectRatioMode(IVMRAspectRatioControl9 *iface, DWORD *mode) +{ + struct quartz_vmr *filter = impl_from_IVMRAspectRatioControl9(iface); + + TRACE("filter %p, mode %p.\n", filter, mode); + + EnterCriticalSection(&filter->renderer.filter.csFilter); + *mode = filter->aspect_mode; + LeaveCriticalSection(&filter->renderer.filter.csFilter); + return S_OK; +} + +static HRESULT WINAPI aspect_ratio_control9_SetAspectRatioMode(IVMRAspectRatioControl9 *iface, DWORD mode) +{ + struct quartz_vmr *filter = impl_from_IVMRAspectRatioControl9(iface); + + TRACE("filter %p, mode %u.\n", filter, mode); + + EnterCriticalSection(&filter->renderer.filter.csFilter); + filter->aspect_mode = mode; + LeaveCriticalSection(&filter->renderer.filter.csFilter); + return S_OK; +} + +static const IVMRAspectRatioControl9Vtbl aspect_ratio_control9_vtbl = +{ + aspect_ratio_control9_QueryInterface, + aspect_ratio_control9_AddRef, + aspect_ratio_control9_Release, + aspect_ratio_control9_GetAspectRatioMode, + aspect_ratio_control9_SetAspectRatioMode, +}; + static inline struct quartz_vmr *impl_from_IOverlay(IOverlay *iface) { return CONTAINING_RECORD(iface, struct quartz_vmr, IOverlay_iface); @@ -2522,6 +2581,7 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) strmbase_renderer_init(&object->renderer, outer, clsid, L"VMR Input0", &renderer_ops); object->IAMCertifiedOutputProtection_iface.lpVtbl = &IAMCertifiedOutputProtection_Vtbl; object->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; + object->IVMRAspectRatioControl9_iface.lpVtbl = &aspect_ratio_control9_vtbl; object->IVMRFilterConfig_iface.lpVtbl = &VMR7_FilterConfig_Vtbl; object->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; object->IVMRMixerBitmap9_iface.lpVtbl = &mixer_bitmap9_vtbl; -- 2.29.2

3 2

[PATCH] kernelbase: Add rudimentary mui resource support to loader.c
by Craig Schulstad Nov. 2, 2020

Nov. 2, 2020

Signed-off-by: Craig Schulstad <craigaschulstad(a)gmail.com> --- dlls/kernelbase/loader.c | 169 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 164 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index fc9b0ce0083..0fbe9bcd9e8 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -48,6 +48,9 @@ struct exclusive_datafile }; static struct list exclusive_datafile_list = LIST_INIT( exclusive_datafile_list ); +static WCHAR mui_locale[LOCALE_NAME_MAX_LENGTH]; +static BOOL locale_found = 0; +static BOOL recursion_flag = 0; /*********************************************************************** * Modules @@ -1011,11 +1014,122 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceTypesExW( HMODULE module, ENUMRESTYPEP return ret; } +/***********************************************************************/ +/* get_mui - Acquire an MUI module for the associated resource */ +/***********************************************************************/ + +HMODULE get_mui(HMODULE module) + +{ + + HMODULE mui_module = NULL; + + WCHAR module_name[MAX_PATH], mui_name[MAX_PATH]; + + INT i, j, k, l; + + /* Initialize the work strings */ + + for (i = 0; i < MAX_PATH; i++) { + module_name[i] = 0; + mui_name[i] = 0; + } + + /* Note - the reference to the Windows file name for an "MUI" file has a structure such as */ + /* "C:\Program Files\Application Directory\xx-XX\Application.exe.mui"; however, in testing */ + /* out the usage of the "GetModuleFileNameW" function, it was determined that it works with */ + /* a relative Linux file structure such as "xx-XX/Application.exe.mui". */ + + /* Acquire the base resource file name */ + + if (!(GetModuleFileNameW(module, module_name, MAX_PATH))) return module; + + /* Stay with the original module reference if this file is not an executable file. */ + + if (!(wcsstr(module_name, L".exe"))) return module; + + /* Acquire the locale name using LCIDToLocaleName. Since this function utilizes the FindResourceExW function, this */ + /* sets up a recursive call to this function. In order to avoid a stack overflow condition that would be caused by */ + /* repeated calls, a flag will be set on to return back to the FindResourceExW function without again calling the */ + /* locale acquisition function. */ + + if (!(locale_found)) { + + if (recursion_flag) return module; + + recursion_flag = 1; + + LCIDToLocaleName( GetUserDefaultLCID(), mui_locale, LOCALE_NAME_MAX_LENGTH, 0 ); + + recursion_flag = 0; + + locale_found = 1; + + } + + /* Locate the position of the final backslash in the retrieved executable file. */ + + j = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + if (module_name[i] == '\\') j = i; + } + + /* Set up the work index that will be used to extract just the executable file from the fully qualified file name. */ + + k = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + /* If work index "j" has been set to -1, then the file portion of the qualified name has been reached and will */ + /* be copied to the "MUI" file reference. */ + + if (j < 0) { + mui_name[k] = module_name[i]; + k++; + } + + /* When the position of the final backslash has been reached, add the locale name as the folder/directory */ + /* containing the "MUI" file and reset work index "j" to -1. */ + + if (i >= j && j > 0) { + for (l = 0; l < 5; l++) { + mui_name[k] = mui_locale[l]; + k++; + } + mui_name[k] = '/'; + k++; + j = -1; + } + } + + /* Finally, append the literal ".mui" onto the file reference. */ + + wcscat(mui_name, L".mui"); + + /* Now, see if there is an associated "MUI" file and if so use its handle for the module handle. */ + + mui_module = LoadLibraryExW(mui_name, 0, 0); + + if (mui_module) { + return mui_module; + } else { + return module; + } + +} + +/***********************************************************************/ +/* get_res_handle - Isolated call of the LdrFindResource function */ +/***********************************************************************/ + +HRSRC get_res_handle(HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang) -/********************************************************************** - * FindResourceExW (kernelbase.@) - */ -HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) { NTSTATUS status; UNICODE_STRING nameW, typeW; @@ -1024,7 +1138,6 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); - if (!module) module = GetModuleHandleW( 0 ); nameW.Buffer = typeW.Buffer = NULL; __TRY @@ -1046,7 +1159,41 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP if (!IS_INTRESOURCE(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); if (!IS_INTRESOURCE(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); + return (HRSRC)entry; + +} + +/********************************************************************** + * FindResourceExW (kernelbase.@) + */ +HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) +{ + + HRSRC rsrc; + + TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); + + if (!module) module = GetModuleHandleW( 0 ); + + rsrc = get_res_handle(module, type, name, lang); + + if (rsrc) { + + return rsrc; + + } else { + + /* If a resource retrieval failed using the initial module value, attempt to */ + /* locate an associated MUI file and retry the resource retrieval. */ + + module = get_mui(module); + + rsrc = get_res_handle(module, type, name, lang); + + return rsrc; + + } } @@ -1074,11 +1221,23 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeResource( HGLOBAL handle ) HGLOBAL WINAPI DECLSPEC_HOTPATCH LoadResource( HINSTANCE module, HRSRC rsrc ) { void *ret; + HMODULE mui_module = NULL; TRACE( "%p %p\n", module, rsrc ); if (!rsrc) return 0; if (!module) module = GetModuleHandleW( 0 ); + + + /* Only check for an MUI reference if the resource handle value is less than the module value, */ + /* or if an MUI reference was found and the MUI reference and handle value are larger than the */ + /* module value for the executable file. That is a signal that the resource handle is to be */ + /* associated with the MUI file instead of the executable file. */ + + mui_module = get_mui(module); + + if (((HMODULE)rsrc < module) || ((mui_module > module) && ((HMODULE)rsrc > mui_module))) module = mui_module; + if (!set_ntstatus( LdrAccessResource( module, (IMAGE_RESOURCE_DATA_ENTRY *)rsrc, &ret, NULL ))) return 0; return ret; -- 2.17.1

1 0

[PATCH] winevulkan: Enable VK_EXT_validation_features and VK_EXT_validation_flags.
by Georg Lehmann Nov. 2, 2020

Nov. 2, 2020

I don't see a reason why this should be explicitly unsupported. We can pass it through to the host validation layers. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 72b0adf0c97..2ef44338d40 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -86,8 +86,6 @@ EXT_BLOCK_SIZE = 1000 UNSUPPORTED_EXTENSIONS = [ # Instance extensions - "VK_EXT_validation_features", - "VK_EXT_validation_flags", "VK_KHR_display", # Needs WSI work. "VK_KHR_surface_protected_capabilities", -- 2.29.2

2 1

[PATCH 2/2 v4] msvcrt/tests: Add scanf tests for dashes in scanset.
by Piotr Caban Nov. 2, 2020

Nov. 2, 2020

From: Will Mainio <will.mainio(a)fastmail.com> Signed-off-by: Will Mainio <will.mainio(a)fastmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/scanf.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)

1 0

[PATCH 1/2 v4] msvcrt: Fix scanf with dashes in scanset.
by Piotr Caban Nov. 2, 2020

Nov. 2, 2020

From: Will Mainio <will.mainio(a)fastmail.com> Signed-off-by: Will Mainio <will.mainio(a)fastmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/scanf.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0