October 2015 - Wine-commits

Henri Verbeet : d2d1: Only test overlapping figures in d2d_geometry_intersect_self().
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: c98d34d7457f8d6f34463c3736877042d2c1cfce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98d34d7457f8d6f34463c373… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 17:56:00 2015 +0200 d2d1: Only test overlapping figures in d2d_geometry_intersect_self(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 3ed9c86..4c66239 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -55,6 +55,8 @@ struct d2d_figure struct d2d_bezier *beziers; size_t beziers_size; size_t bezier_count; + + D2D1_RECT_F bounds; }; struct d2d_cdt_edge_ref @@ -422,6 +424,18 @@ static BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t element_ return TRUE; } +static void d2d_figure_update_bounds(struct d2d_figure *figure, D2D1_POINT_2F vertex) +{ + if (vertex.x < figure->bounds.left) + figure->bounds.left = vertex.x; + if (vertex.x > figure->bounds.right) + figure->bounds.right = vertex.x; + if (vertex.y < figure->bounds.top) + figure->bounds.top = vertex.y; + if (vertex.y > figure->bounds.bottom) + figure->bounds.bottom = vertex.y; +} + static BOOL d2d_figure_insert_vertex(struct d2d_figure *figure, size_t idx, D2D1_POINT_2F vertex) { if (!d2d_array_reserve((void **)&figure->vertices, &figure->vertices_size, @@ -434,6 +448,7 @@ static BOOL d2d_figure_insert_vertex(struct d2d_figure *figure, size_t idx, D2D1 memmove(&figure->vertices[idx + 1], &figure->vertices[idx], (figure->vertex_count - idx) * sizeof(*figure->vertices)); figure->vertices[idx] = vertex; + d2d_figure_update_bounds(figure, vertex); ++figure->vertex_count; return TRUE; } @@ -448,6 +463,7 @@ static BOOL d2d_figure_add_vertex(struct d2d_figure *figure, D2D1_POINT_2F verte } figure->vertices[figure->vertex_count] = vertex; + d2d_figure_update_bounds(figure, vertex); ++figure->vertex_count; return TRUE; } @@ -1426,6 +1442,13 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) for (j = min_j, min_j = 0, l = min_l, min_l = 0; j < i || (j == i && k); ++j, l = 0) { figure_q = &geometry->u.path.figures[j]; + + if (figure_p->bounds.left > figure_q->bounds.right + || figure_q->bounds.left > figure_p->bounds.right + || figure_p->bounds.top > figure_q->bounds.bottom + || figure_q->bounds.top > figure_p->bounds.bottom) + continue; + max_l = j == i ? k - 1 : figure_q->vertex_count; q0 = figure_q->vertices[l == 0 ? figure_q->vertex_count - 1 : l - 1]; for (; l < max_l; q0 = q1, ++l) @@ -1550,6 +1573,10 @@ static BOOL d2d_path_geometry_add_figure(struct d2d_geometry *geometry) figure = &geometry->u.path.figures[geometry->u.path.figure_count]; memset(figure, 0, sizeof(*figure)); + figure->bounds.left = FLT_MAX; + figure->bounds.top = FLT_MAX; + figure->bounds.right = -FLT_MAX; + figure->bounds.bottom = -FLT_MAX; ++geometry->u.path.figure_count; return TRUE;

1 0

Henri Verbeet : d2d1: Only test figures that overlap the probe in d2d_path_geometry_point_inside ().
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: e6da1a780e0ae88588a917545caa44165a7cf66e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6da1a780e0ae88588a917545… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 17:56:01 2015 +0200 d2d1: Only test figures that overlap the probe in d2d_path_geometry_point_inside(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 4c66239..b6a11f7 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1170,6 +1170,10 @@ static BOOL d2d_path_geometry_point_inside(const struct d2d_geometry *geometry, { const struct d2d_figure *figure = &geometry->u.path.figures[i]; + if (probe->x < figure->bounds.left || probe->x > figure->bounds.right + || probe->y < figure->bounds.top || probe->y > figure->bounds.bottom) + continue; + p0 = &figure->vertices[figure->vertex_count - 1]; for (j = 0; j < figure->vertex_count; p0 = p1, ++j) {

1 0

Henri Verbeet : d2d1: Only search for the initial edge for each figure in d2d_cdt_insert_segments ().
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: 76aa675da352cb1b5c0d7de35770c150588f9912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76aa675da352cb1b5c0d7de35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 17:56:02 2015 +0200 d2d1: Only search for the initial edge for each figure in d2d_cdt_insert_segments(). For each subsequent segment we can just re-use the edge we just inserted. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 61 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index b6a11f7..80d004b 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1332,7 +1332,7 @@ static void d2d_cdt_cut_edges(struct d2d_cdt *cdt, struct d2d_cdt_edge_ref *end_ } static BOOL d2d_cdt_insert_segment(struct d2d_cdt *cdt, struct d2d_geometry *geometry, - const struct d2d_cdt_edge_ref *origin, size_t end_vertex) + const struct d2d_cdt_edge_ref *origin, struct d2d_cdt_edge_ref *edge, size_t end_vertex) { struct d2d_cdt_edge_ref base_edge, current, next, target; @@ -1341,7 +1341,10 @@ static BOOL d2d_cdt_insert_segment(struct d2d_cdt *cdt, struct d2d_geometry *geo d2d_cdt_edge_next_origin(cdt, &next, &current); if (d2d_cdt_edge_destination(cdt, &current) == end_vertex) + { + d2d_cdt_edge_sym(edge, &current); return TRUE; + } if (d2d_cdt_rightof(cdt, end_vertex, &next) && d2d_cdt_leftof(cdt, end_vertex, &current)) { @@ -1353,6 +1356,7 @@ static BOOL d2d_cdt_insert_segment(struct d2d_cdt *cdt, struct d2d_geometry *geo if (!d2d_cdt_connect(cdt, &base_edge, &target, &current)) return FALSE; + *edge = base_edge; if (!d2d_cdt_fixup(cdt, &base_edge)) return FALSE; d2d_cdt_edge_sym(&base_edge, &base_edge); @@ -1373,9 +1377,10 @@ static BOOL d2d_cdt_insert_segment(struct d2d_cdt *cdt, struct d2d_geometry *geo static BOOL d2d_cdt_insert_segments(struct d2d_cdt *cdt, struct d2d_geometry *geometry) { size_t start_vertex, end_vertex, i, j, k; + struct d2d_cdt_edge_ref edge, new_edge; const struct d2d_figure *figure; - struct d2d_cdt_edge_ref edge; const D2D1_POINT_2F *p; + BOOL found; for (i = 0; i < geometry->u.path.figure_count; ++i) { @@ -1385,6 +1390,33 @@ static BOOL d2d_cdt_insert_segments(struct d2d_cdt *cdt, struct d2d_geometry *ge geometry->vertex_count, sizeof(*p), d2d_cdt_compare_vertices); start_vertex = p - cdt->vertices; + for (k = 0, found = FALSE; k < cdt->edge_count; ++k) + { + if (cdt->edges[k].flags & D2D_CDT_EDGE_FLAG_FREED) + continue; + + edge.idx = k; + edge.r = 0; + + if (d2d_cdt_edge_origin(cdt, &edge) == start_vertex) + { + found = TRUE; + break; + } + d2d_cdt_edge_sym(&edge, &edge); + if (d2d_cdt_edge_origin(cdt, &edge) == start_vertex) + { + found = TRUE; + break; + } + } + + if (!found) + { + ERR("Edge not found.\n"); + return FALSE; + } + for (j = 0; j < figure->vertex_count; start_vertex = end_vertex, ++j) { p = bsearch(&figure->vertices[j], cdt->vertices, @@ -1394,28 +1426,9 @@ static BOOL d2d_cdt_insert_segments(struct d2d_cdt *cdt, struct d2d_geometry *ge if (start_vertex == end_vertex) continue; - for (k = 0; k < cdt->edge_count; ++k) - { - if (cdt->edges[k].flags & D2D_CDT_EDGE_FLAG_FREED) - continue; - - edge.idx = k; - edge.r = 0; - - if (d2d_cdt_edge_origin(cdt, &edge) == start_vertex) - { - if (!d2d_cdt_insert_segment(cdt, geometry, &edge, end_vertex)) - return FALSE; - break; - } - d2d_cdt_edge_sym(&edge, &edge); - if (d2d_cdt_edge_origin(cdt, &edge) == start_vertex) - { - if (!d2d_cdt_insert_segment(cdt, geometry, &edge, end_vertex)) - return FALSE; - break; - } - } + if (!d2d_cdt_insert_segment(cdt, geometry, &edge, &new_edge, end_vertex)) + return FALSE; + edge = new_edge; } }

1 0

Andrew Eikum : xaudio2_0: Add compatibility implementation and forward to xaudio2_7.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: 4185cc7a94cd74ce2b76ea57601dc32305c944b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4185cc7a94cd74ce2b76ea576… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 7 11:19:35 2015 -0500 xaudio2_0: Add compatibility implementation and forward to xaudio2_7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/xaudio2_0/Makefile.in | 7 + dlls/xaudio2_0/xaudio2_0.spec | 4 + dlls/xaudio2_0/xaudio_classes.idl | 42 ++ dlls/xaudio2_0/xaudio_dll.c | 52 +++ dlls/xaudio2_7/compat.c | 859 ++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 263 +++++++----- dlls/xaudio2_7/xaudio_private.h | 11 + include/xapo.idl | 16 + include/xaudio2.idl | 243 +++++++++++ include/xaudio2fx.idl | 14 + 12 files changed, 1413 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4185cc7a94cd74ce2b76e…

1 0

Nikolay Sivov : wiaservc/tests: Basic test for device enumerator.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: 6fc2d3ce2e0e46b1c1302c7279689d843d1c40d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fc2d3ce2e0e46b1c1302c727… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 00:12:34 2015 +0300 wiaservc/tests: Basic test for device enumerator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/wiaservc/tests/Makefile.in | 5 +++ dlls/wiaservc/tests/wia.c | 76 +++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/wia_lh.idl | 2 ++ include/wia_xp.idl | 2 ++ include/wiadef.h | 22 ++++++++++++ 8 files changed, 110 insertions(+) diff --git a/configure b/configure index 8b1fb86..2ba059a 100755 --- a/configure +++ b/configure @@ -17872,6 +17872,7 @@ wine_fn_config_dll wer enable_wer implib wine_fn_config_test dlls/wer/tests wer_test wine_fn_config_dll wevtapi enable_wevtapi wine_fn_config_dll wiaservc enable_wiaservc clean +wine_fn_config_test dlls/wiaservc/tests wiaservc_test wine_fn_config_dll win32s16.dll16 enable_win16 wine_fn_config_dll win87em.dll16 enable_win16 wine_fn_config_dll winaspi.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 5e83d39..1e9bd66 100644 --- a/configure.ac +++ b/configure.ac @@ -3385,6 +3385,7 @@ WINE_CONFIG_DLL(wer,,[implib]) WINE_CONFIG_TEST(dlls/wer/tests) WINE_CONFIG_DLL(wevtapi) WINE_CONFIG_DLL(wiaservc,,[clean]) +WINE_CONFIG_TEST(dlls/wiaservc/tests) WINE_CONFIG_DLL(win32s16.dll16,enable_win16) WINE_CONFIG_DLL(win87em.dll16,enable_win16) WINE_CONFIG_DLL(winaspi.dll16,enable_win16) diff --git a/dlls/wiaservc/tests/Makefile.in b/dlls/wiaservc/tests/Makefile.in new file mode 100644 index 0000000..594e1b2 --- /dev/null +++ b/dlls/wiaservc/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wiaservc.dll +IMPORTS = ole32 + +C_SRCS = \ + wia.c diff --git a/dlls/wiaservc/tests/wia.c b/dlls/wiaservc/tests/wia.c new file mode 100644 index 0000000..e3f4edb --- /dev/null +++ b/dlls/wiaservc/tests/wia.c @@ -0,0 +1,76 @@ +/* + * Unit test suite for WIA system + * + * Copyright 2015 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 + */ + +#include <stdio.h> + +#define COBJMACROS + +#include "objbase.h" +#include "initguid.h" +#include "wia_lh.h" + +#include "wine/test.h" + +static IWiaDevMgr *devmanager; + +static void test_EnumDeviceInfo(void) +{ + IEnumWIA_DEV_INFO *devenum; + HRESULT hr; + ULONG count; + + hr = IWiaDevMgr_EnumDeviceInfo(devmanager, WIA_DEVINFO_ENUM_LOCAL, NULL); + ok(FAILED(hr), "got 0x%08x\n", hr); + + hr = IWiaDevMgr_EnumDeviceInfo(devmanager, WIA_DEVINFO_ENUM_LOCAL, &devenum); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (hr == S_OK) { + hr = IEnumWIA_DEV_INFO_GetCount(devenum, NULL); + ok(FAILED(hr), "got 0x%08x\n", hr); + + count = 1000; + hr = IEnumWIA_DEV_INFO_GetCount(devenum, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count != 1000, "got %u\n", count); + + IEnumWIA_DEV_INFO_Release(devenum); +} +} + +START_TEST(wia) +{ + HRESULT hr; + + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_WiaDevMgr, NULL, CLSCTX_LOCAL_SERVER, &IID_IWiaDevMgr, (void**)&devmanager); + if (FAILED(hr)) { + win_skip("Failed to create WiaDevMgr instance, 0x%08x\n", hr); + CoUninitialize(); + return; + } + + test_EnumDeviceInfo(); + + IWiaDevMgr_Release(devmanager); + CoUninitialize(); +} diff --git a/include/Makefile.in b/include/Makefile.in index 84a6381..3d2c97f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -611,6 +611,7 @@ SRCDIR_INCLUDES = \ werapi.h \ wfext.h \ wia.h \ + wiadef.h \ winbase.h \ wincon.h \ wincred.h \ diff --git a/include/wia_lh.idl b/include/wia_lh.idl index 7cadbc6..284528a 100644 --- a/include/wia_lh.idl +++ b/include/wia_lh.idl @@ -20,6 +20,8 @@ import "unknwn.idl"; import "oaidl.idl"; import "propidl.idl"; +cpp_quote("#include <wiadef.h>") + interface IEnumWIA_DEV_INFO; interface IWiaPropertyStorage; interface IWiaItem; diff --git a/include/wia_xp.idl b/include/wia_xp.idl index 7cadbc6..284528a 100644 --- a/include/wia_xp.idl +++ b/include/wia_xp.idl @@ -20,6 +20,8 @@ import "unknwn.idl"; import "oaidl.idl"; import "propidl.idl"; +cpp_quote("#include <wiadef.h>") + interface IEnumWIA_DEV_INFO; interface IWiaPropertyStorage; interface IWiaItem; diff --git a/include/wiadef.h b/include/wiadef.h new file mode 100644 index 0000000..28e43e0 --- /dev/null +++ b/include/wiadef.h @@ -0,0 +1,22 @@ +/* + * WIA constants + * + * Copyright 2015 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 + */ + +#define WIA_DEVINFO_ENUM_ALL 0x0000000f +#define WIA_DEVINFO_ENUM_LOCAL 0x00000010

1 0

Ken Thomases : winemac: Remove JPEG 2000 from the bitmap formats that other bitmap formats can be converted to.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: 10b95d0dc74d1c9f069807ec3f397839c3f9cc79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b95d0dc74d1c9f069807ec3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 7 16:22:27 2015 -0500 winemac: Remove JPEG 2000 from the bitmap formats that other bitmap formats can be converted to. Since a983cfb01, the Mac driver won't even present formats, like this one, which don't correspond to a known Windows format through the clipboard APIs, so it's pointless. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_clipboard.m | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index b8ca796..1d1cb88 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -66,12 +66,10 @@ CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) [NSNumber numberWithUnsignedInteger:NSBMPFileType], [NSNumber numberWithUnsignedInteger:NSGIFFileType], [NSNumber numberWithUnsignedInteger:NSJPEGFileType], - [NSNumber numberWithUnsignedInteger:NSJPEG2000FileType], nil]; BitmapOutputTypes = [[NSArray alloc] initWithObjects:@"public.tiff", @"public.png", - @"com.microsoft.bmp", @"com.compuserve.gif", @"public.jpeg", - @"public.jpeg-2000", nil]; + @"com.microsoft.bmp", @"com.compuserve.gif", @"public.jpeg", nil]; BitmapOutputTypeMap = [[NSDictionary alloc] initWithObjects:bitmapFileTypes forKeys:BitmapOutputTypes];

1 0

Iván Matellanes : msvcirt: Implement stdiobuf:: setrwbuf.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: 66ff2e3bad1d0b6e011381afc598f5b92fb9f0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=66ff2e3bad1d0b6e011381afc… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 7 22:19:30 2015 +0100 msvcirt: Implement stdiobuf::setrwbuf. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 28 ++++++++++++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 1d915fa..1eefe73 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1580,8 +1580,32 @@ streampos __thiscall stdiobuf_seekoff(stdiobuf *this, streamoff offset, ios_seek DEFINE_THISCALL_WRAPPER(stdiobuf_setrwbuf, 12) int __thiscall stdiobuf_setrwbuf(stdiobuf *this, int read_size, int write_size) { - FIXME("(%p %d %d) stub\n", this, read_size, write_size); - return EOF; + char *reserve; + int buffer_size = read_size + write_size; + + TRACE("(%p %d %d)\n", this, read_size, write_size); + if (read_size < 0 || write_size < 0) + return 0; + if (!buffer_size) { + this->base.unbuffered = 1; + return 0; + } + /* get a new buffer */ + reserve = MSVCRT_operator_new(buffer_size); + if (!reserve) + return 0; + streambuf_setb(&this->base, reserve, reserve + buffer_size, 1); + this->base.unbuffered = 0; + /* set the get/put areas */ + if (read_size > 0) + streambuf_setg(&this->base, reserve, reserve + read_size, reserve + read_size); + else + streambuf_setg(&this->base, NULL, NULL, NULL); + if (write_size > 0) + streambuf_setp(&this->base, reserve + read_size, reserve + buffer_size); + else + streambuf_setp(&this->base, NULL, NULL); + return 1; } /* ?stdiofile(a)stdiobuf@@QAEPAU_iobuf@@XZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 8bc45c1..758062c 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -210,6 +210,7 @@ static int (*__thiscall p_strstreambuf_underflow)(strstreambuf*); static stdiobuf* (*__thiscall p_stdiobuf_file_ctor)(stdiobuf*, FILE*); static void (*__thiscall p_stdiobuf_dtor)(stdiobuf*); static int (*__thiscall p_stdiobuf_overflow)(stdiobuf*, int); +static int (*__thiscall p_stdiobuf_setrwbuf)(stdiobuf*, int, int); static int (*__thiscall p_stdiobuf_sync)(stdiobuf*); static int (*__thiscall p_stdiobuf_underflow)(stdiobuf*); @@ -374,6 +375,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QEAA(a)PEAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UEAA(a)XZ"); SET(p_stdiobuf_overflow, "?overflow(a)stdiobuf@@UEAAHH(a)Z"); + SET(p_stdiobuf_setrwbuf, "?setrwbuf(a)stdiobuf@@QEAAHHH(a)Z"); SET(p_stdiobuf_sync, "?sync(a)stdiobuf@@UEAAHXZ"); SET(p_stdiobuf_underflow, "?underflow(a)stdiobuf@@UEAAHXZ"); @@ -458,6 +460,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QAE(a)PAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UAE(a)XZ"); SET(p_stdiobuf_overflow, "?overflow(a)stdiobuf@@UAEHH(a)Z"); + SET(p_stdiobuf_setrwbuf, "?setrwbuf(a)stdiobuf@@QAEHHH(a)Z"); SET(p_stdiobuf_sync, "?sync(a)stdiobuf@@UAEHXZ"); SET(p_stdiobuf_underflow, "?underflow(a)stdiobuf@@UAEHXZ"); @@ -2016,6 +2019,35 @@ static void test_stdiobuf(void) ok(stb2.base.gptr == stb2.base.egptr, "wrong get pointer, expected %p got %p\n", stb2.base.egptr, stb2.base.gptr); stb2.base.unbuffered = 1; + /* setrwbuf */ + ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, 100, 60); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(stb1.base.allocated == 1, "wrong allocate value, expected 1 got %d\n", stb1.base.allocated); + ok(stb1.base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", stb1.base.unbuffered); + ok(stb1.base.ebuf == stb1.base.base + 160, "expected %p got %p\n", stb1.base.base + 160, stb1.base.ebuf); + ok(stb1.base.eback == stb1.base.base, "wrong get base, expected %p got %p\n", stb1.base.base, stb1.base.eback); + ok(stb1.base.gptr == stb1.base.base + 100, "wrong get pointer, expected %p got %p\n", stb1.base.base + 100, stb1.base.gptr); + ok(stb1.base.egptr == stb1.base.base + 100, "wrong get end, expected %p got %p\n", stb1.base.base + 100, stb1.base.egptr); + ok(stb1.base.pbase == stb1.base.base + 100, "wrong put base, expected %p got %p\n", stb1.base.base + 100, stb1.base.pbase); + ok(stb1.base.pptr == stb1.base.base + 100, "wrong put pointer, expected %p got %p\n", stb1.base.base + 100, stb1.base.pptr); + ok(stb1.base.epptr == stb1.base.base + 160, "wrong put end, expected %p got %p\n", stb1.base.base + 160, stb1.base.epptr); + ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, -1, 64); + ok(ret == 0 || ret == 1, "expected 0 or 1, got %d\n", ret); + ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, 32, -8); + ok(ret == 0 || ret == 1, "expected 0 or 1, got %d\n", ret); + ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, 0, 64); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(stb1.base.ebuf == stb1.base.base + 64, "expected %p got %p\n", stb1.base.base + 64, stb1.base.ebuf); + ok(stb1.base.eback == NULL, "wrong get base, expected %p got %p\n", NULL, stb1.base.eback); + ok(stb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, stb1.base.gptr); + ok(stb1.base.egptr == NULL, "wrong get end, expected %p got %p\n", NULL, stb1.base.egptr); + ok(stb1.base.pbase == stb1.base.base, "wrong put base, expected %p got %p\n", stb1.base.base, stb1.base.pbase); + ok(stb1.base.pptr == stb1.base.base, "wrong put pointer, expected %p got %p\n", stb1.base.base, stb1.base.pptr); + ok(stb1.base.epptr == stb1.base.base + 64, "wrong put end, expected %p got %p\n", stb1.base.base + 64, stb1.base.epptr); + ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, 0, 0); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(stb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", stb1.base.unbuffered); + call_func1(p_stdiobuf_dtor, &stb1); call_func1(p_stdiobuf_dtor, &stb2); fclose(file1);

1 0

Iván Matellanes : msvcirt: Implement stdiobuf:: seekoff.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: 6aa589e85444a9a4d5c3141516e03222ef97c9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa589e85444a9a4d5c314151… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 7 22:19:31 2015 +0100 msvcirt: Implement stdiobuf::seekoff. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 7 ++++-- dlls/msvcirt/tests/msvcirt.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 1eefe73..bfef1a3 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1571,8 +1571,11 @@ int __thiscall stdiobuf_pbackfail(stdiobuf *this, int c) DEFINE_THISCALL_WRAPPER(stdiobuf_seekoff, 16) streampos __thiscall stdiobuf_seekoff(stdiobuf *this, streamoff offset, ios_seek_dir dir, int mode) { - FIXME("(%p %d %d %d) stub\n", this, offset, dir, mode); - return EOF; + TRACE("(%p %d %d %d)\n", this, offset, dir, mode); + call_streambuf_overflow(&this->base, EOF); + if (fseek(this->file, offset, dir)) + return EOF; + return ftell(this->file); } /* ?setrwbuf(a)stdiobuf@@QAEHHH(a)Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 758062c..704a6c2 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -210,6 +210,7 @@ static int (*__thiscall p_strstreambuf_underflow)(strstreambuf*); static stdiobuf* (*__thiscall p_stdiobuf_file_ctor)(stdiobuf*, FILE*); static void (*__thiscall p_stdiobuf_dtor)(stdiobuf*); static int (*__thiscall p_stdiobuf_overflow)(stdiobuf*, int); +static streampos (*__thiscall p_stdiobuf_seekoff)(stdiobuf*, streamoff, ios_seek_dir, int); static int (*__thiscall p_stdiobuf_setrwbuf)(stdiobuf*, int, int); static int (*__thiscall p_stdiobuf_sync)(stdiobuf*); static int (*__thiscall p_stdiobuf_underflow)(stdiobuf*); @@ -375,6 +376,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QEAA(a)PEAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UEAA(a)XZ"); SET(p_stdiobuf_overflow, "?overflow(a)stdiobuf@@UEAAHH(a)Z"); + SET(p_stdiobuf_seekoff, "?seekoff(a)stdiobuf@@UEAAJJW4seek_dir(a)ios@@H(a)Z"); SET(p_stdiobuf_setrwbuf, "?setrwbuf(a)stdiobuf@@QEAAHHH(a)Z"); SET(p_stdiobuf_sync, "?sync(a)stdiobuf@@UEAAHXZ"); SET(p_stdiobuf_underflow, "?underflow(a)stdiobuf@@UEAAHXZ"); @@ -460,6 +462,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QAE(a)PAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UAE(a)XZ"); SET(p_stdiobuf_overflow, "?overflow(a)stdiobuf@@UAEHH(a)Z"); + SET(p_stdiobuf_seekoff, "?seekoff(a)stdiobuf@@UAEJJW4seek_dir(a)ios@@H(a)Z"); SET(p_stdiobuf_setrwbuf, "?setrwbuf(a)stdiobuf@@QAEHHH(a)Z"); SET(p_stdiobuf_sync, "?sync(a)stdiobuf@@UAEHXZ"); SET(p_stdiobuf_underflow, "?underflow(a)stdiobuf@@UAEHXZ"); @@ -2048,6 +2051,63 @@ static void test_stdiobuf(void) ok(ret == 0, "expected 0 got %d\n", ret); ok(stb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", stb1.base.unbuffered); + /* seekoff */ + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 0, SEEKDIR_beg, OPENMODE_in); + ok(ret == 0, "expected 0 got %d\n", ret); + stb1.base.unbuffered = 0; + ret = (int) call_func3(p_streambuf_xsputn, &stb1.base, "Never gonna say goodbye", 22); + ok(ret == 22, "expected 22 got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 5, SEEKDIR_beg, OPENMODE_in); + ok(ret == 5, "expected 5 got %d\n", ret); + ok(stb1.base.pptr == stb1.base.pbase + 22, "wrong put pointer, expected %p got %p\n", stb1.base.pbase + 22, stb1.base.pptr); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 300, SEEKDIR_beg, OPENMODE_in); + ok(ret == 300, "expected 300 got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, -310, SEEKDIR_cur, OPENMODE_in); + ok(ret == EOF, "expected EOF got %d\n", ret); + stb1.base.eback = stb1.base.base; + stb1.base.gptr = stb1.base.egptr = stb1.base.pbase = stb1.base.base + 10; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, -280, SEEKDIR_cur, OPENMODE_in); + ok(ret == 20, "expected 20 got %d\n", ret); + stb1.base.gptr = stb1.base.eback; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 80, SEEKDIR_cur, OPENMODE_in); + ok(ret == 100, "expected 100 got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 0, SEEKDIR_end, OPENMODE_in); + ok(ret == 49, "expected 49 got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 1, SEEKDIR_end, OPENMODE_in); + ok(ret == 50, "expected 50 got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, -60, SEEKDIR_end, OPENMODE_in); + ok(ret == EOF, "expected EOF got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, -20, SEEKDIR_end, OPENMODE_out); + ok(ret == 29, "expected 29 got %d\n", ret); + stb1.base.eback = stb1.base.gptr = stb1.base.egptr = NULL; + stb1.base.pptr = stb1.base.pbase; + stb1.base.unbuffered = 1; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, 0, SEEKDIR_beg, OPENMODE_in); + ok(ret == 0, "expected 0 got %d\n", ret); + stb2.base.pptr += 10; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, 20, SEEKDIR_beg, OPENMODE_in); + ok(ret == 20, "expected 20 got %d\n", ret); + ok(stb2.base.pptr == stb2.base.pbase + 10, "wrong put pointer, expected %p got %p\n", stb2.base.pbase + 10, stb2.base.pptr); + stb2.base.unbuffered = 0; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, 10, SEEKDIR_cur, OPENMODE_in); + ok(ret == 40, "expected 40 got %d\n", ret); + ok(stb2.base.pptr == stb2.base.pbase, "wrong put pointer, expected %p got %p\n", stb2.base.pbase, stb2.base.pptr); + stb2.base.gptr = stb2.base.eback; + stb2.base.pptr += 5; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, -50, SEEKDIR_cur, OPENMODE_in|OPENMODE_out); + ok(ret == EOF, "expected EOF got %d\n", ret); + ok(stb2.base.pptr == stb2.base.pbase, "wrong put pointer, expected %p got %p\n", stb2.base.pbase, stb2.base.pptr); + stb2.base.pbase = stb2.base.pptr = stb2.base.epptr = NULL; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, 0, SEEKDIR_end, OPENMODE_in|OPENMODE_out); + ok(ret == 48, "expected 48 got %d\n", ret); + ok(stb2.base.pbase == stb2.base.base + 32, "wrong put pointer, expected %p got %p\n", stb2.base.base + 32, stb2.base.pbase); + ok(stb2.base.pptr == stb2.base.base + 32, "wrong put pointer, expected %p got %p\n", stb2.base.base + 32, stb2.base.pptr); + ok(stb2.base.epptr == stb2.base.ebuf, "wrong put pointer, expected %p got %p\n", stb2.base.ebuf, stb2.base.epptr); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, -28, SEEKDIR_end, -1); + ok(ret == 20, "expected 20 got %d\n", ret); + stb2.base.gptr = stb2.base.egptr; + stb2.base.unbuffered = 1; + call_func1(p_stdiobuf_dtor, &stb1); call_func1(p_stdiobuf_dtor, &stb2); fclose(file1);

1 0

Iván Matellanes : msvcirt: Improve implementation of streambuf::pbackfail.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: b34b65e462af459b40821f9b2629b0c7d2c1300b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b34b65e462af459b40821f9b2… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 7 22:19:32 2015 +0100 msvcirt: Improve implementation of streambuf::pbackfail. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 35 +++++++++++------- dlls/msvcirt/tests/msvcirt.c | 88 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b34b65e462af459b40821…

1 0

Sebastian Lackner : ntdll/tests: Add tests for calling NtReadFile/ NtWriteFile on directory.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: b8315e87f18cc8c29aa13ea88ee12a1e0be5587f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8315e87f18cc8c29aa13ea88… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 8 07:25:27 2015 +0200 ntdll/tests: Add tests for calling NtReadFile/NtWriteFile on directory. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 1afb9c8..b8f1847 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -177,6 +177,7 @@ static void create_file_test(void) static const WCHAR pathInvalidNtW[] = {'\\','\\','?','\\',0}; static const WCHAR pathInvalidNt2W[] = {'\\','?','?','\\',0}; static const WCHAR pathInvalidDosW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\',0}; + static const char testdata[] = "Hello World"; FILE_NETWORK_OPEN_INFORMATION info; NTSTATUS status; HANDLE dir, file; @@ -184,6 +185,9 @@ static void create_file_test(void) OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; UNICODE_STRING nameW; + LARGE_INTEGER offset; + char buf[32]; + DWORD ret; GetCurrentDirectoryW( MAX_PATH, path ); pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); @@ -195,9 +199,36 @@ static void create_file_test(void) attr.SecurityQualityOfService = NULL; /* try various open modes and options on directories */ - status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, - FILE_OPEN, FILE_DIRECTORY_FILE, NULL, 0 ); + status = pNtCreateFile( &dir, GENERIC_READ|GENERIC_WRITE, &attr, &io, NULL, 0, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_DIRECTORY_FILE, NULL, 0 ); ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + U(io).Status = 0xdeadbeef; + offset.QuadPart = 0; + status = pNtReadFile( dir, NULL, NULL, NULL, &io, buf, sizeof(buf), &offset, NULL ); + todo_wine + ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtReadFile error %08x\n", status ); + if (status == STATUS_PENDING) + { + ret = WaitForSingleObject( dir, 1000 ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject error %u\n", ret ); + ok( U(io).Status == STATUS_INVALID_DEVICE_REQUEST, + "expected STATUS_INVALID_DEVICE_REQUEST, got %08x\n", U(io).Status ); + } + + U(io).Status = 0xdeadbeef; + offset.QuadPart = 0; + status = pNtWriteFile( dir, NULL, NULL, NULL, &io, testdata, sizeof(testdata), &offset, NULL); + todo_wine + ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtWriteFile error %08x\n", status ); + if (status == STATUS_PENDING) + { + ret = WaitForSingleObject( dir, 1000 ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject error %u\n", ret ); + ok( U(io).Status == STATUS_INVALID_DEVICE_REQUEST, + "expected STATUS_INVALID_DEVICE_REQUEST, got %08x\n", U(io).Status ); + } + CloseHandle( dir ); status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE,

1 0