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

[PATCH 2/6] mfplat: Implement IMFDXGIDeviceManager::ResetDevice().
by Jactry Zeng 29 Aug '19

29 Aug '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 29 ++++++++++- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 92 +++++++++++++++++++++++++++++++++++ 3 files changed, 120 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c2293cfd8b..1b0f6b5e9d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -28,7 +28,10 @@ #include "winuser.h" #include "winreg.h" +#define D3D11_INIT_GUID #include "initguid.h" +#include "d3d11_4.h" +#include "d3d12.h" #include "ole2.h" #include "propsys.h" @@ -7623,6 +7626,7 @@ struct mfdxgi_dev_mgr IMFDXGIDeviceManager IMFDXGIDeviceManager_iface; LONG ref; UINT token; + IUnknown *d3d_device; }; static struct mfdxgi_dev_mgr *impl_from_IMFDXGIDeviceManager(IMFDXGIDeviceManager *iface) @@ -7666,6 +7670,8 @@ static ULONG WINAPI mfdxgi_dev_mgr_Release(IMFDXGIDeviceManager *iface) if (!refcount) { + if (manager->d3d_device) + IUnknown_Release(manager->d3d_device); heap_free(manager); } @@ -7713,10 +7719,28 @@ static HRESULT WINAPI mfdxgi_dev_mgr_OpenDeviceHandle(IMFDXGIDeviceManager *ifac static HRESULT WINAPI mfdxgi_dev_mgr_ResetDevice(IMFDXGIDeviceManager *iface, IUnknown *device, UINT token) { struct mfdxgi_dev_mgr *This = impl_from_IMFDXGIDeviceManager(iface); + IUnknown *d3d_device; + HRESULT hr; - FIXME("(%p)->(%p, %u): stub.\n", This, device, token); + TRACE("(%p)->(%p, %u).\n", This, device, token); - return E_NOTIMPL; + if (!device || token != This->token) + return E_INVALIDARG; + + hr = IUnknown_QueryInterface(device, &IID_ID3D11Device, (void **)&d3d_device); + if (FAILED(hr)) + hr = IUnknown_QueryInterface(device, &IID_ID3D12Device, (void **)&d3d_device); + + if (SUCCEEDED(hr)) + { + if (This->d3d_device) + IUnknown_Release(This->d3d_device); + This->d3d_device = d3d_device; + } + else + hr = E_INVALIDARG; + + return hr; } static HRESULT WINAPI mfdxgi_dev_mgr_TestDevice(IMFDXGIDeviceManager *iface, HANDLE device) @@ -7767,6 +7791,7 @@ HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **man dev_mgr->IMFDXGIDeviceManager_iface.lpVtbl = &mfdxgi_dev_mgr_vtbl; dev_mgr->ref = 1; dev_mgr->token = MFGetSystemTime(); + dev_mgr->d3d_device = NULL; TRACE("Created device manager: %p, token: %u.\n", dev_mgr, dev_mgr->token); diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index c58a0463e5..dafb429142 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 mfuuid propsys uuid d3d11 C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 312f8b3bb2..7f29793982 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -38,7 +38,11 @@ #include "wine/test.h" #include "wine/heap.h" +#define D3D11_INIT_GUID #include "initguid.h" +#include "d3d11_4.h" +#include "d3d12.h" + DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); @@ -56,6 +60,7 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); } +PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static HRESULT (WINAPI *pMFCopyImage)(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); @@ -506,6 +511,7 @@ todo_wine static void init_functions(void) { HMODULE mod = GetModuleHandleA("mfplat.dll"); + HMODULE d3d12_mod = LoadLibraryA("d3d12.dll"); #define X(f) p##f = (void*)GetProcAddress(mod, #f) X(MFAddPeriodicCallback); @@ -522,6 +528,10 @@ static void init_functions(void) X(MFRemovePeriodicCallback); #undef X +#define X(f) p##f = (void*)GetProcAddress(d3d12_mod, #f) + X(D3D12CreateDevice); +#undef X + is_win8_plus = pMFPutWaitingWorkItem != NULL; } @@ -3778,6 +3788,87 @@ static void test_create_dxgi_device_manager(void) IMFDXGIDeviceManager_Release(ret2.dev_mgr); } +static void test_reset_device(void) +{ + ID3D11Device *d3d11_dev, *d3d11_dev2; + IMFDXGIDeviceManager *manager; + ID3D12Device *d3d12_dev; + HRESULT hr; + UINT token; + + token = 0; + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); + EXPECT_REF(manager, 1); + ok(!!token, "got wrong token: %u.\n", token); + + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, D3D11_CREATE_DEVICE_VIDEO_SUPPORT, + NULL, 0, D3D11_SDK_VERSION, &d3d11_dev, NULL, NULL); + ok(hr == S_OK, "D3D11CreateDevice failed: %#x.\n", hr); + EXPECT_REF(d3d11_dev, 1); + + hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)d3d11_dev, token - 1); + ok(hr == E_INVALIDARG, "IMFDXGIDeviceManager_ResetDevice should failed: %#x.\n", hr); + EXPECT_REF(d3d11_dev, 1); + + hr = IMFDXGIDeviceManager_ResetDevice(manager, NULL, token); + ok(hr == E_INVALIDARG, "IMFDXGIDeviceManager_ResetDevice should failed: %#x.\n", hr); + + hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)d3d11_dev, token); + ok(hr == S_OK, "IMFDXGIDeviceManager_ResetDevice failed: %#x.\n", hr); + EXPECT_REF(manager, 1); + EXPECT_REF(d3d11_dev, 2); + + hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)manager, token); + ok(hr == E_INVALIDARG, "IMFDXGIDeviceManager_ResetDevice should failed: %#x.\n", hr); + EXPECT_REF(manager, 1); + EXPECT_REF(d3d11_dev, 2); + + hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)d3d11_dev, token); + ok(hr == S_OK, "IMFDXGIDeviceManager_ResetDevice failed: %#x.\n", hr); + EXPECT_REF(manager, 1); + EXPECT_REF(d3d11_dev, 2); + + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, + NULL, 0, D3D11_SDK_VERSION, &d3d11_dev2, NULL, NULL); + ok(hr == S_OK, "D3D11CreateDevice failed: %#x.\n", hr); + EXPECT_REF(d3d11_dev2, 1); + hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)d3d11_dev2, token); + ok(hr == S_OK, "IMFDXGIDeviceManager_ResetDevice failed: %#x.\n", hr); + EXPECT_REF(manager, 1); + EXPECT_REF(d3d11_dev2, 2); + EXPECT_REF(d3d11_dev, 1); + + IMFDXGIDeviceManager_Release(manager); + EXPECT_REF(d3d11_dev2, 1); + ID3D11Device_Release(d3d11_dev); + ID3D11Device_Release(d3d11_dev2); + + if (!pD3D12CreateDevice) + { + win_skip("D3D12CreateDevice() not found.\n"); + return; + } + + token = 0; + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); + EXPECT_REF(manager, 1); + ok(!!token, "got wrong token: %u.\n", token); + + hr = pD3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&d3d12_dev); + ok(hr == S_OK, "D3D12CreateDevice failed: %#x.\n", hr); + EXPECT_REF(d3d12_dev, 1); + + hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)d3d12_dev, token); + ok(hr == S_OK, "IMFDXGIDeviceManager_ResetDevice failed: %#x.\n", hr); + EXPECT_REF(manager, 1); + EXPECT_REF(d3d12_dev, 2); + + ID3D12Device_Release(d3d12_dev); + IMFDXGIDeviceManager_Release(manager); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -3816,6 +3907,7 @@ START_TEST(mfplat) test_local_handlers(); test_create_property_store(); test_create_dxgi_device_manager(); + test_reset_device(); CoUninitialize(); } -- 2.23.0.rc1

3 3

[PATCH 1/6] mfplat: Implement MFCreateDXGIDeviceManager().
by Jactry Zeng 29 Aug '19

