April 2016 - Wine-commits - list.winehq.org

Francois Gouget : urlmon/tests: Fix a spelling error in a uri comment.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 9cd57841049f06a43a68ed4fbef8055894bf29ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd57841049f06a43a68ed4fb… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 22 00:37:41 2016 +0200 urlmon/tests: Fix a spelling error in a uri comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 464fb07..5f98d4e 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5768,7 +5768,7 @@ static const uri_builder_test uri_builder_tests[] = { 0,INET_E_INVALID_URL,FALSE, 0,0,0,INET_E_INVALID_URL,FALSE }, - /* UserName can't contain any character that is a delimeter for another + /* UserName can't contain any character that is a delimiter for another * component that appears after it in a normal URI. */ { "http://google.com/",0,S_OK,FALSE,

1 0

Francois Gouget : shell32/tests: Fix a spelling error in a shellpath comment.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 5d885360f4721d19272674ec6ca3efe5be50dbab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d885360f4721d19272674ec6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 22 00:38:00 2016 +0200 shell32/tests: Fix a spelling error in a shellpath comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 6b5ed76..2125092 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2278,7 +2278,7 @@ static void test_knownFolders(void) /* remove newly created directory */ RemoveDirectoryW(sSubFolder2Path); - /* verify sub folder. It still succeedes, so Windows does not check folder presence each time */ + /* verify subfolder. It still succeeds, so Windows does not check folder presence each time */ hr = IKnownFolder_GetPath(subFolder, 0, &folderPath); todo_wine ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr);

1 0

Francois Gouget : shell32/tests: A spelling fix for an shlfolder ok() message.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 9638ddd62c2298a2db71b24841f65f86e65218ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9638ddd62c2298a2db71b2484… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 22 00:38:28 2016 +0200 shell32/tests: A spelling fix for an shlfolder ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index da903b0..e80e8a4 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1142,7 +1142,7 @@ static void test_GetAttributesOf(void) todo_wine ok (hr == E_INVALIDARG || broken(hr == S_OK), /* W2K and earlier */ - "MyComputer->GetAttributesOf(emtpy pidl) should fail! hr = %08x\n", hr); + "MyComputer->GetAttributesOf(empty pidl) should fail! hr = %08x\n", hr); dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfMyComputer, 0, NULL, &dwFlags);

1 0

