July 2020 - Wine-devel - list.winehq.org

[v2 PATCH 1/5] evr: Add a stub for default presenter.
by Nikolay Sivov 01 Jul '20

01 Jul '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/Makefile.in | 3 +- dlls/evr/evr.spec | 2 +- dlls/evr/evr_classes.idl | 7 ++ dlls/evr/evr_private.h | 23 +++++ dlls/evr/main.c | 1 + dlls/evr/presenter.c | 218 +++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 35 +++++++ include/evr.idl | 1 + 8 files changed, 288 insertions(+), 2 deletions(-) create mode 100644 dlls/evr/presenter.c diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index 5671511f6ae..daaf9cc872a 100644 --- a/dlls/evr/Makefile.in +++ b/dlls/evr/Makefile.in @@ -8,6 +8,7 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ evr.c \ main.c \ - mixer.c + mixer.c \ + presenter.c IDL_SRCS = evr_classes.idl diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index 214f2b81d85..e46cb04f644 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -17,7 +17,7 @@ @ stub MFCreateVideoMixerAndPresenter @ stub MFCreateVideoOTA @ stub MFCreateVideoPresenter2 -@ stub MFCreateVideoPresenter +@ stdcall MFCreateVideoPresenter(ptr ptr ptr ptr) @ stub MFCreateVideoSampleAllocator @ stdcall MFCreateVideoSampleFromSurface(ptr ptr) @ stub MFGetPlaneSize diff --git a/dlls/evr/evr_classes.idl b/dlls/evr/evr_classes.idl index 31f0d34fe75..1885a34d77f 100644 --- a/dlls/evr/evr_classes.idl +++ b/dlls/evr/evr_classes.idl @@ -31,3 +31,10 @@ coclass EnhancedVideoRenderer { interface IBaseFilter; } uuid(e474e05a-ab65-4f6a-827c-218b1baaf31f) ] coclass MFVideoMixer9 { interface IMFTransform; } + +[ + helpstring("MF Video Presenter"), + threading(both), + uuid(98455561-5136-4d28-ab08-4cee40ea2781) +] +coclass MFVideoPresenter9 { interface IMFVideoPresenter; } diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h index 5698eb0c21e..7ae83140579 100644 --- a/dlls/evr/evr_private.h +++ b/dlls/evr/evr_private.h @@ -22,8 +22,31 @@ #include "dshow.h" #include "evr.h" #include "wine/strmbase.h" +#include "wine/debug.h" + +static inline const char *debugstr_time(LONGLONG time) +{ + ULONGLONG abstime = time >= 0 ? time : -time; + unsigned int i = 0, j = 0; + char buffer[23], rev[23]; + + while (abstime || i <= 8) + { + buffer[i++] = '0' + (abstime % 10); + abstime /= 10; + if (i == 7) buffer[i++] = '.'; + } + if (time < 0) buffer[i++] = '-'; + + while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +} HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; HRESULT evr_mixer_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; +HRESULT evr_presenter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; #endif /* __EVR_PRIVATE_INCLUDED__ */ diff --git a/dlls/evr/main.c b/dlls/evr/main.c index 85c81f13604..2c6db8430ba 100644 --- a/dlls/evr/main.c +++ b/dlls/evr/main.c @@ -72,6 +72,7 @@ static const struct object_creation_info object_creation[] = { { &CLSID_EnhancedVideoRenderer, evr_filter_create }, { &CLSID_MFVideoMixer9, evr_mixer_create }, + { &CLSID_MFVideoPresenter9, evr_presenter_create }, }; static HRESULT WINAPI classfactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c new file mode 100644 index 00000000000..234c1f076ca --- /dev/null +++ b/dlls/evr/presenter.c @@ -0,0 +1,218 @@ +/* + * Copyright 2020 Nikolay Sivov + * + * 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 + */ + +#define COBJMACROS + +#include "evr.h" +#include "d3d9.h" +#include "mfapi.h" +#include "mferror.h" + +#include "evr_classes.h" +#include "evr_private.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(evr); + +struct video_presenter +{ + IMFVideoPresenter IMFVideoPresenter_iface; + IUnknown IUnknown_inner; + IUnknown *outer_unk; + LONG refcount; +}; + +static struct video_presenter *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IUnknown_inner); +} + +static struct video_presenter *impl_from_IMFVideoPresenter(IMFVideoPresenter *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IUnknown(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + } + else if (IsEqualIID(riid, &IID_IMFClockStateSink) + || IsEqualIID(riid, &IID_IMFVideoPresenter)) + { + *obj = &presenter->IMFVideoPresenter_iface; + } + else + { + WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; +} + +static ULONG WINAPI video_presenter_inner_AddRef(IUnknown *iface) +{ + struct video_presenter *presenter = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&presenter->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI video_presenter_inner_Release(IUnknown *iface) +{ + struct video_presenter *presenter = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&presenter->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(presenter); + } + + return refcount; +} + +static const IUnknownVtbl video_presenter_inner_vtbl = +{ + video_presenter_inner_QueryInterface, + video_presenter_inner_AddRef, + video_presenter_inner_Release, +}; + +static HRESULT WINAPI video_presenter_QueryInterface(IMFVideoPresenter *iface, REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface); + return IUnknown_QueryInterface(presenter->outer_unk, riid, obj); +} + +static ULONG WINAPI video_presenter_AddRef(IMFVideoPresenter *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface); + return IUnknown_AddRef(presenter->outer_unk); +} + +static ULONG WINAPI video_presenter_Release(IMFVideoPresenter *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface); + return IUnknown_Release(presenter->outer_unk); +} + +static HRESULT WINAPI video_presenter_OnClockStart(IMFVideoPresenter *iface, MFTIME systime, LONGLONG offset) +{ + FIXME("%p, %s, %s.\n", iface, debugstr_time(systime), wine_dbgstr_longlong(offset)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_OnClockStop(IMFVideoPresenter *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_OnClockPause(IMFVideoPresenter *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_OnClockRestart(IMFVideoPresenter *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_OnClockSetRate(IMFVideoPresenter *iface, MFTIME systime, float rate) +{ + FIXME("%p, %s, %f.\n", iface, debugstr_time(systime), rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, MFVP_MESSAGE_TYPE message, ULONG_PTR param) +{ + FIXME("%p, %d, %lu.\n", iface, message, param); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_GetCurrentMediaType(IMFVideoPresenter *iface, IMFVideoMediaType **media_type) +{ + FIXME("%p, %p.\n", iface, media_type); + + return E_NOTIMPL; +} + +static const IMFVideoPresenterVtbl video_presenter_vtbl = +{ + video_presenter_QueryInterface, + video_presenter_AddRef, + video_presenter_Release, + video_presenter_OnClockStart, + video_presenter_OnClockStop, + video_presenter_OnClockPause, + video_presenter_OnClockRestart, + video_presenter_OnClockSetRate, + video_presenter_ProcessMessage, + video_presenter_GetCurrentMediaType, +}; + +HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) +{ + TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); + + *obj = NULL; + + if (!IsEqualIID(riid_device, &IID_IDirect3DDevice9)) + return E_INVALIDARG; + + return CoCreateInstance(&CLSID_MFVideoPresenter9, owner, CLSCTX_INPROC_SERVER, riid, obj); +} + +HRESULT evr_presenter_create(IUnknown *outer, void **out) +{ + struct video_presenter *object; + + if (!(object = heap_alloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IMFVideoPresenter_iface.lpVtbl = &video_presenter_vtbl; + object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; + object->outer_unk = outer ? outer : &object->IUnknown_inner; + object->refcount = 1; + + *out = &object->IUnknown_inner; + + return S_OK; +} diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 70fc6b18e2f..6805a7ae2b7 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -117,6 +117,7 @@ static IUnknown test_outer = {&outer_vtbl}; static void test_aggregation(void) { IBaseFilter *filter, *filter2; + IMFVideoPresenter *presenter; IUnknown *unk, *unk2; HRESULT hr; ULONG ref; @@ -171,6 +172,25 @@ static void test_aggregation(void) ref = IUnknown_Release(unk); ok(!ref, "Got unexpected refcount %d.\n", ref); ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + /* Default presenter. */ + presenter = (void *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_MFVideoPresenter9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IMFVideoPresenter, + (void **)&presenter); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(!presenter, "Got interface %p.\n", presenter); + + hr = CoCreateInstance(&CLSID_MFVideoPresenter9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK || broken(hr == E_FAIL) /* WinXP */, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + IUnknown_Release(unk); + } } #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) @@ -846,6 +866,20 @@ done: DestroyWindow(window); } +static void test_default_presenter(void) +{ + IMFVideoPresenter *presenter; + HRESULT hr; + + hr = MFCreateVideoPresenter(NULL, &IID_IMFVideoPresenter, &IID_IMFVideoPresenter, (void **)&presenter); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); + ok(hr == S_OK || broken(hr == E_FAIL) /* WinXP */, "Failed to create default presenter, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IMFVideoPresenter_Release(presenter); +} + START_TEST(evr) { CoInitialize(NULL); @@ -860,6 +894,7 @@ START_TEST(evr) test_default_mixer(); test_default_mixer_type_negotiation(); test_surface_sample(); + test_default_presenter(); CoUninitialize(); } diff --git a/include/evr.idl b/include/evr.idl index 4599e298790..5a623c2c29c 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -225,4 +225,5 @@ cpp_quote("DEFINE_GUID(MR_BUFFER_SERVICE, 0xa562248c, 0x9ac6, 0x4ffc, 0x9f, 0xba cpp_quote("DEFINE_GUID(VIDEO_ZOOM_RECT, 0x7aaa1638, 0x1b7f, 0x4c93, 0xbd, 0x89, 0x5b, 0x9c, 0x9f, 0xb6, 0xfc, 0xf0);") cpp_quote("HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj);") +cpp_quote("HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj);") cpp_quote("HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sample);") -- 2.27.0

