- wine-devel - winehq.org

[PATCH 1/6] opcservices: Store part properties on creation.
by Nikolay Sivov 04 Sep '18

04 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/Makefile.in | 2 +- dlls/opcservices/package.c | 61 ++++++++++++++++++++++++---- dlls/opcservices/tests/opcservices.c | 24 +++++++++++ 3 files changed, 79 insertions(+), 8 deletions(-) diff --git a/dlls/opcservices/Makefile.in b/dlls/opcservices/Makefile.in index 651cb411d7..47fbbe4cca 100644 --- a/dlls/opcservices/Makefile.in +++ b/dlls/opcservices/Makefile.in @@ -1,5 +1,5 @@ MODULE = opcservices.dll -IMPORTS = uuid +IMPORTS = uuid ole32 C_SRCS = \ factory.c \ diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index a3a2fabce7..e673f0c892 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -23,6 +23,7 @@ #include "winbase.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "opc_private.h" @@ -40,6 +41,10 @@ struct opc_part { IOpcPart IOpcPart_iface; LONG refcount; + + IOpcPartUri *name; + WCHAR *content_type; + DWORD compression_options; }; struct opc_part_set @@ -63,6 +68,24 @@ static inline struct opc_part *impl_from_IOpcPart(IOpcPart *iface) return CONTAINING_RECORD(iface, struct opc_part, IOpcPart_iface); } +static WCHAR *opc_strdupW(const WCHAR *str) +{ + WCHAR *ret = NULL; + + if (str) + { + size_t size; + + size = (strlenW(str) + 1) * sizeof(WCHAR); + ret = CoTaskMemAlloc(size); + if (ret) + memcpy(ret, str, size); + } + + return ret; +} + + static HRESULT WINAPI opc_part_QueryInterface(IOpcPart *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -97,7 +120,11 @@ static ULONG WINAPI opc_part_Release(IOpcPart *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + IOpcPartUri_Release(part->name); + CoTaskMemFree(part->content_type); heap_free(part); + } return refcount; } @@ -118,16 +145,24 @@ static HRESULT WINAPI opc_part_GetContentStream(IOpcPart *iface, IStream **strea static HRESULT WINAPI opc_part_GetName(IOpcPart *iface, IOpcPartUri **name) { - FIXME("iface %p, name %p stub!\n", iface, name); + struct opc_part *part = impl_from_IOpcPart(iface); - return E_NOTIMPL; + TRACE("iface %p, name %p.\n", iface, name); + + *name = part->name; + IOpcPartUri_AddRef(*name); + + return S_OK; } static HRESULT WINAPI opc_part_GetContentType(IOpcPart *iface, LPWSTR *type) { - FIXME("iface %p, type %p stub!\n", iface, type); + struct opc_part *part = impl_from_IOpcPart(iface); - return E_NOTIMPL; + TRACE("iface %p, type %p.\n", iface, type); + + *type = opc_strdupW(part->content_type); + return *type ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI opc_part_GetCompressionOptions(IOpcPart *iface, OPC_COMPRESSION_OPTIONS *options) @@ -149,15 +184,27 @@ static const IOpcPartVtbl opc_part_vtbl = opc_part_GetCompressionOptions, }; -static HRESULT opc_part_create(IOpcPart **out) +static HRESULT opc_part_create(IOpcPartUri *name, const WCHAR *content_type, + DWORD compression_options, IOpcPart **out) { struct opc_part *part; + if (!name) + return E_POINTER; + if (!(part = heap_alloc_zero(sizeof(*part)))) return E_OUTOFMEMORY; part->IOpcPart_iface.lpVtbl = &opc_part_vtbl; part->refcount = 1; + part->name = name; + IOpcPartUri_AddRef(name); + part->compression_options = compression_options; + if (!(part->content_type = opc_strdupW(content_type))) + { + IOpcPart_Release(&part->IOpcPart_iface); + return E_OUTOFMEMORY; + } *out = &part->IOpcPart_iface; TRACE("Created part %p.\n", *out); @@ -213,10 +260,10 @@ static HRESULT WINAPI opc_part_set_GetPart(IOpcPartSet *iface, IOpcPartUri *name static HRESULT WINAPI opc_part_set_CreatePart(IOpcPartSet *iface, IOpcPartUri *name, LPCWSTR content_type, OPC_COMPRESSION_OPTIONS compression_options, IOpcPart **part) { - FIXME("iface %p, name %p, content_type %s, compression_options %#x, part %p stub!\n", iface, name, + TRACE("iface %p, name %p, content_type %s, compression_options %#x, part %p.\n", iface, name, debugstr_w(content_type), compression_options, part); - return opc_part_create(part); + return opc_part_create(name, content_type, compression_options, part); } static HRESULT WINAPI opc_part_set_DeletePart(IOpcPartSet *iface, IOpcPartUri *name) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index e257c6ea2c..9ef44e6cc3 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -36,10 +36,15 @@ static IOpcFactory *create_factory(void) static void test_package(void) { + static const WCHAR typeW[] = {'t','y','p','e','/','s','u','b','t','y','p','e',0}; + static const WCHAR uriW[] = {'/','u','r','i',0}; IOpcPartSet *partset, *partset2; + IOpcPartUri *part_uri; IOpcFactory *factory; IOpcPackage *package; + IOpcPart *part; HRESULT hr; + BOOL ret; factory = create_factory(); @@ -58,6 +63,25 @@ static void test_package(void) ok(SUCCEEDED(hr), "Failed to create a part set, hr %#x.\n", hr); ok(partset == partset2, "Expected same part set instance.\n"); + /* CreatePart */ + hr = IOpcFactory_CreatePartUri(factory, uriW, &part_uri); + ok(SUCCEEDED(hr), "Failed to create part uri, hr %#x.\n", hr); + + hr = IOpcPartSet_CreatePart(partset, NULL, typeW, OPC_COMPRESSION_NONE, &part); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IOpcPartSet_CreatePart(partset, part_uri, typeW, OPC_COMPRESSION_NONE, &part); + ok(SUCCEEDED(hr), "Failed to create a part, hr %#x.\n", hr); + + ret = FALSE; + hr = IOpcPartSet_PartExists(partset, part_uri, &ret); +todo_wine { + ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + ok(ret, "Expected part to exist.\n"); +} + IOpcPartUri_Release(part_uri); + IOpcPart_Release(part); + IOpcPackage_Release(package); IOpcFactory_Release(factory); -- 2.18.0

1 5

[PATCH] ws2_32/tests: Mark the IPX-not-supported error code test as todo
by Alex Henrie 04 Sep '18

04 Sep '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Wine returns WSAEPROTONOSUPPORT in this case, but all versions of Windows since XP at least return WSAEAFNOSUPPORT. This fixes the test failure on my Arch laptop, and should fix the test failures on Gentoo. --- dlls/ws2_32/tests/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b32d1c053d..c058869059 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2773,6 +2773,7 @@ static void test_WSASocket(void) if (sock == INVALID_SOCKET) { err = WSAGetLastError(); +todo_wine ok(err == WSAEAFNOSUPPORT || broken(err == WSAEPROTONOSUPPORT), "Expected 10047, received %d\n", err); skip("IPX is not supported\n"); } -- 2.18.0

2 1

[PATCH] opengl/tests: Don't run Pbuffer tests if no Pbuffer can be created
by Alex Henrie 04 Sep '18

04 Sep '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This should fix the test failures on Debian. --- dlls/opengl32/tests/opengl.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index b69d91caf9..8105201a79 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -194,17 +194,18 @@ static void test_pbuffers(HDC hdc) { HDC pbuffer_hdc; HPBUFFERARB pbuffer = pwglCreatePbufferARB(hdc, iPixelFormat, 640 /* width */, 480 /* height */, NULL); - if(!pbuffer) - skip("Pbuffer creation failed!\n"); - - /* Test the pixelformat returned by GetPixelFormat on a pbuffer as the behavior is not clear */ - pbuffer_hdc = pwglGetPbufferDCARB(pbuffer); - res = GetPixelFormat(pbuffer_hdc); - - ok(res == 1, "Unexpected iPixelFormat=%d (1 expected) returned by GetPixelFormat for offscreen format %d\n", res, iPixelFormat); - trace("iPixelFormat returned by GetPixelFormat: %d\n", res); - trace("PixelFormat from wglChoosePixelFormatARB: %d\n", iPixelFormat); - pwglReleasePbufferDCARB(pbuffer, hdc); + if(pbuffer) + { + /* Test the pixelformat returned by GetPixelFormat on a pbuffer as the behavior is not clear */ + pbuffer_hdc = pwglGetPbufferDCARB(pbuffer); + res = GetPixelFormat(pbuffer_hdc); + + ok(res == 1, "Unexpected iPixelFormat=%d (1 expected) returned by GetPixelFormat for offscreen format %d\n", res, iPixelFormat); + trace("iPixelFormat returned by GetPixelFormat: %d\n", res); + trace("PixelFormat from wglChoosePixelFormatARB: %d\n", iPixelFormat); + pwglReleasePbufferDCARB(pbuffer, hdc); + } + else skip("Pbuffer creation failed!\n"); } else skip("Pbuffer test for offscreen pixelformat skipped as no offscreen-only format with pbuffer capabilities has been found\n"); } -- 2.18.0

1 0

[PATCH resend3] shell32/tests: Mark a shell dispatch test as todo on x64 and ARM
by Alex Henrie 04 Sep '18

04 Sep '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/tests/shelldispatch.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 5191d5e970..0d38cd02d7 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1025,6 +1025,9 @@ static void test_ShellWindows(void) hr = CoCreateInstance(&CLSID_ShellWindows, NULL, CLSCTX_LOCAL_SERVER, &IID_IShellWindows, (void**)&shellwindows); +#ifndef __i386__ +todo_wine +#endif ok(hr == S_OK, "got 0x%08x\n", hr); /* TODO: remove when explorer startup with clean prefix is fixed */ if (hr != S_OK) -- 2.18.0

1 0

[PATCH] ddraw: Accept d3d1 and d3d2 versions of D3DFINDDEVICERESULT in IDirect3D_FindDevice.
by Alistair Leslie-Hughes 04 Sep '18

04 Sep '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ddraw/ddraw.c | 24 +++++++++++++++++++---- dlls/ddraw/tests/d3d.c | 14 ++++++++++++++ include/d3dcaps.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e60c5f3..f62464c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4045,8 +4045,8 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd if (!fds || !fdr) return DDERR_INVALIDPARAMS; - if (fds->dwSize != sizeof(D3DFINDDEVICESEARCH) - || fdr->dwSize != sizeof(D3DFINDDEVICERESULT)) + if (fds->dwSize != sizeof(D3DFINDDEVICESEARCH) || (fdr->dwSize != sizeof(D3DFINDDEVICERESULT1) && + fdr->dwSize != sizeof(D3DFINDDEVICERESULT2) && fdr->dwSize != sizeof(D3DFINDDEVICERESULT))) return DDERR_INVALIDPARAMS; if ((fds->dwFlags & D3DFDS_COLORMODEL) @@ -4075,8 +4075,24 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd /* Now return our own GUID */ ddraw_d3dcaps1_from_7(&desc1, &desc7); fdr->guid = IID_D3DDEVICE_WineD3D; - fdr->ddHwDesc = desc1; - fdr->ddSwDesc = desc1; + + if (fdr->dwSize == sizeof(D3DFINDDEVICERESULT1)) + { + D3DFINDDEVICERESULT1 *fdr1 = (D3DFINDDEVICERESULT1 *)fdr; + memcpy(&fdr1->ddHwDesc, &desc1, sizeof(fdr1->ddHwDesc)); + memcpy(&fdr1->ddSwDesc, &desc1, sizeof(fdr1->ddSwDesc)); + } + else if (fdr->dwSize == sizeof(D3DFINDDEVICERESULT2)) + { + D3DFINDDEVICERESULT2 *fdr2 = (D3DFINDDEVICERESULT2 *)fdr; + memcpy(&fdr2->ddHwDesc, &desc1, sizeof(fdr2->ddHwDesc)); + memcpy(&fdr2->ddSwDesc, &desc1, sizeof(fdr2->ddSwDesc)); + } + else + { + fdr->ddHwDesc = desc1; + fdr->ddSwDesc = desc1; + } TRACE("Returning Wine's wined3d device with (undumped) capabilities.\n"); diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index ec0f8d7..8ecb2f8 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1631,6 +1631,8 @@ static void FindDevice(void) D3DFINDDEVICESEARCH search = {0}; D3DFINDDEVICERESULT result = {0}; + D3DFINDDEVICERESULT1 result1 = {0}; + D3DFINDDEVICERESULT2 result2 = {0}; IDirect3DDevice *d3dhal; HRESULT hr; int i; @@ -1671,6 +1673,18 @@ static void FindDevice(void) ok(hr == D3D_OK, "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); + result1.dwSize = sizeof(result1); + + hr = IDirect3D_FindDevice(Direct3D1, &search, (D3DFINDDEVICERESULT *)&result1); + ok(hr == D3D_OK, + "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); + + result2.dwSize = sizeof(result2); + + hr = IDirect3D_FindDevice(Direct3D1, &search, (D3DFINDDEVICERESULT *)&result2); + ok(hr == D3D_OK, + "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); + /* Try an arbitrary non-device GUID. */ search.dwSize = sizeof(search); search.dwFlags = D3DFDS_GUID; diff --git a/include/d3dcaps.h b/include/d3dcaps.h index 4fc76ba..51e3efa 100644 --- a/include/d3dcaps.h +++ b/include/d3dcaps.h @@ -193,6 +193,44 @@ typedef struct _D3dPrimCaps { #define D3DPTADDRESSCAPS_BORDER 0x00000008 #define D3DPTADDRESSCAPS_INDEPENDENTUV 0x00000010 +typedef struct _D3DDeviceDesc1 { + DWORD dwSize; + DWORD dwFlags; + D3DCOLORMODEL dcmColorModel; + DWORD dwDevCaps; + D3DTRANSFORMCAPS dtcTransformCaps; + BOOL bClipping; + D3DLIGHTINGCAPS dlcLightingCaps; + D3DPRIMCAPS dpcLineCaps; + D3DPRIMCAPS dpcTriCaps; + DWORD dwDeviceRenderBitDepth; + DWORD dwDeviceZBufferBitDepth; + DWORD dwMaxBufferSize; + DWORD dwMaxVertexCount; +} D3DDEVICEDESC1,*LPD3DDEVICEDESC1; +#define D3DDEVICEDESCSIZE1 (sizeof(D3DDEVICEDESC1)) + +typedef struct _D3DDeviceDesc2 { + DWORD dwSize; + DWORD dwFlags; + D3DCOLORMODEL dcmColorModel; + DWORD dwDevCaps; + D3DTRANSFORMCAPS dtcTransformCaps; + BOOL bClipping; + D3DLIGHTINGCAPS dlcLightingCaps; + D3DPRIMCAPS dpcLineCaps; + D3DPRIMCAPS dpcTriCaps; + DWORD dwDeviceRenderBitDepth; + DWORD dwDeviceZBufferBitDepth; + DWORD dwMaxBufferSize; + DWORD dwMaxVertexCount; + + DWORD dwMinTextureWidth,dwMinTextureHeight; + DWORD dwMaxTextureWidth,dwMaxTextureHeight; + DWORD dwMinStippleWidth,dwMaxStippleWidth; + DWORD dwMinStippleHeight,dwMaxStippleHeight; +} D3DDEVICEDESC2,*LPD3DDEVICEDESC2; +#define D3DDEVICEDESCSIZE2 (sizeof(D3DDEVICEDESC2)) typedef struct _D3DDeviceDesc { DWORD dwSize; @@ -382,6 +420,20 @@ typedef struct _D3DFINDDEVICESEARCH { D3DPRIMCAPS dpcPrimCaps; } D3DFINDDEVICESEARCH,*LPD3DFINDDEVICESEARCH; +typedef struct _D3DFINDDEVICERESULT1 { + DWORD dwSize; + GUID guid; + D3DDEVICEDESC1 ddHwDesc; + D3DDEVICEDESC1 ddSwDesc; +} D3DFINDDEVICERESULT1,*LPD3DFINDDEVICERESULT1; + +typedef struct _D3DFINDDEVICERESULT2 { + DWORD dwSize; + GUID guid; + D3DDEVICEDESC2 ddHwDesc; + D3DDEVICEDESC2 ddSwDesc; +} D3DFINDDEVICERESULT2,*LPD3DFINDDEVICERESULT2; + typedef struct _D3DFINDDEVICERESULT { DWORD dwSize; GUID guid; -- 1.9.1

1 0

[PATCH] dxgi: Implement Map()/Unmap().
by Nikolay Sivov 03 Sep '18

03 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxgi/surface.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 1f53b25a91..4b1b83b84a 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -182,16 +182,43 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface1 *iface, DXGI static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface1 *iface, DXGI_MAPPED_RECT *mapped_rect, UINT flags) { - FIXME("iface %p, mapped_rect %p, flags %#x stub!\n", iface, mapped_rect, flags); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); + struct wined3d_map_desc wined3d_map_desc; + DWORD wined3d_map_flags = 0; + HRESULT hr; + + TRACE("iface %p, mapped_rect %p, flags %#x.\n", iface, mapped_rect, flags); + + if (flags & DXGI_MAP_READ) + wined3d_map_flags |= WINED3D_MAP_READ; + if (flags & DXGI_MAP_WRITE) + wined3d_map_flags |= WINED3D_MAP_WRITE; + if (flags & DXGI_MAP_DISCARD) + wined3d_map_flags |= WINED3D_MAP_DISCARD; + + wined3d_mutex_lock(); + if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), 0, + &wined3d_map_desc, NULL, wined3d_map_flags))) + { + mapped_rect->Pitch = wined3d_map_desc.row_pitch; + mapped_rect->pBits = wined3d_map_desc.data; + } + wined3d_mutex_unlock(); - return E_NOTIMPL; + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_surface_Unmap(IDXGISurface1 *iface) { - FIXME("iface %p stub!\n", iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); + + TRACE("iface %p.\n", iface); - return E_NOTIMPL; + wined3d_mutex_lock(); + wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), 0); + wined3d_mutex_unlock(); + + return S_OK; } /* IDXGISurface1 methods */ -- 2.18.0

2 1

[PATCH] wined3d: Use raw blit for supported depth-stencil blits.
by Andrew Wesie 03 Sep '18

03 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45747 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> --- dlls/wined3d/surface.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a297d55..d1847be 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3406,9 +3406,13 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ else dst_location = dst_texture->resource.map_binding; + if ((flags & WINED3D_BLT_RAW) || (!scale && !convert && !resolve)) + blit_op = WINED3D_BLIT_OP_RAW_BLIT; + else + blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; + context = context_acquire(device, dst_texture, dst_sub_resource_idx); - valid_locations = device->blitter->ops->blitter_blit(device->blitter, - WINED3D_BLIT_OP_DEPTH_BLIT, context, + valid_locations = device->blitter->ops->blitter_blit(device->blitter, blit_op, context, src_texture, src_sub_resource_idx, src_texture->resource.draw_binding, &src_rect, dst_texture, dst_sub_resource_idx, dst_location, &dst_rect, NULL, filter); context_release(context); -- 2.7.4

2 1

[PATCH] server: Support ObjectTypeInformation in pipe objects.
by Jacek Caban 03 Sep '18

03 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45743 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 28 +++++++++++++++++++++++++++- server/named_pipe.c | 12 ++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-)

1 0

Wine staging 3.15 release
by Alistair Leslie-Hughes 03 Sep '18

03 Sep '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.15 (890 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Added * [45622] mfplat: Add MFTRegisterLocal/MFTUnRegisterLocal stubs * [45372] mfplat: Implement MFCreateMFByteStreamOnStream * [45617] mfplat: Implement MFCreateSample * [45715] mfplat: Implement MFCreateMemoryBuffer * [42631] winex11: Improve mouse support in Unity based games. * [39402] xaudio2_7: Support FXEcho interface in CreateFX Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: 2017 Just Dance * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] secur32/tests: Connect to test.winehq.org instead of www.winehq.org.
by Hans Leidekker 03 Sep '18

03 Sep '18

Also make the tests more strict. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/tests/schannel.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 1a37c5226a..2bd0e017f4 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -560,11 +560,11 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 2 || cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 4, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); } -static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: www.winehq.org\r\nConnection: close\r\n\r\n"; +static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: test.winehq.org\r\nConnection: close\r\n\r\n"; static void init_buffers(SecBufferDesc *desc, unsigned count, unsigned size) { @@ -690,7 +690,7 @@ static void test_communication(void) SecBufferDesc buffers[2]; SecBuffer *buf; - unsigned buf_size = 4000; + unsigned buf_size = 8192; unsigned char *data; unsigned data_size; @@ -700,7 +700,7 @@ static void test_communication(void) return; } - /* Create a socket and connect to www.winehq.org */ + /* Create a socket and connect to test.winehq.org */ ret = WSAStartup(0x0202, &wsa_data); if (ret) { @@ -708,10 +708,10 @@ static void test_communication(void) return; } - host = gethostbyname("www.winehq.org"); + host = gethostbyname("test.winehq.org"); if (!host) { - skip("Can't resolve www.winehq.org\n"); + skip("Can't resolve test.winehq.org\n"); return; } @@ -728,7 +728,7 @@ static void test_communication(void) ret = connect(sock, (struct sockaddr *)&addr, sizeof(addr)); if (ret == SOCKET_ERROR) { - skip("Can't connect to www.winehq.org\n"); + skip("Can't connect to test.winehq.org\n"); return; } @@ -806,7 +806,7 @@ todo_wine ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); - buffers[1].cBuffers = 4; + buffers[1].cBuffers = 1; buffers[1].pBuffers[0].cbBuffer = 0; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", @@ -865,10 +865,9 @@ todo_wine } ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); - ok(status == SEC_E_OK || broken(status == SEC_E_INVALID_TOKEN) /* WinNT */, - "InitializeSecurityContext failed: %08x\n", status); + ok(status == SEC_E_OK, "InitializeSecurityContext failed: %08x\n", status); if(status != SEC_E_OK) { - win_skip("Handshake failed\n"); + skip("Handshake failed\n"); return; } -- 2.11.0

1 0

[PATCH 1/2] shlwapi: Don't reuse a function for different methods.
by Nikolay Sivov 03 Sep '18

03 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/istream.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index 43f53ffc79..623232a047 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -274,9 +274,20 @@ static HRESULT WINAPI IStream_fnRevert(IStream *iface) } /************************************************************************** - * IStream_fnLockUnlockRegion + * IStream_fnLockRegion */ -static HRESULT WINAPI IStream_fnLockUnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, +static HRESULT WINAPI IStream_fnLockRegion(IStream *iface, ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, DWORD dwLockType) +{ + ISHFileStream *This = impl_from_IStream(iface); + TRACE("(%p,%s,%s,%d)\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); + return E_NOTIMPL; +} + +/************************************************************************** + * IStream_fnUnlockRegion + */ +static HRESULT WINAPI IStream_fnUnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { ISHFileStream *This = impl_from_IStream(iface); @@ -345,8 +356,8 @@ static const IStreamVtbl SHLWAPI_fsVTable = IStream_fnCopyTo, IStream_fnCommit, IStream_fnRevert, - IStream_fnLockUnlockRegion, - IStream_fnLockUnlockRegion, + IStream_fnLockRegion, + IStream_fnUnlockRegion, IStream_fnStat, IStream_fnClone }; -- 2.18.0

1 1

[PATCH] comctl32/listbox: Fix debug channel name.
by Nikolay Sivov 03 Sep '18

03 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 4d389b13bc..252844ef75 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -39,7 +39,7 @@ #include "comctl32.h" -WINE_DEFAULT_DEBUG_CHANNEL(listbox2); +WINE_DEFAULT_DEBUG_CHANNEL(listbox); /* Items array granularity */ #define LB_ARRAY_GRANULARITY 16 -- 2.18.0

1 0

[PATCH 1/3] opcservices/tests: Add some tests.
by Nikolay Sivov 03 Sep '18

03 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/opcservices/tests/Makefile.in | 5 ++ dlls/opcservices/tests/opcservices.c | 85 ++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 dlls/opcservices/tests/Makefile.in create mode 100644 dlls/opcservices/tests/opcservices.c diff --git a/configure b/configure index 5d520f045a..b800fd269a 100755 --- a/configure +++ b/configure @@ -19715,6 +19715,7 @@ wine_fn_config_makefile dlls/olesvr.dll16 enable_win16 wine_fn_config_makefile dlls/olesvr32 enable_olesvr32 wine_fn_config_makefile dlls/olethk32 enable_olethk32 wine_fn_config_makefile dlls/opcservices enable_opcservices +wine_fn_config_makefile dlls/opcservices/tests enable_tests wine_fn_config_makefile dlls/openal32 enable_openal32 wine_fn_config_makefile dlls/opencl enable_opencl wine_fn_config_makefile dlls/opengl32 enable_opengl32 diff --git a/configure.ac b/configure.ac index 2b63d6ae50..d7d5e8e6ae 100644 --- a/configure.ac +++ b/configure.ac @@ -3574,6 +3574,7 @@ WINE_CONFIG_MAKEFILE(dlls/olesvr.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/olesvr32) WINE_CONFIG_MAKEFILE(dlls/olethk32) WINE_CONFIG_MAKEFILE(dlls/opcservices) +WINE_CONFIG_MAKEFILE(dlls/opcservices/tests) WINE_CONFIG_MAKEFILE(dlls/openal32) WINE_CONFIG_MAKEFILE(dlls/opencl) WINE_CONFIG_MAKEFILE(dlls/opengl32) diff --git a/dlls/opcservices/tests/Makefile.in b/dlls/opcservices/tests/Makefile.in new file mode 100644 index 0000000000..7c0963cc60 --- /dev/null +++ b/dlls/opcservices/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = opcservices.dll +IMPORTS = ole32 + +C_SRCS = \ + opcservices.c diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c new file mode 100644 index 0000000000..e257c6ea2c --- /dev/null +++ b/dlls/opcservices/tests/opcservices.c @@ -0,0 +1,85 @@ +/* + * Font related tests + * + * Copyright 2012, 2014-2017 Nikolay Sivov for CodeWeavers + * Copyright 2014 Aric Stewart for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "windows.h" +#include "initguid.h" +#include "msopc.h" + +#include "wine/test.h" + +static IOpcFactory *create_factory(void) +{ + IOpcFactory *factory = NULL; + CoCreateInstance(&CLSID_OpcFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IOpcFactory, (void **)&factory); + return factory; +} + +static void test_package(void) +{ + IOpcPartSet *partset, *partset2; + IOpcFactory *factory; + IOpcPackage *package; + HRESULT hr; + + factory = create_factory(); + + hr = IOpcFactory_CreatePackage(factory, &package); + ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL) /* Vista */, "Failed to create a package, hr %#x.\n", hr); + if (FAILED(hr)) + { + IOpcFactory_Release(factory); + return; + } + + hr = IOpcPackage_GetPartSet(package, &partset); + ok(SUCCEEDED(hr), "Failed to create a part set, hr %#x.\n", hr); + + hr = IOpcPackage_GetPartSet(package, &partset2); + ok(SUCCEEDED(hr), "Failed to create a part set, hr %#x.\n", hr); + ok(partset == partset2, "Expected same part set instance.\n"); + + IOpcPackage_Release(package); + + IOpcFactory_Release(factory); +} + +START_TEST(opcservices) +{ + IOpcFactory *factory; + HRESULT hr; + + hr = CoInitialize(NULL); + ok(SUCCEEDED(hr), "Failed to initialize COM, hr %#x.\n", hr); + + if (!(factory = create_factory())) { + win_skip("Failed to create IOpcFactory factory.\n"); + CoUninitialize(); + return; + } + + test_package(); + + IOpcFactory_Release(factory); + + CoUninitialize(); +} -- 2.18.0

1 2

[PATCH 1/3] Update POOL_TYPE enumeration based on MSDN
by Derek Lesho 03 Sep '18

03 Sep '18

