wine-commits September 2017

wine-commits@winehq.org

2 participants
446 discussions

Matteo Bruni : wined3d: Accept creation flags for 3D textures.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: e4365e5ba32773282ecd0c9a65f0f53720cc29f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4365e5ba32773282ecd0c9a6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 20 19:53:42 2017 +0200 wined3d: Accept creation flags for 3D textures. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 230f94c..ef8545d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2547,7 +2547,7 @@ static const struct wined3d_texture_ops texture3d_ops = }; static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, - UINT layer_count, UINT level_count, struct wined3d_device *device, void *parent, + UINT layer_count, UINT level_count, DWORD flags, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops) { struct wined3d_device_parent *device_parent = device->device_parent; @@ -2627,7 +2627,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct } if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, level_count, desc, - 0, device, parent, parent_ops, &texture_resource_ops))) + flags, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; @@ -2967,7 +2967,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct break; case WINED3D_RTYPE_TEXTURE_3D: - hr = volumetexture_init(object, desc, layer_count, level_count, device, parent, parent_ops); + hr = volumetexture_init(object, desc, layer_count, level_count, flags, device, parent, parent_ops); break; default:

1 0

Ihsan Akmal : dxgiformat.h: Add missing DXGI_FORMAT enums.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 7babc38c235aeecbc56b2db2992bd99b2fac183f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7babc38c235aeecbc56b2db29… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Wed Sep 20 18:43:33 2017 +0800 dxgiformat.h: Add missing DXGI_FORMAT enums. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgiformat.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/dxgiformat.h b/include/dxgiformat.h index 6bb9d00..4c315cb 100644 --- a/include/dxgiformat.h +++ b/include/dxgiformat.h @@ -138,6 +138,9 @@ typedef enum DXGI_FORMAT { DXGI_FORMAT_P8 = 113, DXGI_FORMAT_A8P8 = 114, DXGI_FORMAT_B4G4R4A4_UNORM = 115, + DXGI_FORMAT_P208 = 130, + DXGI_FORMAT_V208 = 131, + DXGI_FORMAT_V408 = 132, DXGI_FORMAT_FORCE_UINT = 0xffffffff } DXGI_FORMAT;

1 0

Alexandre Julliard : ws2_32/tests: Add some tests for write watches.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 1c72e594e32714d12f086714d6d0b37c188e50dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c72e594e32714d12f086714d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 21 19:41:17 2017 +0200 ws2_32/tests: Add some tests for write watches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 195 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 897839a..02f7473 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6849,6 +6849,200 @@ end: WSACloseEvent(event); } +struct write_watch_thread_args +{ + int func; + SOCKET dest; + void *base; + DWORD size; + const char *expect; +}; + +static DWORD CALLBACK write_watch_thread( void *arg ) +{ + struct write_watch_thread_args *args = arg; + struct sockaddr addr; + int addr_len, ret; + DWORD bytes, flags = 0; + WSABUF buf[1]; + + switch (args->func) + { + case 0: + ret = recv( args->dest, args->base, args->size, 0 ); + ok( ret == strlen(args->expect) + 1, "wrong len %d\n", ret ); + ok( !strcmp( args->base, args->expect ), "wrong data\n" ); + break; + case 1: + ret = recvfrom( args->dest, args->base, args->size, 0, &addr, &addr_len ); + ok( ret == strlen(args->expect) + 1, "wrong len %d\n", ret ); + ok( !strcmp( args->base, args->expect ), "wrong data\n" ); + break; + case 2: + buf[0].len = args->size; + buf[0].buf = args->base; + ret = WSARecv( args->dest, buf, 1, &bytes, &flags, NULL, NULL ); + ok( !ret, "WSARecv failed %u\n", GetLastError() ); + ok( bytes == strlen(args->expect) + 1, "wrong len %d\n", bytes ); + ok( !strcmp( args->base, args->expect ), "wrong data\n" ); + break; + case 3: + buf[0].len = args->size; + buf[0].buf = args->base; + ret = WSARecvFrom( args->dest, buf, 1, &bytes, &flags, &addr, &addr_len, NULL, NULL ); + ok( !ret, "WSARecvFrom failed %u\n", GetLastError() ); + ok( bytes == strlen(args->expect) + 1, "wrong len %d\n", bytes ); + ok( !strcmp( args->base, args->expect ), "wrong data\n" ); + break; + } + return 0; +} + +static void test_write_watch(void) +{ + SOCKET src, dest; + WSABUF bufs[2]; + WSAOVERLAPPED ov; + struct write_watch_thread_args args; + DWORD bytesReturned, flags, size; + struct sockaddr addr; + int addr_len, ret; + HANDLE thread, event; + char *base; + void *results[64]; + ULONG_PTR count; + ULONG pagesize; + UINT (WINAPI *pGetWriteWatch)(DWORD,LPVOID,SIZE_T,LPVOID*,ULONG_PTR*,ULONG*); + + pGetWriteWatch = (void *)GetProcAddress( GetModuleHandleA("kernel32.dll"), "GetWriteWatch" ); + if (!pGetWriteWatch) + { + win_skip( "write watched not supported\n" ); + return; + } + + tcp_socketpair(&src, &dest); + if (src == INVALID_SOCKET || dest == INVALID_SOCKET) + { + skip("failed to create sockets\n"); + return; + } + + memset(&ov, 0, sizeof(ov)); + ov.hEvent = event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(ov.hEvent != NULL, "could not create event object, errno = %d\n", GetLastError()); + + flags = 0; + + size = 0x10000; + base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_COMMIT | MEM_WRITE_WATCH, PAGE_READWRITE ); + ok( base != NULL, "VirtualAlloc failed %u\n", GetLastError() ); + + memset( base, 0, size ); + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 16, "wrong count %lu\n", count ); + + bufs[0].len = 5; + bufs[0].buf = base; + bufs[1].len = 0x8000; + bufs[1].buf = base + 0x4000; + + ret = WSARecv( dest, bufs, 2, NULL, &flags, &ov, NULL); + ok(ret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, + "WSARecv failed - %d error %d\n", ret, GetLastError()); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 9, "wrong count %lu\n", count ); + ok( !base[0], "data set\n" ); + + send(src, "test message", sizeof("test message"), 0); + + ret = GetOverlappedResult( (HANDLE)dest, &ov, &bytesReturned, TRUE ); + todo_wine + { + ok( ret, "GetOverlappedResult failed %u\n", GetLastError() ); + ok( bytesReturned == sizeof("test message"), "wrong size %u\n", bytesReturned ); + ok( !memcmp( base, "test ", 5 ), "wrong data %s\n", base ); + ok( !memcmp( base + 0x4000, "message", 8 ), "wrong data %s\n", base + 0x4000 ); + } + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 0, "wrong count %lu\n", count ); + + memset( base, 0, size ); + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 16, "wrong count %lu\n", count ); + + bufs[1].len = 0x4000; + bufs[1].buf = base + 0x2000; + ret = WSARecvFrom( dest, bufs, 2, NULL, &flags, &addr, &addr_len, &ov, NULL); + todo_wine + ok(ret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, + "WSARecv failed - %d error %d\n", ret, GetLastError()); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 5, "wrong count %lu\n", count ); + todo_wine + ok( !base[0], "data set\n" ); + + send(src, "test message", sizeof("test message"), 0); + + ret = GetOverlappedResult( (HANDLE)dest, &ov, &bytesReturned, TRUE ); + ok( ret, "GetOverlappedResult failed %u\n", GetLastError() ); + ok( bytesReturned == sizeof("test message"), "wrong size %u\n", bytesReturned ); + ok( !memcmp( base, "test ", 5 ), "wrong data %s\n", base ); + ok( !memcmp( base + 0x2000, "message", 8 ), "wrong data %s\n", base + 0x2000 ); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 0, "wrong count %lu\n", count ); + + memset( base, 0, size ); + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 16, "wrong count %lu\n", count ); + + args.dest = dest; + args.base = base; + args.size = 0x7002; + args.expect = "test message"; + for (args.func = 0; args.func < 4; args.func++) + { + thread = CreateThread( NULL, 0, write_watch_thread, &args, 0, NULL ); + Sleep( 200 ); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 8, "wrong count %lu\n", count ); + + send(src, "test message", sizeof("test message"), 0); + WaitForSingleObject( thread, 10000 ); + CloseHandle( thread ); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 0, "wrong count %lu\n", count ); + } + WSACloseEvent( event ); + closesocket( dest ); + closesocket( src ); + VirtualFree( base, 0, MEM_FREE ); +} + #define POLL_CLEAR() ix = 0 #define POLL_SET(s, ev) {fds[ix].fd = s; fds[ix++].events = ev;} #define POLL_ISSET(s, rev) poll_isset(fds, ix, s, rev) @@ -10662,6 +10856,7 @@ START_TEST( sock ) test_WSASendTo(); test_WSARecv(); test_WSAPoll(); + test_write_watch(); test_events(0); test_events(1);

1 0

Alexandre Julliard : kernel32/tests: Add some more tests for write watches.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 2b0725f95a2c77074743fdeb74f45f28c01128db URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b0725f95a2c77074743fdeb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 21 19:50:09 2017 +0200 kernel32/tests: Add some more tests for write watches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 206 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 169 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b0725f95a2c77074743f…

1 0

Hugh Bellamy : gdiplus: Add GdipCreateLineBrushFromRectWithAngle tests.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: b8f56c0b8641706c003fc84106243fb759283939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f56c0b8641706c003fc8410… Author: Hugh Bellamy <hughbellars(a)gmail.com> Date: Wed Sep 20 17:42:31 2017 +0100 gdiplus: Add GdipCreateLineBrushFromRectWithAngle tests. Signed-off-by: Hugh Bellamy <hughbellars(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 5 +++- dlls/gdiplus/tests/brush.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index d5cd94a..26e3419 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -481,9 +481,12 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect TRACE("(%p, %x, %x, %.2f, %d, %d, %p)\n", rect, startcolor, endcolor, angle, isAngleScalable, wrap, line); - if (!rect || !rect->Width || !rect->Height) + if (!rect || !line || wrap == WrapModeClamp) return InvalidParameter; + if (!rect->Width || !rect->Height) + return OutOfMemory; + angle = fmodf(angle, 360); if (angle < 0) angle += 360; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 45b2710..9be500d 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -72,6 +72,68 @@ static void test_createHatchBrush(void) expect(InvalidParameter, status); } +static void test_createLineBrushFromRectWithAngle(void) +{ + GpStatus status; + GpLineGradient *brush; + GpRectF rect1 = { 1, 3, 1, 2 }; + GpRectF rect2 = { 1, 3, -1, -2 }; + GpRectF rect3 = { 1, 3, 0, 1 }; + GpRectF rect4 = { 1, 3, 1, 0 }; + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 0, TRUE, WrapModeTile, &brush); + expect(Ok, status); + GdipDeleteBrush((GpBrush *) brush); + + status = GdipCreateLineBrushFromRectWithAngle(&rect2, 10, 11, 135, TRUE, (WrapMode)(WrapModeTile - 1), &brush); + expect(Ok, status); + GdipDeleteBrush((GpBrush *) brush); + + status = GdipCreateLineBrushFromRectWithAngle(&rect2, 10, 11, -225, FALSE, (WrapMode)(WrapModeTile - 1), &brush); + expect(Ok, status); + GdipDeleteBrush((GpBrush *) brush); + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 405, TRUE, (WrapMode)(WrapModeClamp + 1), &brush); + expect(Ok, status); + GdipDeleteBrush((GpBrush *) brush); + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 45, FALSE, (WrapMode)(WrapModeClamp + 1), &brush); + expect(Ok, status); + GdipDeleteBrush((GpBrush *) brush); + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 90, TRUE, WrapModeTileFlipX, &brush); + expect(Ok, status); + + status = GdipCreateLineBrushFromRectWithAngle(NULL, 10, 11, 90, TRUE, WrapModeTile, &brush); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect3, 10, 11, 90, TRUE, WrapModeTileFlipXY, &brush); + expect(OutOfMemory, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect4, 10, 11, 90, TRUE, WrapModeTileFlipXY, &brush); + expect(OutOfMemory, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect3, 10, 11, 90, TRUE, WrapModeTileFlipXY, NULL); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect4, 10, 11, 90, TRUE, WrapModeTileFlipXY, NULL); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect3, 10, 11, 90, TRUE, WrapModeClamp, &brush); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect4, 10, 11, 90, TRUE, WrapModeClamp, &brush); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 90, TRUE, WrapModeClamp, &brush); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 90, TRUE, WrapModeTile, NULL); + expect(InvalidParameter, status); + + GdipDeleteBrush((GpBrush *) brush); +} + static void test_type(void) { GpStatus status; @@ -1612,6 +1674,7 @@ START_TEST(brush) test_constructor_destructor(); test_createHatchBrush(); + test_createLineBrushFromRectWithAngle(); test_type(); test_gradientblendcount(); test_getblend();

1 0

Nikolay Sivov : dwrite: Added custom IDWriteFontFallback stub.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: c3252c37743eb813d2cc928fd3f57d00ebdfa28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3252c37743eb813d2cc928fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 21 14:41:25 2017 +0300 dwrite: Added custom IDWriteFontFallback stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 64 +++++++++++++++++++++++++++++++++++++++++++--- dlls/dwrite/tests/layout.c | 57 ++++++++++++++++++++++++++--------------- 2 files changed, 98 insertions(+), 23 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 23c2c0e..db488a0 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -209,6 +209,7 @@ static const struct fallback_mapping fontfallback_neutral_data[] = { struct dwrite_fontfallback { IDWriteFontFallback IDWriteFontFallback_iface; + LONG ref; IDWriteFactory5 *factory; IDWriteFontCollection1 *systemcollection; const struct fallback_mapping *mappings; @@ -2178,6 +2179,50 @@ void release_system_fontfallback(IDWriteFontFallback *iface) heap_free(fallback); } +static ULONG WINAPI customfontfallback_AddRef(IDWriteFontFallback *iface) +{ + struct dwrite_fontfallback *fallback = impl_from_IDWriteFontFallback(iface); + ULONG ref = InterlockedIncrement(&fallback->ref); + TRACE("(%p)->(%d)\n", fallback, ref); + return ref; +} + +static ULONG WINAPI customfontfallback_Release(IDWriteFontFallback *iface) +{ + struct dwrite_fontfallback *fallback = impl_from_IDWriteFontFallback(iface); + ULONG ref = InterlockedDecrement(&fallback->ref); + + TRACE("(%p)->(%d)\n", fallback, ref); + + if (!ref) { + IDWriteFactory5_Release(fallback->factory); + heap_free(fallback); + } + + return ref; +} + +static HRESULT WINAPI customfontfallback_MapCharacters(IDWriteFontFallback *iface, IDWriteTextAnalysisSource *source, + UINT32 position, UINT32 length, IDWriteFontCollection *basecollection, const WCHAR *basefamily, + DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, UINT32 *mapped_length, + IDWriteFont **ret_font, FLOAT *scale) +{ + struct dwrite_fontfallback *fallback = impl_from_IDWriteFontFallback(iface); + + FIXME("(%p)->(%p %u %u %p, %s, %u, %u, %u, %p, %p, %p)\n", fallback, source, position, length, + basecollection, debugstr_w(basefamily), weight, style, stretch, mapped_length, ret_font, scale); + + return E_NOTIMPL; +} + +static const IDWriteFontFallbackVtbl customfontfallbackvtbl = +{ + fontfallback_QueryInterface, + customfontfallback_AddRef, + customfontfallback_Release, + customfontfallback_MapCharacters, +}; + static HRESULT WINAPI fontfallbackbuilder_QueryInterface(IDWriteFontFallbackBuilder *iface, REFIID riid, void **obj) { struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); @@ -2239,13 +2284,26 @@ static HRESULT WINAPI fontfallbackbuilder_AddMappings(IDWriteFontFallbackBuilder } static HRESULT WINAPI fontfallbackbuilder_CreateFontFallback(IDWriteFontFallbackBuilder *iface, - IDWriteFontFallback **fallback) + IDWriteFontFallback **ret) { struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); + struct dwrite_fontfallback *fallback; - FIXME("(%p)->(%p): stub\n", fallbackbuilder, fallback); + FIXME("(%p)->(%p): stub\n", fallbackbuilder, ret); - return E_NOTIMPL; + *ret = NULL; + + fallback = heap_alloc(sizeof(*fallback)); + if (!fallback) + return E_OUTOFMEMORY; + + fallback->IDWriteFontFallback_iface.lpVtbl = &customfontfallbackvtbl; + fallback->ref = 1; + fallback->factory = fallbackbuilder->factory; + IDWriteFactory5_AddRef(fallback->factory); + + *ret = &fallback->IDWriteFontFallback_iface; + return S_OK; } static const IDWriteFontFallbackBuilderVtbl fontfallbackbuildervtbl = diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index d606b8e..ba3e852 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4655,8 +4655,8 @@ static void test_FontFallbackBuilder(void) { static const WCHAR localeW[] = {'l','o','c','a','l','e',0}; static const WCHAR strW[] = {'A',0}; + IDWriteFontFallback *fallback, *fallback2; IDWriteFontFallbackBuilder *builder; - IDWriteFontFallback *fallback; DWRITE_UNICODE_RANGE range; IDWriteFactory2 *factory2; IDWriteFactory *factory; @@ -4684,10 +4684,27 @@ static void test_FontFallbackBuilder(void) } fallback = NULL; + EXPECT_REF(factory2, 2); + EXPECT_REF(builder, 1); hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(factory2, 3); + EXPECT_REF(fallback, 1); + EXPECT_REF(builder, 1); + + IDWriteFontFallback_AddRef(fallback); + EXPECT_REF(builder, 1); + EXPECT_REF(fallback, 2); + EXPECT_REF(factory2, 3); + IDWriteFontFallback_Release(fallback); + /* New instance is created every time, even if mappings have not changed. */ + hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback2); + ok(hr == S_OK, "Failed to create fallback object, hr %#x.\n", hr); + ok(fallback != fallback2, "Unexpected fallback instance.\n"); + IDWriteFontFallback_Release(fallback2); + +todo_wine { hr = IDWriteFontFallbackBuilder_AddMapping(builder, NULL, 0, NULL, 0, NULL, NULL, NULL, 0.0f); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -4724,17 +4741,14 @@ todo_wine { hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, NULL, NULL, NULL, 4.0f); ok(hr == S_OK, "got 0x%08x\n", hr); } - if (fallback) - IDWriteFontFallback_Release(fallback); + IDWriteFontFallback_Release(fallback); if (0) /* crashes on native */ hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, NULL); hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { /* fallback font missing from system collection */ g_source = strW; mappedlength = 0; @@ -4742,13 +4756,14 @@ if (hr == S_OK) { font = (void*)0xdeadbeef; hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); +todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 1.0f, "got %f\n", scale); ok(font == NULL, "got %p\n", font); - - IDWriteFontFallback_Release(fallback); } + IDWriteFontFallback_Release(fallback); + /* remap with custom collection */ range.first = range.last = 'A'; hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, &fallbackcollection, NULL, NULL, 5.0f); @@ -4756,24 +4771,25 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { g_source = strW; mappedlength = 0; scale = 0.0f; font = NULL; hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); +todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 5.0f, "got %f\n", scale); ok(font != NULL, "got %p\n", font); - IDWriteFont_Release(font); +} + if (font) + IDWriteFont_Release(font); IDWriteFontFallback_Release(fallback); -} + range.first = 'B'; range.last = 'A'; hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, &fallbackcollection, NULL, NULL, 6.0f); @@ -4781,24 +4797,25 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { g_source = strW; mappedlength = 0; scale = 0.0f; font = NULL; hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); +todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 5.0f, "got %f\n", scale); ok(font != NULL, "got %p\n", font); - IDWriteFont_Release(font); +} + if (font) + IDWriteFont_Release(font); IDWriteFontFallback_Release(fallback); -} + /* explicit locale */ range.first = 'A'; range.last = 'B'; @@ -4807,24 +4824,24 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { g_source = strW; mappedlength = 0; scale = 0.0f; font = NULL; hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); +todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 5.0f, "got %f\n", scale); ok(font != NULL, "got %p\n", font); - IDWriteFont_Release(font); +} + if (font) + IDWriteFont_Release(font); IDWriteFontFallback_Release(fallback); -} IDWriteFontFallbackBuilder_Release(builder); ref = IDWriteFactory2_Release(factory2);

1 0

Hans Leidekker : webservices: Implement WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING in the reader.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: ca13227ebc7deb00c39f74f4b133fae4d5db3540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca13227ebc7deb00c39f74f4b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:17 2017 +0200 webservices: Implement WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 128 +++++++++++++++++----------------- dlls/webservices/tests/reader.c | 148 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 214 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca13227ebc7deb00c39f7…

1 0

Hans Leidekker : webservices: Support more text types in is_empty_text_node.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 04ae90993a95515f38a827acf786ccca040eeab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ae90993a95515f38a827acf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:16 2017 +0200 webservices: Support more text types in is_empty_text_node. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 953af4c..c2dbdb0 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -5911,6 +5911,18 @@ static BOOL is_empty_text_node( const struct node *node ) const WS_XML_BASE64_TEXT *base64 = (const WS_XML_BASE64_TEXT *)text->text; return !base64->length; } + case WS_XML_TEXT_TYPE_BOOL: + case WS_XML_TEXT_TYPE_INT32: + case WS_XML_TEXT_TYPE_INT64: + case WS_XML_TEXT_TYPE_UINT64: + case WS_XML_TEXT_TYPE_FLOAT: + case WS_XML_TEXT_TYPE_DOUBLE: + case WS_XML_TEXT_TYPE_DECIMAL: + case WS_XML_TEXT_TYPE_GUID: + case WS_XML_TEXT_TYPE_UNIQUE_ID: + case WS_XML_TEXT_TYPE_DATETIME: + return FALSE; + default: ERR( "unhandled text type %u\n", text->text->textType ); return FALSE;

1 0

Hans Leidekker : webservices/tests: Add tests for asynchronous WsReceiveMessage.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 71121270ae3a5cf47f78ded0f0d23c630151da10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71121270ae3a5cf47f78ded0f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:15 2017 +0200 webservices/tests: Add tests for asynchronous WsReceiveMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/channel.c | 236 ++++++++++++++++++++++++++++++++------- 1 file changed, 193 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71121270ae3a5cf47f78d…

1 0

Hans Leidekker : webservices: Add asynchronous support for WsReceiveMessage.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 97ccfe20784f88cd38284e230861c71a7c09f116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ccfe20784f88cd38284e230… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:14 2017 +0200 webservices: Add asynchronous support for WsReceiveMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 259 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 230 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97ccfe20784f88cd38284…

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
45
Older →

Jump to page:

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-commits September 2017