2 10

[PATCH] mfplat/tests: Add some tests for d3d9 surface buffer.
by Nikolay Sivov 01 Jul '20

01 Jul '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 185 ++++++++++++++++++++++++++++++++++ include/mfapi.h | 1 + 3 files changed, 187 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index c58a0463e51..4e9413e8da0 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat mfuuid propsys uuid +IMPORTS = ole32 mfplat user32 d3d9 mfuuid propsys uuid strmiids C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index aac6f734583..8b4012f8087 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -34,6 +34,7 @@ #include "mfreadwrite.h" #include "propvarutil.h" #include "strsafe.h" +#include "evr.h" #include "wine/test.h" #include "wine/heap.h" @@ -41,6 +42,7 @@ #define D3D11_INIT_GUID #include "initguid.h" #include "d3d11_4.h" +#include "d3d9.h" #include "d3d9types.h" #include "ks.h" #include "ksmedia.h" @@ -104,6 +106,38 @@ static HRESULT (WINAPI *pMFCreate2DMediaBuffer)(DWORD width, DWORD height, DWORD IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateMediaBufferFromMediaType)(IMFMediaType *media_type, LONGLONG duration, DWORD min_length, DWORD min_alignment, IMFMediaBuffer **buffer); +static HRESULT (WINAPI *pMFCreateDXSurfaceBuffer)(REFIID riid, IUnknown *surface, BOOL bottom_up, IMFMediaBuffer **buffer); + +static HWND create_window(void) +{ + RECT r = {0, 0, 640, 480}; + + AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); + + return CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); +} + +static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DDevice9 *device = NULL; + + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = focus_window; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + present_parameters.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; + + IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + + return device; +} static const WCHAR fileschemeW[] = L"file://"; @@ -677,6 +711,7 @@ static void init_functions(void) X(MFCopyImage); X(MFCreate2DMediaBuffer); X(MFCreateDXGIDeviceManager); + X(MFCreateDXSurfaceBuffer); X(MFCreateSourceResolver); X(MFCreateMediaBufferFromMediaType); X(MFCreateMFByteStreamOnStream); @@ -5281,6 +5316,155 @@ static void test_MFCreateMFVideoFormatFromMFMediaType(void) IMFMediaType_Release(media_type); } +static void test_MFCreateDXSurfaceBuffer(void) +{ + IDirect3DSurface9 *backbuffer = NULL, *surface; + IDirect3DSwapChain9 *swapchain; + IDirect3DDevice9 *device; + IMF2DBuffer2 *_2dbuffer2; + IMFMediaBuffer *buffer; + IMF2DBuffer *_2dbuffer; + BYTE *data, *data2; + IMFGetService *gs; + IDirect3D9 *d3d; + DWORD length; + HWND window; + HRESULT hr; + LONG pitch; + BOOL value; + + if (!pMFCreateDXSurfaceBuffer) + { + skip("MFCreateDXSurfaceBuffer is not available.\n"); + return; + } + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(SUCCEEDED(hr), "Failed to get the implicit swapchain (%08x)\n", hr); + + hr = IDirect3DSwapChain9_GetBackBuffer(swapchain, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer (%08x)\n", hr); + ok(backbuffer != NULL, "The back buffer is NULL\n"); + + IDirect3DSwapChain9_Release(swapchain); + + hr = pMFCreateDXSurfaceBuffer(&IID_IDirect3DSurface9, (IUnknown *)backbuffer, FALSE, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + + /* Surface is accessible. */ + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(surface == backbuffer, "Unexpected surface pointer.\n"); + IDirect3DSurface9_Release(surface); + IMFGetService_Release(gs); + + length = 0; + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!length, "Unexpected length %u.\n", length); + + hr = IMFMediaBuffer_GetCurrentLength(buffer, &length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + ok(!length, "Unexpected length %u.\n", length); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Unlock twice. */ + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#x.\n", hr); + + /* Lock twice. */ + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &data2, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(data == data2, "Unexpected pointer.\n"); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2dbuffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Unlocked. */ + hr = IMF2DBuffer_GetScanline0AndPitch(_2dbuffer, &data, &pitch); + ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer_GetScanline0AndPitch(_2dbuffer, &data, &pitch); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &data2, NULL, NULL); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer_Unlock2D(_2dbuffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer_Unlock2D(_2dbuffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer_Unlock2D(_2dbuffer); + ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer_IsContiguousFormat(_2dbuffer, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!value, "Unexpected return value %d.\n", value); + + IMF2DBuffer_Release(_2dbuffer); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer2, (void **)&_2dbuffer2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Read, &data, &pitch, &data2, &length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(data == data2, "Unexpected scanline pointer.\n"); + memset(data, 0xab, 4); + IMF2DBuffer2_Unlock2D(_2dbuffer2); + + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Write, &data, &pitch, &data2, &length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(data[0] == 0xab, "Unexpected leading byte.\n"); + IMF2DBuffer2_Unlock2D(_2dbuffer2); + + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_ReadWrite, &data, &pitch, &data2, &length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMF2DBuffer2_Unlock2D(_2dbuffer2); + + IMF2DBuffer2_Release(_2dbuffer2); + + IMFMediaBuffer_Release(buffer); + +done: + if (backbuffer) + IDirect3DSurface9_Release(backbuffer); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(mfplat) { char **argv; @@ -5337,6 +5521,7 @@ START_TEST(mfplat) test_MFCreateMediaBufferFromMediaType(); test_MFInitMediaTypeFromWaveFormatEx(); test_MFCreateMFVideoFormatFromMFMediaType(); + test_MFCreateDXSurfaceBuffer(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 06a5412cbc5..b1edeac02f6 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -502,6 +502,7 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, IUnknown *state, IMFAsyncResult **result); HRESULT WINAPI MFCreateCollection(IMFCollection **collection); HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager); +HRESULT WINAPI MFCreateDXSurfaceBuffer(REFIID riid, IUnknown *surface, BOOL bottom_up, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, LPCWSTR url, IMFByteStream **bytestream); -- 2.27.0

