- wine-devel - winehq.org

[PATCH] msado15: Convert to Integer for field index
by Alistair Leslie-Hughes 09 Jun '21

09 Jun '21

Thanks Gabriel Ivăncescu. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 24 +++++++++--------------- dlls/msado15/tests/msado15.c | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 7cd943f55d5..9ed5e404c9d 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -740,28 +740,22 @@ static HRESULT map_index( struct fields *fields, VARIANT *index, ULONG *ret ) { ULONG i; - if (V_VT( index ) == VT_I4 || V_VT( index ) == VT_I2) + if (V_VT( index ) != VT_BSTR) { - if (V_VT( index ) == VT_I4) - i = V_I4 ( index ); - else - i = V_I2 ( index ); - - if (i < fields->count) + VARIANT idx; + if (VariantChangeType(index, &idx, 0, VT_UI4) == S_OK) { - *ret = i; - return S_OK; + i = V_UI4 ( &idx ); + if (i < fields->count) + { + *ret = i; + return S_OK; + } } return MAKE_ADO_HRESULT(adErrItemNotFound); } - if (V_VT( index ) != VT_BSTR) - { - FIXME( "variant type %u not supported\n", V_VT( index ) ); - return E_INVALIDARG; - } - for (i = 0; i < fields->count; i++) { BSTR name; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 860144338c0..25c9c6f8356 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -150,6 +150,23 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); Field_Release(field); + V_VT( &index ) = VT_I1; + V_I1( &index ) = 0; + hr = Fields_get_Item( fields, index, &field ); + ok( hr == S_OK, "got %08x\n", hr ); + Field_Release(field); + + V_VT( &index ) = VT_R8; + V_R8( &index ) = 0.1; + hr = Fields_get_Item( fields, index, &field ); + ok( hr == S_OK, "got %08x\n", hr ); + Field_Release(field); + + V_VT( &index ) = VT_UNKNOWN; + V_UNKNOWN( &index ) = NULL; + hr = Fields_get_Item( fields, index, &field ); + ok( hr == MAKE_ADO_HRESULT(adErrItemNotFound), "got %08x\n", hr ); + V_VT( &index ) = VT_BSTR; V_BSTR( &index ) = name; hr = Fields_get_Item( fields, index, &field ); -- 2.30.2

2 1

[PATCH 1/5] ws2_32: Fix the indentation of SIO_ROUTING_INTERFACE_QUERY.
by Zebediah Figura 09 Jun '21

09 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/socket.c | 115 ++++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 57 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1b3ad2fa6d0..7493b9e9f87 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3428,63 +3428,64 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID return ret ? -1 : 0; } - case WS_SIO_ROUTING_INTERFACE_QUERY: - { - struct WS_sockaddr *daddr = (struct WS_sockaddr *)in_buff; - struct WS_sockaddr_in *daddr_in = (struct WS_sockaddr_in *)daddr; - struct WS_sockaddr_in *saddr_in = out_buff; - MIB_IPFORWARDROW row; - PMIB_IPADDRTABLE ipAddrTable = NULL; - DWORD size, i, found_index; - - TRACE("-> WS_SIO_ROUTING_INTERFACE_QUERY request\n"); - - if (!in_buff || in_size < sizeof(struct WS_sockaddr) || - !out_buff || out_size < sizeof(struct WS_sockaddr_in)) - { - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - if (daddr->sa_family != WS_AF_INET) - { - FIXME("unsupported address family %d\n", daddr->sa_family); - status = WSAEAFNOSUPPORT; - break; - } - if (GetBestRoute(daddr_in->sin_addr.S_un.S_addr, 0, &row) != NOERROR || - GetIpAddrTable(NULL, &size, FALSE) != ERROR_INSUFFICIENT_BUFFER) - { - status = WSAEFAULT; - break; - } - ipAddrTable = HeapAlloc(GetProcessHeap(), 0, size); - if (GetIpAddrTable(ipAddrTable, &size, FALSE)) - { - HeapFree(GetProcessHeap(), 0, ipAddrTable); - status = WSAEFAULT; - break; - } - for (i = 0, found_index = ipAddrTable->dwNumEntries; - i < ipAddrTable->dwNumEntries; i++) - { - if (ipAddrTable->table[i].dwIndex == row.dwForwardIfIndex) - found_index = i; - } - if (found_index == ipAddrTable->dwNumEntries) - { - ERR("no matching IP address for interface %d\n", - row.dwForwardIfIndex); - HeapFree(GetProcessHeap(), 0, ipAddrTable); - status = WSAEFAULT; - break; - } - saddr_in->sin_family = WS_AF_INET; - saddr_in->sin_addr.S_un.S_addr = ipAddrTable->table[found_index].dwAddr; - saddr_in->sin_port = 0; - total = sizeof(struct WS_sockaddr_in); - HeapFree(GetProcessHeap(), 0, ipAddrTable); - break; - } + case WS_SIO_ROUTING_INTERFACE_QUERY: + { + struct WS_sockaddr *daddr = (struct WS_sockaddr *)in_buff; + struct WS_sockaddr_in *daddr_in = (struct WS_sockaddr_in *)daddr; + struct WS_sockaddr_in *saddr_in = out_buff; + MIB_IPFORWARDROW row; + PMIB_IPADDRTABLE ipAddrTable = NULL; + DWORD size, i, found_index; + + TRACE( "-> WS_SIO_ROUTING_INTERFACE_QUERY request\n" ); + + if (!in_buff || in_size < sizeof(struct WS_sockaddr) || + !out_buff || out_size < sizeof(struct WS_sockaddr_in)) + { + SetLastError( WSAEFAULT ); + return -1; + } + if (daddr->sa_family != WS_AF_INET) + { + FIXME("unsupported address family %d\n", daddr->sa_family); + status = WSAEAFNOSUPPORT; + break; + } + if (GetBestRoute( daddr_in->sin_addr.S_un.S_addr, 0, &row ) != NOERROR || + GetIpAddrTable( NULL, &size, FALSE ) != ERROR_INSUFFICIENT_BUFFER) + { + status = WSAEFAULT; + break; + } + ipAddrTable = HeapAlloc( GetProcessHeap(), 0, size ); + if (GetIpAddrTable( ipAddrTable, &size, FALSE )) + { + HeapFree( GetProcessHeap(), 0, ipAddrTable ); + status = WSAEFAULT; + break; + } + for (i = 0, found_index = ipAddrTable->dwNumEntries; + i < ipAddrTable->dwNumEntries; i++) + { + if (ipAddrTable->table[i].dwIndex == row.dwForwardIfIndex) + found_index = i; + } + if (found_index == ipAddrTable->dwNumEntries) + { + ERR("no matching IP address for interface %d\n", + row.dwForwardIfIndex); + HeapFree( GetProcessHeap(), 0, ipAddrTable ); + status = WSAEFAULT; + break; + } + saddr_in->sin_family = WS_AF_INET; + saddr_in->sin_addr.S_un.S_addr = ipAddrTable->table[found_index].dwAddr; + saddr_in->sin_port = 0; + total = sizeof(struct WS_sockaddr_in); + HeapFree( GetProcessHeap(), 0, ipAddrTable ); + break; + } + case WS_SIO_SET_COMPATIBILITY_MODE: TRACE("WS_SIO_SET_COMPATIBILITY_MODE ignored\n"); status = WSAEOPNOTSUPP; -- 2.32.0

2 6

[PATCH 1/2] dxva2: Accept AYUV as input format.
by Nikolay Sivov 09 Jun '21

09 Jun '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 12 +++++++++--- dlls/dxva2/tests/dxva2.c | 11 +++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 8952de17b1e..4eefffd6052 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -377,6 +377,14 @@ static HRESULT WINAPI device_manager_processor_service_RegisterVideoProcessorSof return E_NOTIMPL; } +static BOOL dxva_is_supported_stream_format(const DXVA2_VideoDesc *video_desc) +{ + return video_desc->Format == D3DFMT_A8R8G8B8 || + video_desc->Format == D3DFMT_X8R8G8B8 || + video_desc->Format == D3DFMT_YUY2 || + video_desc->Format == MAKEFOURCC('A','Y','U','V'); +} + static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorDeviceGuids( IDirectXVideoProcessorService *iface, const DXVA2_VideoDesc *video_desc, UINT *count, GUID **guids) { @@ -399,9 +407,7 @@ static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorRenderTa if (IsEqualGUID(deviceguid, &DXVA2_VideoProcSoftwareDevice)) { - if (!(video_desc->Format == D3DFMT_A8R8G8B8 || - video_desc->Format == D3DFMT_X8R8G8B8 || - video_desc->Format == D3DFMT_YUY2)) + if (!dxva_is_supported_stream_format(video_desc)) { WARN("Unsupported content format %#x.\n", video_desc->Format); return E_FAIL; diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 1de1712d163..f785b2ce147 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -111,6 +111,7 @@ static void test_device_manager(void) D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8, D3DFMT_YUY2, + MAKEFOURCC('A','Y','U','V'), }; static const D3DFORMAT rt_unsupported_formats[] = { @@ -353,6 +354,12 @@ static void test_device_manager(void) { init_video_desc(&video_desc, rt_formats[i]); + count = 0; + hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count > 0, "Unexpected device count.\n"); + CoTaskMemFree(guids); + count = 0; hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, &video_desc, &count, &formats); @@ -371,6 +378,10 @@ static void test_device_manager(void) hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, &video_desc, &count, &formats); ok(hr == E_FAIL, "Unexpected hr %#x, format %d.\n", hr, rt_unsupported_formats[i]); + + hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); + todo_wine + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); } IDirectXVideoProcessorService_Release(proc_service); -- 2.30.2

2 3

[PATCH] dxva2/tests: Remove a test failing on system with hw dxva devices support.
by Nikolay Sivov 09 Jun '21

09 Jun '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/tests/dxva2.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 80749b81f12..4b09e93e87a 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -378,9 +378,6 @@ static void test_device_manager(void) hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, &video_desc, &count, &formats); ok(hr == E_FAIL, "Unexpected hr %#x, format %d.\n", hr, rt_unsupported_formats[i]); - - hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); } IDirectXVideoProcessorService_Release(proc_service); -- 2.30.2

1 0

[PATCH] d3d11: Fix freed memory access when releasing device context (Coverity).
by Nikolay Sivov 09 Jun '21

09 Jun '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d3e49879676..fd2f75327e2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -521,13 +521,13 @@ static ULONG STDMETHODCALLTYPE d3d11_device_context_Release(ID3D11DeviceContext1 if (!refcount) { + ID3D11Device2_Release(&context->device->ID3D11Device2_iface); if (context->type != D3D11_DEVICE_CONTEXT_IMMEDIATE) { wined3d_deferred_context_destroy(context->wined3d_context); d3d11_device_context_cleanup(context); heap_free(context); } - ID3D11Device2_Release(&context->device->ID3D11Device2_iface); } return refcount; -- 2.30.2

3 3

[PATCH] msado15: Support VT_I4/I2 for Fields Item property
by Alistair Leslie-Hughes 08 Jun '21

08 Jun '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 16 ++++++++++++++++ dlls/msado15/tests/msado15.c | 17 +++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 8d7619d9161..7cd943f55d5 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -740,6 +740,22 @@ static HRESULT map_index( struct fields *fields, VARIANT *index, ULONG *ret ) { ULONG i; + if (V_VT( index ) == VT_I4 || V_VT( index ) == VT_I2) + { + if (V_VT( index ) == VT_I4) + i = V_I4 ( index ); + else + i = V_I2 ( index ); + + if (i < fields->count) + { + *ret = i; + return S_OK; + } + + return MAKE_ADO_HRESULT(adErrItemNotFound); + } + if (V_VT( index ) != VT_BSTR) { FIXME( "variant type %u not supported\n", V_VT( index ) ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 97a578b0618..860144338c0 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -133,6 +133,23 @@ static void test_Recordset(void) hr = Fields__Append( fields, name, adInteger, 4, adFldUnspecified ); ok( hr == S_OK, "got %08x\n", hr ); + V_VT( &index ) = VT_I4; + V_I4( &index ) = 1000; + hr = Fields_get_Item( fields, index, &field ); + ok( hr == MAKE_ADO_HRESULT(adErrItemNotFound), "got %08x\n", hr ); + + V_VT( &index ) = VT_I4; + V_I4( &index ) = 0; + hr = Fields_get_Item( fields, index, &field ); + ok( hr == S_OK, "got %08x\n", hr ); + Field_Release(field); + + V_VT( &index ) = VT_I2; + V_I4( &index ) = 0; + hr = Fields_get_Item( fields, index, &field ); + ok( hr == S_OK, "got %08x\n", hr ); + Field_Release(field); + V_VT( &index ) = VT_BSTR; V_BSTR( &index ) = name; hr = Fields_get_Item( fields, index, &field ); -- 2.30.2

3 4

[PATCH v3 1/6] ntoskrnl.exe/tests: Silent a todo_wine failing test after a while.
by Rémi Bernon 08 Jun '21

08 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Minor changes, drop the controversial test fixups, let's ignore the spurious failures for now. Tweak the silent logic as requested, squeeze in a few more tests. The spurious w864 crash doesn't seem to be related to the patches, it happens there from time to time when the driver tests aren't executed and is probably caused by some invalid cleanup. FWIW, when I force start_driver code to fail on Wine in the same way it's failing on this machine, I also get a winedevice crash after the test has exited, on a call to PsGetCurrentProcessId() in winetest_cleanup. I have no idea if it's the same kind of thing, but it looks fishy. dlls/ntoskrnl.exe/tests/driver_hid.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 44ec1b09526..0f626e6866c 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -103,6 +103,7 @@ static const unsigned char report_descriptor[] = static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { + static BOOL test_failed; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); const ULONG in_size = stack->Parameters.DeviceIoControl.InputBufferLength; const ULONG out_size = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -175,11 +176,15 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) } case IOCTL_HID_READ_REPORT: + { + ULONG expected_size = 2; ok(!in_size, "got input size %u\n", in_size); - todo_wine ok(out_size == 2, "got output size %u\n", out_size); + if (!test_failed) todo_wine ok(out_size == expected_size, "got output size %u\n", out_size); + if (out_size != expected_size) test_failed = TRUE; ret = STATUS_NOT_IMPLEMENTED; break; + } case IOCTL_HID_GET_STRING: ok(!in_size, "got input size %u\n", in_size); -- 2.31.0

3 26

[PATCH 3/3] msvcrt: Import fmaf implementation from musl.
by Piotr Caban 08 Jun '21

08 Jun '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 3 +-- dlls/msvcrt/math.c | 39 ++++++++++++++++++++++++++++++++++----- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 35 insertions(+), 21 deletions(-)

1 0

[PATCH 2/3] msvcrt: Import tgammaf implementation from musl.
by Piotr Caban 08 Jun '21

08 Jun '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 3 +-- dlls/msvcrt/math.c | 4 +++- dlls/msvcrt/unixlib.c | 14 -------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 4 insertions(+), 18 deletions(-)

1 0

[PATCH 1/3] msvcrt: Import tgamma implementation from musl.
by Piotr Caban 08 Jun '21

08 Jun '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 122 ++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 14 ----- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 118 insertions(+), 20 deletions(-)

1 0

[PATCH] mshtml: Fix typos in traces.
by Dmitry Timoshkov 08 Jun '21

08 Jun '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/dispex.c | 2 +- dlls/mshtml/htmlscript.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index cb2721ec141..39630590228 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -331,7 +331,7 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, hres = ITypeInfo_GetRefTypeInfo(dti, tdesc->u.lptdesc->u.hreftype, &ref_type_info); if(FAILED(hres)) { - ERR("Coulg not get referenced type info: %08x\n", hres); + ERR("Could not get referenced type info: %08x\n", hres); return; } diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 60fd94e3d44..4d7997e31a6 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -192,7 +192,7 @@ static HRESULT WINAPI HTMLScriptElement_put_text(IHTMLScriptElement *iface, BSTR TRACE("(%p)->(%s)\n", This, debugstr_w(v)); if(!This->element.node.doc || !This->element.node.doc->window) { - WARN("no windoow\n"); + WARN("no window\n"); return E_UNEXPECTED; } -- 2.31.1

2 1

[PATCH v2] msdrm: Add stub DRMRegisterContent function.
by Vijay Kiran Kamuju 08 Jun '21

08 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50595 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msdrm/Makefile.in | 3 +++ dlls/msdrm/main.c | 33 +++++++++++++++++++++++++++++++++ dlls/msdrm/msdrm.spec | 2 +- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 dlls/msdrm/main.c diff --git a/dlls/msdrm/Makefile.in b/dlls/msdrm/Makefile.in index 07d04d4f861..21137dd2da5 100644 --- a/dlls/msdrm/Makefile.in +++ b/dlls/msdrm/Makefile.in @@ -1,3 +1,6 @@ MODULE = msdrm.dll EXTRADLLFLAGS = -Wb,--prefer-native + +C_SRCS = \ + main.c diff --git a/dlls/msdrm/main.c b/dlls/msdrm/main.c new file mode 100644 index 00000000000..37ae777ba29 --- /dev/null +++ b/dlls/msdrm/main.c @@ -0,0 +1,33 @@ +/* + * Windows Rights Management Client + * + * Copyright 2021 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +#include "windef.h" +#include "winbase.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdrm); + +HRESULT WINAPI DRMRegisterContent(BOOL value) +{ + FIXME("(%u): stub\n", value); + + return S_OK; +} diff --git a/dlls/msdrm/msdrm.spec b/dlls/msdrm/msdrm.spec index 5d4d3d61bce..85cbb02541d 100644 --- a/dlls/msdrm/msdrm.spec +++ b/dlls/msdrm/msdrm.spec @@ -70,7 +70,7 @@ @ stub DRMIsWindowProtected @ stub DRMLoadLibrary @ stub DRMParseUnboundLicense -@ stub DRMRegisterContent +@ stdcall DRMRegisterContent(long) @ stub DRMRegisterProtectedWindow @ stub DRMRegisterRevocationList @ stub DRMRepair -- 2.30.1

1 0

[PATCH] hidclass.sys: Use realloc instead of HeapReAlloc.
by Rémi Bernon 08 Jun '21

08 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51223 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Which I missed when replacing allocation functions, sorry :/ dlls/hidclass.sys/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c index a45833ae383..720ca4eeb20 100644 --- a/dlls/hidclass.sys/buffer.c +++ b/dlls/hidclass.sys/buffer.c @@ -199,7 +199,7 @@ UINT RingBuffer_AddPointer(struct ReportRingBuffer *ring) { int count = idx = ring->pointer_alloc; ring->pointer_alloc *= 2; - ring->pointers = HeapReAlloc(GetProcessHeap(), 0, ring->pointers, sizeof(UINT) * ring->pointer_alloc); + ring->pointers = realloc(ring->pointers, sizeof(UINT) * ring->pointer_alloc); for( ;count < ring->pointer_alloc; count++) ring->pointers[count] = POINTER_UNUSED; } -- 2.31.0

1 0

[PATCH] sppc: Stub SLPersistApplicationPolicies.
by Esme Povirk 08 Jun '21

08 Jun '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/sppc/sppc.c | 10 ++++++++++ dlls/sppc/sppc.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/sppc/sppc.c b/dlls/sppc/sppc.c index cd78611558d..c05f15a28db 100644 --- a/dlls/sppc/sppc.c +++ b/dlls/sppc/sppc.c @@ -50,3 +50,13 @@ HRESULT WINAPI SLOpen(HSLC *handle) return S_OK; } + +HRESULT WINAPI SLPersistApplicationPolicies(const SLID *app, const SLID *product, DWORD flags) +{ + FIXME("(%s,%s,%x) stub\n", wine_dbgstr_guid(app), wine_dbgstr_guid(product), flags); + + if (!app) + return E_INVALIDARG; + + return S_OK; +} diff --git a/dlls/sppc/sppc.spec b/dlls/sppc/sppc.spec index af93e5619db..3ac40c23972 100644 --- a/dlls/sppc/sppc.spec +++ b/dlls/sppc/sppc.spec @@ -52,7 +52,7 @@ @ stub SLIsGenuineLocalEx @ stub SLLoadApplicationPolicies @ stdcall SLOpen(ptr) -@ stub SLPersistApplicationPolicies +@ stdcall SLPersistApplicationPolicies(ptr ptr long) @ stub SLPersistRTSPayloadOverride @ stub SLReArm @ stub SLRegisterEvent -- 2.25.1

1 0

[PATCH 2/3] winhttp: Remove redundant parentheses.
by Hans Leidekker 08 Jun '21

08 Jun '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 1bdf39bca20..005c35dea4c 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1787,7 +1787,7 @@ static char *download_script( const WCHAR *url, DWORD *out_size ) if (!(req = WinHttpOpenRequest( con, NULL, uc.lpszUrlPath, NULL, NULL, acceptW, flags ))) goto done; if (!WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 )) goto done; - if (!(WinHttpReceiveResponse( req, 0 ))) goto done; + if (!WinHttpReceiveResponse( req, 0 )) goto done; if (!WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ) || status != HTTP_STATUS_OK) goto done; -- 2.30.2

2 1

[PATCH] mfplat/buffer: Fix maximum length for YV12 format.
by Nikolay Sivov 08 Jun '21

08 Jun '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 1 + dlls/mfplat/tests/mfplat.c | 30 +++++++++++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index adb53c7dfe7..c1829043e1b 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1357,6 +1357,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo plane_size *= 2; break; case MAKEFOURCC('N','V','1','2'): + case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','M','C','2'): case MAKEFOURCC('I','M','C','4'): max_length = pitch * height * 3 / 2; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 89f6a945c8a..ff24c2c0ec0 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5450,14 +5450,16 @@ static void test_MFCreate2DMediaBuffer(void) unsigned int contiguous_length; int pitch; unsigned int plane_multiplier; + unsigned int max_length; } _2d_buffer_tests[] = { - { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64 }, - { 4, 2, MAKEFOURCC('N','V','1','2'), 12, 64 }, - { 2, 4, MAKEFOURCC('N','V','1','2'), 12, 64 }, - { 1, 3, MAKEFOURCC('N','V','1','2'), 4, 64 }, + { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64, 0, 192 }, + { 4, 2, MAKEFOURCC('N','V','1','2'), 12, 64 }, + { 2, 4, MAKEFOURCC('N','V','1','2'), 12, 64 }, + { 1, 3, MAKEFOURCC('N','V','1','2'), 4, 64 }, + { 4, 16, MAKEFOURCC('N','V','1','2'), 96, 64, 0, 1536 }, - { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128 }, + { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 0, 384 }, { 4, 2, MAKEFOURCC('I','M','C','2'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','2'), 12, 128 }, { 2, 2, MAKEFOURCC('I','M','C','4'), 6, 128 }, @@ -5466,29 +5468,29 @@ static void test_MFCreate2DMediaBuffer(void) { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128, 2 }, { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 2 }, + { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 2, 4096 }, { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128, 2 }, { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128, 2 }, { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 2 }, + { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 2, 4096 }, { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128, 2 }, { 4, 2, MAKEFOURCC('Y','V','1','2'), 12, 128 }, { 4, 4, MAKEFOURCC('Y','V','1','2'), 24, 128 }, - { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128 }, + { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128, 0, 3072 }, { 4, 2, MAKEFOURCC('A','Y','U','V'), 32, 64 }, { 4, 4, MAKEFOURCC('A','Y','U','V'), 64, 64 }, - { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64 }, + { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64, 0, 1024 }, { 4, 2, MAKEFOURCC('Y','U','Y','2'), 16, 64 }, { 4, 4, MAKEFOURCC('Y','U','Y','2'), 32, 64 }, - { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64 }, + { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64, 0, 1024 }, { 4, 2, MAKEFOURCC('U','Y','V','Y'), 16, 64 }, { 4, 4, MAKEFOURCC('U','Y','V','Y'), 32, 64 }, - { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64 }, + { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64, 0, 1024 }, { 2, 4, D3DFMT_A8R8G8B8, 32, 64 }, { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, @@ -5681,6 +5683,12 @@ static void test_MFCreate2DMediaBuffer(void) hr = pMFCreate2DMediaBuffer(ptr->width, ptr->height, ptr->fourcc, FALSE, &buffer); ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (ptr->max_length) + ok(length == ptr->max_length, "%u: unexpected maximum length %u for %u x %u, format %s.\n", + i, length, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2dbuffer); ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); -- 2.30.2

1 0

[PATCH 3/3] winhttp: Use CRT memory allocators.
by Hans Leidekker 08 Jun '21

08 Jun '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/cookie.c | 50 +++--- dlls/winhttp/handle.c | 7 +- dlls/winhttp/net.c | 34 ++-- dlls/winhttp/request.c | 316 +++++++++++++++++---------------- dlls/winhttp/session.c | 144 ++++++++------- dlls/winhttp/url.c | 8 +- dlls/winhttp/winhttp_private.h | 18 +- 7 files changed, 286 insertions(+), 291 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 6247e379ec7..ebcd1b4d17e 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -49,7 +49,7 @@ static struct domain *add_domain( struct session *session, WCHAR *name ) { struct domain *domain; - if (!(domain = heap_alloc_zero( sizeof(struct domain) ))) return NULL; + if (!(domain = calloc( 1, sizeof(*domain) ))) return NULL; list_init( &domain->entry ); list_init( &domain->cookies ); @@ -89,10 +89,10 @@ static BOOL domain_match( const WCHAR *name, struct domain *domain, BOOL partial static void free_cookie( struct cookie *cookie ) { - heap_free( cookie->name ); - heap_free( cookie->value ); - heap_free( cookie->path ); - heap_free( cookie ); + free( cookie->name ); + free( cookie->value ); + free( cookie->path ); + free( cookie ); } static void delete_cookie( struct cookie *cookie ) @@ -113,8 +113,8 @@ static void delete_domain( struct domain *domain ) } list_remove( &domain->entry ); - heap_free( domain->name ); - heap_free( domain ); + free( domain->name ); + free( domain ); } void destroy_cookies( struct session *session ) @@ -170,12 +170,12 @@ static struct cookie *parse_cookie( const WCHAR *string ) while (len && string[len - 1] == ' ') len--; if (!len) return NULL; - if (!(cookie = heap_alloc_zero( sizeof(struct cookie) ))) return NULL; + if (!(cookie = calloc( 1, sizeof(*cookie) ))) return NULL; list_init( &cookie->entry ); - if (!(cookie->name = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if (!(cookie->name = malloc( (len + 1) * sizeof(WCHAR) ))) { - heap_free( cookie ); + free( cookie ); return NULL; } memcpy( cookie->name, string, len * sizeof(WCHAR) ); @@ -187,7 +187,7 @@ static struct cookie *parse_cookie( const WCHAR *string ) len = lstrlenW( p ); while (len && p[len - 1] == ' ') len--; - if (!(cookie->value = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if (!(cookie->value = malloc( (len + 1) * sizeof(WCHAR) ))) { free_cookie( cookie ); return NULL; @@ -207,9 +207,9 @@ struct attr static void free_attr( struct attr *attr ) { if (!attr) return; - heap_free( attr->name ); - heap_free( attr->value ); - heap_free( attr ); + free( attr->name ); + free( attr->value ); + free( attr ); } static struct attr *parse_attr( const WCHAR *str, int *used ) @@ -224,10 +224,10 @@ static struct attr *parse_attr( const WCHAR *str, int *used ) len = q - p; if (!len) return NULL; - if (!(attr = heap_alloc( sizeof(struct attr) ))) return NULL; - if (!(attr->name = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if (!(attr = malloc( sizeof(*attr) ))) return NULL; + if (!(attr->name = malloc( (len + 1) * sizeof(WCHAR) ))) { - heap_free( attr ); + free( attr ); return NULL; } memcpy( attr->name, p, len * sizeof(WCHAR) ); @@ -244,7 +244,7 @@ static struct attr *parse_attr( const WCHAR *str, int *used ) len = q - p; while (len && p[len - 1] == ' ') len--; - if (!(attr->value = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if (!(attr->value = malloc( (len + 1) * sizeof(WCHAR) ))) { free_attr( attr ); return NULL; @@ -271,7 +271,7 @@ BOOL set_cookies( struct request *request, const WCHAR *cookies ) int len, used; len = lstrlenW( cookies ); - if (!(buffer = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return FALSE; + if (!(buffer = malloc( (len + 1) * sizeof(WCHAR) ))) return FALSE; lstrcpyW( buffer, cookies ); p = buffer; @@ -279,7 +279,7 @@ BOOL set_cookies( struct request *request, const WCHAR *cookies ) if (*p == ';') *p++ = 0; if (!(cookie = parse_cookie( buffer ))) { - heap_free( buffer ); + free( buffer ); return FALSE; } len = lstrlenW( p ); @@ -312,10 +312,10 @@ BOOL set_cookies( struct request *request, const WCHAR *cookies ) end: if (!ret) free_cookie( cookie ); if (domain) free_attr( domain ); - else heap_free( cookie_domain ); + else free( cookie_domain ); if (path) free_attr( path ); - else heap_free( cookie_path ); - heap_free( buffer ); + else free( cookie_path ); + free( buffer ); return ret; } @@ -349,7 +349,7 @@ DWORD add_cookie_headers( struct request *request ) len = len_cookie + len_name; if (cookie->value) len += lstrlenW( cookie->value ) + 1; - if (!(header = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if (!(header = malloc( (len + 1) * sizeof(WCHAR) ))) { LeaveCriticalSection( &session->cs ); return ERROR_OUTOFMEMORY; @@ -366,7 +366,7 @@ DWORD add_cookie_headers( struct request *request ) TRACE("%s\n", debugstr_w(header)); ret = add_request_headers( request, header, len, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_COALESCE_WITH_SEMICOLON ); - heap_free( header ); + free( header ); } } } diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index 08052b91ee3..4fc94f10d01 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -94,14 +94,17 @@ HINTERNET alloc_handle( struct object_header *hdr ) if (!max_handles) { num = HANDLE_CHUNK_SIZE; - if (!(p = heap_alloc_zero( sizeof(ULONG_PTR) * num ))) goto end; + if (!(p = calloc( 1, sizeof(ULONG_PTR) * num ))) goto end; handles = p; max_handles = num; } if (max_handles == next_handle) { + size_t new_size, old_size = max_handles * sizeof(ULONG_PTR); num = max_handles * 2; - if (!(p = heap_realloc_zero( handles, sizeof(ULONG_PTR) * num ))) goto end; + new_size = num * sizeof(ULONG_PTR); + if (!(p = realloc( handles, new_size ))) goto end; + memset( (char *)p + old_size, 0, new_size - old_size ); handles = p; max_handles = num; } diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 0cc2bb2bef7..8597179dc3e 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -187,14 +187,14 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock winsock_init(); - if (!(conn = heap_alloc_zero( sizeof(*conn) ))) return ERROR_OUTOFMEMORY; + if (!(conn = calloc( 1, sizeof(*conn) ))) return ERROR_OUTOFMEMORY; conn->host = host; conn->sockaddr = *sockaddr; if ((conn->socket = socket( sockaddr->ss_family, SOCK_STREAM, 0 )) == -1) { ret = WSAGetLastError(); WARN("unable to create socket (%u)\n", ret); - heap_free( conn ); + free( conn ); return ret; } @@ -208,7 +208,7 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock break; default: ERR( "unhandled family %u\n", conn->sockaddr.ss_family ); - heap_free( conn ); + free( conn ); return ERROR_INVALID_PARAMETER; } @@ -237,7 +237,7 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock { WARN("unable to connect to host (%u)\n", ret); closesocket( conn->socket ); - heap_free( conn ); + free( conn ); return ret; } @@ -249,14 +249,14 @@ void netconn_close( struct netconn *conn ) { if (conn->secure) { - heap_free( conn->peek_msg_mem ); - heap_free(conn->ssl_buf); - heap_free(conn->extra_buf); + free( conn->peek_msg_mem ); + free(conn->ssl_buf); + free(conn->extra_buf); DeleteSecurityContext(&conn->ssl_ctx); } closesocket( conn->socket ); release_host( conn->host ); - heap_free(conn); + free(conn); } DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle, @@ -276,7 +276,7 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur const DWORD isc_req_flags = ISC_REQ_ALLOCATE_MEMORY|ISC_REQ_USE_SESSION_KEY|ISC_REQ_CONFIDENTIALITY |ISC_REQ_SEQUENCE_DETECT|ISC_REQ_REPLAY_DETECT|ISC_REQ_MANUAL_CRED_VALIDATION; - if (!(read_buf = heap_alloc( read_buf_size ))) return ERROR_OUTOFMEMORY; + if (!(read_buf = malloc( read_buf_size ))) return ERROR_OUTOFMEMORY; status = InitializeSecurityContextW(cred_handle, NULL, hostname, isc_req_flags, 0, 0, NULL, 0, &ctx, &out_desc, &attrs, NULL); @@ -318,7 +318,7 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur if(in_bufs[0].cbBuffer + 1024 > read_buf_size) { BYTE *new_read_buf; - new_read_buf = heap_realloc(read_buf, read_buf_size + 1024); + new_read_buf = realloc(read_buf, read_buf_size + 1024); if(!new_read_buf) { status = E_OUTOFMEMORY; break; @@ -365,7 +365,7 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur break; } - conn->ssl_buf = heap_alloc(conn->ssl_sizes.cbHeader + conn->ssl_sizes.cbMaximumMessage + conn->ssl_sizes.cbTrailer); + conn->ssl_buf = malloc(conn->ssl_sizes.cbHeader + conn->ssl_sizes.cbMaximumMessage + conn->ssl_sizes.cbTrailer); if(!conn->ssl_buf) { res = ERROR_OUTOFMEMORY; break; @@ -373,11 +373,11 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur } } - heap_free(read_buf); + free(read_buf); if(status != SEC_E_OK || res != ERROR_SUCCESS) { WARN("Failed to initialize security context: %08x\n", status); - heap_free(conn->ssl_buf); + free(conn->ssl_buf); conn->ssl_buf = NULL; DeleteSecurityContext(&ctx); return ERROR_WINHTTP_SECURE_CHANNEL_ERROR; @@ -459,7 +459,7 @@ static DWORD read_ssl_chunk( struct netconn *conn, void *buf, SIZE_T buf_size, S memcpy(conn->ssl_buf, conn->extra_buf, conn->extra_len); buf_len = conn->extra_len; conn->extra_len = 0; - heap_free(conn->extra_buf); + free(conn->extra_buf); conn->extra_buf = NULL; }else { if ((buf_len = sock_recv( conn->socket, conn->ssl_buf + conn->extra_len, ssl_buf_size - conn->extra_len, 0)) < 0) @@ -516,7 +516,7 @@ static DWORD read_ssl_chunk( struct netconn *conn, void *buf, SIZE_T buf_size, S memcpy(buf, bufs[i].pvBuffer, size); if(size < bufs[i].cbBuffer) { assert(!conn->peek_len); - conn->peek_msg_mem = conn->peek_msg = heap_alloc(bufs[i].cbBuffer - size); + conn->peek_msg_mem = conn->peek_msg = malloc(bufs[i].cbBuffer - size); if(!conn->peek_msg) return ERROR_OUTOFMEMORY; conn->peek_len = bufs[i].cbBuffer-size; @@ -529,7 +529,7 @@ static DWORD read_ssl_chunk( struct netconn *conn, void *buf, SIZE_T buf_size, S for(i = 0; i < ARRAY_SIZE(bufs); i++) { if(bufs[i].BufferType == SECBUFFER_EXTRA) { - conn->extra_buf = heap_alloc(bufs[i].cbBuffer); + conn->extra_buf = malloc(bufs[i].cbBuffer); if(!conn->extra_buf) return ERROR_OUTOFMEMORY; @@ -561,7 +561,7 @@ DWORD netconn_recv( struct netconn *conn, void *buf, size_t len, int flags, int if (conn->peek_len == 0) { - heap_free( conn->peek_msg_mem ); + free( conn->peek_msg_mem ); conn->peek_msg_mem = NULL; conn->peek_msg = NULL; } diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2ff211255ee..946168786ae 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -163,9 +163,9 @@ static DWORD queue_task( struct queue *queue, PTP_WORK_CALLBACK task, void *ctx static void free_header( struct header *header ) { - heap_free( header->field ); - heap_free( header->value ); - heap_free( header ); + free( header->field ); + free( header->value ); + free( header ); } static BOOL valid_token_char( WCHAR c ) @@ -216,10 +216,10 @@ static struct header *parse_header( const WCHAR *string ) p++; } len = q - string; - if (!(header = heap_alloc_zero( sizeof(struct header) ))) return NULL; - if (!(header->field = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if (!(header = calloc( 1, sizeof(*header) ))) return NULL; + if (!(header->field = malloc( (len + 1) * sizeof(WCHAR) ))) { - heap_free( header ); + free( header ); return NULL; } memcpy( header->field, string, len * sizeof(WCHAR) ); @@ -229,7 +229,7 @@ static struct header *parse_header( const WCHAR *string ) while (*q == ' ') q++; len = lstrlenW( q ); - if (!(header->value = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if (!(header->value = malloc( (len + 1) * sizeof(WCHAR) ))) { free_header( header ); return NULL; @@ -266,9 +266,11 @@ static DWORD insert_header( struct request *request, struct header *header ) struct header *hdrs; if (request->headers) - hdrs = heap_realloc_zero( request->headers, sizeof(struct header) * count ); - else - hdrs = heap_alloc_zero( sizeof(struct header) ); + { + if ((hdrs = realloc( request->headers, sizeof(*header) * count ))) + memset( &hdrs[count - 1], 0, sizeof(*header) ); + } + else hdrs = calloc( 1, sizeof(*header) ); if (!hdrs) return ERROR_OUTOFMEMORY; request->headers = hdrs; @@ -284,8 +286,8 @@ static void delete_header( struct request *request, DWORD index ) if (!request->num_headers || index >= request->num_headers) return; request->num_headers--; - heap_free( request->headers[index].field ); - heap_free( request->headers[index].value ); + free( request->headers[index].field ); + free( request->headers[index].value ); memmove( &request->headers[index], &request->headers[index + 1], (request->num_headers - index) * sizeof(struct header) ); @@ -332,7 +334,7 @@ DWORD process_header( struct request *request, const WCHAR *field, const WCHAR * len_value = lstrlenW( value ); len = len_orig + len_value + 2; - if (!(tmp = heap_realloc( header->value, (len + 1) * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; + if (!(tmp = realloc( header->value, (len + 1) * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; header->value = tmp; header->value[len_orig++] = (flags & WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA) ? ',' : ';'; header->value[len_orig++] = ' '; @@ -361,7 +363,7 @@ DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD if (len == ~0u) len = lstrlenW( headers ); if (!len) return ERROR_SUCCESS; - if (!(buffer = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; + if (!(buffer = malloc( (len + 1) * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; memcpy( buffer, headers, len * sizeof(WCHAR) ); buffer[len] = 0; @@ -393,7 +395,7 @@ DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD p = q; } while (!ret); - heap_free( buffer ); + free( buffer ); return ret; } @@ -443,7 +445,7 @@ static WCHAR *build_absolute_request_path( struct request *request, const WCHAR if (request->connect->hostport) len += 6; /* ':' between host and port, up to 5 for port */ len += lstrlenW( request->path ); - if ((ret = heap_alloc( len * sizeof(WCHAR) ))) + if ((ret = malloc( len * sizeof(WCHAR) ))) { offset = swprintf( ret, len, L"%s://%s", scheme, request->connect->hostname ); if (request->connect->hostport) @@ -476,7 +478,7 @@ static WCHAR *build_request_string( struct request *request ) } len += 4; /* '\r\n\r\n' */ - if ((ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if ((ret = malloc( (len + 1) * sizeof(WCHAR) ))) { lstrcpyW( ret, request->verb ); lstrcatW( ret, L" " ); @@ -497,7 +499,7 @@ static WCHAR *build_request_string( struct request *request ) lstrcatW( ret, L"\r\n\r\n" ); } - if (path != request->path) heap_free( path ); + if (path != request->path) free( path ); return ret; } @@ -551,7 +553,7 @@ static DWORD query_headers( struct request *request, DWORD level, const WCHAR *n ret = ERROR_SUCCESS; } *buflen = len * sizeof(WCHAR); - if (request_only) heap_free( headers ); + if (request_only) free( headers ); return ret; } case WINHTTP_QUERY_RAW_HEADERS_CRLF: @@ -577,7 +579,7 @@ static DWORD query_headers( struct request *request, DWORD level, const WCHAR *n ret = ERROR_SUCCESS; } *buflen = len; - if (request_only) heap_free( headers ); + if (request_only) free( headers ); return ret; } case WINHTTP_QUERY_VERSION: @@ -771,14 +773,14 @@ static DWORD query_auth_schemes( struct request *request, DWORD level, DWORD *su break; } - if (!(buffer = heap_alloc( size ))) return ERROR_OUTOFMEMORY; + if (!(buffer = malloc( size ))) return ERROR_OUTOFMEMORY; if ((ret = query_headers( request, level, NULL, buffer, &size, &index ))) { - heap_free( buffer ); + free( buffer ); return ret; } scheme = auth_scheme_from_header( buffer ); - heap_free( buffer ); + free( buffer ); if (!scheme) continue; if (!first_scheme) first_scheme = scheme; @@ -954,7 +956,7 @@ static struct authinfo *alloc_authinfo(void) { struct authinfo *ret; - if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; + if (!(ret = malloc( sizeof(*ret) ))) return NULL; SecInvalidateHandle( &ret->cred ); SecInvalidateHandle( &ret->ctx ); @@ -977,8 +979,8 @@ void destroy_authinfo( struct authinfo *authinfo ) if (SecIsValidHandle( &authinfo->cred )) FreeCredentialsHandle( &authinfo->cred ); - heap_free( authinfo->data ); - heap_free( authinfo ); + free( authinfo->data ); + free( authinfo ); } static BOOL get_authvalue( struct request *request, DWORD level, DWORD scheme, WCHAR *buffer, DWORD len ) @@ -1060,7 +1062,7 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem passlen = WideCharToMultiByte( CP_UTF8, 0, password, lstrlenW( password ), NULL, 0, NULL, NULL ); authinfo->data_len = userlen + 1 + passlen; - if (!(authinfo->data = heap_alloc( authinfo->data_len ))) return FALSE; + if (!(authinfo->data = malloc( authinfo->data_len ))) return FALSE; WideCharToMultiByte( CP_UTF8, 0, username, -1, authinfo->data, userlen, NULL, NULL ); authinfo->data[userlen] = ':'; @@ -1123,7 +1125,7 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem { WARN("AcquireCredentialsHandleW for scheme %s failed with error 0x%08x\n", debugstr_w(auth_schemes[scheme].str), status); - heap_free( authinfo ); + free( authinfo ); return FALSE; } authinfo->scheme = scheme; @@ -1152,7 +1154,7 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem { int len = lstrlenW( ++p ); in.cbBuffer = decode_base64( p, len, NULL ); - if (!(in.pvBuffer = heap_alloc( in.cbBuffer ))) { + if (!(in.pvBuffer = malloc( in.cbBuffer ))) { destroy_authinfo( authinfo ); *auth_ptr = NULL; return FALSE; @@ -1161,9 +1163,9 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem } out.BufferType = SECBUFFER_TOKEN; out.cbBuffer = authinfo->max_token; - if (!(out.pvBuffer = heap_alloc( authinfo->max_token ))) + if (!(out.pvBuffer = malloc( authinfo->max_token ))) { - heap_free( in.pvBuffer ); + free( in.pvBuffer ); destroy_authinfo( authinfo ); *auth_ptr = NULL; return FALSE; @@ -1176,10 +1178,10 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem first ? request->connect->servername : NULL, flags, 0, SECURITY_NETWORK_DREP, in.pvBuffer ? &in_desc : NULL, 0, &authinfo->ctx, &out_desc, &authinfo->attr, &authinfo->exp ); - heap_free( in.pvBuffer ); + free( in.pvBuffer ); if (status == SEC_E_OK) { - heap_free( authinfo->data ); + free( authinfo->data ); authinfo->data = out.pvBuffer; authinfo->data_len = out.cbBuffer; authinfo->finished = TRUE; @@ -1187,7 +1189,7 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem } else if (status == SEC_I_CONTINUE_NEEDED) { - heap_free( authinfo->data ); + free( authinfo->data ); authinfo->data = out.pvBuffer; authinfo->data_len = out.cbBuffer; TRACE("sending next auth packet\n"); @@ -1195,7 +1197,7 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem else { ERR("InitializeSecurityContextW failed with error 0x%08x\n", status); - heap_free( out.pvBuffer ); + free( out.pvBuffer ); destroy_authinfo( authinfo ); *auth_ptr = NULL; return FALSE; @@ -1210,7 +1212,7 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem len_scheme = auth_schemes[authinfo->scheme].len; len = len_scheme + 1 + ((authinfo->data_len + 2) * 4) / 3; - if (!(auth_reply = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return FALSE; + if (!(auth_reply = malloc( (len + 1) * sizeof(WCHAR) ))) return FALSE; memcpy( auth_reply, auth_schemes[authinfo->scheme].str, len_scheme * sizeof(WCHAR) ); auth_reply[len_scheme] = ' '; @@ -1218,7 +1220,7 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem flags = WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE; ret = !process_header( request, auth_target, auth_reply, flags, TRUE ); - heap_free( auth_reply ); + free( auth_reply ); return ret; } @@ -1228,7 +1230,7 @@ static WCHAR *build_proxy_connect_string( struct request *request ) unsigned int i; int len = lstrlenW( request->connect->hostname ) + 7; - if (!(host = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + if (!(host = malloc( len * sizeof(WCHAR) ))) return NULL; len = swprintf( host, len, L"%s:%u", request->connect->hostname, request->connect->hostport ); len += ARRAY_SIZE(L"CONNECT"); @@ -1241,7 +1243,7 @@ static WCHAR *build_proxy_connect_string( struct request *request ) } len += 4; /* '\r\n\r\n' */ - if ((ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if ((ret = malloc( (len + 1) * sizeof(WCHAR) ))) { lstrcpyW( ret, L"CONNECT" ); lstrcatW( ret, L" " ); @@ -1262,7 +1264,7 @@ static WCHAR *build_proxy_connect_string( struct request *request ) lstrcatW( ret, L"\r\n\r\n" ); } - heap_free( host ); + free( host ); return ret; } @@ -1277,12 +1279,12 @@ static DWORD secure_proxy_connect( struct request *request ) if (!(str = build_proxy_connect_string( request ))) return ERROR_OUTOFMEMORY; strA = strdupWA( str ); - heap_free( str ); + free( str ); if (!strA) return ERROR_OUTOFMEMORY; len = strlen( strA ); ret = netconn_send( request->netconn, strA, len, &bytes_sent ); - heap_free( strA ); + free( strA ); if (!ret) ret = read_reply( request ); return ret; @@ -1330,8 +1332,8 @@ void release_host( struct hostdata *host ) if (ref) return; assert( list_empty( &host->connections ) ); - heap_free( host->hostname ); - heap_free( host ); + free( host->hostname ); + free( host ); } static BOOL connection_collector_running; @@ -1467,7 +1469,7 @@ static DWORD open_connection( struct request *request ) if (!host) { - if ((host = heap_alloc( sizeof(*host) ))) + if ((host = malloc( sizeof(*host) ))) { host->ref = 1; host->secure = is_secure; @@ -1479,7 +1481,7 @@ static DWORD open_connection( struct request *request ) } else { - heap_free( host ); + free( host ); host = NULL; } } @@ -1548,7 +1550,7 @@ static DWORD open_connection( struct request *request ) if ((ret = netconn_create( host, &connect->sockaddr, request->connect_timeout, &netconn ))) { - heap_free( addressW ); + free( addressW ); release_host( host ); return ret; } @@ -1564,7 +1566,7 @@ static DWORD open_connection( struct request *request ) if ((ret = secure_proxy_connect( request ))) { request->netconn = NULL; - heap_free( addressW ); + free( addressW ); netconn_close( netconn ); return ret; } @@ -1578,7 +1580,7 @@ static DWORD open_connection( struct request *request ) &request->cred_handle, request->check_revocation ))) { request->netconn = NULL; - heap_free( addressW ); + free( addressW ); netconn_close( netconn ); return ret; } @@ -1597,7 +1599,7 @@ static DWORD open_connection( struct request *request ) if (netconn->secure && !(request->server_cert = netconn_get_certificate( netconn ))) { - heap_free( addressW ); + free( addressW ); netconn_close( netconn ); return ERROR_WINHTTP_SECURE_FAILURE; } @@ -1607,7 +1609,7 @@ done: request->read_chunked = FALSE; request->read_chunked_size = ~0u; request->read_chunked_eof = FALSE; - heap_free( addressW ); + free( addressW ); return ERROR_SUCCESS; } @@ -1635,10 +1637,10 @@ static DWORD add_host_header( struct request *request, DWORD modifier ) return process_header( request, L"Host", connect->hostname, modifier, TRUE ); } len = lstrlenW( connect->hostname ) + 7; /* sizeof(":65335") */ - if (!(host = heap_alloc( len * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; + if (!(host = malloc( len * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; swprintf( host, len, L"%s:%u", connect->hostname, port ); ret = process_header( request, L"Host", host, modifier, TRUE ); - heap_free( host ); + free( host ); return ret; } @@ -1950,11 +1952,11 @@ static DWORD str_to_wire( const WCHAR *src, int src_len, char *dst, enum escape_ if (src_len < 0) src_len = lstrlenW( src ); len = WideCharToMultiByte( CP_UTF8, 0, src, src_len, NULL, 0, NULL, NULL ); - if (!(utf8 = heap_alloc( len ))) return 0; + if (!(utf8 = malloc( len ))) return 0; WideCharToMultiByte( CP_UTF8, 0, src, -1, utf8, len, NULL, NULL ); len = escape_string( utf8, len, dst, flags ); - heap_free( utf8 ); + free( utf8 ); return len; } @@ -1992,14 +1994,14 @@ static char *build_wire_path( struct request *request, DWORD *ret_len ) if (path) *ret_len += str_to_wire( path, len_path, NULL, path_flags ); if (query) *ret_len += str_to_wire( query, len_query, NULL, query_flags ); - if ((ret = heap_alloc( *ret_len + 1 ))) + if ((ret = malloc( *ret_len + 1 ))) { len = str_to_wire( full_path, len - len_path - len_query, ret, 0 ); if (path) len += str_to_wire( path, len_path, ret + len, path_flags ); if (query) str_to_wire( query, len_query, ret + len, query_flags ); } - if (full_path != request->path) heap_free( full_path ); + if (full_path != request->path) free( full_path ); return ret; } @@ -2024,7 +2026,7 @@ static char *build_wire_request( struct request *request, DWORD *len ) } *len += 4; /* '\r\n\r\n' */ - if ((ret = ptr = heap_alloc( *len + 1 ))) + if ((ret = ptr = malloc( *len + 1 ))) { ptr += str_to_wire( request->verb, -1, ptr, 0 ); *ptr++ = ' '; @@ -2048,7 +2050,7 @@ static char *build_wire_request( struct request *request, DWORD *len ) memcpy( ptr, "\r\n\r\n", sizeof("\r\n\r\n") ); } - heap_free( path ); + free( path ); return ret; } @@ -2058,7 +2060,7 @@ static WCHAR *create_websocket_key(void) char buf[16]; DWORD base64_len = ((sizeof(buf) + 2) * 4) / 3; if (!RtlGenRandom( buf, sizeof(buf) )) return NULL; - if ((ret = heap_alloc( (base64_len + 1) * sizeof(WCHAR) ))) encode_base64( buf, sizeof(buf), ret ); + if ((ret = malloc( (base64_len + 1) * sizeof(WCHAR) ))) encode_base64( buf, sizeof(buf), ret ); return ret; } @@ -2067,7 +2069,7 @@ static DWORD add_websocket_key_header( struct request *request ) WCHAR *key = create_websocket_key(); if (!key) return ERROR_OUTOFMEMORY; process_header( request, L"Sec-WebSocket-Key", key, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE, TRUE ); - heap_free( key ); + free( key ); return ERROR_SUCCESS; } @@ -2139,7 +2141,7 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, NULL, 0 ); ret = netconn_send( request->netconn, wire_req, len, &bytes_sent ); - heap_free( wire_req ); + free( wire_req ); if (ret) goto end; if (optional_len) @@ -2174,8 +2176,8 @@ static void CALLBACK task_send_request( TP_CALLBACK_INSTANCE *instance, void *ct send_request( s->request, s->headers, s->headers_len, s->optional, s->optional_len, s->total_len, s->context, TRUE ); release_object( &s->request->hdr ); - heap_free( s->headers ); - heap_free( s ); + free( s->headers ); + free( s ); } /*********************************************************************** @@ -2208,7 +2210,7 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade { struct send_request *s; - if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; + if (!(s = malloc( sizeof(*s) ))) return FALSE; s->request = request; s->headers = strdupW( headers ); s->headers_len = headers_len; @@ -2221,8 +2223,8 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade if ((ret = queue_task( &request->queue, task_send_request, s ))) { release_object( &request->hdr ); - heap_free( s->headers ); - heap_free( s ); + free( s->headers ); + free( s ); } } else ret = send_request( request, headers, headers_len, optional, optional_len, total_len, context, FALSE ); @@ -2245,22 +2247,22 @@ static DWORD set_credentials( struct request *request, DWORD target, DWORD schem { case WINHTTP_AUTH_TARGET_SERVER: { - heap_free( request->creds[TARGET_SERVER][scheme].username ); + free( request->creds[TARGET_SERVER][scheme].username ); if (!username) request->creds[TARGET_SERVER][scheme].username = NULL; else if (!(request->creds[TARGET_SERVER][scheme].username = strdupW( username ))) return ERROR_OUTOFMEMORY; - heap_free( request->creds[TARGET_SERVER][scheme].password ); + free( request->creds[TARGET_SERVER][scheme].password ); if (!password) request->creds[TARGET_SERVER][scheme].password = NULL; else if (!(request->creds[TARGET_SERVER][scheme].password = strdupW( password ))) return ERROR_OUTOFMEMORY; break; } case WINHTTP_AUTH_TARGET_PROXY: { - heap_free( request->creds[TARGET_PROXY][scheme].username ); + free( request->creds[TARGET_PROXY][scheme].username ); if (!username) request->creds[TARGET_PROXY][scheme].username = NULL; else if (!(request->creds[TARGET_PROXY][scheme].username = strdupW( username ))) return ERROR_OUTOFMEMORY; - heap_free( request->creds[TARGET_PROXY][scheme].password ); + free( request->creds[TARGET_PROXY][scheme].password ); if (!password) request->creds[TARGET_PROXY][scheme].password = NULL; else if (!(request->creds[TARGET_PROXY][scheme].password = strdupW( password ))) return ERROR_OUTOFMEMORY; break; @@ -2443,26 +2445,26 @@ static DWORD read_reply( struct request *request ) WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE, FALSE ))) return ret; len = status_code - buffer; - if (!(versionW = heap_alloc( len * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; + if (!(versionW = malloc( len * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; MultiByteToWideChar( CP_ACP, 0, buffer, len - 1, versionW, len -1 ); versionW[len - 1] = 0; - heap_free( request->version ); + free( request->version ); request->version = versionW; len = buflen - (status_text - buffer); - if (!(status_textW = heap_alloc( len * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; + if (!(status_textW = malloc( len * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; MultiByteToWideChar( CP_ACP, 0, status_text, len, status_textW, len ); - heap_free( request->status_text ); + free( request->status_text ); request->status_text = status_textW; len = max( buflen + crlf_len, INITIAL_HEADER_BUFFER_LEN ); - if (!(raw_headers = heap_alloc( len * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; + if (!(raw_headers = malloc( len * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; MultiByteToWideChar( CP_ACP, 0, buffer, buflen, raw_headers, buflen ); memcpy( raw_headers + buflen - 1, L"\r\n", sizeof(L"\r\n") ); - heap_free( request->raw_headers ); + free( request->raw_headers ); request->raw_headers = raw_headers; offset = buflen + crlf_len - 1; @@ -2478,7 +2480,7 @@ static DWORD read_reply( struct request *request ) { WCHAR *tmp; len *= 2; - if (!(tmp = heap_realloc( raw_headers, len * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; + if (!(tmp = realloc( raw_headers, len * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; request->raw_headers = raw_headers = tmp; } if (!*buffer) @@ -2524,10 +2526,10 @@ static DWORD get_redirect_url( struct request *request, WCHAR **ret_url, DWORD * ret = query_headers( request, WINHTTP_QUERY_LOCATION, NULL, NULL, &size, NULL ); if (ret != ERROR_INSUFFICIENT_BUFFER) return ret; - if (!(url = heap_alloc( size ))) return ERROR_OUTOFMEMORY; + if (!(url = malloc( size ))) return ERROR_OUTOFMEMORY; if ((ret = query_headers( request, WINHTTP_QUERY_LOCATION, NULL, url, &size, NULL ))) { - heap_free( url ); + free( url ); return ret; } *ret_url = url; @@ -2557,7 +2559,7 @@ static DWORD handle_redirect( struct request *request, DWORD status ) ret = ERROR_OUTOFMEMORY; if (location[0] == '/') { - if (!(path = heap_alloc( (len_loc + 1) * sizeof(WCHAR) ))) goto end; + if (!(path = malloc( (len_loc + 1) * sizeof(WCHAR) ))) goto end; memcpy( path, location, len_loc * sizeof(WCHAR) ); path[len_loc] = 0; } @@ -2565,13 +2567,13 @@ static DWORD handle_redirect( struct request *request, DWORD status ) { if ((p = wcsrchr( request->path, '/' ))) *p = 0; len = lstrlenW( request->path ) + 1 + len_loc; - if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; + if (!(path = malloc( (len + 1) * sizeof(WCHAR) ))) goto end; lstrcpyW( path, request->path ); lstrcatW( path, L"/" ); memcpy( path + lstrlenW(path), location, len_loc * sizeof(WCHAR) ); path[len_loc] = 0; } - heap_free( request->path ); + free( request->path ); request->path = path; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, len_loc + 1 ); @@ -2597,7 +2599,7 @@ static DWORD handle_redirect( struct request *request, DWORD status ) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, len_loc + 1 ); len = uc.dwHostNameLength; - if (!(hostname = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if (!(hostname = malloc( (len + 1) * sizeof(WCHAR) ))) { ret = ERROR_OUTOFMEMORY; goto end; @@ -2608,7 +2610,7 @@ static DWORD handle_redirect( struct request *request, DWORD status ) port = uc.nPort ? uc.nPort : (uc.nScheme == INTERNET_SCHEME_HTTPS ? 443 : 80); if (wcsicmp( connect->hostname, hostname ) || connect->serverport != port) { - heap_free( connect->hostname ); + free( connect->hostname ); connect->hostname = hostname; connect->hostport = port; if (!set_server_for_hostname( connect, hostname, port )) @@ -2623,17 +2625,17 @@ static DWORD handle_redirect( struct request *request, DWORD status ) request->read_pos = request->read_size = 0; request->read_chunked = request->read_chunked_eof = FALSE; } - else heap_free( hostname ); + else free( hostname ); if ((ret = add_host_header( request, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; if ((ret = open_connection( request ))) goto end; - heap_free( request->path ); + free( request->path ); request->path = NULL; if (uc.dwUrlPathLength) { len = uc.dwUrlPathLength + uc.dwExtraInfoLength; - if (!(request->path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; + if (!(request->path = malloc( (len + 1) * sizeof(WCHAR) ))) goto end; memcpy( request->path, uc.lpszUrlPath, (len + 1) * sizeof(WCHAR) ); request->path[len] = 0; } @@ -2646,14 +2648,14 @@ static DWORD handle_redirect( struct request *request, DWORD status ) if (status != HTTP_STATUS_REDIRECT_KEEP_VERB && !wcscmp( request->verb, L"POST" )) { - heap_free( request->verb ); + free( request->verb ); request->verb = strdupW( L"GET" ); request->optional = NULL; request->optional_len = 0; } end: - heap_free( location ); + free( location ); return ret; } @@ -2764,7 +2766,7 @@ static void CALLBACK task_receive_response( TP_CALLBACK_INSTANCE *instance, void receive_response( r->request, TRUE ); release_object( &r->request->hdr ); - heap_free( r ); + free( r ); } /*********************************************************************** @@ -2793,14 +2795,14 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) { struct receive_response *r; - if (!(r = heap_alloc( sizeof(*r) ))) return FALSE; + if (!(r = malloc( sizeof(*r) ))) return FALSE; r->request = request; addref_object( &request->hdr ); if ((ret = queue_task( &request->queue, task_receive_response, r ))) { release_object( &request->hdr ); - heap_free( r ); + free( r ); } } else ret = receive_response( request, FALSE ); @@ -2851,7 +2853,7 @@ static void CALLBACK task_query_data_available( TP_CALLBACK_INSTANCE *instance, query_data_available( q->request, q->available, TRUE ); release_object( &q->request->hdr ); - heap_free( q ); + free( q ); } /*********************************************************************** @@ -2880,7 +2882,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) { struct query_data *q; - if (!(q = heap_alloc( sizeof(*q) ))) return FALSE; + if (!(q = malloc( sizeof(*q) ))) return FALSE; q->request = request; q->available = available; @@ -2888,7 +2890,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) if ((ret = queue_task( &request->queue, task_query_data_available, q ))) { release_object( &request->hdr ); - heap_free( q ); + free( q ); } } else ret = query_data_available( request, available, FALSE ); @@ -2906,7 +2908,7 @@ static void CALLBACK task_read_data( TP_CALLBACK_INSTANCE *instance, void *ctx, read_data( r->request, r->buffer, r->to_read, r->read, TRUE ); release_object( &r->request->hdr ); - heap_free( r ); + free( r ); } /*********************************************************************** @@ -2935,7 +2937,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L { struct read_data *r; - if (!(r = heap_alloc( sizeof(*r) ))) return FALSE; + if (!(r = malloc( sizeof(*r) ))) return FALSE; r->request = request; r->buffer = buffer; r->to_read = to_read; @@ -2945,7 +2947,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L if ((ret = queue_task( &request->queue, task_read_data, r ))) { release_object( &request->hdr ); - heap_free( r ); + free( r ); } } else ret = read_data( request, buffer, to_read, read, FALSE ); @@ -2985,7 +2987,7 @@ static void CALLBACK task_write_data( TP_CALLBACK_INSTANCE *instance, void *ctx, write_data( w->request, w->buffer, w->to_write, w->written, TRUE ); release_object( &w->request->hdr ); - heap_free( w ); + free( w ); } /*********************************************************************** @@ -3014,7 +3016,7 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write { struct write_data *w; - if (!(w = heap_alloc( sizeof(*w) ))) return FALSE; + if (!(w = malloc( sizeof(*w) ))) return FALSE; w->request = request; w->buffer = buffer; w->to_write = to_write; @@ -3024,7 +3026,7 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write if ((ret = queue_task( &request->queue, task_write_data, w ))) { release_object( &request->hdr ); - heap_free( w ); + free( w ); } } else ret = write_data( request, buffer, to_write, written, FALSE ); @@ -3051,7 +3053,7 @@ static void socket_destroy( struct object_header *hdr ) stop_queue( &socket->recv_q ); release_object( &socket->request->hdr ); - heap_free( socket ); + free( socket ); } static BOOL socket_set_option( struct object_header *hdr, DWORD option, void *buffer, DWORD buflen ) @@ -3087,7 +3089,7 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return NULL; } - if (!(socket = heap_alloc_zero( sizeof(struct socket) ))) + if (!(socket = calloc( 1, sizeof(*socket) ))) { release_object( &request->hdr ); return NULL; @@ -3234,7 +3236,7 @@ static void CALLBACK task_socket_send( TP_CALLBACK_INSTANCE *instance, void *ctx socket_send( s->socket, s->type, s->buf, s->len, TRUE ); release_object( &s->socket->hdr ); - heap_free( s ); + free( s ); } DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, void *buf, DWORD len ) @@ -3267,7 +3269,7 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ { struct socket_send *s; - if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; + if (!(s = malloc( sizeof(*s) ))) return FALSE; s->socket = socket; s->type = type; s->buf = buf; @@ -3277,7 +3279,7 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ if ((ret = queue_task( &socket->send_q, task_socket_send, s ))) { release_object( &socket->hdr ); - heap_free( s ); + free( s ); } } else ret = socket_send( socket, type, buf, len, FALSE ); @@ -3350,7 +3352,7 @@ static void CALLBACK task_socket_send_pong( TP_CALLBACK_INSTANCE *instance, void send_frame( s->socket->request->netconn, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE ); release_object( &s->socket->hdr ); - heap_free( s ); + free( s ); } static DWORD socket_send_pong( struct socket *socket ) @@ -3360,14 +3362,14 @@ static DWORD socket_send_pong( struct socket *socket ) struct socket_send *s; DWORD ret; - if (!(s = heap_alloc( sizeof(*s) ))) return ERROR_OUTOFMEMORY; + if (!(s = malloc( sizeof(*s) ))) return ERROR_OUTOFMEMORY; s->socket = socket; addref_object( &socket->hdr ); if ((ret = queue_task( &socket->send_q, task_socket_send_pong, s ))) { release_object( &socket->hdr ); - heap_free( s ); + free( s ); } return ret; } @@ -3484,7 +3486,7 @@ static void CALLBACK task_socket_receive( TP_CALLBACK_INSTANCE *instance, void * socket_receive( r->socket, r->buf, r->len, NULL, NULL, TRUE ); release_object( &r->socket->hdr ); - heap_free( r ); + free( r ); } DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, DWORD *ret_len, @@ -3513,7 +3515,7 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D { struct socket_receive *r; - if (!(r = heap_alloc( sizeof(*r) ))) return FALSE; + if (!(r = malloc( sizeof(*r) ))) return FALSE; r->socket = socket; r->buf = buf; r->len = len; @@ -3522,7 +3524,7 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D if ((ret = queue_task( &socket->recv_q, task_socket_receive, r ))) { release_object( &socket->hdr ); - heap_free( r ); + free( r ); } } else ret = socket_receive( socket, buf, len, ret_len, ret_type, FALSE ); @@ -3564,7 +3566,7 @@ static void CALLBACK task_socket_shutdown( TP_CALLBACK_INSTANCE *instance, void TRACE("running %p\n", work); release_object( &s->socket->hdr ); - heap_free( s ); + free( s ); } DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *reason, DWORD len ) @@ -3592,7 +3594,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r { struct socket_shutdown *s; - if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; + if (!(s = malloc( sizeof(*s) ))) return FALSE; s->socket = socket; s->status = status; memcpy( s->reason, reason, len ); @@ -3602,7 +3604,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r if ((ret = queue_task( &socket->send_q, task_socket_shutdown, s ))) { release_object( &socket->hdr ); - heap_free( s ); + free( s ); } } else ret = socket_shutdown( socket, status, reason, len, FALSE ); @@ -3666,7 +3668,7 @@ static void CALLBACK task_socket_close( TP_CALLBACK_INSTANCE *instance, void *ct TRACE("running %p\n", work); release_object( &s->socket->hdr ); - heap_free( s ); + free( s ); } DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reason, DWORD len ) @@ -3694,7 +3696,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas { struct socket_shutdown *s; - if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; + if (!(s = malloc( sizeof(*s) ))) return FALSE; s->socket = socket; s->status = status; memcpy( s->reason, reason, len ); @@ -3704,7 +3706,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas if ((ret = queue_task( &socket->recv_q, task_socket_close, s ))) { release_object( &socket->hdr ); - heap_free( s ); + free( s ); } } else ret = socket_close( socket, status, reason, len, FALSE ); @@ -3827,10 +3829,10 @@ static void free_request( struct winhttp_request *request ) CloseHandle( request->done ); CloseHandle( request->wait ); CloseHandle( request->cancel ); - heap_free( request->proxy.lpszProxy ); - heap_free( request->proxy.lpszProxyBypass ); - heap_free( request->buffer ); - heap_free( request->verb ); + free( request->proxy.lpszProxy ); + free( request->proxy.lpszProxyBypass ); + free( request->buffer ); + free( request->verb ); VariantClear( &request->data ); } @@ -3849,7 +3851,7 @@ static ULONG WINAPI winhttp_request_Release( LeaveCriticalSection( &request->cs ); request->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &request->cs ); - heap_free( request ); + free( request ); } return refs; } @@ -4074,16 +4076,16 @@ static HRESULT WINAPI winhttp_request_SetProxy( { case HTTPREQUEST_PROXYSETTING_DEFAULT: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; - heap_free( request->proxy.lpszProxy ); - heap_free( request->proxy.lpszProxyBypass ); + free( request->proxy.lpszProxy ); + free( request->proxy.lpszProxyBypass ); request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; break; case HTTPREQUEST_PROXYSETTING_DIRECT: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NO_PROXY; - heap_free( request->proxy.lpszProxy ); - heap_free( request->proxy.lpszProxyBypass ); + free( request->proxy.lpszProxy ); + free( request->proxy.lpszProxyBypass ); request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; break; @@ -4092,12 +4094,12 @@ static HRESULT WINAPI winhttp_request_SetProxy( request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; if (V_VT( &proxy_server ) == VT_BSTR) { - heap_free( request->proxy.lpszProxy ); + free( request->proxy.lpszProxy ); request->proxy.lpszProxy = strdupW( V_BSTR( &proxy_server ) ); } if (V_VT( &bypass_list ) == VT_BSTR) { - heap_free( request->proxy.lpszProxyBypass ); + free( request->proxy.lpszProxyBypass ); request->proxy.lpszProxyBypass = strdupW( V_BSTR( &bypass_list ) ); } break; @@ -4169,9 +4171,9 @@ static void reset_request( struct winhttp_request *request ) request->hrequest = NULL; WinHttpCloseHandle( request->hconnect ); request->hconnect = NULL; - heap_free( request->buffer ); + free( request->buffer ); request->buffer = NULL; - heap_free( request->verb ); + free( request->verb ); request->verb = NULL; request->offset = 0; request->bytes_available = 0; @@ -4184,9 +4186,9 @@ static void reset_request( struct winhttp_request *request ) request->send_timeout = 30000; request->receive_timeout = 30000; request->url_codepage = CP_UTF8; - heap_free( request->proxy.lpszProxy ); + free( request->proxy.lpszProxy ); request->proxy.lpszProxy = NULL; - heap_free( request->proxy.lpszProxyBypass ); + free( request->proxy.lpszProxyBypass ); request->proxy.lpszProxyBypass = NULL; VariantClear( &request->data ); request->state = REQUEST_STATE_INITIALIZED; @@ -4222,11 +4224,11 @@ static HRESULT WINAPI winhttp_request_Open( EnterCriticalSection( &request->cs ); reset_request( request ); - if (!(hostname = heap_alloc( (uc.dwHostNameLength + 1) * sizeof(WCHAR) ))) goto error; + if (!(hostname = malloc( (uc.dwHostNameLength + 1) * sizeof(WCHAR) ))) goto error; memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) ); hostname[uc.dwHostNameLength] = 0; - if (!(path = heap_alloc( (uc.dwUrlPathLength + uc.dwExtraInfoLength + 1) * sizeof(WCHAR) ))) goto error; + if (!(path = malloc( (uc.dwUrlPathLength + uc.dwExtraInfoLength + 1) * sizeof(WCHAR) ))) goto error; memcpy( path, uc.lpszUrlPath, (uc.dwUrlPathLength + uc.dwExtraInfoLength) * sizeof(WCHAR) ); path[uc.dwUrlPathLength + uc.dwExtraInfoLength] = 0; @@ -4270,17 +4272,17 @@ static HRESULT WINAPI winhttp_request_Open( request->state = REQUEST_STATE_OPEN; request->verb = verb; - heap_free( hostname ); - heap_free( path ); + free( hostname ); + free( path ); LeaveCriticalSection( &request->cs ); return S_OK; error: WinHttpCloseHandle( request->hconnect ); request->hconnect = NULL; - heap_free( hostname ); - heap_free( path ); - heap_free( verb ); + free( hostname ); + free( path ); + free( verb ); LeaveCriticalSection( &request->cs ); return HRESULT_FROM_WIN32( err ); } @@ -4311,7 +4313,7 @@ static HRESULT WINAPI winhttp_request_SetRequestHeader( } len = lstrlenW( header ) + 4; if (value) len += lstrlenW( value ); - if (!(str = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if (!(str = malloc( (len + 1) * sizeof(WCHAR) ))) { err = ERROR_OUTOFMEMORY; goto done; @@ -4322,7 +4324,7 @@ static HRESULT WINAPI winhttp_request_SetRequestHeader( { err = GetLastError(); } - heap_free( str ); + free( str ); done: LeaveCriticalSection( &request->cs ); @@ -4480,7 +4482,7 @@ static HRESULT request_receive( struct winhttp_request *request ) request->state = REQUEST_STATE_RESPONSE_RECEIVED; return S_OK; } - if (!(request->buffer = heap_alloc( buflen ))) return E_OUTOFMEMORY; + if (!(request->buffer = malloc( buflen ))) return E_OUTOFMEMORY; request->buffer[0] = 0; size = 0; do @@ -4498,7 +4500,7 @@ static HRESULT request_receive( struct winhttp_request *request ) { char *tmp; while (buflen < size) buflen *= 2; - if (!(tmp = heap_realloc( request->buffer, buflen ))) + if (!(tmp = realloc( request->buffer, buflen ))) { err = ERROR_OUTOFMEMORY; goto error; @@ -4520,7 +4522,7 @@ static HRESULT request_receive( struct winhttp_request *request ) return S_OK; error: - heap_free( request->buffer ); + free( request->buffer ); request->buffer = NULL; return HRESULT_FROM_WIN32( err ); } @@ -4584,7 +4586,7 @@ static HRESULT request_send( struct winhttp_request *request ) } } size = WideCharToMultiByte( cp, 0, str, len, NULL, 0, NULL, NULL ); - if (!(ptr = heap_alloc( size ))) return E_OUTOFMEMORY; + if (!(ptr = malloc( size ))) return E_OUTOFMEMORY; WideCharToMultiByte( cp, 0, str, len, ptr, size, NULL, NULL ); if (cp == CP_UTF8) request_set_utf8_content_type( request ); } @@ -4608,13 +4610,13 @@ static HRESULT request_send( struct winhttp_request *request ) } if ((err = wait_for_completion( request ))) goto error; if (sa) SafeArrayUnaccessData( sa ); - else heap_free( ptr ); + else free( ptr ); request->state = REQUEST_STATE_SENT; return S_OK; error: if (sa) SafeArrayUnaccessData( sa ); - else heap_free( ptr ); + else free( ptr ); return HRESULT_FROM_WIN32( err ); } @@ -4776,7 +4778,7 @@ static DWORD request_get_codepage( struct winhttp_request *request, UINT *codepa if (!WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_CONTENT_TYPE, NULL, NULL, &size, NULL ) && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { - if (!(buffer = heap_alloc( size ))) return ERROR_OUTOFMEMORY; + if (!(buffer = malloc( size ))) return ERROR_OUTOFMEMORY; if (!WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_CONTENT_TYPE, NULL, buffer, &size, NULL )) { return GetLastError(); @@ -4791,7 +4793,7 @@ static DWORD request_get_codepage( struct winhttp_request *request, UINT *codepa if (!wcsicmp( p, L"utf-8" )) *codepage = CP_UTF8; } } - heap_free( buffer ); + free( buffer ); } return ERROR_SUCCESS; } @@ -4920,8 +4922,8 @@ static ULONG WINAPI stream_Release( IStream *iface ) LONG refs = InterlockedDecrement( &stream->refs ); if (!refs) { - heap_free( stream->data ); - heap_free( stream ); + free( stream->data ); + free( stream ); } return refs; } @@ -5051,16 +5053,16 @@ static HRESULT WINAPI winhttp_request_get_ResponseStream( err = ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND; goto done; } - if (!(stream = heap_alloc( sizeof(*stream) ))) + if (!(stream = malloc( sizeof(*stream) ))) { err = ERROR_OUTOFMEMORY; goto done; } stream->IStream_iface.lpVtbl = &stream_vtbl; stream->refs = 1; - if (!(stream->data = heap_alloc( request->offset ))) + if (!(stream->data = malloc( request->offset ))) { - heap_free( stream ); + free( stream ); err = ERROR_OUTOFMEMORY; goto done; } @@ -5287,7 +5289,7 @@ HRESULT WinHttpRequest_create( void **obj ) TRACE("%p\n", obj); - if (!(request = heap_alloc_zero( sizeof(*request) ))) return E_OUTOFMEMORY; + if (!(request = calloc( 1, sizeof(*request) ))) return E_OUTOFMEMORY; request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; request->refs = 1; InitializeCriticalSection( &request->cs ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 005c35dea4c..dcea874306a 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -74,12 +74,12 @@ static void session_destroy( struct object_header *hdr ) session->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &session->cs ); - heap_free( session->agent ); - heap_free( session->proxy_server ); - heap_free( session->proxy_bypass ); - heap_free( session->proxy_username ); - heap_free( session->proxy_password ); - heap_free( session ); + free( session->agent ); + free( session->proxy_server ); + free( session->proxy_bypass ); + free( session->proxy_username ); + free( session->proxy_password ); + free( session ); } static BOOL session_query_option( struct object_header *hdr, DWORD option, void *buffer, DWORD *buflen ) @@ -239,7 +239,7 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST TRACE("%s, %u, %s, %s, 0x%08x\n", debugstr_w(agent), access, debugstr_w(proxy), debugstr_w(bypass), flags); - if (!(session = heap_alloc_zero( sizeof(struct session) ))) return NULL; + if (!(session = calloc( 1, sizeof(*session) ))) return NULL; session->hdr.type = WINHTTP_HANDLE_TYPE_SESSION; session->hdr.vtbl = &session_vtbl; @@ -299,11 +299,11 @@ static void connect_destroy( struct object_header *hdr ) release_object( &connect->session->hdr ); - heap_free( connect->hostname ); - heap_free( connect->servername ); - heap_free( connect->username ); - heap_free( connect->password ); - heap_free( connect ); + free( connect->hostname ); + free( connect->servername ); + free( connect->username ); + free( connect->password ); + free( connect ); } static BOOL connect_query_option( struct object_header *hdr, DWORD option, void *buffer, DWORD *buflen ) @@ -462,16 +462,14 @@ BOOL set_server_for_hostname( struct connect *connect, const WCHAR *server, INTE if (!connect->servername || wcsnicmp( connect->servername, session->proxy_server, colon - session->proxy_server - 1 )) { - heap_free( connect->servername ); + free( connect->servername ); connect->resolved = FALSE; - if (!(connect->servername = heap_alloc( - (colon - session->proxy_server + 1) * sizeof(WCHAR) ))) + if (!(connect->servername = malloc( (colon - session->proxy_server + 1) * sizeof(WCHAR) ))) { ret = FALSE; goto end; } - memcpy( connect->servername, session->proxy_server, - (colon - session->proxy_server) * sizeof(WCHAR) ); + memcpy( connect->servername, session->proxy_server, (colon - session->proxy_server) * sizeof(WCHAR) ); connect->servername[colon - session->proxy_server] = 0; if (*(colon + 1)) connect->serverport = wcstol( colon + 1, NULL, 10 ); @@ -481,10 +479,9 @@ BOOL set_server_for_hostname( struct connect *connect, const WCHAR *server, INTE } else { - if (!connect->servername || wcsicmp( connect->servername, - session->proxy_server )) + if (!connect->servername || wcsicmp( connect->servername, session->proxy_server )) { - heap_free( connect->servername ); + free( connect->servername ); connect->resolved = FALSE; if (!(connect->servername = strdupW( session->proxy_server ))) { @@ -497,7 +494,7 @@ BOOL set_server_for_hostname( struct connect *connect, const WCHAR *server, INTE } else if (server) { - heap_free( connect->servername ); + free( connect->servername ); connect->resolved = FALSE; if (!(connect->servername = strdupW( server ))) { @@ -537,7 +534,7 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return NULL; } - if (!(connect = heap_alloc_zero( sizeof(struct connect) ))) + if (!(connect = calloc( 1, sizeof(*connect) ))) { release_object( &session->hdr ); return NULL; @@ -588,27 +585,27 @@ static void request_destroy( struct object_header *hdr ) destroy_authinfo( request->authinfo ); destroy_authinfo( request->proxy_authinfo ); - heap_free( request->verb ); - heap_free( request->path ); - heap_free( request->version ); - heap_free( request->raw_headers ); - heap_free( request->status_text ); + free( request->verb ); + free( request->path ); + free( request->version ); + free( request->raw_headers ); + free( request->status_text ); for (i = 0; i < request->num_headers; i++) { - heap_free( request->headers[i].field ); - heap_free( request->headers[i].value ); + free( request->headers[i].field ); + free( request->headers[i].value ); } - heap_free( request->headers ); + free( request->headers ); for (i = 0; i < TARGET_MAX; i++) { for (j = 0; j < SCHEME_MAX; j++) { - heap_free( request->creds[i][j].username ); - heap_free( request->creds[i][j].password ); + free( request->creds[i][j].username ); + free( request->creds[i][j].password ); } } - heap_free( request ); + free( request ); } static void str_to_buffer( WCHAR *buffer, const WCHAR *str, LPDWORD buflen ) @@ -835,7 +832,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void static WCHAR *buffer_to_str( WCHAR *buffer, DWORD buflen ) { WCHAR *ret; - if ((ret = heap_alloc( (buflen + 1) * sizeof(WCHAR)))) + if ((ret = malloc( (buflen + 1) * sizeof(WCHAR)))) { memcpy( ret, buffer, buflen * sizeof(WCHAR) ); ret[buflen] = 0; @@ -950,7 +947,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b { struct connect *connect = request->connect; - heap_free( connect->username ); + free( connect->username ); if (!(connect->username = buffer_to_str( buffer, buflen ))) return FALSE; return TRUE; } @@ -958,7 +955,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b { struct connect *connect = request->connect; - heap_free( connect->password ); + free( connect->password ); if (!(connect->password = buffer_to_str( buffer, buflen ))) return FALSE; return TRUE; } @@ -966,7 +963,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b { struct session *session = request->connect->session; - heap_free( session->proxy_username ); + free( session->proxy_username ); if (!(session->proxy_username = buffer_to_str( buffer, buflen ))) return FALSE; return TRUE; } @@ -974,7 +971,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b { struct session *session = request->connect->session; - heap_free( session->proxy_password ); + free( session->proxy_password ); if (!(session->proxy_password = buffer_to_str( buffer, buflen ))) return FALSE; return TRUE; } @@ -1077,7 +1074,7 @@ static WCHAR *get_request_path( const WCHAR *object ) WCHAR *p, *ret; if (!object || object[0] != '/') len++; - if (!(p = ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL; + if (!(p = ret = malloc( (len + 1) * sizeof(WCHAR) ))) return NULL; if (!object || object[0] != '/') *p++ = '/'; if (object) lstrcpyW( p, object ); ret[len] = 0; @@ -1115,7 +1112,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return NULL; } - if (!(request = heap_alloc_zero( sizeof(struct request) ))) + if (!(request = calloc( 1, sizeof(*request) ))) { release_object( &connect->hdr ); return NULL; @@ -1306,16 +1303,16 @@ static IP_ADAPTER_ADDRESSES *get_adapters(void) GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME; IP_ADAPTER_ADDRESSES *tmp, *ret; - if (!(ret = heap_alloc( size ))) return NULL; + if (!(ret = malloc( size ))) return NULL; err = GetAdaptersAddresses( AF_UNSPEC, flags, NULL, ret, &size ); while (err == ERROR_BUFFER_OVERFLOW) { - if (!(tmp = heap_realloc( ret, size ))) break; + if (!(tmp = realloc( ret, size ))) break; ret = tmp; err = GetAdaptersAddresses( AF_UNSPEC, flags, NULL, ret, &size ); } if (err == ERROR_SUCCESS) return ret; - heap_free( ret ); + free( ret ); return NULL; } @@ -1345,12 +1342,12 @@ static WCHAR *detect_autoproxyconfig_url_dhcp(void) /* FIXME: also skip adapters where DHCP is disabled */ size = 256; - if (!(buf = heap_alloc( size ))) goto done; + if (!(buf = malloc( size ))) goto done; err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, buf, &size, NULL ); while (err == ERROR_MORE_DATA) { - if (!(tmp = heap_realloc( buf, size ))) goto done; + if (!(tmp = realloc( buf, size ))) goto done; buf = tmp; err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, buf, &size, NULL ); @@ -1358,7 +1355,7 @@ static WCHAR *detect_autoproxyconfig_url_dhcp(void) if (err == ERROR_SUCCESS && param.nBytesData) { int len = MultiByteToWideChar( CP_ACP, 0, (const char *)param.Data, param.nBytesData, NULL, 0 ); - if ((ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if ((ret = malloc( (len + 1) * sizeof(WCHAR) ))) { MultiByteToWideChar( CP_ACP, 0, (const char *)param.Data, param.nBytesData, ret, len ); ret[len] = 0; @@ -1369,8 +1366,8 @@ static WCHAR *detect_autoproxyconfig_url_dhcp(void) } done: - heap_free( buf ); - heap_free( adapters ); + free( buf ); + free( adapters ); return ret; } @@ -1381,10 +1378,10 @@ static char *get_computer_name( COMPUTER_NAME_FORMAT format ) GetComputerNameExA( format, NULL, &size ); if (GetLastError() != ERROR_MORE_DATA) return NULL; - if (!(ret = heap_alloc( size ))) return NULL; + if (!(ret = malloc( size ))) return NULL; if (!GetComputerNameExA( format, ret, &size )) { - heap_free( ret ); + free( ret ); return NULL; } return ret; @@ -1432,7 +1429,7 @@ static WCHAR *detect_autoproxyconfig_url_dns(void) if (!(fqdn = get_computer_name( ComputerNamePhysicalDnsFullyQualified ))) return NULL; if (!(domain = get_computer_name( ComputerNamePhysicalDnsDomain ))) { - heap_free( fqdn ); + free( fqdn ); return NULL; } p = fqdn; @@ -1442,10 +1439,10 @@ static WCHAR *detect_autoproxyconfig_url_dns(void) struct addrinfo *ai; int res; - if (!(name = heap_alloc( sizeof("wpad") + strlen(p) ))) + if (!(name = malloc( sizeof("wpad") + strlen(p) ))) { - heap_free( fqdn ); - heap_free( domain ); + free( fqdn ); + free( domain ); return NULL; } strcpy( name, "wpad" ); @@ -1458,15 +1455,15 @@ static WCHAR *detect_autoproxyconfig_url_dns(void) if (ret) { TRACE("returning %s\n", debugstr_w(ret)); - heap_free( name ); + free( name ); break; } } - heap_free( name ); + free( name ); p++; } - heap_free( domain ); - heap_free( fqdn ); + free( domain ); + free( fqdn ); return ret; } @@ -1547,7 +1544,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) if (!l && type == REG_BINARY && size >= sizeof(struct connection_settings_header) + 2 * sizeof(DWORD)) { - BYTE *buf = heap_alloc( size ); + BYTE *buf = malloc( size ); if (buf) { @@ -1605,7 +1602,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) } } } - heap_free( buf ); + free( buf ); } } RegCloseKey( key ); @@ -1673,7 +1670,7 @@ BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser( WINHTTP_CURRENT_USER_IE_PROXY ret = TRUE; goto done; } - if (!(hdr = heap_alloc( size ))) goto done; + if (!(hdr = malloc( size ))) goto done; if (RegQueryValueExW( hkey, L"DefaultConnectionSettings", NULL, &type, (BYTE *)hdr, &size ) || hdr->magic != WININET_SETTINGS_MAGIC) { @@ -1713,7 +1710,7 @@ BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser( WINHTTP_CURRENT_USER_IE_PROXY done: RegCloseKey( hkey ); - heap_free( hdr ); + free( hdr ); if (!ret) { GlobalFree( config->lpszAutoConfigUrl ); @@ -1777,7 +1774,7 @@ static char *download_script( const WCHAR *url, DWORD *out_size ) uc.dwHostNameLength = -1; uc.dwUrlPathLength = -1; if (!WinHttpCrackUrl( url, 0, 0, &uc )) return NULL; - if (!(hostname = heap_alloc( (uc.dwHostNameLength + 1) * sizeof(WCHAR) ))) return NULL; + if (!(hostname = malloc( (uc.dwHostNameLength + 1) * sizeof(WCHAR) ))) return NULL; memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) ); hostname[uc.dwHostNameLength] = 0; @@ -1792,7 +1789,7 @@ static char *download_script( const WCHAR *url, DWORD *out_size ) &size, NULL ) || status != HTTP_STATUS_OK) goto done; size = 4096; - if (!(buffer = heap_alloc( size ))) goto done; + if (!(buffer = malloc( size ))) goto done; to_read = size; offset = 0; for (;;) @@ -1806,7 +1803,7 @@ static char *download_script( const WCHAR *url, DWORD *out_size ) { to_read = size; size *= 2; - if (!(tmp = heap_realloc( buffer, size ))) goto done; + if (!(tmp = realloc( buffer, size ))) goto done; buffer = tmp; } } @@ -1815,7 +1812,7 @@ done: WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); - heap_free( hostname ); + free( hostname ); if (!buffer) SetLastError( ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT ); return buffer; } @@ -1846,7 +1843,7 @@ static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROX if (!(urlA = strdupWA( url ))) return FALSE; if (!(ret = InternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buffer ))) { - heap_free( urlA ); + free( urlA ); return FALSE; } @@ -1862,12 +1859,12 @@ static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROX hostnameA, strlen(hostnameA), &result, &len_result ))) { ret = parse_script_result( result, info ); - heap_free( result ); + free( result ); } - heap_free( hostnameA ); + free( hostnameA ); } - heap_free( urlA ); + free( urlA ); InternetDeInitializeAutoProxyDll( NULL, 0 ); return ret; } @@ -1918,7 +1915,7 @@ BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTO if ((script = download_script( pac_url, &size ))) { ret = run_script( script, size, url, info ); - heap_free( script ); + free( script ); } done: @@ -1990,8 +1987,7 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) if (info->lpszProxyBypass) size += lstrlenW( info->lpszProxyBypass ); } - buf = heap_alloc( size ); - if (buf) + if ((buf = malloc( size ))) { struct connection_settings_header *hdr = (struct connection_settings_header *)buf; @@ -2028,7 +2024,7 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) l = RegSetValueExW( key, L"WinHttpSettings", 0, REG_BINARY, buf, size ); if (!l) ret = TRUE; - heap_free( buf ); + free( buf ); } RegCloseKey( key ); } diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 3e248bca9f7..0d9dfb76de6 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -65,7 +65,7 @@ static WCHAR *decode_url( LPCWSTR url, DWORD *len ) const WCHAR *p = url; WCHAR hex[3], *q, *ret; - if (!(ret = heap_alloc( *len * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( *len * sizeof(WCHAR) ))) return NULL; q = ret; while (*len > 0) { @@ -144,7 +144,7 @@ static DWORD escape_url( const WCHAR *url, DWORD *len, WCHAR **ret ) len_path = 0; } - if (!(*ret = heap_alloc( (len_base + len_path + 1) * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; + if (!(*ret = malloc( (len_base + len_path + 1) * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; memcpy( *ret, url, len_base * sizeof(WCHAR) ); if (p) escape_string( p, *len - (p - url), *ret + len_base, &len_path ); @@ -331,8 +331,8 @@ exit: if (overflow) err = ERROR_INSUFFICIENT_BUFFER; uc->nScheme = scheme_number; } - heap_free( url_decoded ); - heap_free( url_escaped ); + free( url_decoded ); + free( url_escaped ); SetLastError( err ); return !err; } diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index e279e58a5fe..069951d4811 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -19,13 +19,12 @@ #ifndef _WINE_WINHTTP_PRIVATE_H_ #define _WINE_WINHTTP_PRIVATE_H_ -#include "wine/heap.h" -#include "wine/list.h" - #include "ole2.h" #include "sspi.h" #include "wincrypt.h" +#include "wine/list.h" + #define WINHTTP_HANDLE_TYPE_SOCKET 4 struct object_header; @@ -347,17 +346,12 @@ DWORD process_header( struct request *, const WCHAR *, const WCHAR *, DWORD, BOO extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; void release_typelib( void ) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero( LPVOID mem, SIZE_T size ) -{ - return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size ); -} - static inline WCHAR *strdupW( const WCHAR *src ) { WCHAR *dst; if (!src) return NULL; - dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ); + dst = malloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ); if (dst) lstrcpyW( dst, src ); return dst; } @@ -368,7 +362,7 @@ static inline WCHAR *strdupAW( const char *src ) if (src) { int len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); - if ((dst = heap_alloc( len * sizeof(WCHAR) ))) + if ((dst = malloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); } return dst; @@ -380,7 +374,7 @@ static inline char *strdupWA( const WCHAR *src ) if (src) { int len = WideCharToMultiByte( CP_ACP, 0, src, -1, NULL, 0, NULL, NULL ); - if ((dst = heap_alloc( len ))) + if ((dst = malloc( len ))) WideCharToMultiByte( CP_ACP, 0, src, -1, dst, len, NULL, NULL ); } return dst; @@ -392,7 +386,7 @@ static inline char *strdupWA_sized( const WCHAR *src, DWORD size ) if (src) { int len = WideCharToMultiByte( CP_ACP, 0, src, size, NULL, 0, NULL, NULL ) + 1; - if ((dst = heap_alloc( len ))) + if ((dst = malloc( len ))) { WideCharToMultiByte( CP_ACP, 0, src, size, dst, len, NULL, NULL ); dst[len - 1] = 0; -- 2.30.2

1 0

[PATCH 1/3] winhttp: Fix a buffer size check.
by Hans Leidekker 08 Jun '21

08 Jun '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index f052c3c569c..1bdf39bca20 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -992,7 +992,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b CertFreeCertificateContext( request->client_cert ); request->client_cert = NULL; } - else if (buflen >= sizeof(cert)) + else if (buflen >= sizeof(*cert)) { if (!(cert = CertDuplicateCertificateContext( buffer ))) return FALSE; CertFreeCertificateContext( request->client_cert ); -- 2.30.2

1 0

[PATCH] regedit: Allow deletion of selected values without focus
by Hugh McMaster 08 Jun '21

08 Jun '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/framewnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 14f4d711ec1..bb843a89af4 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -178,7 +178,7 @@ static void UpdateMenuItems(HMENU hMenu) { selection = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); keyName = GetItemPath(hwndTV, selection, &hRootKey); index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, - MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); + MAKELPARAM(LVNI_SELECTED, 0)); update_expand_or_collapse_item(hwndTV, selection, hMenu); update_modify_items(hMenu, index); -- 2.32.0

1 0

[PATCH] make_unicode: Add support for the 720 codepage (Arabic, Farsi and Urdu).
by Francois Gouget 08 Jun '21

08 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes user32:clipboard when run on the TestBot in the ar_MA.UTF-8 locale (and hopefully many other tests). https://test.winehq.org/data/patterns.html#user32:clipboard I also checked the LOCALE_IDEFAULTCODEPAGE values in dlls/kernel32/nls/*.nls against the nls/c_*.nls files and there does not seem to be other missing codepages. This requires running make_unicode (obviously) which updates dlls/kernelbase/kernelbase.rgs and nls/sortdefault.nls so I did not include those. --- tools/make_unicode | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/make_unicode b/tools/make_unicode index 1e0dbe419e1..8ece72926c2 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -46,6 +46,7 @@ my @allfiles = "CodpageFiles/437.txt", "CodpageFiles/500.txt", "CodpageFiles/708.txt", + "CodpageFiles/720.txt", "CodpageFiles/737.txt", "CodpageFiles/775.txt", "CodpageFiles/850.txt", -- 2.20.1

1 0

[v6 PATCH] mf/session: Fix computing fastest and slowest presentation rates.
by Nikolay Sivov 08 Jun '21

08 Jun '21

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v6: only set return value on success dlls/mf/session.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 41caf02d059..9f233295773 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -18,6 +18,7 @@ #include <stdarg.h> #include <math.h> +#include <float.h> #define COBJMACROS @@ -3536,8 +3537,9 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA struct media_source *source; struct media_sink *sink; HRESULT hr = E_POINTER; + float rate; - *result = 0.0f; + rate = fastest ? FLT_MAX : 0.0f; EnterCriticalSection(&session->cs); @@ -3545,7 +3547,7 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA { LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) { - if (FAILED(hr = session_presentation_object_get_rate((IUnknown *)source->source, direction, thin, fastest, result))) + if (FAILED(hr = session_presentation_object_get_rate((IUnknown *)source->source, direction, thin, fastest, &rate))) break; } @@ -3553,7 +3555,7 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA { LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) { - if (FAILED(hr = session_presentation_object_get_rate((IUnknown *)sink->sink, direction, thin, fastest, result))) + if (FAILED(hr = session_presentation_object_get_rate((IUnknown *)sink->sink, direction, thin, fastest, &rate))) break; } } @@ -3561,6 +3563,9 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA LeaveCriticalSection(&session->cs); + if (SUCCEEDED(hr)) + *result = direction == MFRATE_FORWARD ? rate : -rate; + return hr; } -- 2.30.2

1 0

[PATCH] user32/tests: Use winetest contexts to simplify set_clipboard_data_process().
by Francois Gouget 08 Jun '21

08 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/user32/tests/clipboard.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 4b95675770b..5071008a0ab 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -151,24 +151,26 @@ static void set_clipboard_data_process( int arg ) { HANDLE ret; + winetest_push_context("process %u", arg); SetLastError( 0xdeadbeef ); if (arg) { - ok( IsClipboardFormatAvailable( CF_WAVE ), "process %u: CF_WAVE not available\n", arg ); + ok( IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE not available\n" ); ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); - ok( ret != 0, "process %u: SetClipboardData failed err %u\n", arg, GetLastError() ); + ok( ret != 0, "SetClipboardData failed err %u\n", GetLastError() ); } else { SetClipboardData( CF_WAVE, 0 ); - ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "process %u: wrong error %u\n", - arg, GetLastError()); - ok( !IsClipboardFormatAvailable( CF_WAVE ), "process %u: SetClipboardData succeeded\n", arg ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", + GetLastError()); + ok( !IsClipboardFormatAvailable( CF_WAVE ), "SetClipboardData succeeded\n" ); ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); - ok( !ret, "process %u: SetClipboardData succeeded\n", arg ); - ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "process %u: wrong error %u\n", - arg, GetLastError()); + ok( !ret, "SetClipboardData succeeded\n" ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", + GetLastError()); } + winetest_pop_context(); } static void grab_clipboard_process( int arg ) -- 2.20.1

1 0

[RFC] A Light Blue theme.
by Zhiyi Zhang 08 Jun '21

08 Jun '21

Hi all, I've been working on theming support for Wine for awhile now. Part of the work is to create a .msstyles file so that UI controls can look better instead of that Win95 look. Now I think it has reached a point where it's good enough for you to try it. The Light Blue theme contains two visual styles. One is Classic Blue and the other is Blue. Classic Blue is a visual style that changes only the system colors and doesn't contain any bitmaps for UI controls. So it still uses the unthemed rendering code path. Blue is a visual style that contains bitmaps for UI controls so it no longer has that Win95-ish look. To install the theme, download light.msstyles from the attachments and install it via winecfg. The patches are on top of Wine 6.10 aadcff4. Theming support for Wine still need more fixes. So even with this theme file, some controls may still render poorly/incorrectly. Below is a non-exhaustive list of the theming problems I know of. Some of them are HiDPI issues, some are because of themed rendering is not implemented. Let me know if you encounter any other issues or have suggestions, specifically, regarding the theme file light.msstyles. Enjoy! Zhiyi Known theme issues: 1. Themed explorer support is not implemented, so startmenu, taskbar, titlbar are not themed. 2. Nonclient area theming support is not implemented. 3. Taskdialog theming support is not implemented 4. Unthemed system metrics are not restored after disabling theme, e.g., IconTitleFont after disabling theme 5. Comctl32 v6 should be loaded in some cases even if there is no comctl32 v6 manifest in applications. 6. Winecfg should close current theme before copying a new theme because the name may be the same. 7. When using comctl32 v5, scrollbars and dialogs should not be themed. 8. Trackbar has wrong background color when themed. 9. In Winecfg desktop integration tab, the postion of size updown buttons change after theme changes. 10. Spy++ toolbar icons has dots and black artifacts 11. Changing theme in winecfg doesn't affect windows in other processes in runtime 12. Application title bar is inactive on launch when not using window manager decoration 13. Combox button doesn't stay pressed after clicking and moving mouse the the dropdown menu 14. Select toolbar in controlspy, resize control spy to a larger size. scrollbar doesn't get repaint 15. Treeview in controlspy, expanded Planets still has old background 16. Trackbar adding style TBS_BOTH doesn't repaint on Wine, repaints on Windows 17. Stutter when moving the thumb of trackbar, even if no theme is active 18. EDIT_WM_Paint() should use themed paint. 19. Buttons and edits in dialogs are not themed 20. Tooltip ballon shape is incorrect 21. Theme may not be updated on wineprefix upgrade. Known HiDPI issues: 1. Status Bar in control spy v6 when HiDPI is on, the purple triangle doesn't get enough space 2. Syslink no address is showed, DPI 192 3. Command links no text on HiDPI 4. In file selection dialog folder name size is not the same when showed in preview and in selected mode

1 0

[PATCH 1/7] hidclass.sys: Fix incorrect feature report debug print.
by Rémi Bernon 08 Jun '21

08 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/descriptor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 9364400275a..1c988d89719 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -248,7 +248,7 @@ static void debug_print_preparsed(WINE_HIDP_PREPARSED_DATA *data) debug_print_report("OUTPUT", data, &data->reports[i]); } end += data->reportCount[HidP_Feature]; - for (i = 0; i < end; i++) + for (; i < end; i++) { debug_print_report("FEATURE", data, &data->reports[i]); } -- 2.31.0

2 9

[PATCH v3 1/6] riched20/tests: Lock hGlobal before use.
by Jactry Zeng 08 Jun '21

08 Jun '21

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- Superseded patch 206432 to 206436. --- dlls/riched20/tests/richole.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index c2457ae5146..a76f9fdaf2e 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3252,7 +3252,7 @@ static void test_InsertObject(void) REOBJECT reo1, reo2, reo3, received_reo; HRESULT hr; HWND hwnd; - const WCHAR *expected_string; + const WCHAR *expected_string, *string; const CHAR *expected_stringA; ITextSelection *selection; IDataObject *dataobject; @@ -3465,8 +3465,10 @@ static void test_InsertObject(void) formatetc.lindex = -1; hr = IDataObject_GetData(dataobject, &formatetc, &stgmedium); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(lstrlenW(stgmedium.hGlobal) == lstrlenW(expected_string), "Got wrong length: %d.\n", result); - todo_wine ok(!lstrcmpW(stgmedium.hGlobal, expected_string), "Got wrong content: %s.\n", debugstr_w(stgmedium.hGlobal)); + string = GlobalLock(stgmedium.hGlobal); + ok(lstrlenW(string) == lstrlenW(expected_string), "Got wrong length: %d.\n", lstrlenW(string)); + todo_wine ok(!lstrcmpW(string, expected_string), "Got wrong content: %s.\n", debugstr_w(string)); + GlobalUnlock(stgmedium.hGlobal); expected_string = L"abc\xfffc""d\xfffc""efg"; gettextex.cb = sizeof(buffer); -- 2.30.2

2 11

[PATCH 1/6] ws2_32/tests: Test passing an output buffer to FIONBIO.
by Zebediah Figura 08 Jun '21

08 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e99faa4096b..26ad716dbe3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3899,6 +3899,7 @@ static void test_fionbio(void) u_long one = 1, zero = 0; HANDLE port, event; ULONG_PTR key; + void *output; DWORD size; SOCKET s; int ret; @@ -3931,6 +3932,11 @@ static void test_fionbio(void) ret = WSAIoctl(s, FIONBIO, &one, sizeof(one) + 1, NULL, 0, &size, NULL, NULL); ok(!ret, "got error %u\n", WSAGetLastError()); + output = VirtualAlloc(NULL, 4, MEM_RESERVE | MEM_COMMIT, PAGE_NOACCESS); + ret = WSAIoctl(s, FIONBIO, &one, sizeof(one) + 1, output, 4, &size, NULL, NULL); + todo_wine ok(!ret, "got error %u\n", WSAGetLastError()); + VirtualFree(output, 0, MEM_FREE); + overlapped.Internal = 0xdeadbeef; overlapped.InternalHigh = 0xdeadbeef; size = 0xdeadbeef; -- 2.32.0

2 6

[PATCH v4] dpnet: Implement IDirectPlay8Server EnumServiceProviders
by Alistair Leslie-Hughes 07 Jun '21

07 Jun '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/server.c | 14 ++++++- dlls/dpnet/tests/server.c | 86 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index 977771697ac..26dd76388b1 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -126,9 +126,19 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_EnumServiceProviders(IDirectPlay8Se PDWORD pcReturned, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%s %s %p %p %p %d)\n", This, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), + TRACE("(%p)->(%s %s %p %p %p %d)\n", This, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags); - return E_NOTIMPL; + + if(!This->msghandler) + return DPNERR_UNINITIALIZED; + + if(dwFlags) + FIXME("Unhandled flags %x\n", dwFlags); + + if(pguidApplication) + FIXME("Application guid %s is currently being ignored\n", debugstr_guid(pguidApplication)); + + return enum_services_providers(pguidServiceProvider, pSPInfoBuffer, pcbEnumData, pcReturned); } static HRESULT WINAPI IDirectPlay8ServerImpl_CancelAsyncOperation(IDirectPlay8Server *iface, DPNHANDLE hAsyncHandle, DWORD dwFlags) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 74a0e5adfcf..4314c69ccc1 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -184,6 +184,91 @@ static void test_server_info(void) } } +static void test_enum_service_providers(void) +{ + DPN_SERVICE_PROVIDER_INFO *serv_prov_info = NULL; + IDirectPlay8Server *server = NULL; + DWORD items, size; + DWORD i; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_DirectPlay8Server, NULL, CLSCTX_ALL, &IID_IDirectPlay8Server, (LPVOID*)&server); + ok(hr == S_OK, "Failed to create IDirectPlay8Server object\n"); + if (FAILED(hr)) + return; + + size = 0; + items = 0; + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, serv_prov_info, &size, &items, 0); + ok(hr == DPNERR_UNINITIALIZED, "got %x\n", hr); + + hr = IDirectPlay8Server_Initialize(server, NULL, DirectPlayMessageHandler, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (FAILED(hr)) + { + IDirectPlay8Server_Release(server); + return; + } + + size = 0; + items = 0; + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, NULL, &size, NULL, 0); + ok(hr == E_POINTER, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, NULL, NULL, &items, 0); + ok(hr == E_POINTER, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, NULL, &size, &items, 0); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, serv_prov_info, &size, &items, 0); + ok(hr == S_OK, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(items != 0, "Found unexpectedly no service providers\n"); + + trace("number of items found: %d\n", items); + + for (i=0;i<items;i++) + { + trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); + } + + ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + + size = 0; + items = 0; + + hr = IDirectPlay8Server_EnumServiceProviders(server, &CLSID_DP8SP_TCPIP, NULL, NULL, &size, &items, 0); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Server_EnumServiceProviders(server, &CLSID_DP8SP_TCPIP, NULL, serv_prov_info, &size, &items, 0); + ok(hr == S_OK, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(items != 0, "Found unexpectedly no adapter\n"); + + + for (i=0;i<items;i++) + { + trace("Found adapter: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); + } + + /* Invalid GUID */ + items = 88; + hr = IDirectPlay8Server_EnumServiceProviders(server, &appguid, NULL, serv_prov_info, &size, &items, 0); + ok(hr == DPNERR_DOESNOTEXIST, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(items == 88, "Found adapter %d\n", items); + + HeapFree(GetProcessHeap(), 0, serv_prov_info); + IDirectPlay8Server_Release(server); +} + BOOL is_process_elevated(void) { HANDLE token; @@ -398,6 +483,7 @@ START_TEST(server) create_server(); test_server_info(); + test_enum_service_providers(); CoUninitialize(); -- 2.30.2

1 0

[PATCH v3] dpnet: Implement IDirectPlay8Server EnumServiceProviders
by Alistair Leslie-Hughes 07 Jun '21

07 Jun '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/server.c | 14 ++++++- dlls/dpnet/tests/server.c | 86 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index 977771697ac..26dd76388b1 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -126,9 +126,19 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_EnumServiceProviders(IDirectPlay8Se PDWORD pcReturned, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%s %s %p %p %p %d)\n", This, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), + TRACE("(%p)->(%s %s %p %p %p %d)\n", This, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags); - return E_NOTIMPL; + + if(!This->msghandler) + return DPNERR_UNINITIALIZED; + + if(dwFlags) + FIXME("Unhandled flags %x\n", dwFlags); + + if(pguidApplication) + FIXME("Application guid %s is currently being ignored\n", debugstr_guid(pguidApplication)); + + return enum_services_providers(pguidServiceProvider, pSPInfoBuffer, pcbEnumData, pcReturned); } static HRESULT WINAPI IDirectPlay8ServerImpl_CancelAsyncOperation(IDirectPlay8Server *iface, DPNHANDLE hAsyncHandle, DWORD dwFlags) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 74a0e5adfcf..ae7e876522d 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -184,6 +184,91 @@ static void test_server_info(void) } } +static void test_enum_service_providers(void) +{ + DPN_SERVICE_PROVIDER_INFO *serv_prov_info; + IDirectPlay8Server *server = NULL; + DWORD items, size; + DWORD i; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_DirectPlay8Server, NULL, CLSCTX_ALL, &IID_IDirectPlay8Server, (LPVOID*)&server); + ok(hr == S_OK, "Failed to create IDirectPlay8Server object\n"); + if (FAILED(hr)) + return; + + size = 0; + items = 0; + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, serv_prov_info, &size, &items, 0); + ok(hr == DPNERR_UNINITIALIZED, "got %x\n", hr); + + hr = IDirectPlay8Server_Initialize(server, NULL, DirectPlayMessageHandler, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (FAILED(hr)) + { + IDirectPlay8Server_Release(server); + return; + } + + size = 0; + items = 0; + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, NULL, &size, NULL, 0); + ok(hr == E_POINTER, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, NULL, NULL, &items, 0); + ok(hr == E_POINTER, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, NULL, &size, &items, 0); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, serv_prov_info, &size, &items, 0); + ok(hr == S_OK, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(items != 0, "Found unexpectedly no service providers\n"); + + trace("number of items found: %d\n", items); + + for (i=0;i<items;i++) + { + trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); + } + + ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + + size = 0; + items = 0; + + hr = IDirectPlay8Server_EnumServiceProviders(server, &CLSID_DP8SP_TCPIP, NULL, NULL, &size, &items, 0); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Server_EnumServiceProviders(server, &CLSID_DP8SP_TCPIP, NULL, serv_prov_info, &size, &items, 0); + ok(hr == S_OK, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(items != 0, "Found unexpectedly no adapter\n"); + + + for (i=0;i<items;i++) + { + trace("Found adapter: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); + } + + /* Invalid GUID */ + items = 88; + hr = IDirectPlay8Server_EnumServiceProviders(server, &appguid, NULL, serv_prov_info, &size, &items, 0); + ok(hr == DPNERR_DOESNOTEXIST, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(items == 88, "Found adapter %d\n", items); + + HeapFree(GetProcessHeap(), 0, serv_prov_info); + IDirectPlay8Server_Release(server); +} + BOOL is_process_elevated(void) { HANDLE token; @@ -398,6 +483,7 @@ START_TEST(server) create_server(); test_server_info(); + test_enum_service_providers(); CoUninitialize(); -- 2.30.2

2 1

[PATCH 1/5] xinput1_3: Use msvcrt allocation functions.
by Rémi Bernon 07 Jun '21

07 Jun '21

And handle allocation failures. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/xinput1_3/hid.c | 46 +++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 8aea638a8d7..20b1ccdafd5 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -21,6 +21,7 @@ #include <assert.h> #include <stdarg.h> #include <string.h> +#include <stdlib.h> #include "wine/debug.h" #include "windef.h" @@ -98,7 +99,7 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA ppd, XINPUT_CAPABILITIES *xinput_ memset(xinput_caps, 0, sizeof(XINPUT_CAPABILITIES)); button_caps_count = caps->NumberInputButtonCaps; - button_caps = HeapAlloc(GetProcessHeap(), 0, sizeof(*button_caps) * button_caps_count); + if (!(button_caps = malloc(sizeof(*button_caps) * button_caps_count))) return FALSE; HidP_GetButtonCaps(HidP_Input, button_caps, &button_caps_count, ppd); for (i = 0; i < button_caps_count; i++) { @@ -109,13 +110,13 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA ppd, XINPUT_CAPABILITIES *xinput_ else button_count = max(button_count, button_caps[i].NotRange.Usage); } - HeapFree(GetProcessHeap(), 0, button_caps); + free(button_caps); if (button_count < 11) WARN("Too few buttons, continuing anyway\n"); xinput_caps->Gamepad.wButtons = 0xffff; value_caps_count = caps->NumberInputValueCaps; - value_caps = HeapAlloc(GetProcessHeap(), 0, sizeof(*value_caps) * value_caps_count); + if (!(value_caps = malloc(sizeof(*value_caps) * value_caps_count))) return FALSE; HidP_GetValueCaps(HidP_Input, value_caps, &value_caps_count, ppd); for (i = 0; i < value_caps_count; i++) { @@ -130,7 +131,7 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA ppd, XINPUT_CAPABILITIES *xinput_ else MarkUsage(private, value_caps[i].NotRange.Usage, value_caps[i].LogicalMin, value_caps[i].LogicalMax, value_caps[i].BitSize); } - HeapFree(GetProcessHeap(), 0, value_caps); + free(value_caps); if (private->ltrigger.bits) xinput_caps->Gamepad.bLeftTrigger = (1u << (sizeof(xinput_caps->Gamepad.bLeftTrigger) + 1)) - 1; @@ -174,13 +175,10 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA ppd, XINPUT_CAPABILITIES *xinput_ static BOOL init_controller(xinput_controller *controller, PHIDP_PREPARSED_DATA ppd, HIDP_CAPS *caps, HANDLE device, WCHAR *device_path) { size_t size; - struct hid_platform_private *private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct hid_platform_private)); + struct hid_platform_private *private; - if (!VerifyGamepad(ppd, &controller->caps, private, caps)) - { - HeapFree(GetProcessHeap(), 0, private); - return FALSE; - } + if (!(private = calloc(1, sizeof(struct hid_platform_private)))) return FALSE; + if (!VerifyGamepad(ppd, &controller->caps, private, caps)) goto failed; TRACE("Found gamepad %s\n", debugstr_w(device_path)); @@ -188,10 +186,10 @@ static BOOL init_controller(xinput_controller *controller, PHIDP_PREPARSED_DATA private->device = device; private->report_length = caps->InputReportByteLength + 1; private->current_report = 0; - private->reports[0] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); - private->reports[1] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); + if (!(private->reports[0] = calloc(1, private->report_length))) goto failed; + if (!(private->reports[1] = calloc(1, private->report_length))) goto failed; size = (lstrlenW(device_path) + 1) * sizeof(WCHAR); - private->device_path = HeapAlloc(GetProcessHeap(), 0, size); + if (!(private->device_path = malloc(size))) goto failed; memcpy(private->device_path, device_path, size); private->enabled = TRUE; @@ -199,8 +197,14 @@ static BOOL init_controller(xinput_controller *controller, PHIDP_PREPARSED_DATA memset(&controller->vibration, 0, sizeof(controller->vibration)); controller->platform_private = private; - return TRUE; + +failed: + free(private->device_path); + free(private->reports[0]); + free(private->reports[1]); + free(private); + return FALSE; } void HID_find_gamepads(xinput_controller *devices) @@ -233,7 +237,7 @@ void HID_find_gamepads(xinput_controller *devices) device_info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); - data = HeapAlloc(GetProcessHeap(), 0 , sizeof(*data) + detail_size); + if (!(data = malloc(sizeof(*data) + detail_size))) goto done; data->cbSize = sizeof(*data); ZeroMemory(&interface_data, sizeof(interface_data)); @@ -291,7 +295,9 @@ void HID_find_gamepads(xinput_controller *devices) HidD_FreePreparsedData(ppd); } } - HeapFree(GetProcessHeap(), 0, data); + +done: + free(data); SetupDiDestroyDeviceInfoList(device_info_set); LeaveCriticalSection(&xinput_crit); } @@ -307,11 +313,11 @@ static void remove_gamepad(xinput_controller *device) device->platform_private = NULL; CloseHandle(private->device); - HeapFree(GetProcessHeap(), 0, private->reports[0]); - HeapFree(GetProcessHeap(), 0, private->reports[1]); - HeapFree(GetProcessHeap(), 0, private->device_path); + free(private->reports[0]); + free(private->reports[1]); + free(private->device_path); HidD_FreePreparsedData(private->ppd); - HeapFree(GetProcessHeap(), 0, private); + free(private); } LeaveCriticalSection(&device->crit); -- 2.31.0

1 4

[v3 PATCH 1/2] mfplat: Fix max buffer length for IMC2/IMC4 formats.
by Nikolay Sivov 07 Jun '21

07 Jun '21

From: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v3: split patches dlls/mfplat/buffer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index e04cc1a9251..df11c8fd408 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1315,6 +1315,8 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo plane_size *= 2; break; case MAKEFOURCC('N','V','1','2'): + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','4'): max_length = pitch * height * 3 / 2; break; default: -- 2.30.2

2 2

[PATCH v2] mfplat: Copy all image planes in buffer copies.
by Derek Lesho 07 Jun '21

07 Jun '21

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v2: - Apply Nikolay's diff in order to remove the need for images to have an associated fourcc. - Fix buffer overflow. (IMC2 and IMC4's buffer->max_length needed to be expanded as NV12's is). --- dlls/mfplat/buffer.c | 59 ++++++++++++++++++++++++++++++++++---- dlls/mfplat/tests/mfplat.c | 42 ++++++++++++++++++++++++++- 2 files changed, 94 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index e04cc1a9251..adb53c7dfe7 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); #define ALIGN_SIZE(size, alignment) (((size) + (alignment)) & ~((alignment))) +typedef void (*p_copy_image_func)(BYTE *dest, LONG dest_stride, const BYTE *src, LONG src_stride, DWORD width, DWORD lines); + struct buffer { IMFMediaBuffer IMFMediaBuffer_iface; @@ -53,8 +55,8 @@ struct buffer unsigned int width; unsigned int height; int pitch; - unsigned int locks; + p_copy_image_func copy_image; } _2d; struct { @@ -73,6 +75,35 @@ struct buffer CRITICAL_SECTION cs; }; +static void copy_image(const struct buffer *buffer, BYTE *dest, LONG dest_stride, const BYTE *src, + LONG src_stride, DWORD width, DWORD lines) +{ + MFCopyImage(dest, dest_stride, src, src_stride, width, lines); + + if (buffer->_2d.copy_image) + { + dest += dest_stride * lines; + src += src_stride * lines; + buffer->_2d.copy_image(dest, dest_stride, src, src_stride, width, lines); + } +} + +static void copy_image_nv12(BYTE *dest, LONG dest_stride, const BYTE *src, LONG src_stride, DWORD width, DWORD lines) +{ + MFCopyImage(dest, dest_stride, src, src_stride, width, lines / 2); +} + +static void copy_image_imc1(BYTE *dest, LONG dest_stride, const BYTE *src, LONG src_stride, DWORD width, DWORD lines) +{ + MFCopyImage(dest, dest_stride, src, src_stride, width / 2, lines); +} + +static void copy_image_imc2(BYTE *dest, LONG dest_stride, const BYTE *src, LONG src_stride, DWORD width, DWORD lines) +{ + MFCopyImage(dest, dest_stride, src, src_stride, width / 2, lines / 2); + MFCopyImage(dest + dest_stride / 2, dest_stride, src + src_stride / 2, src_stride, width / 2, lines / 2); +} + static inline struct buffer *impl_from_IMFMediaBuffer(IMFMediaBuffer *iface) { return CONTAINING_RECORD(iface, struct buffer, IMFMediaBuffer_iface); @@ -307,7 +338,7 @@ static HRESULT WINAPI memory_1d_2d_buffer_Unlock(IMFMediaBuffer *iface) if (buffer->_2d.linear_buffer && !--buffer->_2d.locks) { - MFCopyImage(buffer->data, buffer->_2d.pitch, buffer->_2d.linear_buffer, buffer->_2d.width, + copy_image(buffer, buffer->data, buffer->_2d.pitch, buffer->_2d.linear_buffer, buffer->_2d.width, buffer->_2d.width, buffer->_2d.height); free(buffer->_2d.linear_buffer); @@ -357,7 +388,7 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, 0); if (SUCCEEDED(hr)) { - MFCopyImage(buffer->_2d.linear_buffer, buffer->_2d.width, rect.pBits, rect.Pitch, + copy_image(buffer, buffer->_2d.linear_buffer, buffer->_2d.width, rect.pBits, rect.Pitch, buffer->_2d.width, buffer->_2d.height); IDirect3DSurface9_UnlockRect(buffer->d3d9_surface.surface); } @@ -396,7 +427,7 @@ static HRESULT WINAPI d3d9_surface_buffer_Unlock(IMFMediaBuffer *iface) if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, 0))) { - MFCopyImage(rect.pBits, rect.Pitch, buffer->_2d.linear_buffer, buffer->_2d.width, + copy_image(buffer, rect.pBits, rect.Pitch, buffer->_2d.linear_buffer, buffer->_2d.width, buffer->_2d.width, buffer->_2d.height); IDirect3DSurface9_UnlockRect(buffer->d3d9_surface.surface); } @@ -936,7 +967,7 @@ static HRESULT WINAPI dxgi_surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat hr = dxgi_surface_buffer_map(buffer); if (SUCCEEDED(hr)) { - MFCopyImage(buffer->_2d.linear_buffer, buffer->_2d.width, buffer->dxgi_surface.map_desc.pData, + copy_image(buffer, buffer->_2d.linear_buffer, buffer->_2d.width, buffer->dxgi_surface.map_desc.pData, buffer->dxgi_surface.map_desc.RowPitch, buffer->_2d.width, buffer->_2d.height); } } @@ -970,7 +1001,7 @@ static HRESULT WINAPI dxgi_surface_buffer_Unlock(IMFMediaBuffer *iface) hr = HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED); else if (!--buffer->_2d.locks) { - MFCopyImage(buffer->dxgi_surface.map_desc.pData, buffer->dxgi_surface.map_desc.RowPitch, + copy_image(buffer, buffer->dxgi_surface.map_desc.pData, buffer->dxgi_surface.map_desc.RowPitch, buffer->_2d.linear_buffer, buffer->_2d.width, buffer->_2d.width, buffer->_2d.height); dxgi_surface_buffer_unmap(buffer); @@ -1262,6 +1293,17 @@ static HRESULT create_1d_buffer(DWORD max_length, DWORD alignment, IMFMediaBuffe return S_OK; } +static p_copy_image_func get_2d_buffer_copy_func(DWORD fourcc) +{ + if (fourcc == MAKEFOURCC('N','V','1','2')) + return copy_image_nv12; + if (fourcc == MAKEFOURCC('I','M','C','1') || fourcc == MAKEFOURCC('I','M','C','3')) + return copy_image_imc1; + if (fourcc == MAKEFOURCC('I','M','C','2') || fourcc == MAKEFOURCC('I','M','C','4')) + return copy_image_imc2; + return NULL; +} + static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer) { unsigned int stride, max_length, plane_size; @@ -1315,6 +1357,8 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo plane_size *= 2; break; case MAKEFOURCC('N','V','1','2'): + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','4'): max_length = pitch * height * 3 / 2; break; default: @@ -1334,6 +1378,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo object->_2d.height = height; object->_2d.pitch = bottom_up ? -pitch : pitch; object->_2d.scanline0 = bottom_up ? object->data + pitch * (object->_2d.height - 1) : object->data; + object->_2d.copy_image = get_2d_buffer_copy_func(fourcc); *buffer = &object->IMFMediaBuffer_iface; @@ -1372,6 +1417,7 @@ static HRESULT create_d3d9_surface_buffer(IUnknown *surface, BOOL bottom_up, IMF object->_2d.width = stride; object->_2d.height = desc.Height; object->max_length = object->_2d.plane_size; + object->_2d.copy_image = get_2d_buffer_copy_func(desc.Format); *buffer = &object->IMFMediaBuffer_iface; @@ -1426,6 +1472,7 @@ static HRESULT create_dxgi_surface_buffer(IUnknown *surface, unsigned int sub_re object->_2d.width = stride; object->_2d.height = desc.Height; object->max_length = object->_2d.plane_size; + object->_2d.copy_image = get_2d_buffer_copy_func(desc.Format); if (FAILED(hr = init_attributes_object(&object->dxgi_surface.attributes, 0))) { diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 65ab72bd57b..d73641652b1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5433,10 +5433,10 @@ static void test_MFCreate2DMediaBuffer(void) }; unsigned int max_length, length, length2; BYTE *buffer_start, *data, *data2; + int i, j, k, pitch, pitch2, stride; IMF2DBuffer2 *_2dbuffer2; IMF2DBuffer *_2dbuffer; IMFMediaBuffer *buffer; - int i, pitch, pitch2; HRESULT hr; BOOL ret; @@ -5631,6 +5631,8 @@ static void test_MFCreate2DMediaBuffer(void) ok(length2 == ptr->contiguous_length, "%d: unexpected linear buffer length %u for %u x %u, format %s.\n", i, length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); + memset(data, 0xff, length2); + hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "Failed to unlock buffer, hr %#x.\n", hr); @@ -5649,6 +5651,44 @@ static void test_MFCreate2DMediaBuffer(void) ok(data2 == data, "Unexpected data pointer.\n"); ok(pitch == pitch2, "Unexpected pitch.\n"); + /* primary plane */ + for(j = 0; j < ptr->height; j++) + for (k = 0; k < ptr->width; k++) + ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); + + hr = pMFGetStrideForBitmapInfoHeader(ptr->fourcc, ptr->width, &stride); + ok(hr == S_OK, "Failed to get stride, hr %#x.\n", hr); + + /* secondary planes */ + switch (ptr->fourcc) + { + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','3'): + for (j = ptr->height; j < length2 / stride; j++) + for (k = 0; k < ptr->width / 2; k++) + ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); + break; + + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','4'): + for (j = ptr->height; j < length2 / stride; j++) + for (k = 0; k < ptr->width / 2; k++) + ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); + for (j = ptr->height; j < length2 / stride; j++) + for (k = pitch / 2; k < pitch / 2 + ptr->width / 2; k++) + ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); + break; + + case MAKEFOURCC('N','V','1','2'): + for (j = ptr->height; j < length2 / stride; j++) + for (k = 0; k < ptr->width; k++) + ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); + break; + + default: + ; + } + hr = IMF2DBuffer_Unlock2D(_2dbuffer); ok(hr == S_OK, "Failed to unlock buffer, hr %#x.\n", hr); -- 2.31.1