Update POOL_TYPE enum to include types listed on MSDN, including NonPagedPoolExecute, which is needed for Battleye. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- include/ddk/wdm.h | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 0cd1673dbe..a639b3c7b7 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -183,14 +183,29 @@ typedef struct _VPB { } VPB, *PVPB; typedef enum _POOL_TYPE { - NonPagedPool, - PagedPool, - NonPagedPoolMustSucceed, - DontUseThisType, - NonPagedPoolCacheAligned, - PagedPoolCacheAligned, - NonPagedPoolCacheAlignedMustS, - MaxPoolType + NonPagedPool , + NonPagedPoolExecute , + PagedPool , + NonPagedPoolMustSucceed , + DontUseThisType , + NonPagedPoolCacheAligned , + PagedPoolCacheAligned , + NonPagedPoolCacheAlignedMustS , + MaxPoolType , + NonPagedPoolBase , + NonPagedPoolBaseMustSucceed , + NonPagedPoolBaseCacheAligned , + NonPagedPoolBaseCacheAlignedMustS , + NonPagedPoolSession , + PagedPoolSession , + NonPagedPoolMustSucceedSession , + DontUseThisTypeSession , + NonPagedPoolCacheAlignedSession , + PagedPoolCacheAlignedSession , + NonPagedPoolCacheAlignedMustSSession , + NonPagedPoolNx , + NonPagedPoolNxCacheAligned , + NonPagedPoolSessionNx } POOL_TYPE; typedef struct _WAIT_CONTEXT_BLOCK { -- 2.18.0

2 5

[PATCH] cmd: Don't print an empty line if no command was executed.
by Thomas Faller 01 Sep '18

01 Sep '18

Signed-off-by: Thomas Faller <tfaller1(a)gmx.de> --- programs/cmd/wcmdmain.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 7a7ee16f7d..cceb5883ed 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -335,7 +335,7 @@ void WCMD_print_error (void) { * */ -static void WCMD_show_prompt (void) { +static void WCMD_show_prompt (BOOL newLine) { int status; WCHAR out_string[MAX_PATH], curdir[MAX_PATH], prompt_string[MAX_PATH]; @@ -350,8 +350,10 @@ static void WCMD_show_prompt (void) { } p = prompt_string; q = out_string; - *q++ = '\r'; - *q++ = '\n'; + if (newLine) { + *q++ = '\r'; + *q++ = '\n'; + } *q = '\0'; while (*p != '\0') { if (*p != '$') { @@ -1886,7 +1888,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE const DWORD len = ARRAY_SIZE(echoDot); DWORD curr_size = strlenW(curPos); DWORD min_len = (curr_size < len ? curr_size : len); - WCMD_show_prompt(); + WCMD_show_prompt(TRUE); WCMD_output_asis(curPos); /* I don't know why Windows puts a space here but it does */ /* Except for lines starting with 'echo.', 'echo:' or 'echo/'. Ask MS why */ @@ -2395,6 +2397,7 @@ int wmain (int argc, WCHAR *argvW[]) WCHAR *argPos = NULL; WCHAR string[1024]; WCHAR envvar[4]; + BOOL promptNewLine = TRUE; BOOL opt_q; int opt_t = 0; static const WCHAR offW[] = {'O','F','F','\0'}; @@ -2749,11 +2752,12 @@ int wmain (int argc, WCHAR *argvW[]) /* Read until EOF (which for std input is never, but if redirect in place, may occur */ - if (echo_mode) WCMD_show_prompt(); + if (echo_mode) WCMD_show_prompt(promptNewLine); if (!WCMD_ReadAndParseLine(NULL, &toExecute, GetStdHandle(STD_INPUT_HANDLE))) break; WCMD_process_commands(toExecute, FALSE, FALSE); WCMD_free_commands(toExecute); + promptNewLine = !!toExecute; toExecute = NULL; } return 0; -- 2.17.1

1 0

[PATCH 3/3 v2] mshtml: Implement known IHTMLCSSStyleDeclaration BSTR properties.
by Jacek Caban 31 Aug '18

31 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed a typo in tests. dlls/mshtml/htmlstyle.c | 360 +++++++++++++++++++++++----------------------- dlls/mshtml/tests/style.c | 27 +++- 2 files changed, 206 insertions(+), 181 deletions(-)

1 0

[PATCH 2/3 resend] mshtml: Implement known IHTMLCSSStyleDeclaration VARIANT properties.
by Jacek Caban 31 Aug '18

31 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 296 +++++++++++++++++++++++----------------------- dlls/mshtml/tests/style.c | 83 +++++++++++++ 2 files changed, 231 insertions(+), 148 deletions(-)

1 0

[PATCH 1/3 resend] mshtml: Added IHTMLCSSStyleDeclaration stub implementation.
by Jacek Caban 31 Aug '18

31 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 3065 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/style.c | 8 + 4 files changed, 3075 insertions(+)

1 0

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng 31 Aug '18

31 Aug '18

From: Zixing Liu <liushuyu011(a)gmail.com> Signed-off-by: Zixing Liu <liushuyu011(a)gmail.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH] winhttp: Fix macOS build.
by Hans Leidekker 31 Aug '18

31 Aug '18

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 c62fdadb06..5191a34711 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -17,7 +17,6 @@ */ #include "config.h" -#include "ws2tcpip.h" #include <stdarg.h> #include <stdlib.h> @@ -34,6 +33,7 @@ #include "winbase.h" #include "winsock2.h" #include "ws2ipdef.h" +#include "ws2tcpip.h" #include "winhttp.h" #include "winreg.h" #define COBJMACROS -- 2.11.0

1 0

[PATCH] testbot: Fail the task if the log contains perl errors or warnings.
by Francois Gouget 31 Aug '18

31 Aug '18

They indicate the script needs fixing and they may mask other issues. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 5120217c0..b0b804046 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -71,7 +71,11 @@ sub ParseTaskLog($) $Result = "badpatch"; last; # Should be the last and most specific message } - elsif ($Line =~ /^Task: /) + elsif ($Line =~ /^Task: / or + # Typical perl errors + $Line =~ /^Use of uninitialized value / or + $Line =~ /^Undefined subroutine / or + $Line =~ /^Global symbol /) { $Result = "failed"; } @@ -111,7 +115,9 @@ sub GetLogLineCategory($) $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or # Typical perl errors - $Line =~ /^Use of uninitialized value/) + $Line =~ /^Use of uninitialized value / or + $Line =~ /^Undefined subroutine / or + $Line =~ /^Global symbol /) { return "error"; } -- 2.18.0

1 0

[PATCH] testbot/WineRunWineTest: Remove a redundant $TaskDir variable.
by Francois Gouget 31 Aug '18

31 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunWineTest.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 0363a26b3..e3b8b17ed 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -537,7 +537,6 @@ elsif (!defined $TAError) my $TimedOut; if ($Step->Type ne "build") { - my $TaskDir = $Task->CreateDir(); my $BuildList = $Task->CmdLineArg; $BuildList =~ s/ .*$//; foreach my $Build (split /,/, $BuildList) -- 2.18.0

1 0

[PATCH 3/3] mshtml: Implement known IHTMLCSSStyleDeclaration BSTR properties.
by Jacek Caban 31 Aug '18

31 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 360 +++++++++++++++++++++++----------------------- dlls/mshtml/tests/style.c | 27 +++- 2 files changed, 206 insertions(+), 181 deletions(-)

2 1

[PATCH 2/3] mshtml: Implement known IHTMLCSSStyleDeclaration VARIANT properties.
by Jacek Caban 31 Aug '18

31 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 296 +++++++++++++++++++++++----------------------- dlls/mshtml/tests/style.c | 83 +++++++++++++ 2 files changed, 231 insertions(+), 148 deletions(-)

1 0

[PATCH 1/3] mshtml: Added IHTMLCSSStyleDeclaration stub implementation.
by Jacek Caban 31 Aug '18

31 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 3065 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/style.c | 8 + 4 files changed, 3075 insertions(+)

1 0

[PATCH 1/3] msxml3/tests: Add test for treating namespaces as attributes.
by Daniel Lehman 31 Aug '18

31 Aug '18

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msxml3/tests/domdoc.c | 129 +++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 35fa42a6d1..ffb9e1462d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12830,6 +12830,134 @@ todo_wine { IXMLDOMDocument2_Release(doc); } +typedef struct _namespace_as_attribute_t { + const GUID *guid; + const char *clsid; + const char *xmlns_uri; + BOOL todo; +} namespace_as_attribute_t; + +static const namespace_as_attribute_t namespace_as_attribute_test_data[] = { + { &CLSID_DOMDocument, "CLSID_DOMDocument", "", FALSE }, + { &CLSID_DOMDocument2, "CLSID_DOMDocument2", "", FALSE }, + { &CLSID_DOMDocument26, "CLSID_DOMDocument26", "", FALSE }, + { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "", FALSE }, + { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "", FALSE }, + { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "http://www.w3.org/2000/xmlns/", TRUE }, + { 0 } +}; + +void test_namespaces_as_attributes(void) +{ + const namespace_as_attribute_t *entry = namespace_as_attribute_test_data; + static const char ns_as_attr_doc[] = { + "<?xml version=\"1.0\"?>" + "<a ns:b=\"b attr\" d=\"d attr\" xmlns:ns=\"nshref\" />" + }; + static const char *names[] = { "ns:b", "d", "xmlns:ns" }; + static const char *prefixes[] = { "ns", NULL, "xmlns" }; + static const char *basenames[] = { "b", "d", "ns" }; + static const char *uris[] = { "nshref", NULL, "" }; + static const char *texts[] = { "b attr", "d attr", "nshref" }; + IXMLDOMNamedNodeMap *map; + IXMLDOMDocument *doc; + IXMLDOMNode *node; + IXMLDOMNode *item; + VARIANT_BOOL b; + HRESULT hr; + BSTR str; + LONG len; + LONG i; + + while (entry->guid) + { + if (!is_clsid_supported(entry->guid, &IID_IXMLDOMDocument2)) + { + entry++; + continue; + } + + hr = CoCreateInstance(entry->guid, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDOMDocument2, (void**)&doc); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(ns_as_attr_doc), &b); + EXPECT_HR(hr, S_OK); + + node = NULL; + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("a"), &node); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNode_get_attributes(node, &map); + EXPECT_HR(hr, S_OK); + + len = -1; + hr = IXMLDOMNamedNodeMap_get_length(map, &len); + EXPECT_HR(hr, S_OK); + todo_wine ok(len == 3, "got %d\n", len); + + for (i = 0; i < len; i++) + { + item = NULL; + hr = IXMLDOMNamedNodeMap_get_item(map, i, &item); + EXPECT_HR(hr, S_OK); + + str = NULL; + hr = IXMLDOMNode_get_nodeName(item, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_(names[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = NULL; + hr = IXMLDOMNode_get_prefix(item, &str); + if (prefixes[i]) + { + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_(prefixes[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + else + EXPECT_HR(hr, S_FALSE); + + str = NULL; + hr = IXMLDOMNode_get_baseName(item, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_(basenames[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = NULL; + hr = IXMLDOMNode_get_namespaceURI(item, &str); + if (uris[i]) + { + EXPECT_HR(hr, S_OK); + if (prefixes[i] && !strcmp(prefixes[i], "xmlns")) + todo_wine_if(entry->todo) + ok(!lstrcmpW(str, _bstr_(entry->xmlns_uri)), "got %s\n", wine_dbgstr_w(str)); + else + ok(!lstrcmpW(str, _bstr_(uris[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + else + EXPECT_HR(hr, S_FALSE); + + str = NULL; + hr = IXMLDOMNode_get_text(item, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_(texts[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMNode_Release(item); + } + + IXMLDOMNamedNodeMap_Release(map); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); + + entry++; + } + free_bstrs(); +} + START_TEST(domdoc) { HRESULT hr; @@ -12914,6 +13042,7 @@ START_TEST(domdoc) test_merging_text(); test_transformNodeToObject(); test_normalize_attribute_values(); + test_namespaces_as_attributes(); test_xsltemplate(); test_xsltext(); -- 2.17.1

2 4

[v2 PATCH] msxml3/tests: Add test for treating namespaces as attributes.
by Nikolay Sivov 31 Aug '18

31 Aug '18

From: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: minor cleanup. dlls/msxml3/tests/domdoc.c | 126 +++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 35fa42a6d1..b602e030a8 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12830,6 +12830,131 @@ todo_wine { IXMLDOMDocument2_Release(doc); } +typedef struct _namespace_as_attribute_t { + const GUID *guid; + const char *clsid; + const char *xmlns_uri; + BOOL todo; +} namespace_as_attribute_t; + +static const namespace_as_attribute_t namespace_as_attribute_test_data[] = { + { &CLSID_DOMDocument, "CLSID_DOMDocument", "", FALSE }, + { &CLSID_DOMDocument2, "CLSID_DOMDocument2", "", FALSE }, + { &CLSID_DOMDocument26, "CLSID_DOMDocument26", "", FALSE }, + { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "", FALSE }, + { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "", FALSE }, + { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "http://www.w3.org/2000/xmlns/", TRUE }, + { 0 } +}; + +void test_namespaces_as_attributes(void) +{ + const namespace_as_attribute_t *entry = namespace_as_attribute_test_data; + static const char ns_as_attr_doc[] = { + "<?xml version=\"1.0\"?>" + "<a ns:b=\"b attr\" d=\"d attr\" xmlns:ns=\"nshref\" />" + }; + static const char *names[] = { "ns:b", "d", "xmlns:ns" }; + static const char *prefixes[] = { "ns", NULL, "xmlns" }; + static const char *basenames[] = { "b", "d", "ns" }; + static const char *uris[] = { "nshref", NULL, "" }; + static const char *texts[] = { "b attr", "d attr", "nshref" }; + IXMLDOMNamedNodeMap *map; + IXMLDOMNode *node, *item; + IXMLDOMDocument *doc; + VARIANT_BOOL b; + LONG len, i; + HRESULT hr; + BSTR str; + + while (entry->guid) + { + if (!is_clsid_supported(entry->guid, &IID_IXMLDOMDocument2)) + { + entry++; + continue; + } + + hr = CoCreateInstance(entry->guid, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (void **)&doc); + ok(SUCCEEDED(hr), "Failed to create document %s, hr %#x.\n", wine_dbgstr_guid(entry->guid), hr); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(ns_as_attr_doc), &b); + ok(hr == S_OK, "Failed to load xml, hr %#x.\n", hr); + + node = NULL; + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("a"), &node); + ok(SUCCEEDED(hr), "Failed to select a node, hr %#x.\n", hr); + + hr = IXMLDOMNode_get_attributes(node, &map); + ok(SUCCEEDED(hr), "Failed to get attributes, hr %#x.\n", hr); + + len = -1; + hr = IXMLDOMNamedNodeMap_get_length(map, &len); + ok(SUCCEEDED(hr), "Failed to get map length, hr %#x.\n", hr); + todo_wine ok(len == 3, "got %d\n", len); + + for (i = 0; i < len; i++) + { + item = NULL; + hr = IXMLDOMNamedNodeMap_get_item(map, i, &item); + ok(SUCCEEDED(hr), "Failed to get item, hr %#x.\n", hr); + + str = NULL; + hr = IXMLDOMNode_get_nodeName(item, &str); + ok(SUCCEEDED(hr), "Failed to get node name, hr %#x.\n", hr); + ok(!lstrcmpW(str, _bstr_(names[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = NULL; + hr = IXMLDOMNode_get_prefix(item, &str); + if (prefixes[i]) + { + ok(hr == S_OK, "Failed to get node name, hr %#x.\n", hr); + ok(!lstrcmpW(str, _bstr_(prefixes[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + else + ok(hr == S_FALSE, "Failed to get node name, hr %#x.\n", hr); + + str = NULL; + hr = IXMLDOMNode_get_baseName(item, &str); + ok(SUCCEEDED(hr), "Failed to get base name, hr %#x.\n", hr); + ok(!lstrcmpW(str, _bstr_(basenames[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = NULL; + hr = IXMLDOMNode_get_namespaceURI(item, &str); + if (uris[i]) + { + ok(hr == S_OK, "Failed to get node name, hr %#x.\n", hr); + if (prefixes[i] && !strcmp(prefixes[i], "xmlns")) + todo_wine_if(entry->todo) + ok(!lstrcmpW(str, _bstr_(entry->xmlns_uri)), "got %s\n", wine_dbgstr_w(str)); + else + ok(!lstrcmpW(str, _bstr_(uris[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + else + ok(hr == S_FALSE, "Failed to get node name, hr %#x.\n", hr); + + str = NULL; + hr = IXMLDOMNode_get_text(item, &str); + ok(SUCCEEDED(hr), "Failed to get node text, hr %#x.\n", hr); + ok(!lstrcmpW(str, _bstr_(texts[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMNode_Release(item); + } + + IXMLDOMNamedNodeMap_Release(map); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); + + entry++; + } + free_bstrs(); +} + START_TEST(domdoc) { HRESULT hr; @@ -12914,6 +13039,7 @@ START_TEST(domdoc) test_merging_text(); test_transformNodeToObject(); test_normalize_attribute_values(); + test_namespaces_as_attributes(); test_xsltemplate(); test_xsltext(); -- 2.18.0

1 0

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 31 Aug '18

31 Aug '18

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/po/fi.po b/po/fi.po index 54a636b461..f5a7b9ce99 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-20 17:38+0200\n" +"PO-Revision-Date: 2018-08-31 07:27+0200\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: Finnish\n" "Language: fi\n" @@ -399,16 +399,12 @@ msgid "&Retry" msgstr "&Uudelleen" #: comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "P&iilota välilehdet" +msgstr "Piilota lisätiedot" #: comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "Tiedot" +msgstr "Näytä lisätiedot" #: comctl32.rc:31 cryptui.rc:230 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 @@ -3440,18 +3436,16 @@ msgid "Connections" msgstr "Yhteydet" #: inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Winen asetukset" +msgstr "Automaattiset asetukset" #: inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Käytä Web Proxy Auto-Discovery (WPAD) -protokollaa" #: inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "Käytä Proxy Auto-Config (PAC) -skriptiä" #: inetcpl.rc:128 inetcpl.rc:132 msgid "Address:" @@ -14183,11 +14177,11 @@ msgstr "&Väri:" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "MIME-tyypit" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "&Muokkaa tiedostosidoksia" #: winecfg.rc:308 msgid "Folders" -- 2.18.0

1 0

[PATCH] schedsvc/tests: Check the entire entry list to find the new job
by Alex Henrie 31 Aug '18

31 Aug '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This looks like it was a typo: The code loops through all the retrieved jobs, but it only retrieved the first one. This patch should fix the tests that usually fail on Debian, as well as any intermittent failures on Windows. --- dlls/schedsvc/tests/atsvcapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index 66f237ecab..d7d48a122c 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -118,7 +118,7 @@ START_TEST(atsvcapi) container.EntriesRead = 0; container.Buffer = NULL; total = start_index = 0; - ret = NetrJobEnum(server_name, &container, 1, &total, &start_index); + ret = NetrJobEnum(server_name, &container, -1, &total, &start_index); if (ret == ERROR_ACCESS_DENIED) { win_skip("NetrJobEnum: Access denied, skipping the tests\n"); -- 2.18.0

1 0

[PATCH 01/12] shell32: Add image file icon
by Alex Henrie 31 Aug '18

31 Aug '18

Adapted from image-x-generic in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/image.ico | Bin 0 -> 48827 bytes dlls/shell32/resources/image.svg | 1008 ++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 1013 insertions(+) create mode 100644 dlls/shell32/resources/image.ico create mode 100644 dlls/shell32/resources/image.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 146ed11224..2c9f3d7ab5 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -76,6 +76,7 @@ SVG_SRCS = \ resources/folder.svg \ resources/folder_open.svg \ resources/help.svg \ + resources/image.svg \ resources/internet.svg \ resources/log_off.svg \ resources/menu.svg \ diff --git a/dlls/shell32/resources/image.ico b/dlls/shell32/resources/image.ico new file mode 100644 index 0000000000000000000000000000000000000000..0d96369ce0340c2cc3afd3a923823884b6abadb7 GIT binary patch literal 48827 zcmeIb1wa)``#-*fh=LLZ2q<AUq9_<Nf}(VHNOw0Jx<e3=2I=l@5D@_hX+%O4B}JuU zf3qCr<r??B-s^qu{eS-q&zzk(XLsf^&pb1`Gqdvnf-s=%5aKW(Drn*`1jT_cEiF2p z0OI~fzQjqP1PTbca_hJ8S85PMMfLf7LJ0D3`Vt4{<3rH-`@fC%K7=4ba2}GM8a4zu zq<@LyLTXzeXe|4;aiKy8a^vUa+OeGs0lMP`H-{i{HR5q`z(Lv|K?NMJRatMdLQtj; z-m(Hn2BK2p7Q78X763lV5rP)MSE#oTWDJTnDi1-IA3zX^UTBfPRqz9jA`ce_1S5Zu zrSbmYo2^DSZgXxO!acC#934?f8PEensHDJa0zsH&AZLId!bSX9oH$_!I@ErHgH_n9 zXQEHtSE<vO@;zKQSL!l({ZbKQ^`P%P8n+|IFFzCvcyi)!-djH&{h@orHL*99GlkNu zxQDC^{E{9`Zxxe>zQ@cF_lPL)3DF*&6P$SJHy?7l51l#lfuA_hX^4r!z`1%5zi#l< zwNl7z>ZK(wQ;AEgr3LFH)b(h6n-lI3nHip|<)qEo$a{h}kH`L^k5NMHPgpc;bJq;| zU+<k&#Pr&+h;y$e(KT`OpzXLR(}ydyizeQ@{qys$e0;>RM=5u;*dFHBN}b_&v_Hc2 zB88^&qS;MjkIKi&XNc}*pIT1D@}ZbdwqBYw4t;aEr6qlJ$;aB3@5W6Z?|{cIOEpzG zIVfsUu}<+YR4<qGDjjbp@bK_pFd6D%dy_@k{zj7$?y6<FKReo`QhI5;H^1p#jM0>^ z`KWs-$z+&oG$}{h^41D(^OqSdBR6M+3Z);5h)L5+gdejtvocstw=f?!#;TyFEPOL} zki68ivmvdZ*OBhYNa;?po7#tIs+6aSwAi?r^!o`WmvUwIoAyC0&Z}zRv^v(2XAV#M z=v$H}sz@C`Ui&>>%`?xAK4`JfC490}dsB&rm^D$jDov)CkaNt&>N!r(+Y6P+th<O9 zM)*@j1521B!Y>@<3oD5e8<9A_#RK=+rzh;MIwYY~$4u3x0}aof(bQ)ho|-Z~*duxg z_e8D?A<>Z|NBB<!_{ODPEN5`1rYW{C4yVVeh-aEPUi9W*XJ{b*5Q8jnP@Z9Z2@VE* zO356pip1$K=*i>Ssg$@^bjv2AX=Am9vDXE-Fe2p`vyNEA;%HW5$j5f#g!$4Bp3G$= z*LX}B_d;e@so+?z(H{AQaxsf36SK5?k}`Z`7+b@h(6=Bboxs4qte{yXmXz;YwmtG* zPf67Nt&#UeU-FA!+!HLN-~9@@C%BTSECP|B7HXQOrvrL!_&wl1KBqf7uA<$|KR`%2 zlM-Jabe#Tz>v-f@1x_j1E!<=D6jswgto`|dQi@h3o+s0bESdu|lgf5%k$uMqojP-7 zpmytlN=w_B6^Am@*u^B-^r26Q{?(L_#krl4D>EO457~@S+GsV;r3uT0F|J&kTzIMN zQ07UmEpaeXP-E%c7y}gBHrru*FcOs7S*$4ux|ulmTx5^Ds^2mt5g}2`%<0|mv0Ou~ zqU{;yaa~C<o$Xj$?eY#0oZ|a{?P`aMaR)lr92x1{Jxd-^u*DUV3L_HYSBibji_3yB zG0jhiL5tFAx+{A#RXGO}+CoUdVj%nY_9MugFl$*q`UL;(70y!}iYzqTN?i1qxCa`K zx>A$jwh``ggIIQ>u2;!@u-N~&L*dpn0{s1oH>jlTx%V~Hh`u`n(UH>0yXA01I#=x^ zfCPu<Qzcxnoip*MvLSW_AujrR7#Fc<30NHok5noUL#!24PazIMw@7VljVryG7^n(V zU2{So9`@ZZm&}g~{r5|P6plHZ+vlkdnUiXWV2FPhx@L&IbK3(RwL@C=Tz6EdRdzP) zaik#}Zg+#YTa)OH<u;B#fqY38vhzlaA5C}XEm}P5Axn{Q^b%|)YeboUFh*@59C^Kc zr_%c<&w*NZL)w%ur*j^-3Z}C3R2aVYzG}Uwp8F=U5ETJ`GL!BE#jOil{X{YITWI{u z(r|a5q_9Vocn}gEe@fVTk$SrzwhtMD`@qWXlCvZc#u?L6RC27i0S`T>u?Urp+Vp7@ zOk~K#Y^C2-PUX&5&7ay`%XN|cI1`rA{QzwIYH>Sy>a&Z_x5r|flgGd$$Ict@-HNSr z)o=LJLp7qH5DXXWLztRP7{i3iXHdt=&rqM<mY}U%i;Ys@VTMpdobmDrndwDT?juCC zhK)xUG35{Xbm92Eliv-U!^e0`t7w)%YNkt6;sntiVHdo-ZR*5(o$XL%@QGtP-|O({ zKgQ>f+|S=zyK@_aPj#~AH5sFA_`DnT4TJ3+agC;20xT3uA4gZPF`raD7}8Ylz`#C* zPvmo5zl!jn+dg7*29nCHcvw_!Bl5SLPxWqbwTs#<@abYnzYxV)EPl)!1%7QTc1j4_ zFaO0QonygHQ5LI?q&ME}PN^fucEgT+RQW*kEJRfK0K4Np%kJuw7R}mIgl3Mu_Ut%z zyD=VD(j9E1VZptdidA>KK#PC__i>Et!|eAqVlP=)b~fBNpm&cfGKv7=IB=|J##6%a z9A1qacI>dx`Dt>+dpCCqw@q!sCikMw+qK`co!sAatK=?rn(G6*pS4576I)*?dFC8& zsG-W*cZ|{LLMb7%r&AQua34f+jd(h;oQZzO`6{F*)fw*K_3R?-ckkH+kCl$?H}y3S zQ3*I63b#MU<1vVh_wWYcVJdgl3_@&I2G=`;K`y&1ou5!;y~?;pWsFBym%KaHk3IOX z{1NdGn&XW$JZGPzAH0lba+rmNaN*%;mSju~J?G01;eyKKe$MR1%htP3Q)SUZsB`v$ zq4c|K@6-}<zCOIm!u5!J;~7#ixz@g|yIszzVB(#@<aZi5Pgv)}_n79!iT6?N17n=@ z2idQkWF>VSr(w7`V7(8!E*VpYPj(L>0W00xbOEo7!5t7W<UjXnSG)YJQnPWQqa*IM zEUn@5(fW^CI6e}ZhuIRGdL2E7yNgzZm<5{+A4UD1@CG%VkCmRlzRcqXpHMvDV;xX% z_3fgg!(daxw%e^<ij6^dG<$#+XD=T6!V9c7nahhoQLzyHF?Mn&A(gu6`p3pv{ddyY zhX`wT#=RZN&dWJ8O-|-=F0g{iE~+m><<f^JoBC(Zm&-k<1-X3vf%0OvdxoJ#b`d6G zVILCM7lex$PkYF9sKf<D<?3(9{aj|Da6<Y3gt7{^SA+N+&c&2p#c(fT4$A3%t$NG- z$p!aSPX>((JFmNH6;8y}yN+K`P$$bQCGL=R3?POLIFwu)iV1^Eu`;MQTpO+^@MG`A zd|2?}#g-%9m|8>$DXCQ#$PWqm9xpoHGAb#ok-S40dNMLea!Gz~NIF*?+edvrZ0>W* zm%N{H;xVxZv)wssS2;;Tty@CKal!4$>UP}2g!nX;$6aqO%n(w0AN4TZK2$(IO6x9l zc#mdMO{M#ifCl7z9*R8YEGO^oc;{Hf-oo<S7onq?6XJ&Q1eH~-v9uSkG|#YJ5;ESl zEkzrf(4k9u`-w7MO&U`FOOyMm8}+w7ZbJ?Ac%?oJ_^7KRnI+gqRs~V{UZ<g(QL*ml z@Ms*S;7r9<o)90)?B2oSpYdk@wL)Sx&nG3>W_zn2$TXI7YESGCkd{7+As~EG$3fwi zl93`x6swI2Ujb6v0}JFVW2wzzMv|rzK+ZJcLTwYroukxAv-9KgZwos|ZHFp?@gR4P z+EnTqlN%1oW5MJT&_b&s8PwK6UIsN^6lxMYHxfbG@uu4DV147GJKBj8rRS-FQBjHE za(?GXUK2RVs~62!5aEA#SM8<2;x4Mw9~?o|Yy#!ZIG=^MrP!h#9z{u?Z^<8td3=#< z9{2IB%ACW`WNGfP+!LceC5iF4tAmPCQ?j%3fwxvq$7!loVpNX>I|)SQZ|qu7m=mZS z(yyy!$t!tbRbbm8q6C6MTP%8FrW);Qn5k(sv-)^mkZ=C#CD~3W<9-DENx#Hqyq#6< zvG;i+43=Pj^PatnF|*y)Uhj(H_MGyCXlu%sq6ILY1h{v)@8I}wQr9wDcPSJH#Y?L6 zKH%(R?Q_0s=ic&k3pk&FBH#7~&eD9`jv@b!EtDvs$>Bh+k8Tgn9{M*FIeh13vj$10 z{pJz_N)6s_aU^`-r@O*@)vSMi<GBM#SE@;%;BB!pSiZ9_gq~R*#1F~~Es*QkWj!V> zjQ>%FETbpAbUuGIQfy{)klpNcGu|;TFIEn{fy}LXOWJZ<vM+|3XwGA@oDa)6nzbkI ztlR;rn0^Os$r_9MvxX#$R!e5^VIOjm6i!qCL*QWAlns`@(DQ=f*7A0%l^{7LH>tAO zEoPky&Syrg01&cmv8U(rN#+W1ad?W`DPo$GCY9@+v5mmTde5853d*1J+N!aIpwE`% zS*Q)UP(UmgsqEZuwNq~CDSTZrea9l5OUL^yC>5Rli{@NCV{@DkAr6U*GwTNtOESax zB?AdTZ6=krkWQ)^`kX+~*aF$8JP~_N9;m+5W?baz^eZk5DBxYtM@$H!u%1!2n&G(= zB`Ndb?cg5gbI=812K*RY%!X8mupq!UMqr#|>)p%ZZ>}&m;?R4a_QM=<@04u!o(({8 ze!yU>$}2n*`F0V-V>YEfVp_KIIL$~~+l4b_!(k`O<{nK)OA>d*P~$_XJUYWM4MZ^s zV(0UTC2>>x?CcxZ@9ceB?OJ?wdPE!Y6y<&N!eo_(Hj|Y5p!|*AV3f6P48<9rm4O2# z)*rmye7vcQLn2#1B2e<-vb!#Y?G8D3RF0;;m6tDy))ON#HQ|&OCp}AzjWx8@e)p8Z zvtVQ0`x3N*8KLiHw%9GC4$)zsTF~I2L7m0)MOAn~gp$?%oHw;yT8LSyrF0L}+EFrP z4Cf|3z3_xo+NkAlvdv^yOLf7_n4IIBO{q{qRr3~9NlVJzkUX6JdD@p&6z+m3+=JX5 z%ZKWZW80A1zkE%6Dn7Ut&k9FyH_Xl*QhmQv^K8Ja9P2zH2$y|6;^El`Sd+`oI-ACZ zl7+!2lVqaQsIiICW`WacB)z;f<#Iyqj*)b4k1}Ik$q7iIB<SN6)fQah%Ff_eRE42@ z!$HT+W)H^sQy+1y=*suj5zgP5CdHL*<8m9YK1j9C(Rb@<R_wu;g`%hX&Bj?n8CHAD z)A{yb$WPUb@x8VgER5Hi3(McRDC%6LxB8*yahKuUXm`RAT}uiwZOj8qIeEAr2eCQc z3|0@O-NZaKLO4G&lz@NqX!F~8yeOPES1TA)Lv~m#;5_t7V$pP?dn>8{p@ekHooWx1 zjg)lOk>0CcIKe|AW2MejyV&i&^}T;B<$+J9wJq8AK_B+c(6|sNbDz6dQGD}!W?@Re zdwV&plf>IYLs9Yvm?+dcy04HB&U?{JpU1{;s`WTs{(&ZC&Wn>7H|_3{!@%;LX;OKe zQ{>m*-nmv4#>=7CInghkxyr=IxaGvGUV+-w;r)~!%Pe(jqXNUpKc#AGf-F(9I=Q6M zZSa=7t_SCJPrgrktLs8#Y}h!MN3&DHY=<W!w$1)<IgI*K9Z7p}1+kg7k?hPRBR=f( zDmry~3(b=k(uQgVZ=zLRg_{Pb@HR>7>{(J)BT<=5jJUdrD|=<}sk^Oa8;l`ukY(T6 zCC*j5Tg7Ur<Ls-3AR&jcQf*B&Ea;GiclaxQ^_?+>I!WDo-j--H?cK(my^wcq4wKTm z`eTT^1k1oHy+Nw0l&k|vxXVW{BUlDH2db&(-_wb|ynf&iX+!+o>9Iy8TcYd1jr3br z=jB6;;fiz8=V^%;E_57jo~Xi*pB-1fx;!u^y0RoJ1?D6AiswwM#&cwA^K}>eX7N)L z&9GR?ns%bB<af9vz8RA+QOM3`zOAGe-NH}NI!@sz#dxirLYiTF)6q&nr^xO188bq0 z>LoH7*!hh{Zn#s$4^|PGF?wBhqt;^yZnTRf#jC)P5XGOxs8mkP#bgxjxejx_RZ(aS zV*xc{T3)CETPs_r)P2O8Gdci41CORV-w%}b@Bfsl!&5D@dhb}jIF>zO9BUj7`+<gY zRwfwWDI1$5_%Qbneusf9vEB$Fr?R-viMYLvR-vc{dxjHxKe@8f5}FZ`dggT3bXH*M zB~&lfsBClWjttN3*ss@(|A4%b%8o#&=FFSmC9H}jTMNiV&PKm+?iR1;{j2@fgPi0{ zO?)<=aMMagHKc7`_XBg(J;^Q&Iy-y47giL@lZQ`FHY(;rK_0zHSePSweU(QD+48gu zytmfVh^r6{<BPu`yrXbqNVSe@pGx;BX{n*P%E<5|jY&7&oZzgtl_h@PotAgHQpwX| zl9}0bC&5e0+M=oCTXGr03o0O!7c+gjG`Gh>7RPz%he5xsrD@=GXrOs9li`wAgNS=M z(WpB9$dHP!{PdF-S6jzVg-US@q%hj4G46FH*cX~i)A)?W@T0cj4%{G*ySXFFIwy4J zPnwnEwRY{4rfFQkcws$~nqW$6W1Ey^bh@??2W6P8`rct_itLlN?#XJIEo#2F9Oi-2 zxXKVl$D2M&uZ}r}I#U9ZmsOT*(uy2$;y!YuOl@|}UGi-x-;o~dIyk@8em}?iXBA5Y z67EmNmY=`3$y&&(I8UhK30;tPyMA?QYq-tmHVUi3ciu0hB=$maswT#t3Inb#_}9Ll zW11gJ<~>D5e<czd8aBj`<QyeDfg3dwJzeH`q3?MTW(5_`!M4$Dp+3O}ammSq+&I~$ zr()fhr=I%=q#reJf7n7^xmR7g$=r>3UKA@<?}g|N(%bDdTVBkqOc^b&CML#W$Xi({ zw%=eKBO*GzC8wJjgQ|Rw#9r(Vil*M|_7+8#rjDGF-9^nn5+!;zO7?7JA?ZsgM|mng zxLUD7YoOH0(EMR~`%S%P7mv>4;szy0%9fL!;-p96GL6gLpZ5=&3D9lrGksw{I>g2` zb=!~lrqZjCQrV!MW#TCpS&N-qvWyIG(-ow;_KBd5;BA8>T&(WP?i*6#XnAKvB706x zhwSBTnwxKkI6WF;tHp80PhX@vk$!HuYw4-q<!e0mE^!+~-;Qh%PjrI^@R|k|M#4wu zSL%x)^0*V{Wp=zbAHQp<-~C!_$Kn`i!T!Av<m*IRNxBt-ox!gDjC1aY{J51sem*ex z(Bz8i#^Om;Jvq^hj1RWaD7{y(s>41+B{%4@az|iAZBj1It(-r-6Y1x*-kujq9{!ZP z#hJI%VxI7&#YZzPe-D$aFcL7)h|{o*WhVy)MD4gw?^rd5A#ENGF~%dRf^FEtJB%I| zSUunQbZM2<Z?5y8+#_}d%=)LsO%=Ops3P*pd4xaldzyrm55Ao0b6zO)YAh9J+Mcms zK_Y^3K5Fyn7}Kg-Kjo)RI{qsRQZy{Yu7}i4AKZIzzEAI+tRt<ltQdtM{#5N?-|o<m zGdH(A2jgLC&vf7U(^vVb3VA-zl;=D?gnP8c@b)sKHy_|&wwQSI(sJQz8PpE{Yq(Go z(@OSTIT16L`%sUolPkvEtpgsPNDn#&S$(2X=A15<Em2K1#?;DO?jn7_!(-25a|UXb zwk^z&t=`|i+7ma+B%YcOaj&TV_3?T^3dUt(&@YU#+HzuLf5ZZVo7UU-c3Y^2ci6X? zm10lvKx7Ukq#RMCGz|;eIXo2y?*`!AqFH#xa%yjmKb}a)rvYnI`N<dEx2;WbAKFmN zsf6S^oV}WgAumjbPjw`M<51|-S#AXhmA<!_(j)Si!_kBvE2s|k7nf&6bL|{d<vY;z zX+%sD>#YdHU@#xcYIVBzG4~eKeJi4!c3ZHi1{DtyJu|c+KGm1#;9hryrK~PNB5y8I z(#>?I>C08Gw7hFlsXOGevFz?&v7Eh7GUxiR<<|CS^UnHVx59JEq+^q<(IN9jZ?+P= zDPGjtOOz_Ph1;(c$0v_Y;qiF4P=Q`k4c3A;&h6}T?Ig8w%<h!TtK4F>#{%Q!8=f+^ z$ckV<0}bz5WX^G8p+*Y{tNdiFFKVV%GPPAV3YSv$rLpXQl12_#&L0T18sq4!l}KGB zh>TyEE5$!jeH~npnE&#s9hT3v<`uh)S+#Q6H$A&{y`ChXi@5+Lge&YUcy&dN9k)-n z2s7p77F;OzfDU%iQk7TgxdMMMy1e#ro`AB7{N(s(wuGh##+wlpO9OAW4~LG#pXj4h z<5mY}=#Nh1zkj>Ec+n_2>-si%{isV)rBi*q-Ms8q0&t-A+&5`V*TTiKMYj!1`0LIN zQv}MK>(RsnY0Fp+)%v6rCG%bC(7-Z#^(Zqu^i`=?X}O$SJ%2M4S=5>yU=q#ncz*to zyRDS?gX+TW^D+^y>}5#Oiu>ky<1tvYC65Aqc1UWjmd;zLCT~k0aj=CiaarI)kr*t- zgCxvLM6!&Z*yOxRMW^8fRoj-C=~oPu{VNsBZ#%`#UjXI5E%6{?Y|O?oc?T9Rn7q7Z zkTCWNUZkho{|<v?2N=`Et@Y~dN!C|ZHKHLo^Vd`b^^7?F{(F`m>#mx}l}9K<0T^A` z<;%xqtyTlAuhnXZpxDnc^|tG~;lks)%3TE2Q_?$`PvvP{LrGra#KoXyaK&XK?b|0_ zol;bQvYc8K?QaqaKNT@Ye&hLNS+mu|H1DNK0vU&sY0K@W7gloNj^y^;#qq^*PjWi* zPC?6!d^X<9%Tu;?ZhkfGQ)gZo$}Q!C$<*9!lm!p%O~)r~Cl~r>Wqi(m<k|J^b>OW5 z>#5)u!$fxe+54ExU*%7$Ua~5l>Lie_(_M*xUlF|Wh*<GI%{X;kZ4ZmF*3_-6!)}z2 zMt7@48GS{%G+kz0G)DXzy5;fLhGXe742niKXxs00ku8VS#}zU2yU^udfJ&xhgh)Lu z1<IA`AE`Mj8^kVud!-(j#s0#@K4s6NVN)SpUJdnrkBU?;R~Db`F{^Xn)O$a}Sz`6j zwscQ5FBVEtOlw=B|7jlXAl=uiLc54;CZ4|A;nQ{H+SL1o<c|;17f-LGIeXzixo1eQ z&r*zOU73>Yk-71{@?<<w@3UQSA*V|qUz^_0E$jMpQ&Ny|uQ$Ep$unUUdjfeYjC?=F zd+UFYc2?5u)VDZ8{^>Qro*j?|=T!F<Z_|l=lurt4d2nvDNjOmA@i$?fctw=<Ql4Z` zk?j3)%fd$sitBD5+lMt46-MSu@Kt<_=dZmch!0_wEQ;<qTULfkdA(RwehDTK#nQKU zR=Jfm$8K?s_Cd16@`oo^RY;5uod8ytYR{=>@ls*x)|AP>zL*Mov6l%$&C@5uxv=N~ z)?|y1TJAFb)$pz$8Sd#%gA&5$F}b&v=aH|%MM=7{S0t)iUd5xDm-g7=JQlAwM70Ye z?$Q-}g7csZE>w~Jm25OD+|<;K%t}hWZWy~>H*t9az(?q&<@4DCA-#&lkSx3pRPs=k z`A)t(?k)}b#fgO6ZtOd~WSCCWWjIgv&V+^F?&f1-!_kw(b`ZfO>3r=$alkyW;)20~ zcrSFn1&X}rjDIW~HNP8|{*$%M=_|PS$H=f~aWY&SFB4v-m_CZ>c#43E<p91GW*2s} z_^=$P&mQcjyJBvCXk~elVMA1kS0;Ml<!fVOI)Bv6LZP|C%ECC+I3(7{bE!pKR)kbQ z@_=9n7tZcL)*G=+r$;gM@ysn*9Nbvyb{`9WaVN7(4gc22Gv--bfTT!OE1c9narJc^ zjjz_=@(GvQ?oduQ1`p>R>M)0bnpH9NynUb}G`)p?;x^VahpLPL`C;m&)WCySH;>pQ zgw*kHx=~%}G+(OP394m=qWc^_9TtbuTXS~u;*!boR`clTlAFzqj84=#7(-l2d#FKL z%&sgg*a>a7r>*uhI@j*$I&^l25xJSwe!s@(bgz(J6zJXL?y%O~dC4Si(aA)mLo^_A ze~Iqgu`|(QR263kFs~HIumFXS9l<&L+`MYMPCoQ{Q^g4^KP^FF)}luThD>yBAiqoI zVc(4Nz$rds`1WC08JYWI%k#S*Sj!G|*?}G^mFwQ6u7DFYt|ezu{24y#V_s8p#qahW z-w%379G6qaCRvwQxWyu}ZsF|Kw&990xss_0(j+T6kVD{_oc8jV8c%8Bc3iBI?3);% zKbvh4S*qyqvTtjriptA=|Ex!i0|1aMQm0hAxIL{|vH!u&7pbYiIHk@9xqLopm6`xc zv((5V5WXmCB^ND_aY-A)A&hOgO{lzLy3+?(@WCpM$e65530rE1`8|0!nzxQmK88qk zGg>e1K43A=dM9YCn-g^P)s;sUIHGxbw~9)fL={m`a9~L)rii8w-q-EJRMO((I-&vb zv&XbB(T3%Zr{53_AJH9ZG-dSbZVhlu&6QUX))cXNoh-+uo$369BSWAqJB*JWN*K(( zL+wXzFf7tRNL5@XSfRq4zfE8_wL1-k^~AB&sX(2_Lu`BQ(`3+w@<fbxo9B&t-y6++ zXib&=QA|uH>TCyL<ej9M;M<T~pSVCU{xQk)ww5dU6tB{Xryki+?q}g3(jt0`J(Qfg zI8l1p2M3~G*22u19>ojTtBITQ7?Yog(;SODod2p_>RSwPaq)_eXPI2MY{BC!j@xm& z9%nkssiY&W_n~`|8evX1txwCPH5_?B!AHyFKODU^kkSbyNK9>bz;4SKy!XV^4~Xe% zeGl;Mc$S5)Te5&7%WQ++RQ{fVH;l=N;imi{d+O{%Z(MOX9`TBqz&T<golvC7{fE|& z$*J_cIWyR<QrLGZ+r?zv2}-7janr9R9OZk3jbe3%2=O7MZ8VrF6<eL>@F}r_@bs9d zj4^`nYAmq{<;4!O38u-%jq5k9^mCPpvge9czgVW&yZ6l?oy(!)ukAQ-mAo>ypWJ=% z>J_3YtfkqBv2HyMU=OM%_MX^Md^JAM%9L6k?@1^ZMa={5i<iQ$Q<-BO<iCd-gG-hb z<4DE1ZCEDoO;d#V;ywtQ2GdUdSe2Qer^%rdscJnYDZ<C_yVspD7%UT7HEglOqvrH1 zq-Rp?tKWEh5FTgeUhqF%NlZnPix+psEHbdR9g4h;*?q2JcmnGTo-cLpRw~1HG}y3a zf0^~QFi+5)y}Tb<SMcB;cxb#TP8!ahz}sHdJf<|pLPc+oMJqjK)ghy8hhi=@?{B;& zcb9_)(ionvV9$OOPr&O~?bhj2HXXRaP<9_`d$O&8T>u*_B&Nw8zHe*VtDQd++rkFg z6C)EYOD{8Yhv_y(;Y!h%&a!^_GjQwo3LV&TVZiBHN9pxhz414M<F@Zc%yV{t?<*YS zIy6t8@(fNEv3u{fvXsvJyva~~8~BCL%olGdB{^J##O=LmMDc7K)(TS~lDEQrZ7Ga| zV#yO#%r9&wc64gjEad4^2q!V;X?~P@^PI3Nf?I2)U#ndiG?s%d%1iW^mm_ZMZI#$Q zdoW`4Q{zb9Xo=(&{)1fNIHg5%#CF#NBhGAp8{H{m+LxJnb&drSMa`znrsPA0&+a%O zNQ6tlZ#u)tKYz4S&hq(lDeKkKd`=CRB-mooJs~^D1A6dBYrHFEwo~vMwx3{Fu5Yr= zgHNxX?EV1pn|el+U%ljNDU$T=64QmQk4pmrrn#Id3w`8i#qXk6WoqwlL7ja0ap!V8 z^L!s`U%a3;Httazli7*`#&W4-4nDS%=PzBo`b1Z;9<!odOvV{rU|wCJni4q<p+4^H zw3&VGz-X%Hx3GwLcX`&>R{zy5ht)GVhk3myc2di&ntCWRHD>vS?>I$SI-PxqiTUjm z2IvZ}^W&DhepenYqA6Qd@7KayG`&dvlI)Xdb0n4>(5wn+Ha)X7(RF&M6r5RtXZM<{ z-!6`&_g{3QY$isLvD#JN_rz{knokxXDqJ;;C>-R=l)<6Q0e7A2-ljX-Mu<^(K}}Xg zPdsg{S5$Qiberc&$UsXN7S_xydktf<UQ2F&u)>2o8zEb63s1B5Pf4!XfMn_Ysp3v0 zyK71B*y#1<t3C~<5lr^K`JCyD<PQ6nja!L{V#;Lk#z$O-=Vs-ubX8s>U$ZO8(vIwX zc1&h%)~VYE(z7||xFX=?5fU70TlDW5x!YBob3>SM@D6^Q(ZE%(bA{#M+)FQ+-!Apw zYh&>rRMkl<p1DXD;jB@_|M6vi4ueFomiR8_4Bl-6{t?SDSLfe4(9pCoS+`pH7!=}9 zS?1j?6qI_?_U?Iz26h9<WWrh6`lg`wlsfYbJ6v$A&-O{4hY0Up1ur*zd{+GK5N~k$ z*;A(?g-=ks=io#+H;s>X@7RK>z(`C#?fRq_e|cn#*>GhJ$C{utOK1BLcH8sJ%y4F3 zvB@P5sKHY*_2OGiF^%fIBqW2O?8nLE=1R@0($C_W$zsCO4Q-RUvlf<<tWuXC+K=%* z<>t%zXC4$rmWaHH4;T&X^r2+mU87l6>vSu$X)m_HeQet@2C=25jhFhzajYj+ngzI? zRQp_8emy-sZEL(>c_yNn3M}}i_7`nQ-*3I+t^^r2rlr}eF=Z(9Nr-BBVO3Mt3hLEc zwmEAo>=qIHV6nQeC)9klMis8Pa>j<MkWPe^qBhJ*I8po60MAza`S&NeAD+YBDZdSO zJlPHl+YF0FZgxQT#iyVUZ~R5c{HM;&Y%gGkC1&E@c|Oc47pGXdw;p0iLLUtc&1MT# zY0GH|XfbhhFHcQk4MPiWGgp@8%CElF6#jKD_57jtgNz4ZtXGUtCy!cskAV4y!$zFq zMt2m9lrJk8D1!q;M|+OpG%dsF^R&X}7%yL7yi8Afn)c#lT3RC~rqbVBpsjmHUB&#z z7i{Tr26Jr?bc2(ZBaKbo{ul^@m$V>x;E|Wa*4!cVVe@lS1DhJy)WD_&HZ_1~pscb? zrL?kiuDHAy{wI7<SrP0P=ntFQTCNydn7q_7(p5sCz_9-hy3(rBcMA&(@IUERR#spG zGb7m4+zd80H(Am#)*sO}(&PCfMJTB(nO<F8g(oK`;faZff6QB;tY8aE3)sra3N{1f z&^6JY(KFJI)YsSF_Iu^{8vpR{F#Jz=8!#<xZh^*+l)=){5;ib3oYyhZf2MAxPV}QP ze2xDW7YEG4$?`w<>N*+#zxkT}5&U1gv6;!Dj*(uMk&zMJ_sZ}+{8z}Z;s3Q)*HHS6 z{=eWyjz(t2i@HX71^;IJ8d|Er{w>$_z7anX);Ber1MQmo>oWY)`oFvn8>ZWf1*>bR zz}g1du(m$%20AdXnKiF#tPh)7nIUZf2K{UQzX|^Z5^VV7F03{D7bv#Fr}v>fBgM8g z`{m(afro~M;Lfg2*zdkStZ!zx`ftF0krW#~wHpgQPK*Vg-Gc=)f;u<>%7MfYkNl3b zKLkJ07b5*Sa*wiewnuJLYh$%9<@jIP4+Fq;<}+>t=V=hW3~(aHFW6~8dA{@=8}TE+ zv-7i8{|Wqvei2+JKI<33ir5W3u%9p3ks}iSg8gg#BlyAd&Ho<%!Cmm><NLqs8ISFU z5r5?<Iedu>XRR*&ZTQ*GQo~%APJiQhZ(N531O#B-n_Ms#!x<PkZzJ|UtABx8H(|+Z zCx4+o1q<H3xrP<N`^8JJU4RAo`PSk>w{O4_OlQ8yQ-Ftiz5V`C`%$^01i$WR{-wUA zFb5VA5?sfQl%X;&6ZUj=T>s9_%Ho?mbu`ug75EW-_<OmpV@2?1CB(ovNpb7n2?`3r z-Sv-uQ-*&N{=wD;SY1VV9dC4S;94Dgu_xsCxH#``!9NW2*VokoKksRUn|q(bZ9UK7 zfzD<a`Tl2Y?NPyh?8wj44KB(^UM~+~UtRSzze(>`=zpla8EyiYvtPY{W8MwIQKQ3f z+}lC8V6YqR0Ok1EGTe1{UBhf|Z3(BxJzU3cV`26i?1*0eDt-i8OZRg)Y2+mw^<f;& zS(t$<7G~kh`44c^`%yS^_yybze*c*|=x?cqkv_suPX`VM&oqeLh>42A&DCY!r1Mwt z4|cY|1q0n{Seus?;3cFJ18#bC1ug~Uh@2XMt6p}%uR2=3$@}-pRFRVbD=R6&PAD4~ zX}3sQ{@(e26@M?V`Q+FAaLU{?JP#wc?*F)<l_fZOW)j#{FFg2@?Et}w*pa5X8k`sz z`d#eEIe!&@Pgg6P`1&QBKKEf=_g_jdva$@v&P>6X0RI4}r|;?S_rB|Es)Mr=V}JL$ zzltBhl?`k>`qKpb3h4WbLqc^+b8zJQF}QS~3m*Ct_<yf#Uw-?m_+NoKeEOmtjvX6@ z6M(LpKpW^?S%e=g&cQLCCgH@l190n4w%;$<{>bsK;z#lr1pRz<e<vI_G5|+Sy@R8s zN8zZ6H*oTs0k|HN?PuHWAHn_QoL_+-Nei)$w%#_l=4Crv2JEG_uLJG^dPnXJU-J4p zj=u{37i@?<A^LvR-t@QP{*vFH#gE)y{w@B?_!sFr{>b=iVtgF_SNYF#vVR!=KRAc` zd-KOX!Vl*EN0*kCU}O&Z-|Ux{m*J9%5`={0HxA7I>w!6xg~~^j^Z#ZKa4wWpmAU-} z{O3qgQW8#1bq>+L+2`fuZT%kh&F?lfu&IInZ)yO!C%`ZS{n=v$DE3xxJqjE#J|7`l zbR1&-e5Cw*B>3tGdK2V2=>Nd6;&VBER*%1ZPm2^u1%k-Yht1DT4Qy&)Qv?4V4S=U_ zFo65}<Y8R&-2guqPuD+EWbnv8GdqLsaQ~)H@K%rigMg5*(7X5iTs-~@s^W@bFna3f z=xASaAh7N_H@L11u6u*)+2DFNxEC8-UteEjbYyaJa&&a`{lGx4yFQk-)<4n}8V|tI z*4Eaz!9CmHnl`xR4X$N_Yu(_UZ*U-4;1ZG(a&mJrGBRRgV}nD2LG^j~dVUwuMm&5s zx%jv__-}CjatR3wsj99nEG*2*%8HMV4-E~y7Z~6lc<)<CXgr_@piKNc++y@pe}}}z zMAX;UmzI_m6cl7<XD1{igoT9#g#-tNJopL{8V_2*g12tSUpxMHNLpGFumw=1poVK} zYm1AE!O$}zA|fglP>TM>t>XbF3-R)(U#I)EqRM$r;>wAvth9ong8YK~-2B|!g1qe9 z?9803teot`l%&Meq>X?!;t}S%Wx#vo7m70H1tG?h3T$+DxEaM*=z!?*T?6Th^6`Kg z>FVyTsjbP%$@&o<F#%pnaSjVH_P;KA{7lkpbfVV)*CV}&Fsm37EeHeA<G%(H7Z<n< zssnTtU^1kzr082b=srhTUdBsH%3E6se0pj~cxZ^bsfxHL3py$CJILMogJLPct#b2< zG&?;ICGN{8nVZTtE~BFwx0%q1NDA@-Ljrg}4_sVU{4E~P^8rX|O7ejwDrk9Nq5@<+ z8fdJ1PhbA7wzQX;sHdvPcg6LNprP<}r5jfjxe-y}VX~3FrOC?*!diT+HZr%@uaXw# z2Y5iYir^{#J{|x`OZ83^O7BM!X{);?I-wTofrg3!da@hET2Vwp^p^T>MMaoLO_)bp zoYzG~)L&O-{d^fwLC~#&F8@b(z)t{=u7+BYo5lCV)jY}7JP|D}W{EClaSldNR$Ad^ zs%Sx}$r>w3Z4?<XVX&qsEhb{5BxSE57xv{$aK4<FFzE7s9}oD|P)EBk)c1!H;!_yn zQvf8`driFZgS>JB+%mlF(mZXF-L2)N!~uYH7lJYt6G0#;%Sy$$Sb%fZMNwJ;-~k%= zk$%v3NDDKQp2tPK-xKitXQ?Ud`78z9kJh9*zq2B{tu#G9CI~E2uH(sh80c(ef{t1m z>b8}nt&4`TBDg&Qi~W5(R^}$16*-7hZV>c071<zDARXmEve43AmWfDd1`v=}OMar8 z^=AM8MvR|ptiKx?55QTI65f;(ix%}e3crsB{nTJ>Zu-19we1@LUm{YJvL?yT3zJ)c z6eIxw7+UfZTJjQ_^WvLx<DO<jsVK^!G2C;oNWK3V5BMfC$n$AR2wKz><-qL&JXHKh zKWIF*mS)X)ai1kWzBxa>p)jeYEVa5kqoy>qp&+3tH?}D^29cbYXW7xuvL8OnifROs z8QGW_(U1||kRF~B<|`o~0RT9fXvcWjtm~&Z+@mJ;E?QI-WEvV8eg_ZwNeX3U4w7Ay z$cD_wisGcq#)_n#XNfPLCv`St)fH70#MP&ROvCEaLhI8)o~DBG20u*+s!M)QmlXH} zNaFq4gaB_lGdVdqb8VFec7|v?hH8oxVJ_>UA}0m#fQO17=?9I+-r8a<{ouNkkh0vE zl-5V-qeE4*?;GZ4%Rfz~zImDQw74=e;z{D?d~4(HJ&yB#9OqXP>sJ$V_fd@RqiCP% zhu-Dk9{O4u=6YH_*80N2!Xm;#DIR9U0XFNREF%FPKfo>QM|jXrmku_TwF&otJW2}8 zsLoCwdD*)(zr42I{%LikZuVp1Ku30A!lO99M=?H+qP?phdR0exRz-PKM!Hu<xK)I^ z0u7XhI+cew#(P@oYN*;9Yst&Y2ch%|?waO#8|Qf&q2-RW*wd#^|0^CxTT74&kn*H} z<oeR$>9NHPi~sLdmNLhOld3YyqdY4kTr0wX{+&VYWg(7b!49QCcBKzcC4siZ_ic&- ztcvbgx|(V0YpMoV>*V{I<og)sc^T$-=w-X<WVvYFkrD-Xz%BK6^aGx{9c`^D!(Bm1 zOJnaQ)t6L!m_REBTm{_t%5u)c>-dVa;xLyDxmy>n<zDD-QRrs|^nhdy^x$Qf>8>AS zt(onvlkKLR<*JqCqM7NWp5dsP?x3P7EB^cS1;7C3jIu5Zwl52DD2;GQDNoB89UNW$ zyf_blwJ**j4|XPHhZhFg6y38Z^fxc?GcCAllJ5&@!7$g$AlFkr$3r*UT|3K7E7L_I z(^);kNj2S3CEY<e%}yy5rI2DPpKK$SY%QZAE&2!XfWnpp+LSy%WhVwCwNw{Rj`S?f z4=*jY%+F-M8;q&RO%HX-_chM*G1>q?2NeG^07o@Y{51PJsQ`ejLW+%ivbAiIrF5c& zRHC_Lys22ciD;a$h_aN(AHm~<vMlg50Xj#@9%!AG5*S}wn9|#nI?$fj@ie+3Ejhv^ z+fyH@g5T;N0f15j#ZLjnw^{>WE}38^4gi4MV~vDj4FzKi_@niBAL`zY(&4!yA@qmv z*jj+Ray)f&z4UXv4RU>q(t~W1Vm;#%{SqTxQ~gadTr@JA)Yhs1Xh3nT3K0D#SxO~Z zNG6zz$D08Sh{PHL00IaAeE{HAl+Mjats4=VT;b}RVQTE5s%%Q)0)GULgOw?$>kKCq zQ16+}YCsSJ005j+(-0fj0KiH*(Q*xdsc4*uNE`rQv<5)$_7?zL5gOOS)j1FVDy$)Q zn1YqA1u0$$Qn>s;jzLkB@AvV5{s-8zorST3r71w=Xl>?XZ4LwkfPgRUElljpjcv^g zZA=WTP4umdbS({aEDW^GbTv(M)Qz>(j5JjYG?ew#m2_1Ubd=?_@5pK@%4jG^tI0{I z%7`mVi`|hDQIrr;5EGOa<(C!t?|6_dvA1VUdO_$v(%bvx`<~w3p57iH-913MyMT0e z0qFz+p69wcJHTUaXGc4bj`lXRw6{G6()PR+Ezet9fV8$Wqepz88~N_@D!PB(__@{r z^lkhG9bTU^K;MGF=lbjdc%nl)@Sufu>r)fp)(IRkl3#OZFyHMDODjs}=H|e-;~#P0 z<@vAl1I8L)3aFyG;vW%^HJA<CINsR|Z)#vu1AmhS)}FJ#`r@BGRsdX^>y!|L=mA-8 z{aHP3u2Uk4+jN^6*wnzkUjv)#l)qC)=yen@06;(bua5*k;LGR$Ier;3AjkEA1PH8; zE<j*?$N>Ty2P9yKvbj$A`%9af>y*F0y1BVd`Q6pc&2`Fe7cV#0DL2<CzrR$uxlXyc zPWgj*RrF)b<~rq%=AAd!DL2<CH`gh@ER=4pQ*N$PZmv@zi-SM9Uu+!yqr;o)l<Si) zo9mS8s@M!{YT*B{27Y#3?d$U^fNnO|DgW9!B^A&i3-If__k<v_={7a+FVX<m3behd zrmCdAxqjkT`mFry4{qM>^Vaq@t=h)=U<da19oVbEH!(S}i12<aE-wC3?|aV=;rj)A zvqsDMrUog7hK9SpMp05;B0l|Ldg;T54={M~46duI`(@tiuJ;-bH^SL#Vr~ip{@eFj z`ue9gV%V7f9T{=>1~UW9ef7dG@d^sku!))JI*+g!;H3i?K4=+fQGdbkb^a_z_I$&g z`8Aj3AC1dN@WFsHdW}mO;gd!<u@OBOni;kH-T5PYzQQ+IVHGtcSQU6R4P{sl@DLlA z8?A8>yZE?JAsBvj`M>b-A{?>j02eaC4~vA^PEx=|+UoGs)D-OM<-Ynb;i34i%zq=F zF2X;19+V&9s6{w-5zg8#`G5NK3GiKYErKnH!oMp2t4By-#>4wIcv6_*Fe!YAa_71& zZOs4eySEE~YoGmB<bRbM2j-wV40AD_MSH*xi}1lBp6%3r_$v99H4J|we<ynsTmiUD z2c9?nly9smfyKqd*7y@;q^04E_~^B;uC^xJ54bv!^m3Bp;Je;lFrxn-mEYCL5k`11 zzi@8-%rPc3Xf02K1F^BPcr6SzhQM{D1#9W$rzXMyes_N=e}r?dqq`Mu1KfxG|Akj? z81Rr8>+7xMTMM{Hk-QQAtg_@!<=+GH%>Z1Nv4CSP=EEqQ2Dlfy0gm6(Nz0@1wR%X8 zjatjw!o+C({GTa5!mU;?)C(6ae1bm!E~@u{qq1mz2F`i?0&uSVK2Kas$O9PRGnJE( zfjgd5|Ec^DuFRx&1Ha)p><65Oaig!`{{Nx_q#o}3c&+RGi@tug{26av!i`Jw@Cq0h zECXK$cnXujcYlQA55e#y-!I3X$sf6<1@N)POuUBk=03r>GauK&O}!o8r28fP|91S@ z{1Lv@j;`l`le7!29O#7GLHK9+VK-v>qxrko+roD}Tz|PoIBNe}`>%WQ1THHn{@Z-h zv&L`wpQ4H)k*W7nOUSd|{QUgi?vdxrk+&oB;2nMz<o;7$UcS5bY3;j??heq`{SSOs z2mI*Cqk+edAOG(EGC{Cyy8rtcK+n7U_7ep`w!l*YPXPQ@;IV#{|7}h%jJ!`x1w0Gz z7|>_lCwvgubpL<T0C*qsue`4cp6Fu}VtxF5J%7x*g8X-?zu>^-p;2M+i3#_D0<69v zoB>@rNE>V!L+>5?ypgP}4gGp4_(Z>9y8dn{`o+@qS4z<@VkD#_f_;Md`S}qKBf$T8 z*=Pgk^Z}~_AZhv2l9rhccm_&JO2CaLE+H;FDttYQ_4L92h)`xd{pTdFFc)Y5&7cD| zfM;fB#wW+4vsh36&ykjB^DxM=o+~UZT9@MTlH#(GoPykq>4V%Qg$3+odF-Tbprp9} zh*(Qp*SK|6n)QOQ5W6(n1xc3k=As;c$pq9Cm>L4vZA>53qq>s(15;HXL8hu}tQ`t> zb!5CX!~t=~SK^^6Vj+1G&~yOG4hu;hZGJXo9wtjE9&nn35I;yC7z|L$#`J-a=%}g0 zIT<73Y=X#IIM&HH+D<RrLOs~zPOz~O5D#rx18G4WNq!)DQi9qNNWfcL2K}p)h#*Mn z+w?)EhT57r{*F2KoIVQ(uSvF_1CUG~REn!vg1vsYwKm|%Fi}CoQbR#VP|!e0Cc;_= z`~(DWYXDVzn?A5=OH-3hz&KG|@I^p4zXL5*dF_?CK-$W)nu}8WT~KKD0AELIeN8nG z4)%0vE=UHVBqxK+hkc_T&|a*~O<D^QTMLsu3kVk^wg5qB9OBV54r{CtG4*NTn#u|w zSzALb7ju0O(7dCtMkWxbC?omRDlXbSLHgijs0M^2A+kO*vN|ueq$IVfAigd$ydJP3 ztPvvsR)o5gU_goRBsnlI%u7mALSI$h*+dhhkI*0h5`b`5K>hL6?oo95pqT>_h9^n) zf#j5?rVMoyOpT<EyhwkPTay^@INtAZ9H4aY1@r=I+yWj|k?w&`W_s!>RyxXnx+BU# zuh7pNh@6Bd=nB5o4|re6!P=twp=U{AK<djjKoI~o!cVNMWWO88P7g*{0@er$(EI>k zmpVcYaL>xdK+{B9)zefRumNN`Yi2rY$chPlH+`_C?Py~O_ziNB?&psVq5D(t{|Kr+ zOn{B{VCOs7{|<Kg7u+=iBm-cZKiK3BNCx5^wS7&&_G*m`N3}G2Ww5neK~m(q`T^-X z*;)d!f}9A~w4Ua%l_ikH<mz(P>ldjH-H~nkV9&n0F2We#tdR+JYJ<)4=$-P`V57PW z*dveZQa2G*loI`6`ZgBG_H!Sj<m7<V-e)Ca!|4MZv6-QnNZCPx%4zn<-v4A9u<ae} zI+p-j&f|=QV~xOucRpmVw>H>p&aEgR{G;^kElt7pd1Mc}lWLNWQGAe1g0Df6y%Lfj z*hLN!1Y5|Bg<}i_qV@TrbZ<p!qqnYeptp?&DPDab&nPb@@ZI!5{enH<cIHN4KR8;z zo^h0!k*%qLwXq&xaWU7|Hr3VmydPZs4%iH?eMb)L1Xq`rQk9heJP&Jozy;()_<oc= z`jxl!7a7n|^e6fzg}!H@?_cQK8R%-zw>k7(4}AyxDt&Ns2j=?A-TLlh@caOp*sqt0 z->@g4`|8cl|FH(XXErDZVg`QW7zG2we~JG(zs+&V|G2{cz1eM!Q@~wdbDZ+sZAswE z&2h@+I0f82HpeNO<CM*D%H}v_{XuebobvB|r2BQq)~kC%0QEl}ry#F+QUSmI-X}JQ zeC3?nU1NZU|D^Xqu0#Gu*6i%;PkCep{!5-n_<^$ptjKlg4|(KVB)^T<BiBCkvV(n$ zRsX9;&i&r?M#8MHkq`^4&wmZpxy1l$a9@BmxX!P?LjtDt*1|u!UYqwCtj+h?gRthU zE3hKlSy<xY!T+Se%CJ_(uk+Ut=7ftABYxwH62sx5gmAbpK6L&1V0XLkUT-LI0|xV+ zaBBhDBjJ|(c(^4m4sOnkUAsQ|t}_gXWxs#D7&i<USmE0AFgU*|8_sO0fvdBlU@*A} z1FBaz%*`4Ge6KKIUH!rJTri*~g|lk%;C}Fq#w7S(o|!LN;L0dZ7%+vx<)O}N9?Um> z_j&_SPPjA(1*f+>f)|kgy9U}#+1L<V5Nrnnwoo|V*Lcn6c^Q27dOcxw7)%O+|9|TP z7lQX=>OX@2WmymdgZV)i(0RgOHgC;?`MhtgN9<QufEiA<Re%B8CY<D`2FH8p!$~%B zaDt^29A_p5#~2H*`Dg?FZ?6BV_WNi5$J}T8Uu%P3+QLsBy}s%WemaWGhy16X!9`z> zu_2kyVbHc9V2cpI2Z6eTK%0O-JBC2rLZIFtV0#d#8wl761ndj~Z4d&s4}rRafNem) zZXnPmAy5|(unP#(4Fqfo0`>@jx`#krL!fRT0agYGv`+}M69}|l2-q+L><I#O3IY3v zfUY6XPe8y%AYda9XtNNgYY4PI2-qJ4+6)A29RlqD0&N8XZ4d(O7y@kq0&M{TZ3zN> z1O(b71neE0p8$dO0Rg*%K%0g@dxt<fhJYPI!1f_vcMz~y2((WK*dhel1q5sg0(J%g zn}a}~0vU>NL7=@sz{Vh8gAnLLAYlIx=zG9#+z_xY2(&8*v;_#XZwRz22=sFhXlEM~ zy&2rpz`s`mm|r^@#tn`S6O(TX`MTS}2;$@i0f9H#k*~#}^Y}#jZ(j!v9Y4aubL8x0 z?CaOb*5b#m0C#4`h3nTT*5WJ|1qCmjz@WQMeR?g<i+hTe`@p$NC-L^K#kuJDMc9O{ zZQrwpa4k-7{3_+GT>>~*Sj=m2lC2Df4wJI(WMbNe#A!Hha!?)J%}#vd#=f=RzrsuN k8~1f-G5>1KZ1%I8{p?@0q0Q_6?`z<jj%Tx<{i#a-e}u0EJ^%m! literal 0 HcmV?d00001 diff --git a/dlls/shell32/resources/image.svg b/dlls/shell32/resources/image.svg new file mode 100644 index 0000000000..e69abe20ad --- /dev/null +++ b/dlls/shell32/resources/image.svg @@ -0,0 +1,1008 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.1" + id="svg16168" + xml:space="preserve" + height="272" + width="632"><metadata + id="metadata16236"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + + + + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + + + + <dc:title></dc:title> +<dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> +</dc:creator> +<dc:subject> + <rdf:Bag><rdf:li>image</rdf:li><rdf:li>picture</rdf:li><rdf:li>snapshot</rdf:li><rdf:li>photo</rdf:li></rdf:Bag> +</dc:subject> +<cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> +</cc:Work> + + + + +<cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"><cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /></cc:License></rdf:RDF> + + + +</metadata> + + + +<defs + id="defs16234"><radialGradient + r="117.14286" + fy="486.64789" + fx="605.71429" + cy="486.64789" + cx="605.71429" + gradientTransform="matrix(-0.52019826,0,0,0.36514455,-1632.0267,-1306.987)" + gradientUnits="userSpaceOnUse" + id="radialGradient6719" + xlink:href="#linearGradient5060" /><linearGradient + id="linearGradient5060"><stop + id="stop5062" + offset="0" + style="stop-color:black;stop-opacity:1;" /><stop + id="stop5064" + offset="1" + style="stop-color:black;stop-opacity:0;" /></linearGradient><radialGradient + r="117.14286" + fy="486.64789" + fx="605.71429" + cy="486.64789" + cx="605.71429" + gradientTransform="matrix(0.52019826,0,0,0.36514455,-2007.8511,-1306.987)" + gradientUnits="userSpaceOnUse" + id="radialGradient6717" + xlink:href="#linearGradient5060" /><linearGradient + id="linearGradient5048"><stop + id="stop5050" + offset="0" + style="stop-color:black;stop-opacity:0;" /><stop + style="stop-color:black;stop-opacity:1;" + offset="0.5" + id="stop5056" /><stop + id="stop5052" + offset="1" + style="stop-color:black;stop-opacity:0;" /></linearGradient><linearGradient + y2="609.50507" + x2="302.85715" + y1="366.64789" + x1="302.85715" + gradientTransform="matrix(0.52019826,0,0,0.36514455,-2007.9535,-1306.987)" + gradientUnits="userSpaceOnUse" + id="linearGradient6715" + xlink:href="#linearGradient5048" /><linearGradient + id="linearGradient8171"><stop + id="stop8173" + offset="0" + style="stop-color:#bbbdba;stop-opacity:1;" /><stop + id="stop8175" + offset="1" + style="stop-color:#70746e;stop-opacity:1;" /></linearGradient><linearGradient + id="linearGradient8155"><stop + id="stop8157" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /><stop + id="stop8159" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient + id="linearGradient2224"><stop + id="stop2226" + offset="0" + style="stop-color:#7c7c7c;stop-opacity:1;" /><stop + id="stop2228" + offset="1" + style="stop-color:#b8b8b8;stop-opacity:1;" /></linearGradient><linearGradient + id="linearGradient2251"><stop + id="stop2253" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /><stop + id="stop2255" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient + y2="7.1090999" + x2="21.9326" + y1="24.627399" + x1="21.9326" + gradientUnits="userSpaceOnUse" + id="linearGradient7648"> + <stop + id="stop7650" + style="stop-color:#8595bc;stop-opacity:1;" + offset="0" /> + + + + + <stop + id="stop7652" + style="stop-color:#041a3b;stop-opacity:1;" + offset="1" /> + + + + + </linearGradient><linearGradient + id="aigrd1" + gradientUnits="userSpaceOnUse" + x1="12.4873" + y1="3.7319" + x2="31.081301" + y2="36.032799"> + <stop + offset="0" + style="stop-color:#D2D2D2;stroke-dasharray:none;stroke-miterlimit:4.0000000;stroke-width:1.2166667" + id="stop16177" /> + + + + + <stop + offset="1" + style="stop-color:#EDEDED;stroke-dasharray:none;stroke-miterlimit:4.0000000;stroke-width:1.2166667" + id="stop16179" /> + + + + + </linearGradient><linearGradient + id="aigrd3" + gradientUnits="userSpaceOnUse" + x1="21.9326" + y1="24.627399" + x2="21.9326" + y2="7.1090999"> + <stop + offset="0" + style="stop-color:#D0D6E5;stroke-dasharray:none;stroke-miterlimit:4.0000000;stroke-width:1.2166667" + id="stop16199" /> + + + + + <stop + offset="1" + style="stop-color:#093A80;stroke-dasharray:none;stroke-miterlimit:4.0000000;stroke-width:1.2166667" + id="stop16201" /> + + + + + </linearGradient><linearGradient + y2="7.1090999" + x2="21.9326" + y1="24.627399" + x1="21.9326" + gradientTransform="matrix(0.20606057,0,0,-0.14788838,-1.1607128,2.4786422)" + gradientUnits="userSpaceOnUse" + id="linearGradient7671" + xlink:href="#linearGradient7648" /><linearGradient + y2="7.1090999" + x2="21.9326" + y1="24.627399" + x1="21.9326" + gradientTransform="matrix(0.20606057,0,0,0.20515975,-1.1607128,-5.3530148)" + gradientUnits="userSpaceOnUse" + id="linearGradient7673" + xlink:href="#aigrd3" /><linearGradient + y2="36.032799" + x2="31.081301" + y1="3.7319" + x1="12.4873" + gradientTransform="matrix(1.434003,0,0,0.99008701,52.321668,2.8389222)" + gradientUnits="userSpaceOnUse" + id="linearGradient8148" + xlink:href="#aigrd1" /><radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.710531,0,0,1.124849,-11.568333,1.8025822)" + r="19.96875" + fy="10.404876" + fx="12.700491" + cy="10.404876" + cx="12.700491" + id="radialGradient8161" + xlink:href="#linearGradient8155" /><linearGradient + y2="38.070381" + x2="34.170048" + y1="36.921333" + x1="33.396004" + gradientTransform="translate(5.1475674,-3.4097878)" + gradientUnits="userSpaceOnUse" + id="linearGradient8166" + xlink:href="#linearGradient2251" /><linearGradient + y2="37.770721" + x2="33.664921" + y1="40.458221" + x1="35.996582" + gradientTransform="translate(5.1475674,-3.0347878)" + gradientUnits="userSpaceOnUse" + id="linearGradient8169" + xlink:href="#linearGradient2224" /><linearGradient + gradientTransform="translate(-2.55025e-6,2.1577629e-6)" + gradientUnits="userSpaceOnUse" + y2="39.984692" + x2="45" + y1="31" + x1="42.1875" + id="linearGradient8177" + xlink:href="#linearGradient8171" /><linearGradient + y2="609.50507" + x2="302.85715" + y1="366.64789" + x1="302.85715" + gradientTransform="matrix(2.774389,0,0,1.969706,-14397.275,-9696.68)" + gradientUnits="userSpaceOnUse" + id="linearGradient6715-3" + xlink:href="#linearGradient5048" /><radialGradient + r="117.14286" + fy="486.64789" + fx="605.71429" + cy="486.64789" + cx="605.71429" + gradientTransform="matrix(2.774389,0,0,1.969706,-14396.729,-9696.68)" + gradientUnits="userSpaceOnUse" + id="radialGradient6717-3" + xlink:href="#linearGradient5060" /><radialGradient + r="117.14286" + fy="486.64789" + fx="605.71429" + cy="486.64789" + cx="605.71429" + gradientTransform="matrix(-2.774389,0,0,1.969706,-12392.333,-9696.68)" + gradientUnits="userSpaceOnUse" + id="radialGradient6719-2" + xlink:href="#linearGradient5060" /><linearGradient + y2="7.1090999" + x2="21.9326" + y1="24.627399" + x1="21.9326" + gradientTransform="matrix(1.098989,0,0,-0.797757,-259.82885,-172.20238)" + gradientUnits="userSpaceOnUse" + id="linearGradient7671-2" + xlink:href="#linearGradient7648" /><linearGradient + y2="7.1090999" + x2="21.9326" + y1="24.627399" + x1="21.9326" + gradientTransform="matrix(1.098989,0,0,1.106697,-259.82885,-214.44883)" + gradientUnits="userSpaceOnUse" + id="linearGradient7673-9" + xlink:href="#aigrd3" /><radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.710531,0,0,1.124849,-11.568325,1.8025804)" + r="19.96875" + fy="10.404876" + fx="12.700491" + cy="10.404876" + cx="12.700491" + id="radialGradient8161-7" + xlink:href="#linearGradient8155" /><linearGradient + y2="36.032799" + x2="31.081301" + y1="3.7319" + x1="12.4873" + gradientTransform="matrix(1.434003,0,0,0.990087,52.321675,2.8389204)" + gradientUnits="userSpaceOnUse" + id="linearGradient1070" + xlink:href="#aigrd1" /><linearGradient + y2="37.770721" + x2="33.664921" + y1="40.458221" + x1="35.996582" + gradientTransform="translate(5.1475751,-3.0347896)" + gradientUnits="userSpaceOnUse" + id="linearGradient1072" + xlink:href="#linearGradient2224" /><linearGradient + gradientTransform="translate(5.0857998e-6)" + y2="39.984692" + x2="45" + y1="31" + x1="42.1875" + gradientUnits="userSpaceOnUse" + id="linearGradient1074" + xlink:href="#linearGradient8171" /><linearGradient + y2="38.070381" + x2="34.170048" + y1="36.921333" + x1="33.396004" + gradientTransform="translate(5.1475751,-3.4097896)" + gradientUnits="userSpaceOnUse" + id="linearGradient1076" + xlink:href="#linearGradient2251" /><radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.710531,0,0,1.124849,-11.568326,1.8025772)" + r="19.96875" + fy="10.404876" + fx="12.700491" + cy="10.404876" + cx="12.700491" + id="radialGradient8161-7-6" + xlink:href="#linearGradient8155" /><linearGradient + y2="38.070381" + x2="34.170048" + y1="36.921333" + x1="33.396004" + gradientTransform="translate(5.1475774,-3.4097895)" + gradientUnits="userSpaceOnUse" + id="linearGradient1076-6" + xlink:href="#linearGradient8155" /><linearGradient + y2="37.770721" + x2="33.664921" + y1="40.458221" + x1="35.996582" + gradientTransform="translate(5.1475774,-3.0347918)" + gradientUnits="userSpaceOnUse" + id="linearGradient1072-0" + xlink:href="#linearGradient2224" /><linearGradient + gradientTransform="translate(5.0101976e-6,-3.7533736e-6)" + y2="39.984692" + x2="45" + y1="31" + x1="42.1875" + gradientUnits="userSpaceOnUse" + id="linearGradient1074-5" + xlink:href="#linearGradient8171" /><linearGradient + y2="7.1090999" + x2="21.9326" + y1="24.627399" + x1="21.9326" + gradientTransform="matrix(1.6484753,0,0,-1.2051099,-629.17272,-281.25344)" + gradientUnits="userSpaceOnUse" + id="linearGradient7671-2-7" + xlink:href="#linearGradient7648" /><linearGradient + y2="7.1090999" + x2="21.9326" + y1="24.627399" + x1="21.9326" + gradientTransform="matrix(1.6484753,0,0,1.6718017,-629.17272,-345.07189)" + gradientUnits="userSpaceOnUse" + id="linearGradient7673-9-6" + xlink:href="#aigrd3" /><linearGradient + y2="36.032799" + x2="31.081301" + y1="3.7319" + x1="12.4873" + gradientTransform="matrix(1.434003,0,0,0.990087,52.321673,2.838918)" + gradientUnits="userSpaceOnUse" + id="linearGradient1070-7" + xlink:href="#aigrd1" /><linearGradient + y2="609.50507" + x2="302.85715" + y1="366.64789" + x1="302.85715" + gradientTransform="matrix(4.1615627,0,0,2.9754828,-32212.903,-14936.877)" + gradientUnits="userSpaceOnUse" + id="linearGradient6715-3-2" + xlink:href="#linearGradient5048" /><radialGradient + r="117.14286" + fy="486.64789" + fx="605.71429" + cy="486.64789" + cx="605.71429" + gradientTransform="matrix(4.1615627,0,0,2.9754828,-32212.084,-14936.877)" + gradientUnits="userSpaceOnUse" + id="radialGradient6717-3-4" + xlink:href="#linearGradient5060" /><radialGradient + r="117.14286" + fy="486.64789" + fx="605.71429" + cy="486.64789" + cx="605.71429" + gradientTransform="matrix(-4.1615627,0,0,2.9754828,-29205.505,-14936.877)" + gradientUnits="userSpaceOnUse" + id="radialGradient6719-2-0" + xlink:href="#linearGradient5060" /></defs> + + + + + + + + + + <g + id="g6707" + transform="matrix(0.1160059,0,0,0.13449455,234.18793,187.83047)" + style="display:inline;stroke-width:0.18643716"><rect + y="-150.69685" + x="-1559.2523" + height="478.35718" + width="1339.6335" + id="rect6709" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.18643716;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + id="path6711" + d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.18643716;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.18643716;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z" + id="path6713" /></g><path + id="rect7603" + d="M 22.493564,40.261362 H 239.35622 c 3.32399,0 5.99999,2.7066 5.99999,6.06861 V 175.25853 c 0,3.36201 -45.10238,43.25861 -48.42637,43.25861 H 22.493564 c -3.323994,0 -5.99999,-2.7066 -5.99999,-6.06861 V 46.329972 c 0,-3.36201 2.675996,-6.06861 5.99999,-6.06861 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient8148);fill-opacity:1;fill-rule:nonzero;stroke:#bbbfbb;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<g + style="stroke-width:0.18643716" + transform="matrix(5.6254578,0,0,5.663975,3.6540074,29.635832)" + id="g7654"><path + style="fill:url(#linearGradient7671);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.22683188;stroke-miterlimit:4" + d="M 5.512695,30 H 39.643234 V 19.627375 H 5.512695 Z" + id="path7644" /><path + id="path16203" + d="M 5.512695,5.237844 H 39.643234 V 19.627375 H 5.512695 Z" + style="fill:url(#linearGradient7673);fill-rule:nonzero;stroke:none;stroke-width:0.22683188;stroke-miterlimit:4" /><g + transform="matrix(1.189217,0,0,1.189217,-3.525355,-6.535408)" + style="fill-rule:nonzero;stroke:#000000;stroke-width:0.21554199;stroke-miterlimit:4" + id="g16205"> + <g + style="stroke-width:0.21554199" + id="g16207"> + <path + id="path16209" + d="m 18.4,15.4 c 0,2.2 -1.8,4.1 -4.1,4.1 -2.2,0 -4.1,-1.8 -4.1,-4.1 0,-2.2 1.8,-4.1 4.1,-4.1 2.2,0 4.1,1.8 4.1,4.1 z" + style="opacity:0.04999994;fill:#e8f52f;stroke:none;stroke-width:0.21554199" /> + + + + + <path + id="path16211" + d="m 18,15.4 c 0,2 -1.6,3.7 -3.7,3.7 -2,0 -3.7,-1.6 -3.7,-3.7 0,-2 1.6,-3.7 3.7,-3.7 2,0 3.7,1.6 3.7,3.7 z" + style="opacity:0.20829994;fill:#ecf751;stroke:none;stroke-width:0.21554199" /> + + + + + <path + id="path16213" + d="m 17.6,15.4 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 0,-1.8 1.5,-3.3 3.3,-3.3 1.8,0 3.3,1.5 3.3,3.3 z" + style="opacity:0.36669994;fill:#f0f972;stroke:none;stroke-width:0.21554199" /> + + + + + <path + id="path16215" + d="m 17.2,15.4 c 0,1.6 -1.3,2.9 -2.9,2.9 -1.6,0 -2.9,-1.3 -2.9,-2.9 0,-1.6 1.3,-2.9 2.9,-2.9 1.6,0 2.9,1.3 2.9,2.9 z" + style="opacity:0.525;fill:#f4fa95;stroke:none;stroke-width:0.21554199" /> + + + + + <path + id="path16217" + d="m 16.8,15.4 c 0,1.4 -1.1,2.5 -2.5,2.5 -1.4,0 -2.5,-1.1 -2.5,-2.5 0,-1.4 1.1,-2.5 2.5,-2.5 1.4,0 2.5,1.1 2.5,2.5 z" + style="opacity:0.6833;fill:#f7fcb7;stroke:none;stroke-width:0.21554199" /> + + + + + <path + id="path16219" + d="m 16.4,15.4 c 0,1.2 -1,2.1 -2.1,2.1 -1.1,0 -2.1,-1 -2.1,-2.1 0,-1.1 1,-2.1 2.1,-2.1 1.1,0 2.1,1 2.1,2.1 z" + style="opacity:0.8417;fill:#fbfddb;stroke:none;stroke-width:0.21554199" /> + + + + + <path + id="path16221" + d="m 16,15.4 c 0,1 -0.8,1.8 -1.8,1.8 -1,0 -1.8,-0.8 -1.8,-1.8 0,-1 0.8,-1.8 1.8,-1.8 1,0 1.8,0.8 1.8,1.8 z" + style="fill:#ffffff;stroke:none;stroke-width:0.21554199" /> + + + + + </g> + + + + + </g><path + id="path16223" + d="m 25.015859,21.649044 h 8.681289 l 1.664904,0.475688 h -2.854121 c 0,0 2.854121,0.237842 4.281184,2.021669 1.427059,1.664904 -1.664905,3.686575 -1.664905,3.686575 0,0 0,0 0,0 -0.118922,-0.356766 -0.832454,-3.210889 -2.259514,-4.400106 -1.070297,-0.951374 -2.259514,-1.189218 -2.259514,-1.189218 h -5.589323 v -0.475686 z" + style="opacity:0.3;fill-rule:nonzero;stroke:none;stroke-width:0.22683188;stroke-miterlimit:4" /><path + id="path16225" + d="m 30.724106,22.362574 h -4.994715 l 9.275897,5.232557 z" + style="opacity:0.3;fill-rule:nonzero;stroke:none;stroke-width:0.22683188;stroke-miterlimit:4" /><path + id="path16227" + d="m 25.015859,21.767966 h 8.681289 l 1.30814,-0.832453 h -2.854121 c 0,0 2.616276,-0.475686 2.973043,-3.448731 0.356763,-2.973043 -4.043341,-6.302851 -4.043341,-6.302851 0,0 0,0 0,0.118922 0.118921,0.71353 1.308138,5.708243 0.475688,7.610993 -0.356767,1.664901 -1.427062,2.021667 -1.427062,2.021667 h -5.470401 l 0.237844,0.832453 z" + style="fill:#515151;fill-rule:nonzero;stroke:none;stroke-width:0.22683188;stroke-miterlimit:4" /><path + id="path16229" + d="M 30.248418,20.459827 H 25.253704 L 31.19979,11.421773 Z" + style="fill:#515151;fill-rule:nonzero;stroke:none;stroke-width:0.22683188;stroke-miterlimit:4" /></g><path + id="rect7675" + d="M 22.954685,45.645342 H 238.5799 c 0.80204,0 1.44772,0.65306 1.44772,1.46427 V 174.94603 c 0,5.10236 -37.88662,38.17748 -38.68865,38.17748 H 22.954685 c -0.802031,0 -1.447711,-0.65306 -1.447711,-1.46427 V 47.109612 c 0,-0.81121 0.64568,-1.46427 1.447711,-1.46427 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect + y="62.0826" + x="37.332108" + height="135.1951" + width="186.99988" + id="rect8163" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.84659095;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#4f4f4f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + id="path2210" + d="m 195.76749,218.34932 c 10.82889,1.77958 51.1402,-24.43588 49.51683,-45.84007 -8.3374,13.07095 -25.37877,6.94107 -47.29214,7.79882 0,0 2.10864,35.3441 -2.22469,38.04125 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient8169);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8177);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.36931817;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8166);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m 203.50314,206.52766 c 7.30549,-3.68879 23.61732,-11.57871 30.54735,-21.72545 -8.5125,3.66844 -15.72165,1.13009 -30.41243,1.02711 0,0 0.86571,16.51791 -0.13494,20.69835 z" + id="path2247" /><path + id="rect8150" + d="M 24.332115,48.596802 V 167.60895 C 143.40446,172.40105 156.71675,97.145662 237.33199,97.145662 v -48.54886 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.30113639;fill:url(#radialGradient8161);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:256-32" + height="256" + width="256" + y="8" + x="8" + style="fill:none" /> + <g + id="g6707-0" + transform="matrix(0.02175112,0,0,0.02493263,314.41033,253.81157)" + style="display:inline"><rect + y="-150.69685" + x="-1559.2523" + height="478.35718" + width="1339.6335" + id="rect6709-2" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#linearGradient6715-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + id="path6711-3" + d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient6717-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient6719-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z" + id="path6713-7" /></g><path + id="rect7603-5" + d="m 274.71761,226.45518 h 40.66177 c 0.62325,0 1.125,0.50175 1.125,1.12499 v 23.90081 c 0,0.62325 -8.4567,8.01929 -9.07995,8.01929 h -32.70682 c -0.62325,0 -1.125,-0.50175 -1.125,-1.125 v -30.7951 c 0,-0.62324 0.50175,-1.12499 1.125,-1.12499 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1070);fill-opacity:1;fill-rule:nonzero;stroke:#bbbfbb;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><g + transform="matrix(1.054774,0,0,1.049989,271.18519,224.48541)" + id="g7654-9"><path + style="fill:url(#linearGradient7671-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.2166667;stroke-miterlimit:4" + d="M 5.512695,30 H 39.643234 V 19.627375 H 5.512695 Z" + id="path7644-2" /><path + id="path16203-2" + d="M 5.512695,5.237844 H 39.643234 V 19.627375 H 5.512695 Z" + style="fill:url(#linearGradient7673-9);fill-rule:nonzero;stroke:none;stroke-width:1.2166667;stroke-miterlimit:4" /><g + transform="matrix(1.189217,0,0,1.189217,-3.525355,-6.535408)" + style="fill-rule:nonzero;stroke:#000000;stroke-width:1.15611064;stroke-miterlimit:4" + id="g16205-8"><g + id="g16207-9"><path + id="path16209-7" + d="m 18.4,15.4 c 0,2.2 -1.8,4.1 -4.1,4.1 -2.2,0 -4.1,-1.8 -4.1,-4.1 0,-2.2 1.8,-4.1 4.1,-4.1 2.2,0 4.1,1.8 4.1,4.1 z" + style="opacity:0.04999994;fill:#e8f52f;stroke:none" /><path + id="path16211-3" + d="m 18,15.4 c 0,2 -1.6,3.7 -3.7,3.7 -2,0 -3.7,-1.6 -3.7,-3.7 0,-2 1.6,-3.7 3.7,-3.7 2,0 3.7,1.6 3.7,3.7 z" + style="opacity:0.20829994;fill:#ecf751;stroke:none" /><path + id="path16213-6" + d="m 17.6,15.4 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 0,-1.8 1.5,-3.3 3.3,-3.3 1.8,0 3.3,1.5 3.3,3.3 z" + style="opacity:0.36669994;fill:#f0f972;stroke:none" /><path + id="path16215-1" + d="m 17.2,15.4 c 0,1.6 -1.3,2.9 -2.9,2.9 -1.6,0 -2.9,-1.3 -2.9,-2.9 0,-1.6 1.3,-2.9 2.9,-2.9 1.6,0 2.9,1.3 2.9,2.9 z" + style="opacity:0.525;fill:#f4fa95;stroke:none" /><path + id="path16217-2" + d="m 16.8,15.4 c 0,1.4 -1.1,2.5 -2.5,2.5 -1.4,0 -2.5,-1.1 -2.5,-2.5 0,-1.4 1.1,-2.5 2.5,-2.5 1.4,0 2.5,1.1 2.5,2.5 z" + style="opacity:0.6833;fill:#f7fcb7;stroke:none" /><path + id="path16219-9" + d="m 16.4,15.4 c 0,1.2 -1,2.1 -2.1,2.1 -1.1,0 -2.1,-1 -2.1,-2.1 0,-1.1 1,-2.1 2.1,-2.1 1.1,0 2.1,1 2.1,2.1 z" + style="opacity:0.8417;fill:#fbfddb;stroke:none" /><path + id="path16221-3" + d="m 16,15.4 c 0,1 -0.8,1.8 -1.8,1.8 -1,0 -1.8,-0.8 -1.8,-1.8 0,-1 0.8,-1.8 1.8,-1.8 1,0 1.8,0.8 1.8,1.8 z" + style="fill:#ffffff;stroke:none" /></g></g><path + id="path16223-1" + d="m 25.015859,21.649044 h 8.681289 l 1.664904,0.475688 h -2.854121 c 0,0 2.854121,0.237842 4.281184,2.021669 1.427059,1.664904 -1.664905,3.686575 -1.664905,3.686575 0,0 0,0 0,0 -0.118922,-0.356766 -0.832454,-3.210889 -2.259514,-4.400106 -1.070297,-0.951374 -2.259514,-1.189218 -2.259514,-1.189218 h -5.589323 v -0.475686 z" + style="opacity:0.3;fill-rule:nonzero;stroke:none;stroke-width:1.2166667;stroke-miterlimit:4" /><path + id="path16225-9" + d="m 30.724106,22.362574 h -4.994715 l 9.275897,5.232557 z" + style="opacity:0.3;fill-rule:nonzero;stroke:none;stroke-width:1.2166667;stroke-miterlimit:4" /><path + id="path16227-4" + d="m 25.015859,21.767966 h 8.681289 l 1.30814,-0.832453 h -2.854121 c 0,0 2.616276,-0.475686 2.973043,-3.448731 0.356763,-2.973043 -4.043341,-6.302851 -4.043341,-6.302851 0,0 0,0 0,0.118922 0.118921,0.71353 1.308138,5.708243 0.475688,7.610993 -0.356767,1.664901 -1.427062,2.021667 -1.427062,2.021667 h -5.470401 l 0.237844,0.832453 z" + style="fill:#515151;fill-rule:nonzero;stroke:none;stroke-width:1.2166667;stroke-miterlimit:4" /><path + id="path16229-7" + d="M 30.248418,20.459827 H 25.253704 L 31.19979,11.421773 Z" + style="fill:#515151;fill-rule:nonzero;stroke:none;stroke-width:1.2166667;stroke-miterlimit:4" /></g><path + id="rect7675-8" + d="m 274.80407,227.45326 h 40.42975 c 0.15039,0 0.27145,0.12106 0.27145,0.27144 v 23.69835 c 0,0.94588 -7.10374,7.07735 -7.25412,7.07735 h -33.44708 c -0.15038,0 -0.27144,-0.12106 -0.27144,-0.27145 V 227.7247 c 0,-0.15038 0.12106,-0.27144 0.27144,-0.27144 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect + y="230.50041" + x="277.49985" + height="25.0625" + width="35.0625" + id="rect8163-4" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.84659095;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#4f4f4f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + id="path2210-5" + d="m 307.20649,259.46916 c 2.03042,0.3299 9.58879,-4.52993 9.28441,-8.49784 -1.56326,2.4231 -4.75852,1.28674 -8.86728,1.44575 0,0 0.39537,6.55209 -0.41713,7.05209 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1072);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1074);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.36931817;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1076);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m 308.65693,257.27766 c 1.36978,-0.68383 4.42825,-2.14646 5.72763,-4.02747 -1.5961,0.68006 -2.94781,0.2095 -5.70234,0.19041 0,0 0.16233,3.06209 -0.0253,3.83706 z" + id="path2247-0" /><path + id="rect8150-3" + d="m 275.06234,228.0004 v 22.0625 c 22.32608,0.88836 24.82213,-13.0625 39.9375,-13.0625 v -9 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.30113639;fill:url(#radialGradient8161-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:48-32" + height="48" + width="48" + y="220" + x="272" + style="fill:none" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +8NpC/NRj/FlDJiFxHCGlZDgcFuSTNMZgePe3v9lDaOoa+NUvf1GxJ4U8L/v23dvs9nrIVGbkw4B4 +GDFMh/zu4u/FzX/e3MN1agZ83//KSJftOI6xsYnjmMGgTzyM6Ha7/Prtd8Xa2trUrDmjwVEcce7c +OV4UtNb8+fKfkMOUMAoJo5Db//5IXHzv4r7jsgwoxNXrV83zOrgOgkcPH6KUZnOwyYMHq+L9996n +2+2+MD6HOMQhDnGIrwf+D/F3w+/ak6oYAAAAFHRFWHRBdXRob3IASmFrdWIgU3RlaW5lcub79y8A +AABYdEVYdENvcHlyaWdodABDQzAgUHVibGljIERvbWFpbiBEZWRpY2F0aW9uIGh0dHA6Ly9jcmVh +dGl2ZWNvbW1vbnMub3JnL3B1YmxpY2RvbWFpbi96ZXJvLzEuMC/G4735AAAAJXRFWHRkYXRlOmNy +ZWF0ZQAyMDE4LTA4LTI5VDIxOjU4OjE5LTA2OjAwN6TyQQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAx +OC0wOC0yOVQyMTo1ODoxOS0wNjowMEb5Sv0AAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5v +cmeb7jwaAAAAEnRFWHRUaXRsZQBHZW5yaWMgSW1hZ2XykzdZAAAAAElFTkSuQmCC +" + id="icon:48-8" + x="328" + y="220" /><image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +8NpC/NRj/FlDJiFxHCGlZDgcFuSTNMZgePe3v9lDaOoa+NUvf1GxJ4U8L/v23dvs9nrIVGbkw4B4 +GDFMh/zu4u/FzX/e3MN1agZ83//KSJftOI6xsYnjmMGgTzyM6Ha7/Prtd8Xa2trUrDmjwVEcce7c +OV4UtNb8+fKfkMOUMAoJo5Db//5IXHzv4r7jsgwoxNXrV83zOrgOgkcPH6KUZnOwyYMHq+L9996n +2+2+MD6HOMQhDnGIrwf+D/F3w+/ak6oYAAAAFHRFWHRBdXRob3IASmFrdWIgU3RlaW5lcub79y8A +AABYdEVYdENvcHlyaWdodABDQzAgUHVibGljIERvbWFpbiBEZWRpY2F0aW9uIGh0dHA6Ly9jcmVh +dGl2ZWNvbW1vbnMub3JnL3B1YmxpY2RvbWFpbi96ZXJvLzEuMC/G4735AAAAJXRFWHRkYXRlOmNy +ZWF0ZQAyMDE4LTA4LTI5VDIxOjU4OjE5LTA2OjAwN6TyQQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAx +OC0wOC0yOVQyMTo1ODoxOS0wNjowMEb5Sv0AAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5v +cmeb7jwaAAAAEnRFWHRUaXRsZQBHZW5yaWMgSW1hZ2XykzdZAAAAAElFTkSuQmCC +" + id="icon:48-4" + x="384" + y="220" /><g + id="g6707-0-7" + transform="matrix(0.01450082,0,0,0.01650487,468.36694,258.57901)" + style="display:inline;stroke-width:1.50529826"><rect + y="-150.69685" + x="-1559.2523" + height="478.35718" + width="1339.6335" + id="rect6709-2-8" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#linearGradient6715-3-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50529826;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + id="path6711-3-6" + d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient6717-3-4);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50529826;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient6719-2-0);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50529826;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z" + id="path6713-7-8" /></g><path + id="rect7603-5-8" + d="m 441.905,240.46966 h 27.10798 c 0.4155,0 0.75,0.33215 0.75,0.74472 v 15.82183 c 0,0.41258 -5.63782,5.3086 -6.05333,5.3086 H 441.905 c -0.4155,0 -0.75,-0.33215 -0.75,-0.74473 v -20.3857 c 0,-0.41257 0.3345,-0.74472 0.75,-0.74472 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1070-7);fill-opacity:1;fill-rule:nonzero;stroke:#bbbfbb;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><g + style="stroke-width:1.50529826" + transform="matrix(0.70318618,0,0,0.69507027,439.55004,239.16572)" + id="g7654-9-4"><path + style="fill:url(#linearGradient7671-2-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.83144629;stroke-miterlimit:4" + d="M 5.512695,30 H 39.643234 V 19.627375 H 5.512695 Z" + id="path7644-2-3" /><path + id="path16203-2-1" + d="M 5.512695,5.237844 H 39.643234 V 19.627375 H 5.512695 Z" + style="fill:url(#linearGradient7673-9-6);fill-rule:nonzero;stroke:none;stroke-width:1.83144629;stroke-miterlimit:4" /><g + transform="matrix(1.189217,0,0,1.189217,-3.525355,-6.535408)" + style="fill-rule:nonzero;stroke:#000000;stroke-width:1.74029136;stroke-miterlimit:4" + id="g16205-8-4"><g + style="stroke-width:1.74029136" + id="g16207-9-9"><path + id="path16209-7-2" + d="m 18.4,15.4 c 0,2.2 -1.8,4.1 -4.1,4.1 -2.2,0 -4.1,-1.8 -4.1,-4.1 0,-2.2 1.8,-4.1 4.1,-4.1 2.2,0 4.1,1.8 4.1,4.1 z" + style="opacity:0.04999994;fill:#e8f52f;stroke:none;stroke-width:1.74029136" /><path + id="path16211-3-0" + d="m 18,15.4 c 0,2 -1.6,3.7 -3.7,3.7 -2,0 -3.7,-1.6 -3.7,-3.7 0,-2 1.6,-3.7 3.7,-3.7 2,0 3.7,1.6 3.7,3.7 z" + style="opacity:0.20829994;fill:#ecf751;stroke:none;stroke-width:1.74029136" /><path + id="path16213-6-6" + d="m 17.6,15.4 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 0,-1.8 1.5,-3.3 3.3,-3.3 1.8,0 3.3,1.5 3.3,3.3 z" + style="opacity:0.36669994;fill:#f0f972;stroke:none;stroke-width:1.74029136" /><path + id="path16215-1-8" + d="m 17.2,15.4 c 0,1.6 -1.3,2.9 -2.9,2.9 -1.6,0 -2.9,-1.3 -2.9,-2.9 0,-1.6 1.3,-2.9 2.9,-2.9 1.6,0 2.9,1.3 2.9,2.9 z" + style="opacity:0.525;fill:#f4fa95;stroke:none;stroke-width:1.74029136" /><path + id="path16217-2-9" + d="m 16.8,15.4 c 0,1.4 -1.1,2.5 -2.5,2.5 -1.4,0 -2.5,-1.1 -2.5,-2.5 0,-1.4 1.1,-2.5 2.5,-2.5 1.4,0 2.5,1.1 2.5,2.5 z" + style="opacity:0.6833;fill:#f7fcb7;stroke:none;stroke-width:1.74029136" /><path + id="path16219-9-2" + d="m 16.4,15.4 c 0,1.2 -1,2.1 -2.1,2.1 -1.1,0 -2.1,-1 -2.1,-2.1 0,-1.1 1,-2.1 2.1,-2.1 1.1,0 2.1,1 2.1,2.1 z" + style="opacity:0.8417;fill:#fbfddb;stroke:none;stroke-width:1.74029136" /><path + id="path16221-3-6" + d="m 16,15.4 c 0,1 -0.8,1.8 -1.8,1.8 -1,0 -1.8,-0.8 -1.8,-1.8 0,-1 0.8,-1.8 1.8,-1.8 1,0 1.8,0.8 1.8,1.8 z" + style="fill:#ffffff;stroke:none;stroke-width:1.74029136" /></g></g><path + id="path16223-1-6" + d="m 25.015859,21.649044 h 8.681289 l 1.664904,0.475688 h -2.854121 c 0,0 2.854121,0.237842 4.281184,2.021669 1.427059,1.664904 -1.664905,3.686575 -1.664905,3.686575 0,0 0,0 0,0 -0.118922,-0.356766 -0.832454,-3.210889 -2.259514,-4.400106 -1.070297,-0.951374 -2.259514,-1.189218 -2.259514,-1.189218 h -5.589323 v -0.475686 z" + style="opacity:0.3;fill-rule:nonzero;stroke:none;stroke-width:1.83144629;stroke-miterlimit:4" /><path + id="path16225-9-4" + d="m 30.724106,22.362574 h -4.994715 l 9.275897,5.232557 z" + style="opacity:0.3;fill-rule:nonzero;stroke:none;stroke-width:1.83144629;stroke-miterlimit:4" /><path + id="path16227-4-9" + d="m 25.015859,21.767966 h 8.681289 l 1.30814,-0.832453 h -2.854121 c 0,0 2.616276,-0.475686 2.973043,-3.448731 0.356763,-2.973043 -4.043341,-6.302851 -4.043341,-6.302851 0,0 0,0 0,0.118922 0.118921,0.71353 1.308138,5.708243 0.475688,7.610993 -0.356767,1.664901 -1.427062,2.021667 -1.427062,2.021667 h -5.470401 l 0.237844,0.832453 z" + style="fill:#515151;fill-rule:nonzero;stroke:none;stroke-width:1.83144629;stroke-miterlimit:4" /><path + id="path16229-7-5" + d="M 30.248418,20.459827 H 25.253704 L 31.19979,11.421773 Z" + style="fill:#515151;fill-rule:nonzero;stroke:none;stroke-width:1.83144629;stroke-miterlimit:4" /></g><path + id="rect7675-8-0" + d="m 441.96264,241.13037 h 26.9533 c 0.10026,0 0.18097,0.0801 0.18097,0.17969 v 15.6878 c 0,0.62615 -4.73585,4.68505 -4.83611,4.68505 h -22.29816 c -0.10025,0 -0.18096,-0.0801 -0.18096,-0.17969 v -20.19316 c 0,-0.0995 0.0807,-0.17969 0.18096,-0.17969 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect + y="243.14752" + x="443.75983" + height="16.590839" + width="23.375116" + id="rect8163-4-4" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.84659095;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#4f4f4f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + id="path2210-5-8" + d="m 463.56436,262.32421 c 1.35362,0.21839 6.39256,-2.99871 6.18964,-5.62539 -1.04218,1.60404 -3.17236,0.8518 -5.91155,0.95706 0,0 0.26358,4.33734 -0.27809,4.66833 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1072-0);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1074-5);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.36931817;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1076-6);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m 464.53133,260.87349 c 0.91319,-0.45268 2.95218,-1.42091 3.81843,-2.6661 -1.06407,0.45018 -1.96521,0.13868 -3.80157,0.12604 0,0 0.10822,2.02704 -0.0169,2.54006 z" + id="path2247-0-7" /><path + id="rect8150-3-1" + d="m 442.13482,241.49257 v 14.6049 c 14.88413,0.58807 16.54817,-8.6471 26.62513,-8.6471 v -5.9578 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.30113639;fill:url(#radialGradient8161-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:32-32" + height="32" + width="32" + y="236" + x="440" + style="fill:none" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAA +B3RJTUUH1gYMFyca8+vhYAAABBJJREFUWMPtlk1vG1UUhp87Y3scO05ip00TWlQVgUCCqLBECKlS +1Z/Br2ALq25A/AE2CKkqy0ZsWFWVQluVqhIUAlVbkRD1w3ESx07Gn+O5Xyxm7HHiNm5F1A090uie +e+/RvM85597RwGv7v5sAuLp81WJfvfKFcxdEKvIF58+df6X6136+BkAKwNoo/dXV1QRQiIHf3z84 +P2w8bG9xcXEwTx0k+/a7ywjh4AwDYLHGYqzFGIM1BmMMOh6Nida11vE8ebTWcVwUc/HLz/fp7QMQ +QpByXWreBziOQAgo5CS5nKbVFfgNB6kExli0sWhtYj8ZtbH79nUfzljmu7dHWjFSAdd1KeQ9XAfO +nOrw8YcuczMlGu0mt/7osPJgklATiVubCOukQn1/GNJYi9tzxgMIATkvTSEf8slZl/ff+pSUU2J+ +1ieTvkndl2ztTMQljYWGxfvrg70ElF3GA2AtE16aqXxIaWaClFMCHFwxQ7Eww7HiJq12ZtBTMzgb +yah7TWRzC2f6zL7WNK09HKB/erNeCmuzNFo+anYH15nFGp9m10epCXLZ9NChjEZrk8x3K/exMsCi +yJTeRWuBBXytR27UMwA0uWwaSPNwPcBJ3aBYmKQddHm4BjKcI5cVWJsARxDRvF6+h+w2sOlJtv++ +xemPjpOfngdgxxEvVoEJL4VA0Gyd4O5fAdlMj1DN0u15ZDNOv1MJgI2uaqdR59G9m3iFOfLZHFhL +o7zC/MnTAPHNEs8HADDGkPMyJHEeSoED5D0bC8dfhz4EEIaKO7d/Iuh2mF2YIu1GL7AqYDqfjQGc +wwGstWAMU/k0w2H2gNcXBtDGEkrF6p+32dvZAKBYLFKtPALg7ffOcmw6AnDHVcBaS7sT8OvvawzH +DZ+bgbA2BD1JL1Qo2aGxXWbq+DsAPN2o4m8+ZrJ0hi0/zc6dBwB0g3A8gJQSv9EAGEAkABapDL2e +RCo1WJeBT6sdYoyKSi1CjPcGza6CvV0yWTlo71iAUEoaMQAIjDEopVFaI5WOPigj5uDmFwiau7T8 +HYzRTBdP0O00qfv3KczMkS+UxgNorfF9n1BuY4wdubNjTWTITp2g06yxVXnMdGmBTmOXdnud4pwh +ZwwA9d06Nvaf0YKQvb29lxMeKUiWVM6lXt/i6y8+G9o4R3nzKeXKU6SUowD9PjVazf8GMDAPqTRv +LpzCxBkrpShXynSCzvMBTuaqRwQAYRCgtaZWq+G6LpWtCkEv4NL3l8QIgBCCb766OPCH1w/6L7p2 +d+U3lFJIKXmy8YRWq8mVpSWxvLw8VAERZb64uHhkmfereeOX66z9s0ptr8bmxiaXL/0g1tfXE1CI +/ooF4uVP/SFmraW6XaVa3UZpza3rN8XS0o9HmuBre21HYv8CrF4Qpho05YEAAAAldEVYdGRhdGU6 +Y3JlYXRlADIwMTgtMDgtMjNUMjI6MTQ6NTctMDY6MDAATcIIAAAAJXRFWHRkYXRlOm1vZGlmeQAy +MDA2LTA2LTEzVDA1OjM5OjI2LTA2OjAwewtT2wAAAABJRU5ErkJggg== +" + id="icon:32-8" + x="480" + y="236" /><image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAA +B3RJTUUH1gYMFyca8+vhYAAABBJJREFUWMPtlk1vG1UUhp87Y3scO05ip00TWlQVgUCCqLBECKlS +1Z/Br2ALq25A/AE2CKkqy0ZsWFWVQluVqhIUAlVbkRD1w3ESx07Gn+O5Xyxm7HHiNm5F1A090uie +e+/RvM85597RwGv7v5sAuLp81WJfvfKFcxdEKvIF58+df6X6136+BkAKwNoo/dXV1QRQiIHf3z84 +P2w8bG9xcXEwTx0k+/a7ywjh4AwDYLHGYqzFGIM1BmMMOh6Nida11vE8ebTWcVwUc/HLz/fp7QMQ +QpByXWreBziOQAgo5CS5nKbVFfgNB6kExli0sWhtYj8ZtbH79nUfzljmu7dHWjFSAdd1KeQ9XAfO +nOrw8YcuczMlGu0mt/7osPJgklATiVubCOukQn1/GNJYi9tzxgMIATkvTSEf8slZl/ff+pSUU2J+ +1ieTvkndl2ztTMQljYWGxfvrg70ElF3GA2AtE16aqXxIaWaClFMCHFwxQ7Eww7HiJq12ZtBTMzgb +yah7TWRzC2f6zL7WNK09HKB/erNeCmuzNFo+anYH15nFGp9m10epCXLZ9NChjEZrk8x3K/exMsCi +yJTeRWuBBXytR27UMwA0uWwaSPNwPcBJ3aBYmKQddHm4BjKcI5cVWJsARxDRvF6+h+w2sOlJtv++ +xemPjpOfngdgxxEvVoEJL4VA0Gyd4O5fAdlMj1DN0u15ZDNOv1MJgI2uaqdR59G9m3iFOfLZHFhL +o7zC/MnTAPHNEs8HADDGkPMyJHEeSoED5D0bC8dfhz4EEIaKO7d/Iuh2mF2YIu1GL7AqYDqfjQGc +wwGstWAMU/k0w2H2gNcXBtDGEkrF6p+32dvZAKBYLFKtPALg7ffOcmw6AnDHVcBaS7sT8OvvawzH +DZ+bgbA2BD1JL1Qo2aGxXWbq+DsAPN2o4m8+ZrJ0hi0/zc6dBwB0g3A8gJQSv9EAGEAkABapDL2e +RCo1WJeBT6sdYoyKSi1CjPcGza6CvV0yWTlo71iAUEoaMQAIjDEopVFaI5WOPigj5uDmFwiau7T8 +HYzRTBdP0O00qfv3KczMkS+UxgNorfF9n1BuY4wdubNjTWTITp2g06yxVXnMdGmBTmOXdnud4pwh +ZwwA9d06Nvaf0YKQvb29lxMeKUiWVM6lXt/i6y8+G9o4R3nzKeXKU6SUowD9PjVazf8GMDAPqTRv +LpzCxBkrpShXynSCzvMBTuaqRwQAYRCgtaZWq+G6LpWtCkEv4NL3l8QIgBCCb766OPCH1w/6L7p2 +d+U3lFJIKXmy8YRWq8mVpSWxvLw8VAERZb64uHhkmfereeOX66z9s0ptr8bmxiaXL/0g1tfXE1CI +/ooF4uVP/SFmraW6XaVa3UZpza3rN8XS0o9HmuBre21HYv8CrF4Qpho05YEAAAAldEVYdGRhdGU6 +Y3JlYXRlADIwMTgtMDgtMjNUMjI6MTQ6NTctMDY6MDAATcIIAAAAJXRFWHRkYXRlOm1vZGlmeQAy +MDA2LTA2LTEzVDA1OjM5OjI2LTA2OjAwewtT2wAAAABJRU5ErkJggg== +" + id="icon:32-4" + x="520" + y="236" /><image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI +WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH1QsKEAcSNpSytgAAAbtJREFUOMud001rE0EYwPH/7Ns0 +3ZjUBaGlBaHgpYVcxKIXU+jJg59A6GconusxGIP1CwjeevUg0kC12B4K1Z5URA8q0kMiBZUmm263 +2ZnpYenqYgohAwPz+ntmhmdEvVFbA+4zWnlCvVEzWuuRar1RMw6AMYYHj56ytfNuqLBL1QVWV5YB +cACEEOzuf2bu5h0sy8K1FYWC4veRTaI0idIopQFIlGFr500eMMbg2IKg7DMzGXO3WiQoBWzsfuft +ez9DUkDT/uc0znnDsiwu+ZIb8zGzU4sI4XL7epdvB6dEJwKlU0Apk7vOX0AISuOSTmgTJy1cu8yf +oy6+nEA6oM8BfQEggGLBo314hdd7XwjKp3w9CCiOe2htaP/4xOTVOfSFgAUlX4IQ9I59ej2D54Dr +p2/0au8lhTGPmdn5wUDS7xN1DnOTBgMGtEmj7m8/px9Hg4FON+TZ+ov0LulutNaExxFhGFGZToeb +zSZ4lzPAymmexHYkCIe+FsSJwXHHqEyfZGumJhh8AoDFWxVaP38NyL1ruV7rw8f/gaXqAhub20On +cg4QQrC6spyl5zBFSpkB643HD++N+p3PALVY4ZaLQhKrAAAAAElFTkSuQmCC +" + id="icon:16-32" + x="560" + y="252" /><image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABBVBMVEWIioX+/v79/f16hpg3 +R2L29vY/UW9hf6tjga1ohKpxjadffqpbe6hXeKZUdaRQcqNDVHBzjraPpq/c5bnu88ukuKltibNp +hrFlg69hgK1FVnKAmb3E0a/+/vn///7i676Bmrh4krl1kLdyjbZHV3OOo8S2xbL3+t/8/e7R3LGM +ocGInsGGnL+Dmr5IV3OarMqdr8ezwrfF0bGhs8OYq8mWqch9iZ2VqMeTpsZJWXOot9GouNKnt9Gm +ttGltdBRUVGGkaOis85FVG6fqbueqbqeqLqcp7mBipo9Tm09T207TGsvQmIjNlk4QVFBVHRAU3Q9 +UHE4TG40SGozR2qBjaJndY8AAADMon8sAAAAAWJLR0RWCg3piQAAAAlwSFlzAAAN1wAADdcBQiib +eAAAAAd0SU1FB9ULCgIIBrR0DRoAAACYSURBVBjTY2DAAIwoACjAxMwCB8ysIBVs7BycXNw8vHx8 +/CwgASYBQSFhEVExcQkJSYiAlLSMrJy8gqKSkjJEQEVVTV1DU0tbR0cXIqCnb2BoZGxiamZuARGw +tLK2trKxtbN3cIQIODkDgYurm729O0SAxcPT08PL28fe3hcq4OcfEBgUbA8EUIGQUBiACGA4nRUJ +MGF6HgAVTBZM9cwcgAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0wOC0yM1QyMjoxNDo1Ny0wNjow +MABNwggAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMDUtMTEtMTBUMDk6MDg6MDYtMDc6MDBS4S64AAAA +AElFTkSuQmCC +" + id="icon:16-8" + x="584" + y="252" /><image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABBVBMVEWIioX+/v79/f16hpg3 +R2L29vY/UW9hf6tjga1ohKpxjadffqpbe6hXeKZUdaRQcqNDVHBzjraPpq/c5bnu88ukuKltibNp +hrFlg69hgK1FVnKAmb3E0a/+/vn///7i676Bmrh4krl1kLdyjbZHV3OOo8S2xbL3+t/8/e7R3LGM +ocGInsGGnL+Dmr5IV3OarMqdr8ezwrfF0bGhs8OYq8mWqch9iZ2VqMeTpsZJWXOot9GouNKnt9Gm +ttGltdBRUVGGkaOis85FVG6fqbueqbqeqLqcp7mBipo9Tm09T207TGsvQmIjNlk4QVFBVHRAU3Q9 +UHE4TG40SGozR2qBjaJndY8AAADMon8sAAAAAWJLR0RWCg3piQAAAAlwSFlzAAAN1wAADdcBQiib +eAAAAAd0SU1FB9ULCgIIBrR0DRoAAACYSURBVBjTY2DAAIwoACjAxMwCB8ysIBVs7BycXNw8vHx8 +/CwgASYBQSFhEVExcQkJSYiAlLSMrJy8gqKSkjJEQEVVTV1DU0tbR0cXIqCnb2BoZGxiamZuARGw +tLK2trKxtbN3cIQIODkDgYurm729O0SAxcPT08PL28fe3hcq4OcfEBgUbA8EUIGQUBiACGA4nRUJ +MGF6HgAVTBZM9cwcgAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0wOC0yM1QyMjoxNDo1Ny0wNjow +MABNwggAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMDUtMTEtMTBUMDk6MDg6MDYtMDc6MDBS4S64AAAA +AElFTkSuQmCC +" + id="icon:16-4" + x="608" + y="252" /></svg> diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 1f8fe89cf8..a044bb7770 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -810,6 +810,9 @@ IDI_SHELL_VIDEO_FILE ICON resources/video.ico /* @makedep: resources/audio.ico */ IDI_SHELL_AUDIO_FILE ICON resources/audio.ico +/* @makedep: resources/image.ico */ +IDI_SHELL_IMAGE_FILE ICON resources/image.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 1f132239b3..0339bc33d9 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -295,6 +295,7 @@ #define IDI_SHELL_DOCUMENTS 223 #define IDI_SHELL_VIDEO_FILE 224 #define IDI_SHELL_AUDIO_FILE 225 +#define IDI_SHELL_IMAGE_FILE 226 #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_CARD_READER 229 #define IDI_SHELL_ZIP_DRIVE 230 -- 2.18.0

1 11

[PATCH 01/15] shell32: Add video file icon
by Alex Henrie 31 Aug '18

31 Aug '18

Adapted from video-x-generic in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/video.ico | Bin 0 -> 64287 bytes dlls/shell32/resources/video.svg | 783 +++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 788 insertions(+) create mode 100644 dlls/shell32/resources/video.ico create mode 100644 dlls/shell32/resources/video.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 74a3c13f2b..aad12636ce 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -98,4 +98,5 @@ SVG_SRCS = \ resources/trash_file.svg \ resources/trash_full.svg \ resources/update.svg \ + resources/video.svg \ resources/window.svg diff --git a/dlls/shell32/resources/video.ico b/dlls/shell32/resources/video.ico new file mode 100644 index 0000000000000000000000000000000000000000..2edeeeef3ab09ace3468a4e60891cb7c51c8e348 GIT binary patch literal 64287 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 literal 0 HcmV?d00001 diff --git a/dlls/shell32/resources/video.svg b/dlls/shell32/resources/video.svg new file mode 100644 index 0000000000..c7a0b9ed45 --- /dev/null +++ b/dlls/shell32/resources/video.svg @@ -0,0 +1,783 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.1" + id="svg11300" + height="272" + width="632"> + <defs + id="defs3"> + <linearGradient + id="linearGradient7087"> + <stop + id="stop7089" + offset="0" + style="stop-color:#888a85;stop-opacity:1;" /> + <stop + id="stop7091" + offset="1" + style="stop-color:#b8b9b6;stop-opacity:1;" /> + </linearGradient> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.99999998,0,0,0.66393398,1.2374365,9.8240947)" + r="21.566757" + fy="26.963573" + fx="23.157747" + cy="26.963573" + cx="23.157747" + id="radialGradient7085" + xlink:href="#linearGradient7079" /> + <linearGradient + id="linearGradient7079"> + <stop + id="stop7081" + offset="0" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + id="stop7083" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <radialGradient + gradientTransform="translate(1.9716765,9.2201447)" + xlink:href="#aigrd4-3" + id="radialGradient6540" + gradientUnits="userSpaceOnUse" + cx="20.655508" + cy="24.735121" + fx="20.655508" + fy="24.735121" + r="14.1515" /> + <radialGradient + gradientUnits="userSpaceOnUse" + fy="22.6138" + fx="9.3417997" + r="14.1515" + cy="22.6138" + cx="9.3417997" + id="aigrd4-3"> + <stop + id="stop6452-6" + style="stop-color:#767676" + offset="0" /> + <stop + id="stop6454-7" + style="stop-color:#484848" + offset="1" /> + </radialGradient> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="25.772396" + x2="29.049412" + y1="12.75" + x1="23.816254" + id="linearGradient7093" + xlink:href="#linearGradient7087" + gradientTransform="matrix(0.76096898,0,0,0.98666301,2.9050465,0.58427473)" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="-4.5986342" + x2="21.107563" + y1="31.867859" + x1="21.03167" + id="linearGradient7060" + xlink:href="#linearGradient7054" + gradientTransform="matrix(0.950533,0,0,0.9375,1.4509965,3.3206247)" /> + <linearGradient + id="linearGradient7054"> + <stop + id="stop7056" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop7058" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(0.88487799,0,0,0.88487801,5.3181165,5.9431647)" + gradientUnits="userSpaceOnUse" + y2="34.140205" + x2="40.820396" + y1="35.24506" + x1="46.54464" + id="linearGradient7075" + xlink:href="#linearGradient7069" /> + <linearGradient + id="linearGradient7069"> + <stop + id="stop7071" + offset="0" + style="stop-color:#888a85;stop-opacity:1;" /> + <stop + id="stop7073" + offset="1" + style="stop-color:#888a85;stop-opacity:0;" /> + </linearGradient> + <linearGradient + gradientTransform="translate(6.5136719e-6,2.0000047)" + gradientUnits="userSpaceOnUse" + y2="32.133045" + x2="26.625" + y1="32.133045" + x1="43.6875" + id="linearGradient7144" + xlink:href="#linearGradient7054" /> + <linearGradient + gradientTransform="translate(1.6748048e-6,1.9999997)" + gradientUnits="userSpaceOnUse" + y2="32.133045" + x2="26.625" + y1="32.133045" + x1="43.6875" + id="linearGradient7144-5" + xlink:href="#linearGradient7054" /> + <linearGradient + gradientTransform="matrix(0.884878,0,0,0.884878,5.3181217,5.9431597)" + gradientUnits="userSpaceOnUse" + y2="34.140205" + x2="40.820396" + y1="35.24506" + x1="46.54464" + id="linearGradient7075-9" + xlink:href="#linearGradient7069" /> + <radialGradient + gradientTransform="translate(1.9716817,9.2201397)" + xlink:href="#aigrd4-3-3" + id="radialGradient6540-9" + gradientUnits="userSpaceOnUse" + cx="20.655508" + cy="24.735121" + fx="20.655508" + fy="24.735121" + r="14.1515" /> + <radialGradient + gradientUnits="userSpaceOnUse" + fy="22.6138" + fx="9.3417997" + r="14.1515" + cy="22.6138" + cx="9.3417997" + id="aigrd4-3-3"> + <stop + id="stop6452-6-6" + style="stop-color:#767676" + offset="0" /> + <stop + id="stop6454-7-0" + style="stop-color:#484848" + offset="1" /> + </radialGradient> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.663934,1.2374417,9.8240897)" + r="21.566757" + fy="26.963573" + fx="23.157747" + cy="26.963573" + cx="23.157747" + id="radialGradient7085-6" + xlink:href="#linearGradient7079" /> + <linearGradient + y2="25.772396" + x2="29.049412" + y1="12.75" + x1="23.816254" + gradientTransform="matrix(0.760969,0,0,0.986663,2.9050517,0.58426974)" + gradientUnits="userSpaceOnUse" + id="linearGradient1048" + xlink:href="#linearGradient7087" /> + <linearGradient + y2="-4.5986342" + x2="21.107563" + y1="31.867859" + x1="21.03167" + gradientTransform="matrix(0.950533,0,0,0.9375,1.4510017,3.3206197)" + gradientUnits="userSpaceOnUse" + id="linearGradient1050" + xlink:href="#linearGradient7054" /> + <linearGradient + gradientTransform="translate(5.4928296e-7,2.0000038)" + gradientUnits="userSpaceOnUse" + y2="32.133045" + x2="26.625" + y1="32.133045" + x1="43.6875" + id="linearGradient7144-5-5" + xlink:href="#linearGradient7054" /> + <linearGradient + gradientTransform="matrix(0.88487802,0,0,0.88487802,5.3181239,5.9431621)" + gradientUnits="userSpaceOnUse" + y2="34.140205" + x2="40.820396" + y1="35.24506" + x1="46.54464" + id="linearGradient7075-9-2" + xlink:href="#linearGradient7069" /> + <linearGradient + y2="-4.5986342" + x2="21.107563" + y1="31.867859" + x1="21.03167" + gradientTransform="matrix(0.95053306,0,0,0.93750001,1.4509995,3.3206198)" + gradientUnits="userSpaceOnUse" + id="linearGradient1050-7" + xlink:href="#linearGradient7054" /> + <linearGradient + y2="25.772396" + x2="29.049412" + y1="12.75" + x1="23.816254" + gradientTransform="matrix(0.760969,0,0,0.98666303,2.9050524,0.584272)" + gradientUnits="userSpaceOnUse" + id="linearGradient1048-3" + xlink:href="#linearGradient7087" /> + <radialGradient + gradientTransform="translate(1.9716838,9.2201388)" + xlink:href="#aigrd4-3-3-9" + id="radialGradient6540-9-2" + gradientUnits="userSpaceOnUse" + cx="20.655508" + cy="24.735121" + fx="20.655508" + fy="24.735121" + r="14.1515" /> + <radialGradient + gradientUnits="userSpaceOnUse" + fy="22.6138" + fx="9.3417997" + r="14.1515" + cy="22.6138" + cx="9.3417997" + id="aigrd4-3-3-9"> + <stop + id="stop6452-6-6-3" + style="stop-color:#767676" + offset="0" /> + <stop + id="stop6454-7-0-1" + style="stop-color:#484848" + offset="1" /> + </radialGradient> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.66393399,1.2374433,9.8240901)" + r="21.566757" + fy="26.963573" + fx="23.157747" + cy="26.963573" + cx="23.157747" + id="radialGradient7085-6-9" + xlink:href="#linearGradient7079" /> + </defs> + <metadata + id="metadata4"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:creator> + <dc:source>http://jimmac.musichall.cz</dc:source> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> + <dc:title></dc:title> + <dc:subject> + <rdf:Bag> + <rdf:li>video</rdf:li> + <rdf:li>audio</rdf:li> + <rdf:li>multimedia</rdf:li> + <rdf:li>movie</rdf:li> + </rdf:Bag> + </dc:subject> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + </cc:License> + </rdf:RDF> + </metadata> + <ellipse + id="path7077" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.70329674;fill:url(#radialGradient7085);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="139.2869" + cy="154.96852" + rx="116.2039" + ry="77.271484" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#a1a39f;fill-opacity:1;fill-rule:evenodd;stroke:#6d6f6a;stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="path7028" + cx="129.07542" + cy="146.19809" + rx="99.679878" + ry="68.647804" /> + <ellipse + id="path7042" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97567552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="126.29389" + cy="132.6004" + rx="60.719406" + ry="44.601574" /> + <path + id="path6456" + d="m 255.83491,227.82128 c 0,0 -44.85,-20.16662 -73.57993,-17.62872 -30.62065,2.70491 -81.77403,4.51919 -101.824885,-27.19461 85.121765,25.71126 124.395075,-16.97591 182.006765,7.06674 0,0 -6.60195,37.75659 -6.60195,37.75659 z" + style="fill:url(#radialGradient6540);fill-rule:nonzero;stroke:#3b3d39;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient7093);fill-opacity:1;fill-rule:evenodd;stroke:#757972;stroke-width:1.06933594;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="path7026" + cx="129.07545" + cy="120.31272" + rx="60.477642" + ry="43.927044" /> + <path + id="path7012" + d="m 121.49844,46.999405 c -51.496905,2.83678 -92.102881,34.61625 -92.102882,73.020875 0,40.26326 44.656612,73.02089 99.679902,73.02089 55.02329,0 99.6799,-32.75764 99.6799,-73.02089 0,-40.263245 -44.65661,-73.020875 -99.6799,-73.020875 -0.21493,0 -0.45891,-0.001 -0.67351,0 -1.28267,0.006 -2.60195,-0.0412 -3.8727,0 -0.62049,0.0201 -1.23469,-0.0284 -1.85216,0 -0.4068,0.0187 -0.77316,-0.0223 -1.17865,0 z m -7.40864,11.80476 c 0.3408,-0.0276 0.66592,0.0187 1.01027,0 0.72256,-0.0393 1.45233,0 2.18891,0 15.71382,0 28.45592,9.18587 28.45592,20.40537 0,11.2195 -12.7421,20.23674 -28.45592,20.23674 -15.71381,0 -28.455913,-9.01724 -28.455913,-20.23674 0,-10.44295 11.056139,-19.25707 25.256733,-20.40537 z m 61.96318,24.79 c 0.35912,-0.0324 0.64757,0.0232 1.01027,0 0.62907,-0.0399 1.21306,0.0113 1.85216,0 0.25971,-0.005 0.41224,0 0.67351,0 16.72173,0 30.30808,9.79028 30.30808,21.754485 0,11.96421 -13.58635,21.58585 -30.30808,21.58585 -16.72173,1e-5 -30.30807,-9.62164 -30.30807,-21.58585 -10e-6,-11.051965 11.80955,-20.413775 26.77213,-21.754485 z M 72.500381,100.62674 c 1.173668,-0.0962 2.49488,0 3.70432,0 17.20092,0 31.149969,9.94217 31.149969,22.26041 0,12.31825 -13.949049,22.26041 -31.149969,22.26041 -17.200916,0 -31.149969,-9.94216 -31.149969,-22.26041 0,-11.45211 11.927126,-20.98865 27.445649,-22.26041 z m 62.131559,27.65688 c 0.12921,-0.0151 0.20712,0.014 0.33676,0 0.0145,-6.4e-4 0.15464,-1.8e-4 0.16838,0 0.014,2.4e-4 0.1535,5.3e-4 0.16837,0 0.0334,5.7e-4 0.15119,6.2e-4 0.16838,0 0.1409,9.6e-4 0.36375,-0.002 0.50514,0 0.0172,-4.2e-4 0.13481,-4.5e-4 0.16837,0 1.29841,-0.10675 2.53473,0 3.8727,0 19.02898,0 34.51754,10.95245 34.51754,24.62136 0,13.66891 -15.48856,24.79 -34.51754,24.79 -19.02898,0 -34.51753,-11.12109 -34.51753,-24.79 0,-12.31456 12.7237,-22.71216 29.12943,-24.62136 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <ellipse + id="path7044" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7060);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="129.28571" + cy="119.43317" + rx="94.611595" + ry="67.970284" /> + <path + id="path7067" + d="m 260.41047,191.49053 -5.82757,32.64854 c -14.05766,-4.72426 -22.53331,-8.46249 -38.10017,-12.17906 l 1.78793,-26.51092 c 10.22948,-1.08634 26.20385,0.76487 42.13981,6.04144 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient7075);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <path + id="path7136" + d="m 260.41047,190.51158 -1.01027,4.7219 c -43.67003,-16.34527 -83.87156,-1.22348 -125.94691,0 57.17345,-4.7628 75.91968,-20.0514 126.95718,-4.7219 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.70329674;fill:url(#linearGradient7144);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:256-32" + height="256" + width="256" + y="8" + x="8" + style="fill:none" /> + <ellipse + id="path7077-1" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.70329674;fill:url(#radialGradient7085-6);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="296.39474" + cy="247.72609" + rx="21.566757" + ry="14.318913" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#a1a39f;fill-opacity:1;fill-rule:evenodd;stroke:#6d6f6a;stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="path7028-8" + cx="294.49957" + cy="246.10088" + rx="18.499996" + ry="12.720889" /> + <ellipse + id="path7042-7" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97567552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="293.98334" + cy="243.58113" + rx="11.269162" + ry="8.2649651" /> + <path + id="path6456-9" + d="m 318.02537,261.22618 c 0,0 -8.32389,-3.73701 -13.65599,-3.26672 -5.68302,0.50124 -15.17678,0.83743 -18.8981,-5.03934 15.7981,4.76446 23.08699,-3.14575 33.77938,1.30951 0,0 -1.22529,6.99655 -1.22529,6.99655 z" + style="fill:url(#radialGradient6540-9);fill-rule:nonzero;stroke:#3b3d39;stroke-miterlimit:4;stroke-opacity:1" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient1048);fill-opacity:1;fill-rule:evenodd;stroke:#757972;stroke-width:1.06933594;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="path7026-2" + cx="294.49957" + cy="241.30414" + rx="11.224293" + ry="8.1399698" /> + <path + id="path7012-0" + d="m 293.09332,227.71869 c -9.55752,0.52568 -17.09375,6.41462 -17.09375,13.53125 0,7.46105 8.288,13.53125 18.5,13.53125 10.212,0 18.5,-6.0702 18.5,-13.53125 0,-7.46104 -8.288,-13.53125 -18.5,-13.53125 -0.0399,0 -0.0852,-1.8e-4 -0.125,0 -0.23806,0.001 -0.48291,-0.008 -0.71875,0 -0.11516,0.004 -0.22915,-0.005 -0.34375,0 -0.0755,0.004 -0.14349,-0.004 -0.21875,0 z m -1.375,2.1875 c 0.0632,-0.005 0.12359,0.004 0.1875,0 0.1341,-0.007 0.26954,0 0.40625,0 2.91639,0 5.28125,1.70221 5.28125,3.78125 0,2.07905 -2.36486,3.75 -5.28125,3.75 -2.91639,0 -5.28125,-1.67095 -5.28125,-3.75 0,-1.93515 2.05195,-3.56846 4.6875,-3.78125 z m 11.5,4.59375 c 0.0667,-0.006 0.12019,0.004 0.1875,0 0.11675,-0.007 0.22514,0.002 0.34375,0 0.0482,-8.7e-4 0.0765,0 0.125,0 3.10345,0 5.625,1.81421 5.625,4.03125 0,2.21705 -2.52155,4 -5.625,4 -3.10345,0 -5.625,-1.78295 -5.625,-4 0,-2.048 2.19178,-3.7828 4.96875,-4.03125 z m -19.21875,3.15625 c 0.21783,-0.0178 0.46304,0 0.6875,0 3.19239,0 5.78125,1.84235 5.78125,4.125 0,2.28265 -2.58886,4.125 -5.78125,4.125 -3.19239,0 -5.78125,-1.84235 -5.78125,-4.125 0,-2.12215 2.2136,-3.88933 5.09375,-4.125 z m 11.53125,5.125 c 0.024,-0.003 0.0384,0.003 0.0625,0 0.003,-1.1e-4 0.0287,-3e-5 0.0312,0 0.003,5e-5 0.0285,1e-4 0.0312,0 0.006,1.1e-4 0.0281,1.2e-4 0.0312,0 0.0262,1.8e-4 0.0675,-3.8e-4 0.0937,0 0.003,-7e-5 0.025,-8e-5 0.0312,0 0.24098,-0.0198 0.47043,0 0.71875,0 3.53167,0 6.40625,2.02956 6.40625,4.5625 0,2.53294 -2.87458,4.59375 -6.40625,4.59375 -3.53167,0 -6.40625,-2.06081 -6.40625,-4.59375 0,-2.28197 2.36144,-4.20871 5.40625,-4.5625 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <ellipse + id="path7044-2" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1050);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="294.53857" + cy="241.14116" + rx="17.559353" + ry="12.59534" /> + <path + id="path7067-3" + d="m 318.87457,254.49385 -1.08156,6.04999 c -2.60902,-0.87544 -4.18205,-1.56816 -7.07117,-2.25686 l 0.33183,-4.91265 c 1.89853,-0.2013 4.86328,0.14174 7.8209,1.11952 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient7075-9);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <path + id="path7136-7" + d="m 318.87457,254.31244 -0.1875,0.875 c -8.1049,-3.02888 -15.56606,-0.22672 -23.375,0 10.61105,-0.88258 14.09024,-3.71565 23.5625,-0.875 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.70329674;fill:url(#linearGradient7144-5);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:48-32" + height="48" + width="48" + y="220" + x="272" + style="fill:none" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +VrtF222TxAme51Gt1mg1uyFp6AZCSKIowvM8oigijuM7JgEhBAMDA2zbvo3dD+1iZHSUxaVFfvKv +//Lp50KHDx9mbO8uZRg6Q9uHKRSLCCFwXY+33noL13Xp6+3HXq8TDF1HNwykFCSJIo4igjAkCqP1 +0bnzc9Pwm5/fBACwHRvHsclmHRzHIU4iJibeu/+jxZf+5q8pForKsgx6ewcol8tomsb58xc4c+Y0 +ppmikCuQy+cxDXP9WEWhlCJJkk2NvxvIHYkqBE7WWTe+C7FyY4WPz0+Kz3Q2Ojrax9PPHCaXdZSU +GrbtkMvlyKTTVGs1Ji9OsrK0gmmaWFYaXdfR9W4NrBKFApIkJgojojjaKPyTJOHWjl9snHLclKZp +ZHNdz9+EuHjpEnPXFj4bwCf13HNPs314GCudVoZuws1DLakR+B28jo/rufgdnzDsVlRJoroAUbzx +jFBdDyNZrykEEgFCoGsaumaQyWTWRyCL49g4WZuTp04hlS703xbg7bffBd7tugzYv38/W7b0ksnY +aGb3xXEco+KEjusyP7/M5OTkfff/1FNPEYuYKIpVJ/AIogDd0MnlsggBbtvj3V/+6vP/wfH70Fee ++wqmr4EUyjRMevt6mZ9f4FfvnPjtQ+iL0sFnDqIlUimFOPHuiS/anAd6oAf6f6//BS95WkgntXrp +AAAAFHRFWHRBdXRob3IASmFrdWIgU3RlaW5lcub79y8AAABYdEVYdENvcHlyaWdodABDQzAgUHVi +bGljIERvbWFpbiBEZWRpY2F0aW9uIGh0dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL3B1YmxpY2Rv +bWFpbi96ZXJvLzEuMC/G4735AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTI5VDIxOjQ1OjA1 +LTA2OjAwCN7M2wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yOVQyMTo0NTowNS0wNjowMHmD +dGcAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAIXRFWHRTb3VyY2UAaHR0 +cDovL2ppbW1hYy5tdXNpY2hhbGwuY3ppZuNeAAAAE3RFWHRUaXRsZQBHZW5lcmljIFZpZGVvLHad +gQAAAABJRU5ErkJggg== +" + id="icon:48-8" + x="328" + y="220" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +VrtF222TxAme51Gt1mg1uyFp6AZCSKIowvM8oigijuM7JgEhBAMDA2zbvo3dD+1iZHSUxaVFfvKv +//Lp50KHDx9mbO8uZRg6Q9uHKRSLCCFwXY+33noL13Xp6+3HXq8TDF1HNwykFCSJIo4igjAkCqP1 +0bnzc9Pwm5/fBACwHRvHsclmHRzHIU4iJibeu/+jxZf+5q8pForKsgx6ewcol8tomsb58xc4c+Y0 +ppmikCuQy+cxDXP9WEWhlCJJkk2NvxvIHYkqBE7WWTe+C7FyY4WPz0+Kz3Q2Ojrax9PPHCaXdZSU +GrbtkMvlyKTTVGs1Ji9OsrK0gmmaWFYaXdfR9W4NrBKFApIkJgojojjaKPyTJOHWjl9snHLclKZp +ZHNdz9+EuHjpEnPXFj4bwCf13HNPs314GCudVoZuws1DLakR+B28jo/rufgdnzDsVlRJoroAUbzx +jFBdDyNZrykEEgFCoGsaumaQyWTWRyCL49g4WZuTp04hlS703xbg7bffBd7tugzYv38/W7b0ksnY +aGb3xXEco+KEjusyP7/M5OTkfff/1FNPEYuYKIpVJ/AIogDd0MnlsggBbtvj3V/+6vP/wfH70Fee ++wqmr4EUyjRMevt6mZ9f4FfvnPjtQ+iL0sFnDqIlUimFOPHuiS/anAd6oAf6f6//BS95WkgntXrp +AAAAFHRFWHRBdXRob3IASmFrdWIgU3RlaW5lcub79y8AAABYdEVYdENvcHlyaWdodABDQzAgUHVi +bGljIERvbWFpbiBEZWRpY2F0aW9uIGh0dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL3B1YmxpY2Rv +bWFpbi96ZXJvLzEuMC/G4735AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTI5VDIxOjQ1OjA1 +LTA2OjAwCN7M2wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yOVQyMTo0NTowNS0wNjowMHmD +dGcAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAIXRFWHRTb3VyY2UAaHR0 +cDovL2ppbW1hYy5tdXNpY2hhbGwuY3ppZuNeAAAAE3RFWHRUaXRsZQBHZW5lcmljIFZpZGVvLHad +gQAAAABJRU5ErkJggg== +" + id="icon:48-4" + x="384" + y="220" /> + <ellipse + id="path7077-1-8" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.70329674;fill:url(#radialGradient7085-6-9);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="456.17224" + cy="254.37633" + rx="14.28721" + ry="9.4764519" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#a1a39f;fill-opacity:1;fill-rule:evenodd;stroke:#6d6f6a;stroke-width:0.99999964;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="path7028-8-4" + cx="454.91672" + cy="253.30074" + rx="12.255589" + ry="8.4188576" /> + <ellipse + id="path7042-7-5" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97567552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="454.57474" + cy="251.63313" + rx="7.4654193" + ry="5.4698663" /> + <path + id="path6456-9-0" + d="m 470.50174,263.31088 c 0,0 -5.51429,-2.4732 -9.04662,-2.16196 -3.76479,0.33173 -10.05407,0.55423 -12.51931,-3.3351 10.46568,3.15319 15.2943,-2.0819 22.37764,0.86665 0,0 -0.81171,4.63041 -0.81171,4.63041 z" + style="fill:url(#radialGradient6540-9-2);fill-rule:nonzero;stroke:#3b3d39;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient1048-3);fill-opacity:1;fill-rule:evenodd;stroke:#757972;stroke-width:1.06933594;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="path7026-2-3" + cx="454.91672" + cy="250.12619" + rx="7.4356947" + ry="5.3871427" /> + <path + id="path7012-0-6" + d="m 453.98514,241.13517 c -6.33152,0.3479 -11.32401,4.24528 -11.32401,8.95517 0,4.93782 5.49051,8.95516 12.2556,8.95516 6.76509,0 12.25559,-4.01734 12.25559,-8.95516 0,-4.93782 -5.4905,-8.95517 -12.25559,-8.95517 -0.0264,0 -0.0564,-1.2e-4 -0.0828,0 -0.15771,6.6e-4 -0.31991,-0.005 -0.47615,0 -0.0763,0.003 -0.1518,-0.003 -0.22772,0 -0.05,0.003 -0.095,-0.003 -0.14491,0 z m -0.91089,1.44772 c 0.0419,-0.003 0.0819,0.003 0.12421,0 0.0888,-0.005 0.17856,0 0.26913,0 1.932,0 3.49864,1.12654 3.49864,2.50248 0,1.37594 -1.56664,2.4818 -3.49864,2.4818 -1.93201,0 -3.49864,-1.10586 -3.49864,-2.4818 0,-1.28071 1.35935,-2.36165 3.1053,-2.50248 z m 7.61834,3.0402 c 0.0442,-0.004 0.0796,0.003 0.12422,0 0.0773,-0.005 0.14914,0.001 0.22772,0 0.0319,-5.7e-4 0.0507,0 0.0828,0 2.05592,0 3.72636,1.20067 3.72636,2.66794 0,1.46727 -1.67044,2.64726 -3.72636,2.64726 -2.05592,0 -3.72636,-1.17999 -3.72636,-2.64726 0,-1.35539 1.45197,-2.50351 3.29162,-2.66794 z m -12.73174,2.08885 c 0.14431,-0.0118 0.30675,0 0.45544,0 2.11485,0 3.82988,1.2193 3.82988,2.72999 0,1.51068 -1.71503,2.72998 -3.82988,2.72998 -2.11484,0 -3.82986,-1.2193 -3.82986,-2.72998 0,-1.40447 1.46642,-2.57402 3.37442,-2.72999 z m 7.63904,3.3918 c 0.0159,-0.002 0.0254,0.002 0.0414,0 0.002,-7e-5 0.019,-2e-5 0.0207,0 0.002,3e-5 0.0189,6e-5 0.0207,0 0.004,7e-5 0.0186,8e-5 0.0207,0 0.0174,1.2e-4 0.0447,-2.5e-4 0.0621,0 0.002,-5e-5 0.0166,-5e-5 0.0207,0 0.15964,-0.0131 0.31164,0 0.47614,0 2.33961,0 4.24391,1.34319 4.24391,3.01952 0,1.67634 -1.9043,3.04021 -4.24391,3.04021 -2.3396,0 -4.24391,-1.36387 -4.24391,-3.04021 0,-1.51024 1.56437,-2.78538 3.58144,-3.01952 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <ellipse + id="path7044-2-1" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1050-7);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="454.94257" + cy="250.01833" + rx="11.632446" + ry="8.3357677" /> + <path + id="path7067-3-0" + d="m 471.06429,258.85534 -0.71648,4.00396 c -1.72839,-0.57938 -2.77047,-1.03783 -4.68441,-1.49362 l 0.21983,-3.25126 c 1.25771,-0.13322 3.22175,0.0938 5.18106,0.74092 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient7075-9-2);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <path + id="path7136-7-6" + d="m 471.06429,258.73528 -0.12421,0.57908 c -5.3692,-2.00455 -10.31196,-0.15004 -15.4851,0 7.02944,-0.5841 9.33428,-2.45906 15.60931,-0.57908 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.70329674;fill:url(#linearGradient7144-5-5);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:32-32" + height="32" + width="32" + y="236" + x="440" + style="fill:none" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +SUVORK5CYII= +" + id="icon:32-8" + x="480" + y="236" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +SUVORK5CYII= +" + id="icon:32-4" + x="520" + y="236" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI +WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1gEEDDonMwh5AwAAADV0RVh0Q29tbWVudAAoYykgMjAw +NCBKYWt1YiBTdGVpbmVyCgpDcmVhdGVkIHdpdGggVGhlIEdJTVCQ2YtvAAACg0lEQVQ4y52T30tT +YRjHP+ec6ZxnxjbEmw3NYrpjWmpqGSpECf2gCNb02qsu6loEqTtB/AdCCIzubAai+CvNQL0QkpLQ +nbOoC/XCaTGlneN25qZduEnaTfXcvO8Lz/Pheb/f5xE4Fb19PR1AAKgDXEAUWAKCXZ3dA6fzhd8K +LwL9NdW1VxVFQc6Xj5OMPQNVVfm0/HEReNTV2f35BCBTPB3wtxXZC+zoRgwzmSB9kEYSJay5edjl +AvSYTvDN622gNQsRM6D+gL+tSJAgpK2wvrGGmTQBMJMm6xtrhLQVBAkC/rYioD/bgdTb19NRU137 +uLikmK/fvrC/v08opBLWwnjLvExOTBGN7uByOYnpMdxuDwKCp7KqYn1menZZBAKKoqAbMQA0Lcz8 +3AKGbhz9XzeYn1tA08IA6EYMRVHICI0FqJPzZbZ+/MThdBCPx1EUH/cf3AM4PuPxOA6nAzOZwHHG +ScYlLBmrSB+ksVgs3Ll7+4RNVquVQPvD43f6IJ29urIiRgEkUSKVSjE+NkFwcAjTzIhomgQHhxgf +myCVSiGJUhYQzQKWjD0Da24euzu72Gw2VFVjZHgUgJHhUVRVw2azsbuzizU3D2PPIDNciEBQVVXs +cgEAPl85zS1NyPajQZLtMs0tTfh85QDY5QJUVQUIAkgz07PLlVUVt7znvR6H00FMjyEIAg1X6hFF +kdJzpUQ2I6yvbdDYeI1kIsm79zOLXZ3dTwAkgJutNz6E1FV/he+C7HZ7KCwsBODw8JAcSw5l3nLq +6xpIJpK8fDUQjUS2np0tLbGGVtXNf9qFqbeTX7e3v0+ZpnkdmANeCP+zjYF2/2XgOTD6B+BvI9Du +fwpc+gUuhglRSTLyIQAAAABJRU5ErkJggg== +" + id="icon:16-32" + x="560" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAV1BMVEUAAACIioVqbGhVV1OI +ioW5urfi4+Dt7evd3dvp6ufd39rW2dLT18/e4Nu/wrvP08u6vbaSlY+JjIZVV1N+gHvM0MiprKaY +m5WLjYh9f3pydG9cXloAAABrterCAAAABHRSTlMAAAAAs5NmmgAAAAFiS0dEAIgFHUgAAAAJcEhZ +cwAACxMAAAsTAQCanBgAAAAHdElNRQfWAhQUDiATysDQAAAAgElEQVQY022P2Q7DIAwEoRjM4ZiA +Sc///8+SBClN23lcjexdpToaVrQaaLAOEZ0dkQYfYqIUg98T8BNzpsw8eVgFG3gulWqZOdiugItc +pFGTwtF1BTDl2hZaWs0Jt4AO8K/xfePny9bj2nvc7nuPz6aPizlteb5EjDqtNSM4MPIGY+0ISe9t +J8gAAAA1dEVYdENvbW1lbnQAKGMpIDIwMDQgSmFrdWIgU3RlaW5lcgoKQ3JlYXRlZCB3aXRoIFRo +ZSBHSU1QkNmLbwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0wOC0yM1QyMjoxNDo1Ny0wNjowMABN +wggAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMDYtMDItMjFUMDM6MTQ6MzItMDc6MDDLd46aAAAAAElF +TkSuQmCC +" + id="icon:16-8" + x="584" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAV1BMVEUAAACIioVqbGhVV1OI +ioW5urfi4+Dt7evd3dvp6ufd39rW2dLT18/e4Nu/wrvP08u6vbaSlY+JjIZVV1N+gHvM0MiprKaY +m5WLjYh9f3pydG9cXloAAABrterCAAAABHRSTlMAAAAAs5NmmgAAAAFiS0dEAIgFHUgAAAAJcEhZ +cwAACxMAAAsTAQCanBgAAAAHdElNRQfWAhQUDiATysDQAAAAgElEQVQY022P2Q7DIAwEoRjM4ZiA +Sc///8+SBClN23lcjexdpToaVrQaaLAOEZ0dkQYfYqIUg98T8BNzpsw8eVgFG3gulWqZOdiugItc +pFGTwtF1BTDl2hZaWs0Jt4AO8K/xfePny9bj2nvc7nuPz6aPizlteb5EjDqtNSM4MPIGY+0ISe9t +J8gAAAA1dEVYdENvbW1lbnQAKGMpIDIwMDQgSmFrdWIgU3RlaW5lcgoKQ3JlYXRlZCB3aXRoIFRo +ZSBHSU1QkNmLbwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0wOC0yM1QyMjoxNDo1Ny0wNjowMABN +wggAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMDYtMDItMjFUMDM6MTQ6MzItMDc6MDDLd46aAAAAAElF +TkSuQmCC +" + id="icon:16-4" + x="608" + y="252" /> +</svg> diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 6dad8bc574..806e8ef64f 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -804,6 +804,9 @@ IDI_SHELL_DVD ICON resources/optical_disc.ico /* @makedep: resources/document.ico */ IDI_SHELL_DOCUMENTS ICON resources/document.ico +/* @makedep: resources/video.ico */ +IDI_SHELL_VIDEO_FILE ICON resources/video.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 1c28a06dc8..38e444c361 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -293,6 +293,7 @@ #define IDI_SHELL_POWER_OFF 221 #define IDI_SHELL_DVD 222 #define IDI_SHELL_DOCUMENTS 223 +#define IDI_SHELL_VIDEO_FILE 224 #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 -- 2.18.0

2 16

[PATCH] kernel32: Fallback to default comspec when %COMSPEC% is not set.
by Alistair Leslie-Hughes 31 Aug '18

31 Aug '18

From: Qian Hong <qhong(a)codeweavers.com> Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=19801 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/process.c | 6 +++++- programs/cmd/wcmdmain.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 7ac7477..85e0042 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2206,6 +2206,7 @@ static BOOL create_cmd_process( LPCWSTR filename, LPWSTR cmd_line, LPVOID env, L { static const WCHAR comspecW[] = {'C','O','M','S','P','E','C',0}; + static const WCHAR cmdW[] = {'\\','c','m','d','.','e','x','e',0}; static const WCHAR slashscW[] = {' ','/','s','/','c',' ',0}; static const WCHAR quotW[] = {'"',0}; WCHAR comspec[MAX_PATH]; @@ -2213,7 +2214,10 @@ static BOOL create_cmd_process( LPCWSTR filename, LPWSTR cmd_line, LPVOID env, L BOOL ret; if (!GetEnvironmentVariableW( comspecW, comspec, ARRAY_SIZE( comspec ))) - return FALSE; + { + GetSystemDirectoryW( comspec, (sizeof(comspec) - sizeof(cmdW))/sizeof(WCHAR) ); + strcatW( comspec, cmdW ); + } if (!(newcmdline = HeapAlloc( GetProcessHeap(), 0, (strlenW(comspec) + 7 + strlenW(cmd_line) + 2) * sizeof(WCHAR)))) return FALSE; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 7a7ee16..66a5ac0 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2400,10 +2400,20 @@ int wmain (int argc, WCHAR *argvW[]) static const WCHAR offW[] = {'O','F','F','\0'}; static const WCHAR promptW[] = {'P','R','O','M','P','T','\0'}; static const WCHAR defaultpromptW[] = {'$','P','$','G','\0'}; + static const WCHAR comspecW[] = {'C','O','M','S','P','E','C',0}; + static const WCHAR cmdW[] = {'\\','c','m','d','.','e','x','e',0}; + WCHAR comspec[MAX_PATH]; CMD_LIST *toExecute = NULL; /* Commands left to be executed */ OSVERSIONINFOW osv; char osver[50]; + if (!GetEnvironmentVariableW(comspecW, comspec, sizeof(comspec)/sizeof(WCHAR))) + { + GetSystemDirectoryW(comspec, (sizeof(comspec) - sizeof(cmdW))/sizeof(WCHAR)); + strcatW(comspec, cmdW); + SetEnvironmentVariableW(comspecW, comspec); + } + srand(time(NULL)); /* Get the windows version being emulated */ -- 1.9.1

1 0

[PATCH] include: Add MmIsAddressValid to header
by Alistair Leslie-Hughes 31 Aug '18

31 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/ddk/ntddk.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 5c124ca..e76ccc9 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -214,6 +214,7 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); +BOOLEAN WINAPI MmIsAddressValid(void *); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); -- 1.9.1

1 0

[PATCH 1/3] include: Add IOpcPackage definition.
by Nikolay Sivov 30 Aug '18

30 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/opcbase.idl | 15 ++++ include/opcobjectmodel.idl | 174 +++++++++++++++++++++++++++++++++++++ 2 files changed, 189 insertions(+) diff --git a/include/opcbase.idl b/include/opcbase.idl index fc92675420..33f56ac077 100644 --- a/include/opcbase.idl +++ b/include/opcbase.idl @@ -25,3 +25,18 @@ typedef [v1_enum] enum OPC_STREAM_IO_READ = 1, OPC_STREAM_IO_WRITE = 2, } OPC_STREAM_IO_MODE; + +typedef [v1_enum] enum +{ + OPC_COMPRESSION_NONE = -1, + OPC_COMPRESSION_NORMAL = 0, + OPC_COMPRESSION_MAXIMUM = 1, + OPC_COMPRESSION_FAST = 2, + OPC_COMPRESSION_SUPERFAST = 3, +} OPC_COMPRESSION_OPTIONS; + +typedef [v1_enum] enum +{ + OPC_URI_TARGET_MODE_INTERNAL = 0, + OPC_URI_TARGET_MODE_EXTERNAL = 1, +} OPC_URI_TARGET_MODE; diff --git a/include/opcobjectmodel.idl b/include/opcobjectmodel.idl index e5370d2e54..45bc8aa4a5 100644 --- a/include/opcobjectmodel.idl +++ b/include/opcobjectmodel.idl @@ -20,6 +20,11 @@ #pragma makedep install #endif +interface IOpcPart; +interface IOpcPartUri; +interface IOpcUri; +interface IOpcRelationship; + typedef [v1_enum] enum { OPC_READ_DEFAULT = 0, @@ -32,3 +37,172 @@ typedef [v1_enum] enum OPC_WRITE_DEFAULT = 0, OPC_WRITE_FORCE_ZIP32 = 1, } OPC_WRITE_FLAGS; + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee75), + pointer_default(ref) +] +interface IOpcPartEnumerator : IUnknown +{ + HRESULT MoveNext( + [out, retval] BOOL *has_next + ); + + HRESULT MovePrevious( + [out, retval] BOOL *has_previous + ); + + HRESULT GetCurrent( + [out, retval] IOpcPart **part + ); + + HRESULT Clone( + [out, retval] IOpcPartEnumerator **enumerator + ); +} + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee76), + pointer_default(ref) +] +interface IOpcRelationshipEnumerator : IUnknown +{ + HRESULT MoveNext( + [out, retval] BOOL *has_next + ); + + HRESULT MovePrevious( + [out, retval] BOOL *has_previous + ); + + HRESULT GetCurrent( + [out, retval] IOpcRelationship **relationship + ); + + HRESULT Clone( + [out, retval] IOpcRelationshipEnumerator **enumerator + ); +} + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee73), + pointer_default(ref) +] +interface IOpcPartSet : IUnknown +{ + HRESULT GetPart( + [in] IOpcPartUri *name, + [out, retval] IOpcPart **part + ); + + HRESULT CreatePart( + [in] IOpcPartUri *name, + [in, string] LPCWSTR content_type, + [in] OPC_COMPRESSION_OPTIONS compression_options, + [out, retval] IOpcPart **part + ); + + HRESULT DeletePart( + [in] IOpcPartUri *name + ); + + HRESULT PartExists( + [in] IOpcPartUri *name, + [out, retval] BOOL *exists + ); + + HRESULT GetEnumerator( + [out, retval] IOpcPartEnumerator **enumerator + ); +} + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee72), + pointer_default(ref) +] +interface IOpcRelationship : IUnknown +{ + HRESULT GetId( + [out, string, retval] LPWSTR *id + ); + + HRESULT GetRelationshipType( + [out, string, retval] LPWSTR *type + ); + + HRESULT GetSourceUri( + [out, retval] IOpcUri **uri + ); + + HRESULT GetTargetUri( + [out, retval] IUri **target + ); + + HRESULT GetTargetMode( + [out, retval] OPC_URI_TARGET_MODE *target_mode + ); +} + + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee74), + pointer_default(ref) +] +interface IOpcRelationshipSet : IUnknown +{ + HRESULT GetRelationship( + [in, string] LPCWSTR id, + [out, retval] IOpcRelationship **relationship + ); + + HRESULT CreateRelationship( + [in, string, unique] LPCWSTR id, + [in, string] LPCWSTR type, + [in] IUri *target_uri, + [in] OPC_URI_TARGET_MODE target_mode, + [out, retval] IOpcRelationship **relationship + ); + + HRESULT DeleteRelationship( + [in, string] LPCWSTR id + ); + + HRESULT RelationshipExists( + [in, string] LPCWSTR id, + [out, retval] BOOL *exists + ); + + HRESULT GetEnumerator( + [out, retval] IOpcRelationshipEnumerator **enumerator + ); + + HRESULT GetEnumeratorForType( + [in, string] LPCWSTR type, + [out, retval] IOpcRelationshipEnumerator **enumerator + ); + + HRESULT GetRelationshipsContentStream( + [out, retval] IStream **stream + ); +} + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee70), + pointer_default(ref) +] +interface IOpcPackage : IUnknown +{ + HRESULT GetPartSet( + [out, retval] IOpcPartSet **part_set + ); + + HRESULT GetRelationshipSet( + [out, retval] IOpcRelationshipSet **relationship_set + ); +} -- 2.18.0

1 2

[PATCH 1/4] shlwapi/tests: Add a simple QI test for file streams.
by Nikolay Sivov 30 Aug '18

30 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/tests/istream.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 300e9b9c00..f1854a283f 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -247,6 +247,27 @@ static void test_stream_read_write(IStream *stream, DWORD mode) ok(buf[0] == 0x5e && buf[1] == 0xa7, "expected 5ea7, got %02x%02x\n", buf[0], buf[1]); } +static void test_stream_qi(IStream *stream) +{ + IUnknown *unk; + HRESULT hr; + + hr = IStream_QueryInterface(stream, &IID_IStream, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IStream interface, hr %#x.\n", hr); + IUnknown_Release(unk); + + unk = NULL; + hr = IStream_QueryInterface(stream, &IID_ISequentialStream, (void **)&unk); +todo_wine + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* XP */, "Failed to get ISequentialStream interface, hr %#x.\n", hr); + if (unk) + IUnknown_Release(unk); + + hr = IStream_QueryInterface(stream, &IID_IUnknown, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IUnknown interface, hr %#x.\n", hr); + IUnknown_Release(unk); +} + static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm) { IStream * stream; @@ -310,6 +331,7 @@ if (0) /* This test crashes on WinXP SP2 */ ok(stream != NULL, "SHCreateStreamOnFileA: expected a valid IStream object, got NULL\n"); if (stream) { + test_stream_qi(stream); test_IStream_invalid_operations(stream, mode); refcount = IStream_Release(stream); @@ -422,6 +444,7 @@ static void test_SHCreateStreamOnFileW(DWORD mode, DWORD stgm) ok(stream != NULL, "SHCreateStreamOnFileW: expected a valid IStream object, got NULL\n"); if (stream) { + test_stream_qi(stream); test_IStream_invalid_operations(stream, mode); refcount = IStream_Release(stream); @@ -551,6 +574,7 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) ok(stream != NULL, "SHCreateStreamOnFileEx: expected a valid IStream object, got NULL\n"); if (stream) { + test_stream_qi(stream); test_IStream_invalid_operations(stream, mode); refcount = IStream_Release(stream); -- 2.18.0

1 3

[PATCH 1/3] kernel32/tests: Test ReplaceFileW on open "exe"
by Brock York 30 Aug '18

30 Aug '18

Replicate the scenario of an exe calling ReplaceFileW on itself. An exe calling ReplaceFileW on itself will fail in Wine currently but succeed in Windows 7. This seems to be the problem seen in bug 33845. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33845 Signed-off-by: Brock York <twunknown(a)gmail.com> --- dlls/kernel32/tests/file.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 1c4157279b..d496e9273b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3677,6 +3677,30 @@ static void test_ReplaceFileA(void) ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "SetFileAttributesA: error setting to normal %d\n", GetLastError()); + /* re-create replacement file for pass w/ replaced opened with + * the same permissions as an exe (Replicating an exe trying to + * replace itself) + */ + ret = GetTempFileNameA(temp_path, prefix, 0, replacement); + ok(ret != 0, "GetTempFileNameA error (replacement) %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + /* make sure that the replacement file still exists */ + hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacementFile != INVALID_HANDLE_VALUE || + broken(GetLastError() == ERROR_FILE_NOT_FOUND), /* win2k */ + "unexpected error, replacement file should still exist %d\n", GetLastError()); + CloseHandle(hReplacementFile); + + /* make sure that the replaced file is opened like an exe*/ + hReplacedFile = CreateFileA(replaced, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacedFile != INVALID_HANDLE_VALUE, + "unexpected error, replaced file should be able to be opened %d\n", GetLastError()); + /*Calling ReplaceFileA on an exe should succeed*/ + ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); + ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); + CloseHandle(hReplacedFile); + /* replacement file still exists, make pass w/o "replaced" */ ret = DeleteFileA(replaced); ok(ret || GetLastError() == ERROR_ACCESS_DENIED, -- 2.18.0

2 8

[PATCH vkd3d 1/3] vkd3d: Use vkd3d_create_vk_buffer_view() to create counter resource views.
by Józef Kucia 30 Aug '18

30 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d97c3dbeb88b..7dc7b384b57e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1590,11 +1590,16 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ if (counter_resource) { + const struct vkd3d_format *format; + assert(d3d12_resource_is_buffer(counter_resource)); assert(desc->u.Buffer.StructureByteStride); - if (!vkd3d_create_buffer_view(device, counter_resource, DXGI_FORMAT_R32_UINT, - desc->u.Buffer.CounterOffsetInBytes / sizeof(uint32_t), 1, 0, 0, &view->vk_counter_view)) + + format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); + if (!vkd3d_create_vk_buffer_view(device, counter_resource, format, + desc->u.Buffer.CounterOffsetInBytes, sizeof(uint32_t), &view->vk_counter_view)) { + WARN("Failed to create counter buffer view.\n"); view->vk_counter_view = VK_NULL_HANDLE; d3d12_desc_destroy(descriptor, device); } -- 2.16.4

2 1

[PATCH vkd3d 3/3] vkd3d: Return bool from vkd3d_create_texture_view().
by Józef Kucia 30 Aug '18

30 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> For consistency with vkd3d_create_buffer_view(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 4772b3f10dbf..219b95c37194 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1341,7 +1341,7 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, return true; } -static HRESULT vkd3d_create_texture_view(struct d3d12_device *device, +static bool vkd3d_create_texture_view(struct d3d12_device *device, struct d3d12_resource *resource, const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view) { @@ -1369,18 +1369,18 @@ static HRESULT vkd3d_create_texture_view(struct d3d12_device *device, if ((vr = VK_CALL(vkCreateImageView(device->vk_device, &view_desc, NULL, &vk_view))) < 0) { WARN("Failed to create Vulkan image view, vr %d.\n", vr); - return hresult_from_vk_result(vr); + return false; } if (!(object = vkd3d_view_create())) { VK_CALL(vkDestroyImageView(device->vk_device, vk_view, NULL)); - return E_OUTOFMEMORY; + return false; } object->u.vk_image_view = vk_view; *view = object; - return S_OK; + return true; } void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, @@ -1541,7 +1541,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, } } - if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) + if (!vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view)) return; descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; @@ -1663,7 +1663,7 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, } } - if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) + if (!vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view)) return; descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; @@ -1913,7 +1913,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev vkd3d_desc.layer_count = resource->desc.DepthOrArraySize; } - if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) + if (!vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view)) return; rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; @@ -1985,7 +1985,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev } } - if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) + if (!vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view)) return; dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; -- 2.16.4

2 1

[PATCH vkd3d 2/3] vkd3d: Create vkd3d_views in vkd3d_create_buffer_view().
by Józef Kucia 30 Aug '18

30 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 7dc7b384b57e..4772b3f10dbf 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1206,10 +1206,13 @@ static bool vkd3d_create_vk_buffer_view(struct d3d12_device *device, static bool vkd3d_create_buffer_view(struct d3d12_device *device, struct d3d12_resource *resource, DXGI_FORMAT view_format, unsigned int offset, unsigned int size, unsigned int structure_stride, - unsigned int flags, VkBufferView *vk_view) + unsigned int flags, struct vkd3d_view **view) { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_format *format; + struct vkd3d_view *object; unsigned int element_size; + VkBufferView vk_view; if (view_format == DXGI_FORMAT_R32_TYPELESS && (flags & VKD3D_VIEW_RAW_BUFFER)) { @@ -1231,8 +1234,19 @@ static bool vkd3d_create_buffer_view(struct d3d12_device *device, return false; } - return vkd3d_create_vk_buffer_view(device, resource, format, - offset * element_size, size * element_size, vk_view); + if (!vkd3d_create_vk_buffer_view(device, resource, format, + offset * element_size, size * element_size, &vk_view)) + return false; + + if (!(object = vkd3d_view_create())) + { + VK_CALL(vkDestroyBufferView(device->vk_device, vk_view, NULL)); + return false; + } + + object->u.vk_buffer_view = vk_view; + *view = object; + return true; } static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, @@ -1419,6 +1433,7 @@ static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor, const D3D12_SHADER_RESOURCE_VIEW_DESC *desc) { struct vkd3d_view *view; + unsigned int flags; if (!desc) { @@ -1432,18 +1447,11 @@ static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor, return; } - if (!(view = vkd3d_view_create())) - return; - + flags = vkd3d_view_flags_from_d3d12_buffer_srv_flags(desc->u.Buffer.Flags); if (!vkd3d_create_buffer_view(device, resource, desc->Format, desc->u.Buffer.FirstElement, desc->u.Buffer.NumElements, - desc->u.Buffer.StructureByteStride, - vkd3d_view_flags_from_d3d12_buffer_srv_flags(desc->u.Buffer.Flags), - &view->u.vk_buffer_view)) - { - vkd3d_free(view); + desc->u.Buffer.StructureByteStride, flags, &view)) return; - } descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; @@ -1555,6 +1563,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) { struct vkd3d_view *view; + unsigned int flags; if (!desc) { @@ -1571,18 +1580,11 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ if (desc->u.Buffer.CounterOffsetInBytes) FIXME("Ignoring counter offset %"PRIu64".\n", desc->u.Buffer.CounterOffsetInBytes); - if (!(view = vkd3d_view_create())) - return; - + flags = vkd3d_view_flags_from_d3d12_buffer_uav_flags(desc->u.Buffer.Flags); if (!vkd3d_create_buffer_view(device, resource, desc->Format, desc->u.Buffer.FirstElement, desc->u.Buffer.NumElements, - desc->u.Buffer.StructureByteStride, - vkd3d_view_flags_from_d3d12_buffer_uav_flags(desc->u.Buffer.Flags), - &view->u.vk_buffer_view)) - { - vkd3d_free(view); + desc->u.Buffer.StructureByteStride, flags, &view)) return; - } descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; -- 2.16.4

2 1

[PATCH 3/3] wined3d: Use get_format_internal() in init_format_filter_info().
by Józef Kucia 30 Aug '18

30 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/utils.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5720cabba99e..d75cbc1a1645 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3330,7 +3330,7 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, { enum wined3d_pci_vendor vendor = adapter->driver_info.vendor; struct wined3d_format *format; - unsigned int fmt_idx, i; + unsigned int i; static const enum wined3d_format_id fmts16[] = { WINED3DFMT_R16_FLOAT, @@ -3339,8 +3339,8 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, }; BOOL filtered; + /* This was already handled by init_format_texture_info(). */ if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) - /* This was already handled by init_format_texture_info(). */ return; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO @@ -3367,8 +3367,8 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, { for (i = 0; i < ARRAY_SIZE(fmts16); ++i) { - fmt_idx = get_format_idx(fmts16[i]); - format_set_flag(&adapter->formats[fmt_idx], WINED3DFMT_FLAG_FILTERING); + format = get_format_internal(adapter, fmts16[i]); + format_set_flag(format, WINED3DFMT_FLAG_FILTERING); } } return; @@ -3376,19 +3376,19 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, for (i = 0; i < ARRAY_SIZE(fmts16); ++i) { - fmt_idx = get_format_idx(fmts16[i]); - format = &adapter->formats[fmt_idx]; - if (!format->glInternal) continue; /* Not supported by GL */ + format = get_format_internal(adapter, fmts16[i]); + if (!format->glInternal) + continue; /* Not supported by GL */ - filtered = check_filter(gl_info, adapter->formats[fmt_idx].glInternal); + filtered = check_filter(gl_info, format->glInternal); if (filtered) { - TRACE("Format %s supports filtering\n", debug_d3dformat(fmts16[i])); + TRACE("Format %s supports filtering.\n", debug_d3dformat(format->id)); format_set_flag(format, WINED3DFMT_FLAG_FILTERING); } else { - TRACE("Format %s does not support filtering\n", debug_d3dformat(fmts16[i])); + TRACE("Format %s does not support filtering.\n", debug_d3dformat(format->id)); } } } -- 2.16.4

2 1

[PATCH 2/3] wined3d: Use get_format_internal() in apply_format_fixups().
by Józef Kucia 30 Aug '18

30 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/utils.c | 198 +++++++++++++++++++++++++-------------------------- 1 file changed, 99 insertions(+), 99 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bc225878e5e8..5720cabba99e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3395,27 +3395,27 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_gl_info *gl_info) { + struct wined3d_format *format; unsigned int i; - int idx; - idx = get_format_idx(WINED3DFMT_R16_FLOAT); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R16_FLOAT); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); - idx = get_format_idx(WINED3DFMT_R32_FLOAT); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R32_FLOAT); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); - idx = get_format_idx(WINED3DFMT_R16G16_UNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R16G16_UNORM); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); - idx = get_format_idx(WINED3DFMT_R16G16_FLOAT); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R16G16_FLOAT); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); - idx = get_format_idx(WINED3DFMT_R32G32_FLOAT); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R32G32_FLOAT); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); /* GL_ATI_envmap_bumpmap in theory supports R8G8_SNORM but is no longer supported by @@ -3425,163 +3425,163 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ /* R8G8_SNORM and R16G16_SNORM need a fixup of the undefined blue channel. OpenGL * returns 0.0 when sampling from it, DirectX 1.0. So we always have in-shader * conversion for this format. */ - idx = get_format_idx(WINED3DFMT_R8G8_SNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R8G8_SNORM); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); - idx = get_format_idx(WINED3DFMT_R16G16_SNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R16G16_SNORM); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } else { /* Emulate using unsigned formats. This requires load-time conversion in addition to the * fixups here. */ - idx = get_format_idx(WINED3DFMT_R8G8_SNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R8G8_SNORM); + format->color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); - idx = get_format_idx(WINED3DFMT_R16G16_SNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R16G16_SNORM); + format->color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); - idx = get_format_idx(WINED3DFMT_R8G8B8A8_SNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R8G8B8A8_SNORM); + format->color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 1, CHANNEL_SOURCE_Z, 1, CHANNEL_SOURCE_W); - idx = get_format_idx(WINED3DFMT_R5G5_SNORM_L6_UNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R5G5_SNORM_L6_UNORM); + format->color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE); } if (!gl_info->supported[NV_TEXTURE_SHADER]) { - idx = get_format_idx(WINED3DFMT_R8G8_SNORM_L8X8_UNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R8G8_SNORM_L8X8_UNORM); + format->color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_W); } if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] || gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) { - idx = get_format_idx(WINED3DFMT_ATI1N); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_ATI1N); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X); - idx = get_format_idx(WINED3DFMT_ATI2N); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_ATI2N); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } else if (gl_info->supported[ATI_TEXTURE_COMPRESSION_3DC]) { - idx = get_format_idx(WINED3DFMT_ATI2N); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_ATI2N); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_W, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } if (!gl_info->supported[APPLE_YCBCR_422] && (gl_info->supported[ARB_FRAGMENT_PROGRAM] || (gl_info->supported[ARB_FRAGMENT_SHADER] && gl_info->supported[ARB_VERTEX_SHADER]))) { - idx = get_format_idx(WINED3DFMT_YUY2); - adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YUY2); + format = get_format_internal(adapter, WINED3DFMT_YUY2); + format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YUY2); - idx = get_format_idx(WINED3DFMT_UYVY); - adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_UYVY); + format = get_format_internal(adapter, WINED3DFMT_UYVY); + format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_UYVY); } else if (!gl_info->supported[APPLE_YCBCR_422] && (!gl_info->supported[ARB_FRAGMENT_PROGRAM] && (!gl_info->supported[ARB_FRAGMENT_SHADER] || !gl_info->supported[ARB_VERTEX_SHADER]))) { - idx = get_format_idx(WINED3DFMT_YUY2); - adapter->formats[idx].glInternal = 0; + format = get_format_internal(adapter, WINED3DFMT_YUY2); + format->glInternal = 0; - idx = get_format_idx(WINED3DFMT_UYVY); - adapter->formats[idx].glInternal = 0; + format = get_format_internal(adapter, WINED3DFMT_UYVY); + format->glInternal = 0; } if (gl_info->supported[ARB_FRAGMENT_PROGRAM] || (gl_info->supported[ARB_FRAGMENT_SHADER] && gl_info->supported[ARB_VERTEX_SHADER])) { - idx = get_format_idx(WINED3DFMT_YV12); - format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); - adapter->formats[idx].height_scale.numerator = 3; - adapter->formats[idx].height_scale.denominator = 2; - adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YV12); + format = get_format_internal(adapter, WINED3DFMT_YV12); + format_set_flag(format, WINED3DFMT_FLAG_HEIGHT_SCALE); + format->height_scale.numerator = 3; + format->height_scale.denominator = 2; + format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YV12); - idx = get_format_idx(WINED3DFMT_NV12); - format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); - adapter->formats[idx].height_scale.numerator = 3; - adapter->formats[idx].height_scale.denominator = 2; - adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_NV12); + format = get_format_internal(adapter, WINED3DFMT_NV12); + format_set_flag(format, WINED3DFMT_FLAG_HEIGHT_SCALE); + format->height_scale.numerator = 3; + format->height_scale.denominator = 2; + format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_NV12); } else { - idx = get_format_idx(WINED3DFMT_YV12); - adapter->formats[idx].glInternal = 0; + format = get_format_internal(adapter, WINED3DFMT_YV12); + format->glInternal = 0; - idx = get_format_idx(WINED3DFMT_NV12); - adapter->formats[idx].glInternal = 0; + format = get_format_internal(adapter, WINED3DFMT_NV12); + format->glInternal = 0; } if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) { - idx = get_format_idx(WINED3DFMT_A8_UNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_A8_UNORM); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_X); - idx = get_format_idx(WINED3DFMT_L8A8_UNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_L8A8_UNORM); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y); - idx = get_format_idx(WINED3DFMT_L4A4_UNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_L4A4_UNORM); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y); - idx = get_format_idx(WINED3DFMT_L16_UNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_L16_UNORM); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE); - idx = get_format_idx(WINED3DFMT_INTZ); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_INTZ); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X); } if (gl_info->supported[ARB_TEXTURE_RG]) { - idx = get_format_idx(WINED3DFMT_L8_UNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_L8_UNORM); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE); } if (gl_info->supported[ARB_FRAGMENT_PROGRAM] || gl_info->supported[ARB_FRAGMENT_SHADER]) { - idx = get_format_idx(WINED3DFMT_P8_UINT); - adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); + format = get_format_internal(adapter, WINED3DFMT_P8_UINT); + format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); } if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) { - idx = get_format_idx(WINED3DFMT_B8G8R8A8_UNORM); - adapter->formats[idx].gl_vtx_format = GL_BGRA; + format = get_format_internal(adapter, WINED3DFMT_B8G8R8A8_UNORM); + format->gl_vtx_format = GL_BGRA; } if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) { /* Do not change the size of the type, it is CPU side. We have to change the GPU-side information though. * It is the job of the vertex buffer code to make sure that the vbos have the right format */ - idx = get_format_idx(WINED3DFMT_R16G16_FLOAT); - adapter->formats[idx].gl_vtx_type = GL_FLOAT; + format = get_format_internal(adapter, WINED3DFMT_R16G16_FLOAT); + format->gl_vtx_type = GL_FLOAT; - idx = get_format_idx(WINED3DFMT_R16G16B16A16_FLOAT); - adapter->formats[idx].gl_vtx_type = GL_FLOAT; + format = get_format_internal(adapter, WINED3DFMT_R16G16B16A16_FLOAT); + format->gl_vtx_type = GL_FLOAT; } if (!gl_info->supported[ARB_HALF_FLOAT_PIXEL]) { - idx = get_format_idx(WINED3DFMT_R16_FLOAT); - format_clear_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format = get_format_internal(adapter, WINED3DFMT_R16_FLOAT); + format_clear_flag(format, WINED3DFMT_FLAG_TEXTURE); - idx = get_format_idx(WINED3DFMT_R16G16_FLOAT); - format_clear_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format = get_format_internal(adapter, WINED3DFMT_R16G16_FLOAT); + format_clear_flag(format, WINED3DFMT_FLAG_TEXTURE); - idx = get_format_idx(WINED3DFMT_R16G16B16A16_FLOAT); - format_clear_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format = get_format_internal(adapter, WINED3DFMT_R16G16B16A16_FLOAT); + format_clear_flag(format, WINED3DFMT_FLAG_TEXTURE); } if (gl_info->quirks & WINED3D_QUIRK_BROKEN_RGBA16) { - idx = get_format_idx(WINED3DFMT_R16G16B16A16_UNORM); - format_clear_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format = get_format_internal(adapter, WINED3DFMT_R16G16B16A16_UNORM); + format_clear_flag(format, WINED3DFMT_FLAG_TEXTURE); } /* ATI instancing hack: Although ATI cards do not support Shader Model @@ -3599,8 +3599,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ /* FIXME: This should just check the shader backend caps. */ if (gl_info->supported[ARB_VERTEX_PROGRAM] || gl_info->supported[ARB_VERTEX_SHADER]) { - idx = get_format_idx(WINED3DFMT_INST); - format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format = get_format_internal(adapter, WINED3DFMT_INST); + format_set_flag(format, WINED3DFMT_FLAG_TEXTURE); } /* Depth bound test. To query if the card supports it CheckDeviceFormat() @@ -3611,8 +3611,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ * value. */ if (gl_info->supported[EXT_DEPTH_BOUNDS_TEST]) { - idx = get_format_idx(WINED3DFMT_NVDB); - format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format = get_format_internal(adapter, WINED3DFMT_NVDB); + format_set_flag(format, WINED3DFMT_FLAG_TEXTURE); } /* RESZ aka AMD DX9-level hack for multisampled depth buffer resolve. You query for RESZ @@ -3620,8 +3620,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ * RENDERTARGET usage. */ if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) { - idx = get_format_idx(WINED3DFMT_RESZ); - format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET); + format = get_format_internal(adapter, WINED3DFMT_RESZ); + format_set_flag(format, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET); } for (i = 0; i < adapter->format_count; ++i) @@ -3650,18 +3650,18 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ /* These formats are not supported for 3D textures. See also * WINED3DFMT_FLAG_DECOMPRESS. */ - idx = get_format_idx(WINED3DFMT_ATI1N); - adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_ATI2N); - adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC4_UNORM); - adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC4_SNORM); - adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC5_UNORM); - adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC5_SNORM); - adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + format = get_format_internal(adapter, WINED3DFMT_ATI1N); + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + format = get_format_internal(adapter, WINED3DFMT_ATI2N); + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + format = get_format_internal(adapter, WINED3DFMT_BC4_UNORM); + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + format = get_format_internal(adapter, WINED3DFMT_BC4_SNORM); + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + format = get_format_internal(adapter, WINED3DFMT_BC5_UNORM); + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + format = get_format_internal(adapter, WINED3DFMT_BC5_SNORM); + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; } static unsigned int calculate_vertex_attribute_size(GLenum type, unsigned int component_count) -- 2.16.4