1 0

[PATCH 1/5] evr: Add IMFRateSupport stub for the presenter.
by Nikolay Sivov 01 Jul '20

01 Jul '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/presenter.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 28 ++++++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index cbe8b0d2ff4..29167d364df 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -37,6 +37,7 @@ struct video_presenter IMFVideoDeviceID IMFVideoDeviceID_iface; IMFTopologyServiceLookupClient IMFTopologyServiceLookupClient_iface; IMFVideoDisplayControl IMFVideoDisplayControl_iface; + IMFRateSupport IMFRateSupport_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -67,6 +68,11 @@ static struct video_presenter *impl_from_IMFVideoDisplayControl(IMFVideoDisplayC return CONTAINING_RECORD(iface, struct video_presenter, IMFVideoDisplayControl_iface); } +static struct video_presenter *impl_from_IMFRateSupport(IMFRateSupport *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IMFRateSupport_iface); +} + static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { struct video_presenter *presenter = impl_from_IUnknown(iface); @@ -94,6 +100,10 @@ static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFI { *obj = &presenter->IMFVideoDisplayControl_iface; } + else if (IsEqualIID(riid, &IID_IMFRateSupport)) + { + *obj = &presenter->IMFRateSupport_iface; + } else { WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); @@ -409,6 +419,56 @@ static const IMFVideoDisplayControlVtbl video_presenter_control_vtbl = video_presenter_control_GetCurrentImage, }; +static HRESULT WINAPI video_presenter_rate_support_QueryInterface(IMFRateSupport *iface, REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IMFRateSupport(iface); + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); +} + +static ULONG WINAPI video_presenter_rate_support_AddRef(IMFRateSupport *iface) +{ + struct video_presenter *presenter = impl_from_IMFRateSupport(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_rate_support_Release(IMFRateSupport *iface) +{ + struct video_presenter *presenter = impl_from_IMFRateSupport(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, + BOOL thin, float *rate) +{ + TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + *rate = 0.0f; + + return S_OK; +} + +static HRESULT WINAPI video_presenter_rate_support_GetFastestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, + BOOL thin, float *rate) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, + float *nearest_supported_rate) +{ + return E_NOTIMPL; +} + +static const IMFRateSupportVtbl video_presenter_rate_support_vtbl = +{ + video_presenter_rate_support_QueryInterface, + video_presenter_rate_support_AddRef, + video_presenter_rate_support_Release, + video_presenter_rate_support_GetSlowestRate, + video_presenter_rate_support_GetFastestRate, + video_presenter_rate_support_IsRateSupported, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -432,6 +492,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IMFVideoDeviceID_iface.lpVtbl = &video_presenter_device_id_vtbl; object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_presenter_service_client_vtbl; object->IMFVideoDisplayControl_iface.lpVtbl = &video_presenter_control_vtbl; + object->IMFRateSupport_iface.lpVtbl = &video_presenter_rate_support_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 037916fc4e1..dd3fbbe0289 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -869,8 +869,10 @@ done: static void test_default_presenter(void) { IMFVideoPresenter *presenter; + IMFRateSupport *rate_support; IMFVideoDeviceID *deviceid; IUnknown *unk; + float rate; HRESULT hr; GUID iid; @@ -902,6 +904,32 @@ static void test_default_presenter(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + /* Rate support. */ + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFRateSupport, (void **)&rate_support); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + IMFRateSupport_Release(rate_support); + IMFVideoPresenter_Release(presenter); } -- 2.27.0