2 1

[PATCH 4/6] d3d11: Implement d3d11_device_context_ClearUnorderedAccessViewFloat().
by Henri Verbeet 07 Jun '21

07 Jun '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 11 ++++++++++- dlls/d3d11/tests/d3d11.c | 26 +++++++++++--------------- dlls/wined3d/adapter_gl.c | 6 +++--- dlls/wined3d/adapter_vk.c | 6 +++--- dlls/wined3d/cs.c | 8 +++++--- dlls/wined3d/device.c | 16 +++++++++++++++- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/view.c | 18 ++++++++++++------ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 14 +++++++------- include/wine/wined3d.h | 2 ++ 11 files changed, 71 insertions(+), 41 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7994da70591..d3e49879676 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1447,8 +1447,17 @@ static void STDMETHODCALLTYPE d3d11_device_context_ClearUnorderedAccessViewUint( static void STDMETHODCALLTYPE d3d11_device_context_ClearUnorderedAccessViewFloat(ID3D11DeviceContext1 *iface, ID3D11UnorderedAccessView *unordered_access_view, const float values[4]) { - FIXME("iface %p, unordered_access_view %p, values %s stub!\n", + struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); + struct d3d11_unordered_access_view *view; + + TRACE("iface %p, unordered_access_view %p, values %s.\n", iface, unordered_access_view, debug_float4(values)); + + view = unsafe_impl_from_ID3D11UnorderedAccessView(unordered_access_view); + wined3d_mutex_lock(); + wined3d_device_context_clear_uav_float(context->wined3d_context, + view->wined3d_view, (const struct wined3d_vec4 *)values); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_ClearDepthStencilView(ID3D11DeviceContext1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f729a38b4c2..ae48e9748c9 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16451,22 +16451,19 @@ static void test_clear_image_unordered_access_view(void) unsigned int expected; BOOL is_float; unsigned int clamped; - BOOL is_todo; } tests[] = { /* Test clearing a specific mip level. */ {DXGI_FORMAT_R32_FLOAT, 2, 1, 0, 0, 1, {1, 0, 0, 0}, 0x00000001}, {DXGI_FORMAT_R32_FLOAT, 2, 1, 1, 0, 1, {1, 0, 0, 0}, 0x00000001}, - {DXGI_FORMAT_R32_FLOAT, 2, 1, 0, 0, 1, {0x3f000000, 0, 0, 0}, 0x3f000000, TRUE, 0, TRUE}, - {DXGI_FORMAT_R32_FLOAT, 2, 1, 1, 0, 1, {0x3f000000, 0, 0, 0}, 0x3f000000, TRUE, 0, TRUE}, + {DXGI_FORMAT_R32_FLOAT, 2, 1, 0, 0, 1, {0x3f000000, 0, 0, 0}, 0x3f000000, TRUE}, + {DXGI_FORMAT_R32_FLOAT, 2, 1, 1, 0, 1, {0x3f000000, 0, 0, 0}, 0x3f000000, TRUE}, /* Test clearing specific array layers. */ {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, IMAGE_SIZE, {1, 0, 0, 0}, 0x00000001}, {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, {1, 0, 0, 0}, 0x00000001}, - {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, IMAGE_SIZE, - {0x3f000000, 0, 0, 0}, 0x3f000000, TRUE, 0, TRUE}, - {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, - {0x3f000000, 0, 0, 0}, 0x3f000000, TRUE, 0, TRUE}, + {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, IMAGE_SIZE, {0x3f000000, 0, 0, 0}, 0x3f000000, TRUE}, + {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, {0x3f000000, 0, 0, 0}, 0x3f000000, TRUE}, /* Test uint clears with formats. */ {DXGI_FORMAT_R16G16_UINT, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x00020001}, {DXGI_FORMAT_R16G16_UINT, 1, 1, 0, 0, 1, {0x12345, 0, 0, 0}, 0x00002345, FALSE, 0x0000ffff}, @@ -16478,16 +16475,16 @@ static void test_clear_image_unordered_access_view(void) {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x00c01001}, /* Test float clears with formats. */ {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, - {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, TRUE, 0, TRUE}, + {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, TRUE}, {DXGI_FORMAT_R16G16_FLOAT, 1, 1, 0, 0, 1, - {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x3c003800, TRUE, 0, TRUE}, + {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x3c003800, TRUE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, - {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x0000ff80, TRUE, 0, TRUE}, + {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x0000ff80, TRUE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, - {0, 0, 0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */}, 0xff800000, TRUE, 0, TRUE}, + {0, 0, 0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */}, 0xff800000, TRUE}, {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, {0x3f000000 /* 1.0f */, 0 /* 0.0f */, 0xbf800000 /* -1.0f */, 0x3f000000 /* 1.0f */}, - 0x00000380, TRUE, 0, TRUE}, + 0x00000380, TRUE}, }; static const struct @@ -16624,9 +16621,8 @@ static void test_clear_image_unordered_access_view(void) || broken(is_inside && !tests[i].is_float && is_small_float_format && !actual_colour))) break; } - todo_wine_if(tests[i].is_todo && expected_colour) - ok(success, "At layer %u, (%u,%u,%u), expected 0x%08x, got 0x%08x.\n", - layer, x, y, z, expected_colour, actual_colour); + ok(success, "At layer %u, (%u,%u,%u), expected 0x%08x, got 0x%08x.\n", + layer, x, y, z, expected_colour, actual_colour); release_resource_readback(&rb); } diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index f6ef04a5fbb..b014790af51 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5015,12 +5015,12 @@ static void adapter_gl_flush_context(struct wined3d_context *context) } static void adapter_gl_clear_uav(struct wined3d_context *context, - struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value, bool fp) { TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); - wined3d_unordered_access_view_gl_clear_uint(wined3d_unordered_access_view_gl(view), - clear_value, wined3d_context_gl(context)); + wined3d_unordered_access_view_gl_clear(wined3d_unordered_access_view_gl(view), + clear_value, wined3d_context_gl(context), fp); } static void adapter_gl_generate_mipmap(struct wined3d_context *context, struct wined3d_shader_resource_view *view) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 99d7547b834..9f36ee39080 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1744,12 +1744,12 @@ static void adapter_vk_dispatch_compute(struct wined3d_device *device, } static void adapter_vk_clear_uav(struct wined3d_context *context, - struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value, bool fp) { TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); - wined3d_unordered_access_view_vk_clear_uint(wined3d_unordered_access_view_vk(view), - clear_value, wined3d_context_vk(context)); + wined3d_unordered_access_view_vk_clear(wined3d_unordered_access_view_vk(view), + clear_value, wined3d_context_vk(context), fp); } static void adapter_vk_generate_mipmap(struct wined3d_context *context, struct wined3d_shader_resource_view *view) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 50a08334dab..544b76534d0 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -504,6 +504,7 @@ struct wined3d_cs_clear_unordered_access_view enum wined3d_cs_op opcode; struct wined3d_unordered_access_view *view; struct wined3d_uvec4 clear_value; + bool fp; }; struct wined3d_cs_copy_uav_counter @@ -2721,14 +2722,14 @@ static void wined3d_cs_exec_clear_unordered_access_view(struct wined3d_cs *cs, c struct wined3d_context *context; context = context_acquire(cs->c.device, NULL, 0); - cs->c.device->adapter->adapter_ops->adapter_clear_uav(context, view, &op->clear_value); + cs->c.device->adapter->adapter_ops->adapter_clear_uav(context, view, &op->clear_value, op->fp); context_release(context); wined3d_resource_release(view->resource); } -void wined3d_device_context_emit_clear_uav_uint(struct wined3d_device_context *context, - struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) +void wined3d_device_context_emit_clear_uav(struct wined3d_device_context *context, + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value, bool fp) { struct wined3d_cs_clear_unordered_access_view *op; @@ -2736,6 +2737,7 @@ void wined3d_device_context_emit_clear_uav_uint(struct wined3d_device_context *c op->opcode = WINED3D_CS_OP_CLEAR_UNORDERED_ACCESS_VIEW; op->view = view; op->clear_value = *clear_value; + op->fp = fp; wined3d_device_context_acquire_resource(context, view->resource); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5092d8129b9..a11f137729f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4799,12 +4799,26 @@ HRESULT CDECL wined3d_device_context_clear_rendertarget_view(struct wined3d_devi return WINED3D_OK; } +void CDECL wined3d_device_context_clear_uav_float(struct wined3d_device_context *context, + struct wined3d_unordered_access_view *view, const struct wined3d_vec4 *clear_value) +{ + TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_vec4(clear_value)); + + if (!(view->format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_FLOAT | WINED3DFMT_FLAG_NORMALISED))) + { + WARN("Not supported for view format %s.\n", debug_d3dformat(view->format->id)); + return; + } + + wined3d_device_context_emit_clear_uav(context, view, (const struct wined3d_uvec4 *)clear_value, true); +} + void CDECL wined3d_device_context_clear_uav_uint(struct wined3d_device_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); - wined3d_device_context_emit_clear_uav_uint(context, view, clear_value); + wined3d_device_context_emit_clear_uav(context, view, clear_value, false); } static unsigned int sanitise_map_flags(const struct wined3d_resource *resource, unsigned int flags) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index be43d2ffb86..0e8a396a598 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3046,9 +3046,9 @@ static void adapter_no3d_dispatch_compute(struct wined3d_device *device, } static void adapter_no3d_clear_uav(struct wined3d_context *context, - struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value, bool fp) { - ERR("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); + ERR("context %p, view %p, clear_value %s, fp %#x.\n", context, view, debug_uvec4(clear_value), fp); } static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 2d2622e1191..cda16b690f8 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1446,8 +1446,8 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ wined3d_view_invalidate_location(view->resource, &view->desc, location); } -void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access_view_gl *view_gl, - const struct wined3d_uvec4 *clear_value, struct wined3d_context_gl *context_gl) +void wined3d_unordered_access_view_gl_clear(struct wined3d_unordered_access_view_gl *view_gl, + const struct wined3d_uvec4 *clear_value, struct wined3d_context_gl *context_gl, bool fp) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; const struct wined3d_format_gl *format_gl; @@ -1478,7 +1478,7 @@ void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access base_layer = view_gl->v.desc.u.texture.layer_idx; base_level = view_gl->v.desc.u.texture.level_idx; - if (format_gl->f.byte_count <= 4) + if (format_gl->f.byte_count <= 4 && !fp) { gl_format = format_gl->format; gl_type = format_gl->type; @@ -1552,6 +1552,12 @@ void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access return; } + if (fp) + { + FIXME("Floating-point buffer clears not implemented.\n"); + return; + } + buffer_gl = wined3d_buffer_gl(buffer_from_resource(resource)); wined3d_buffer_load_location(&buffer_gl->b, &context_gl->c, WINED3D_LOCATION_BUFFER); wined3d_unordered_access_view_invalidate_location(&view_gl->v, ~WINED3D_LOCATION_BUFFER); @@ -1700,8 +1706,8 @@ HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_vi return hr; } -void wined3d_unordered_access_view_vk_clear_uint(struct wined3d_unordered_access_view_vk *view_vk, - const struct wined3d_uvec4 *clear_value, struct wined3d_context_vk *context_vk) +void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view_vk *view_vk, + const struct wined3d_uvec4 *clear_value, struct wined3d_context_vk *context_vk, bool fp) { const struct wined3d_vk_info *vk_info; const struct wined3d_format *format; @@ -1712,7 +1718,7 @@ void wined3d_unordered_access_view_vk_clear_uint(struct wined3d_unordered_access VkAccessFlags access_mask; unsigned int offset, size; - TRACE("view_vk %p, clear_value %s, context_vk %p.\n", view_vk, debug_uvec4(clear_value), context_vk); + TRACE("view_vk %p, clear_value %s, context_vk %p, fp %#x.\n", view_vk, debug_uvec4(clear_value), context_vk, fp); resource = view_vk->v.resource; if (resource->type != WINED3D_RTYPE_BUFFER) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7b0737386b7..11351b60a7f 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -87,6 +87,7 @@ @ cdecl wined3d_device_context_blt(ptr ptr long ptr ptr long ptr long ptr long) @ cdecl wined3d_device_context_clear_rendertarget_view(ptr ptr ptr long ptr float long) +@ cdecl wined3d_device_context_clear_uav_float(ptr ptr ptr) @ cdecl wined3d_device_context_clear_uav_uint(ptr ptr ptr) @ cdecl wined3d_device_context_copy_resource(ptr ptr ptr) @ cdecl wined3d_device_context_copy_sub_resource_region(ptr ptr long long long long ptr long ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d08c523bd9f..4e3be01ed5a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3355,7 +3355,7 @@ struct wined3d_adapter_ops void (*adapter_dispatch_compute)(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters); void (*adapter_clear_uav)(struct wined3d_context *context, - struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value); + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value, bool fp); void (*adapter_generate_mipmap)(struct wined3d_context *context, struct wined3d_shader_resource_view *view); }; @@ -4735,8 +4735,8 @@ void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, struct wined3d_texture *texture, unsigned int layer) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; -void wined3d_device_context_emit_clear_uav_uint(struct wined3d_device_context *context, - struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_clear_uav(struct wined3d_device_context *context, + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value, bool fp) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, unsigned int swap_interval, DWORD flags) DECLSPEC_HIDDEN; @@ -5168,8 +5168,8 @@ static inline struct wined3d_unordered_access_view_gl *wined3d_unordered_access_ return CONTAINING_RECORD(view, struct wined3d_unordered_access_view_gl, v); } -void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access_view_gl *view_gl, - const struct wined3d_uvec4 *clear_value, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_unordered_access_view_gl_clear(struct wined3d_unordered_access_view_gl *view_gl, + const struct wined3d_uvec4 *clear_value, struct wined3d_context_gl *context_gl, bool fp) DECLSPEC_HIDDEN; HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_view_gl *view_gl, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; @@ -5197,8 +5197,8 @@ static inline void wined3d_unordered_access_view_vk_barrier(struct wined3d_unord wined3d_resource_vk_barrier(uav_vk->v.resource, context_vk, bind_mask); } -void wined3d_unordered_access_view_vk_clear_uint(struct wined3d_unordered_access_view_vk *view_vk, - const struct wined3d_uvec4 *clear_value, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view_vk *view_vk, + const struct wined3d_uvec4 *clear_value, struct wined3d_context_vk *context_vk, bool fp) DECLSPEC_HIDDEN; HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_view_vk *view_vk, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7133280a724..53ae13b7df5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2422,6 +2422,8 @@ HRESULT __cdecl wined3d_device_context_blt(struct wined3d_device_context *contex HRESULT __cdecl wined3d_device_context_clear_rendertarget_view(struct wined3d_device_context *context, struct wined3d_rendertarget_view *view, const RECT *rect, unsigned int flags, const struct wined3d_color *color, float depth, unsigned int stencil); +void __cdecl wined3d_device_context_clear_uav_float(struct wined3d_device_context *context, + struct wined3d_unordered_access_view *view, const struct wined3d_vec4 *clear_value); void __cdecl wined3d_device_context_clear_uav_uint(struct wined3d_device_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value); void __cdecl wined3d_device_context_copy_resource(struct wined3d_device_context *context, -- 2.20.1