29 Aug '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 158 +++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 75 ++++++++++++++++++ include/mfapi.h | 1 + include/mfobjects.idl | 17 ++++ 5 files changed, 252 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index f8f4b502a5..c2293cfd8b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -7617,3 +7617,161 @@ HRESULT WINAPI CreatePropertyStore(IPropertyStore **store) return S_OK; } + +struct mfdxgi_dev_mgr +{ + IMFDXGIDeviceManager IMFDXGIDeviceManager_iface; + LONG ref; + UINT token; +}; + +static struct mfdxgi_dev_mgr *impl_from_IMFDXGIDeviceManager(IMFDXGIDeviceManager *iface) +{ + return CONTAINING_RECORD(iface, struct mfdxgi_dev_mgr, IMFDXGIDeviceManager_iface); +} + +static HRESULT WINAPI mfdxgi_dev_mgr_QueryInterface(IMFDXGIDeviceManager *iface, REFIID riid, void **obj) +{ + TRACE("(%p, %s, %p).\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFDXGIDeviceManager) || + IsEqualGUID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFDXGIDeviceManager_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI mfdxgi_dev_mgr_AddRef(IMFDXGIDeviceManager *iface) +{ + struct mfdxgi_dev_mgr *manager = impl_from_IMFDXGIDeviceManager(iface); + ULONG refcount = InterlockedIncrement(&manager->ref); + + TRACE("(%p) ref=%u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI mfdxgi_dev_mgr_Release(IMFDXGIDeviceManager *iface) +{ + struct mfdxgi_dev_mgr *manager = impl_from_IMFDXGIDeviceManager(iface); + ULONG refcount = InterlockedDecrement(&manager->ref); + + TRACE("(%p) ref=%u.\n", iface, refcount); + + if (!refcount) + { + heap_free(manager); + } + + return refcount; +} + +static HRESULT WINAPI mfdxgi_dev_mgr_CloseDeviceHandle(IMFDXGIDeviceManager *iface, HANDLE device) +{ + struct mfdxgi_dev_mgr *This = impl_from_IMFDXGIDeviceManager(iface); + + FIXME("(%p)->(%p): stub.\n", This, device); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfdxgi_dev_mgr_GetVideoService(IMFDXGIDeviceManager *iface, HANDLE device, + REFIID riid, void **service) +{ + struct mfdxgi_dev_mgr *This = impl_from_IMFDXGIDeviceManager(iface); + + FIXME("(%p)->(%p, %s, %p): stub.\n", This, device, debugstr_guid(riid), service); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfdxgi_dev_mgr_LockDevice(IMFDXGIDeviceManager *iface, HANDLE device, + REFIID riid, void **ppv, BOOL block) +{ + struct mfdxgi_dev_mgr *This = impl_from_IMFDXGIDeviceManager(iface); + + FIXME("(%p)->(%p, %s, %p, %d): stub.\n", This, device, wine_dbgstr_guid(riid), ppv, block); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfdxgi_dev_mgr_OpenDeviceHandle(IMFDXGIDeviceManager *iface, HANDLE *device) +{ + struct mfdxgi_dev_mgr *This = impl_from_IMFDXGIDeviceManager(iface); + + FIXME("(%p)->(%p): stub.\n", This, device); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfdxgi_dev_mgr_ResetDevice(IMFDXGIDeviceManager *iface, IUnknown *device, UINT token) +{ + struct mfdxgi_dev_mgr *This = impl_from_IMFDXGIDeviceManager(iface); + + FIXME("(%p)->(%p, %u): stub.\n", This, device, token); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfdxgi_dev_mgr_TestDevice(IMFDXGIDeviceManager *iface, HANDLE device) +{ + struct mfdxgi_dev_mgr *This = impl_from_IMFDXGIDeviceManager(iface); + + FIXME("(%p)->(%p): stub.\n", This, device); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfdxgi_dev_mgr_UnlockDevice(IMFDXGIDeviceManager *iface, HANDLE device, BOOL state) +{ + struct mfdxgi_dev_mgr *This = impl_from_IMFDXGIDeviceManager(iface); + + FIXME("(%p)->(%p, %d): stub.\n", This, device, state); + + return E_NOTIMPL; +} + +static const IMFDXGIDeviceManagerVtbl mfdxgi_dev_mgr_vtbl = +{ + mfdxgi_dev_mgr_QueryInterface, + mfdxgi_dev_mgr_AddRef, + mfdxgi_dev_mgr_Release, + mfdxgi_dev_mgr_CloseDeviceHandle, + mfdxgi_dev_mgr_GetVideoService, + mfdxgi_dev_mgr_LockDevice, + mfdxgi_dev_mgr_OpenDeviceHandle, + mfdxgi_dev_mgr_ResetDevice, + mfdxgi_dev_mgr_TestDevice, + mfdxgi_dev_mgr_UnlockDevice, +}; + +HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager) +{ + struct mfdxgi_dev_mgr *dev_mgr; + + TRACE("(%p, %p).\n", token, manager); + + if (!token || !manager) + return E_POINTER; + + dev_mgr = heap_alloc(sizeof(*dev_mgr)); + if (!dev_mgr) + return E_OUTOFMEMORY; + + dev_mgr->IMFDXGIDeviceManager_iface.lpVtbl = &mfdxgi_dev_mgr_vtbl; + dev_mgr->ref = 1; + dev_mgr->token = MFGetSystemTime(); + + TRACE("Created device manager: %p, token: %u.\n", dev_mgr, dev_mgr->token); + + *token = dev_mgr->token; + *manager = &dev_mgr->IMFDXGIDeviceManager_iface; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 2f16bbd197..cc440c5ee0 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -42,6 +42,7 @@ @ stdcall MFCreateAttributes(ptr long) @ stub MFCreateAudioMediaType @ stdcall MFCreateCollection(ptr) +@ stdcall MFCreateDXGIDeviceManager(ptr ptr) @ stdcall MFCreateEventQueue(ptr) @ stdcall MFCreateFile(long long long wstr ptr) @ stub MFCreateLegacyMediaBufferOnMFMediaBuffer diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index b4ba6b6c57..312f8b3bb2 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -58,6 +58,7 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) static HRESULT (WINAPI *pMFCopyImage)(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); +static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); static void* (WINAPI *pMFHeapAlloc)(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); @@ -510,6 +511,7 @@ static void init_functions(void) X(MFAddPeriodicCallback); X(MFAllocateSerialWorkQueue); X(MFCopyImage); + X(MFCreateDXGIDeviceManager); X(MFCreateSourceResolver); X(MFCreateMFByteStreamOnStream); X(MFHeapAlloc); @@ -3704,6 +3706,78 @@ if (0) ok(!refcount, "Unexpected refcount %u.\n", refcount); } +struct dev_mgr_ret +{ + IMFDXGIDeviceManager *dev_mgr; + UINT token; +}; + +static DWORD WINAPI create_dxgi_dev_mgr(LPVOID lParam) +{ + struct dev_mgr_ret *ret = lParam; + HRESULT hr; + + hr = pMFCreateDXGIDeviceManager(&ret->token, &ret->dev_mgr); + ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); + ok(!!ret->token, "got wrong token: %u.\n", ret->token); + EXPECT_REF(ret->dev_mgr, 1); + + return 0; +} + +static void test_create_dxgi_device_manager(void) +{ + IMFDXGIDeviceManager *manager, *manager2; + struct dev_mgr_ret ret1, ret2; + HANDLE thread1, thread2; + UINT token, token2; + HRESULT hr; + + if (!pMFCreateDXGIDeviceManager) + { + win_skip("MFCreateDXGIDeviceManager not found.\n"); + return; + } + + hr = pMFCreateDXGIDeviceManager(NULL, &manager); + ok(hr == E_POINTER, "MFCreateDXGIDeviceManager should failed: %#x.\n", hr); + + token = 0; + hr = pMFCreateDXGIDeviceManager(&token, NULL); + ok(hr == E_POINTER, "MFCreateDXGIDeviceManager should failed: %#x.\n", hr); + ok(!token, "got wrong token: %u.\n", token); + + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); + EXPECT_REF(manager, 1); + ok(!!token, "got wrong token: %u.\n", token); + + Sleep(50); + token2 = 0; + hr = pMFCreateDXGIDeviceManager(&token2, &manager2); + ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); + EXPECT_REF(manager2, 1); + ok(token2 && token2 != token, "got wrong token: %u, %u.\n", token2, token); + ok(manager != manager2, "got wrong pointer: %p.\n", manager2); + EXPECT_REF(manager, 1); + + IMFDXGIDeviceManager_Release(manager); + IMFDXGIDeviceManager_Release(manager2); + + memset(&ret1, 0, sizeof(ret1)); + thread1 = CreateThread(NULL, 0, create_dxgi_dev_mgr, &ret1, 0, NULL); + ok(WaitForSingleObject(thread1, 1000) == WAIT_OBJECT_0, "wait failed.\n"); + Sleep(50); + memset(&ret2, 0, sizeof(ret2)); + thread2 = CreateThread(NULL, 0, create_dxgi_dev_mgr, &ret2, 0, NULL); + ok(WaitForSingleObject(thread2, 1000) == WAIT_OBJECT_0, "wait failed.\n"); + ok(ret1.dev_mgr != ret2.dev_mgr, "got wrong pointer: %p, %p.\n", ret1.dev_mgr, ret2.dev_mgr); + ok(ret1.token != ret2.token, "got wrong token: %u, %u.\n", ret1.token, ret2.token); + + IMFDXGIDeviceManager_Release(ret1.dev_mgr); + IMFDXGIDeviceManager_Release(ret2.dev_mgr); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -3741,6 +3815,7 @@ START_TEST(mfplat) test_async_create_file(); test_local_handlers(); test_create_property_store(); + test_create_dxgi_device_manager(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 957fb0df9f..f84c051792 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -384,6 +384,7 @@ HRESULT WINAPI MFCreateAlignedMemoryBuffer(DWORD max_length, DWORD alignment, IM 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 MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, LPCWSTR url, IMFByteStream **bytestream); diff --git a/include/mfobjects.idl b/include/mfobjects.idl index 0cc8f422da..203acc770f 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -727,3 +727,20 @@ interface IMFMediaEventQueue : IUnknown [in] HRESULT status, [in, unique] IUnknown *unk); HRESULT Shutdown(); } + +[ + object, + uuid(eb533d5d-2db6-40f8-97a9-494692014f07), + local, + pointer_default(unique) +] +interface IMFDXGIDeviceManager : IUnknown +{ + HRESULT CloseDeviceHandle([in] HANDLE device); + HRESULT GetVideoService([in] HANDLE device, [in] REFIID riid, [out] void **service); + HRESULT LockDevice([in] HANDLE device, [in] REFIID riid, [out] void **ppv, [in] BOOL block); + HRESULT OpenDeviceHandle([out] HANDLE *device); + HRESULT ResetDevice([in] IUnknown *device, [in] UINT token); + HRESULT TestDevice([in] HANDLE device); + HRESULT UnlockDevice([in] HANDLE device, [in] BOOL state); +} -- 2.23.0.rc1