1 4

[PATCH] where.exe: add stub program (now with bugreport reference)
by Louis Lenders 01 Jul '20

01 Jul '20

https://bugs.winehq.org/show_bug.cgi?id=49460 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + programs/where/Makefile.in | 6 ++++++ programs/where/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 programs/where/Makefile.in create mode 100644 programs/where/main.c diff --git a/configure b/configure index ee0439425a..b6e42b4c86 100755 --- a/configure +++ b/configure @@ -1807,6 +1807,7 @@ enable_uninstaller enable_unlodctr enable_view enable_wevtutil +enable_where enable_whoami enable_wineboot enable_winebrowser @@ -21426,6 +21427,7 @@ wine_fn_config_makefile programs/uninstaller enable_uninstaller wine_fn_config_makefile programs/unlodctr enable_unlodctr wine_fn_config_makefile programs/view enable_view wine_fn_config_makefile programs/wevtutil enable_wevtutil +wine_fn_config_makefile programs/where enable_where wine_fn_config_makefile programs/whoami enable_whoami wine_fn_config_makefile programs/wineboot enable_wineboot wine_fn_config_makefile programs/winebrowser enable_winebrowser diff --git a/configure.ac b/configure.ac index 3c03bad292..272f2e2a93 100644 --- a/configure.ac +++ b/configure.ac @@ -4011,6 +4011,7 @@ WINE_CONFIG_MAKEFILE(programs/uninstaller) WINE_CONFIG_MAKEFILE(programs/unlodctr) WINE_CONFIG_MAKEFILE(programs/view) WINE_CONFIG_MAKEFILE(programs/wevtutil) +WINE_CONFIG_MAKEFILE(programs/where) WINE_CONFIG_MAKEFILE(programs/whoami) WINE_CONFIG_MAKEFILE(programs/wineboot) WINE_CONFIG_MAKEFILE(programs/winebrowser) diff --git a/programs/where/Makefile.in b/programs/where/Makefile.in new file mode 100644 index 0000000000..109261c379 --- /dev/null +++ b/programs/where/Makefile.in @@ -0,0 +1,6 @@ +MODULE = where.exe + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c diff --git a/programs/where/main.c b/programs/where/main.c new file mode 100644 index 0000000000..84daac8220 --- /dev/null +++ b/programs/where/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2020 Louis Lenders + * + * 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(where); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} -- 2.27.0