2 1

[PATCH 3/6] wined3d: Implement OpenGL image UAV clears using ARB_clear_texture.
by Henri Verbeet 07 Jun '21

07 Jun '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 24 ++++----- dlls/wined3d/utils.c | 12 +++++ dlls/wined3d/view.c | 95 ++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 110 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 217b4870e53..f729a38b4c2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16456,26 +16456,26 @@ static void test_clear_image_unordered_access_view(void) tests[] = { /* Test clearing a specific mip level. */ - {DXGI_FORMAT_R32_FLOAT, 2, 1, 0, 0, 1, {1, 0, 0, 0}, 0x00000001, FALSE, 0, TRUE}, - {DXGI_FORMAT_R32_FLOAT, 2, 1, 1, 0, 1, {1, 0, 0, 0}, 0x00000001, FALSE, 0, TRUE}, + {DXGI_FORMAT_R32_FLOAT, 2, 1, 0, 0, 1, {1, 0, 0, 0}, 0x00000001}, + {DXGI_FORMAT_R32_FLOAT, 2, 1, 1, 0, 1, {1, 0, 0, 0}, 0x00000001}, {DXGI_FORMAT_R32_FLOAT, 2, 1, 0, 0, 1, {0x3f000000, 0, 0, 0}, 0x3f000000, TRUE, 0, TRUE}, {DXGI_FORMAT_R32_FLOAT, 2, 1, 1, 0, 1, {0x3f000000, 0, 0, 0}, 0x3f000000, TRUE, 0, TRUE}, /* Test clearing specific array layers. */ - {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, IMAGE_SIZE, {1, 0, 0, 0}, 0x00000001, FALSE, 0, TRUE}, - {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, {1, 0, 0, 0}, 0x00000001, FALSE, 0, TRUE}, + {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, IMAGE_SIZE, {1, 0, 0, 0}, 0x00000001}, + {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, {1, 0, 0, 0}, 0x00000001}, {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, IMAGE_SIZE, {0x3f000000, 0, 0, 0}, 0x3f000000, TRUE, 0, TRUE}, {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, {0x3f000000, 0, 0, 0}, 0x3f000000, TRUE, 0, TRUE}, /* Test uint clears with formats. */ - {DXGI_FORMAT_R16G16_UINT, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x00020001, FALSE, 0, TRUE}, - {DXGI_FORMAT_R16G16_UINT, 1, 1, 0, 0, 1, {0x12345, 0, 0, 0}, 0x00002345, FALSE, 0x0000ffff, TRUE}, - {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x00020001, FALSE, 0, TRUE}, - {DXGI_FORMAT_R16G16_FLOAT, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x00020001, FALSE, 0, TRUE}, - {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x04030201, FALSE, 0, TRUE}, - {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, {0x123, 0, 0, 0}, 0x00000023, FALSE, 0x000000ff, TRUE}, - {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x04030201, FALSE, 0, TRUE}, - {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x00c01001, FALSE, 0, TRUE}, + {DXGI_FORMAT_R16G16_UINT, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x00020001}, + {DXGI_FORMAT_R16G16_UINT, 1, 1, 0, 0, 1, {0x12345, 0, 0, 0}, 0x00002345, FALSE, 0x0000ffff}, + {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x00020001}, + {DXGI_FORMAT_R16G16_FLOAT, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x00020001}, + {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x04030201}, + {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, {0x123, 0, 0, 0}, 0x00000023, FALSE, 0x000000ff}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x04030201}, + {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x00c01001}, /* Test float clears with formats. */ {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, TRUE, 0, TRUE}, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8eacc52ee2c..6e388e66862 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5803,6 +5803,18 @@ BOOL wined3d_get_primary_adapter_luid(LUID *luid) return TRUE; } +uint32_t wined3d_format_pack(const struct wined3d_format *format, const struct wined3d_uvec4 *value) +{ + uint32_t p = 0; + + p |= (value->x & wined3d_mask_from_size(format->red_size)) << format->red_offset; + p |= (value->y & wined3d_mask_from_size(format->green_size)) << format->green_offset; + p |= (value->z & wined3d_mask_from_size(format->blue_size)) << format->blue_offset; + p |= (value->w & wined3d_mask_from_size(format->alpha_size)) << format->alpha_offset; + + return p; +} + /* Note: It's the caller's responsibility to ensure values can be expressed * in the requested format. UNORM formats for example can only express values * in the range 0.0f -> 1.0f. */ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 03abaf57102..2d2622e1191 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1450,7 +1450,7 @@ void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access const struct wined3d_uvec4 *clear_value, struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; - const struct wined3d_format_gl *format; + const struct wined3d_format_gl *format_gl; struct wined3d_buffer_gl *buffer_gl; struct wined3d_resource *resource; unsigned int offset, size; @@ -1458,7 +1458,82 @@ void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access resource = view_gl->v.resource; if (resource->type != WINED3D_RTYPE_BUFFER) { - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); + unsigned int layer_count, level_count, base_level, base_layer; + unsigned int sub_resource_idx, width, height, depth, i, j; + struct wined3d_texture_gl *texture_gl; + const void *data = clear_value; + GLenum gl_format, gl_type; + uint32_t packed; + + if (!gl_info->supported[ARB_CLEAR_TEXTURE]) + { + FIXME("OpenGL implementation does not support ARB_clear_texture.\n"); + return; + } + + format_gl = wined3d_format_gl(resource->format); + texture_gl = wined3d_texture_gl(texture_from_resource(resource)); + layer_count = view_gl->v.desc.u.texture.layer_count; + level_count = view_gl->v.desc.u.texture.level_count; + base_layer = view_gl->v.desc.u.texture.layer_idx; + base_level = view_gl->v.desc.u.texture.level_idx; + + if (format_gl->f.byte_count <= 4) + { + gl_format = format_gl->format; + gl_type = format_gl->type; + packed = wined3d_format_pack(&format_gl->f, clear_value); + data = &packed; + } + else if (resource->format_flags & WINED3DFMT_FLAG_INTEGER) + { + gl_format = GL_RGBA_INTEGER; + gl_type = GL_UNSIGNED_INT; + } + else + { + gl_format = GL_RGBA; + gl_type = GL_FLOAT; + } + + for (i = 0; i < layer_count; ++i) + { + for (j = 0; j < level_count; ++j) + { + sub_resource_idx = (base_layer + i) * texture_gl->t.level_count + base_level + j; + wined3d_texture_prepare_location(&texture_gl->t, sub_resource_idx, + &context_gl->c, WINED3D_LOCATION_TEXTURE_RGB); + + width = wined3d_texture_get_level_width(&texture_gl->t, base_level + j); + height = wined3d_texture_get_level_height(&texture_gl->t, base_level + j); + depth = wined3d_texture_get_level_depth(&texture_gl->t, base_level + j); + + switch (texture_gl->target) + { + case GL_TEXTURE_1D_ARRAY: + GL_EXTCALL(glClearTexSubImage(texture_gl->texture_rgb.name, base_level + j, + 0, base_layer + i, 0, width, 1, 1, gl_format, gl_type, data)); + break; + + case GL_TEXTURE_2D_ARRAY: + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: + case GL_TEXTURE_CUBE_MAP: + case GL_TEXTURE_CUBE_MAP_ARRAY: + GL_EXTCALL(glClearTexSubImage(texture_gl->texture_rgb.name, base_level + j, + 0, 0, base_layer + i, width, height, 1, gl_format, gl_type, data)); + break; + + default: + GL_EXTCALL(glClearTexSubImage(texture_gl->texture_rgb.name, base_level + j, + 0, 0, 0, width, height, depth, gl_format, gl_type, data)); + break; + } + + wined3d_texture_validate_location(&texture_gl->t, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(&texture_gl->t, sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); + } + } + return; } @@ -1468,12 +1543,12 @@ void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access return; } - format = wined3d_format_gl(view_gl->v.format); - if (format->f.id != WINED3DFMT_R32_UINT && format->f.id != WINED3DFMT_R32_SINT - && format->f.id != WINED3DFMT_R32G32B32A32_UINT - && format->f.id != WINED3DFMT_R32G32B32A32_SINT) + format_gl = wined3d_format_gl(view_gl->v.format); + if (format_gl->f.id != WINED3DFMT_R32_UINT && format_gl->f.id != WINED3DFMT_R32_SINT + && format_gl->f.id != WINED3DFMT_R32G32B32A32_UINT + && format_gl->f.id != WINED3DFMT_R32G32B32A32_SINT) { - FIXME("Not implemented for format %s.\n", debug_d3dformat(format->f.id)); + FIXME("Not implemented for format %s.\n", debug_d3dformat(format_gl->f.id)); return; } @@ -1481,10 +1556,10 @@ void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access wined3d_buffer_load_location(&buffer_gl->b, &context_gl->c, WINED3D_LOCATION_BUFFER); wined3d_unordered_access_view_invalidate_location(&view_gl->v, ~WINED3D_LOCATION_BUFFER); - get_buffer_view_range(&buffer_gl->b, &view_gl->v.desc, &format->f, &offset, &size); + get_buffer_view_range(&buffer_gl->b, &view_gl->v.desc, &format_gl->f, &offset, &size); wined3d_context_gl_bind_bo(context_gl, buffer_gl->bo.binding, buffer_gl->bo.id); - GL_EXTCALL(glClearBufferSubData(buffer_gl->bo.binding, format->internal, - offset, size, format->format, format->type, clear_value)); + GL_EXTCALL(glClearBufferSubData(buffer_gl->bo.binding, format_gl->internal, + offset, size, format_gl->format, format_gl->type, clear_value)); wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); checkGLcall("clear unordered access view"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6d41f02e842..d08c523bd9f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5818,6 +5818,7 @@ BOOL wined3d_format_is_depth_view(enum wined3d_format_id resource_format_id, enum wined3d_format_id view_format_id) DECLSPEC_HIDDEN; const struct wined3d_color_key_conversion * wined3d_format_get_color_key_conversion( const struct wined3d_texture *texture, BOOL need_alpha_ck) DECLSPEC_HIDDEN; +uint32_t wined3d_format_pack(const struct wined3d_format *format, const struct wined3d_uvec4 *value) DECLSPEC_HIDDEN; BOOL wined3d_formats_are_srgb_variants(enum wined3d_format_id format1, enum wined3d_format_id format2) DECLSPEC_HIDDEN; -- 2.20.1