Piotr Caban : gdi32/enhmfdrv: Don't drop viewport/ window transformation in StretchBlt.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: d9e7c4d820a104a7a675baa1b2e0261e685deb39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e7c4d820a104a7a675baa1b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 21 17:41:21 2016 +0200 gdi32/enhmfdrv: Don't drop viewport/window transformation in StretchBlt. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/bitblt.c | 2 +- dlls/gdi32/tests/metafile.c | 60 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 51 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index d6d0fe7..ed03c1f 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -122,7 +122,7 @@ BOOL EMFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, pEMR->dwRop = rop; pEMR->xSrc = src->log_x; pEMR->ySrc = src->log_y; - GetWorldTransform(devSrc->hdc, &pEMR->xformSrc); + GetTransform(devSrc->hdc, 0x204, &pEMR->xformSrc); pEMR->crBkColorSrc = GetBkColor(devSrc->hdc); pEMR->iUsageSrc = DIB_RGB_COLORS; pEMR->offBmiSrc = emrSize; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index b9e7522..c77112d 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -989,7 +989,7 @@ static void test_mf_SaveDC(void) /* with the nominal results. */ /* Maximum size of sample metafiles in bytes. */ -#define MF_BUFSIZE 512 +#define MF_BUFSIZE 1024 /* 8x8 bitmap data for a pattern brush */ static const unsigned char SAMPLE_PATTERN_BRUSH[] = { @@ -1231,16 +1231,16 @@ static const unsigned char EMF_BITBLT[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x6a, 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0xa0, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x64, 0x02, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x23, 0x04, 0x00, 0x00, 0x3b, 0x02, 0x00, 0x00, - 0x75, 0x01, 0x00, 0x00, 0xc9, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xb0, 0x04, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x3e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x08, 0xb1, 0x05, 0x00, - 0x28, 0x11, 0x03, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0x30, 0xda, 0x04, 0x00, 0x4c, 0x00, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1276,9 +1276,34 @@ static const unsigned char EMF_BITBLT[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + 0x00, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x00, + 0xc4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0a, 0xd7, 0xa3, 0x3b, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0a, 0xd7, 0x23, 0x3c, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, + 0x94, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x90, 0x01, 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 }; static const unsigned char EMF_DCBRUSH_BITS[] = @@ -1858,6 +1883,7 @@ static void test_emf_BitBlt(void) 0, /* biClrImportant */ }; void *bits; + XFORM xform; BOOL ret; hdcDisplay = CreateDCA("DISPLAY", NULL, NULL, NULL); @@ -1865,6 +1891,7 @@ static void test_emf_BitBlt(void) hdcBitmap = CreateCompatibleDC(hdcDisplay); ok( hdcBitmap != 0, "CreateCompatibleDC failed\n" ); + ok(SetGraphicsMode(hdcBitmap, GM_ADVANCED), "SetGraphicsMode failed\n"); bmih.biXPelsPerMeter = MulDiv(GetDeviceCaps(hdcDisplay, LOGPIXELSX), 100, 3937); bmih.biYPelsPerMeter = MulDiv(GetDeviceCaps(hdcDisplay, LOGPIXELSY), 100, 3937); hBitmap = CreateDIBSection(hdcDisplay, (const BITMAPINFO *)&bmih, @@ -1883,6 +1910,19 @@ static void test_emf_BitBlt(void) ret = BitBlt(hdcMetafile, 0, 0, BMP_DIM, BMP_DIM, 0, 0, 0, WHITENESS); ok( ret, "BitBlt(WHITENESS) failed\n" ); + ok(SetMapMode(hdcBitmap, MM_ANISOTROPIC), "SetMapMode failed\n"); + ok(SetWindowOrgEx(hdcBitmap, 0, 0, NULL), "SetWindowOrgEx failed\n"); + ok(SetWindowExtEx(hdcBitmap, 400, 400, NULL), "SetWindowExtEx failed\n"); + ok(SetViewportOrgEx(hdcBitmap, 0, 0, NULL), "SetViewportOrgEx failed\n"); + ok(SetViewportExtEx(hdcBitmap, BMP_DIM, BMP_DIM, NULL), "SetViewportExtEx failed\n"); + memset(&xform, 0, sizeof(xform)); + xform.eM11 = 0.5; + xform.eM22 = 1.0; + ok(SetWorldTransform(hdcBitmap, &xform), "SetWorldTransform failed\n"); + + ret = StretchBlt(hdcMetafile, 0, 0, BMP_DIM, BMP_DIM, hdcBitmap, 0, 0, 400, 400, SRCCOPY); + ok( ret, "StretchBlt(SRCCOPY) failed\n" ); + hMetafile = CloseEnhMetaFile(hdcMetafile); ok( hMetafile != 0, "CloseEnhMetaFile failed\n" );

1 0