1 0

[PATCH] where.exe: add stub program
by Louis Lenders 01 Jul '20

01 Jul '20

Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + programs/where/Makefile.in | 6 ++++++ programs/where/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 programs/where/Makefile.in create mode 100644 programs/where/main.c diff --git a/configure b/configure index ee0439425a..b6e42b4c86 100755 --- a/configure +++ b/configure @@ -1807,6 +1807,7 @@ enable_uninstaller enable_unlodctr enable_view enable_wevtutil +enable_where enable_whoami enable_wineboot enable_winebrowser @@ -21426,6 +21427,7 @@ wine_fn_config_makefile programs/uninstaller enable_uninstaller wine_fn_config_makefile programs/unlodctr enable_unlodctr wine_fn_config_makefile programs/view enable_view wine_fn_config_makefile programs/wevtutil enable_wevtutil +wine_fn_config_makefile programs/where enable_where wine_fn_config_makefile programs/whoami enable_whoami wine_fn_config_makefile programs/wineboot enable_wineboot wine_fn_config_makefile programs/winebrowser enable_winebrowser diff --git a/configure.ac b/configure.ac index 3c03bad292..272f2e2a93 100644 --- a/configure.ac +++ b/configure.ac @@ -4011,6 +4011,7 @@ WINE_CONFIG_MAKEFILE(programs/uninstaller) WINE_CONFIG_MAKEFILE(programs/unlodctr) WINE_CONFIG_MAKEFILE(programs/view) WINE_CONFIG_MAKEFILE(programs/wevtutil) +WINE_CONFIG_MAKEFILE(programs/where) WINE_CONFIG_MAKEFILE(programs/whoami) WINE_CONFIG_MAKEFILE(programs/wineboot) WINE_CONFIG_MAKEFILE(programs/winebrowser) diff --git a/programs/where/Makefile.in b/programs/where/Makefile.in new file mode 100644 index 0000000000..109261c379 --- /dev/null +++ b/programs/where/Makefile.in @@ -0,0 +1,6 @@ +MODULE = where.exe + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c diff --git a/programs/where/main.c b/programs/where/main.c new file mode 100644 index 0000000000..84daac8220 --- /dev/null +++ b/programs/where/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2020 Louis Lenders + * + * 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(where); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} -- 2.27.0