2 2

[PATCH v5] odbccp32: Implement SQLConfigDataSource/W
by Alistair Leslie-Hughes 29 Aug '19

29 Aug '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 121 +++++++++++++++++++++++++++++-------- dlls/odbccp32/tests/misc.c | 8 +-- 2 files changed, 101 insertions(+), 28 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 1198b487f3..13d681e50b 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -68,6 +68,9 @@ static const WCHAR odbc_error_load_lib_failed[] = {'L','o','a','d',' ','L','i',' static const WCHAR odbc_error_request_failed[] = {'R','e','q','u','e','s','t',' ','F','a','i','l','e','d',0}; static const WCHAR odbc_error_invalid_keyword[] = {'I','n','v','a','l','i','d',' ','k','e','y','w','o','r','d',' ','v','a','l','u','e',0}; +static BOOL (WINAPI *pConfigDSN)(HWND hwnd, WORD request, const char *driver, const char *attr); +static BOOL (WINAPI *pConfigDSNW)(HWND hwnd, WORD request, const WCHAR *driver, const WCHAR *attr); + /* Push an error onto the error stack, taking care of ranges etc. */ static void push_error(int code, LPCWSTR msg) { @@ -219,30 +222,6 @@ static BOOL SQLInstall_narrow(int mode, LPSTR buffer, LPCWSTR str, WORD str_leng return success; } -BOOL WINAPI SQLConfigDataSourceW(HWND hwndParent, WORD fRequest, - LPCWSTR lpszDriver, LPCWSTR lpszAttributes) -{ - LPCWSTR p; - - clear_errors(); - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_w(lpszDriver), - debugstr_w(lpszAttributes)); - - for (p = lpszAttributes; *p; p += lstrlenW(p) + 1) - FIXME("%s\n", debugstr_w(p)); - - return TRUE; -} - -BOOL WINAPI SQLConfigDataSource(HWND hwndParent, WORD fRequest, - LPCSTR lpszDriver, LPCSTR lpszAttributes) -{ - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_a(lpszDriver), - debugstr_a(lpszAttributes)); - clear_errors(); - return TRUE; -} - static HMODULE load_config_driver(const WCHAR *driver) { static WCHAR reg_driver[] = {'d','r','i','v','e','r',0}; @@ -359,6 +338,100 @@ fail: return FALSE; } +BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR attributes) +{ + HMODULE mod; + BOOL ret = FALSE; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_w(driver), debugstr_w(attributes)); + if (TRACE_ON(odbc)) + { + const WCHAR *p; + for (p = attributes; *p; p += lstrlenW(p) + 1) + TRACE("%s\n", debugstr_w(p)); + } + + clear_errors(); + + mod = load_config_driver(driver); + if (!mod) + return FALSE; + + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + if(pConfigDSNW) + ret = pConfigDSNW(hwnd, request, driver, attributes); + else + ERR("Failed to find ConfigDSNW\n"); + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + FreeLibrary(mod); + + return ret; +} + +BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR attributes) +{ + HMODULE mod; + BOOL ret = FALSE; + WCHAR *driverW; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_a(driver), debugstr_a(attributes)); + + if (TRACE_ON(odbc)) + { + const char *p; + for (p = attributes; *p; p += lstrlenA(p) + 1) + TRACE("%s\n", debugstr_a(p)); + } + + clear_errors(); + + driverW = heap_strdupAtoW(driver); + if (!driverW) + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + return FALSE; + } + + mod = load_config_driver(driverW); + if (!mod) + { + heap_free(driverW); + return FALSE; + } + + pConfigDSN = (void*)GetProcAddress(mod, "ConfigDSN"); + if (pConfigDSN) + { + TRACE("Calling ConfigDSN\n"); + ret = pConfigDSN(hwnd, request, driver, attributes); + } + else + { + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + if (pConfigDSNW) + { + WCHAR *attr = NULL; + TRACE("Calling ConfigDSNW\n"); + + attr = SQLInstall_strdup_multi(attributes); + if(attr) + ret = pConfigDSNW(hwnd, request, driverW, attr); + heap_free(attr); + } + } + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + heap_free(driverW); + FreeLibrary(mod); + + return ret; +} + BOOL WINAPI SQLConfigDriverW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR args, LPWSTR msg, WORD msgmax, WORD *msgout) { diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index dc2ca7ed3f..273023f8ba 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -746,10 +746,10 @@ static void test_SQLConfigDataSource(void) BOOL ret; ret = SQLConfigDataSource(0, ODBC_ADD_DSN, "SQL Server", "DSN=WINEMQIS\0Database=MQIS\0\0"); - ok(ret, "got %d\n", ret); + todo_wine ok(ret, "got %d\n", ret); ret = SQLConfigDataSource(0, ODBC_REMOVE_DSN, "SQL Server", "DSN=WINEMQIS\0\0"); - ok(ret, "got %d\n", ret); + todo_wine ok(ret, "got %d\n", ret); ret = SQLConfigDataSource(0, ODBC_REMOVE_DSN, "SQL Server", "DSN=WINEMQIS\0\0"); if(!ret) @@ -762,8 +762,8 @@ static void test_SQLConfigDataSource(void) } ret = SQLConfigDataSource(0, ODBC_ADD_DSN, "ODBC driver", "DSN=ODBC data source\0\0"); - todo_wine ok(!ret, "got %d\n", ret); - todo_wine check_error(ODBC_ERROR_COMPONENT_NOT_FOUND); + ok(!ret, "got %d\n", ret); + check_error(ODBC_ERROR_COMPONENT_NOT_FOUND); } START_TEST(misc) -- 2.17.1

1 0

[PATCH 1/5] strmbase: Get rid of the BaseFilterFuncTable typedef.
by Zebediah Figura 29 Aug '19