2 1

[PATCH 1/3] wined3d: Move formats from gl_info to wined3d_adapter.
by Józef Kucia 30 Aug '18

30 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 5 +- dlls/wined3d/texture.c | 1 - dlls/wined3d/utils.c | 236 +++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 6 +- 4 files changed, 127 insertions(+), 121 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8fa3a2492dfe..ab6a452a2e8c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -73,7 +73,7 @@ UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) static void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) { - heap_free(adapter->gl_info.formats); + heap_free(adapter->formats); heap_free(adapter->cfgs); } @@ -2512,6 +2512,9 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o TRACE("Allocated LUID %08x:%08x for adapter %p.\n", adapter->luid.HighPart, adapter->luid.LowPart, adapter); + adapter->formats = NULL; + adapter->format_count = 0; + if (wined3d_creation_flags & WINED3D_NO3D) return wined3d_adapter_no3d_init(adapter); return wined3d_adapter_opengl_init(adapter, wined3d_creation_flags); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f72442d1ddfe..8f499d4ada60 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2656,7 +2656,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D && !gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) { - /* TODO: Add support for non-power-of-two compressed textures. */ if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_HEIGHT_SCALE)) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0c80756e2a87..bc225878e5e8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1936,7 +1936,7 @@ static inline int get_format_idx(enum wined3d_format_id format_id) return -1; } -static struct wined3d_format *get_format_internal(struct wined3d_gl_info *gl_info, +static struct wined3d_format *get_format_internal(const struct wined3d_adapter *adapter, enum wined3d_format_id format_id) { int fmt_idx; @@ -1947,7 +1947,7 @@ static struct wined3d_format *get_format_internal(struct wined3d_gl_info *gl_inf return NULL; } - return &gl_info->formats[fmt_idx]; + return &adapter->formats[fmt_idx]; } static void copy_format(struct wined3d_format *dst_format, const struct wined3d_format *src_format) @@ -1999,14 +1999,14 @@ static enum wined3d_channel_type map_channel_type(char t) } } -static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) +static BOOL init_format_base_info(struct wined3d_adapter *adapter) { struct wined3d_format *format; unsigned int i, j; - gl_info->format_count = WINED3D_FORMAT_COUNT; - if (!(gl_info->formats = heap_calloc(gl_info->format_count - + ARRAY_SIZE(typeless_depth_stencil_formats), sizeof(*gl_info->formats)))) + adapter->format_count = WINED3D_FORMAT_COUNT; + if (!(adapter->formats = heap_calloc(adapter->format_count + + ARRAY_SIZE(typeless_depth_stencil_formats), sizeof(*adapter->formats)))) { ERR("Failed to allocate memory.\n"); return FALSE; @@ -2014,7 +2014,7 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) for (i = 0; i < ARRAY_SIZE(formats); ++i) { - if (!(format = get_format_internal(gl_info, formats[i].id))) + if (!(format = get_format_internal(adapter, formats[i].id))) goto fail; format->id = formats[i].id; @@ -2039,10 +2039,10 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) const struct wined3d_format *typeless_format; DWORD flags = 0; - if (!(format = get_format_internal(gl_info, typed_formats[i].id))) + if (!(format = get_format_internal(adapter, typed_formats[i].id))) goto fail; - if (!(typeless_format = get_format_internal(gl_info, typed_formats[i].typeless_id))) + if (!(typeless_format = get_format_internal(adapter, typed_formats[i].typeless_id))) goto fail; format->id = typed_formats[i].id; @@ -2082,7 +2082,7 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) for (i = 0; i < ARRAY_SIZE(ddi_formats); ++i) { - if (!(format = get_format_internal(gl_info, ddi_formats[i].id))) + if (!(format = get_format_internal(adapter, ddi_formats[i].id))) goto fail; format->ddi_format = ddi_formats[i].ddi_format; @@ -2090,7 +2090,7 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) for (i = 0; i < ARRAY_SIZE(format_base_flags); ++i) { - if (!(format = get_format_internal(gl_info, format_base_flags[i].id))) + if (!(format = get_format_internal(adapter, format_base_flags[i].id))) goto fail; format_set_flag(format, format_base_flags[i].flags); @@ -2099,18 +2099,18 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) return TRUE; fail: - heap_free(gl_info->formats); + heap_free(adapter->formats); return FALSE; } -static BOOL init_format_block_info(struct wined3d_gl_info *gl_info) +static BOOL init_format_block_info(struct wined3d_adapter *adapter) { struct wined3d_format *format; unsigned int i; for (i = 0; i < ARRAY_SIZE(format_block_info); ++i) { - if (!(format = get_format_internal(gl_info, format_block_info[i].id))) + if (!(format = get_format_internal(adapter, format_block_info[i].id))) return FALSE; format->block_width = format_block_info[i].block_width; @@ -2135,14 +2135,14 @@ static BOOL init_format_block_info(struct wined3d_gl_info *gl_info) * * Affected applications include "Heroes VI", "From Dust", "Halo Online" and * "Eldorado". */ -static BOOL init_format_decompress_info(struct wined3d_gl_info *gl_info) +static BOOL init_format_decompress_info(struct wined3d_adapter *adapter) { struct wined3d_format *format; unsigned int i; for (i = 0; i < ARRAY_SIZE(format_decompress_info); ++i) { - if (!(format = get_format_internal(gl_info, format_decompress_info[i].id))) + if (!(format = get_format_internal(adapter, format_decompress_info[i].id))) return FALSE; format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= WINED3DFMT_FLAG_DECOMPRESS; @@ -2723,7 +2723,8 @@ static void query_format_flag(struct wined3d_gl_info *gl_info, struct wined3d_fo } /* Context activation is done by the caller. */ -static void init_format_fbo_compat_info(struct wined3d_caps_gl_ctx *ctx) +static void init_format_fbo_compat_info(const struct wined3d_adapter *adapter, + struct wined3d_caps_gl_ctx *ctx) { const struct wined3d_gl_info *gl_info = ctx->gl_info; unsigned int i, type; @@ -2731,12 +2732,12 @@ static void init_format_fbo_compat_info(struct wined3d_caps_gl_ctx *ctx) if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) { - for (i = 0; i < gl_info->format_count; ++i) + for (i = 0; i < adapter->format_count; ++i) { - GLint value; - struct wined3d_format *format = &gl_info->formats[i]; BOOL fallback_fmt_used = FALSE, regular_fmt_used = FALSE; + struct wined3d_format *format = &adapter->formats[i]; GLenum rt_internal = format->rtInternal; + GLint value; if (!format->glInternal) continue; @@ -2845,9 +2846,9 @@ static void init_format_fbo_compat_info(struct wined3d_caps_gl_ctx *ctx) gl_info->gl_ops.gl.p_glReadBuffer(GL_COLOR_ATTACHMENT0); } - for (i = 0; i < gl_info->format_count; ++i) + for (i = 0; i < adapter->format_count; ++i) { - struct wined3d_format *format = &gl_info->formats[i]; + struct wined3d_format *format = &adapter->formats[i]; if (!format->glInternal) continue; @@ -3125,7 +3126,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win for (i = 0; i < ARRAY_SIZE(format_texture_info); ++i) { - if (!(format = get_format_internal(gl_info, format_texture_info[i].id))) + if (!(format = get_format_internal(adapter, format_texture_info[i].id))) return FALSE; if (!gl_info->supported[format_texture_info[i].extension]) @@ -3189,7 +3190,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win { if (format_srgb_info[j].base_format_id == format->id) { - if (!(srgb_format = get_format_internal(gl_info, format_srgb_info[j].srgb_format_id))) + if (!(srgb_format = get_format_internal(adapter, format_srgb_info[j].srgb_format_id))) return FALSE; break; } @@ -3324,8 +3325,10 @@ static BOOL check_filter(const struct wined3d_gl_info *gl_info, GLenum internal) return ret; } -static void init_format_filter_info(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) +static void init_format_filter_info(struct wined3d_adapter *adapter, + struct wined3d_gl_info *gl_info) { + enum wined3d_pci_vendor vendor = adapter->driver_info.vendor; struct wined3d_format *format; unsigned int fmt_idx, i; static const enum wined3d_format_id fmts16[] = @@ -3365,7 +3368,7 @@ static void init_format_filter_info(struct wined3d_gl_info *gl_info, enum wined3 for (i = 0; i < ARRAY_SIZE(fmts16); ++i) { fmt_idx = get_format_idx(fmts16[i]); - format_set_flag(&gl_info->formats[fmt_idx], WINED3DFMT_FLAG_FILTERING); + format_set_flag(&adapter->formats[fmt_idx], WINED3DFMT_FLAG_FILTERING); } } return; @@ -3374,10 +3377,10 @@ static void init_format_filter_info(struct wined3d_gl_info *gl_info, enum wined3 for (i = 0; i < ARRAY_SIZE(fmts16); ++i) { fmt_idx = get_format_idx(fmts16[i]); - format = &gl_info->formats[fmt_idx]; + format = &adapter->formats[fmt_idx]; if (!format->glInternal) continue; /* Not supported by GL */ - filtered = check_filter(gl_info, gl_info->formats[fmt_idx].glInternal); + filtered = check_filter(gl_info, adapter->formats[fmt_idx].glInternal); if (filtered) { TRACE("Format %s supports filtering\n", debug_d3dformat(fmts16[i])); @@ -3396,23 +3399,23 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ int idx; idx = get_format_idx(WINED3DFMT_R16_FLOAT); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); idx = get_format_idx(WINED3DFMT_R32_FLOAT); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); idx = get_format_idx(WINED3DFMT_R16G16_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); idx = get_format_idx(WINED3DFMT_R16G16_FLOAT); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); idx = get_format_idx(WINED3DFMT_R32G32_FLOAT); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); /* GL_ATI_envmap_bumpmap in theory supports R8G8_SNORM but is no longer supported by @@ -3423,10 +3426,10 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ * returns 0.0 when sampling from it, DirectX 1.0. So we always have in-shader * conversion for this format. */ idx = get_format_idx(WINED3DFMT_R8G8_SNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); idx = get_format_idx(WINED3DFMT_R16G16_SNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } else @@ -3434,40 +3437,40 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ /* Emulate using unsigned formats. This requires load-time conversion in addition to the * fixups here. */ idx = get_format_idx(WINED3DFMT_R8G8_SNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); idx = get_format_idx(WINED3DFMT_R16G16_SNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); idx = get_format_idx(WINED3DFMT_R8G8B8A8_SNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 1, CHANNEL_SOURCE_Z, 1, CHANNEL_SOURCE_W); idx = get_format_idx(WINED3DFMT_R5G5_SNORM_L6_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE); } if (!gl_info->supported[NV_TEXTURE_SHADER]) { idx = get_format_idx(WINED3DFMT_R8G8_SNORM_L8X8_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_W); } if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] || gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) { idx = get_format_idx(WINED3DFMT_ATI1N); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X); idx = get_format_idx(WINED3DFMT_ATI2N); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } else if (gl_info->supported[ATI_TEXTURE_COMPRESSION_3DC]) { idx = get_format_idx(WINED3DFMT_ATI2N); - gl_info->formats[idx].color_fixup= create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_W, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } @@ -3475,81 +3478,81 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ || (gl_info->supported[ARB_FRAGMENT_SHADER] && gl_info->supported[ARB_VERTEX_SHADER]))) { idx = get_format_idx(WINED3DFMT_YUY2); - gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YUY2); + adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YUY2); idx = get_format_idx(WINED3DFMT_UYVY); - gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_UYVY); + adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_UYVY); } else if (!gl_info->supported[APPLE_YCBCR_422] && (!gl_info->supported[ARB_FRAGMENT_PROGRAM] && (!gl_info->supported[ARB_FRAGMENT_SHADER] || !gl_info->supported[ARB_VERTEX_SHADER]))) { idx = get_format_idx(WINED3DFMT_YUY2); - gl_info->formats[idx].glInternal = 0; + adapter->formats[idx].glInternal = 0; idx = get_format_idx(WINED3DFMT_UYVY); - gl_info->formats[idx].glInternal = 0; + adapter->formats[idx].glInternal = 0; } if (gl_info->supported[ARB_FRAGMENT_PROGRAM] || (gl_info->supported[ARB_FRAGMENT_SHADER] && gl_info->supported[ARB_VERTEX_SHADER])) { idx = get_format_idx(WINED3DFMT_YV12); - format_set_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); - gl_info->formats[idx].height_scale.numerator = 3; - gl_info->formats[idx].height_scale.denominator = 2; - gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YV12); + format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); + adapter->formats[idx].height_scale.numerator = 3; + adapter->formats[idx].height_scale.denominator = 2; + adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YV12); idx = get_format_idx(WINED3DFMT_NV12); - format_set_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); - gl_info->formats[idx].height_scale.numerator = 3; - gl_info->formats[idx].height_scale.denominator = 2; - gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_NV12); + format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); + adapter->formats[idx].height_scale.numerator = 3; + adapter->formats[idx].height_scale.denominator = 2; + adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_NV12); } else { idx = get_format_idx(WINED3DFMT_YV12); - gl_info->formats[idx].glInternal = 0; + adapter->formats[idx].glInternal = 0; idx = get_format_idx(WINED3DFMT_NV12); - gl_info->formats[idx].glInternal = 0; + adapter->formats[idx].glInternal = 0; } if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) { idx = get_format_idx(WINED3DFMT_A8_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_X); idx = get_format_idx(WINED3DFMT_L8A8_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y); idx = get_format_idx(WINED3DFMT_L4A4_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y); idx = get_format_idx(WINED3DFMT_L16_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE); idx = get_format_idx(WINED3DFMT_INTZ); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X); } if (gl_info->supported[ARB_TEXTURE_RG]) { idx = get_format_idx(WINED3DFMT_L8_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE); } if (gl_info->supported[ARB_FRAGMENT_PROGRAM] || gl_info->supported[ARB_FRAGMENT_SHADER]) { idx = get_format_idx(WINED3DFMT_P8_UINT); - gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); + adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); } if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) { idx = get_format_idx(WINED3DFMT_B8G8R8A8_UNORM); - gl_info->formats[idx].gl_vtx_format = GL_BGRA; + adapter->formats[idx].gl_vtx_format = GL_BGRA; } if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) @@ -3557,28 +3560,28 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ /* Do not change the size of the type, it is CPU side. We have to change the GPU-side information though. * It is the job of the vertex buffer code to make sure that the vbos have the right format */ idx = get_format_idx(WINED3DFMT_R16G16_FLOAT); - gl_info->formats[idx].gl_vtx_type = GL_FLOAT; + adapter->formats[idx].gl_vtx_type = GL_FLOAT; idx = get_format_idx(WINED3DFMT_R16G16B16A16_FLOAT); - gl_info->formats[idx].gl_vtx_type = GL_FLOAT; + adapter->formats[idx].gl_vtx_type = GL_FLOAT; } if (!gl_info->supported[ARB_HALF_FLOAT_PIXEL]) { idx = get_format_idx(WINED3DFMT_R16_FLOAT); - format_clear_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format_clear_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); idx = get_format_idx(WINED3DFMT_R16G16_FLOAT); - format_clear_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format_clear_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); idx = get_format_idx(WINED3DFMT_R16G16B16A16_FLOAT); - format_clear_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format_clear_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); } if (gl_info->quirks & WINED3D_QUIRK_BROKEN_RGBA16) { idx = get_format_idx(WINED3DFMT_R16G16B16A16_UNORM); - format_clear_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format_clear_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); } /* ATI instancing hack: Although ATI cards do not support Shader Model @@ -3597,7 +3600,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ if (gl_info->supported[ARB_VERTEX_PROGRAM] || gl_info->supported[ARB_VERTEX_SHADER]) { idx = get_format_idx(WINED3DFMT_INST); - format_set_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); } /* Depth bound test. To query if the card supports it CheckDeviceFormat() @@ -3609,7 +3612,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ if (gl_info->supported[EXT_DEPTH_BOUNDS_TEST]) { idx = get_format_idx(WINED3DFMT_NVDB); - format_set_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); } /* RESZ aka AMD DX9-level hack for multisampled depth buffer resolve. You query for RESZ @@ -3618,12 +3621,12 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) { idx = get_format_idx(WINED3DFMT_RESZ); - format_set_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET); + format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET); } - for (i = 0; i < gl_info->format_count; ++i) + for (i = 0; i < adapter->format_count; ++i) { - struct wined3d_format *format = &gl_info->formats[i]; + struct wined3d_format *format = &adapter->formats[i]; if (!(format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_TEXTURE)) continue; @@ -3648,17 +3651,17 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ /* These formats are not supported for 3D textures. See also * WINED3DFMT_FLAG_DECOMPRESS. */ idx = get_format_idx(WINED3DFMT_ATI1N); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_ATI2N); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC4_UNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC4_SNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC5_UNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC5_SNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; } static unsigned int calculate_vertex_attribute_size(GLenum type, unsigned int component_count) @@ -3689,14 +3692,15 @@ static unsigned int calculate_vertex_attribute_size(GLenum type, unsigned int co } } -static BOOL init_format_vertex_info(struct wined3d_gl_info *gl_info) +static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, + struct wined3d_gl_info *gl_info) { struct wined3d_format *format; unsigned int i; for (i = 0; i < ARRAY_SIZE(format_vertex_info); ++i) { - if (!(format = get_format_internal(gl_info, format_vertex_info[i].id))) + if (!(format = get_format_internal(adapter, format_vertex_info[i].id))) return FALSE; if (!gl_info->supported[format_vertex_info[i].extension]) @@ -3719,7 +3723,7 @@ static BOOL init_format_vertex_info(struct wined3d_gl_info *gl_info) return TRUE; } -static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) +static BOOL init_typeless_formats(const struct wined3d_adapter *adapter) { unsigned int flags[WINED3D_GL_RES_TYPE_COUNT]; unsigned int i, j; @@ -3728,9 +3732,9 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) { struct wined3d_format *format, *typeless_format; - if (!(format = get_format_internal(gl_info, typed_formats[i].id))) + if (!(format = get_format_internal(adapter, typed_formats[i].id))) return FALSE; - if (!(typeless_format = get_format_internal(gl_info, typed_formats[i].typeless_id))) + if (!(typeless_format = get_format_internal(adapter, typed_formats[i].typeless_id))) return FALSE; memcpy(flags, typeless_format->flags, sizeof(flags)); @@ -3745,12 +3749,12 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) struct wined3d_format *depth_view_format, *stencil_view_format; enum wined3d_format_id format_id; - if (!(typeless_format = get_format_internal(gl_info, typeless_depth_stencil_formats[i].typeless_id))) + if (!(typeless_format = get_format_internal(adapter, typeless_depth_stencil_formats[i].typeless_id))) return FALSE; - if (!(ds_format = get_format_internal(gl_info, typeless_depth_stencil_formats[i].depth_stencil_id))) + if (!(ds_format = get_format_internal(adapter, typeless_depth_stencil_formats[i].depth_stencil_id))) return FALSE; - typeless_ds_format = &gl_info->formats[WINED3D_FORMAT_COUNT + i]; + typeless_ds_format = &adapter->formats[WINED3D_FORMAT_COUNT + i]; typeless_ds_format->id = typeless_depth_stencil_formats[i].typeless_id; copy_format(typeless_ds_format, ds_format); for (j = 0; j < ARRAY_SIZE(typeless_ds_format->flags); ++j) @@ -3762,13 +3766,13 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) if ((format_id = typeless_depth_stencil_formats[i].depth_view_id) && typeless_depth_stencil_formats[i].separate_depth_view_format) { - if (!(depth_view_format = get_format_internal(gl_info, format_id))) + if (!(depth_view_format = get_format_internal(adapter, format_id))) return FALSE; copy_format(depth_view_format, ds_format); } if ((format_id = typeless_depth_stencil_formats[i].stencil_view_id)) { - if (!(stencil_view_format = get_format_internal(gl_info, format_id))) + if (!(stencil_view_format = get_format_internal(adapter, format_id))) return FALSE; copy_format(stencil_view_format, ds_format); } @@ -3777,16 +3781,17 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) return TRUE; } -static void init_format_gen_mipmap_info(struct wined3d_gl_info *gl_info) +static void init_format_gen_mipmap_info(const struct wined3d_adapter *adapter, + struct wined3d_gl_info *gl_info) { unsigned int i, j; if (!gl_info->fbo_ops.glGenerateMipmap) return; - for (i = 0; i < gl_info->format_count; ++i) + for (i = 0; i < adapter->format_count; ++i) { - struct wined3d_format *format = &gl_info->formats[i]; + struct wined3d_format *format = &adapter->formats[i]; for (j = 0; j < ARRAY_SIZE(format->flags); ++j) if (!(~format->flags[j] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING))) @@ -3935,15 +3940,15 @@ static float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *c return (float)(1u << cur); } -static void init_format_depth_bias_scale(struct wined3d_caps_gl_ctx *ctx, - const struct wined3d_d3d_info *d3d_info) +static void init_format_depth_bias_scale(struct wined3d_adapter *adapter, + struct wined3d_caps_gl_ctx *ctx) { - const struct wined3d_gl_info *gl_info = ctx->gl_info; + const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; unsigned int i; - for (i = 0; i < gl_info->format_count; ++i) + for (i = 0; i < adapter->format_count; ++i) { - struct wined3d_format *format = &gl_info->formats[i]; + struct wined3d_format *format = &adapter->formats[i]; if (format->flags[WINED3D_GL_RES_TYPE_RB] & WINED3DFMT_FLAG_DEPTH) { @@ -3969,35 +3974,34 @@ BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wi { struct wined3d_gl_info *gl_info = &adapter->gl_info; - if (!init_format_base_info(gl_info)) return FALSE; - if (!init_format_block_info(gl_info)) goto fail; - if (!init_format_decompress_info(gl_info)) goto fail; + if (!init_format_base_info(adapter)) return FALSE; + if (!init_format_block_info(adapter)) goto fail; + if (!init_format_decompress_info(adapter)) goto fail; if (!ctx) /* WINED3D_NO3D */ return TRUE; if (!init_format_texture_info(adapter, gl_info)) goto fail; - if (!init_format_vertex_info(gl_info)) goto fail; + if (!init_format_vertex_info(adapter, gl_info)) goto fail; apply_format_fixups(adapter, gl_info); - init_format_fbo_compat_info(ctx); - init_format_filter_info(gl_info, adapter->driver_info.vendor); - if (!init_typeless_formats(gl_info)) goto fail; - init_format_gen_mipmap_info(gl_info); - init_format_depth_bias_scale(ctx, &adapter->d3d_info); + init_format_fbo_compat_info(adapter, ctx); + init_format_filter_info(adapter, gl_info); + if (!init_typeless_formats(adapter)) goto fail; + init_format_gen_mipmap_info(adapter, gl_info); + init_format_depth_bias_scale(adapter, ctx); return TRUE; fail: - heap_free(gl_info->formats); - gl_info->formats = NULL; + heap_free(adapter->formats); + adapter->formats = NULL; return FALSE; } const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *adapter, enum wined3d_format_id format_id, unsigned int resource_usage) { - const struct wined3d_gl_info *gl_info = &adapter->gl_info; const struct wined3d_format *format; int idx = get_format_idx(format_id); unsigned int i; @@ -4006,22 +4010,22 @@ const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *ad { FIXME("Can't find format %s (%#x) in the format lookup table.\n", debug_d3dformat(format_id), format_id); - return &gl_info->formats[get_format_idx(WINED3DFMT_UNKNOWN)]; + return &adapter->formats[get_format_idx(WINED3DFMT_UNKNOWN)]; } - format = &gl_info->formats[idx]; + format = &adapter->formats[idx]; if (resource_usage & WINED3DUSAGE_DEPTHSTENCIL && wined3d_format_is_typeless(format)) { for (i = 0; i < ARRAY_SIZE(typeless_depth_stencil_formats); ++i) { if (typeless_depth_stencil_formats[i].typeless_id == format_id) - return &gl_info->formats[WINED3D_FORMAT_COUNT + i]; + return &adapter->formats[WINED3D_FORMAT_COUNT + i]; } FIXME("Cannot find depth/stencil typeless format %s (%#x).\n", debug_d3dformat(format_id), format_id); - return &gl_info->formats[get_format_idx(WINED3DFMT_UNKNOWN)]; + return &adapter->formats[get_format_idx(WINED3DFMT_UNKNOWN)]; } return format; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da3cd4615686..70841683e5ba 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2599,9 +2599,6 @@ struct wined3d_gl_info HGLRC (WINAPI *p_wglCreateContextAttribsARB)(HDC dc, HGLRC share, const GLint *attribs); struct opengl_funcs gl_ops; struct wined3d_fbo_ops fbo_ops; - - struct wined3d_format *formats; - unsigned int format_count; }; /* The driver names reflect the lowest GPU supported @@ -2682,6 +2679,9 @@ struct wined3d_adapter UINT64 vram_bytes_used; LUID luid; + struct wined3d_format *formats; + unsigned int format_count; + const struct wined3d_vertex_pipe_ops *vertex_pipe; const struct fragment_pipeline *fragment_pipe; const struct wined3d_shader_backend_ops *shader_backend; -- 2.16.4

2 1

[PATCH 1/3] dxgi: Add support for DXGI_FORMAT_R10G10B10A2_UNORM D3D12 swapchains.
by Józef Kucia 30 Aug '18

30 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index b285f3d33e0a..6eda2353152e 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -917,6 +917,7 @@ static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) case VK_FORMAT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; case VK_FORMAT_R8G8B8A8_SRGB: return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; case VK_FORMAT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; + case VK_FORMAT_A2B10G10R10_UNORM_PACK32: return DXGI_FORMAT_R10G10B10A2_UNORM; default: WARN("Unhandled format %#x.\n", vk_format); return DXGI_FORMAT_UNKNOWN; @@ -929,6 +930,7 @@ static VkFormat get_swapchain_fallback_format(VkFormat vk_format) { case VK_FORMAT_R8G8B8A8_SRGB: return VK_FORMAT_B8G8R8A8_SRGB; case VK_FORMAT_R8G8B8A8_UNORM: return VK_FORMAT_B8G8R8A8_UNORM; + case VK_FORMAT_A2B10G10R10_UNORM_PACK32: return VK_FORMAT_B8G8R8A8_UNORM; default: WARN("Unhandled format %#x.\n", vk_format); return VK_FORMAT_UNDEFINED; -- 2.16.4

2 1

[PATCH 3/3] dxgi: Return actual swap effect for D3D11 swapchains.
by Józef Kucia 30 Aug '18

30 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 6eda2353152e..f8e4f8078e74 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -37,6 +37,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); WINE_DECLARE_DEBUG_CHANNEL(winediag); +static DXGI_SWAP_EFFECT dxgi_swap_effect_from_wined3d(enum wined3d_swap_effect swap_effect) +{ + switch (swap_effect) + { + case WINED3D_SWAP_EFFECT_DISCARD: + return DXGI_SWAP_EFFECT_DISCARD; + case WINED3D_SWAP_EFFECT_SEQUENTIAL: + return DXGI_SWAP_EFFECT_SEQUENTIAL; + case WINED3D_SWAP_EFFECT_FLIP_DISCARD: + return DXGI_SWAP_EFFECT_FLIP_DISCARD; + case WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL: + return DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL; + default: + FIXME("Invalid swap effect %#x.\n", swap_effect); + return DXGI_SWAP_EFFECT_DISCARD; + } +} + static inline struct d3d11_swapchain *d3d11_swapchain_from_IDXGISwapChain1(IDXGISwapChain1 *iface) { return CONTAINING_RECORD(iface, struct d3d11_swapchain, IDXGISwapChain1_iface); @@ -297,7 +315,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc(IDXGISwapChain1 *iface, wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); wined3d_mutex_unlock(); - FIXME("Ignoring ScanlineOrdering, Scaling and SwapEffect.\n"); + FIXME("Ignoring ScanlineOrdering and Scaling.\n"); desc->BufferDesc.Width = wined3d_desc.backbuffer_width; desc->BufferDesc.Height = wined3d_desc.backbuffer_height; @@ -312,7 +330,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc(IDXGISwapChain1 *iface, desc->BufferCount = wined3d_desc.backbuffer_count; desc->OutputWindow = wined3d_desc.device_window; desc->Windowed = wined3d_desc.windowed; - desc->SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + desc->SwapEffect = dxgi_swap_effect_from_wined3d(wined3d_desc.swap_effect); desc->Flags = dxgi_swapchain_flags_from_wined3d(wined3d_desc.flags); return S_OK; @@ -457,7 +475,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc1(IDXGISwapChain1 *iface wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); wined3d_mutex_unlock(); - FIXME("Ignoring Stereo, Scaling, SwapEffect and AlphaMode.\n"); + FIXME("Ignoring Stereo, Scaling and AlphaMode.\n"); desc->Width = wined3d_desc.backbuffer_width; desc->Height = wined3d_desc.backbuffer_height; @@ -468,7 +486,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc1(IDXGISwapChain1 *iface desc->BufferUsage = dxgi_usage_from_wined3d_usage(wined3d_desc.backbuffer_usage); desc->BufferCount = wined3d_desc.backbuffer_count; desc->Scaling = DXGI_SCALING_STRETCH; - desc->SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + desc->SwapEffect = dxgi_swap_effect_from_wined3d(wined3d_desc.swap_effect); desc->AlphaMode = DXGI_ALPHA_MODE_IGNORE; desc->Flags = dxgi_swapchain_flags_from_wined3d(wined3d_desc.flags); -- 2.16.4

2 1

[PATCH 2/3] d3d12/tests: Add test for DXGI_FORMAT_R10G10B10A2_UNORM swapchain.
by Józef Kucia 30 Aug '18

30 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 2e2e69be0adc..7b610c0c85a9 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -47,6 +47,7 @@ static unsigned int format_size(DXGI_FORMAT format) case DXGI_FORMAT_R8G8B8A8_UNORM: case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: case DXGI_FORMAT_B8G8R8A8_UNORM: + case DXGI_FORMAT_R10G10B10A2_UNORM: return 4; default: trace("Unhandled format %#x.\n", format); @@ -832,10 +833,12 @@ static void test_swapchain_draw(void) } tests[] = { - {DXGI_FORMAT_B8G8R8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xffff0000}, - {DXGI_FORMAT_B8G8R8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, - {DXGI_FORMAT_R8G8B8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xff0000ff}, - {DXGI_FORMAT_R8G8B8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {DXGI_FORMAT_B8G8R8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xffff0000}, + {DXGI_FORMAT_B8G8R8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {DXGI_FORMAT_R8G8B8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xff0000ff}, + {DXGI_FORMAT_R8G8B8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {DXGI_FORMAT_R10G10B10A2_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xc00003ff}, + {DXGI_FORMAT_R10G10B10A2_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xc00ffc00}, }; desc.no_pipeline = TRUE; -- 2.16.4

2 1

[PATCH v2] shell32/autocomplete: Revamp pwzsRegKeyPath handling so it can deal with arbitrary sizes and make it more robust
by Gabriel Ivăncescu 30 Aug '18

30 Aug '18

Handle heap_alloc failure, reg strings without a \ character at all, try harder to find the reg path (if only value fails the lookup), and read the registry value with any size. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Retrieve the registry value without failing in rare race conditions. dlls/shell32/autocomplete.c | 93 +++++++++++++++++++++++++++++---------------- 1 file changed, 61 insertions(+), 32 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 5fe48e9..99d5ae7 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -486,40 +486,69 @@ static HRESULT WINAPI IAutoComplete2_fnInit( if (This->options & ACO_AUTOSUGGEST) create_listbox(This); - if (pwzsRegKeyPath) { - WCHAR *key; - WCHAR result[MAX_PATH]; - WCHAR *value; - HKEY hKey = 0; - LONG res; - LONG len; - - /* pwszRegKeyPath contains the key as well as the value, so we split */ - key = heap_alloc((lstrlenW(pwzsRegKeyPath)+1)*sizeof(WCHAR)); - strcpyW(key, pwzsRegKeyPath); - value = strrchrW(key, '\\'); - *value = 0; - value++; - /* Now value contains the value and buffer the key */ - res = RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_READ, &hKey); - if (res != ERROR_SUCCESS) { - /* if the key is not found, MSDN states we must seek in HKEY_LOCAL_MACHINE */ - res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); - } - if (res == ERROR_SUCCESS) { - res = RegQueryValueW(hKey, value, result, &len); - if (res == ERROR_SUCCESS) { - This->quickComplete = heap_alloc(len*sizeof(WCHAR)); - strcpyW(This->quickComplete, result); - } - RegCloseKey(hKey); - } - heap_free(key); + if (pwzsRegKeyPath) + { + WCHAR *key, *value; + DWORD type, sz = MAX_PATH * sizeof(WCHAR); + BYTE *qc; + HKEY hKey; + LSTATUS res; + size_t len; + + /* pwszRegKeyPath contains the key as well as the value, so split it */ + value = strrchrW(pwzsRegKeyPath, '\\'); + len = value - pwzsRegKeyPath; + + if (value && (key = heap_alloc((len+1) * sizeof(*key))) != NULL) { + memcpy(key, pwzsRegKeyPath, len * sizeof(*key)); + key[len] = '\0'; + value++; + + res = RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_READ, &hKey); + + /* if not found, MSDN states we must seek in HKEY_LOCAL_MACHINE */ + if (res != ERROR_SUCCESS) + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); + + if (res == ERROR_SUCCESS && (qc = heap_alloc(sz)) != NULL) { + res = RegQueryValueExW(hKey, value, NULL, &type, qc, &sz); + + if ((res != ERROR_SUCCESS && res != ERROR_MORE_DATA) || type != REG_SZ) + { + RegCloseKey(hKey); + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); + if (res != ERROR_SUCCESS) { + heap_free(qc); + goto free_key_str; + } + sz = MAX_PATH * sizeof(WCHAR); + res = RegQueryValueExW(hKey, value, NULL, &type, qc, &sz); + } + + for (;;) { + if (res == ERROR_SUCCESS && type == REG_SZ) { + This->quickComplete = heap_realloc(qc, sz); + break; + } + heap_free(qc); + if (res != ERROR_MORE_DATA || type != REG_SZ) + break; + if ((qc = heap_alloc(sz)) == NULL) + break; + res = RegQueryValueExW(hKey, value, NULL, &type, qc, &sz); + } + RegCloseKey(hKey); + } + free_key_str: + heap_free(key); + } } - if ((pwszQuickComplete) && (!This->quickComplete)) { - This->quickComplete = heap_alloc((lstrlenW(pwszQuickComplete)+1)*sizeof(WCHAR)); - lstrcpyW(This->quickComplete, pwszQuickComplete); + if (!This->quickComplete && pwszQuickComplete) + { + size_t len = strlenW(pwszQuickComplete)+1; + if ((This->quickComplete = heap_alloc(len * sizeof(WCHAR))) != NULL) + memcpy(This->quickComplete, pwszQuickComplete, len * sizeof(WCHAR)); } return S_OK; -- 1.9.1

1 0

[PATCH 1/3] shell32/autocomplete: Don't crash when there's another AutoComplete object on the same edit control
by Gabriel Ivăncescu 30 Aug '18

30 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22333 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/autocomplete.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 99ce23d..5fe48e9 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -93,6 +93,14 @@ static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDr return CONTAINING_RECORD(iface, IAutoCompleteImpl, IAutoCompleteDropDown_iface); } +static void destroy_autocomplete_object(IAutoCompleteImpl *ac) +{ + ac->hwndEdit = NULL; + if (ac->hwndListBox) + DestroyWindow(ac->hwndListBox); + IAutoComplete2_Release(&ac->IAutoComplete2_iface); +} + /* Window procedure for autocompletion */ @@ -276,10 +284,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, RemovePropW(hwnd, autocomplete_propertyW); SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)proc); - This->hwndEdit = NULL; - if (This->hwndListBox) - DestroyWindow(This->hwndListBox); - IAutoComplete2_Release(&This->IAutoComplete2_iface); + destroy_autocomplete_object(This); return CallWindowProcW(proc, hwnd, uMsg, wParam, lParam); } default: @@ -434,7 +439,7 @@ static HRESULT WINAPI IAutoComplete2_fnInit( LPCOLESTR pwzsRegKeyPath, LPCOLESTR pwszQuickComplete) { - IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); + IAutoCompleteImpl *Other, *This = impl_from_IAutoComplete2(iface); TRACE("(%p)->(%p, %p, %s, %s)\n", This, hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete)); @@ -461,10 +466,22 @@ static HRESULT WINAPI IAutoComplete2_fnInit( This->initialized = TRUE; This->hwndEdit = hwndEdit; - This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW( hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); - /* Keep at least one reference to the object until the edit window is destroyed. */ + + /* If another AutoComplete object was previously assigned to this edit control, + release it but keep the same callback on the control, to avoid an infinite + recursive loop in ACEditSubclassProc while the property is set to this object */ + Other = GetPropW(hwndEdit, autocomplete_propertyW); + SetPropW(hwndEdit, autocomplete_propertyW, This); + + if (Other && Other->initialized) { + This->wpOrigEditProc = Other->wpOrigEditProc; + destroy_autocomplete_object(Other); + } + else + This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); + + /* Keep at least one reference to the object until the edit window is destroyed */ IAutoComplete2_AddRef(&This->IAutoComplete2_iface); - SetPropW( hwndEdit, autocomplete_propertyW, This ); if (This->options & ACO_AUTOSUGGEST) create_listbox(This); -- 1.9.1