1 0

[PATCH] ntdll: Don't use WCHAR in unix_to_win_locale().
by Gijs Vermeulen 01 Jul '20

01 Jul '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntdll/unix/env.c | 49 +++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index e260e5c338..e57b625689 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -74,8 +74,8 @@ char **main_envp = NULL; static WCHAR **main_wargv; static CPTABLEINFO unix_table; -static WCHAR system_locale[LOCALE_NAME_MAX_LENGTH]; -static WCHAR user_locale[LOCALE_NAME_MAX_LENGTH]; +static char system_locale[LOCALE_NAME_MAX_LENGTH]; +static char user_locale[LOCALE_NAME_MAX_LENGTH]; static void *read_nls_file( const char *name ) { @@ -649,18 +649,11 @@ static WCHAR **build_wargv( char **argv ) /* Unix format is: lang[_country][.charset][@modifier] * Windows format is: lang[-script][-country][_modifier] */ -static BOOL unix_to_win_locale( const char *unix_name, WCHAR *win_name ) +static BOOL unix_to_win_locale( const char *unix_name, char *win_name ) { - static const WCHAR sepW[] = {'_','.','@',0}; - static const WCHAR posixW[] = {'P','O','S','I','X',0}; - static const WCHAR cW[] = {'C',0}; - static const WCHAR euroW[] = {'e','u','r','o',0}; - static const WCHAR latinW[] = {'l','a','t','i','n',0}; - static const WCHAR latnW[] = {'-','L','a','t','n',0}; - static const WCHAR enUSW[] = {'e','n','-','U','S',0}; - WCHAR buffer[LOCALE_NAME_MAX_LENGTH]; - WCHAR *p, *country = NULL, *modifier = NULL; - DWORD len; + static const char sep[] = "_.@"; + char buffer[LOCALE_NAME_MAX_LENGTH]; + char *p, *country = NULL, *modifier = NULL; if (!unix_name || !unix_name[0] || !strcmp( unix_name, "C" )) { @@ -668,16 +661,12 @@ static BOOL unix_to_win_locale( const char *unix_name, WCHAR *win_name ) if (!unix_name || !unix_name[0]) return FALSE; } - len = ntdll_umbstowcs( unix_name, strlen(unix_name), buffer, ARRAY_SIZE(buffer) ); - if (len == ARRAY_SIZE(buffer)) return FALSE; - buffer[len] = 0; - - if (!(p = wcspbrk( buffer, sepW ))) + if (!(p = strpbrk( buffer, sep ))) { - if (!wcscmp( buffer, posixW ) || !wcscmp( buffer, cW )) - wcscpy( win_name, enUSW ); + if (!strcmp( buffer, "POSIX" ) || !strcmp( buffer, "C" )) + strcpy( win_name, "en-US" ); else - wcscpy( win_name, buffer ); + strcpy( win_name, buffer ); return TRUE; } @@ -685,13 +674,13 @@ static BOOL unix_to_win_locale( const char *unix_name, WCHAR *win_name ) { *p++ = 0; country = p; - p = wcspbrk( p, sepW + 1 ); + p = strpbrk( p, sep + 1 ); } if (p && *p == '.') { *p++ = 0; /* charset, ignore */ - p = wcschr( p, '@' ); + p = strchr( p, '@' ); } if (p) { @@ -701,18 +690,18 @@ static BOOL unix_to_win_locale( const char *unix_name, WCHAR *win_name ) /* rebuild a Windows name */ - wcscpy( win_name, buffer ); + strcpy( win_name, buffer ); if (modifier) { - if (!wcscmp( modifier, latinW )) wcscat( win_name, latnW ); - else if (!wcscmp( modifier, euroW )) {} /* ignore */ + if (!strcmp( modifier, "latin" )) strcat( win_name, "-Latn" ); + else if (!strcmp( modifier, "euro" )) {} /* ignore */ else return FALSE; } if (country) { - p = win_name + wcslen(win_name); + p = win_name + strlen(win_name); *p++ = '-'; - wcscpy( p, country ); + strcpy( p, country ); } return TRUE; } @@ -1083,6 +1072,6 @@ void CDECL get_unix_codepage( CPTABLEINFO *table ) */ void CDECL get_locales( WCHAR *sys, WCHAR *user ) { - wcscpy( sys, system_locale ); - wcscpy( user, user_locale ); + ntdll_umbstowcs( system_locale, ARRAY_SIZE(system_locale), sys, LOCALE_NAME_MAX_LENGTH * sizeof(WCHAR) ); + ntdll_umbstowcs( user_locale, ARRAY_SIZE(user_locale), user, LOCALE_NAME_MAX_LENGTH * sizeof(WCHAR) ); } -- 2.27.0