29 Aug '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/audiorecord.c | 5 +++-- dlls/qcap/avico.c | 5 +++-- dlls/qcap/avimux.c | 5 +++-- dlls/qcap/smartteefilter.c | 5 +++-- dlls/qcap/vfwcapture.c | 5 +++-- dlls/qedit/samplegrabber.c | 5 +++-- dlls/quartz/avisplit.c | 4 ++-- dlls/quartz/filesource.c | 4 ++-- dlls/quartz/mpegsplit.c | 4 ++-- dlls/quartz/parser.c | 2 +- dlls/quartz/parser.h | 2 +- dlls/quartz/waveparser.c | 4 ++-- dlls/strmbase/filter.c | 2 +- dlls/strmbase/renderer.c | 5 +++-- dlls/strmbase/transform.c | 5 +++-- dlls/winegstreamer/gstdemux.c | 5 +++-- dlls/wineqtdecoder/qtsplitter.c | 5 +++-- include/wine/strmbase.h | 8 ++++---- 18 files changed, 45 insertions(+), 35 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index de2d271aa53..fd0ca32ee18 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -122,7 +122,8 @@ static HRESULT audio_record_query_interface(BaseFilter *iface, REFIID iid, void return S_OK; } -static const BaseFilterFuncTable AudioRecordFuncs = { +static const struct strmbase_filter_ops filter_ops = +{ .filter_get_pin = audio_record_get_pin, .filter_destroy = audio_record_destroy, .filter_query_interface = audio_record_query_interface, @@ -213,7 +214,7 @@ IUnknown* WINAPI QCAP_createAudioCaptureFilter(IUnknown *outer, HRESULT *phr) memset(This, 0, sizeof(*This)); This->IPersistPropertyBag_iface.lpVtbl = &PersistPropertyBagVtbl; - strmbase_filter_init(&This->filter, &AudioRecordVtbl, outer, &CLSID_AudioRecord, &AudioRecordFuncs); + strmbase_filter_init(&This->filter, &AudioRecordVtbl, outer, &CLSID_AudioRecord, &filter_ops); *phr = S_OK; return &This->filter.IUnknown_inner; diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 7ef7b51b11d..38ba2c70e10 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -215,7 +215,8 @@ static HRESULT avi_compressor_query_interface(BaseFilter *iface, REFIID iid, voi return S_OK; } -static const BaseFilterFuncTable filter_func_table = { +static const struct strmbase_filter_ops filter_ops = +{ .filter_get_pin = avi_compressor_get_pin, .filter_destroy = avi_compressor_destroy, .filter_query_interface = avi_compressor_query_interface, @@ -600,7 +601,7 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) return NULL; } - strmbase_filter_init(&compressor->filter, &AVICompressorVtbl, outer, &CLSID_AVICo, &filter_func_table); + strmbase_filter_init(&compressor->filter, &AVICompressorVtbl, outer, &CLSID_AVICo, &filter_ops); compressor->IPersistPropertyBag_iface.lpVtbl = &PersistPropertyBagVtbl; diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index fb0ae4188e7..a825c121aff 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -167,7 +167,8 @@ static HRESULT avi_mux_query_interface(BaseFilter *iface, REFIID iid, void **out return S_OK; } -static const BaseFilterFuncTable filter_func_table = { +static const struct strmbase_filter_ops filter_ops = +{ .filter_get_pin = avi_mux_get_pin, .filter_destroy = avi_mux_destroy, .filter_query_interface = avi_mux_query_interface, @@ -2251,7 +2252,7 @@ IUnknown * WINAPI QCAP_createAVIMux(IUnknown *outer, HRESULT *phr) return NULL; } - strmbase_filter_init(&avimux->filter, &AviMuxVtbl, outer, &CLSID_AviDest, &filter_func_table); + strmbase_filter_init(&avimux->filter, &AviMuxVtbl, outer, &CLSID_AviDest, &filter_ops); avimux->IConfigAviMux_iface.lpVtbl = &ConfigAviMuxVtbl; avimux->IConfigInterleaving_iface.lpVtbl = &ConfigInterleavingVtbl; avimux->IMediaSeeking_iface.lpVtbl = &MediaSeekingVtbl; diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index b93b3324d75..ec124494e55 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -141,7 +141,8 @@ static void smart_tee_destroy(BaseFilter *iface) CoTaskMemFree(filter); } -static const BaseFilterFuncTable SmartTeeFilterFuncs = { +static const struct strmbase_filter_ops filter_ops = +{ .filter_get_pin = smart_tee_get_pin, .filter_destroy = smart_tee_destroy, }; @@ -483,7 +484,7 @@ IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) } memset(This, 0, sizeof(*This)); - strmbase_filter_init(&This->filter, &SmartTeeFilterVtbl, outer, &CLSID_SmartTee, &SmartTeeFilterFuncs); + strmbase_filter_init(&This->filter, &SmartTeeFilterVtbl, outer, &CLSID_SmartTee, &filter_ops); inputPinInfo.pFilter = &This->filter.IBaseFilter_iface; strmbase_sink_init(&This->sink, &SmartTeeFilterInputVtbl, &inputPinInfo, diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index e194bbf010e..c4208ea16d4 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -134,7 +134,8 @@ static HRESULT vfw_capture_query_interface(BaseFilter *iface, REFIID iid, void * return S_OK; } -static const BaseFilterFuncTable BaseFuncTable = { +static const struct strmbase_filter_ops filter_ops = +{ .filter_get_pin = vfw_capture_get_pin, .filter_destroy = vfw_capture_destroy, .filter_query_interface = vfw_capture_query_interface, @@ -642,7 +643,7 @@ IUnknown * WINAPI QCAP_createVFWCaptureFilter(IUnknown *outer, HRESULT *phr) return NULL; } - strmbase_filter_init(&object->filter, &VfwCapture_Vtbl, outer, &CLSID_VfwCapture, &BaseFuncTable); + strmbase_filter_init(&object->filter, &VfwCapture_Vtbl, outer, &CLSID_VfwCapture, &filter_ops); object->IAMStreamConfig_iface.lpVtbl = &IAMStreamConfig_VTable; object->IAMVideoProcAmp_iface.lpVtbl = &IAMVideoProcAmp_VTable; diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 20525401335..4f923fa5dda 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -306,7 +306,8 @@ static HRESULT sample_grabber_query_interface(BaseFilter *iface, REFIID iid, voi return S_OK; } -static const BaseFilterFuncTable basefunc_vtbl = { +static const struct strmbase_filter_ops filter_ops = +{ .filter_get_pin = sample_grabber_get_pin, .filter_destroy = sample_grabber_destroy, .filter_query_interface = sample_grabber_query_interface, @@ -1154,7 +1155,7 @@ HRESULT SampleGrabber_create(IUnknown *outer, void **out) } ZeroMemory(obj, sizeof(SG_Impl)); - strmbase_filter_init(&obj->filter, &IBaseFilter_VTable, outer, &CLSID_SampleGrabber, &basefunc_vtbl); + strmbase_filter_init(&obj->filter, &IBaseFilter_VTable, outer, &CLSID_SampleGrabber, &filter_ops); obj->ISampleGrabber_iface.lpVtbl = &ISampleGrabber_VTable; obj->IMemInputPin_iface.lpVtbl = &IMemInputPin_VTable; obj->pin_in.IPin_iface.lpVtbl = &IPin_In_VTable; diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index fd67379f2be..27857c0171d 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1411,7 +1411,7 @@ static void avi_splitter_destroy(BaseFilter *iface) Parser_Destroy(&filter->Parser); } -static const BaseFilterFuncTable avi_splitter_func_table = +static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = parser_get_pin, .filter_destroy = avi_splitter_destroy, @@ -1432,7 +1432,7 @@ HRESULT AVISplitter_create(IUnknown *outer, void **out) This->oldindex = NULL; hr = Parser_Create(&This->Parser, &AVISplitterImpl_Vtbl, outer, &CLSID_AviSplitter, - &avi_splitter_func_table, sink_name, AVISplitter_Sample, AVISplitter_QueryAccept, + &filter_ops, sink_name, AVISplitter_Sample, AVISplitter_QueryAccept, AVISplitter_InputPin_PreConnect, AVISplitter_Flush, AVISplitter_Disconnect, AVISplitter_first_request, AVISplitter_done_process, NULL, AVISplitter_seek, NULL); diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index d93375e1e9c..df2e071fc7f 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -393,7 +393,7 @@ static HRESULT async_reader_query_interface(BaseFilter *iface, REFIID iid, void return E_NOINTERFACE; } -static const BaseFilterFuncTable BaseFuncTable = +static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = async_reader_get_pin, .filter_destroy = async_reader_destroy, @@ -409,7 +409,7 @@ HRESULT AsyncReader_create(IUnknown *outer, void **out) if (!pAsyncRead) return E_OUTOFMEMORY; - strmbase_filter_init(&pAsyncRead->filter, &AsyncReader_Vtbl, outer, &CLSID_AsyncReader, &BaseFuncTable); + strmbase_filter_init(&pAsyncRead->filter, &AsyncReader_Vtbl, outer, &CLSID_AsyncReader, &filter_ops); pAsyncRead->IFileSourceFilter_iface.lpVtbl = &FileSource_Vtbl; diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 5e5a88e4612..5c38596b1e9 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -856,7 +856,7 @@ static HRESULT mpeg_splitter_query_interface(BaseFilter *iface, REFIID iid, void return E_NOINTERFACE; } -static const BaseFilterFuncTable mpeg_splitter_func_table = +static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = parser_get_pin, .filter_destroy = mpeg_splitter_destroy, @@ -877,7 +877,7 @@ HRESULT MPEGSplitter_create(IUnknown *outer, void **out) ZeroMemory(This, sizeof(MPEGSplitterImpl)); hr = Parser_Create(&This->Parser, &MPEGSplitter_Vtbl, outer, &CLSID_MPEG1Splitter, - &mpeg_splitter_func_table, sink_name, MPEGSplitter_process_sample, MPEGSplitter_query_accept, + &filter_ops, sink_name, MPEGSplitter_process_sample, MPEGSplitter_query_accept, MPEGSplitter_pre_connect, MPEGSplitter_cleanup, MPEGSplitter_disconnect, MPEGSplitter_first_request, NULL, NULL, MPEGSplitter_seek, NULL); if (FAILED(hr)) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index ee6a4a57938..3a36dca7884 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -73,7 +73,7 @@ IPin *parser_get_pin(BaseFilter *iface, unsigned int index) } HRESULT Parser_Create(ParserImpl *pParser, const IBaseFilterVtbl *vtbl, IUnknown *outer, - const CLSID *clsid, const BaseFilterFuncTable *func_table, const WCHAR *sink_name, + const CLSID *clsid, const struct strmbase_filter_ops *func_table, const WCHAR *sink_name, PFN_PROCESS_SAMPLE fnProcessSample, PFN_QUERY_ACCEPT fnQueryAccept, PFN_PRE_CONNECT fnPreConnect, PFN_CLEANUP fnCleanup, PFN_DISCONNECT fnDisconnect, REQUESTPROC fnRequest, STOPPROCESSPROC fnDone, SourceSeeking_ChangeStop stop, diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index 95b98d1f74d..70d6318af80 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -53,7 +53,7 @@ struct ParserImpl extern HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, const AM_MEDIA_TYPE * amt); HRESULT Parser_Create(ParserImpl *parser, const IBaseFilterVtbl *vtbl, IUnknown *outer, - const CLSID *clsid, const BaseFilterFuncTable *func_table, const WCHAR *sink_name, + const CLSID *clsid, const struct strmbase_filter_ops *func_table, const WCHAR *sink_name, PFN_PROCESS_SAMPLE, PFN_QUERY_ACCEPT, PFN_PRE_CONNECT, PFN_CLEANUP, PFN_DISCONNECT, REQUESTPROC, STOPPROCESSPROC, SourceSeeking_ChangeStop, SourceSeeking_ChangeStart, SourceSeeking_ChangeRate) DECLSPEC_HIDDEN; diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 149e69cdb61..d08cad144d2 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -414,7 +414,7 @@ static void wave_parser_destroy(BaseFilter *iface) Parser_Destroy(&filter->Parser); } -static const BaseFilterFuncTable wave_parser_func_table = +static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = parser_get_pin, .filter_destroy = wave_parser_destroy, @@ -432,7 +432,7 @@ HRESULT WAVEParser_create(IUnknown *outer, void **out) This = CoTaskMemAlloc(sizeof(WAVEParserImpl)); hr = Parser_Create(&This->Parser, &WAVEParser_Vtbl, outer, &CLSID_WAVEParser, - &wave_parser_func_table, sink_name, WAVEParser_Sample, WAVEParser_QueryAccept, + &filter_ops, sink_name, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup, WAVEParser_disconnect, WAVEParser_first_request, NULL, NULL, WAVEParserImpl_seek, NULL); diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index b1c955825d3..078d991c249 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -292,7 +292,7 @@ VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter *filter) } void strmbase_filter_init(BaseFilter *filter, const IBaseFilterVtbl *vtbl, IUnknown *outer, - const CLSID *clsid, const BaseFilterFuncTable *func_table) + const CLSID *clsid, const struct strmbase_filter_ops *func_table) { memset(filter, 0, sizeof(*filter)); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 0d53934af2d..c842120538c 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -204,7 +204,8 @@ static HRESULT renderer_query_interface(BaseFilter *iface, REFIID iid, void **ou return E_NOINTERFACE; } -static const BaseFilterFuncTable RendererBaseFilterFuncTable = { +static const struct strmbase_filter_ops filter_ops = +{ .filter_get_pin = renderer_get_pin, .filter_destroy = renderer_destroy, .filter_query_interface = renderer_query_interface, @@ -239,7 +240,7 @@ HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, const IBaseFilterVtb HRESULT hr; memset(filter, 0, sizeof(*filter)); - strmbase_filter_init(&filter->filter, vtbl, outer, clsid, &RendererBaseFilterFuncTable); + strmbase_filter_init(&filter->filter, vtbl, outer, clsid, &filter_ops); filter->pFuncsTable = pBaseFuncsTable; diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index c14142fcf4d..ff75f08f5c4 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -156,7 +156,8 @@ static void transform_destroy(BaseFilter *iface) CoTaskMemFree(filter); } -static const BaseFilterFuncTable tfBaseFuncTable = { +static const struct strmbase_filter_ops filter_ops = +{ .filter_get_pin = transform_get_pin, .filter_destroy = transform_destroy, }; @@ -277,7 +278,7 @@ static HRESULT strmbase_transform_init(IUnknown *outer, const CLSID *clsid, PIN_INFO piInput; PIN_INFO piOutput; - strmbase_filter_init(&filter->filter, &transform_vtbl, outer, clsid, &tfBaseFuncTable); + strmbase_filter_init(&filter->filter, &transform_vtbl, outer, clsid, &filter_ops); InitializeCriticalSection(&filter->csReceive); filter->csReceive.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": TransformFilter.csReceive"); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 0ce64e2b9a8..acf83c89eac 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1241,7 +1241,8 @@ static void gstdemux_destroy(BaseFilter *iface) CoTaskMemFree(filter); } -static const BaseFilterFuncTable BaseFuncTable = { +static const struct strmbase_filter_ops filter_ops = +{ .filter_get_pin = gstdemux_get_pin, .filter_destroy = gstdemux_destroy, }; @@ -1267,7 +1268,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) } memset(This, 0, sizeof(*This)); - strmbase_filter_init(&This->filter, &GST_Vtbl, outer, &CLSID_Gstreamer_Splitter, &BaseFuncTable); + strmbase_filter_init(&This->filter, &GST_Vtbl, outer, &CLSID_Gstreamer_Splitter, &filter_ops); This->cStreams = 0; This->ppPins = NULL; diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index fb85d576dbd..ebffc94fc76 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -278,7 +278,8 @@ static void qt_splitter_destroy(BaseFilter *iface) CoTaskMemFree(filter); } -static const BaseFilterFuncTable BaseFuncTable = { +static const struct strmbase_filter_ops filter_ops = +{ .filter_get_pin = qt_splitter_get_pin, .filter_destroy = qt_splitter_destroy, }; @@ -301,7 +302,7 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) } ZeroMemory(This,sizeof(*This)); - strmbase_filter_init(&This->filter, &QT_Vtbl, outer, &CLSID_QTSplitter, &BaseFuncTable); + strmbase_filter_init(&This->filter, &QT_Vtbl, outer, &CLSID_QTSplitter, &filter_ops); InitializeCriticalSection(&This->csReceive); This->csReceive.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": QTSplitter.csReceive"); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b1483fc26c9..649d272b874 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -171,15 +171,15 @@ typedef struct BaseFilter CLSID clsid; LONG pin_version; - const struct BaseFilterFuncTable* pFuncsTable; + const struct strmbase_filter_ops *pFuncsTable; } BaseFilter; -typedef struct BaseFilterFuncTable +struct strmbase_filter_ops { IPin *(*filter_get_pin)(BaseFilter *iface, unsigned int index); void (*filter_destroy)(BaseFilter *iface); HRESULT (*filter_query_interface)(BaseFilter *iface, REFIID iid, void **out); -} BaseFilterFuncTable; +}; HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv); ULONG WINAPI BaseFilterImpl_AddRef(IBaseFilter * iface); @@ -200,7 +200,7 @@ HRESULT WINAPI BaseFilterImpl_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVend VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter* This); void strmbase_filter_init(BaseFilter *filter, const IBaseFilterVtbl *vtbl, IUnknown *outer, - const CLSID *clsid, const BaseFilterFuncTable *func_table); + const CLSID *clsid, const struct strmbase_filter_ops *func_table); void strmbase_filter_cleanup(BaseFilter *filter); /* Enums */ -- 2.22.0