2 1

[PATCH 1/6] d3d11/tests: Add a test for image UAV clears.
by Henri Verbeet 07 Jun '21

07 Jun '21

Ported from the similar Direct3D 12 test in vkd3d. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 329 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 329 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index fc0da439173..217b4870e53 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -102,6 +102,22 @@ struct device_desc UINT flags; }; +struct resource_desc +{ + D3D11_RESOURCE_DIMENSION dimension; + unsigned int width; + unsigned int height; + unsigned int depth_or_array_size; + unsigned int level_count; + DXGI_FORMAT format; + DXGI_SAMPLE_DESC sample_desc; + D3D11_USAGE usage; + unsigned int bind_flags; + unsigned int cpu_access_flags; + unsigned int misc_flags; + unsigned int structure_byte_stride; +}; + struct swapchain_desc { BOOL windowed; @@ -771,6 +787,66 @@ static ID3D11Buffer *create_buffer_(unsigned int line, ID3D11Device *device, return buffer; } +static HRESULT create_resource(ID3D11Device *device, const struct resource_desc *desc, + const D3D11_SUBRESOURCE_DATA *data, ID3D11Resource **resource) +{ + D3D11_TEXTURE1D_DESC texture1d_desc; + D3D11_TEXTURE2D_DESC texture2d_desc; + D3D11_TEXTURE3D_DESC texture3d_desc; + D3D11_BUFFER_DESC buffer_desc; + + switch (desc->dimension) + { + case D3D11_RESOURCE_DIMENSION_BUFFER: + buffer_desc.ByteWidth = desc->width; + buffer_desc.Usage = desc->usage; + buffer_desc.BindFlags = desc->bind_flags; + buffer_desc.CPUAccessFlags = desc->cpu_access_flags; + buffer_desc.MiscFlags = desc->misc_flags; + buffer_desc.StructureByteStride = desc->structure_byte_stride; + return ID3D11Device_CreateBuffer(device, &buffer_desc, data, (ID3D11Buffer **)resource); + + case D3D11_RESOURCE_DIMENSION_TEXTURE1D: + texture1d_desc.Width = desc->width; + texture1d_desc.MipLevels = desc->level_count; + texture1d_desc.ArraySize = desc->depth_or_array_size; + texture1d_desc.Format = desc->format; + texture1d_desc.Usage = desc->usage; + texture1d_desc.BindFlags = desc->bind_flags; + texture1d_desc.CPUAccessFlags = desc->cpu_access_flags; + texture1d_desc.MiscFlags = desc->misc_flags; + return ID3D11Device_CreateTexture1D(device, &texture1d_desc, data, (ID3D11Texture1D **)resource); + + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: + texture2d_desc.Width = desc->width; + texture2d_desc.Height = desc->height; + texture2d_desc.MipLevels = desc->level_count; + texture2d_desc.ArraySize = desc->depth_or_array_size; + texture2d_desc.Format = desc->format; + texture2d_desc.SampleDesc = desc->sample_desc; + texture2d_desc.Usage = desc->usage; + texture2d_desc.BindFlags = desc->bind_flags; + texture2d_desc.CPUAccessFlags = desc->cpu_access_flags; + texture2d_desc.MiscFlags = desc->misc_flags; + return ID3D11Device_CreateTexture2D(device, &texture2d_desc, data, (ID3D11Texture2D **)resource); + + case D3D11_RESOURCE_DIMENSION_TEXTURE3D: + texture3d_desc.Width = desc->width; + texture3d_desc.Height = desc->height; + texture3d_desc.Depth = desc->depth_or_array_size; + texture3d_desc.MipLevels = desc->level_count; + texture3d_desc.Format = desc->format; + texture3d_desc.Usage = desc->usage; + texture3d_desc.BindFlags = desc->bind_flags; + texture3d_desc.CPUAccessFlags = desc->cpu_access_flags; + texture3d_desc.MiscFlags = desc->misc_flags; + return ID3D11Device_CreateTexture3D(device, &texture3d_desc, data, (ID3D11Texture3D **)resource); + + default: + return E_INVALIDARG; + } +} + struct resource_readback { ID3D11Resource *resource; @@ -936,6 +1012,36 @@ static void get_texture3d_readback(ID3D11Texture3D *texture, unsigned int sub_re ID3D11Device_Release(device); } +static void get_resource_readback(ID3D11Resource *resource, + unsigned int sub_resource_idx, struct resource_readback *rb) +{ + D3D11_RESOURCE_DIMENSION d; + + ID3D11Resource_GetType(resource, &d); + switch (d) + { + case D3D11_RESOURCE_DIMENSION_BUFFER: + get_buffer_readback((ID3D11Buffer *)resource, rb); + return; + + case D3D11_RESOURCE_DIMENSION_TEXTURE1D: + get_texture1d_readback((ID3D11Texture1D *)resource, sub_resource_idx, rb); + return; + + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: + get_texture_readback((ID3D11Texture2D *)resource, sub_resource_idx, rb); + return; + + case D3D11_RESOURCE_DIMENSION_TEXTURE3D: + get_texture3d_readback((ID3D11Texture3D *)resource, sub_resource_idx, rb); + return; + + default: + memset(rb, 0, sizeof(*rb)); + return; + } +} + static void *get_readback_data(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z, unsigned byte_width) { @@ -16314,6 +16420,228 @@ static void test_clear_buffer_unordered_access_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_clear_image_unordered_access_view(void) +{ + unsigned int expected_colour, actual_colour; + D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; + unsigned int i, j, d, p, x, y, z, layer; + struct d3d11_test_context test_context; + unsigned int image_size, image_depth; + struct resource_desc resource_desc; + ID3D11UnorderedAccessView *uav[2]; + ID3D11DeviceContext *context; + struct resource_readback rb; + BOOL is_small_float_format; + ID3D11Resource *resource; + BOOL is_inside, success; + ID3D11Device *device; + UINT clear_value[4]; + HRESULT hr; + +#define IMAGE_SIZE 16 + static const struct + { + DXGI_FORMAT format; + unsigned int image_mips; + unsigned int image_layers; + unsigned int mip_level; + unsigned int first_layer; + unsigned int layer_count; + unsigned int values[4]; + unsigned int expected; + BOOL is_float; + unsigned int clamped; + BOOL is_todo; + } + tests[] = + { + /* Test clearing a specific mip level. */ + {DXGI_FORMAT_R32_FLOAT, 2, 1, 0, 0, 1, {1, 0, 0, 0}, 0x00000001, FALSE, 0, TRUE}, + {DXGI_FORMAT_R32_FLOAT, 2, 1, 1, 0, 1, {1, 0, 0, 0}, 0x00000001, FALSE, 0, TRUE}, + {DXGI_FORMAT_R32_FLOAT, 2, 1, 0, 0, 1, {0x3f000000, 0, 0, 0}, 0x3f000000, TRUE, 0, TRUE}, + {DXGI_FORMAT_R32_FLOAT, 2, 1, 1, 0, 1, {0x3f000000, 0, 0, 0}, 0x3f000000, TRUE, 0, TRUE}, + /* Test clearing specific array layers. */ + {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, IMAGE_SIZE, {1, 0, 0, 0}, 0x00000001, FALSE, 0, TRUE}, + {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, {1, 0, 0, 0}, 0x00000001, FALSE, 0, TRUE}, + {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, IMAGE_SIZE, + {0x3f000000, 0, 0, 0}, 0x3f000000, TRUE, 0, TRUE}, + {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, + {0x3f000000, 0, 0, 0}, 0x3f000000, TRUE, 0, TRUE}, + /* Test uint clears with formats. */ + {DXGI_FORMAT_R16G16_UINT, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x00020001, FALSE, 0, TRUE}, + {DXGI_FORMAT_R16G16_UINT, 1, 1, 0, 0, 1, {0x12345, 0, 0, 0}, 0x00002345, FALSE, 0x0000ffff, TRUE}, + {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x00020001, FALSE, 0, TRUE}, + {DXGI_FORMAT_R16G16_FLOAT, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x00020001, FALSE, 0, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x04030201, FALSE, 0, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, {0x123, 0, 0, 0}, 0x00000023, FALSE, 0x000000ff, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x04030201, FALSE, 0, TRUE}, + {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, {1, 2, 3, 4}, 0x00c01001, FALSE, 0, TRUE}, + /* Test float clears with formats. */ + {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, + {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, TRUE, 0, TRUE}, + {DXGI_FORMAT_R16G16_FLOAT, 1, 1, 0, 0, 1, + {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x3c003800, TRUE, 0, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, + {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x0000ff80, TRUE, 0, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, + {0, 0, 0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */}, 0xff800000, TRUE, 0, TRUE}, + {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, + {0x3f000000 /* 1.0f */, 0 /* 0.0f */, 0xbf800000 /* -1.0f */, 0x3f000000 /* 1.0f */}, + 0x00000380, TRUE, 0, TRUE}, + }; + + static const struct + { + D3D11_RESOURCE_DIMENSION resource_dim; + D3D11_UAV_DIMENSION view_dim; + BOOL is_layered; + } + uav_dimensions[] = + { + {D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3D11_UAV_DIMENSION_TEXTURE2D, FALSE}, + {D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3D11_UAV_DIMENSION_TEXTURE2DARRAY, TRUE }, + /* Expected behaviour with partial layer coverage is unclear. */ + {D3D11_RESOURCE_DIMENSION_TEXTURE3D, D3D11_UAV_DIMENSION_TEXTURE3D, FALSE}, + }; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + memset(&resource_desc, 0, sizeof(resource_desc)); + resource_desc.width = IMAGE_SIZE; + resource_desc.height = IMAGE_SIZE; + resource_desc.sample_desc.Count = 1; + resource_desc.usage = D3D11_USAGE_DEFAULT; + resource_desc.bind_flags = D3D11_BIND_UNORDERED_ACCESS; + + for (d = 0; d < ARRAY_SIZE(uav_dimensions); ++d) + { + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("Dim %u, Test %u", d, i); + + if (tests[i].image_layers > 1 && !uav_dimensions[d].is_layered) + { + winetest_pop_context(); + continue; + } + + resource_desc.dimension = uav_dimensions[d].resource_dim; + resource_desc.depth_or_array_size = tests[i].image_layers; + resource_desc.level_count = tests[i].image_mips; + resource_desc.format = tests[i].format; + if (FAILED(hr = create_resource(device, &resource_desc, NULL, &resource))) + { + skip("Failed to create resource, hr %#x.\n", hr); + winetest_pop_context(); + continue; + } + + uav_desc.Format = tests[i].format; + uav_desc.ViewDimension = uav_dimensions[d].view_dim; + + for (j = 0; j < 2; ++j) + { + unsigned int first_layer = j ? 0 : tests[i].first_layer; + unsigned int layer_count = j ? tests[i].image_layers : tests[i].layer_count; + + switch (uav_desc.ViewDimension) + { + case D3D11_UAV_DIMENSION_TEXTURE2D: + uav_desc.Texture2D.MipSlice = tests[i].mip_level; + break; + + case D3D11_UAV_DIMENSION_TEXTURE2DARRAY: + uav_desc.Texture2DArray.MipSlice = tests[i].mip_level; + uav_desc.Texture2DArray.FirstArraySlice = first_layer; + uav_desc.Texture2DArray.ArraySize = layer_count; + break; + + case D3D11_UAV_DIMENSION_TEXTURE3D: + uav_desc.Texture3D.MipSlice = tests[i].mip_level; + uav_desc.Texture3D.FirstWSlice = first_layer; + uav_desc.Texture3D.WSize = layer_count; + break; + + default: + ok(0, "Unhandled uav dimension %#x.\n", uav_dimensions[d].view_dim); + break; + } + + hr = ID3D11Device_CreateUnorderedAccessView(device, resource, &uav_desc, &uav[j]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + + for (j = 0; j < 4; ++j) + { + clear_value[j] = tests[i].expected ? 0u : ~0u; + } + + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav[1], clear_value); + if (tests[i].is_float) + ID3D11DeviceContext_ClearUnorderedAccessViewFloat(context, uav[0], (const float *)tests[i].values); + else + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav[0], tests[i].values); + + image_depth = uav_dimensions[d].resource_dim == D3D11_RESOURCE_DIMENSION_TEXTURE3D + ? max(tests[i].image_layers >> tests[i].mip_level, 1u) : 1; + image_size = max(IMAGE_SIZE >> tests[i].mip_level, 1u); + + is_small_float_format = tests[i].format == DXGI_FORMAT_R16G16_UNORM + || tests[i].format == DXGI_FORMAT_R16G16_FLOAT + || tests[i].format == DXGI_FORMAT_R11G11B10_FLOAT + || tests[i].format == DXGI_FORMAT_R8G8B8A8_UNORM; + for (layer = 0; layer < tests[i].image_layers / image_depth; ++layer) + { + get_resource_readback(resource, tests[i].mip_level + (layer * tests[i].image_mips), &rb); + + success = TRUE; + expected_colour = actual_colour = x = y = z = 0; + for (p = 0; p < image_depth * image_size * image_size; ++p) + { + x = p % image_size; + y = (p / image_size) % image_size; + z = p / (image_size * image_size); + + if (uav_dimensions[d].resource_dim == D3D11_RESOURCE_DIMENSION_TEXTURE3D) + is_inside = z >= tests[i].first_layer + && z < tests[i].first_layer + tests[i].layer_count; + else + is_inside = layer >= tests[i].first_layer + && layer < tests[i].first_layer + tests[i].layer_count; + + expected_colour = is_inside ? tests[i].expected : clear_value[0]; + actual_colour = get_readback_u32(&rb, x, y, z); + if (!(success = compare_color(actual_colour, expected_colour, tests[i].is_float ? 1 : 0) + /* Some drivers/GPUs clamp clear values that can't + * be represented by the format. (Windows 7 + * testbot, AMD PALM) */ + || broken(is_inside && tests[i].clamped && actual_colour == tests[i].clamped) + /* Some drivers/GPUs mishandle integer clears of + * small float/normalised formats. (AMD PALM) */ + || broken(is_inside && !tests[i].is_float && is_small_float_format && !actual_colour))) + break; + } + todo_wine_if(tests[i].is_todo && expected_colour) + ok(success, "At layer %u, (%u,%u,%u), expected 0x%08x, got 0x%08x.\n", + layer, x, y, z, expected_colour, actual_colour); + + release_resource_readback(&rb); + } + + ID3D11UnorderedAccessView_Release(uav[1]); + ID3D11UnorderedAccessView_Release(uav[0]); + ID3D11Resource_Release(resource); + winetest_pop_context(); + } + } + + release_test_context(&test_context); +#undef IMAGE_SIZE +} + static void test_initial_depth_stencil_state(void) { static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; @@ -33043,6 +33371,7 @@ START_TEST(d3d11) queue_test(test_clear_render_target_view_3d); queue_test(test_clear_depth_stencil_view); queue_test(test_clear_buffer_unordered_access_view); + queue_test(test_clear_image_unordered_access_view); queue_test(test_initial_depth_stencil_state); queue_test(test_draw_depth_only); queue_test(test_draw_uav_only); -- 2.20.1

2 1

[PATCH v3] dsound: Notify DSBPN_OFFSETSTOP earlier.
by Hiroki Awata 07 Jun '21

07 Jun '21

Some games may not receive the DSBPN_OFFSETSTOP event and get stuck if CloseHandle is called immediately after IDirectSoundBuffer::Stop. To solve this problem, IDirectSoundBuffer::Stop will immediately notify the DSBPN_OFFSETSTOP event. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41292 Signed-off-by: Hiroki Awata <castaneai(a)by.black> --- v3: removed dead code --- dlls/dsound/buffer.c | 7 ++----- dlls/dsound/mixer.c | 6 +----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index fafa6fc6015..dc3b54906ce 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -296,8 +296,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Play(IDirectSoundBuffer8 *iface, DW if (This->state == STATE_STOPPED) { This->leadin = TRUE; This->state = STATE_STARTING; - } else if (This->state == STATE_STOPPING) - This->state = STATE_PLAYING; + } for (i = 0; i < This->num_filters; i++) { IMediaObject_Discontinuity(This->filters[i].obj, 0); @@ -317,9 +316,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Stop(IDirectSoundBuffer8 *iface) AcquireSRWLockExclusive(&This->lock); - if (This->state == STATE_PLAYING) - This->state = STATE_STOPPING; - else if (This->state == STATE_STARTING) + if (This->state == STATE_PLAYING || This->state == STATE_STARTING) { This->state = STATE_STOPPED; DSOUND_CheckEvent(This, 0, 0); diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index a6402b09eff..124d1e4fba1 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -593,11 +593,7 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buff if (dsb->buflen && dsb->state) { TRACE("Checking %p, frames=%d\n", dsb, frames); AcquireSRWLockShared(&dsb->lock); - /* if buffer is stopping it is stopped now */ - if (dsb->state == STATE_STOPPING) { - dsb->state = STATE_STOPPED; - DSOUND_CheckEvent(dsb, 0, 0); - } else if (dsb->state != STATE_STOPPED) { + if (dsb->state != STATE_STOPPED) { /* if the buffer was starting, it must be playing now */ if (dsb->state == STATE_STARTING) -- 2.27.0

2 1

[PATCH 6/6] wined3d: Use the texture level count to calculate sub-resource indices for Vulkan mip-map generation.
by Henri Verbeet 07 Jun '21

07 Jun '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/view.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f9ba8430d08..91d26c05fae 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1266,7 +1266,7 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou void wined3d_shader_resource_view_vk_generate_mipmap(struct wined3d_shader_resource_view_vk *srv_vk, struct wined3d_context_vk *context_vk) { - unsigned int i, j, layer_count, level_count, base_level, base_layer; + unsigned int i, j, layer_count, level_count, base_level, base_layer, sub_resource_idx; const struct wined3d_vk_info *vk_info = context_vk->vk_info; VkImageSubresourceRange vk_src_range, vk_dst_range; struct wined3d_texture_vk *texture_vk; @@ -1283,8 +1283,9 @@ void wined3d_shader_resource_view_vk_generate_mipmap(struct wined3d_shader_resou texture_vk = wined3d_texture_vk(texture_from_resource(srv_vk->v.resource)); for (i = 0; i < layer_count; ++i) { - if (!wined3d_texture_load_location(&texture_vk->t, - (base_layer + i) * level_count + base_level, &context_vk->c, WINED3D_LOCATION_TEXTURE_RGB)) + sub_resource_idx = (base_layer + i) * texture_vk->t.level_count + base_level; + if (!wined3d_texture_load_location(&texture_vk->t, sub_resource_idx, + &context_vk->c, WINED3D_LOCATION_TEXTURE_RGB)) ERR("Failed to load source layer %u.\n", base_layer + i); } @@ -1393,10 +1394,9 @@ void wined3d_shader_resource_view_vk_generate_mipmap(struct wined3d_shader_resou { for (j = 1; j < level_count; ++j) { - wined3d_texture_validate_location(&texture_vk->t, - (base_layer + i) * level_count + base_level + j, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_invalidate_location(&texture_vk->t, - (base_layer + i) * level_count + base_level + j, ~WINED3D_LOCATION_TEXTURE_RGB); + sub_resource_idx = (base_layer + i) * texture_vk->t.level_count + base_level + j; + wined3d_texture_validate_location(&texture_vk->t, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(&texture_vk->t, sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); } } -- 2.20.1

1 0

[PATCH 5/6] wined3d: Use the texture level count to calculate sub-resource indices for OpenGL mip-map generation.
by Henri Verbeet 07 Jun '21

07 Jun '21

Instead of the view's level count, which may be different. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/view.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index cda16b690f8..f9ba8430d08 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1197,7 +1197,7 @@ static void shader_resource_view_gl_bind_and_dirtify(struct wined3d_shader_resou void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resource_view_gl *view_gl, struct wined3d_context_gl *context_gl) { - unsigned int i, j, layer_count, level_count, base_level, base_layer; + unsigned int i, j, layer_count, level_count, base_level, base_layer, sub_resource_idx; const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_texture_gl *texture_gl; struct gl_texture *gl_tex; @@ -1216,8 +1216,8 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; for (i = 0; i < layer_count; ++i) { - if (!wined3d_texture_load_location(&texture_gl->t, - (base_layer + i) * level_count + base_level, &context_gl->c, location)) + sub_resource_idx = (base_layer + i) * texture_gl->t.level_count + base_level; + if (!wined3d_texture_load_location(&texture_gl->t, sub_resource_idx, &context_gl->c, location)) ERR("Failed to load source layer %u.\n", base_layer + i); } @@ -1249,10 +1249,9 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou { for (j = 1; j < level_count; ++j) { - wined3d_texture_validate_location(&texture_gl->t, - (base_layer + i) * level_count + base_level + j, location); - wined3d_texture_invalidate_location(&texture_gl->t, - (base_layer + i) * level_count + base_level + j, ~location); + sub_resource_idx = (base_layer + i) * texture_gl->t.level_count + base_level + j; + wined3d_texture_validate_location(&texture_gl->t, sub_resource_idx, location); + wined3d_texture_invalidate_location(&texture_gl->t, sub_resource_idx, ~location); } } -- 2.20.1

1 0

[PATCH 2/6] wined3d: Introduce wined3d_mask_from_size().
by Henri Verbeet 07 Jun '21

07 Jun '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 8 ++++---- dlls/wined3d/utils.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 5 +++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c5d7a7d9d55..8a4ca4f5781 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -36,11 +36,11 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); static const DWORD surface_simple_locations = WINED3D_LOCATION_SYSMEM | WINED3D_LOCATION_BUFFER; /* Works correctly only for <= 4 bpp formats. */ -static void get_color_masks(const struct wined3d_format *format, DWORD *masks) +static void get_color_masks(const struct wined3d_format *format, uint32_t *masks) { - masks[0] = ((1u << format->red_size) - 1) << format->red_offset; - masks[1] = ((1u << format->green_size) - 1) << format->green_offset; - masks[2] = ((1u << format->blue_size) - 1) << format->blue_offset; + masks[0] = wined3d_mask_from_size(format->red_size) << format->red_offset; + masks[1] = wined3d_mask_from_size(format->green_size) << format->green_offset; + masks[2] = wined3d_mask_from_size(format->blue_size) << format->blue_offset; } /* See also float_16_to_32() in wined3d_private.h */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b39fb46cadc..8eacc52ee2c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5902,7 +5902,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con static float color_to_float(DWORD color, DWORD size, DWORD offset) { - DWORD mask = size < 32 ? (1u << size) - 1 : ~0u; + uint32_t mask = wined3d_mask_from_size(size); if (!size) return 1.0f; @@ -5938,10 +5938,10 @@ void wined3d_format_get_float_color_key(const struct wined3d_format *format, case WINED3DFMT_R8G8B8X8_UNORM: case WINED3DFMT_R16G16_UNORM: case WINED3DFMT_B10G10R10A2_UNORM: - slop.r = 0.5f / ((1u << format->red_size) - 1); - slop.g = 0.5f / ((1u << format->green_size) - 1); - slop.b = 0.5f / ((1u << format->blue_size) - 1); - slop.a = 0.5f / ((1u << format->alpha_size) - 1); + slop.r = 0.5f / wined3d_mask_from_size(format->red_size); + slop.g = 0.5f / wined3d_mask_from_size(format->green_size); + slop.b = 0.5f / wined3d_mask_from_size(format->blue_size); + slop.a = 0.5f / wined3d_mask_from_size(format->alpha_size); float_colors[0].r = color_to_float(key->color_space_low_value, format->red_size, format->red_offset) - slop.r; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b0f8ea1bf93..6d41f02e842 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5959,6 +5959,11 @@ static inline BOOL is_rasterization_disabled(const struct wined3d_shader *geomet && geometry_shader->u.gs.so_desc->rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM; } +static inline uint32_t wined3d_mask_from_size(unsigned int size) +{ + return size < 32 ? (1u << size) - 1 : ~0u; +} + static inline DWORD wined3d_extract_bits(const DWORD *bitstream, unsigned int offset, unsigned int count) { -- 2.20.1

1 0

[PATCH 1/2] d2d1: Reset bitmap brush sampler state only if parameters have changed.
by Nikolay Sivov 07 Jun '21

07 Jun '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/brush.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 07d2e26a143..496a399aa6e 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -818,6 +818,15 @@ static inline struct d2d_brush *impl_from_ID2D1BitmapBrush1(ID2D1BitmapBrush1 *i return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); } +static void d2d_bitmap_brush_reset_sampler_state(struct d2d_brush *brush) +{ + if (brush->u.bitmap.sampler_state) + { + ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + brush->u.bitmap.sampler_state = NULL; + } +} + static HRESULT STDMETHODCALLTYPE d2d_bitmap_brush_QueryInterface(ID2D1BitmapBrush1 *iface, REFIID iid, void **out) { @@ -923,11 +932,10 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeX(ID2D1BitmapBrush1 TRACE("iface %p, mode %#x.\n", iface, mode); - brush->u.bitmap.extend_mode_x = mode; - if (brush->u.bitmap.sampler_state) + if (brush->u.bitmap.extend_mode_x != mode) { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); - brush->u.bitmap.sampler_state = NULL; + brush->u.bitmap.extend_mode_x = mode; + d2d_bitmap_brush_reset_sampler_state(brush); } } @@ -937,11 +945,10 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeY(ID2D1BitmapBrush1 TRACE("iface %p, mode %#x.\n", iface, mode); - brush->u.bitmap.extend_mode_y = mode; - if (brush->u.bitmap.sampler_state) + if (brush->u.bitmap.extend_mode_y != mode) { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); - brush->u.bitmap.sampler_state = NULL; + brush->u.bitmap.extend_mode_y = mode; + d2d_bitmap_brush_reset_sampler_state(brush); } } @@ -962,11 +969,10 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode(ID2D1BitmapB return; } - brush->u.bitmap.interpolation_mode = d2d1_1_interp_mode_from_d2d1(mode); - if (brush->u.bitmap.sampler_state) + if (brush->u.bitmap.interpolation_mode != d2d1_1_interp_mode_from_d2d1(mode)) { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); - brush->u.bitmap.sampler_state = NULL; + brush->u.bitmap.interpolation_mode = d2d1_1_interp_mode_from_d2d1(mode); + d2d_bitmap_brush_reset_sampler_state(brush); } } @@ -1050,11 +1056,10 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode1(ID2D1Bitmap return; } - brush->u.bitmap.interpolation_mode = mode; - if (brush->u.bitmap.sampler_state) + if (brush->u.bitmap.interpolation_mode != mode) { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); - brush->u.bitmap.sampler_state = NULL; + brush->u.bitmap.interpolation_mode = mode; + d2d_bitmap_brush_reset_sampler_state(brush); } } -- 2.30.2

2 3

[PATCH] mfplat: Copy all image planes in buffer copies.
by Derek Lesho 07 Jun '21

07 Jun '21

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- I decided to put the branching in the copy functions, as it there were too many variables involved in how to copy the secondary planes. --- dlls/mfplat/buffer.c | 55 +++++++++++++++++++++++++++++++------- dlls/mfplat/tests/mfplat.c | 42 ++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index e04cc1a9251..5830b1af4ff 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -32,6 +32,34 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); #define ALIGN_SIZE(size, alignment) (((size) + (alignment)) & ~((alignment))) +static void copy_multiplane_image(BYTE *dest, LONG dest_stride, const BYTE *src, LONG src_stride, DWORD width, DWORD lines, unsigned int fourcc) +{ + MFCopyImage(dest, dest_stride, src, src_stride, width, lines); + dest += dest_stride * lines; + src += src_stride * lines; + + switch (fourcc) + { + case MAKEFOURCC('N','V','1','2'): + MFCopyImage(dest, dest_stride, src, src_stride, width, lines / 2); + break; + + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','3'): + MFCopyImage(dest, dest_stride, src, src_stride, width / 2, lines); + break; + + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','4'): + MFCopyImage(dest, dest_stride, src, src_stride, width / 2, lines / 2); + MFCopyImage(dest + dest_stride / 2, dest_stride, src + src_stride / 2, src_stride, width / 2, lines / 2); + break; + + default: + break; + } +} + struct buffer { IMFMediaBuffer IMFMediaBuffer_iface; @@ -54,6 +82,8 @@ struct buffer unsigned int height; int pitch; + unsigned int fourcc; + unsigned int locks; } _2d; struct @@ -307,8 +337,8 @@ static HRESULT WINAPI memory_1d_2d_buffer_Unlock(IMFMediaBuffer *iface) if (buffer->_2d.linear_buffer && !--buffer->_2d.locks) { - MFCopyImage(buffer->data, buffer->_2d.pitch, buffer->_2d.linear_buffer, buffer->_2d.width, - buffer->_2d.width, buffer->_2d.height); + copy_multiplane_image(buffer->data, buffer->_2d.pitch, buffer->_2d.linear_buffer, buffer->_2d.width, + buffer->_2d.width, buffer->_2d.height, buffer->_2d.fourcc); free(buffer->_2d.linear_buffer); buffer->_2d.linear_buffer = NULL; @@ -357,8 +387,8 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, 0); if (SUCCEEDED(hr)) { - MFCopyImage(buffer->_2d.linear_buffer, buffer->_2d.width, rect.pBits, rect.Pitch, - buffer->_2d.width, buffer->_2d.height); + copy_multiplane_image(buffer->_2d.linear_buffer, buffer->_2d.width, rect.pBits, rect.Pitch, + buffer->_2d.width, buffer->_2d.height, buffer->_2d.fourcc); IDirect3DSurface9_UnlockRect(buffer->d3d9_surface.surface); } } @@ -396,8 +426,8 @@ static HRESULT WINAPI d3d9_surface_buffer_Unlock(IMFMediaBuffer *iface) if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, 0))) { - MFCopyImage(rect.pBits, rect.Pitch, buffer->_2d.linear_buffer, buffer->_2d.width, - buffer->_2d.width, buffer->_2d.height); + copy_multiplane_image(rect.pBits, rect.Pitch, buffer->_2d.linear_buffer, buffer->_2d.width, + buffer->_2d.width, buffer->_2d.height, buffer->_2d.fourcc); IDirect3DSurface9_UnlockRect(buffer->d3d9_surface.surface); } @@ -936,8 +966,8 @@ static HRESULT WINAPI dxgi_surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat hr = dxgi_surface_buffer_map(buffer); if (SUCCEEDED(hr)) { - MFCopyImage(buffer->_2d.linear_buffer, buffer->_2d.width, buffer->dxgi_surface.map_desc.pData, - buffer->dxgi_surface.map_desc.RowPitch, buffer->_2d.width, buffer->_2d.height); + copy_multiplane_image(buffer->_2d.linear_buffer, buffer->_2d.width, buffer->dxgi_surface.map_desc.pData, + buffer->dxgi_surface.map_desc.RowPitch, buffer->_2d.width, buffer->_2d.height, buffer->_2d.fourcc); } } } @@ -970,8 +1000,8 @@ static HRESULT WINAPI dxgi_surface_buffer_Unlock(IMFMediaBuffer *iface) hr = HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED); else if (!--buffer->_2d.locks) { - MFCopyImage(buffer->dxgi_surface.map_desc.pData, buffer->dxgi_surface.map_desc.RowPitch, - buffer->_2d.linear_buffer, buffer->_2d.width, buffer->_2d.width, buffer->_2d.height); + copy_multiplane_image(buffer->dxgi_surface.map_desc.pData, buffer->dxgi_surface.map_desc.RowPitch, + buffer->_2d.linear_buffer, buffer->_2d.width, buffer->_2d.width, buffer->_2d.height, buffer->_2d.fourcc); dxgi_surface_buffer_unmap(buffer); free(buffer->_2d.linear_buffer); @@ -1334,6 +1364,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo object->_2d.height = height; object->_2d.pitch = bottom_up ? -pitch : pitch; object->_2d.scanline0 = bottom_up ? object->data + pitch * (object->_2d.height - 1) : object->data; + object->_2d.fourcc = fourcc; *buffer = &object->IMFMediaBuffer_iface; @@ -1373,6 +1404,8 @@ static HRESULT create_d3d9_surface_buffer(IUnknown *surface, BOOL bottom_up, IMF object->_2d.height = desc.Height; object->max_length = object->_2d.plane_size; + object->_2d.fourcc = desc.Format; + *buffer = &object->IMFMediaBuffer_iface; return S_OK; @@ -1427,6 +1460,8 @@ static HRESULT create_dxgi_surface_buffer(IUnknown *surface, unsigned int sub_re object->_2d.height = desc.Height; object->max_length = object->_2d.plane_size; + object->_2d.fourcc = desc.Format; + if (FAILED(hr = init_attributes_object(&object->dxgi_surface.attributes, 0))) { IMFMediaBuffer_Release(&object->IMFMediaBuffer_iface); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 65ab72bd57b..d73641652b1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5433,10 +5433,10 @@ static void test_MFCreate2DMediaBuffer(void) }; unsigned int max_length, length, length2; BYTE *buffer_start, *data, *data2; + int i, j, k, pitch, pitch2, stride; IMF2DBuffer2 *_2dbuffer2; IMF2DBuffer *_2dbuffer; IMFMediaBuffer *buffer; - int i, pitch, pitch2; HRESULT hr; BOOL ret; @@ -5631,6 +5631,8 @@ static void test_MFCreate2DMediaBuffer(void) ok(length2 == ptr->contiguous_length, "%d: unexpected linear buffer length %u for %u x %u, format %s.\n", i, length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); + memset(data, 0xff, length2); + hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "Failed to unlock buffer, hr %#x.\n", hr); @@ -5649,6 +5651,44 @@ static void test_MFCreate2DMediaBuffer(void) ok(data2 == data, "Unexpected data pointer.\n"); ok(pitch == pitch2, "Unexpected pitch.\n"); + /* primary plane */ + for(j = 0; j < ptr->height; j++) + for (k = 0; k < ptr->width; k++) + ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); + + hr = pMFGetStrideForBitmapInfoHeader(ptr->fourcc, ptr->width, &stride); + ok(hr == S_OK, "Failed to get stride, hr %#x.\n", hr); + + /* secondary planes */ + switch (ptr->fourcc) + { + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','3'): + for (j = ptr->height; j < length2 / stride; j++) + for (k = 0; k < ptr->width / 2; k++) + ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); + break; + + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','4'): + for (j = ptr->height; j < length2 / stride; j++) + for (k = 0; k < ptr->width / 2; k++) + ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); + for (j = ptr->height; j < length2 / stride; j++) + for (k = pitch / 2; k < pitch / 2 + ptr->width / 2; k++) + ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); + break; + + case MAKEFOURCC('N','V','1','2'): + for (j = ptr->height; j < length2 / stride; j++) + for (k = 0; k < ptr->width; k++) + ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); + break; + + default: + ; + } + hr = IMF2DBuffer_Unlock2D(_2dbuffer); ok(hr == S_OK, "Failed to unlock buffer, hr %#x.\n", hr); -- 2.31.1

3 3

[PATCH v2 4/6] gdi32: Add more emf StretchBlt tests.
by Zhiyi Zhang 07 Jun '21

07 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 1236 ++++++++++++++++++++++++++++++----- 1 file changed, 1087 insertions(+), 149 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 83a10264589..062eb4c8a44 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1265,87 +1265,6 @@ static const unsigned char EMF_LINETO_MM_TEXT_BITS[] = { 0x14, 0x00, 0x00, 0x00 }; -static const unsigned char EMF_BITBLT[] = -{ - 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, - 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0x64, 0x02, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x80, 0x07, 0x00, 0x00, 0xb0, 0x04, 0x00, 0x00, - 0xfc, 0x01, 0x00, 0x00, 0x3e, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, - 0x30, 0xda, 0x04, 0x00, 0x4c, 0x00, 0x00, 0x00, - 0xbc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x64, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, - 0x8c, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, - 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x4c, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x62, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x00, - 0xc4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0a, 0xd7, 0xa3, 0x3b, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0a, 0xd7, 0x23, 0x3c, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x6c, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, - 0x94, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, - 0x90, 0x01, 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, - 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00 -}; - static const unsigned char EMF_DCBRUSH_BITS[] = { 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, @@ -1909,83 +1828,1102 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits, return 0; } +static const unsigned char EMF_STRETCHBLT_1BIT_3X3[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x2c, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd0, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xb9, 0xf0, 0x03, 0x00, 0x4d, 0x00, 0x00, 0x00, + 0xac, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x9c, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + +static const unsigned char EMF_STRETCHBLT_4BIT_3X3[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x64, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd0, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xb9, 0xf0, 0x03, 0x00, 0x4d, 0x00, 0x00, 0x00, + 0xe4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, + 0xd4, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + +static const unsigned char EMF_STRETCHBLT_8BIT_3X3[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x24, 0x05, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd0, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xb9, 0xf0, 0x03, 0x00, 0x4d, 0x00, 0x00, 0x00, + 0xa4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x00, 0x00, 0x00, 0x28, 0x04, 0x00, 0x00, + 0x94, 0x04, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + +static const unsigned char EMF_STRETCHBLT_16BIT_555_3X3[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x40, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd0, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xb9, 0xf0, 0x03, 0x00, 0x4d, 0x00, 0x00, 0x00, + 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, + 0xa0, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x7c, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x00, + 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; + +static const unsigned char EMF_STRETCHBLT_24BIT_3X3[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x44, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd0, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xb9, 0xf0, 0x03, 0x00, 0x4d, 0x00, 0x00, 0x00, + 0xc4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, + 0x94, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + +static const unsigned char EMF_STRETCHBLT_32BIT_888_3X3[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x60, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd0, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xb9, 0xf0, 0x03, 0x00, 0x4d, 0x00, 0x00, 0x00, + 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, + 0xa0, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, + 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; + +static const unsigned char EMF_STRETCHBLT_16BIT_3X3[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x40, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd0, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xb9, 0xf0, 0x03, 0x00, 0x4d, 0x00, 0x00, 0x00, + 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, + 0xa0, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xf8, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, + 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; + +static const unsigned char EMF_STRETCHBLT_32BIT_3X3[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x60, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd0, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xb9, 0xf0, 0x03, 0x00, 0x4d, 0x00, 0x00, 0x00, + 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, + 0xa0, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xff, 0x00, 0xe0, 0xff, 0x00, 0x00, + 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; + +static const unsigned char EMF_BITBLT_1BIT_4X4[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x24, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd0, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xb9, 0xf0, 0x03, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0xa4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x94, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + +static const unsigned char EMF_BITBLT_4BIT_4X4[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x5c, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd0, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xb9, 0xf0, 0x03, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, + 0xcc, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + +static const unsigned char EMF_BITBLT_8BIT_4X4[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x1c, 0x05, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd0, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xb9, 0xf0, 0x03, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0x9c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x28, 0x04, 0x00, 0x00, + 0x8c, 0x04, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + +static const unsigned char EMF_BITBLT_16BIT_555_4X4[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x38, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd0, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xb9, 0xf0, 0x03, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0xb8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, + 0x98, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x7c, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x00, + 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; + +static const unsigned char EMF_BITBLT_24BIT_4X4[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x3c, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd0, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xb9, 0xf0, 0x03, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0xbc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, + 0x8c, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + +static const unsigned char EMF_BITBLT_32BIT_888_4X4[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x58, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd0, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xb9, 0xf0, 0x03, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, + 0x98, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, + 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; + +static const unsigned char EMF_BITBLT_16BIT_4X4[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x38, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd0, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xb9, 0xf0, 0x03, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0xb8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, + 0x98, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xf8, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, + 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; + +static const unsigned char EMF_BITBLT_32BIT_4X4[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x58, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd0, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xb9, 0xf0, 0x03, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, + 0x98, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xff, 0x00, 0xe0, 0xff, 0x00, 0x00, + 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; /* tests blitting to an EMF */ static void test_emf_BitBlt(void) { - HDC hdcDisplay, hdcMetafile, hdcBitmap; - HBITMAP hBitmap, hOldBitmap; - HENHMETAFILE hMetafile; -#define BMP_DIM 4 - BITMAPINFOHEADER bmih = - { - sizeof(BITMAPINFOHEADER), - BMP_DIM,/* biWidth */ - BMP_DIM,/* biHeight */ - 1, /* biPlanes */ - 24, /* biBitCount */ - BI_RGB, /* biCompression */ - 0, /* biXPelsPerMeter */ - 0, /* biYPelsPerMeter */ - 0, /* biClrUsed */ - 0, /* biClrImportant */ - }; + static const XFORM xform = {0.5f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f}; + static const int bitmap_width = 4, bitmap_height = 4; + unsigned char bmi_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *bmi = (BITMAPINFO *)bmi_buffer; + HDC hdc, hdc_emf, hdc_emf2, hdc_bitmap; + HBITMAP hbitmap, old_hbitmap; + HENHMETAFILE hemf, hemf2; + int ret, test_idx; void *bits; - XFORM xform; - BOOL ret; - hdcDisplay = CreateDCA("DISPLAY", NULL, NULL, NULL); - ok( hdcDisplay != 0, "CreateDCA error %d\n", GetLastError() ); - - hdcBitmap = CreateCompatibleDC(hdcDisplay); - ok( hdcBitmap != 0, "CreateCompatibleDC failed\n" ); - ok(SetGraphicsMode(hdcBitmap, GM_ADVANCED), "SetGraphicsMode failed\n"); - bmih.biXPelsPerMeter = MulDiv(GetDeviceCaps(hdcDisplay, LOGPIXELSX), 100, 3937); - bmih.biYPelsPerMeter = MulDiv(GetDeviceCaps(hdcDisplay, LOGPIXELSY), 100, 3937); - hBitmap = CreateDIBSection(hdcDisplay, (const BITMAPINFO *)&bmih, - DIB_RGB_COLORS, &bits, NULL, 0); - hOldBitmap = SelectObject(hdcBitmap, hBitmap); - - hdcMetafile = CreateEnhMetaFileA(hdcBitmap, NULL, NULL, NULL); - ok( hdcMetafile != 0, "CreateEnhMetaFileA failed\n" ); - - /* First fill the bitmap DC with something recognizable, like BLACKNESS */ - ret = BitBlt(hdcBitmap, 0, 0, BMP_DIM, BMP_DIM, 0, 0, 0, BLACKNESS); - ok( ret, "BitBlt(BLACKNESS) failed\n" ); - - ret = BitBlt(hdcMetafile, 0, 0, BMP_DIM, BMP_DIM, hdcBitmap, 0, 0, SRCCOPY); - ok( ret, "BitBlt(SRCCOPY) failed\n" ); - ret = BitBlt(hdcMetafile, 0, 0, BMP_DIM, BMP_DIM, 0, 0, 0, WHITENESS); - ok( ret, "BitBlt(WHITENESS) failed\n" ); - - ok(SetMapMode(hdcBitmap, MM_ANISOTROPIC), "SetMapMode failed\n"); - ok(SetWindowOrgEx(hdcBitmap, 0, 0, NULL), "SetWindowOrgEx failed\n"); - ok(SetWindowExtEx(hdcBitmap, 400, 400, NULL), "SetWindowExtEx failed\n"); - ok(SetViewportOrgEx(hdcBitmap, 0, 0, NULL), "SetViewportOrgEx failed\n"); - ok(SetViewportExtEx(hdcBitmap, BMP_DIM, BMP_DIM, NULL), "SetViewportExtEx failed\n"); - memset(&xform, 0, sizeof(xform)); - xform.eM11 = 0.5; - xform.eM22 = 1.0; - ok(SetWorldTransform(hdcBitmap, &xform), "SetWorldTransform failed\n"); - - ret = StretchBlt(hdcMetafile, 0, 0, BMP_DIM, BMP_DIM, hdcBitmap, 0, 0, 400, 400, SRCCOPY); - ok( ret, "StretchBlt(SRCCOPY) failed\n" ); - - hMetafile = CloseEnhMetaFile(hdcMetafile); - ok( hMetafile != 0, "CloseEnhMetaFile failed\n" ); - - if(compare_emf_bits(hMetafile, EMF_BITBLT, sizeof(EMF_BITBLT), - "emf_BitBlt", FALSE) != 0) + static const struct { - dump_emf_bits(hMetafile, "emf_BitBlt"); - dump_emf_records(hMetafile, "emf_BitBlt"); + WORD bpp; + int src_width; + int src_height; + WORD compression; + const void *bits; + size_t bits_count; + DWORD used_color_count; + DWORD color_count; + RGBQUAD colors[3]; + } + tests[] = + { + {1, 3, 3, BI_RGB, EMF_STRETCHBLT_1BIT_3X3, sizeof(EMF_STRETCHBLT_1BIT_3X3), 1, 1, {{0xff, 0xff, 0xff}}}, + {4, 3, 3, BI_RGB, EMF_STRETCHBLT_4BIT_3X3, sizeof(EMF_STRETCHBLT_4BIT_3X3), 1, 1, {{0xff, 0xff, 0xff}}}, + {8, 3, 3, BI_RGB, EMF_STRETCHBLT_8BIT_3X3, sizeof(EMF_STRETCHBLT_8BIT_3X3), 1, 1, {{0xff, 0xff, 0xff}}}, + {16, 3, 3, BI_RGB, EMF_STRETCHBLT_16BIT_555_3X3, sizeof(EMF_STRETCHBLT_16BIT_555_3X3)}, + {24, 3, 3, BI_RGB, EMF_STRETCHBLT_24BIT_3X3, sizeof(EMF_STRETCHBLT_24BIT_3X3)}, + {32, 3, 3, BI_RGB, EMF_STRETCHBLT_32BIT_888_3X3, sizeof(EMF_STRETCHBLT_32BIT_888_3X3)}, + {16, 3, 3, BI_BITFIELDS, EMF_STRETCHBLT_16BIT_3X3, sizeof(EMF_STRETCHBLT_16BIT_3X3), 0, 3, {{0x00, 0xf8, 0x00}, {0xe0, 0x07, 0x00}, {0x1f, 0x00, 0x00}}}, + {32, 3, 3, BI_BITFIELDS, EMF_STRETCHBLT_32BIT_3X3, sizeof(EMF_STRETCHBLT_32BIT_3X3), 0, 3, {{0x00, 0x00, 0xff}, {0xe0, 0xff, 0x00}, {0xff, 0x00, 0x00}}}, + {1, 4, 4, BI_RGB, EMF_BITBLT_1BIT_4X4, sizeof(EMF_BITBLT_1BIT_4X4), 1, 1, {{0xff, 0xff, 0xff}}}, + {4, 4, 4, BI_RGB, EMF_BITBLT_4BIT_4X4, sizeof(EMF_BITBLT_4BIT_4X4), 1, 1, {{0xff, 0xff, 0xff}}}, + {8, 4, 4, BI_RGB, EMF_BITBLT_8BIT_4X4, sizeof(EMF_BITBLT_8BIT_4X4), 1, 1, {{0xff, 0xff, 0xff}}}, + {16, 4, 4, BI_RGB, EMF_BITBLT_16BIT_555_4X4, sizeof(EMF_BITBLT_16BIT_555_4X4)}, + {24, 4, 4, BI_RGB, EMF_BITBLT_24BIT_4X4, sizeof(EMF_BITBLT_24BIT_4X4)}, + {32, 4, 4, BI_RGB, EMF_BITBLT_32BIT_888_4X4, sizeof(EMF_BITBLT_32BIT_888_4X4)}, + {16, 4, 4, BI_BITFIELDS, EMF_BITBLT_16BIT_4X4, sizeof(EMF_BITBLT_16BIT_4X4), 0, 3, {{0x00, 0xf8, 0x00}, {0xe0, 0x07, 0x00}, {0x1f, 0x00, 0x00}}}, + {32, 4, 4, BI_BITFIELDS, EMF_BITBLT_32BIT_4X4, sizeof(EMF_BITBLT_32BIT_4X4), 0, 3, {{0x00, 0x00, 0xff}, {0xe0, 0xff, 0x00}, {0xff, 0x00, 0x00}}}, + }; + + hdc = GetDC(0); + + /* Test that source DC cannot be an enhanced metafile */ + hdc_emf = CreateEnhMetaFileW(hdc, NULL, NULL, NULL); + ok(!!hdc_emf, "CreateEnhMetaFileW failed, error %d\n", GetLastError()); + hdc_emf2 = CreateEnhMetaFileW(hdc, NULL, NULL, NULL); + ok(!!hdc_emf2, "CreateEnhMetaFileW failed, error %d\n", GetLastError()); + + ret = StretchBlt(hdc_emf, 0, 0, 1, 1, hdc_emf2, 0, 0, 1, 1, SRCCOPY); + ok(!ret, "StretchBlt succeeded\n"); + + hemf2 = CloseEnhMetaFile(hdc_emf2); + ok(!!hemf2, "CloseEnhMetaFile failed, error %d\n", GetLastError()); + hemf = CloseEnhMetaFile(hdc_emf); + ok(!!hemf, "CloseEnhMetaFile failed, error %d\n", GetLastError()); + DeleteEnhMetaFile(hemf2); + DeleteEnhMetaFile(hemf); + + for (test_idx = 0; test_idx < ARRAY_SIZE(tests); ++test_idx) + { + winetest_push_context("Test %d", test_idx); + + memset(bmi_buffer, 0, sizeof(bmi_buffer)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biHeight = bitmap_width; + bmi->bmiHeader.biWidth = bitmap_height; + bmi->bmiHeader.biBitCount = tests[test_idx].bpp; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = tests[test_idx].compression; + bmi->bmiHeader.biClrUsed = tests[test_idx].used_color_count; + memcpy(bmi->bmiColors, tests[test_idx].colors, sizeof(RGBQUAD) * tests[test_idx].color_count); + + hbitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, &bits, NULL, 0); + ok(!!hbitmap, "CreateDIBSection failed, error %d\n", GetLastError()); + hdc_bitmap = CreateCompatibleDC(hdc); + ok(!!hdc_bitmap, "CreateCompatibleDC failed, error %d\n", GetLastError()); + old_hbitmap = SelectObject(hdc_bitmap, hbitmap); + + SetBkColor(hdc_bitmap, RGB(0xff, 0xff, 0xff)); + ret = SetGraphicsMode(hdc_bitmap, GM_ADVANCED); + ok(ret, "SetGraphicsMode failed, error %d\n", GetLastError()); + ret = SetWorldTransform(hdc_bitmap, &xform); + ok(ret, "SetWorldTransform failed, error %d\n", GetLastError()); + + hdc_emf = CreateEnhMetaFileW(hdc, NULL, NULL, NULL); + ok(!!hdc_emf, "CreateEnhMetaFileW failed, error %d\n", GetLastError()); + + ret = BitBlt(hdc_bitmap, 0, 0, bitmap_width, bitmap_height, 0, 0, 0, BLACKNESS); + ok(ret, "BitBlt failed, error %d\n", GetLastError()); + if (tests[test_idx].src_width == bitmap_width && tests[test_idx].src_height == bitmap_height) + { + ret = BitBlt(hdc_emf, 0, 0, bitmap_width, bitmap_height, hdc_bitmap, 0, 0, SRCCOPY); + ok(ret, "BitBlt failed, error %d\n", GetLastError()); + } + else + { + ret = StretchBlt(hdc_emf, 0, 0, bitmap_width, bitmap_height, hdc_bitmap, 0, 0, + tests[test_idx].src_width, tests[test_idx].src_height, SRCCOPY); + ok(ret, "StretchBlt failed, error %d\n", GetLastError()); + } + + hemf = CloseEnhMetaFile(hdc_emf); + ok(!!hemf, "CloseEnhMetaFile failed, error %d\n", GetLastError()); + + ret = compare_emf_bits(hemf, tests[test_idx].bits, tests[test_idx].bits_count, + "test_emf_BitBlt", FALSE); + if (ret) + { + dump_emf_bits(hemf, "test_emf_BitBlt"); + dump_emf_records(hemf, "test_emf_BitBlt"); + } + + DeleteEnhMetaFile(hemf); + SelectObject(hdc_bitmap, old_hbitmap); + DeleteDC(hdc_bitmap); + DeleteObject(hbitmap); + + winetest_pop_context(); } - SelectObject(hdcBitmap, hOldBitmap); - DeleteObject(hBitmap); - DeleteDC(hdcBitmap); - DeleteDC(hdcDisplay); -#undef BMP_DIM + ReleaseDC(0, hdc); } static void test_emf_DCBrush(void) -- 2.30.2

3 2

[PATCH v2 3/6] gdi32: Use a common helper for emf StretchBlt and AlphaBlend.
by Zhiyi Zhang 07 Jun '21

07 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/bitblt.c | 129 +++++++---------------------------- 1 file changed, 23 insertions(+), 106 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index 597a6110abd..f15acaa1f14 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -27,15 +27,17 @@ #include "enhmetafiledrv.h" #include "wine/debug.h" -BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, - PHYSDEV dev_src, struct bitblt_coords *src, BLENDFUNCTION func ) +/* Generate an EMRBITBLT, EMRSTRETCHBLT or EMRALPHABLEND record depending on the type parameter */ +static BOOL emfdrv_stretchblt( PHYSDEV dev_dst, struct bitblt_coords *dst, PHYSDEV dev_src, + struct bitblt_coords *src, DWORD rop, DWORD type ) { unsigned char src_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; BITMAPINFO *src_info = (BITMAPINFO *)src_buffer; UINT bits_size, bmi_size, emr_size, size, bpp; + EMRSTRETCHBLT *emr_stretchblt; struct gdi_image_bits bits; - EMRALPHABLEND *emr; BITMAPINFO *bmi; + EMRBITBLT *emr; DC *dc_src; DWORD err; BOOL ret = FALSE; @@ -56,14 +58,15 @@ BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, bmi_size = sizeof(BITMAPINFOHEADER) + 3 * sizeof(RGBQUAD); else bmi_size = sizeof(BITMAPINFOHEADER); - emr_size = sizeof(EMRALPHABLEND); + /* EMRSTRETCHBLT and EMRALPHABLEND have the same structure */ + emr_size = type == EMR_BITBLT ? sizeof(EMRBITBLT) : sizeof(EMRSTRETCHBLT); bits_size = src_info->bmiHeader.biSizeImage; size = emr_size + bmi_size + bits_size; emr = HeapAlloc(GetProcessHeap(), 0, size); if (!emr) goto err; - emr->emr.iType = EMR_ALPHABLEND; + emr->emr.iType = type; emr->emr.nSize = size; emr->rclBounds.left = dst->log_x; emr->rclBounds.top = dst->log_y; @@ -75,9 +78,13 @@ BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, emr->cyDest = dst->log_height; emr->xSrc = src->log_x; emr->ySrc = src->log_y; - emr->cxSrc = src->log_width; - emr->cySrc = src->log_height; - emr->dwRop = *(DWORD *)&func; + if (type == EMR_STRETCHBLT || type == EMR_ALPHABLEND) + { + emr_stretchblt = (EMRSTRETCHBLT *)emr; + emr_stretchblt->cxSrc = src->log_width; + emr_stretchblt->cySrc = src->log_height; + } + emr->dwRop = rop; GetTransform(dev_src->hdc, 0x204, &emr->xformSrc); emr->crBkColorSrc = GetBkColor(dev_src->hdc); emr->iUsageSrc = DIB_RGB_COLORS; @@ -115,6 +122,12 @@ err: return ret; } +BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, + PHYSDEV dev_src, struct bitblt_coords *src, BLENDFUNCTION func ) +{ + return emfdrv_stretchblt(dev_dst, dst, dev_src, src, *(DWORD *)&func, EMR_ALPHABLEND); +} + BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) { EMRBITBLT emr; @@ -155,106 +168,10 @@ BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) BOOL CDECL EMFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) { - BOOL ret; - PEMRBITBLT pEMR; - UINT emrSize; - UINT bmiSize; - UINT bitsSize; - UINT size; - BITMAP BM; - WORD nBPP = 0; - LPBITMAPINFOHEADER lpBmiH; - HBITMAP hBitmap = NULL; - DWORD emrType; - - if (devSrc->funcs == devDst->funcs) return FALSE; /* can't use a metafile DC as source */ - if (src->log_width == dst->log_width && src->log_height == dst->log_height) - { - emrType = EMR_BITBLT; - emrSize = sizeof(EMRBITBLT); - } + return emfdrv_stretchblt(devDst, dst, devSrc, src, rop, EMR_BITBLT); else - { - emrType = EMR_STRETCHBLT; - emrSize = sizeof(EMRSTRETCHBLT); - } - - hBitmap = GetCurrentObject(devSrc->hdc, OBJ_BITMAP); - - if(sizeof(BITMAP) != GetObjectW(hBitmap, sizeof(BITMAP), &BM)) - return FALSE; - - nBPP = BM.bmPlanes * BM.bmBitsPixel; - if(nBPP > 8) nBPP = 24; /* FIXME Can't get 16bpp to work for some reason */ - bitsSize = get_dib_stride( BM.bmWidth, nBPP ) * BM.bmHeight; - bmiSize = sizeof(BITMAPINFOHEADER) + - (nBPP <= 8 ? 1 << nBPP : 0) * sizeof(RGBQUAD); - - size = emrSize + bmiSize + bitsSize; - - pEMR = HeapAlloc(GetProcessHeap(), 0, size); - if (!pEMR) return FALSE; - - /* Initialize EMR */ - pEMR->emr.iType = emrType; - pEMR->emr.nSize = size; - pEMR->rclBounds.left = dst->log_x; - pEMR->rclBounds.top = dst->log_y; - pEMR->rclBounds.right = dst->log_x + dst->log_width - 1; - pEMR->rclBounds.bottom = dst->log_y + dst->log_height - 1; - pEMR->xDest = dst->log_x; - pEMR->yDest = dst->log_y; - pEMR->cxDest = dst->log_width; - pEMR->cyDest = dst->log_height; - pEMR->dwRop = rop; - pEMR->xSrc = src->log_x; - pEMR->ySrc = src->log_y; - GetTransform(devSrc->hdc, 0x204, &pEMR->xformSrc); - pEMR->crBkColorSrc = GetBkColor(devSrc->hdc); - pEMR->iUsageSrc = DIB_RGB_COLORS; - pEMR->offBmiSrc = emrSize; - pEMR->offBitsSrc = emrSize + bmiSize; - pEMR->cbBmiSrc = bmiSize; - pEMR->cbBitsSrc = bitsSize; - if (emrType == EMR_STRETCHBLT) - { - PEMRSTRETCHBLT pEMRStretch = (PEMRSTRETCHBLT)pEMR; - pEMRStretch->cxSrc = src->log_width; - pEMRStretch->cySrc = src->log_height; - } - - /* Initialize BITMAPINFO structure */ - lpBmiH = (LPBITMAPINFOHEADER)((BYTE*)pEMR + pEMR->offBmiSrc); - - lpBmiH->biSize = sizeof(BITMAPINFOHEADER); - lpBmiH->biWidth = BM.bmWidth; - lpBmiH->biHeight = BM.bmHeight; - lpBmiH->biPlanes = BM.bmPlanes; - lpBmiH->biBitCount = nBPP; - /* Assume the bitmap isn't compressed and set the BI_RGB flag. */ - lpBmiH->biCompression = BI_RGB; - lpBmiH->biSizeImage = bitsSize; - lpBmiH->biYPelsPerMeter = 0; - lpBmiH->biXPelsPerMeter = 0; - lpBmiH->biClrUsed = nBPP <= 8 ? 1 << nBPP : 0; - /* Set biClrImportant to 0, indicating that all of the - device colors are important. */ - lpBmiH->biClrImportant = 0; - - /* Initialize bitmap bits */ - if (GetDIBits(devSrc->hdc, hBitmap, 0, (UINT)lpBmiH->biHeight, - (BYTE*)pEMR + pEMR->offBitsSrc, - (LPBITMAPINFO)lpBmiH, DIB_RGB_COLORS)) - { - ret = EMFDRV_WriteRecord(devDst, (EMR*)pEMR); - if (ret) EMFDRV_UpdateBBox(devDst, &(pEMR->rclBounds)); - } - else - ret = FALSE; - - HeapFree( GetProcessHeap(), 0, pEMR); - return ret; + return emfdrv_stretchblt(devDst, dst, devSrc, src, rop, EMR_STRETCHBLT); } INT CDECL EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst, -- 2.30.2

2 1

[PATCH v2 2/6] gdi32: Implement MFDRV_SetLayout().
by Zhiyi Zhang 07 Jun '21

07 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/mfdrv/dc.c | 5 +++ dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 + dlls/gdi32/tests/metafile.c | 79 ++++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 61417bfd462..a036efe2d17 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -85,6 +85,11 @@ INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) return MFDRV_MetaParam2( dev, META_OFFSETCLIPRGN, x, y ); } +DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) +{ + return MFDRV_MetaParam2( dev, META_SETLAYOUT, HIWORD(layout), LOWORD(layout) ); +} + INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) { return MFDRV_MetaParam1( dev, META_SETMAPMODE, mode ); diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 2a215b70902..fe7aae631d7 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -201,7 +201,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ - NULL, /* pSetLayout */ + MFDRV_SetLayout, /* pSetLayout */ MFDRV_SetMapMode, /* pSetMapMode */ MFDRV_SetMapperFlags, /* pSetMapperFlags */ MFDRV_SetPixel, /* pSetPixel */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 7d3d1c41da5..429b95b3f40 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -113,6 +113,7 @@ extern COLORREF CDECL MFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_H extern INT CDECL MFDRV_SetBkMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index ab823dd443d..83a10264589 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -5072,6 +5072,84 @@ static void test_emf_text_extents(void) ReleaseDC(0, dc); } +static const unsigned char MF_SETLAYOUT_BITS[] = +{ +/* Winedump output. Note that there is no META_SELECTOBJECT records after META_SETLAYOUT. + * + * METAHEADER 00000012 + * type 1 header_size 0x12 version 0x300 size 0x54 object_count 0 max_record_size 0xa parameter_count 0 + * 0001 0009 0300 002a 0000 0000 0005 0000 + * 0000 + * META_SETLAYOUT 0000000a + * 0000 0000 + * META_SETLAYOUT 0000000a + * 0001 0000 + * META_SETLAYOUT 0000000a + * 0008 0000 + * META_SETLAYOUT 0000000a + * 0000 8000 + * META_SETLAYOUT 0000000a + * 0009 0000 + * META_SETLAYOUT 0000000a + * 0001 8000 + * META_EOF 00000006 + */ + 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0x2a, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x49, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x49, 0x01, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, + 0x00, 0x00, 0x49, 0x01, 0x08, 0x00, 0x00, 0x00, + 0x05, 0x00, 0x00, 0x00, 0x49, 0x01, 0x00, 0x00, + 0x00, 0x80, 0x05, 0x00, 0x00, 0x00, 0x49, 0x01, + 0x09, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x49, 0x01, 0x01, 0x00, 0x00, 0x80, 0x03, 0x00, + 0x00, 0x00, 0x00, 0x00 +}; + +static void test_mf_SetLayout(void) +{ + static const DWORD tests[] = + { + LAYOUT_LTR, + LAYOUT_RTL, + LAYOUT_BITMAPORIENTATIONPRESERVED, + NOMIRRORBITMAP, + LAYOUT_RTL | LAYOUT_BITMAPORIENTATIONPRESERVED, + LAYOUT_RTL | NOMIRRORBITMAP, + }; + DWORD layout; + HMETAFILE mf; + int ret, i; + HDC mf_dc; + + mf_dc = CreateMetaFileW(NULL); + ok(!!mf_dc, "CreateMetaFileW failed, error %d\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("Test %d", i); + layout = SetLayout(mf_dc, tests[i]); + ok(layout == LAYOUT_RTL, "Expected %#x, got %#x\n", tests[i], layout); + layout = GetLayout(mf_dc); + todo_wine ok(layout == GDI_ERROR, "Expected %#x, got %#x\n", GDI_ERROR, layout); + winetest_pop_context(); + } + + mf = CloseMetaFile(mf_dc); + ok(!!mf, "CloseMetaFile failed, error %d\n", GetLastError()); + + ret = compare_mf_bits(mf, MF_SETLAYOUT_BITS, sizeof(MF_SETLAYOUT_BITS), "mf_SetLayout"); + ok(!ret, "Bits mismatch\n"); + if (ret) + { + dump_mf_bits(mf, "mf_SetLayout"); + EnumMetaFile(0, mf, mf_enum_proc, 0); + } + + DeleteMetaFile(mf); +} + START_TEST(metafile) { init_function_pointers(); @@ -5103,6 +5181,7 @@ START_TEST(metafile) test_mf_ExtTextOut_on_path(); test_mf_clipping(); test_mf_GetPath(); + test_mf_SetLayout(); /* For metafile conversions */ test_mf_conversions(); -- 2.30.2

2 1

[PATCH v2 1/6] gdi32: Return correct color depth for display DCs in GetDeviceCaps().
by Zhiyi Zhang 07 Jun '21

07 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29184 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 205834 and 205844~205848. Now that winex11.drv EnumDisplaySettingsW backend has a cache, performance shouldn't be an issue. dlls/gdi32/driver.c | 19 ++++++++++++++++++- dlls/user32/tests/monitor.c | 1 - dlls/winex11.drv/init.c | 2 -- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index a2ebd018bca..2042701dd45 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -460,7 +460,24 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) return pGetSystemMetrics ? pGetSystemMetrics( SM_CYSCREEN ) : 480; } - case BITSPIXEL: return 32; + case BITSPIXEL: + { + DEVMODEW devmode; + WCHAR *display; + DC *dc; + + if (GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY && pEnumDisplaySettingsW) + { + dc = get_nulldrv_dc( dev ); + display = dc->display[0] ? dc->display : NULL; + memset( &devmode, 0, sizeof(devmode) ); + devmode.dmSize = sizeof(devmode); + if (pEnumDisplaySettingsW( display, ENUM_CURRENT_SETTINGS, &devmode ) + && devmode.dmFields & DM_BITSPERPEL && devmode.dmBitsPerPel) + return devmode.dmBitsPerPel; + } + return 32; + } case PLANES: return 1; case NUMBRUSHES: return -1; case NUMPENS: return -1; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index ab03837f5e6..654f77ed617 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2068,7 +2068,6 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ dm->dmDisplayFrequency, value); value = GetDeviceCaps(hdc, BITSPIXEL); - todo_wine_if(dm->dmBitsPerPel != 32) ok_(__FILE__, line)(value == dm->dmBitsPerPel, "Expected BITSPIXEL %d, got %d.\n", dm->dmBitsPerPel, value); diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index d070c0f1171..ff3d5317697 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -162,8 +162,6 @@ static INT CDECL X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { switch(cap) { - case BITSPIXEL: - return screen_bpp; case SIZEPALETTE: return palette_size; default: -- 2.30.2

3 2

[PATCH] gdi32/tests: Test otmEMSquare only for Truetype fonts.
by Dmitry Timoshkov 07 Jun '21

07 Jun '21

It looks like GetOutlineTextMetrics no longer fails for bitmat fonts under Windows 10. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51184 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ed0acf8243a..ffb400ba838 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -353,7 +353,8 @@ if (0) /* these metrics are scaled too, but with rounding errors */ ok(otm.otmMacDescent < 0, "otm.otmMacDescent should be < 0\n"); ok(tm.tmDescent > 0, "tm.tmDescent should be > 0\n"); ok(otm.otmMacDescent == -tm.tmDescent, "descent %d != %d\n", otm.otmMacDescent, -tm.tmDescent); - ok(otm.otmEMSquare == 2048, "expected 2048, got %d\n", otm.otmEMSquare); + if (otm.otmTextMetrics.tmPitchAndFamily & TMPF_TRUETYPE) + ok(otm.otmEMSquare == 2048, "expected 2048, got %d\n", otm.otmEMSquare); } else { -- 2.31.1

2 1

[PATCH] msvcrt: Fix logf implementation.
by Piotr Caban 07 Jun '21

07 Jun '21

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=51222 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH] shell32: Fix a memory leak.
by Haidong Yu 07 Jun '21

07 Jun '21

1 0

[PATCH 1/6] hid/tests: Don't print buttons after HidP_GetUsages failed.
by Rémi Bernon 07 Jun '21

07 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This test still seems to timeout very rarely on 32bit, I couldn't reproduce locally though... dlls/hid/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index 3dd22b7f068..6693bc8bf5a 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -215,7 +215,7 @@ static void process_data(HIDP_CAPS Caps, PHIDP_PREPARSED_DATA ppd, CHAR *data, D status = HidP_GetUsages(HidP_Input, i, 0, button_pages, &usage_length, ppd, data, data_length); ok (status == HIDP_STATUS_SUCCESS || usage_length == 0, "HidP_GetUsages failed (%x) but usage length still %i\n", status, usage_length); - if (usage_length) + if (status == HIDP_STATUS_SUCCESS && usage_length) { CHAR report[50]; int count; -- 2.31.0

2 6

[PATCH] hidclass.sys: Don't crash when no buffer was provided.
by Rémi Bernon 07 Jun '21

07 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This happens when reading a 0 byte report. It's probably not supposed to be done, but I think crashing winedevice.exe in that case isn't good either. dlls/hidclass.sys/device.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 73ea6610ab8..82366ad1888 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -345,6 +345,12 @@ static NTSTATUS HID_get_feature(BASE_DEVICE_EXTENSION *ext, IRP *irp) out_buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", ext, irpsp->Parameters.DeviceIoControl.OutputBufferLength, out_buffer); + if (!irpsp->Parameters.DeviceIoControl.OutputBufferLength || !out_buffer) + { + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + return rc; + } + len = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength; packet = malloc(len); packet->reportBufferLen = irpsp->Parameters.DeviceIoControl.OutputBufferLength; @@ -495,6 +501,12 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) BYTE *buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); ULONG out_length; + if (!irpsp->Parameters.DeviceIoControl.OutputBufferLength || !buffer) + { + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + break; + } + packet = malloc(packet_size); if (ext->u.pdo.preparsed_data->reports[0].reportID) -- 2.31.0

1 0

[PATCH] include: Add HID haptics usage page.
by Rémi Bernon 07 Jun '21

07 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/hidusage.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/hidusage.h b/include/hidusage.h index fc77dff2c6b..002040bddc0 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -196,6 +196,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_TELEPHONY ((USAGE) 0x0B) #define HID_USAGE_PAGE_CONSUMER ((USAGE) 0x0C) #define HID_USAGE_PAGE_DIGITIZER ((USAGE) 0x0D) +#define HID_USAGE_PAGE_HAPTICS ((USAGE) 0x0E) #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) #define HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN ((USAGE) 0xff00) @@ -224,6 +225,33 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_TELEPHONY_KEYPAD_D ((USAGE) 0xBF) #define HID_USAGE_TELEPHONY_HOST_AVAILABLE ((USAGE) 0xF1) +#define HID_USAGE_HAPTICS_SIMPLE_CONTROLLER ((USAGE) 0x01) +#define HID_USAGE_HAPTICS_WAVEFORM_LIST ((USAGE) 0x10) +#define HID_USAGE_HAPTICS_DURATION_LIST ((USAGE) 0x11) +#define HID_USAGE_HAPTICS_AUTO_TRIGGER ((USAGE) 0x20) +#define HID_USAGE_HAPTICS_MANUAL_TRIGGER ((USAGE) 0x21) +#define HID_USAGE_HAPTICS_AUTO_ASSOCIATED_CONTROL ((USAGE) 0x22) +#define HID_USAGE_HAPTICS_INTENSITY ((USAGE) 0x23) +#define HID_USAGE_HAPTICS_REPEAT_COUNT ((USAGE) 0x24) +#define HID_USAGE_HAPTICS_RETRIGGER_PERIOD ((USAGE) 0x25) +#define HID_USAGE_HAPTICS_WAVEFORM_VENDOR_PAGE ((USAGE) 0x26) +#define HID_USAGE_HAPTICS_WAVEFORM_VENDOR_ID ((USAGE) 0x27) +#define HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME ((USAGE) 0x28) +#define HID_USAGE_HAPTICS_WAVEFORM_BEGIN ((USAGE) 0x1000) +/* Differs from https://usb.org/sites/default/files/hut1_22.pdf */ +/* Waveform None */ +#define HID_USAGE_HAPTICS_WAVEFORM_STOP ((USAGE) 0x1001) +/* Waveform Stop */ +#define HID_USAGE_HAPTICS_WAVEFORM_NULL ((USAGE) 0x1002) +#define HID_USAGE_HAPTICS_WAVEFORM_CLICK ((USAGE) 0x1003) +#define HID_USAGE_HAPTICS_WAVEFORM_BUZZ ((USAGE) 0x1004) +#define HID_USAGE_HAPTICS_WAVEFORM_RUMBLE ((USAGE) 0x1005) +#define HID_USAGE_HAPTICS_WAVEFORM_PRESS ((USAGE) 0x1006) +#define HID_USAGE_HAPTICS_WAVEFORM_RELEASE ((USAGE) 0x1007) +#define HID_USAGE_HAPTICS_WAVEFORM_END ((USAGE) 0x1FFF) +#define HID_USAGE_HAPTICS_WAVEFORM_VENDOR_BEGIN ((USAGE) 0x2000) +#define HID_USAGE_HAPTICS_WAVEFORM_VENDOR_END ((USAGE) 0x2FFF) + #define HID_USAGE_MS_BTH_HF_DIALNUMBER ((USAGE) 0x21) #define HID_USAGE_MS_BTH_HF_DIALMEMORY ((USAGE) 0x22) -- 2.31.0

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel