July 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Improve parameter validation in GetGdiCompatibleGlyphAdvances(), add some tests.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: 5231715d31cc1f7ebbfca64247383b1aa7fdc2ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5231715d31cc1f7ebbfca6424… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 20 15:13:58 2015 +0300 dwrite: Improve parameter validation in GetGdiCompatibleGlyphAdvances(), add some tests. --- dlls/dwrite/font.c | 13 +++++- dlls/dwrite/tests/font.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 11ff9d0..2d01574 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -771,10 +771,19 @@ static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontF TRACE("(%p)->(%.2f %.2f %p %d %d %u %p %p)\n", This, em_size, ppdip, m, use_gdi_natural, is_sideways, glyph_count, glyphs, advances); - if (m && memcmp(m, &identity, sizeof(*m))) - FIXME("transform is not supported, %s\n", debugstr_matrix(m)); + if (em_size < 0.0 || ppdip <= 0.0) { + memset(advances, 0, sizeof(*advances) * glyph_count); + return E_INVALIDARG; + } scale = em_size * ppdip / This->metrics.designUnitsPerEm; + if (scale == 0.0) { + memset(advances, 0, sizeof(*advances) * glyph_count); + return S_OK; + } + + if (m && memcmp(m, &identity, sizeof(*m))) + FIXME("transform is not supported, %s\n", debugstr_matrix(m)); for (i = 0; i < glyph_count; i++) { hr = IDWriteFontFace2_GetDesignGlyphAdvances(iface, 1, glyphs + i, advances + i, is_sideways); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7dc6077..94dccdd 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3905,6 +3905,121 @@ static void test_GetPanose(void) IDWriteFactory_Release(factory); } +static INT32 get_gdi_font_advance(HDC hdc, FLOAT emsize) +{ + LOGFONTW logfont; + HFONT hfont; + BOOL ret; + ABC abc; + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = (LONG)-emsize; + logfont.lfWeight = FW_NORMAL; + logfont.lfQuality = CLEARTYPE_QUALITY; + lstrcpyW(logfont.lfFaceName, tahomaW); + + hfont = CreateFontIndirectW(&logfont); + SelectObject(hdc, hfont); + + ret = GetCharABCWidthsW(hdc, 'A', 'A', &abc); + ok(ret, "got %d\n", ret); + + DeleteObject(hfont); + + return abc.abcA + abc.abcB + abc.abcC; +} + +static void test_GetGdiCompatibleGlyphAdvances(void) +{ + IDWriteFontFace1 *fontface1; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + IDWriteFont *font; + HRESULT hr; + HDC hdc; + UINT32 codepoint; + UINT16 glyph; + FLOAT emsize; + DWRITE_FONT_METRICS1 fm; + INT32 advance; + + factory = create_factory(); + font = get_tahoma_instance(factory, DWRITE_FONT_STYLE_NORMAL); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + IDWriteFontFace_Release(fontface); + + if (hr != S_OK) { + IDWriteFactory_Release(factory); + win_skip("GetGdiCompatibleGlyphAdvances() is not supported\n"); + return; + } + + codepoint = 'A'; + glyph = 0; + hr = IDWriteFontFace1_GetGlyphIndices(fontface1, &codepoint, 1, &glyph); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(glyph > 0, "got %u\n", glyph); + + /* zero emsize */ + advance = 1; + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, 0.0, + 1.0, NULL, FALSE, FALSE, 1, &glyph, &advance); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(advance == 0, "got %d\n", advance); + + /* negative emsize */ + advance = 1; + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, -1.0, + 1.0, NULL, FALSE, FALSE, 1, &glyph, &advance); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(advance == 0, "got %d\n", advance); + + /* zero ppdip */ + advance = 1; + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, 1.0, + 0.0, NULL, FALSE, FALSE, 1, &glyph, &advance); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(advance == 0, "got %d\n", advance); + + /* negative ppdip */ + advance = 1; + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, 1.0, + -1.0, NULL, FALSE, FALSE, 1, &glyph, &advance); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(advance == 0, "got %d\n", advance); + + IDWriteFontFace1_GetMetrics(fontface1, &fm); + + hdc = CreateCompatibleDC(0); + + for (emsize = 1.0; emsize <= fm.designUnitsPerEm; emsize += 1.0) { + INT32 gdi_advance; + + gdi_advance = get_gdi_font_advance(hdc, emsize); + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, emsize, + 1.0, NULL, FALSE, FALSE, 1, &glyph, &advance); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* advance is in design units */ + advance = (int)floorf(emsize * advance / fm.designUnitsPerEm + 0.5f); + + /* allow 1 pixel difference for large sizes, for Tahoma this happens for 16 sizes in [1, 2048] range */ + if (emsize > 150.0) + ok((advance - gdi_advance) <= 1, "%.0f: got advance %d, expected %d\n", emsize, advance, gdi_advance); + else + ok(gdi_advance == advance, "%.0f: got advance %d, expected %d\n", emsize, advance, gdi_advance); + } + + DeleteObject(hdc); + + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -3950,6 +4065,7 @@ START_TEST(font) test_CreateGlyphRunAnalysis(); test_GetGdiCompatibleMetrics(); test_GetPanose(); + test_GetGdiCompatibleGlyphAdvances(); IDWriteFactory_Release(factory); }

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_CopySubresourceRegion().
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: e2c0c611d48eda80e6cd6a8f2a98ad500bdf2d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c0c611d48eda80e6cd6a8f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 20 11:07:30 2015 +0200 d3d10core: Implement d3d10_device_CopySubresourceRegion(). --- dlls/d3d10core/device.c | 19 ++++++++++-- dlls/wined3d/device.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 4 +++ 4 files changed, 96 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 3ba87b4..abf0430 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -635,10 +635,25 @@ static void STDMETHODCALLTYPE d3d10_device_CopySubresourceRegion(ID3D10Device1 * ID3D10Resource *dst_resource, UINT dst_subresource_idx, UINT dst_x, UINT dst_y, UINT dst_z, ID3D10Resource *src_resource, UINT src_subresource_idx, const D3D10_BOX *src_box) { - FIXME("iface %p, dst_resource %p, dst_subresource_idx %u, dst_x %u, dst_y %u, dst_z %u,\n" - "\tsrc_resource %p, src_subresource_idx %u, src_box %p stub!\n", + struct wined3d_resource *wined3d_dst_resource, *wined3d_src_resource; + struct d3d10_device *device = impl_from_ID3D10Device(iface); + struct wined3d_box wined3d_src_box; + + TRACE("iface %p, dst_resource %p, dst_subresource_idx %u, dst_x %u, dst_y %u, dst_z %u, " + "src_resource %p, src_subresource_idx %u, src_box %p.\n", iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box); + + wined3d_dst_resource = wined3d_resource_from_resource(dst_resource); + wined3d_src_resource = wined3d_resource_from_resource(src_resource); + wined3d_src_box.left = src_box->left; + wined3d_src_box.top = src_box->top; + wined3d_src_box.front = src_box->front; + wined3d_src_box.right = src_box->right; + wined3d_src_box.bottom = src_box->bottom; + wined3d_src_box.back = src_box->back; + wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_dst_resource, dst_subresource_idx, + dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, &wined3d_src_box); } static void STDMETHODCALLTYPE d3d10_device_CopyResource(ID3D10Device1 *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 56cf325..bff610d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3908,6 +3908,80 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, } } +void CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device, + struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, unsigned int dst_x, + unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, + unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) +{ + struct wined3d_surface *dst_surface, *src_surface; + struct wined3d_texture *dst_texture, *src_texture; + struct wined3d_resource *tmp; + RECT dst_rect, src_rect; + HRESULT hr; + + TRACE("device %p, dst_resource %p, dst_sub_resource_idx %u, dst_x %u, dst_y %u, dst_z %u, " + "src_resource %p, src_sub_resource_idx %u, src_box %p.\n", + device, dst_resource, dst_sub_resource_idx, dst_x, dst_y, dst_z, + src_resource, src_sub_resource_idx, src_box); + + if (src_resource == dst_resource && src_sub_resource_idx == dst_sub_resource_idx) + { + WARN("Source and destination are the same sub-resource.\n"); + return; + } + + if (src_resource->type != dst_resource->type) + { + WARN("Resource types (%s / %s) don't match.\n", + debug_d3dresourcetype(dst_resource->type), + debug_d3dresourcetype(src_resource->type)); + return; + } + + if (src_resource->format->id != dst_resource->format->id) + { + WARN("Resource formats (%s / %s) don't match.\n", + debug_d3dformat(dst_resource->format->id), + debug_d3dformat(src_resource->format->id)); + return; + } + + if (dst_resource->type != WINED3D_RTYPE_TEXTURE) + { + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource->type)); + return; + } + + dst_texture = wined3d_texture_from_resource(dst_resource); + if (!(tmp = wined3d_texture_get_sub_resource(dst_texture, dst_sub_resource_idx))) + { + WARN("Invalid dst_sub_resource_idx %u.\n", dst_sub_resource_idx); + return; + } + dst_surface = surface_from_resource(tmp); + + src_texture = wined3d_texture_from_resource(src_resource); + if (!(tmp = wined3d_texture_get_sub_resource(src_texture, src_sub_resource_idx))) + { + WARN("Invalid src_sub_resource_idx %u.\n", src_sub_resource_idx); + return; + } + src_surface = surface_from_resource(tmp); + + dst_rect.left = dst_x; + dst_rect.top = dst_y; + dst_rect.right = dst_x + (src_box->right - src_box->left); + dst_rect.bottom = dst_y + (src_box->bottom - src_box->top); + + src_rect.left = src_box->left; + src_rect.top = src_box->top; + src_rect.right = src_box->right; + src_rect.bottom = src_box->bottom; + + if (FAILED(hr = wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) + ERR("Failed to blit, hr %#x.\n", hr); +} + HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view, const RECT *rect, const struct wined3d_color *color) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a79d6a6..f478106 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -38,6 +38,7 @@ @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr ptr) @ cdecl wined3d_device_copy_resource(ptr ptr ptr) +@ cdecl wined3d_device_copy_sub_resource_region(ptr ptr long long long long ptr long ptr) @ cdecl wined3d_device_create(ptr long long ptr long long ptr ptr) @ cdecl wined3d_device_decref(ptr) @ cdecl wined3d_device_draw_indexed_primitive(ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bb7007c..6ff1a3e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2137,6 +2137,10 @@ HRESULT __cdecl wined3d_device_clear_rendertarget_view(struct wined3d_device *de struct wined3d_rendertarget_view *view, const RECT *rect, const struct wined3d_color *color); void __cdecl wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource); +void __cdecl wined3d_device_copy_sub_resource_region(struct wined3d_device *device, + struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, unsigned int dst_x, + unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, + unsigned int src_sub_resource_idx, const struct wined3d_box *src_box); HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, HWND focus_window, DWORD behaviour_flags, BYTE surface_alignment, struct wined3d_device_parent *device_parent, struct wined3d_device **device);

1 0

Henri Verbeet : d2d1: Add some FIXMEs for unimplemented functionality to d2d_d3d_render_target_DrawGlyphRun ().
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: fc1286aed87201ac7adae18d2f5272246723c76a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1286aed87201ac7adae18d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 20 11:07:29 2015 +0200 d2d1: Add some FIXMEs for unimplemented functionality to d2d_d3d_render_target_DrawGlyphRun(). --- dlls/d2d1/render_target.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 37a8d57..ac6a0fa 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -848,6 +848,10 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg if (measuring_mode) FIXME("Ignoring measuring mode %#x.\n", measuring_mode); + if (render_target->text_rendering_params) + FIXME("Ignoring text rendering parameters %p.\n", render_target->text_rendering_params); + if (render_target->drawing_state.textAntialiasMode != D2D1_TEXT_ANTIALIAS_MODE_ALIASED) + FIXME("Ignoring text antialiasing mode %#x.\n", render_target->drawing_state.textAntialiasMode); if (FAILED(hr = ID2D1Factory_CreatePathGeometry(render_target->factory, &geometry))) {

1 0

Henri Verbeet : d2d1/tests: Don't call compare_surface() inside ok().
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: f5b4da0ddd2a9d8f02eed429be0f3df1d70276fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5b4da0ddd2a9d8f02eed429b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 20 11:07:26 2015 +0200 d2d1/tests: Don't call compare_surface() inside ok(). --- dlls/d2d1/tests/d2d1.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a27ddfa..1106423 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -277,6 +277,7 @@ static void test_clip(void) D2D1_SIZE_F size; HWND window; HRESULT hr; + BOOL match; static const D2D1_MATRIX_3X2_F identity = { 1.0f, 0.0f, @@ -370,7 +371,8 @@ static void test_clip(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - ok(compare_surface(surface, "035a44d4198d6e422e9de6185b5b2c2bac5e33c9"), "Surface does not match.\n"); + match = compare_surface(surface, "035a44d4198d6e422e9de6185b5b2c2bac5e33c9"); + ok(match, "Surface does not match.\n"); ID2D1RenderTarget_Release(rt); IDXGISurface_Release(surface); @@ -606,6 +608,7 @@ static void test_color_brush(void) float opacity; HWND window; HRESULT hr; + BOOL match; if (!(device = create_device())) { @@ -681,7 +684,8 @@ static void test_color_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - ok(compare_surface(surface, "6d1218fca5e21fb7e287b3a439d60dbc251f5ceb"), "Surface does not match.\n"); + match = compare_surface(surface, "6d1218fca5e21fb7e287b3a439d60dbc251f5ceb"); + ok(match, "Surface does not match.\n"); ID2D1SolidColorBrush_Release(brush); ID2D1RenderTarget_Release(rt); @@ -711,6 +715,7 @@ static void test_bitmap_brush(void) float opacity; HWND window; HRESULT hr; + BOOL match; static const struct { @@ -833,7 +838,8 @@ static void test_bitmap_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - ok(compare_surface(surface, "393636185359a550d459e1e5f0e25411814f724c"), "Surface does not match.\n"); + match = compare_surface(surface, "393636185359a550d459e1e5f0e25411814f724c"); + ok(match, "Surface does not match.\n"); ID2D1RenderTarget_BeginDraw(rt); @@ -861,7 +867,8 @@ static void test_bitmap_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - ok(compare_surface(surface, "b4b775afecdae2d26642001f4faff73663bb8b31"), "Surface does not match.\n"); + match = compare_surface(surface, "b4b775afecdae2d26642001f4faff73663bb8b31"); + ok(match, "Surface does not match.\n"); ID2D1BitmapBrush_Release(brush); refcount = ID2D1Bitmap_Release(bitmap); @@ -889,6 +896,7 @@ static void test_path_geometry(void) UINT32 count; HWND window; HRESULT hr; + BOOL match; if (!(device = create_device())) { @@ -1185,7 +1193,8 @@ static void test_path_geometry(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - ok(compare_surface(surface, "736d9bf019bcf0be264571c1bd954f07752330ab"), "Surface does not match.\n"); + match = compare_surface(surface, "736d9bf019bcf0be264571c1bd954f07752330ab"); + ok(match, "Surface does not match.\n"); ID2D1PathGeometry_Release(geometry); ID2D1SolidColorBrush_Release(brush);

1 0

Iván Matellanes : msvcirt: Implement ios manipulators.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: 3c5328dca83bde9536df4ee6c3efd21deb7fa716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5328dca83bde9536df4ee6c… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:37:09 2015 +0200 msvcirt: Implement ios manipulators. --- dlls/msvcirt/msvcirt.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 6dd650b..bbcefbf 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -90,6 +90,7 @@ typedef struct { ios* __thiscall ios_assign(ios*, const ios*); int __thiscall ios_fail(const ios*); void __cdecl ios_lock(ios*); +LONG __thiscall ios_setf_mask(ios*, LONG, LONG); void __cdecl ios_unlock(ios*); /* class ostream */ @@ -905,7 +906,8 @@ int __thiscall ios_delbuf_get(const ios *this) /* ?dec@@YAAEAVios@@AEAV1@@Z */ ios* __cdecl ios_dec(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + ios_setf_mask(this, FLAGS_dec, ios_basefield); return this; } @@ -984,7 +986,8 @@ int __thiscall ios_good(const ios *this) /* ?hex@@YAAEAVios@@AEAV1@@Z */ ios* __cdecl ios_hex(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + ios_setf_mask(this, FLAGS_hex, ios_basefield); return this; } @@ -1049,7 +1052,8 @@ CRITICAL_SECTION* __thiscall ios_lockptr(ios *this) /* ?oct@@YAAEAVios@@AEAV1@@Z */ ios* __cdecl ios_oct(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + ios_setf_mask(this, FLAGS_oct, ios_basefield); return this; }

1 0

Iván Matellanes : msvcirt: Implement ios operators.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: 19bce9272c947b396f825683145f55bb2f9208a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19bce9272c947b396f8256831… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:37:00 2015 +0200 msvcirt: Implement ios operators. --- dlls/msvcirt/msvcirt.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 1397ccd..6959db3 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -82,6 +82,7 @@ typedef struct { } ios; ios* __thiscall ios_assign(ios*, const ios*); +int __thiscall ios_fail(const ios*); void __cdecl ios_lock(ios*); void __cdecl ios_unlock(ios*); @@ -795,8 +796,8 @@ ios* __thiscall ios_assign(ios *this, const ios *rhs) DEFINE_THISCALL_WRAPPER(ios_op_not, 4) int __thiscall ios_op_not(const ios *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return ios_fail(this); } /* ??Bios@@QBEPAXXZ */ @@ -804,8 +805,8 @@ int __thiscall ios_op_not(const ios *this) DEFINE_THISCALL_WRAPPER(ios_op_void, 4) void* __thiscall ios_op_void(const ios *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return ios_fail(this) ? NULL : (void*)this; } /* ??_Eios@@UAEPAXI(a)Z */

1 0

Iván Matellanes : msvcirt: Implement ios::delbuf.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: 9abffde3bcdc139eae77e8d66dfbc26ed08bd0ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=9abffde3bcdc139eae77e8d66… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:36:50 2015 +0200 msvcirt: Implement ios::delbuf. --- dlls/msvcirt/msvcirt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index dbb2ea3..5bae2c8 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -878,7 +878,8 @@ void __cdecl ios_clrlock(ios *this) DEFINE_THISCALL_WRAPPER(ios_delbuf_set, 8) void __thiscall ios_delbuf_set(ios *this, int delete) { - FIXME("(%p %d) stub\n", this, delete); + TRACE("(%p %d)\n", this, delete); + this->delbuf = delete; } /* ?delbuf(a)ios@@QBEHXZ */ @@ -886,8 +887,8 @@ void __thiscall ios_delbuf_set(ios *this, int delete) DEFINE_THISCALL_WRAPPER(ios_delbuf_get, 4) int __thiscall ios_delbuf_get(const ios *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->delbuf; } /* ?dec@@YAAAVios@@AAV1@@Z */

1 0

Iván Matellanes : msvcirt: Implement ios::tie.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: 5fea62039986fb736c50b6de268a33985d11809e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fea62039986fb736c50b6de2… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:36:40 2015 +0200 msvcirt: Implement ios::tie. --- dlls/msvcirt/msvcirt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 4e4315e..d1c5509 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1142,8 +1142,12 @@ void __cdecl ios_sync_with_stdio(void) DEFINE_THISCALL_WRAPPER(ios_tie_set, 8) ostream* __thiscall ios_tie_set(ios *this, ostream *ostr) { - FIXME("(%p %p) stub\n", this, ostr); - return NULL; + ostream *prev = this->tie; + + TRACE("(%p %p)\n", this, ostr); + + this->tie = ostr; + return prev; } /* ?tie(a)ios@@QBEPAVostream@@XZ */ @@ -1151,8 +1155,8 @@ ostream* __thiscall ios_tie_set(ios *this, ostream *ostr) DEFINE_THISCALL_WRAPPER(ios_tie_get, 4) ostream* __thiscall ios_tie_get(const ios *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return this->tie; } /* ?unlock(a)ios@@QAAXXZ */

1 0

Iván Matellanes : msvcirt: Implement ios::precision.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: 80f5fd53617fcf5797318c111b24c127d5b901f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f5fd53617fcf5797318c111… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:36:27 2015 +0200 msvcirt: Implement ios::precision. --- dlls/msvcirt/msvcirt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 068beab..275a849 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1047,8 +1047,12 @@ ios* __cdecl ios_oct(ios *this) DEFINE_THISCALL_WRAPPER(ios_precision_set, 8) int __thiscall ios_precision_set(ios *this, int prec) { - FIXME("(%p %d) stub\n", this, prec); - return 0; + int prev = this->precision; + + TRACE("(%p %d)\n", this, prec); + + this->precision = prec; + return prev; } /* ?precision(a)ios@@QBEHXZ */ @@ -1056,8 +1060,8 @@ int __thiscall ios_precision_set(ios *this, int prec) DEFINE_THISCALL_WRAPPER(ios_precision_get, 4) int __thiscall ios_precision_get(const ios *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->precision; } /* ?pword(a)ios@@QBEAAPAXH(a)Z */

1 0

Iván Matellanes : msvcirt: Implement ios::fill.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: 9b42f88e49c5cdc3df77947515d9c6328f14a4ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b42f88e49c5cdc3df7794751… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:36:22 2015 +0200 msvcirt: Implement ios::fill. --- dlls/msvcirt/msvcirt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index a0d670f..068beab 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -921,8 +921,12 @@ int __thiscall ios_fail(const ios *this) DEFINE_THISCALL_WRAPPER(ios_fill_set, 8) char __thiscall ios_fill_set(ios *this, char fill) { - FIXME("(%p %d) stub\n", this, fill); - return EOF; + char prev = this->fill; + + TRACE("(%p %d)\n", this, fill); + + this->fill = fill; + return prev; } /* ?fill(a)ios@@QBEDXZ */ @@ -930,8 +934,8 @@ char __thiscall ios_fill_set(ios *this, char fill) DEFINE_THISCALL_WRAPPER(ios_fill_get, 4) char __thiscall ios_fill_get(const ios *this) { - FIXME("(%p) stub\n", this); - return EOF; + TRACE("(%p)\n", this); + return this->fill; } /* ?flags(a)ios@@QAEJJ(a)Z */

1 0