2 1

[PATCH v2 2/2] kernel32: Fix GetPrivateProfileIntW() if section and filename are both NULL.
by Jiajin Cui 01 Jul '20

01 Jul '20

1 0

[PATCH v3 1/2] include: Use the public VM_COUNTERS and VM_COUNTERS_EX structure definitions.
by Zebediah Figura 30 Jun '20

30 Jun '20

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/info.c | 20 +++++++------------- dlls/ntdll/unix/process.c | 12 ++++++------ include/winternl.h | 26 ++++++++++++++++++++------ 3 files changed, 33 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 7475fcf56ee..35e4b834c42 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -342,7 +342,7 @@ static void test_query_process(void) ULONG HandleCount; DWORD dwUnknown3; DWORD dwUnknown4; - VM_COUNTERS vmCounters; + VM_COUNTERS_EX vmCounters; IO_COUNTERS ioCounters; SYSTEM_THREAD_INFORMATION ti[1]; } SYSTEM_PROCESS_INFORMATION_PRIVATE; @@ -1399,7 +1399,7 @@ static void test_query_process_basic(void) ok( pbi.UniqueProcessId > 0, "Expected a ProcessID > 0, got 0\n"); } -static void dump_vm_counters(const char *header, const VM_COUNTERS *pvi) +static void dump_vm_counters(const char *header, const VM_COUNTERS_EX *pvi) { trace("%s:\n", header); trace("PeakVirtualSize : %lu\n", pvi->PeakVirtualSize); @@ -1419,8 +1419,7 @@ static void test_query_process_vm(void) { NTSTATUS status; ULONG ReturnLength; - VM_COUNTERS pvi; - ULONG old_size = FIELD_OFFSET(VM_COUNTERS,PrivatePageCount); + VM_COUNTERS_EX pvi; HANDLE process; SIZE_T prev_size; const SIZE_T alloc_size = 16 * 1024 * 1024; @@ -1430,24 +1429,19 @@ static void test_query_process_vm(void) ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status); - status = pNtQueryInformationProcess(NULL, ProcessVmCounters, &pvi, old_size, NULL); + status = pNtQueryInformationProcess(NULL, ProcessVmCounters, &pvi, sizeof(VM_COUNTERS), NULL); ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); - /* Windows XP and W2K3 will report success for a size of 44 AND 48 ! - Windows W2K will only report success for 44. - For now we only care for 44, which is FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) - */ - status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, 24, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, old_size, &ReturnLength); + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(VM_COUNTERS), &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( old_size == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( ReturnLength == sizeof(VM_COUNTERS), "Inconsistent length %d\n", ReturnLength); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, 46, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( ReturnLength == old_size || ReturnLength == sizeof(pvi), "Inconsistent length %d\n", ReturnLength); + ok( ReturnLength == sizeof(VM_COUNTERS) || ReturnLength == sizeof(pvi), "Inconsistent length %d\n", ReturnLength); /* Check if we have some return values */ dump_vm_counters("VM counters for GetCurrentProcess", &pvi); diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 578c79bf89a..c39d8fb23a4 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1170,13 +1170,13 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class { VM_COUNTERS pvmi; - /* older Windows versions don't have the PrivatePageCount field */ - if (size >= FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) + /* older Windows versions don't have the PrivateUsage field */ + if (size >= sizeof(VM_COUNTERS)) { if (!info) ret = STATUS_ACCESS_VIOLATION; else { - memset(&pvmi, 0 , sizeof(VM_COUNTERS)); + memset(&pvmi, 0, sizeof(pvmi)); if (handle == GetCurrentProcess()) fill_VM_COUNTERS(&pvmi); else { @@ -1197,10 +1197,10 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class if (ret) break; } len = size; - if (len != FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) len = sizeof(VM_COUNTERS); - memcpy(info, &pvmi, min(size,sizeof(VM_COUNTERS))); + if (len != sizeof(VM_COUNTERS)) len = sizeof(VM_COUNTERS_EX); + memcpy(info, &pvmi, min(size, sizeof(pvmi))); } - if (size != FIELD_OFFSET(VM_COUNTERS,PrivatePageCount) && size != sizeof(VM_COUNTERS)) + if (size != sizeof(VM_COUNTERS) && size != sizeof(VM_COUNTERS_EX)) ret = STATUS_INFO_LENGTH_MISMATCH; } else diff --git a/include/winternl.h b/include/winternl.h index 9a70a2014f1..5b5a5f32c6f 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1584,12 +1584,11 @@ typedef struct _SYSTEM_KERNEL_DEBUGGER_INFORMATION { BOOLEAN DebuggerNotPresent; } SYSTEM_KERNEL_DEBUGGER_INFORMATION, *PSYSTEM_KERNEL_DEBUGGER_INFORMATION; -/* System Information Class 0x05 */ - -typedef struct _VM_COUNTERS_ { +typedef struct _VM_COUNTERS +{ SIZE_T PeakVirtualSize; SIZE_T VirtualSize; - ULONG PageFaultCount; + ULONG PageFaultCount; SIZE_T PeakWorkingSetSize; SIZE_T WorkingSetSize; SIZE_T QuotaPeakPagedPoolUsage; @@ -1598,9 +1597,24 @@ typedef struct _VM_COUNTERS_ { SIZE_T QuotaNonPagedPoolUsage; SIZE_T PagefileUsage; SIZE_T PeakPagefileUsage; - SIZE_T PrivatePageCount; } VM_COUNTERS, *PVM_COUNTERS; +typedef struct _VM_COUNTERS_EX +{ + SIZE_T PeakVirtualSize; + SIZE_T VirtualSize; + ULONG PageFaultCount; + SIZE_T PeakWorkingSetSize; + SIZE_T WorkingSetSize; + SIZE_T QuotaPeakPagedPoolUsage; + SIZE_T QuotaPagedPoolUsage; + SIZE_T QuotaPeakNonPagedPoolUsage; + SIZE_T QuotaNonPagedPoolUsage; + SIZE_T PagefileUsage; + SIZE_T PeakPagefileUsage; + SIZE_T PrivateUsage; +} VM_COUNTERS_EX, *PVM_COUNTERS_EX; + typedef struct _SYSTEM_PROCESS_INFORMATION { #ifdef __WINESRC__ /* win32/win64 */ ULONG NextEntryOffset; /* 00/00 */ @@ -1616,7 +1630,7 @@ typedef struct _SYSTEM_PROCESS_INFORMATION { ULONG HandleCount; /* 4c/60 */ ULONG SessionId; /* 50/64 */ DWORD dwUnknown4; /* 54/68 */ - VM_COUNTERS vmCounters; /* 58/70 */ + VM_COUNTERS_EX vmCounters; /* 58/70 */ IO_COUNTERS ioCounters; /* 88/d0 */ SYSTEM_THREAD_INFORMATION ti[1]; /* b8/100 */ #else -- 2.27.0

1 1

[PATCH] windowscodecs: Implement DdsFrameDecode_GetPixelFormat().
by Ziqing Hui 30 Jun '20

30 Jun '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 15 +++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 10 +++++----- 2 files changed, 18 insertions(+), 7 deletions(-)

2 1

[PATCH v2 1/6] amstream: Decrement "sample_refs" only when the object is being released.
by Zebediah Figura 30 Jun '20

30 Jun '20

From: Gijs Vermeulen <gijsvrm(a)gmail.com> Fixes: 51fce87c607d92300bb6b3f7674e7e6c775c86ff Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: reword subject to be a bit more specific. dlls/amstream/ddrawstream.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 56230ca4e63..b7196d9fc9e 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -980,7 +980,6 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) object->IMemInputPin_iface.lpVtbl = &ddraw_meminput_vtbl; object->IPin_iface.lpVtbl = &ddraw_sink_vtbl; object->ref = 1; - object->sample_refs = 0; InitializeCriticalSection(&object->cs); @@ -1043,12 +1042,12 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) TRACE("(%p)->(): new ref = %u\n", iface, ref); - EnterCriticalSection(&sample->parent->cs); - InterlockedDecrement(&sample->parent->sample_refs); - LeaveCriticalSection(&sample->parent->cs); - if (!ref) { + EnterCriticalSection(&sample->parent->cs); + --sample->parent->sample_refs; + LeaveCriticalSection(&sample->parent->cs); + if (sample->surface) IDirectDrawSurface_Release(sample->surface); HeapFree(GetProcessHeap(), 0, sample); @@ -1166,7 +1165,7 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw object->parent = parent; EnterCriticalSection(&parent->cs); - InterlockedIncrement(&parent->sample_refs); + ++parent->sample_refs; LeaveCriticalSection(&parent->cs); if (surface) -- 2.27.0

1 5