November 2018 - Wine-commits

Hans Leidekker : winhttp: Properly handle request paths with Unicode characters.
by Alexandre Julliard 06 Nov '18

06 Nov '18

Module: wine Branch: master Commit: 7e5b5cb1aa253ce2f20a790989d0f18bcbcab946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e5b5cb1aa253ce2f20a7909… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 6 16:09:04 2018 +0100 winhttp: Properly handle request paths with Unicode characters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46076 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 202 +++++++++++++++++++++++++++++++++++++---- dlls/winhttp/session.c | 51 ++--------- dlls/winhttp/tests/url.c | 62 +++++++++++++ dlls/winhttp/tests/winhttp.c | 21 ++++- dlls/winhttp/url.c | 74 ++++++++------- dlls/winhttp/winhttp_private.h | 9 -- 6 files changed, 315 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e5b5cb1aa253ce2f20a…

1 0

Michael Stefaniuc : wineqtdecoder: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 06 Nov '18

06 Nov '18

Module: wine Branch: master Commit: 9629769fe7a6fee0e5adaafad3545516ef478461 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9629769fe7a6fee0e5adaafa… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 6 21:01:07 2018 +0100 wineqtdecoder: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/main.c | 2 +- dlls/wineqtdecoder/qtdatahandler.c | 2 +- dlls/wineqtdecoder/qtsplitter.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineqtdecoder/main.c b/dlls/wineqtdecoder/main.c index c7dd76c..ac9268d 100644 --- a/dlls/wineqtdecoder/main.c +++ b/dlls/wineqtdecoder/main.c @@ -141,7 +141,7 @@ FactoryTemplate const g_Templates[] = { } }; -int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]); +int g_cTemplates = ARRAY_SIZE(g_Templates); static HINSTANCE hInst = NULL; /*********************************************************************** diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index bfbeab9..c88b354 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -361,7 +361,7 @@ static pascal ComponentResult myDataHGetFileName ( DataHandler dh, Str255 str) int i; IAsyncReader_SyncRead(data->dataRef.pReader, 0, 8, header); - for (i=0; i < sizeof(stream_sigs)/sizeof(signature); i++) + for (i = 0; i < ARRAY_SIZE(stream_sigs); i++) if (memcmp(header, stream_sigs[i].sig, stream_sigs[i].sig_length)==0) { str[0] = strlen(stream_sigs[i].fname); diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 2b9ec88..c0a9b93 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -277,7 +277,7 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) piInput = &This->pInputPin.pin.pinInfo; piInput->dir = PINDIR_INPUT; piInput->pFilter = &This->filter.IBaseFilter_iface; - lstrcpynW(piInput->achName, wcsInputPinName, sizeof(piInput->achName) / sizeof(piInput->achName[0])); + lstrcpynW(piInput->achName, wcsInputPinName, ARRAY_SIZE(piInput->achName)); This->pInputPin.pin.IPin_iface.lpVtbl = &QT_InputPin_Vtbl; This->pInputPin.pin.refCount = 1; This->pInputPin.pin.pConnectedTo = NULL;

1 0

Austin English : ntoskrnl.exe: Add PsGetProcessWow64Process stub.
by Alexandre Julliard 06 Nov '18

06 Nov '18

Module: wine Branch: master Commit: 454ba90abff809ac68a987c72d31df714c4f764e URL: https://source.winehq.org/git/wine.git/?a=commit;h=454ba90abff809ac68a987c7… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Nov 6 01:51:02 2018 -0600 ntoskrnl.exe: Add PsGetProcessWow64Process stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 15 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 16 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 9fbf22d..00d93a2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3991,13 +3991,28 @@ void WINAPI IoReleaseRemoveLockAndWaitEx(PIO_REMOVE_LOCK lock, PVOID tag, ULONG FIXME("stub: %p %p %u\n", lock, tag, size); } +/********************************************************************* + * DbgQueryDebugFilterState (NTOSKRNL.@) + */ NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG component, ULONG level) { FIXME("stub: %d %d\n", component, level); return STATUS_NOT_IMPLEMENTED; } +/********************************************************************* + * ExReleaseResourceLite (NTOSKRNL.@) + */ void WINAPI ExReleaseResourceLite(PERESOURCE resource) { FIXME("stub: %p\n", resource); } + +/********************************************************************* + * PsGetProcessWow64Process (NTOSKRNL.@) + */ +PVOID WINAPI PsGetProcessWow64Process(PEPROCESS process) +{ + FIXME("stub: %p\n", process); + return NULL; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c10fa2f..3e8315c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -886,6 +886,7 @@ @ stub PsGetProcessSessionId @ stub PsGetProcessWin32Process @ stub PsGetProcessWin32WindowStation +@ stdcall -arch=x86_64 PsGetProcessWow64Process(ptr) @ stub PsGetThreadFreezeCount @ stub PsGetThreadHardErrorsAreDisabled @ stub PsGetThreadId

1 0

Austin English : ntoskrnl.exe: Add MmCopyVirtualMemory stub.
by Alexandre Julliard 06 Nov '18

06 Nov '18

Module: wine Branch: master Commit: b3252feb3fc7c11c17801706a4ce4aaacfebddf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3252feb3fc7c11c17801706… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Nov 6 01:51:03 2018 -0600 ntoskrnl.exe: Add MmCopyVirtualMemory stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 12 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 00d93a2..4a5ac16 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4016,3 +4016,14 @@ PVOID WINAPI PsGetProcessWow64Process(PEPROCESS process) FIXME("stub: %p\n", process); return NULL; } + +/********************************************************************* + * MmCopyVirtualMemory (NTOSKRNL.@) + */ +NTSTATUS WINAPI MmCopyVirtualMemory(PEPROCESS fromprocess, PVOID fromaddress, PEPROCESS toprocess, + PVOID toaddress, SIZE_T bufsize, KPROCESSOR_MODE mode, + PSIZE_T copied) +{ + FIXME("stub: %p %p %p %p %lu %d %p\n", fromprocess, fromaddress, toprocess, toaddress, bufsize, mode, copied); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3e8315c..76d8fb3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -668,6 +668,7 @@ @ stub MmBuildMdlForNonPagedPool @ stub MmCanFileBeTruncated @ stub MmCommitSessionMappedView +@ stdcall MmCopyVirtualMemory(ptr ptr ptr ptr long long ptr) @ stub MmCreateMdl @ stdcall MmCreateSection(ptr long ptr ptr long long long ptr) @ stub MmDisableModifiedWriteOfSection

1 0

Fabian Maurer : mscoree: Add test for registration-less COM components.
by Alexandre Julliard 06 Nov '18

06 Nov '18

Module: wine Branch: master Commit: ef19a461616f5dbfaefcb2b886caca94a9144ddf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef19a461616f5dbfaefcb2b8… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Nov 3 13:24:29 2018 +0100 mscoree: Add test for registration-less COM components. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43270 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/Makefile.in | 6 +- dlls/mscoree/tests/comtest.c | 356 ++++++++++++++++++++++++++++++++ dlls/mscoree/tests/comtest.cs | 41 ++++ dlls/mscoree/tests/comtest_dll.manifest | 16 ++ dlls/mscoree/tests/comtest_exe.manifest | 11 + dlls/mscoree/tests/interfaces.idl | 35 ++++ dlls/mscoree/tests/resource.rc | 30 +++ 7 files changed, 494 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef19a461616f5dbfaefc…

1 0

Sven Baars : mfplat: Move IMFAttributes interface up to avoid forward declarations.
by Alexandre Julliard 06 Nov '18

06 Nov '18

Module: wine Branch: master Commit: ae220de0985d899d642b9a7d61fa248893be0426 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae220de0985d899d642b9a7d… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Nov 3 22:25:06 2018 +0100 mfplat: Move IMFAttributes interface up to avoid forward declarations. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 708 ++++++++++++++++++++++++++--------------------------- 1 file changed, 354 insertions(+), 354 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae220de0985d899d642b…

1 0

Sven Baars : mfplat: Add IMFAttributes interface to IMFByteStream.
by Alexandre Julliard 06 Nov '18

06 Nov '18

Module: wine Branch: master Commit: b8b4c041eaecbc66da063834525c43934ec04dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8b4c041eaecbc66da063834… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Nov 3 22:25:07 2018 +0100 mfplat: Add IMFAttributes interface to IMFByteStream. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 80 ++++++++++++++++++++++++++++++++++++++++++---- dlls/mfplat/tests/mfplat.c | 53 ++++++++++++++++++++++++++++-- 2 files changed, 124 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 5980721..f38ca7b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -847,8 +847,8 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size) typedef struct _mfbytestream { + mfattributes attributes; IMFByteStream IMFByteStream_iface; - LONG ref; } mfbytestream; static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) @@ -867,6 +867,10 @@ static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID r { *out = &This->IMFByteStream_iface; } + else if(IsEqualGUID(riid, &IID_IMFAttributes)) + { + *out = &This->attributes.IMFAttributes_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -881,17 +885,17 @@ static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID r static ULONG WINAPI mfbytestream_AddRef(IMFByteStream *iface) { mfbytestream *This = impl_from_IMFByteStream(iface); - ULONG ref = InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->attributes.ref); TRACE("(%p) ref=%u\n", This, ref); return ref; } -static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) +static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) { mfbytestream *This = impl_from_IMFByteStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->attributes.ref); TRACE("(%p) ref=%u\n", This, ref); @@ -1044,7 +1048,7 @@ static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) return E_NOTIMPL; } -static const IMFByteStreamVtbl mfbytesteam_vtbl = +static const IMFByteStreamVtbl mfbytestream_vtbl = { mfbytestream_QueryInterface, mfbytestream_AddRef, @@ -1066,6 +1070,67 @@ static const IMFByteStreamVtbl mfbytesteam_vtbl = mfbytestream_Close }; +static inline mfbytestream *impl_from_IMFByteStream_IMFAttributes(IMFAttributes *iface) +{ + return CONTAINING_RECORD(iface, mfbytestream, attributes.IMFAttributes_iface); +} + +static HRESULT WINAPI mfbytestream_attributes_QueryInterface( + IMFAttributes *iface, REFIID riid, void **out) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFByteStream_QueryInterface(&This->IMFByteStream_iface, riid, out); +} + +static ULONG WINAPI mfbytestream_attributes_AddRef(IMFAttributes *iface) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFByteStream_AddRef(&This->IMFByteStream_iface); +} + +static ULONG WINAPI mfbytestream_attributes_Release(IMFAttributes *iface) +{ + mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFByteStream_Release(&This->IMFByteStream_iface); +} + +static const IMFAttributesVtbl mfbytestream_attributes_vtbl = +{ + mfbytestream_attributes_QueryInterface, + mfbytestream_attributes_AddRef, + mfbytestream_attributes_Release, + mfattributes_GetItem, + mfattributes_GetItemType, + mfattributes_CompareItem, + mfattributes_Compare, + mfattributes_GetUINT32, + mfattributes_GetUINT64, + mfattributes_GetDouble, + mfattributes_GetGUID, + mfattributes_GetStringLength, + mfattributes_GetString, + mfattributes_GetAllocatedString, + mfattributes_GetBlobSize, + mfattributes_GetBlob, + mfattributes_GetAllocatedBlob, + mfattributes_GetUnknown, + mfattributes_SetItem, + mfattributes_DeleteItem, + mfattributes_DeleteAllItems, + mfattributes_SetUINT32, + mfattributes_SetUINT64, + mfattributes_SetDouble, + mfattributes_SetGUID, + mfattributes_SetString, + mfattributes_SetBlob, + mfattributes_SetUnknown, + mfattributes_LockStore, + mfattributes_UnlockStore, + mfattributes_GetCount, + mfattributes_GetItemByIndex, + mfattributes_CopyAllItems +}; + HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) { mfbytestream *object; @@ -1076,8 +1141,9 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt if(!object) return E_OUTOFMEMORY; - object->ref = 1; - object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; + init_attribute_object(&object->attributes, 0); + object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; + object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; *bytestream = &object->IMFByteStream_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 17cdc46..4605e20 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -258,8 +258,12 @@ static void test_MFCreateAttributes(void) static void test_MFCreateMFByteStreamOnStream(void) { IMFByteStream *bytestream; + IMFByteStream *bytestream2; IStream *stream; + IMFAttributes *attributes = NULL; + IUnknown *unknown; HRESULT hr; + ULONG ref; if(!pMFCreateMFByteStreamOnStream) { @@ -270,11 +274,56 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = pMFCreateMFByteStreamOnStream(stream, &bytestream ); + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); - IStream_Release(stream); + hr = IUnknown_QueryInterface(bytestream, &IID_IUnknown, + (void **)&unknown); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); + ref = IUnknown_Release(unknown); + ok(ref == 1, "got %u\n", ref); + + hr = IUnknown_QueryInterface(unknown, &IID_IMFByteStream, + (void **)&bytestream2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bytestream2 == bytestream, "got %p\n", bytestream2); + ref = IMFByteStream_Release(bytestream2); + ok(ref == 1, "got %u\n", ref); + + hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + (void **)&attributes); + ok(hr == S_OK || + /* w7pro64 */ + broken(hr == E_NOINTERFACE), "got 0x%08x\n", hr); + + if (hr != S_OK) + { + win_skip("Can not retrieve IMFAttributes interface from IMFByteStream\n"); + IStream_Release(stream); + IMFByteStream_Release(bytestream); + return; + } + + ok(attributes != NULL, "got NULL\n"); + + hr = IUnknown_QueryInterface(attributes, &IID_IUnknown, + (void **)&unknown); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); + ref = IUnknown_Release(unknown); + ok(ref == 2, "got %u\n", ref); + + hr = IUnknown_QueryInterface(attributes, &IID_IMFByteStream, + (void **)&bytestream2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bytestream2 == bytestream, "got %p\n", bytestream2); + ref = IMFByteStream_Release(bytestream2); + ok(ref == 2, "got %u\n", ref); + + IMFAttributes_Release(attributes); IMFByteStream_Release(bytestream); + IStream_Release(stream); } static void test_MFCreateMemoryBuffer(void)