Caron Wills : wined3d: Add Nvidia GeForce GTX 880M.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: f52accf86de3f3be387090cf5f1516a693213331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52accf86de3f3be387090cf5… Author: Caron Wills <caron(a)codeweavers.com> Date: Thu Apr 21 18:06:05 2016 +0000 wined3d: Add Nvidia GeForce GTX 880M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1ff8d43..761ee07 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1294,6 +1294,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX850M, "NVIDIA GeForce GTX 850M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX870M, "NVIDIA GeForce GTX 870M", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX880M, "NVIDIA GeForce GTX 880M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1756,6 +1757,7 @@ cards_nvidia_binary[] = {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ + {"GTX 880M", CARD_NVIDIA_GEFORCE_GTX880M}, /* GeForce 800 - mobile */ {"GTX 870M", CARD_NVIDIA_GEFORCE_GTX870M}, /* GeForce 800 - mobile */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ {"GTX 850M", CARD_NVIDIA_GEFORCE_GTX850M}, /* GeForce 800 - mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 099d1ee..bfc8f26 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1802,6 +1802,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX850M = 0x1391, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX870M = 0x1199, + CARD_NVIDIA_GEFORCE_GTX880M = 0x1198, CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, CARD_NVIDIA_GEFORCE_GTX960 = 0x1401,

1 0

Stefan Dösinger : wined3d: Use wined3d_texture_prepare_location() in device_clear_render_targets().
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: a010a0edd8ece039caceb6c05bb56aa05ed6cd21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a010a0edd8ece039caceb6c05… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 20 19:29:15 2016 +0200 wined3d: Use wined3d_texture_prepare_location() in device_clear_render_targets(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c44e911..ddd2d83 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -292,8 +292,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c float depth, DWORD stencil) { struct wined3d_surface *target = rt_count ? wined3d_rendertarget_view_get_surface(fb->render_targets[0]) : NULL; - struct wined3d_surface *depth_stencil = fb->depth_stencil - ? wined3d_rendertarget_view_get_surface(fb->depth_stencil) : NULL; + struct wined3d_rendertarget_view *dsv = fb->depth_stencil; + struct wined3d_surface *depth_stencil = dsv ? wined3d_rendertarget_view_get_surface(dsv) : NULL; const struct wined3d_state *state = &device->state; const struct wined3d_gl_info *gl_info; UINT drawable_width, drawable_height; @@ -331,7 +331,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c if (flags & WINED3DCLEAR_TARGET && !is_full_clear(target, draw_rect, rect_count ? clear_rect : NULL)) surface_load_location(rt, context, rtv->resource->draw_binding); else - wined3d_surface_prepare(rt, context, rtv->resource->draw_binding); + wined3d_texture_prepare_location(rt->container, rtv->sub_resource_idx, + context, rtv->resource->draw_binding); } } @@ -350,11 +351,12 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c } if (depth_stencil && render_offscreen) - wined3d_surface_prepare(depth_stencil, context, depth_stencil->container->resource.draw_binding); + wined3d_texture_prepare_location(depth_stencil->container, + dsv->sub_resource_idx, context, dsv->resource->draw_binding); if (flags & WINED3DCLEAR_ZBUFFER) { - DWORD location = render_offscreen ? fb->depth_stencil->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; + DWORD location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; if (!render_offscreen && depth_stencil != device->onscreen_depth_stencil) device_switch_onscreen_ds(device, context, depth_stencil); @@ -386,7 +388,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c if (flags & WINED3DCLEAR_ZBUFFER) { - DWORD location = render_offscreen ? fb->depth_stencil->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; + DWORD location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; surface_modify_ds_location(depth_stencil, location, ds_rect.right, ds_rect.bottom);

1 0

Nikolay Sivov : dwrite: Implement IDWriteFontFaceReference::Equals().
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 9d0bbb13642add299b8b989a86bb8a2448d0285d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0bbb13642add299b8b989a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 21:38:17 2016 +0300 dwrite: Implement IDWriteFontFaceReference::Equals(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 597fb97..24ee58c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5390,10 +5390,18 @@ static HRESULT WINAPI fontfacereference_CreateFontFaceWithSimulations(IDWriteFon static BOOL WINAPI fontfacereference_Equals(IDWriteFontFaceReference *iface, IDWriteFontFaceReference *ref) { struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); + IDWriteFontFile *file; + BOOL ret; - FIXME("(%p)->(%p): stub\n", This, ref); + TRACE("(%p)->(%p)\n", This, ref); - return E_NOTIMPL; + if (FAILED(IDWriteFontFaceReference_GetFontFile(ref, &file))) + return FALSE; + + ret = is_same_fontfile(This->file, file); + IDWriteFontFile_Release(file); + + return ret; } static UINT32 WINAPI fontfacereference_GetFontFaceIndex(IDWriteFontFaceReference *iface)

1 0

Nikolay Sivov : dwrite: Fix IDWriteFont3 QueryInterface to respond to its own IID.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: e7667fa2b737a00efe72764a10c534f4335cb8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7667fa2b737a00efe72764a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 21:38:18 2016 +0300 dwrite: Fix IDWriteFont3 QueryInterface to respond to its own IID. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 24ee58c..0b5438e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1243,7 +1243,8 @@ static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont3 *iface, REFIID riid TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); - if (IsEqualIID(riid, &IID_IDWriteFont2) || + if (IsEqualIID(riid, &IID_IDWriteFont3) || + IsEqualIID(riid, &IID_IDWriteFont2) || IsEqualIID(riid, &IID_IDWriteFont1) || IsEqualIID(riid, &IID_IDWriteFont) || IsEqualIID(riid, &IID_IUnknown))

1 0

Nikolay Sivov : dwrite: Implement IDWriteFont3::HasCharacter().
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 9777c77a573267af829810fc021029df2d2b85b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9777c77a573267af829810fc0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 21:38:19 2016 +0300 dwrite: Implement IDWriteFont3::HasCharacter(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 8 ++++++-- dlls/dwrite/tests/font.c | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0b5438e..f579e19 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1518,8 +1518,12 @@ static HRESULT WINAPI dwritefont3_GetFontFaceReference(IDWriteFont3 *iface, IDWr static BOOL WINAPI dwritefont3_HasCharacter(IDWriteFont3 *iface, UINT32 ch) { struct dwrite_font *This = impl_from_IDWriteFont3(iface); - FIXME("(%p)->(0x%x): stub\n", This, ch); - return FALSE; + BOOL ret; + + TRACE("(%p)->(0x%x)\n", This, ch); + + IDWriteFont_HasCharacter((IDWriteFont*)iface, ch, &ret); + return ret; } static DWRITE_LOCALITY WINAPI dwritefont3_GetLocality(IDWriteFont3 *iface) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f8f878c..ae6cbcf 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5810,7 +5810,6 @@ static void test_HasCharacter(void) ok(hr == S_OK, "got 0x%08x\n", hr); ret = IDWriteFont3_HasCharacter(font3, 'A'); - todo_wine ok(ret, "got %d\n", ret); IDWriteFont3_Release(font3);

1 0

Nikolay Sivov : dwrite: Implement IDWriteFont3::GetFontFaceReference().
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: d9c446050adc372fcf71ae43f85d7a4d36be67e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c446050adc372fcf71ae43f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 21:38:20 2016 +0300 dwrite: Implement IDWriteFont3::GetFontFaceReference(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 7 +++++-- dlls/dwrite/tests/font.c | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index f579e19..2a2f39f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1511,8 +1511,11 @@ static BOOL WINAPI dwritefont3_Equals(IDWriteFont3 *iface, IDWriteFont *font) static HRESULT WINAPI dwritefont3_GetFontFaceReference(IDWriteFont3 *iface, IDWriteFontFaceReference **reference) { struct dwrite_font *This = impl_from_IDWriteFont3(iface); - FIXME("(%p)->(%p): stub\n", This, reference); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, reference); + + return IDWriteFactory3_CreateFontFaceReference_(This->data->factory, This->data->file, This->data->face_index, + This->data->simulations, reference); } static BOOL WINAPI dwritefont3_HasCharacter(IDWriteFont3 *iface, UINT32 ch) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ae6cbcf..bad347d 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5830,6 +5830,8 @@ static void test_CreateFontFaceReference(void) IDWriteFontFile *file, *file1; IDWriteFactory3 *factory3; IDWriteFactory *factory; + IDWriteFont3 *font3; + IDWriteFont *font; UINT32 index; WCHAR *path; HRESULT hr; @@ -5921,6 +5923,23 @@ todo_wine IDWriteFontFile_Release(file); IDWriteFontFile_Release(file1); + /* references returned from IDWriteFont3 */ + font = get_tahoma_instance((IDWriteFactory*)factory3, DWRITE_FONT_STYLE_NORMAL); + hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont3, (void**)&font3); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + hr = IDWriteFont3_GetFontFaceReference(font3, &ref); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont3_GetFontFaceReference(font3, &ref1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ref != ref1, "got %p, %p\n", ref1, ref); + + IDWriteFontFaceReference_Release(ref); + IDWriteFontFaceReference_Release(ref1); + IDWriteFont3_Release(font3); + IDWriteFactory3_Release(factory3); DELETE_FONTFILE(path); }

1 0