2 6

[PATCH 1/5] http.sys: Allow sending response data.
by Zebediah Figura 29 Aug '19

29 Aug '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/http.sys/http.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ include/wine/http.h | 8 ++++++++ 2 files changed, 53 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 4115afc8672..b2400a26b7c 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1193,6 +1193,48 @@ static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) return ret; } +static NTSTATUS http_send_response(struct request_queue *queue, IRP *irp) +{ + const struct http_response *response = irp->AssociatedIrp.SystemBuffer; + struct connection *conn; + + TRACE("id %s, len %d.\n", wine_dbgstr_longlong(response->id), response->len); + + EnterCriticalSection(&http_cs); + + LIST_FOR_EACH_ENTRY(conn, &connections, struct connection, entry) + { + if (conn->req_id == response->id) + { + if (send(conn->socket, response->buffer, response->len, 0) >= 0) + { + conn->queue = NULL; + conn->req_id = HTTP_NULL_ID; + WSAEventSelect(conn->socket, request_event, FD_READ | FD_CLOSE); + irp->IoStatus.Information = response->len; + /* We might have another request already in the buffer. */ + if (parse_request(conn) < 0) + { + WARN("Failed to parse request; shutting down connection.\n"); + send_400(conn); + close_connection(conn); + } + } + else + { + ERR("Got error %u; shutting down connection.\n", WSAGetLastError()); + close_connection(conn); + } + + LeaveCriticalSection(&http_cs); + return STATUS_SUCCESS; + } + } + + LeaveCriticalSection(&http_cs); + return STATUS_CONNECTION_INVALID; +} + static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -1210,6 +1252,9 @@ static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HTTP_RECEIVE_REQUEST: ret = http_receive_request(queue, irp); break; + case IOCTL_HTTP_SEND_RESPONSE: + ret = http_send_response(queue, irp); + break; default: FIXME("Unhandled ioctl %#x.\n", stack->Parameters.DeviceIoControl.IoControlCode); ret = STATUS_NOT_IMPLEMENTED; diff --git a/include/wine/http.h b/include/wine/http.h index 1145cab71a7..eb75d8f60ef 100644 --- a/include/wine/http.h +++ b/include/wine/http.h @@ -26,6 +26,7 @@ #define IOCTL_HTTP_ADD_URL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, 0) #define IOCTL_HTTP_REMOVE_URL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, 0) #define IOCTL_HTTP_RECEIVE_REQUEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x802, METHOD_BUFFERED, 0) +#define IOCTL_HTTP_SEND_RESPONSE CTL_CODE(FILE_DEVICE_UNKNOWN, 0x803, METHOD_BUFFERED, 0) struct http_add_url_params { @@ -41,4 +42,11 @@ struct http_receive_request_params ULONG bits; }; +struct http_response +{ + HTTP_REQUEST_ID id; + int len; + char buffer[1]; +}; + #endif -- 2.22.0

1 4

[PATCH v3] wineoss: Fix the -lossaudio check.
by Francois Gouget 29 Aug '19

29 Aug '19

Only check for libossaudio if compiling wineoss.drv and the headers are recent enough. Also only wineoss.drv needs to be linked with libossudio so put the link options in OSS4_LIBS. But do not disable building wineoss.drv if the library is missing since it's not needed for wineoss.drv on Linux. From: Naveen Narayanan <zerous(a)nocebo.space> Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Fixed linking on Linux. v3: Fixed zerous' name. configure.ac | 8 ++++---- dlls/wineoss.drv/Makefile.in | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index e58a9242397..c202c9a2f75 100644 --- a/configure.ac +++ b/configure.ac @@ -407,8 +407,6 @@ dnl **** Check for some libraries **** dnl Check for -li386 for NetBSD and OpenBSD AC_CHECK_LIB(i386,i386_set_ldt) -dnl Check for -lossaudio for NetBSD -AC_CHECK_LIB(ossaudio,_oss_ioctl) AC_SUBST(OPENGL_LIBS,"") @@ -1655,8 +1653,10 @@ then CPPFLAGS="$CPPFLAGS $ac_oss_incl" AC_CHECK_HEADER([sys/soundcard.h], [AC_CHECK_MEMBERS([oss_sysinfo.numaudioengines], - [AC_SUBST(OSS4_CFLAGS,"$ac_oss_incl")],, - [#include <sys/soundcard.h>])]) + [AC_SUBST(OSS4_CFLAGS,"$ac_oss_incl") + AC_CHECK_LIB(ossaudio,_oss_ioctl, + [AC_SUBST(OSS4_LIBS,"-lossaudio")])],, + [#include <sys/soundcard.h>])]) CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(oss,[test "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes], diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in index d129f13fa19..a2ae5f53a5c 100644 --- a/dlls/wineoss.drv/Makefile.in +++ b/dlls/wineoss.drv/Makefile.in @@ -1,6 +1,7 @@ MODULE = wineoss.drv IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm +EXTRALIBS = $(OSS4_LIBS) EXTRAINCL = $(OSS4_CFLAGS) C_SRCS = \ -- 2.20.1

1 0

[PATCH 3/3] wined3d: Truncate stencil reference values to the stencil component size.
by Henri Verbeet 28 Aug '19

28 Aug '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> As opposed to OpenGL, which clamps them. This fixes a regression introduced by commit a9e199e5ad76c0540381f25011d6051ace3e7c0a. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/cs.c | 7 +++++-- dlls/wined3d/state.c | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 948582ab9c6..990702883a4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11211,7 +11211,7 @@ static void stencil_cull_test(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColor(device, 280, 360); - todo_wine ok(color == 0x000000f0, "Got unexpected colour 0x%08x.\n", color); + ok(color == 0x000000f0, "Got unexpected colour 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 32f9954a039..044d586b29b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1152,9 +1152,12 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILWRITEMASK)); device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); } - else if (prev && prev->format->depth_bias_scale != op->view->format->depth_bias_scale) + else if (prev) { - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + if (prev->format->depth_bias_scale != op->view->format->depth_bias_scale) + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + if (prev->format->stencil_size != op->view->format->stencil_size) + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILREF)); } device_invalidate_state(device, STATE_FRAMEBUFFER); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4cdca277f63..54c0c67fbad 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -925,7 +925,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ if (!(func_back = wined3d_gl_compare_func(state->render_states[WINED3D_RS_BACK_STENCILFUNC]))) func_back = GL_ALWAYS; mask = state->render_states[WINED3D_RS_STENCILMASK]; - ref = state->render_states[WINED3D_RS_STENCILREF] & mask; + ref = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb->depth_stencil->format->stencil_size) - 1); stencilFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILFAIL]); depthFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILZFAIL]); stencilPass = gl_stencil_op(state->render_states[WINED3D_RS_STENCILPASS]); -- 2.11.0

2 1

[PATCH 1/3] wined3d: Initialise d3d_info after quirks are applied.
by Henri Verbeet 28 Aug '19

28 Aug '19

In particular, quirk_broken_viewport_subpixel_bits() disables ARB_CLIP_CONTROL, which affects "d3d_info->clip_control". This fixes a regression introduced by commit e795ddb3d80d7b94d29cf97a24a01bb157b0138d. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 170 +++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 90 insertions(+), 81 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 10b8aea4e4b..0415099439c 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1295,8 +1295,7 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s } static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_limits *d3d_limits, const struct shader_caps *shader_caps, - const struct fragment_caps *fragment_caps) + const struct shader_caps *shader_caps, const struct fragment_caps *fragment_caps) { unsigned int shader_model; @@ -1322,7 +1321,7 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_g } } - if (shader_model >= 3 && d3d_limits->texture_size >= 4096 && d3d_limits->max_rt_count >= 4) + if (shader_model >= 3 && gl_info->limits.texture_size >= 4096 && gl_info->limits.buffers >= 4) return WINED3D_FEATURE_LEVEL_9_3; if (shader_model >= 2) { @@ -2905,10 +2904,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) #undef MAP_GL_FUNCTION_CAST } -static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info, struct wined3d_d3d_info *d3d_info) +static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) { unsigned int i, sampler_count; - GLfloat gl_floatv[2]; GLint gl_max; gl_info->limits.buffers = 1; @@ -2947,14 +2945,9 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info, struct } gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_SIZE, &gl_max); - d3d_info->limits.texture_size = gl_max; + gl_info->limits.texture_size = gl_max; TRACE("Maximum texture size support - max texture size %d.\n", gl_max); - gl_info->gl_ops.gl.p_glGetFloatv(gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] - ? GL_ALIASED_POINT_SIZE_RANGE : GL_POINT_SIZE_RANGE, gl_floatv); - d3d_info->limits.pointsize_max = gl_floatv[1]; - TRACE("Maximum point size support - max point size %f.\n", gl_floatv[1]); - if (gl_info->supported[ARB_MAP_BUFFER_ALIGNMENT]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MIN_MAP_BUFFER_ALIGNMENT, &gl_max); @@ -3246,8 +3239,8 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info, struct } else { - gl_info->limits.framebuffer_width = d3d_info->limits.texture_size; - gl_info->limits.framebuffer_height = d3d_info->limits.texture_size; + gl_info->limits.framebuffer_width = gl_info->limits.texture_size; + gl_info->limits.framebuffer_height = gl_info->limits.texture_size; } gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL] = @@ -3420,12 +3413,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, }; struct wined3d_driver_info *driver_info = &adapter->driver_info; const char *gl_vendor_str, *gl_renderer_str, *gl_version_str; - struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; const struct wined3d_gpu_description *gpu_description; struct wined3d_gl_info *gl_info = &adapter->gl_info; - struct wined3d_vertex_caps vertex_caps; - struct fragment_caps fragment_caps; - struct shader_caps shader_caps; const char *WGL_Extensions = NULL; enum wined3d_gl_vendor gl_vendor; DWORD gl_version, gl_ext_emul_mask; @@ -3731,7 +3720,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, gl_info->supported[ARB_TEXTURE_MULTISAMPLE] = FALSE; } - wined3d_adapter_init_limits(gl_info, d3d_info); + wined3d_adapter_init_limits(gl_info); if (gl_info->supported[ARB_VERTEX_PROGRAM] && test_arb_vs_offset_limit(gl_info)) gl_info->quirks |= WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT; @@ -3756,68 +3745,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vertex_pipe = select_vertex_implementation(gl_info, adapter->shader_backend); adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); - d3d_info->limits.max_rt_count = gl_info->limits.buffers; - d3d_info->limits.max_clip_distances = gl_info->limits.user_clip_distances; - - adapter->shader_backend->shader_get_caps(adapter, &shader_caps); - d3d_info->vs_clipping = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING; - d3d_info->limits.vs_version = shader_caps.vs_version; - d3d_info->limits.hs_version = shader_caps.hs_version; - d3d_info->limits.ds_version = shader_caps.ds_version; - d3d_info->limits.gs_version = shader_caps.gs_version; - d3d_info->limits.ps_version = shader_caps.ps_version; - d3d_info->limits.cs_version = shader_caps.cs_version; - d3d_info->limits.vs_uniform_count = shader_caps.vs_uniform_count; - d3d_info->limits.ps_uniform_count = shader_caps.ps_uniform_count; - d3d_info->limits.varying_count = shader_caps.varying_count; - d3d_info->full_ffp_varyings = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_FULL_FFP_VARYINGS); - d3d_info->shader_double_precision = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION); - d3d_info->shader_output_interpolation = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION); - - d3d_info->viewport_array_index_any_shader = !!gl_info->supported[ARB_SHADER_VIEWPORT_LAYER_ARRAY]; - - adapter->vertex_pipe->vp_get_caps(adapter, &vertex_caps); - d3d_info->xyzrhw = vertex_caps.xyzrhw; - d3d_info->ffp_generic_attributes = vertex_caps.ffp_generic_attributes; - d3d_info->ffp_alpha_test = !!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; - d3d_info->limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices; - d3d_info->limits.active_light_count = vertex_caps.max_active_lights; - d3d_info->emulated_flatshading = vertex_caps.emulated_flatshading; - - adapter->fragment_pipe->get_caps(adapter, &fragment_caps); - d3d_info->limits.ffp_blend_stages = fragment_caps.MaxTextureBlendStages; - d3d_info->limits.ffp_textures = fragment_caps.MaxSimultaneousTextures; - d3d_info->shader_color_key = !!(fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_COLOR_KEY); - d3d_info->wined3d_creation_flags = wined3d_creation_flags; - - d3d_info->texture_npot = !!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]; - d3d_info->texture_npot_conditional = gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] - || gl_info->supported[ARB_TEXTURE_RECTANGLE]; - - d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; - d3d_info->vertex_bgra = !!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; - d3d_info->texture_swizzle = !!gl_info->supported[ARB_TEXTURE_SWIZZLE]; - d3d_info->srgb_read_control = !!gl_info->supported[EXT_TEXTURE_SRGB_DECODE]; - d3d_info->srgb_write_control = !!gl_info->supported[ARB_FRAMEBUFFER_SRGB]; - d3d_info->clip_control = !!gl_info->supported[ARB_CLIP_CONTROL]; - - if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) - d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; - else - d3d_info->multisample_draw_location = WINED3D_LOCATION_RB_MULTISAMPLE; - - d3d_info->feature_level = feature_level_from_caps(gl_info, &d3d_info->limits, &shader_caps, &fragment_caps); - - TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); - - if (!d3d_info->shader_color_key) - { - /* We do not want to deal with re-creating immutable texture storage - * for colour-keying emulation. */ - WARN("Disabling ARB_texture_storage because fragment pipe doesn't support colour-keying.\n"); - gl_info->supported[ARB_TEXTURE_STORAGE] = FALSE; - } - if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) { gl_info->fbo_ops.glIsRenderbuffer = gl_info->gl_ops.ext.p_glIsRenderbuffer; @@ -3911,13 +3838,20 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, if (!(gpu_description = query_gpu_description(gl_info, &vram_bytes))) { + enum wined3d_feature_level feature_level; + struct fragment_caps fragment_caps; enum wined3d_pci_vendor vendor; enum wined3d_pci_device device; + struct shader_caps shader_caps; + + adapter->shader_backend->shader_get_caps(adapter, &shader_caps); + adapter->fragment_pipe->get_caps(adapter, &fragment_caps); + feature_level = feature_level_from_caps(gl_info, &shader_caps, &fragment_caps); vendor = wined3d_guess_card_vendor(gl_vendor_str, gl_renderer_str); TRACE("Guessed vendor PCI ID 0x%04x.\n", vendor); - device = wined3d_guess_card(d3d_info->feature_level, gl_renderer_str, &gl_vendor, &vendor); + device = wined3d_guess_card(feature_level, gl_renderer_str, &gl_vendor, &vendor); TRACE("Guessed device PCI ID 0x%04x.\n", device); if (!(gpu_description = wined3d_get_gpu_description(vendor, device))) @@ -5159,6 +5093,71 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_flush_context, }; +static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_gl, uint32_t wined3d_creation_flags) +{ + const struct wined3d_gl_info *gl_info = &adapter_gl->a.gl_info; + struct wined3d_d3d_info *d3d_info = &adapter_gl->a.d3d_info; + struct wined3d_vertex_caps vertex_caps; + struct fragment_caps fragment_caps; + struct shader_caps shader_caps; + GLfloat f[2]; + + adapter_gl->a.shader_backend->shader_get_caps(&adapter_gl->a, &shader_caps); + adapter_gl->a.vertex_pipe->vp_get_caps(&adapter_gl->a, &vertex_caps); + adapter_gl->a.fragment_pipe->get_caps(&adapter_gl->a, &fragment_caps); + + d3d_info->limits.vs_version = shader_caps.vs_version; + d3d_info->limits.hs_version = shader_caps.hs_version; + d3d_info->limits.ds_version = shader_caps.ds_version; + d3d_info->limits.gs_version = shader_caps.gs_version; + d3d_info->limits.ps_version = shader_caps.ps_version; + d3d_info->limits.cs_version = shader_caps.cs_version; + d3d_info->limits.vs_uniform_count = shader_caps.vs_uniform_count; + d3d_info->limits.ps_uniform_count = shader_caps.ps_uniform_count; + d3d_info->limits.varying_count = shader_caps.varying_count; + d3d_info->limits.ffp_textures = fragment_caps.MaxSimultaneousTextures; + d3d_info->limits.ffp_blend_stages = fragment_caps.MaxTextureBlendStages; + TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); + d3d_info->limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices; + d3d_info->limits.active_light_count = vertex_caps.max_active_lights; + + d3d_info->limits.max_rt_count = gl_info->limits.buffers; + d3d_info->limits.max_clip_distances = gl_info->limits.user_clip_distances; + d3d_info->limits.texture_size = gl_info->limits.texture_size; + + gl_info->gl_ops.gl.p_glGetFloatv(gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] + ? GL_ALIASED_POINT_SIZE_RANGE : GL_POINT_SIZE_RANGE, f); + d3d_info->limits.pointsize_max = f[1]; + TRACE("Maximum point size support - max point size %.8e.\n", f[1]); + + d3d_info->wined3d_creation_flags = wined3d_creation_flags; + d3d_info->xyzrhw = vertex_caps.xyzrhw; + d3d_info->emulated_flatshading = vertex_caps.emulated_flatshading; + d3d_info->ffp_generic_attributes = vertex_caps.ffp_generic_attributes; + d3d_info->ffp_alpha_test = !!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; + d3d_info->vs_clipping = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING; + d3d_info->shader_color_key = !!(fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_COLOR_KEY); + d3d_info->shader_double_precision = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION); + d3d_info->shader_output_interpolation = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION); + d3d_info->viewport_array_index_any_shader = !!gl_info->supported[ARB_SHADER_VIEWPORT_LAYER_ARRAY]; + d3d_info->texture_npot = !!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]; + d3d_info->texture_npot_conditional = gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] + || gl_info->supported[ARB_TEXTURE_RECTANGLE]; + d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; + d3d_info->vertex_bgra = !!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; + d3d_info->texture_swizzle = !!gl_info->supported[ARB_TEXTURE_SWIZZLE]; + d3d_info->srgb_read_control = !!gl_info->supported[EXT_TEXTURE_SRGB_DECODE]; + d3d_info->srgb_write_control = !!gl_info->supported[ARB_FRAMEBUFFER_SRGB]; + d3d_info->clip_control = !!gl_info->supported[ARB_CLIP_CONTROL]; + d3d_info->full_ffp_varyings = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_FULL_FFP_VARYINGS); + d3d_info->feature_level = feature_level_from_caps(gl_info, &shader_caps, &fragment_caps); + + if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; + else + d3d_info->multisample_draw_location = WINED3D_LOCATION_RB_MULTISAMPLE; +} + static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, unsigned int ordinal, unsigned int wined3d_creation_flags) { @@ -5239,6 +5238,15 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, return FALSE; } + wined3d_adapter_gl_init_d3d_info(adapter_gl, wined3d_creation_flags); + if (!adapter_gl->a.d3d_info.shader_color_key) + { + /* We do not want to deal with re-creating immutable texture storage + * for colour-keying emulation. */ + WARN("Disabling ARB_texture_storage because fragment pipe doesn't support colour-keying.\n"); + gl_info->supported[ARB_TEXTURE_STORAGE] = FALSE; + } + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) ERR_(winediag)("You are using the backbuffer for offscreen rendering. " "This is unsupported, and will be removed in a future version.\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 26a1feee7a5..10d076edccc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2682,6 +2682,7 @@ struct wined3d_gl_limits unsigned int combined_samplers; UINT general_combiners; UINT user_clip_distances; + unsigned int texture_size; UINT texture3d_size; UINT anisotropy; float shininess; -- 2.11.0

2 1

[PATCH 2/3] d3d9/tests: Add a test for stencil reference value truncation.
by Henri Verbeet 28 Aug '19

28 Aug '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> With suggestions by Paul Gofman. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 136 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 97 insertions(+), 39 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f2c6ee42dc0..948582ab9c6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10958,33 +10958,37 @@ static void stencil_cull_test(void) D3DCAPS9 caps; HWND window; HRESULT hr; - static const float quad1[] = + static const struct { - -1.0, -1.0, 0.1, - 0.0, -1.0, 0.1, - -1.0, 0.0, 0.1, - 0.0, 0.0, 0.1, - }; - static const float quad2[] = + struct vec3 position; + } + quad1[] = { - 0.0, -1.0, 0.1, - 1.0, -1.0, 0.1, - 0.0, 0.0, 0.1, - 1.0, 0.0, 0.1, - }; - static const float quad3[] = + {{-1.0f, -1.0f, 0.1f}}, + {{ 0.0f, -1.0f, 0.1f}}, + {{-1.0f, 0.0f, 0.1f}}, + {{ 0.0f, 0.0f, 0.1f}}, + }, + quad2[] = { - 0.0, 0.0, 0.1, - 1.0, 0.0, 0.1, - 0.0, 1.0, 0.1, - 1.0, 1.0, 0.1, - }; - static const float quad4[] = + {{ 0.0f, -1.0f, 0.1f}}, + {{ 1.0f, -1.0f, 0.1f}}, + {{ 0.0f, 0.0f, 0.1f}}, + {{ 1.0f, 0.0f, 0.1f}}, + }, + quad3[] = + { + {{ 0.0f, 0.0f, 0.1f}}, + {{ 1.0f, 0.0f, 0.1f}}, + {{ 0.0f, 1.0f, 0.1f}}, + {{ 1.0f, 1.0f, 0.1f}}, + }, + quad4[] = { - -1.0, 0.0, 0.1, - 0.0, 0.0, 0.1, - -1.0, 1.0, 0.1, - 0.0, 1.0, 0.1, + {{-1.0f, 0.0f, 0.1f}}, + {{ 0.0f, 0.0f, 0.1f}}, + {{-1.0f, 1.0f, 0.1f}}, + {{ 0.0f, 1.0f, 0.1f}}, }; struct { @@ -11057,40 +11061,40 @@ static void stencil_cull_test(void) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CW); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad1, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_cw, D3DFMT_INDEX16, quad1, sizeof(*quad1)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad1, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_ccw, D3DFMT_INDEX16, quad1, sizeof(*quad1)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TWOSIDEDSTENCILMODE, TRUE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad2, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_cw, D3DFMT_INDEX16, quad2, sizeof(*quad2)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad2, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_ccw, D3DFMT_INDEX16, quad2, sizeof(*quad2)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CW); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad3, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_cw, D3DFMT_INDEX16, quad3, sizeof(*quad3)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad3, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_ccw, D3DFMT_INDEX16, quad3, sizeof(*quad3)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CCW); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad4, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_cw, D3DFMT_INDEX16, quad4, sizeof(*quad4)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad4, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_ccw, D3DFMT_INDEX16, quad4, sizeof(*quad4)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); @@ -11155,6 +11159,60 @@ static void stencil_cull_test(void) color = getPixelColor(device, 480, 60); ok(color == 0x00000080, "CW triangle, twoside TRUE, cull cw, culled, has color 0x%08x, expected 0x00000080\n", color); + /* Test for reference truncation. */ + /* 1st pass: set stencil. */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_STENCIL, 0x00ff0000, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFAIL, D3DSTENCILOP_REPLACE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILZFAIL, D3DSTENCILOP_REPLACE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILPASS, D3DSTENCILOP_REPLACE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILREF, 0x1cc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILMASK, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFUNC, D3DCMP_ALWAYS); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CW); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_cw, D3DFMT_INDEX16, quad1, sizeof(*quad1)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* 2nd pass: draw image. */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff0000, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILREF, 0xdb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILMASK, 0x0f); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFUNC, D3DCMP_LESS); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, painter, sizeof(painter[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + color = getPixelColor(device, 280, 360); + todo_wine ok(color == 0x000000f0, "Got unexpected colour 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); -- 2.11.0

2 1

[PATCH v2 1/3] wininet: Return error from HttpQueryInfo if number argument is invalid.
by Daniel Lehman 28 Aug '19

28 Aug '19

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v2: - just use strtoulW with overflow check - make this patch first since it's really 0003 that needs it --- dlls/wininet/http.c | 21 +++++++++++++--- dlls/wininet/tests/http.c | 51 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 538fc2bf6b..f771356760 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3724,9 +3724,24 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, /* coalesce value to requested type */ if (dwInfoLevel & HTTP_QUERY_FLAG_NUMBER && lpBuffer) { - *(int *)lpBuffer = atoiW(lphttpHdr->lpszValue); - TRACE(" returning number: %d\n", *(int *)lpBuffer); - } + unsigned long value; + + if (*lpdwBufferLength != sizeof(DWORD)) + { + LeaveCriticalSection( &request->headers_section ); + return ERROR_HTTP_INVALID_HEADER; + } + + value = strtoulW( lphttpHdr->lpszValue, NULL, 10 ); + if (value >= UINT_MAX) + { + LeaveCriticalSection( &request->headers_section ); + return ERROR_HTTP_INVALID_HEADER; + } + + *(DWORD *)lpBuffer = value; + TRACE(" returning number: %u\n", *(DWORD *)lpBuffer); + } else if (dwInfoLevel & HTTP_QUERY_FLAG_SYSTEMTIME && lpBuffer) { time_t tmpTime; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6db33e4033..076c6ce5a4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2061,6 +2061,11 @@ static const char okmsg2[] = "Set-Cookie: two\r\n" "\r\n"; +static const char notok4gb[] = +"HTTP/1.1 200 OK\r\n" +"Content-Length: 4294967296\r\n" +"\r\n"; + static const char notokmsg[] = "HTTP/1.1 400 Bad Request\r\n" "Server: winetest\r\n" @@ -2455,6 +2460,10 @@ static DWORD CALLBACK server_thread(LPVOID param) { send(c, okmsg, sizeof(okmsg)-1, 0); } + if (strstr(buffer, "HEAD /test_4GB")) + { + send(c, notok4gb, sizeof(notok4gb)-1, 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -5515,6 +5524,47 @@ static void test_remove_dot_segments(int port) close_request(&req); } +static void test_large_content(int port) +{ + test_request_t req; + DWORD len, len2; + DWORD64 len64; + BOOL ret; + + open_simple_request(&req, "localhost", port, "HEAD", "/test_4GB"); + + ret = HttpSendRequestA(req.request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + + /* test argument size */ + len = sizeof(len64); + len64 = ~0; + SetLastError(0xdeadbeef); + ret = HttpQueryInfoA(req.request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, + &len64, &len, 0); + ok(!ret, "HttpQueryInfo should have failed\n"); + ok(GetLastError() == ERROR_HTTP_INVALID_HEADER, + "HttpQueryInfo should have set last error to ERROR_HTTP_INVALID_HEADER instead of %u\n", + GetLastError()); + ok(len == sizeof(DWORD64), "len = %u\n", len); + ok(len64 == ~0, "len64 = %x%08x\n", (DWORD)(len64 >> 32), (DWORD)len64); + + /* test overflow */ + len = sizeof(len2); + len2 = ~0; + SetLastError(0xdeadbeef); + ret = HttpQueryInfoA(req.request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, + &len2, &len, 0); + ok(!ret, "HttpQueryInfo should have failed\n"); + ok(GetLastError() == ERROR_HTTP_INVALID_HEADER, + "HttpQueryInfo should have set last error to ERROR_HTTP_INVALID_HEADER instead of %u\n", + GetLastError()); + ok(len == sizeof(DWORD), "len = %u\n", len); + ok(len2 == ~0, "len2 = %x\n", len2); + + close_request(&req); +} + static void test_http_connection(void) { struct server_info si; @@ -5573,6 +5623,7 @@ static void test_http_connection(void) test_redirect(si.port); test_persistent_connection(si.port); test_remove_dot_segments(si.port); + test_large_content(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit"); -- 2.17.1

4 7