2 7

[v2 PATCH 1/2] include: Add IOpcFactory and related definitions.
by Nikolay Sivov 30 Aug '18

30 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed up includes in main idl. include/Makefile.in | 4 ++ include/msopc.idl | 89 ++++++++++++++++++++++++++++++++++++++ include/opcbase.idl | 28 ++++++++++++ include/opcobjectmodel.idl | 34 +++++++++++++++ include/opcparturi.idl | 71 ++++++++++++++++++++++++++++++ 5 files changed, 226 insertions(+) create mode 100644 include/msopc.idl create mode 100644 include/opcbase.idl create mode 100644 include/opcobjectmodel.idl create mode 100644 include/opcparturi.idl diff --git a/include/Makefile.in b/include/Makefile.in index a89fef6eac..ffecb98d9e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -399,6 +399,7 @@ SOURCES = \ msident.idl \ msinkaut.idl \ msiquery.h \ + msopc.idl \ mssip.h \ msstkppg.h \ mstask.idl \ @@ -493,6 +494,9 @@ SOURCES = \ oledberr.h \ oledlg.h \ oleidl.idl \ + opcbase.idl \ + opcobjectmodel.idl \ + opcparturi.idl \ opnrst.idl \ optary.idl \ patchapi.h \ diff --git a/include/msopc.idl b/include/msopc.idl new file mode 100644 index 0000000000..12404e5a12 --- /dev/null +++ b/include/msopc.idl @@ -0,0 +1,89 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +import "unknwn.idl"; +import "ocidl.idl"; + +#include "opcbase.idl" +#include "opcobjectmodel.idl" +#include "opcparturi.idl" + +#ifndef __WIDL__ +#define threading(model) +#endif + +interface IOpcUri; +interface IOpcPartUri; +interface IOpcPackage; +interface IOpcDigitalSignatureManager; + +[ + object, + uuid(6d0b4446-cd73-4ab3-94f4-8ccdf6116154), + pointer_default(ref) +] +interface IOpcFactory : IUnknown +{ + HRESULT CreatePackageRootUri( + [out, retval] IOpcUri **uri + ); + + HRESULT CreatePartUri( + [in, string] LPCWSTR uri, + [out, retval] IOpcPartUri **part_uri + ); + + [local] + HRESULT CreateStreamOnFile( + [in, string] LPCWSTR filename, + [in] OPC_STREAM_IO_MODE io_mode, + [in, unique] SECURITY_ATTRIBUTES *sa, + [in] DWORD flags, + [out, retval] IStream **stream + ); + + HRESULT CreatePackage( + [out, retval] IOpcPackage **package + ); + + HRESULT ReadPackageFromStream( + [in] IStream *stream, + [in] OPC_READ_FLAGS flags, + [out, retval] IOpcPackage **package + ); + + HRESULT WritePackageToStream( + [in] IOpcPackage *package, + [in] OPC_WRITE_FLAGS flags, + [in] IStream *stream + ); + + HRESULT CreateDigitalSignatureManager( + [in] IOpcPackage *package, + [out, retval] IOpcDigitalSignatureManager **signature_manager + ); +} + +[ + threading(both), + uuid(6b2d6Ba0-9f3e-4f27-920b-313cc426a39e) +] +coclass OpcFactory +{ + interface IOpcFactory; +}; diff --git a/include/opcbase.idl b/include/opcbase.idl new file mode 100644 index 0000000000..2cfb885c12 --- /dev/null +++ b/include/opcbase.idl @@ -0,0 +1,28 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#if 0 +#pragma makedep install +#endif + +typedef [v1_enum] enum +{ + OPC_STREAM_IO_READ = 1, + OPC_STREAM_IO_WRITE = 2, +} OPC_STREAM_IO_MODE; + diff --git a/include/opcobjectmodel.idl b/include/opcobjectmodel.idl new file mode 100644 index 0000000000..e5370d2e54 --- /dev/null +++ b/include/opcobjectmodel.idl @@ -0,0 +1,34 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#if 0 +#pragma makedep install +#endif + +typedef [v1_enum] enum +{ + OPC_READ_DEFAULT = 0, + OPC_VALIDATE_ON_LOAD = 1, + OPC_CACHE_ON_ACCESS = 2, +} OPC_READ_FLAGS; + +typedef [v1_enum] enum +{ + OPC_WRITE_DEFAULT = 0, + OPC_WRITE_FORCE_ZIP32 = 1, +} OPC_WRITE_FLAGS; diff --git a/include/opcparturi.idl b/include/opcparturi.idl new file mode 100644 index 0000000000..00b21b9598 --- /dev/null +++ b/include/opcparturi.idl @@ -0,0 +1,71 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +import "unknwn.idl"; +import "ocidl.idl"; + +#if 0 +#pragma makedep install +#endif + +interface IOpcPartUri; + +[ + object, + uuid(bc9c1b9b-d62c-49eb-aef0-3b4e0b28ebed), + nonextensible, + pointer_default(ref) +] +interface IOpcUri : IUri +{ + HRESULT GetRelationshipsPartUri( + [out, retval] IOpcPartUri **part_uri + ); + + HRESULT GetRelativeUri( + [in] IOpcPartUri *part_uri, + [out, retval] IUri **relative_uri + ); + + HRESULT CombinePartUri( + [in] IUri *relative_uri, + [out, retval] IOpcPartUri **combined + ); +} + +[ + object, + uuid(7d3babe7-88b2-46ba-85cb-4203cb016c87), + nonextensible, + pointer_default(ref) +] +interface IOpcPartUri : IOpcUri +{ + HRESULT ComparePartUri( + [in] IOpcPartUri *part_uri, + [out, retval] INT32 *result + ); + + HRESULT GetSourceUri( + [out, retval] IOpcUri **source_uri + ); + + HRESULT IsRelationshipsPartUri( + [out, retval] BOOL *result + ); +} -- 2.18.0

1 1

[PATCH 4/4] winevulkan: Free all command buffers when vkAllocateCommandBuffers() fails.
by Józef Kucia 30 Aug '18

30 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index f500602e96d5..4e0d999ddb41 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -540,25 +540,24 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, buffers[i]->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; buffers[i]->device = device; + list_add_tail(&pool->command_buffers, &buffers[i]->pool_link); res = device->funcs.p_vkAllocateCommandBuffers(device->device, &allocate_info_host, &buffers[i]->command_buffer); if (res != VK_SUCCESS) { ERR("Failed to allocate command buffer, res=%d.\n", res); + buffers[i]->command_buffer = VK_NULL_HANDLE; break; } - - list_add_tail(&pool->command_buffers, &buffers[i]->pool_link); } if (res != VK_SUCCESS) { - wine_vk_free_command_buffers(device, pool, i, buffers); + wine_vk_free_command_buffers(device, pool, i + 1, buffers); memset(buffers, 0, allocate_info->commandBufferCount * sizeof(*buffers)); - return res; } - return VK_SUCCESS; + return res; } void WINAPI wine_vkCmdExecuteCommands(VkCommandBuffer buffer, uint32_t count, -- 2.16.4

1 0

[PATCH 3/4] vulkan-1/tests: Add a test for destroying a command pool.
by Józef Kucia 30 Aug '18

30 Aug '18

The Vulkan spec says: "When a pool is destroyed, all command buffers allocated from the pool are implicitly freed and become invalid. Command buffers allocated from a given pool do not need to be freed before destroying that command pool." Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/vulkan-1/tests/vulkan.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 1d2f66f5f901..20a245238b02 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -232,6 +232,45 @@ static void test_physical_device_groups(void) vkDestroyInstance(vk_instance, NULL); } +static void test_destroy_command_pool(VkPhysicalDevice vk_physical_device) +{ + VkCommandBufferAllocateInfo allocate_info; + VkCommandPoolCreateInfo pool_info; + VkCommandBuffer vk_cmd_buffers[4]; + uint32_t queue_family_index; + VkCommandPool vk_cmd_pool; + VkDevice vk_device; + VkResult vr; + + if ((vr = create_device(vk_physical_device, 0, NULL, NULL, &vk_device)) < 0) + { + skip("Failed to create device, vr %d.\n", vr); + return; + } + + find_queue_family(vk_physical_device, VK_QUEUE_GRAPHICS_BIT, &queue_family_index); + + pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; + pool_info.pNext = NULL; + pool_info.flags = 0; + pool_info.queueFamilyIndex = queue_family_index; + vr = vkCreateCommandPool(vk_device, &pool_info, NULL, &vk_cmd_pool); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + allocate_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; + allocate_info.pNext = NULL; + allocate_info.commandPool = vk_cmd_pool; + allocate_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; + allocate_info.commandBufferCount = ARRAY_SIZE(vk_cmd_buffers); + vr = vkAllocateCommandBuffers(vk_device, &allocate_info, vk_cmd_buffers); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + vkDestroyCommandPool(vk_device, vk_cmd_pool, NULL); + vkDestroyCommandPool(vk_device, VK_NULL_HANDLE, NULL); + + vkDestroyDevice(vk_device, NULL); +} + static void for_each_device(void (*test_func)(VkPhysicalDevice)) { VkPhysicalDevice *vk_physical_devices; @@ -272,4 +311,5 @@ START_TEST(vulkan) for_each_device(enumerate_physical_device); for_each_device(enumerate_device_queues); test_physical_device_groups(); + for_each_device(test_destroy_command_pool); } -- 2.16.4

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