1 0

Sven Baars : mfplat: Add MFCreateFile stub.
by Alexandre Julliard 06 Nov '18

06 Nov '18

Module: wine Branch: master Commit: 5bd465acd94ee7f88e0a176030f00fc29c3bdf77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bd465acd94ee7f88e0a1760… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Nov 3 22:25:08 2018 +0100 mfplat: Add MFCreateFile stub. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 71 +++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/Makefile.in | 2 + dlls/mfplat/tests/mfplat.c | 120 ++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/tests/resource.rc | 24 +++++++++ dlls/mfplat/tests/test.mp4 | Bin 0 -> 1554 bytes include/mfapi.h | 2 + 7 files changed, 220 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5bd465acd94ee7f88e0a…

1 0

Henri Verbeet : wined3d: Get rid of WINED3DUSAGE_DEPTHSTENCIL.
by Alexandre Julliard 06 Nov '18

06 Nov '18

Module: wine Branch: master Commit: a0d6ef5bb4fa9a86c3e2679abfdc954a59f25705 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0d6ef5bb4fa9a86c3e2679a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 6 14:00:58 2018 +0330 wined3d: Get rid of WINED3DUSAGE_DEPTHSTENCIL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/utils.c | 2 -- dlls/ddraw/surface.c | 5 ----- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 4 +--- dlls/wined3d/resource.c | 3 +-- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 3 +-- 8 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 2a1a8c6..1a61971 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -450,8 +450,6 @@ DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) if (bind_flags & D3D11_BIND_SHADER_RESOURCE) wined3d_usage |= WINED3DUSAGE_TEXTURE; - if (bind_flags & D3D11_BIND_DEPTH_STENCIL) - wined3d_usage |= WINED3DUSAGE_DEPTHSTENCIL; if (bind_flags & ~handled) FIXME("Unhandled bind flags %#x.\n", bind_flags & ~handled); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6bb92d5..fb0cc85 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6175,14 +6175,9 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ wined3d_desc.bind_flags |= WINED3D_BIND_SHADER_RESOURCE; } if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) - { - wined3d_desc.usage |= WINED3DUSAGE_DEPTHSTENCIL; wined3d_desc.bind_flags |= WINED3D_BIND_DEPTH_STENCIL; - } else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) - { wined3d_desc.bind_flags |= WINED3D_BIND_RENDER_TARGET; - } } if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1af76f2..893ce55 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4898,7 +4898,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, texture_desc.format = swapchain->desc.auto_depth_stencil_format; texture_desc.multisample_type = swapchain->desc.multisample_type; texture_desc.multisample_quality = swapchain->desc.multisample_quality; - texture_desc.usage = WINED3DUSAGE_DEPTHSTENCIL; + texture_desc.usage = 0; texture_desc.bind_flags = WINED3D_BIND_DEPTH_STENCIL; texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; texture_desc.width = swapchain->desc.backbuffer_width; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a79e924..dab10cb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1541,11 +1541,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3D_BIND_RENDER_TARGET); format = wined3d_get_format(adapter, check_format_id, bind_flags); - if (usage & WINED3DUSAGE_DEPTHSTENCIL) - bind_flags |= WINED3D_BIND_DEPTH_STENCIL; if (usage & WINED3DUSAGE_TEXTURE) bind_flags |= WINED3D_BIND_SHADER_RESOURCE; - usage &= ~(WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_TEXTURE); + usage &= ~WINED3DUSAGE_TEXTURE; switch (resource_type) { diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 58caccc..6114355 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -30,8 +30,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); static void resource_check_usage(DWORD usage) { - static const DWORD handled = WINED3DUSAGE_DEPTHSTENCIL - | WINED3DUSAGE_WRITEONLY + static const DWORD handled = WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_STATICDECL | WINED3DUSAGE_OVERLAY diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 36e7b2e..ba7c817 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -947,7 +947,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 struct wined3d_texture *ds; texture_desc.format = swapchain->desc.auto_depth_stencil_format; - texture_desc.usage = WINED3DUSAGE_DEPTHSTENCIL; + texture_desc.usage = 0; texture_desc.bind_flags = WINED3D_BIND_DEPTH_STENCIL; if (FAILED(hr = device->device_parent->ops->create_swapchain_texture(device->device_parent, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a7b1b10..4e5d36c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4511,7 +4511,6 @@ const char *debug_d3dusage(DWORD usage) init_debug_buffer(&buffer, "0"); #define WINED3DUSAGE_TO_STR(x) if (usage & x) { debug_append(&buffer, #x, " | "); usage &= ~x; } - WINED3DUSAGE_TO_STR(WINED3DUSAGE_DEPTHSTENCIL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_WRITEONLY); WINED3DUSAGE_TO_STR(WINED3DUSAGE_SOFTWAREPROCESSING); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DONOTCLIP); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fd90757..0d98dfa 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -914,7 +914,6 @@ enum wined3d_shader_type #define WINED3D_BIND_DEPTH_STENCIL 0x00000040 #define WINED3D_BIND_UNORDERED_ACCESS 0x00000080 -#define WINED3DUSAGE_DEPTHSTENCIL 0x00000002 #define WINED3DUSAGE_WRITEONLY 0x00000008 #define WINED3DUSAGE_SOFTWAREPROCESSING 0x00000010 #define WINED3DUSAGE_DONOTCLIP 0x00000020 @@ -927,7 +926,7 @@ enum wined3d_shader_type #define WINED3DUSAGE_RESTRICT_SHARED_RESOURCE 0x00002000 #define WINED3DUSAGE_DMAP 0x00004000 #define WINED3DUSAGE_TEXTAPI 0x10000000 -#define WINED3DUSAGE_MASK 0x10007bfa +#define WINED3DUSAGE_MASK 0x10007bf8 #define WINED3DUSAGE_SCRATCH 0x00200000 #define WINED3DUSAGE_PRIVATE 0x00400000

1 0

Henri Verbeet : wined3d: Get rid of WINED3DUSAGE_TEXTURE.
by Alexandre Julliard 06 Nov '18

06 Nov '18

Module: wine Branch: master Commit: 03c1422a71b030dcfa931b4a2054fb26f65bacec URL: https://source.winehq.org/git/wine.git/?a=commit;h=03c1422a71b030dcfa931b4a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 6 14:00:59 2018 +0330 wined3d: Get rid of WINED3DUSAGE_TEXTURE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 2 +- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/texture.c | 6 +++--- dlls/d3d11/utils.c | 10 +--------- dlls/d3d8/texture.c | 4 +--- dlls/d3d9/texture.c | 4 +--- dlls/ddraw/surface.c | 3 --- dlls/dxgi/device.c | 2 -- dlls/wined3d/directx.c | 4 ---- dlls/wined3d/resource.c | 1 - dlls/wined3d/swapchain.c | 2 -- dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 7 +++---- 13 files changed, 11 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03c1422a71b030dcfa93…

1 0