January 2021 - wine-commits

Rémi Bernon : d2d1/tests: Pass a d2d1_test_context structure get_surface_readback().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: aff25e42b18a6b12044263d361d5a03e74c3230c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aff25e42b18a6b12044263d3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:48:02 2021 +0330 d2d1/tests: Pass a d2d1_test_context structure get_surface_readback(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 38fe6c4ff7d..6f8aac4fd04 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -311,8 +311,9 @@ static void cubic_to(ID2D1GeometrySink *sink, float x1, float y1, float x2, floa ID2D1GeometrySink_AddBezier(sink, &b); } -static void get_surface_readback(IDXGISurface *surface, struct resource_readback *rb) +static void get_surface_readback(struct d2d1_test_context *ctx, struct resource_readback *rb) { + IDXGISurface *surface = ctx->surface; D3D10_TEXTURE2D_DESC texture_desc; D3D10_MAPPED_TEXTURE2D map_desc; DXGI_SURFACE_DESC surface_desc; @@ -466,7 +467,7 @@ static BOOL compare_surface(struct d2d1_test_context *ctx, const char *ref_sha1) struct resource_readback rb; BOOL ret; - get_surface_readback(ctx->surface, &rb); + get_surface_readback(ctx, &rb); ret = compare_sha1(rb.data, rb.pitch, 4, rb.width, rb.height, ref_sha1); release_resource_readback(&rb); @@ -638,7 +639,7 @@ static BOOL compare_figure(struct d2d1_test_context *ctx, unsigned int x, unsign unsigned int i, j, span, diff; struct resource_readback rb; - get_surface_readback(ctx->surface, &rb); + get_surface_readback(ctx, &rb); figure.span_count = 0; figure.spans_size = 64; @@ -2170,7 +2171,7 @@ static void test_linear_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - get_surface_readback(ctx.surface, &rb); + get_surface_readback(&ctx, &rb); for (i = 0; i < ARRAY_SIZE(test1); ++i) { DWORD colour; @@ -2243,7 +2244,7 @@ static void test_linear_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - get_surface_readback(ctx.surface, &rb); + get_surface_readback(&ctx, &rb); for (i = 0; i < ARRAY_SIZE(test2); ++i) { DWORD colour; @@ -2367,7 +2368,7 @@ static void test_radial_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - get_surface_readback(ctx.surface, &rb); + get_surface_readback(&ctx, &rb); for (i = 0; i < ARRAY_SIZE(test1); ++i) { DWORD colour; @@ -2442,7 +2443,7 @@ static void test_radial_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - get_surface_readback(ctx.surface, &rb); + get_surface_readback(&ctx, &rb); for (i = 0; i < ARRAY_SIZE(test2); ++i) { DWORD colour;

1 0

Rémi Bernon : d2d1/tests: Pass a d2d1_test_context structure to compare_figure().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 1b2e27fe498299928091f40038652d8ae63eecc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b2e27fe498299928091f400… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:48:01 2021 +0330 d2d1/tests: Pass a d2d1_test_context structure to compare_figure(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 296 ++++++++++++++++++++++++------------------------- 1 file changed, 148 insertions(+), 148 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b2e27fe498299928091…

1 0

Rémi Bernon : d2d1/tests: Pass a d2d1_test_context structure to compare_surface().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: f5bb97d28f20ce0040d77f508998c1e75d32f86a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5bb97d28f20ce0040d77f50… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:48:00 2021 +0330 d2d1/tests: Pass a d2d1_test_context structure to compare_surface(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 52 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f5bb97d28f20ce0040d7…

1 0

Rémi Bernon : d2d1/tests: Store the resource data pointer and row-pitch directly in struct resource_readback.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: aab3f4b7fe8ba0d7f6da015872e7a6726846a588 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aab3f4b7fe8ba0d7f6da0158… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:59 2021 +0330 d2d1/tests: Store the resource data pointer and row-pitch directly in struct resource_readback. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index c8c0e83df1c..a1869dcaaaa 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -54,8 +54,8 @@ struct d2d1_test_context struct resource_readback { ID3D10Resource *resource; - D3D10_MAPPED_TEXTURE2D map_desc; - unsigned int width, height; + unsigned int pitch, width, height; + void *data; }; struct figure @@ -314,6 +314,7 @@ static void cubic_to(ID2D1GeometrySink *sink, float x1, float y1, float x2, floa static void get_surface_readback(IDXGISurface *surface, struct resource_readback *rb) { D3D10_TEXTURE2D_DESC texture_desc; + D3D10_MAPPED_TEXTURE2D map_desc; DXGI_SURFACE_DESC surface_desc; ID3D10Resource *src_resource; ID3D10Device *device; @@ -346,8 +347,11 @@ static void get_surface_readback(IDXGISurface *surface, struct resource_readback ID3D10Resource_Release(src_resource); ID3D10Device_Release(device); - hr = ID3D10Texture2D_Map((ID3D10Texture2D *)rb->resource, 0, D3D10_MAP_READ, 0, &rb->map_desc); + hr = ID3D10Texture2D_Map((ID3D10Texture2D *)rb->resource, 0, D3D10_MAP_READ, 0, &map_desc); ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + + rb->pitch = map_desc.RowPitch; + rb->data = map_desc.pData; } static void release_resource_readback(struct resource_readback *rb) @@ -358,7 +362,7 @@ static void release_resource_readback(struct resource_readback *rb) static DWORD get_readback_colour(struct resource_readback *rb, unsigned int x, unsigned int y) { - return ((DWORD *)((BYTE *)rb->map_desc.pData + y * rb->map_desc.RowPitch))[x]; + return ((DWORD *)((BYTE *)rb->data + y * rb->pitch))[x]; } static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) @@ -463,8 +467,7 @@ static BOOL compare_surface(IDXGISurface *surface, const char *ref_sha1) BOOL ret; get_surface_readback(surface, &rb); - ret = compare_sha1(rb.map_desc.pData, rb.map_desc.RowPitch, 4, - rb.width, rb.height, ref_sha1); + ret = compare_sha1(rb.data, rb.pitch, 4, rb.width, rb.height, ref_sha1); release_resource_readback(&rb); return ret; @@ -641,7 +644,7 @@ static BOOL compare_figure(IDXGISurface *surface, unsigned int x, unsigned int y figure.spans_size = 64; figure.spans = HeapAlloc(GetProcessHeap(), 0, figure.spans_size * sizeof(*figure.spans)); - read_figure(&figure, rb.map_desc.pData, rb.map_desc.RowPitch, x, y, w, h, prev); + read_figure(&figure, rb.data, rb.pitch, x, y, w, h, prev); deserialize_figure(&ref_figure, (BYTE *)ref); span = w * h; @@ -679,7 +682,7 @@ static BOOL compare_figure(IDXGISurface *surface, unsigned int x, unsigned int y if (diff > max_diff) { trace("diff %u > max_diff %u.\n", diff, max_diff); - read_figure(&figure, rb.map_desc.pData, rb.map_desc.RowPitch, x, y, w, h, prev); + read_figure(&figure, rb.data, rb.pitch, x, y, w, h, prev); serialize_figure(&figure); }

1 0

Rémi Bernon : d2d1/tests: Create a Direct2D render target in init_test_context_().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 85f3ba90e520e49be32ce2118e1cab771766a94c URL: https://source.winehq.org/git/wine.git/?a=commit;h=85f3ba90e520e49be32ce211… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:58 2021 +0330 d2d1/tests: Create a Direct2D render target in init_test_context_(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 131 +++++++++++++++---------------------------------- 1 file changed, 40 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85f3ba90e520e49be32c…

1 0

Rémi Bernon : d2d1/tests: Retrieve the swapchain back-buffer in init_test_context_().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 1a12eb08be86b3c805366e1dfad9d6eced168dad URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a12eb08be86b3c805366e1d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:57 2021 +0330 d2d1/tests: Retrieve the swapchain back-buffer in init_test_context_(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 507 +++++++++++++++++++++---------------------------- 1 file changed, 212 insertions(+), 295 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a12eb08be86b3c80536…

1 0

Rémi Bernon : d2d1/tests: Create a swapchain in init_test_context_().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 7b312cd1be5fff36e11a87e6271bdd6cf40084a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b312cd1be5fff36e11a87e6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:56 2021 +0330 d2d1/tests: Create a swapchain in init_test_context_(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 118 ++++++++++++------------------------------------- 1 file changed, 28 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b312cd1be5fff36e11a…

1 0

Rémi Bernon : d2d1/tests: Create a window in init_test_context_().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: acd9b6a45aa0890e1fe48f3d7feb98c484b60c17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acd9b6a45aa0890e1fe48f3d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:55 2021 +0330 d2d1/tests: Create a window in init_test_context_(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 120 ++++++++++++------------------------------------- 1 file changed, 29 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=acd9b6a45aa0890e1fe4…

1 0

Rémi Bernon : d2d1/tests: Introduce init_test_context().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 02634c3d75c8b1a12c3f12295a2562a71ca503aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=02634c3d75c8b1a12c3f1229… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:54 2021 +0330 d2d1/tests: Introduce init_test_context(). Analogous to the d3d11 tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 374 ++++++++++++++++++++++--------------------------- 1 file changed, 167 insertions(+), 207 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02634c3d75c8b1a12c3f…

1 0

Rémi Bernon : d2d1/tests: Check for d2d1 math functions presence.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: babd036a79841f1da65b72ae5dd512b2b316d213 URL: https://source.winehq.org/git/wine.git/?a=commit;h=babd036a79841f1da65b72ae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:53 2021 +0330 d2d1/tests: Check for d2d1 math functions presence. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 8627f5ebef6..37cdda0aae6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -30,6 +30,9 @@ static HRESULT (WINAPI *pD2D1CreateDevice)(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *properties, ID2D1Device **device); +static void (WINAPI *pD2D1SinCos)(float angle, float *s, float *c); +static float (WINAPI *pD2D1Tan)(float angle); +static float (WINAPI *pD2D1Vec3Length)(float x, float y, float z); static BOOL use_mt = TRUE; @@ -9585,9 +9588,15 @@ static void test_math(void) {1.0f, 2.0f, 3.0f, 3.74165750f}, }; + if (!pD2D1SinCos || !pD2D1Tan || !pD2D1Vec3Length) + { + win_skip("D2D1SinCos/D2D1Tan/D2D1Vec3Length not available, skipping test.\n"); + return; + } + for (i = 0; i < ARRAY_SIZE(sc_data); ++i) { - D2D1SinCos(sc_data[i].x, &s, &c); + pD2D1SinCos(sc_data[i].x, &s, &c); ok(compare_float(s, sc_data[i].s, 0), "Test %u: Got unexpected sin %.8e, expected %.8e.\n", i, s, sc_data[i].s); ok(compare_float(c, sc_data[i].c, 0), @@ -9596,14 +9605,14 @@ static void test_math(void) for (i = 0; i < ARRAY_SIZE(t_data); ++i) { - t = D2D1Tan(t_data[i].x); + t = pD2D1Tan(t_data[i].x); ok(compare_float(t, t_data[i].t, 1), "Test %u: Got unexpected tan %.8e, expected %.8e.\n", i, t, t_data[i].t); } for (i = 0; i < ARRAY_SIZE(l_data); ++i) { - l = D2D1Vec3Length(l_data[i].x, l_data[i].y, l_data[i].z); + l = pD2D1Vec3Length(l_data[i].x, l_data[i].y, l_data[i].z); ok(compare_float(l, l_data[i].l, 0), "Test %u: Got unexpected length %.8e, expected %.8e.\n", i, l, l_data[i].l); } @@ -9611,10 +9620,14 @@ static void test_math(void) START_TEST(d2d1) { + HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); unsigned int argc, i; char **argv; - pD2D1CreateDevice = (void *)GetProcAddress(GetModuleHandleA("d2d1.dll"), "D2D1CreateDevice"); + pD2D1CreateDevice = (void *)GetProcAddress(d2d1_dll, "D2D1CreateDevice"); + pD2D1SinCos = (void *)GetProcAddress(d2d1_dll, "D2D1SinCos"); + pD2D1Tan = (void *)GetProcAddress(d2d1_dll, "D2D1Tan"); + pD2D1Vec3Length = (void *)GetProcAddress(d2d1_dll, "D2D1Vec3Length"); use_mt = !getenv("WINETEST_NO_MT_D3D");

1 0

Jactry Zeng : d2d1: Partially implement d2d_device_context_DrawImage().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: c19fc01d363e06fa9a3a19d6f5f8cbd2d6057f9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c19fc01d363e06fa9a3a19d6… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jan 15 22:55:39 2021 +0800 d2d1: Partially implement d2d_device_context_DrawImage(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 34 +++++++++++++++++++--- dlls/d2d1/tests/d2d1.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index e8bc7207a67..5f04c3aa833 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1067,7 +1067,8 @@ static void STDMETHODCALLTYPE d2d_device_context_FillOpacityMask(ID2D1DeviceCont static void d2d_device_context_draw_bitmap(struct d2d_device_context *context, ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, D2D1_INTERPOLATION_MODE interpolation_mode, - const D2D1_RECT_F *src_rect, const D2D1_MATRIX_4X4_F *perspective_transform) + const D2D1_RECT_F *src_rect, const D2D1_POINT_2F *offset, + const D2D1_MATRIX_4X4_F *perspective_transform) { D2D1_BITMAP_BRUSH_PROPERTIES1 bitmap_brush_desc; D2D1_BRUSH_PROPERTIES brush_desc; @@ -1102,6 +1103,14 @@ static void d2d_device_context_draw_bitmap(struct d2d_device_context *context, I d.bottom = s.bottom - s.top; } + if (offset) + { + d.left += offset->x; + d.top += offset->y; + d.right += offset->x; + d.bottom += offset->y; + } + bitmap_brush_desc.extendModeX = D2D1_EXTEND_MODE_CLAMP; bitmap_brush_desc.extendModeY = D2D1_EXTEND_MODE_CLAMP; bitmap_brush_desc.interpolationMode = interpolation_mode; @@ -1141,7 +1150,7 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawBitmap(ID2D1DeviceContext * } d2d_device_context_draw_bitmap(context, bitmap, dst_rect, opacity, d2d1_1_interp_mode_from_d2d1(interpolation_mode), - src_rect, NULL); + src_rect, NULL, NULL); } static void STDMETHODCALLTYPE d2d_device_context_DrawText(ID2D1DeviceContext *iface, @@ -2211,9 +2220,26 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawImage(ID2D1DeviceContext *i const D2D1_POINT_2F *target_offset, const D2D1_RECT_F *image_rect, D2D1_INTERPOLATION_MODE interpolation_mode, D2D1_COMPOSITE_MODE composite_mode) { - FIXME("iface %p, image %p, target_offset %s, image_rect %s, interpolation_mode %#x, composite_mode %#x stub!\n", + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + ID2D1Bitmap *bitmap; + + TRACE("iface %p, image %p, target_offset %s, image_rect %s, interpolation_mode %#x, composite_mode %#x.\n", iface, image, debug_d2d_point_2f(target_offset), debug_d2d_rect_f(image_rect), interpolation_mode, composite_mode); + + if (composite_mode != D2D1_COMPOSITE_MODE_SOURCE_OVER) + FIXME("Unhandled composite mode %#x.\n", composite_mode); + + if (SUCCEEDED(ID2D1Image_QueryInterface(image, &IID_ID2D1Bitmap, (void **)&bitmap))) + { + d2d_device_context_draw_bitmap(context, bitmap, NULL, 1.0f, d2d1_1_interp_mode_from_d2d1(interpolation_mode), + image_rect, target_offset, NULL); + + ID2D1Bitmap_Release(bitmap); + return; + } + + FIXME("Unhandled image %p.\n", image); } static void STDMETHODCALLTYPE d2d_device_context_DrawGdiMetafile(ID2D1DeviceContext *iface, @@ -2235,7 +2261,7 @@ static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_DrawBitmap(I debug_d2d_rect_f(src_rect), perspective_transform); d2d_device_context_draw_bitmap(context, bitmap, dst_rect, opacity, interpolation_mode, src_rect, - perspective_transform); + NULL, perspective_transform); } static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_PushLayer(ID2D1DeviceContext *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 19bb94530c2..8627f5ebef6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1746,7 +1746,84 @@ static void test_bitmap_brush(void) hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Image, (void **)&image); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Vista */, "Failed to get ID2D1Image, hr %#x.\n", hr); if (hr == S_OK) - ID2D1Image_Release(image); + { + ID2D1DeviceContext *context; + D2D1_POINT_2F offset; + D2D1_RECT_F src_rect; + + hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ID2D1RenderTarget_BeginDraw(rt); + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + + ID2D1RenderTarget_GetTransform(rt, &tmp_matrix); + set_matrix_identity(&matrix); + translate_matrix(&matrix, 20.0f, 12.0f); + scale_matrix(&matrix, 2.0f, 6.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + + /* Crash on Windows 7+ */ + if (0) + { + ID2D1DeviceContext_DrawImage(context, NULL, NULL, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + } + + ID2D1DeviceContext_DrawImage(context, image, NULL, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + set_rect(&src_rect, 0.0f, 0.0f, image_size.width, image_size.height); + + ID2D1DeviceContext_DrawImage(context, image, NULL, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + offset.x = -1; + offset.y = -1; + ID2D1DeviceContext_DrawImage(context, image, &offset, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + offset.x = image_size.width * 2; + offset.y = image_size.height; + ID2D1DeviceContext_DrawImage(context, image, &offset, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + offset.x = image_size.width * 3; + set_rect(&src_rect, image_size.width / 2, image_size.height / 2, image_size.width, image_size.height); + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + offset.x = image_size.width * 4; + set_rect(&src_rect, 0.0f, 0.0f, image_size.width * 2, image_size.height * 2); + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + offset.x = image_size.width * 5; + set_rect(&src_rect, image_size.width, image_size.height, 0.0f, 0.0f); + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "95675fbc4a16404c9568d41b14e8f6be64240998"); + ok(match, "Surface does not match.\n"); + + ID2D1RenderTarget_BeginDraw(rt); + + offset.x = image_size.width * 6; + set_rect(&src_rect, 1.0f, 0.0f, 1.0f, image_size.height); + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "95675fbc4a16404c9568d41b14e8f6be64240998"); + ok(match, "Surface does not match.\n"); + + ID2D1RenderTarget_SetTransform(rt, &tmp_matrix); + ID2D1DeviceContext_Release(context); + } /* Creating a brush with a NULL bitmap crashes on Vista, but works fine on * Windows 7+. */

1 0

Jactry Zeng : d2d1: Skip empty source rectangle for ID2D1RenderTarget_DrawBitmap().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: e2a7ee33d09223c9b70879b4da21c871d04c7921 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2a7ee33d09223c9b70879b4… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jan 15 22:55:38 2021 +0800 d2d1: Skip empty source rectangle for ID2D1RenderTarget_DrawBitmap(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 3 +++ dlls/d2d1/tests/d2d1.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index b609a2c1e24..e8bc7207a67 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1087,6 +1087,9 @@ static void d2d_device_context_draw_bitmap(struct d2d_device_context *context, I d2d_rect_intersect(&s, src_rect); } + if (s.left == s.right || s.top == s.bottom) + return; + if (dst_rect) { d = *dst_rect; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 6e3bc4a51d2..19bb94530c2 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1835,6 +1835,11 @@ static void test_bitmap_brush(void) /* Invalid interpolation mode. */ ID2D1RenderTarget_BeginDraw(rt); + set_rect(&dst_rect, 4.0f, 8.0f, 8.0f, 12.0f); + set_rect(&src_rect, 0.0f, 1.0f, image_size.width, 1.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, &src_rect); + set_rect(&dst_rect, 1.0f, 8.0f, 4.0f, 12.0f); set_rect(&src_rect, 2.0f, 1.0f, 4.0f, 3.0f); ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 1.0f,

1 0

Jactry Zeng : d2d1: Limit source rectangle to the actual size for ID2D1RenderTarget_DrawBitmap().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 757ce04917f1f881c42bfad2c7b4b0d3586c174f URL: https://source.winehq.org/git/wine.git/?a=commit;h=757ce04917f1f881c42bfad2… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jan 15 22:55:37 2021 +0800 d2d1: Limit source rectangle to the actual size for ID2D1RenderTarget_DrawBitmap(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 18 ++++++------------ dlls/d2d1/tests/d2d1.c | 30 ++++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 3c8431ce8f4..b609a2c1e24 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1072,25 +1072,19 @@ static void d2d_device_context_draw_bitmap(struct d2d_device_context *context, I D2D1_BITMAP_BRUSH_PROPERTIES1 bitmap_brush_desc; D2D1_BRUSH_PROPERTIES brush_desc; struct d2d_brush *brush; + D2D1_SIZE_F size; D2D1_RECT_F s, d; HRESULT hr; if (perspective_transform) FIXME("Perspective transform is ignored.\n"); - if (src_rect) + size = ID2D1Bitmap_GetSize(bitmap); + d2d_rect_set(&s, 0.0f, 0.0f, size.width, size.height); + if (src_rect && src_rect->left <= src_rect->right + && src_rect->top <= src_rect->bottom) { - s = *src_rect; - } - else - { - D2D1_SIZE_F size; - - size = ID2D1Bitmap_GetSize(bitmap); - s.left = 0.0f; - s.top = 0.0f; - s.right = size.width; - s.bottom = size.height; + d2d_rect_intersect(&s, src_rect); } if (dst_rect) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d571cfe8d15..6e3bc4a51d2 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1676,6 +1676,7 @@ static void test_bitmap_brush(void) IDXGISwapChain *swapchain; ID2D1BitmapBrush1 *brush1; ID2D1BitmapBrush *brush; + D2D1_SIZE_F image_size; ID2D1RenderTarget *rt; ID3D10Device1 *device; IDXGISurface *surface; @@ -1740,6 +1741,7 @@ static void test_bitmap_brush(void) bitmap_desc.dpiY = 96.0f; hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + image_size = ID2D1Bitmap_GetSize(bitmap); hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Image, (void **)&image); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Vista */, "Failed to get ID2D1Image, hr %#x.\n", hr); @@ -1810,12 +1812,24 @@ static void test_bitmap_brush(void) D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); set_rect(&dst_rect, 0.0f, 8.0f, 4.0f, 12.0f); set_rect(&src_rect, 2.0f, 1.0f, 4.0f, 3.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, &src_rect); + set_rect(&dst_rect, 4.0f, 12.0f, 12.0f, 20.0f); + set_rect(&src_rect, 0.0f, 0.0f, image_size.width * 2, image_size.height * 2); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, &src_rect); + set_rect(&dst_rect, 4.0f, 8.0f, 12.0f, 12.0f); + set_rect(&src_rect, image_size.width / 2, image_size.height / 2, image_size.width, image_size.height); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, &src_rect); + set_rect(&dst_rect, 0.0f, 4.0f, 4.0f, 8.0f); + set_rect(&src_rect, image_size.width, 0.0f, 0.0f, image_size.height); ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 1.0f, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, &src_rect); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - match = compare_surface(surface, "9437f4447d98feaad41a1c4202ee90aadc718ee6"); + match = compare_surface(surface, "f5d039c280fa33ba05496c9883192a34108efbbe"); ok(match, "Surface does not match.\n"); /* Invalid interpolation mode. */ @@ -1828,7 +1842,19 @@ static void test_bitmap_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - match = compare_surface(surface, "9437f4447d98feaad41a1c4202ee90aadc718ee6"); + match = compare_surface(surface, "f5d039c280fa33ba05496c9883192a34108efbbe"); + ok(match, "Surface does not match.\n"); + + ID2D1RenderTarget_BeginDraw(rt); + ID2D1RenderTarget_Clear(rt, &color); + + set_rect(&src_rect, image_size.width, 0.0f, 0.0f, image_size.height); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, NULL, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, &src_rect); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "59043096393570ad800dbcbfdd644394b79493bd"); ok(match, "Surface does not match.\n"); ID2D1RenderTarget_BeginDraw(rt);

1 0

Biswapriyo Nath : propkey.h: Added more PROPERTYKEY declarations.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: c2d78a43674043595c51269e8c9e3caac76e2b0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2d78a43674043595c51269e… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Dec 31 12:42:51 2020 +0530 propkey.h: Added more PROPERTYKEY declarations. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/propkey.h | 310 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 310 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2d78a43674043595c51…

1 0

Dmitry Timoshkov : shell32: Return S_OK from IShellLink::SetFlags() stub.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 7690a91a736bf84822b24a296da1853ef055c20b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7690a91a736bf84822b24a29… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 22 17:38:00 2020 +0300 shell32: Return S_OK from IShellLink::SetFlags() stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 5b044d4be1d..46d9bc994ff 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2297,7 +2297,7 @@ static HRESULT WINAPI ShellLink_SetFlags( IShellLinkDataList* iface, DWORD dwFlags ) { FIXME("(%p)->(%u): stub\n", iface, dwFlags); - return E_NOTIMPL; + return S_OK; } static const IShellLinkDataListVtbl dlvt =

1 0

Alexandre Julliard : msvcrt: Fix some spec file discrepancies.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: dda104587bf734f2bbaf6c4b075d32ab6a0bb8c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dda104587bf734f2bbaf6c4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 17:05:55 2021 +0100 msvcrt: Fix some spec file discrepancies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 10 +++++----- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/msvcr71.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 8 ++++---- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4e981ca8718..b15a6219c52 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -657,7 +657,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) @ cdecl __strncnt(str long) -@ varargs __swprintf_l(ptr wstr ptr) +@ varargs __swprintf_l(ptr wstr ptr) @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread @@ -870,7 +870,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) -@ cdecl _gcvt_s(ptr long double long) +@ cdecl _gcvt_s(ptr long double long) @ cdecl _get_current_locale() @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) @@ -903,7 +903,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 5aef5e3739f..c4782b5977b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1005,7 +1005,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) @ cdecl __strncnt(str long) -@ varargs __swprintf_l(ptr wstr ptr) +@ varargs __swprintf_l(ptr wstr ptr) @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread @@ -1217,7 +1217,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) -@ cdecl _gcvt_s(ptr long double long) +@ cdecl _gcvt_s(ptr long double long) @ cdecl _get_current_locale() @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) @@ -1249,7 +1249,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) @@ -1340,9 +1340,9 @@ @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) -@ stub _ismbclower(long) +@ cdecl _ismbclower(long) @ cdecl _ismbclower_l(long ptr) -@ stub _ismbcprint(long) +@ cdecl _ismbcprint(long) @ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcpunct(long) @ cdecl _ismbcpunct_l(long ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 50cb4377fb5..b8ba61a2e8c 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1217,7 +1217,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) -@ cdecl _gcvt_s(ptr long double long) +@ cdecl _gcvt_s(ptr long double long) @ cdecl _get_current_locale() @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) @@ -1249,7 +1249,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) @@ -1345,7 +1345,7 @@ @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) -@ stub _ismbclower(long) +@ cdecl _ismbclower(long) @ cdecl _ismbclower_l(long ptr) @ cdecl _ismbcprint(long) @ cdecl _ismbcprint_l(long ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 144eb39ac29..b99bb2ee614 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1145,7 +1145,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) msvcr120._fwscanf_l @ varargs _fwscanf_s_l(ptr wstr ptr) msvcr120._fwscanf_s_l @ cdecl _gcvt(double long str) msvcr120._gcvt -@ cdecl _gcvt_s(ptr long double long) msvcr120._gcvt_s +@ cdecl _gcvt_s(ptr long double long) msvcr120._gcvt_s @ cdecl _get_current_locale() msvcr120._get_current_locale @ cdecl _get_daylight(ptr) msvcr120._get_daylight @ cdecl _get_doserrno(ptr) msvcr120._get_doserrno diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 07b1bb7298d..bdf94e26226 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -342,7 +342,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ stub _getsystime(ptr) @ cdecl _getw(ptr) @ cdecl _getwch() @@ -421,7 +421,7 @@ @ cdecl _mbbtombc(long) @ cdecl _mbbtype(long long) # extern _mbcasemap -@ cdecl _mbccpy(ptr str) +@ cdecl _mbccpy(ptr ptr) @ cdecl _mbcjistojms(long) @ cdecl _mbcjmstojis(long) @ cdecl _mbclen(ptr) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index b3231c0be45..98d35a337df 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -230,7 +230,7 @@ @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) @ cdecl _atodbl(ptr str) -@ cdecl -ret64 _atoi64(str) ntdll._atoi64 +@ cdecl -ret64 _atoi64(str) @ cdecl _atoldbl(ptr str) @ cdecl _beep(long long) @ cdecl _beginthread(ptr long ptr) @@ -337,7 +337,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ stub _getsystime(ptr) @ cdecl _getw(ptr) @ cdecl _getwch() @@ -416,7 +416,7 @@ @ cdecl _mbbtombc(long) @ cdecl _mbbtype(long long) # extern _mbcasemap -@ cdecl _mbccpy(ptr str) +@ cdecl _mbccpy(ptr ptr) @ cdecl _mbcjistojms(long) @ cdecl _mbcjmstojis(long) @ cdecl _mbclen(ptr) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 187aeabca6d..ddca7ed9ff7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -306,7 +306,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) @ cdecl __strncnt(str long) -@ varargs __swprintf_l(ptr wstr ptr) +@ varargs __swprintf_l(ptr wstr ptr) @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread @@ -536,7 +536,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) -@ cdecl _gcvt_s(ptr long double long) +@ cdecl _gcvt_s(ptr long double long) @ stub _get_amblksiz @ cdecl _get_current_locale() @ cdecl _get_daylight(ptr) @@ -576,7 +576,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9f8a3ba8877..5e35ded3570 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -290,7 +290,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) @ cdecl __strncnt(str long) -@ varargs __swprintf_l(ptr wstr ptr) +@ varargs __swprintf_l(ptr wstr ptr) @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread @@ -519,7 +519,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) -@ cdecl _gcvt_s(ptr long double long) +@ cdecl _gcvt_s(ptr long double long) @ stub _get_amblksiz @ cdecl _get_current_locale() @ cdecl _get_daylight(ptr) @@ -554,7 +554,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c40510a4889..f80c0af6700 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -500,7 +500,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) -@ cdecl _gcvt_s(ptr long double long) +@ cdecl _gcvt_s(ptr long double long) @ cdecl _get_current_locale() @ cdecl _get_doserrno(ptr) @ cdecl _get_environ(ptr) @@ -532,7 +532,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ stub _getsystime(ptr) @ cdecl _getw(ptr) @ cdecl _getwch() diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 9c78b3ba389..7162e5168a4 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -552,7 +552,7 @@ @ cdecl _unlock(long) @ cdecl -arch=win32 _utime(str ptr) _utime32 @ cdecl -arch=win64 _utime(str ptr) _utime64 -@ cdecl _vsnprintf(ptr long str ptr) +@ cdecl -norelay _vsnprintf(ptr long str ptr) @ cdecl _vsnwprintf(ptr long wstr ptr) @ cdecl _waccess(wstr long) @ cdecl _wasctime(ptr) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2a4a77865a8..b1d6cf992b4 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -394,7 +394,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ stub _getsystime(ptr) @ cdecl _getw(ptr) @ cdecl _getwc_nolock(ptr) _fgetwc_nolock @@ -484,7 +484,7 @@ @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) -@ stub _ismbclower(long) +@ cdecl _ismbclower(long) @ cdecl _ismbclower_l(long ptr) @ cdecl _ismbcprint(long) @ cdecl _ismbcprint_l(long ptr) @@ -623,7 +623,7 @@ @ cdecl _mbscspn_l(str str ptr) @ cdecl _mbsdec(ptr ptr) @ stub _mbsdec_l -@ stub _mbsdup(str) +@ cdecl _mbsdup(str) _strdup @ cdecl _mbsicmp(str str) @ stub _mbsicmp_l @ cdecl _mbsicoll(str str) @@ -2425,7 +2425,7 @@ @ cdecl memcpy(ptr ptr long) @ cdecl memcpy_s(ptr long ptr long) @ cdecl memmove(ptr ptr long) -@ cdecl memmove_s(ptr long ptr long) memmove_s +@ cdecl memmove_s(ptr long ptr long) @ cdecl memset(ptr long long) @ cdecl modf(double ptr) @ cdecl -arch=!i386 modff(float ptr)

1 0

Alexandre Julliard : msvcrt: Implement pwctype() functions.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 52a1737fc012554e81b8a931b879c60757029ea4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52a1737fc012554e81b8a931… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 17:04:34 2021 +0100 msvcrt: Implement pwctype() functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-locale-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/ctype.c | 16 ++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 3 ++- dlls/ucrtbase/ucrtbase.spec | 2 +- 15 files changed, 39 insertions(+), 22 deletions(-) diff --git a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec index 12bbbe6133c..dc2ec272202 100644 --- a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec +++ b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec @@ -5,7 +5,7 @@ @ cdecl ___mb_cur_max_l_func(ptr) ucrtbase.___mb_cur_max_l_func @ cdecl __initialize_lconv_for_unsigned_char() ucrtbase.__initialize_lconv_for_unsigned_char @ cdecl __pctype_func() ucrtbase.__pctype_func -@ stub __pwctype_func +@ cdecl __pwctype_func() ucrtbase.__pwctype_func @ cdecl _configthreadlocale(long) ucrtbase._configthreadlocale @ cdecl _create_locale(long str) ucrtbase._create_locale @ cdecl _free_locale(ptr) ucrtbase._free_locale diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2d2bc0d8db4..4e981ca8718 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -641,7 +641,7 @@ @ cdecl __p__mbctype() @ cdecl __p__pctype() @ cdecl __p__pgmptr() -@ stub __p__pwctype() +@ cdecl __p__pwctype() @ cdecl __p__timezone() @ cdecl __p__tzname() @ cdecl __p__wcmdln() @@ -649,7 +649,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo -@ stub __pwctype_func +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __set_app_type(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e46208d84c0..5aef5e3739f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -990,7 +990,7 @@ @ cdecl __p__mbctype() @ cdecl __p__pctype() @ cdecl __p__pgmptr() -@ stub __p__pwctype() +@ cdecl __p__pwctype() @ cdecl __p__timezone() @ cdecl __p__tzname() @ cdecl __p__wcmdln() @@ -998,7 +998,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo -@ stub __pwctype_func +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __set_app_type(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 962ebeb96c8..50cb4377fb5 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -980,7 +980,7 @@ @ cdecl __p__mbctype() @ cdecl __p__pctype() @ cdecl __p__pgmptr() -@ stub __p__pwctype() +@ cdecl __p__pwctype() @ cdecl __p__timezone() @ cdecl __p__tzname() @ cdecl __p__wcmdln() @@ -988,7 +988,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo -@ stub __pwctype_func +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __set_app_type(long) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d8c424100a9..144eb39ac29 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -960,7 +960,7 @@ @ cdecl __p__wpgmptr() msvcr120.__p__wpgmptr @ cdecl __pctype_func() msvcr120.__pctype_func @ extern __pioinfo msvcr120.__pioinfo -@ stub __pwctype_func +@ cdecl __pwctype_func() msvcr120.__pwctype_func @ cdecl __pxcptinfoptrs() msvcr120.__pxcptinfoptrs @ stub __report_gsfailure @ extern __setlc_active msvcr120.__setlc_active diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 53c6c27cc12..07b1bb7298d 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -181,7 +181,7 @@ @ cdecl __p__osver() @ cdecl __p__pctype() @ cdecl __p__pgmptr() -@ stub __p__pwctype() +@ cdecl __p__pwctype() @ cdecl __p__timezone() @ cdecl __p__tzname() @ cdecl __p__wcmdln() @@ -192,7 +192,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo -@ stub __pwctype_func +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ cdecl __security_error_handler(long ptr) @ cdecl __set_app_type(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 2bfdc16f0ba..b3231c0be45 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -176,7 +176,7 @@ @ cdecl __p__osver() @ cdecl __p__pctype() @ cdecl __p__pgmptr() -@ stub __p__pwctype() +@ cdecl __p__pwctype() @ cdecl __p__timezone() @ cdecl __p__tzname() @ cdecl __p__wcmdln() @@ -187,7 +187,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo -@ stub __pwctype_func +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ cdecl __security_error_handler(long ptr) @ cdecl __set_app_type(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b14f0c7fee1..187aeabca6d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -287,7 +287,7 @@ @ cdecl __p__osver() @ cdecl __p__pctype() @ cdecl __p__pgmptr() -@ stub __p__pwctype() +@ cdecl __p__pwctype() @ cdecl __p__timezone() @ cdecl __p__tzname() @ cdecl __p__wcmdln() @@ -298,7 +298,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo -@ stub __pwctype_func +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __set_app_type(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9aa743910ce..9f8a3ba8877 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -274,7 +274,7 @@ @ cdecl __p__mbctype() @ cdecl __p__pctype() @ cdecl __p__pgmptr() -@ stub __p__pwctype() +@ cdecl __p__pwctype() @ cdecl __p__timezone() @ cdecl __p__tzname() @ cdecl __p__wcmdln() @@ -282,7 +282,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo -@ stub __pwctype_func +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __set_app_type(long) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 7fc778eca4a..7cfba52c9f4 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -143,6 +143,22 @@ const unsigned short* CDECL __pctype_func(void) return get_locinfo()->pctype; } +/********************************************************************* + * __p__pwctype (MSVCRT.@) + */ +unsigned short** CDECL __p__pwctype(void) +{ + return &MSVCRT__pwctype; +} + +/********************************************************************* + * __pwctype_func (MSVCRT.@) + */ +const unsigned short* CDECL __pwctype_func(void) +{ + return MSVCRT__pwctype; +} + /********************************************************************* * _isctype_l (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 51195429088..c40510a4889 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -265,7 +265,7 @@ @ cdecl -arch=i386 __p__osver() @ cdecl -arch=i386 __p__pctype() @ cdecl -arch=i386 __p__pgmptr() -@ stub -arch=i386 __p__pwctype() +@ cdecl -arch=i386 __p__pwctype() @ cdecl -arch=i386 __p__timezone() @ cdecl -arch=i386 __p__tzname() @ cdecl -arch=i386 __p__wcmdln() @@ -276,7 +276,7 @@ @ cdecl -arch=i386 __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo -# stub __pwctype_func() +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ cdecl __set_app_type(long) @ extern __setlc_active MSVCRT___setlc_active diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 907d3ffed6e..7e2ec304979 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -825,7 +825,7 @@ @ cdecl -arch=i386 __p__osver() msvcrt.__p__osver @ cdecl -arch=i386 __p__pctype() msvcrt.__p__pctype @ cdecl -arch=i386 __p__pgmptr() msvcrt.__p__pgmptr -@ cdecl __p__pwctype() msvcrt.__p__pwctype +@ cdecl -arch=i386 __p__pwctype() msvcrt.__p__pwctype @ cdecl -arch=i386 __p__timezone() msvcrt.__p__timezone @ cdecl -arch=i386 __p__tzname() msvcrt.__p__tzname @ cdecl -arch=i386 __p__wcmdln() msvcrt.__p__wcmdln diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 9e25f4f2bc1..ebcf5df4fc3 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -904,7 +904,7 @@ @ cdecl -arch=i386 __p__osver() msvcrt.__p__osver @ cdecl -arch=i386 __p__pctype() msvcrt.__p__pctype @ cdecl -arch=i386 __p__pgmptr() msvcrt.__p__pgmptr -@ cdecl __p__pwctype() msvcrt.__p__pwctype +@ cdecl -arch=i386 __p__pwctype() msvcrt.__p__pwctype @ cdecl -arch=i386 __p__timezone() msvcrt.__p__timezone @ cdecl -arch=i386 __p__tzname() msvcrt.__p__tzname @ cdecl -arch=i386 __p__wcmdln() msvcrt.__p__wcmdln diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index cb29aedfe46..9c78b3ba389 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -173,7 +173,7 @@ @ cdecl __p__osver() @ cdecl __p__pctype() @ cdecl __p__pgmptr() -@ stub __p__pwctype() +@ cdecl __p__pwctype() @ cdecl __p__timezone() @ cdecl __p__tzname() @ cdecl __p__wcmdln() @@ -184,6 +184,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ cdecl __set_app_type(long) @ extern __setlc_active MSVCRT___setlc_active diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2631299d24c..2a4a77865a8 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -136,7 +136,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ cdecl __processing_throw() -@ stub __pwctype_func +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __setusermatherr(ptr)

1 0

Alexandre Julliard : msvcrt: Don't export fabsf on x86_64.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 5131905771017784a55d2ca099e6cb34544dc539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5131905771017784a55d2ca0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 17:03:10 2021 +0100 msvcrt: Don't export fabsf on x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 28 ++++++++++++++++------------ dlls/msvcrt/msvcrt.spec | 2 +- include/msvcrt/math.h | 8 ++++++-- 6 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 62e230a8740..e46208d84c0 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2015,7 +2015,7 @@ @ cdecl exp(double) @ cdecl -arch=!i386 expf(float) @ cdecl fabs(double) -@ cdecl -arch=!i386 fabsf(float) +@ cdecl -arch=arm,arm64 fabsf(float) @ cdecl fclose(ptr) @ cdecl feof(ptr) @ cdecl ferror(ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 509bb59ba43..962ebeb96c8 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2138,7 +2138,7 @@ @ cdecl expm1f(float) @ cdecl expm1l(double) expm1 @ cdecl fabs(double) -@ cdecl -arch=!i386 fabsf(float) +@ cdecl -arch=arm,arm64 fabsf(float) @ cdecl fclose(ptr) @ cdecl fdim(double double) @ cdecl fdimf(float float) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index f74140c2311..d8c424100a9 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1804,7 +1804,7 @@ @ cdecl expm1f(float) msvcr120.expm1f @ cdecl expm1l(double) msvcr120.expm1l @ cdecl fabs(double) msvcr120.fabs -@ cdecl -arch=!i386 fabsf(float) msvcr120.fabsf +@ cdecl -arch=arm,arm64 fabsf(float) msvcr120.fabsf @ cdecl fclose(ptr) msvcr120.fclose @ cdecl fdim(double double) msvcr120.fdim @ cdecl fdimf(float float) msvcr120.fdimf diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e6e837e52c6..3aba13d1478 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -713,18 +713,6 @@ float CDECL ceilf( float x ) return unix_funcs->ceilf(x); } -/********************************************************************* - * fabsf (MSVCRT.@) - * - * Copied from musl: src/math/fabsf.c - */ -float CDECL fabsf( float x ) -{ - union { float f; UINT32 i; } u = { x }; - u.i &= 0x7fffffff; - return u.f; -} - /********************************************************************* * floorf (MSVCRT.@) */ @@ -751,6 +739,22 @@ float CDECL modff( float x, float *iptr ) #endif +#if !defined(__i386__) && !defined(__x86_64__) && (_MSVCR_VER == 0 || _MSVCR_VER >= 110) + +/********************************************************************* + * fabsf (MSVCRT.@) + * + * Copied from musl: src/math/fabsf.c + */ +float CDECL fabsf( float x ) +{ + union { float f; UINT32 i; } u = { x }; + u.i &= 0x7fffffff; + return u.f; +} + +#endif + /********************************************************************* * acos (MSVCRT.@) * diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 63fb33ae300..51195429088 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1284,7 +1284,7 @@ @ cdecl exp(double) @ cdecl -arch=!i386 expf(float) @ cdecl fabs(double) -@ cdecl -arch=!i386 fabsf(float) +@ cdecl -arch=arm,arm64 fabsf(float) @ cdecl fclose(ptr) @ cdecl feof(ptr) @ cdecl ferror(ptr) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index d4bc140f228..43e82fc3bea 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -133,7 +133,6 @@ _ACRTIMP float __cdecl powf(float, float); _ACRTIMP float __cdecl sqrtf(float); _ACRTIMP float __cdecl ceilf(float); _ACRTIMP float __cdecl floorf(float); -_ACRTIMP float __cdecl fabsf(float); _ACRTIMP float __cdecl frexpf(float, int*); _ACRTIMP float __cdecl modff(float, float*); _ACRTIMP float __cdecl fmodf(float, float); @@ -161,7 +160,6 @@ static inline float powf(float x, float y) { return pow(x, y); } static inline float sqrtf(float x) { return sqrt(x); } static inline float ceilf(float x) { return ceil(x); } static inline float floorf(float x) { return floor(x); } -static inline float fabsf(float x) { return fabs(x); } static inline float frexpf(float x, int *y) { return frexp(x, y); } static inline float modff(float x, float *y) { double yd, ret = modf(x, &yd); *y = yd; return ret; } static inline float fmodf(float x, float y) { return fmod(x, y); } @@ -172,6 +170,12 @@ static inline int _fpclassf(float x) { return _fpclass(x); } #endif +#if !defined(__i386__) && !defined(__x86_64__) && (_MSVCR_VER == 0 || _MSVCR_VER >= 110) +_ACRTIMP float __cdecl fabsf(float); +#else +static inline float fabsf(float x) { return fabs(x); } +#endif + #if !defined(__i386__) || _MSVCR_VER>=120 _ACRTIMP float __cdecl _chgsignf(float);

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.2.166.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 6b2199c3da5609ff0be17384f86f5e191ab81f73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b2199c3da5609ff0be17384… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Jan 15 11:50:05 2021 +0100 winevulkan: Update to VK spec version 1.2.166. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 17 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 849 +++++++++++++++++++++------------------- 4 files changed, 458 insertions(+), 412 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b2199c3da5609ff0be1…

1 0

Georg Lehmann : winevulkan: Skip extensions that require a skipped extension.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: eb9f3dd3ad07aae3c9588bcff376ed2a7a8ef8d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb9f3dd3ad07aae3c9588bcf… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Jan 15 11:50:04 2021 +0100 winevulkan: Skip extensions that require a skipped extension. Needed to skip VK_NV_acquire_winrt_display in the next version bump. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 0ad169d5e78..ce603691d6e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -91,7 +91,6 @@ UNSUPPORTED_EXTENSIONS = [ # Device extensions "VK_AMD_display_native_hdr", - "VK_EXT_display_control", # Requires VK_EXT_display_surface_counter "VK_EXT_full_screen_exclusive", "VK_EXT_hdr_metadata", # Needs WSI work. "VK_EXT_pipeline_creation_feedback", @@ -2893,6 +2892,7 @@ class VkRegistry(object): extensions = [] exts = root.findall("./extensions/extension") deferred_exts = [] + skipped_exts = UNSUPPORTED_EXTENSIONS.copy() def process_ext(ext, deferred=False): ext_name = ext.attrib["name"] @@ -2907,6 +2907,7 @@ class VkRegistry(object): # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled": LOGGER.debug("Skipping disabled extension: {0}".format(ext_name)) + skipped_exts.append(ext_name) return # Defer extensions with 'sortorder' as they are order-dependent for spec-parsing. @@ -2919,6 +2920,7 @@ class VkRegistry(object): # or NV. if "KHX" in ext_name or "NVX" in ext_name: LOGGER.debug("Skipping experimental extension: {0}".format(ext_name)) + skipped_exts.append(ext_name) return # Extensions can define VkEnumValues which alias to provisional extensions. Pre-process @@ -2931,15 +2933,18 @@ class VkRegistry(object): platform = ext.attrib.get("platform") if platform and platform != "win32": LOGGER.debug("Skipping extensions {0} for platform {1}".format(ext_name, platform)) + skipped_exts.append(ext_name) return if not self._is_extension_supported(ext_name): LOGGER.debug("Skipping unsupported extension: {0}".format(ext_name)) + skipped_exts.append(ext_name) return elif "requires" in ext.attrib: # Check if this extension builds on top of another unsupported extension. requires = ext.attrib["requires"].split(",") - if len(set(requires).intersection(UNSUPPORTED_EXTENSIONS)) > 0: + if len(set(requires).intersection(skipped_exts)) > 0: + skipped_exts.append(ext_name) return LOGGER.debug("Loading extension: {0}".format(ext_name))

1 0

Damjan Jovanovic : mmsystem: Win16 DllEntryPoint uses HINSTANCE16, not HINSTANCE.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 7464d1042a10e4b013f764e3bbb52bedb6817ede URL: https://source.winehq.org/git/wine.git/?a=commit;h=7464d1042a10e4b013f764e3… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jan 12 17:42:50 2021 +0200 mmsystem: Win16 DllEntryPoint uses HINSTANCE16, not HINSTANCE. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmsystem.dll16/mmsystem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index 083ec2d6da6..445fc48d50e 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -66,7 +66,7 @@ CRITICAL_SECTION mmdrv_cs = { &mmdrv_critsect_debug, -1, 0, 0, 0, 0 }; * MMSYSTEM DLL entry point * */ -BOOL WINAPI MMSYSTEM_LibMain(DWORD fdwReason, HINSTANCE hinstDLL, WORD ds, +BOOL WINAPI MMSYSTEM_LibMain(DWORD fdwReason, HINSTANCE16 hinstDLL, WORD ds, WORD wHeapSize, DWORD dwReserved1, WORD wReserved2) { static int done;

1 0

Alex Henrie : include: Add new LCMAP constants.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: bbb8f1a338aeba0f419350ffe7a514968b839c72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbb8f1a338aeba0f419350ff… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 12 02:56:45 2021 -0700 include: Add new LCMAP constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnls.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/winnls.h b/include/winnls.h index e90b6f5a22f..07a31cfde88 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -394,17 +394,18 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' /* String mapping flags */ #define LCMAP_LOWERCASE 0x00000100 /* Make lower-case */ #define LCMAP_UPPERCASE 0x00000200 /* Make upper-case */ +#define LCMAP_TITLECASE 0x00000300 /* Make title-case */ #define LCMAP_SORTKEY 0x00000400 /* Create a sort key */ #define LCMAP_BYTEREV 0x00000800 /* Reverse the result */ - +#define LCMAP_HASH 0x00040000 #define LCMAP_HIRAGANA 0x00100000 /* Transform Japanese katakana into hiragana */ #define LCMAP_KATAKANA 0x00200000 /* Transform Japanese hiragana into katakana */ #define LCMAP_HALFWIDTH 0x00400000 /* Use single byte chars in output */ #define LCMAP_FULLWIDTH 0x00800000 /* Use double byte chars in output */ - #define LCMAP_LINGUISTIC_CASING 0x01000000 /* Change case by using language context */ #define LCMAP_SIMPLIFIED_CHINESE 0x02000000 /* Transform Chinese traditional into simplified */ #define LCMAP_TRADITIONAL_CHINESE 0x04000000 /* Transform Chinese simplified into traditional */ +#define LCMAP_SORTHANDLE 0x20000000 /* Date and time formatting flags */ #define DATE_SHORTDATE 0x01 /* Short date format */

1 0

Martin Storsjo : include: Don't use __attribute__((pcs("aapcs-vfp"))) when building in PE mode.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 52398912f954a28007468c41be7d108e0f9f11bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=52398912f954a28007468c41… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Jan 11 23:00:21 2021 +0200 include: Don't use __attribute__((pcs("aapcs-vfp"))) when building in PE mode. Clang doesn't support this attribute for windows targets right now; the attribute is only needed for selecting a potentially non-default calling convention on e.g. linux. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt.h | 4 ++-- include/windef.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index a66f43877ac..4adbe0920f6 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -79,7 +79,7 @@ # else # define __stdcall __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) # define __stdcall __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) @@ -120,7 +120,7 @@ #endif #ifndef WINAPIV -# if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) +# if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) # define WINAPIV __attribute__((pcs("aapcs"))) # else # define WINAPIV __cdecl diff --git a/include/windef.h b/include/windef.h index 5351afe66db..ac2ec619fbd 100644 --- a/include/windef.h +++ b/include/windef.h @@ -72,7 +72,7 @@ extern "C" { # else # define __stdcall __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) # define __stdcall __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # define __stdcall __attribute__((ms_abi)) @@ -120,7 +120,7 @@ extern "C" { # endif #endif -#if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) +#if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32) # define WINAPIV __attribute__((pcs("aapcs"))) #else # define WINAPIV __cdecl

1 0

Paul Gofman : dbghelp: Support UWOP_PUSH_MACHFRAME on x64.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 400520192284c34e5b34b52b657cd3dda084403f URL: https://source.winehq.org/git/wine.git/?a=commit;h=400520192284c34e5b34b52b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jan 15 16:06:41 2021 +0300 dbghelp: Support UWOP_PUSH_MACHFRAME on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_x86_64.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index c04d8db61cf..8e8ac85dd2f 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -474,6 +474,7 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, DWORD64 newframe, prolog_offset, off, value; M128A floatvalue; union handler_data handler_data; + BOOL mach_frame = FALSE; /* FIXME: we have some assumptions here */ assert(context); @@ -556,7 +557,23 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, set_float_reg(context, info->UnwindCode[i].u.OpInfo, floatvalue); break; case UWOP_PUSH_MACHFRAME: - FIXME("PUSH_MACHFRAME %u\n", info->UnwindCode[i].u.OpInfo); + if (info->Flags & UNW_FLAG_CHAININFO) + { + FIXME("PUSH_MACHFRAME with chained unwind info.\n"); + break; + } + if (i + get_opcode_size(info->UnwindCode[i]) < info->CountOfCodes) + { + FIXME("PUSH_MACHFRAME is not the last opcode.\n"); + break; + } + + if (info->UnwindCode[i].u.OpInfo) + context->Rsp += 0x8; + + if (!sw_read_mem(csw, context->Rsp, &context->Rip, sizeof(DWORD64))) return FALSE; + if (!sw_read_mem(csw, context->Rsp + 24, &context->Rsp, sizeof(DWORD64))) return FALSE; + mach_frame = TRUE; break; default: FIXME("unknown code %u\n", info->UnwindCode[i].u.UnwindOp); @@ -569,7 +586,7 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, &handler_data, sizeof(handler_data))) return FALSE; function = &handler_data.chain; /* restart with the chained info */ } - return default_unwind(csw, context); + return mach_frame ? TRUE : default_unwind(csw, context); } /* fetch_next_frame()

1 0

Paul Gofman : dbghelp: Fix unwind opcodes on x64.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 6bcde00566f506ffb1f7cfd9e584c793d6f4a02f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bcde00566f506ffb1f7cfd9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jan 15 16:06:40 2021 +0300 dbghelp: Fix unwind opcodes on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_x86_64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index c2789d0d71b..c04d8db61cf 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -41,7 +41,8 @@ typedef enum _UNWIND_OP_CODES UWOP_SET_FPREG, UWOP_SAVE_NONVOL, UWOP_SAVE_NONVOL_FAR, - UWOP_SAVE_XMM128, + UWOP_EPILOG, + UWOP_SAVE_XMM128 = 8, UWOP_SAVE_XMM128_FAR, UWOP_PUSH_MACHFRAME } UNWIND_CODE_OPS;

1 0

Alistair Leslie-Hughes : msado15: Implement ADOConnectionConstruction15 get_Session.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 8af32e41c2b3301fecf27ca673e2853dae9f494e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8af32e41c2b3301fecf27ca6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 15 18:22:15 2021 +1100 msado15: Implement ADOConnectionConstruction15 get_Session. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index c6a52e262c2..63014d7e37e 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -753,8 +753,12 @@ static HRESULT WINAPI adoconstruct_get_DSO(ADOConnectionConstruction15 *iface, I static HRESULT WINAPI adoconstruct_get_Session(ADOConnectionConstruction15 *iface, IUnknown **session) { struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); - FIXME("%p, %p\n", connection, session); - return E_NOTIMPL; + TRACE("%p, %p\n", connection, session); + + *session = connection->session; + if (*session) + IUnknown_AddRef(*session); + return S_OK; } static HRESULT WINAPI adoconstruct_WrapDSOandSession(ADOConnectionConstruction15 *iface, IUnknown *dso,

1 0

Alistair Leslie-Hughes : msado15: Support ADOConnectionConstruction15 on _Connection interface.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 3289a7a2d40e77036278b59462ab200a7020a4ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=3289a7a2d40e77036278b594… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 15 18:22:14 2021 +1100 msado15: Support ADOConnectionConstruction15 on _Connection interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msado15/tests/msado15.c | 2 +- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index fd15d5a443f..c6a52e262c2 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -50,6 +50,7 @@ struct connection _Connection Connection_iface; ISupportErrorInfo ISupportErrorInfo_iface; IConnectionPointContainer IConnectionPointContainer_iface; + ADOConnectionConstruction15 ADOConnectionConstruction15_iface; LONG refs; ObjectStateEnum state; LONG timeout; @@ -76,6 +77,11 @@ static inline struct connection *impl_from_IConnectionPointContainer( IConnectio return CONTAINING_RECORD( iface, struct connection, IConnectionPointContainer_iface ); } +static inline struct connection *impl_from_ADOConnectionConstruction15( ADOConnectionConstruction15 *iface ) +{ + return CONTAINING_RECORD( iface, struct connection, ADOConnectionConstruction15_iface ); +} + static inline struct connection_point *impl_from_IConnectionPoint( IConnectionPoint *iface ) { return CONTAINING_RECORD( iface, struct connection_point, IConnectionPoint_iface ); @@ -129,6 +135,10 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid { *obj = &connection->IConnectionPointContainer_iface; } + else if (IsEqualGUID( riid, &IID_ADOConnectionConstruction15 )) + { + *obj = &connection->ADOConnectionConstruction15_iface; + } else if (IsEqualGUID( riid, &IID_IRunnableObject )) { TRACE("IID_IRunnableObject not supported returning NULL\n"); @@ -715,6 +725,56 @@ static const IConnectionPointVtbl connpoint_vtbl = connpoint_EnumConnections }; +static HRESULT WINAPI adoconstruct_QueryInterface(ADOConnectionConstruction15 *iface, REFIID riid, void **obj) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + return _Connection_QueryInterface( &connection->Connection_iface, riid, obj ); +} + +static ULONG WINAPI adoconstruct_AddRef(ADOConnectionConstruction15 *iface) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + return _Connection_AddRef( &connection->Connection_iface ); +} + +static ULONG WINAPI adoconstruct_Release(ADOConnectionConstruction15 *iface) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + return _Connection_Release( &connection->Connection_iface ); +} + +static HRESULT WINAPI adoconstruct_get_DSO(ADOConnectionConstruction15 *iface, IUnknown **dso) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + FIXME("%p, %p\n", connection, dso); + return E_NOTIMPL; +} + +static HRESULT WINAPI adoconstruct_get_Session(ADOConnectionConstruction15 *iface, IUnknown **session) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + FIXME("%p, %p\n", connection, session); + return E_NOTIMPL; +} + +static HRESULT WINAPI adoconstruct_WrapDSOandSession(ADOConnectionConstruction15 *iface, IUnknown *dso, + IUnknown *session) +{ + struct connection *connection = impl_from_ADOConnectionConstruction15( iface ); + FIXME("%p, %p, %p\n", connection, dso, session); + return E_NOTIMPL; +} + +struct ADOConnectionConstruction15Vtbl ado_construct_vtbl = +{ + adoconstruct_QueryInterface, + adoconstruct_AddRef, + adoconstruct_Release, + adoconstruct_get_DSO, + adoconstruct_get_Session, + adoconstruct_WrapDSOandSession +}; + HRESULT Connection_create( void **obj ) { struct connection *connection; @@ -723,6 +783,7 @@ HRESULT Connection_create( void **obj ) connection->Connection_iface.lpVtbl = &connection_vtbl; connection->ISupportErrorInfo_iface.lpVtbl = &support_error_vtbl; connection->IConnectionPointContainer_iface.lpVtbl = &connpointcontainer_vtbl; + connection->ADOConnectionConstruction15_iface.lpVtbl = &ado_construct_vtbl; connection->refs = 1; connection->state = adStateClosed; connection->timeout = 30; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 8b08e8af193..50418690613 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -1046,7 +1046,7 @@ static void test_Connection(void) IConnectionPointContainer_Release(pointcontainer); hr = _Connection_QueryInterface(connection, &IID_ADOConnectionConstruction15, (void**)&construct); - todo_wine ok(hr == S_OK, "Failed to get ADOConnectionConstruction15 interface %08x\n", hr); + ok(hr == S_OK, "Failed to get ADOConnectionConstruction15 interface %08x\n", hr); if (hr == S_OK) ADOConnectionConstruction15_Release(construct);

1 0

Alistair Leslie-Hughes : msado15: Only support put CursorLocation on Closed Recordset.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 44501a2781010259921cbb34495ff8109173da08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44501a2781010259921cbb34… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 15 18:22:13 2021 +1100 msado15: Only support put CursorLocation on Closed Recordset. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index e915922fdc4..e830f66e1ba 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1279,6 +1279,8 @@ static HRESULT WINAPI recordset_put_CursorLocation( _Recordset *iface, CursorLoc TRACE( "%p, %u\n", iface, cursor_loc ); + if (recordset->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + recordset->cursor_location = cursor_loc; return S_OK;

1 0

Nikolay Sivov : dcomp: Add DCompositionCreateDevice() stub.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 8eabf58dee5b6212d14f425f2c32f6e42a7d8538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eabf58dee5b6212d14f425f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 14 22:45:05 2021 +0300 dcomp: Add DCompositionCreateDevice() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50459 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dcomp/dcomp.spec | 2 +- dlls/dcomp/device.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/dcomp/dcomp.spec b/dlls/dcomp/dcomp.spec index 10e9f49a412..428385e3a2a 100644 --- a/dlls/dcomp/dcomp.spec +++ b/dlls/dcomp/dcomp.spec @@ -15,7 +15,7 @@ @ stub DCompositionAttachMouseWheelToHwnd @ stdcall DCompositionCreateDevice2(ptr ptr ptr) @ stub DCompositionCreateDevice3 -@ stub DCompositionCreateDevice +@ stdcall DCompositionCreateDevice(ptr ptr ptr) @ stub DCompositionCreateSurfaceHandle @ stub DeserializeEffectDescription @ stub DllCanUnloadNow diff --git a/dlls/dcomp/device.c b/dlls/dcomp/device.c index efc6bacdb08..2d0600ce50a 100644 --- a/dlls/dcomp/device.c +++ b/dlls/dcomp/device.c @@ -20,10 +20,18 @@ #include "windef.h" #include "winbase.h" #include "objidl.h" +#include "dxgi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dcomp); +HRESULT WINAPI DCompositionCreateDevice(IDXGIDevice *dxgi_device, REFIID iid, void **device) +{ + FIXME("%p, %s, %p.\n", dxgi_device, debugstr_guid(iid), device); + + return E_NOTIMPL; +} + HRESULT WINAPI DCompositionCreateDevice2(IUnknown *rendering_device, REFIID iid, void **device) { FIXME("%p, %s, %p.\n", rendering_device, debugstr_guid(iid), device);

1 0

Nikolay Sivov : dcomp: Add DCompositionCreateDevice2().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: c9a0006e4fda676239b1db0b322dda83cc7f141c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9a0006e4fda676239b1db0b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 14 22:45:04 2021 +0300 dcomp: Add DCompositionCreateDevice2(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50357 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dcomp/Makefile.in | 1 + dlls/dcomp/dcomp.spec | 2 +- dlls/dcomp/device.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/dcomp/Makefile.in b/dlls/dcomp/Makefile.in index 6d75a87980f..436b88993ab 100644 --- a/dlls/dcomp/Makefile.in +++ b/dlls/dcomp/Makefile.in @@ -3,6 +3,7 @@ MODULE = dcomp.dll EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + device.c \ main.c RC_SRCS = version.rc diff --git a/dlls/dcomp/dcomp.spec b/dlls/dcomp/dcomp.spec index 03801ebba6f..10e9f49a412 100644 --- a/dlls/dcomp/dcomp.spec +++ b/dlls/dcomp/dcomp.spec @@ -13,7 +13,7 @@ @ stub CreateEffectDescription @ stub DCompositionAttachMouseDragToHwnd @ stub DCompositionAttachMouseWheelToHwnd -@ stub DCompositionCreateDevice2 +@ stdcall DCompositionCreateDevice2(ptr ptr ptr) @ stub DCompositionCreateDevice3 @ stub DCompositionCreateDevice @ stub DCompositionCreateSurfaceHandle diff --git a/dlls/dcomp/device.c b/dlls/dcomp/device.c new file mode 100644 index 00000000000..efc6bacdb08 --- /dev/null +++ b/dlls/dcomp/device.c @@ -0,0 +1,32 @@ +/* + * Copyright 2020 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objidl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dcomp); + +HRESULT WINAPI DCompositionCreateDevice2(IUnknown *rendering_device, REFIID iid, void **device) +{ + FIXME("%p, %s, %p.\n", rendering_device, debugstr_guid(iid), device); + + return E_NOTIMPL; +}

1 0

Nikolay Sivov : mf: Add a helper to get associated topology node object.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: c55dbcdb9a8f7d53f81393a0d8af6cfa8000dbb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c55dbcdb9a8f7d53f81393a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 14 22:40:17 2021 +0300 mf: Add a helper to get associated topology node object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/copier.c | 4 ++-- dlls/mf/mf_private.h | 3 ++- dlls/mf/session.c | 55 +++++++++++++++------------------------------- dlls/mf/topology.c | 62 +++++++++++++++++++++++++--------------------------- 4 files changed, 52 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c55dbcdb9a8f7d53f813…

1 0

Zebediah Figura : winegstreamer: Don't bother setting the GStreamer pipeline to PLAYING.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 20beb7abbef8085fb761ee80f96c2464e75452c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20beb7abbef8085fb761ee80… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 14 10:37:53 2021 -0600 winegstreamer: Don't bother setting the GStreamer pipeline to PLAYING. It's entirely unnecessary; only renderers and live sources care about this. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 97c25db89a7..0243f8e20c1 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1525,42 +1525,6 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) return S_OK; } -static HRESULT gstdemux_start_stream(struct strmbase_filter *iface, REFERENCE_TIME time) -{ - struct gstdemux *filter = impl_from_strmbase_filter(iface); - GstStateChangeReturn ret; - - if (!filter->container) - return S_OK; - - if ((ret = gst_element_set_state(filter->container, GST_STATE_PLAYING)) == GST_STATE_CHANGE_FAILURE) - { - ERR("Failed to play stream.\n"); - return E_FAIL; - } - else if (ret == GST_STATE_CHANGE_ASYNC) - return S_FALSE; - return S_OK; -} - -static HRESULT gstdemux_stop_stream(struct strmbase_filter *iface) -{ - struct gstdemux *filter = impl_from_strmbase_filter(iface); - GstStateChangeReturn ret; - - if (!filter->container) - return S_OK; - - if ((ret = gst_element_set_state(filter->container, GST_STATE_PAUSED)) == GST_STATE_CHANGE_FAILURE) - { - ERR("Failed to pause stream.\n"); - return E_FAIL; - } - else if (ret == GST_STATE_CHANGE_ASYNC) - return S_FALSE; - return S_OK; -} - static HRESULT gstdemux_cleanup_stream(struct strmbase_filter *iface) { struct gstdemux *filter = impl_from_strmbase_filter(iface); @@ -1613,8 +1577,6 @@ static const struct strmbase_filter_ops filter_ops = .filter_get_pin = gstdemux_get_pin, .filter_destroy = gstdemux_destroy, .filter_init_stream = gstdemux_init_stream, - .filter_start_stream = gstdemux_start_stream, - .filter_stop_stream = gstdemux_stop_stream, .filter_cleanup_stream = gstdemux_cleanup_stream, .filter_wait_state = gstdemux_wait_state, }; @@ -2740,8 +2702,6 @@ static const struct strmbase_filter_ops mpeg_splitter_ops = .filter_get_pin = gstdemux_get_pin, .filter_destroy = gstdemux_destroy, .filter_init_stream = gstdemux_init_stream, - .filter_start_stream = gstdemux_start_stream, - .filter_stop_stream = gstdemux_stop_stream, .filter_cleanup_stream = gstdemux_cleanup_stream, .filter_wait_state = gstdemux_wait_state, };

1 0

Zebediah Figura : winegstreamer: Don't force autoplug_blacklist() onto a Wine thread.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 3bf543589d0404689727b223bfa22890771113ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bf543589d0404689727b223… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 14 10:37:52 2021 -0600 winegstreamer: Don't force autoplug_blacklist() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 16 ---------------- dlls/winegstreamer/gst_cbs.h | 10 ---------- dlls/winegstreamer/gstdemux.c | 9 +-------- 3 files changed, 1 insertion(+), 34 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index e6b9a30d466..cb07cafb7bc 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -263,22 +263,6 @@ void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) call_cb(&cbdata); } -GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, - GstCaps *caps, GstElementFactory *fact, gpointer user) -{ - struct cb_data cbdata = { AUTOPLUG_BLACKLIST }; - - cbdata.u.autoplug_blacklist_data.bin = bin; - cbdata.u.autoplug_blacklist_data.pad = pad; - cbdata.u.autoplug_blacklist_data.caps = caps; - cbdata.u.autoplug_blacklist_data.fact = fact; - cbdata.u.autoplug_blacklist_data.user = user; - - call_cb(&cbdata); - - return cbdata.u.autoplug_blacklist_data.ret; -} - gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) { struct cb_data cbdata = { QUERY_SINK }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 546443bb4c6..9bb3572c5db 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -40,7 +40,6 @@ enum CB_TYPE { EVENT_SINK, GOT_DATA_SINK, REMOVED_DECODED_PAD, - AUTOPLUG_BLACKLIST, QUERY_SINK, GSTDEMUX_MAX, BYTESTREAM_WRAPPER_PULL, @@ -116,14 +115,6 @@ struct cb_data { GstPad *pad; gpointer user; } pad_removed_data; - struct autoplug_blacklist_data { - GstElement *bin; - GstPad *pad; - GstCaps *caps; - GstElementFactory *fact; - gpointer user; - GstAutoplugSelectResult ret; - } autoplug_blacklist_data; struct query_sink_data { GstPad *pad; GstObject *parent; @@ -153,7 +144,6 @@ gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DEC GstFlowReturn got_data_sink_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; -GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; GstFlowReturn bytestream_wrapper_pull_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 06fc630e47a..97c25db89a7 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1689,7 +1689,7 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter); - g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist_wrapper), filter); + g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist), filter); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_wrapper), filter); filter->their_sink = gst_element_get_static_pad(element, "sink"); @@ -2338,13 +2338,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) removed_decoded_pad(data->element, data->pad, data->user); break; } - case AUTOPLUG_BLACKLIST: - { - struct autoplug_blacklist_data *data = &cbdata->u.autoplug_blacklist_data; - cbdata->u.autoplug_blacklist_data.ret = autoplug_blacklist(data->bin, - data->pad, data->caps, data->fact, data->user); - break; - } case QUERY_SINK: { struct query_sink_data *data = &cbdata->u.query_sink_data;

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in autoplug_blacklist().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: c59bd77679685ab3e026e2e694c013dd7d8da60f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c59bd77679685ab3e026e2e6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 14 10:37:51 2021 -0600 winegstreamer: Avoid using Wine debug functions in autoplug_blacklist(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 992cdf01755..06fc630e47a 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -41,6 +41,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); +GST_DEBUG_CATEGORY_STATIC(wine); +#define GST_CAT_DEFAULT wine + static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; struct gstdemux @@ -1305,15 +1308,18 @@ static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, { const char *name = gst_element_factory_get_longname(fact); - if (strstr(name, "Player protection")) { - WARN("Blacklisted a/52 decoder because it only works in Totem\n"); + GST_TRACE("Using \"%s\".", name); + + if (strstr(name, "Player protection")) + { + GST_WARNING("Blacklisted a/52 decoder because it only works in Totem."); return GST_AUTOPLUG_SELECT_SKIP; } - if (!strcmp(name, "Fluendo Hardware Accelerated Video Decoder")) { - WARN("Disabled video acceleration since it breaks in wine\n"); + if (!strcmp(name, "Fluendo Hardware Accelerated Video Decoder")) + { + GST_WARNING("Disabled video acceleration since it breaks in wine."); return GST_AUTOPLUG_SELECT_SKIP; } - TRACE("using \"%s\"\n", name); return GST_AUTOPLUG_SELECT_TRY; } @@ -1812,11 +1818,19 @@ static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, return VFW_S_NO_MORE_ITEMS; } +static BOOL parser_init_gstreamer(void) +{ + if (!init_gstreamer()) + return FALSE; + GST_DEBUG_CATEGORY_INIT(wine, "WINE", GST_DEBUG_FG_RED, "Wine GStreamer support"); + return TRUE; +} + HRESULT gstdemux_create(IUnknown *outer, IUnknown **out) { struct gstdemux *object; - if (!init_gstreamer()) + if (!parser_init_gstreamer()) return E_FAIL; mark_wine_thread(); @@ -2466,7 +2480,7 @@ HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; struct gstdemux *object; - if (!init_gstreamer()) + if (!parser_init_gstreamer()) return E_FAIL; mark_wine_thread(); @@ -2585,7 +2599,7 @@ HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; struct gstdemux *object; - if (!init_gstreamer()) + if (!parser_init_gstreamer()) return E_FAIL; mark_wine_thread(); @@ -2744,7 +2758,7 @@ HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) static const WCHAR sink_name[] = {'I','n','p','u','t',0}; struct gstdemux *object; - if (!init_gstreamer()) + if (!parser_init_gstreamer()) return E_FAIL; mark_wine_thread();

1 0

Zebediah Figura : winegstreamer: Get rid of the unknown_type() callback.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 0d570d63a9dbd0edefc2a60a336ddc2d5eb85650 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d570d63a9dbd0edefc2a60a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 14 10:37:50 2021 -0600 winegstreamer: Get rid of the unknown_type() callback. This information is already printed by GStreamer via GST_MESSAGE_ERROR. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 12 ------------ dlls/winegstreamer/gst_cbs.h | 8 -------- dlls/winegstreamer/gstdemux.c | 14 -------------- 3 files changed, 34 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 51aaefa911d..e6b9a30d466 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -279,18 +279,6 @@ GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, return cbdata.u.autoplug_blacklist_data.ret; } -void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) -{ - struct cb_data cbdata = { UNKNOWN_TYPE }; - - cbdata.u.unknown_type_data.bin = bin; - cbdata.u.unknown_type_data.pad = pad; - cbdata.u.unknown_type_data.caps = caps; - cbdata.u.unknown_type_data.user = user; - - call_cb(&cbdata); -} - gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) { struct cb_data cbdata = { QUERY_SINK }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index a48999bbf71..546443bb4c6 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -41,7 +41,6 @@ enum CB_TYPE { GOT_DATA_SINK, REMOVED_DECODED_PAD, AUTOPLUG_BLACKLIST, - UNKNOWN_TYPE, QUERY_SINK, GSTDEMUX_MAX, BYTESTREAM_WRAPPER_PULL, @@ -125,12 +124,6 @@ struct cb_data { gpointer user; GstAutoplugSelectResult ret; } autoplug_blacklist_data; - struct unknown_type_data { - GstElement *bin; - GstPad *pad; - GstCaps *caps; - gpointer user; - } unknown_type_data; struct query_sink_data { GstPad *pad; GstObject *parent; @@ -161,7 +154,6 @@ GstFlowReturn got_data_sink_wrapper(GstPad *pad, GstObject *parent, GstBuffer *b GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) DECLSPEC_HIDDEN; -void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; GstFlowReturn bytestream_wrapper_pull_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1e91c9f8e7e..992cdf01755 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1352,13 +1352,6 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) return GST_BUS_DROP; } -static void unknown_type(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) -{ - gchar *strcaps = gst_caps_to_string(caps); - ERR("Could not find a filter for caps: %s\n", debugstr_a(strcaps)); - g_free(strcaps); -} - static HRESULT GST_Connect(struct gstdemux *This, IPin *pConnectPin) { LONGLONG avail; @@ -1691,7 +1684,6 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter); g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist_wrapper), filter); - g_signal_connect(element, "unknown-type", G_CALLBACK(unknown_type_wrapper), filter); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_wrapper), filter); filter->their_sink = gst_element_get_static_pad(element, "sink"); @@ -2339,12 +2331,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) data->pad, data->caps, data->fact, data->user); break; } - case UNKNOWN_TYPE: - { - struct unknown_type_data *data = &cbdata->u.unknown_type_data; - unknown_type(data->bin, data->pad, data->caps, data->user); - break; - } case QUERY_SINK: { struct query_sink_data *data = &cbdata->u.query_sink_data;

1 0

Henri Verbeet : wined3d: Use glFinish() for synchronisation when cleaning up a destroyed context in wined3d_context_gl_cleanup().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 3cc8147594de868884d3e57babff8eef058c63a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cc8147594de868884d3e57b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 12 21:15:57 2021 +0330 wined3d: Use glFinish() for synchronisation when cleaning up a destroyed context in wined3d_context_gl_cleanup(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50485 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 467f5b64d6c..a51e5ec9095 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1374,9 +1374,20 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) if (context_gl->valid) { - wined3d_context_gl_submit_command_fence(context_gl); - wined3d_context_gl_wait_command_fence(context_gl, - wined3d_device_gl(context_gl->c.device)->current_fence_id - 1); + /* If we're here because we're switching away from a previously + * destroyed context, acquiring a context in order to submit a fence + * is problematic. (In particular, we'd end up back here again in the + * process of switching to the newly acquired context.) */ + if (context_gl->c.destroyed) + { + gl_info->gl_ops.gl.p_glFinish(); + } + else + { + wined3d_context_gl_submit_command_fence(context_gl); + wined3d_context_gl_wait_command_fence(context_gl, + wined3d_device_gl(context_gl->c.device)->current_fence_id - 1); + } if (context_gl->dummy_arbfp_prog) GL_EXTCALL(glDeleteProgramsARB(1, &context_gl->dummy_arbfp_prog));

1 0

Zebediah Figura : gdi32: Do not compare face file names in insert_face_in_family_list() if either is NULL.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 96fdbabc722f95fd9c4051c1d6f73e5f9515afa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96fdbabc722f95fd9c4051c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 11 16:11:33 2021 -0600 gdi32: Do not compare face file names in insert_face_in_family_list() if either is NULL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50486 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7f243192cc3..6f50cc92a83 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -913,7 +913,7 @@ static BOOL insert_face_in_family_list( struct gdi_font_face *face, struct gdi_f debugstr_w(face->full_name), debugstr_w(family->family_name), cursor->version, face->version ); - if (face->file && !wcsicmp( face->file, cursor->file )) + if (face->file && cursor->file && !wcsicmp( face->file, cursor->file )) { cursor->refcount++; TRACE("Font %s already in list, refcount now %d\n",

1 0

Paul Gofman : d3d9/tests: Add more tests for shader validator.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 22dce3052c42c0f376f954ae64ee5c07992f2543 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22dce3052c42c0f376f954ae… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jan 11 22:02:56 2021 +0300 d3d9/tests: Add more tests for shader validator. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47229 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 155 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 153 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index fac9de172bd..ef8d9a34e25 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -14256,18 +14256,71 @@ struct IDirect3DShaderValidator9 const struct IDirect3DShaderValidator9Vtbl *vtbl; }; +#define MAX_VALIDATOR_CB_CALL_COUNT 5 + +struct test_shader_validator_cb_context +{ + unsigned int call_count; + const char *file[MAX_VALIDATOR_CB_CALL_COUNT]; + int line[MAX_VALIDATOR_CB_CALL_COUNT]; + DWORD_PTR message_id[MAX_VALIDATOR_CB_CALL_COUNT]; + const char *message[MAX_VALIDATOR_CB_CALL_COUNT]; +}; + HRESULT WINAPI test_shader_validator_cb(const char *file, int line, DWORD_PTR arg3, DWORD_PTR message_id, const char *message, void *context) { - ok(0, "Unexpected call.\n"); + if (context) + { + struct test_shader_validator_cb_context *c = context; + + c->file[c->call_count] = file; + c->line[c->call_count] = line; + c->message_id[c->call_count] = message_id; + c->message[c->call_count] = message; + ++c->call_count; + } + else + { + ok(0, "Unexpected call.\n"); + } return S_OK; } static void test_shader_validator(void) { + static const unsigned int dcl_texcoord_9_9[] = {0x0200001f, 0x80090005, 0x902f0009}; /* dcl_texcoord9_pp v9 */ + static const unsigned int dcl_texcoord_9_10[] = {0x0200001f, 0x80090005, 0x902f000a}; /* dcl_texcoord9_pp v10 */ + static const unsigned int dcl_texcoord_10_9[] = {0x0200001f, 0x800a0005, 0x902f0009}; /* dcl_texcoord10_pp v9 */ + static const unsigned int mov_r2_v9[] = {0x02000001, 0x80220002, 0x90ff0009}; /* mov_pp r2.y, v9.w */ + static const unsigned int mov_r2_v10[] = {0x02000001, 0x80220002, 0x90ff000a}; /* mov_pp r2.y, v10.w */ + + static const unsigned int ps_3_0 = D3DPS_VERSION(3, 0); + static const unsigned int end_token = 0x0000ffff; + static const char *test_file_name = "test_file"; + static const struct instruction_test + { + unsigned int shader_version; + const unsigned int *instruction; + unsigned int instruction_length; + DWORD_PTR message_id; + const unsigned int *decl; + unsigned int decl_length; + } + instruction_tests[] = + { + {D3DPS_VERSION(3, 0), dcl_texcoord_9_9, ARRAY_SIZE(dcl_texcoord_9_9)}, + {D3DPS_VERSION(3, 0), dcl_texcoord_9_10, ARRAY_SIZE(dcl_texcoord_9_10), 0x12c}, + {D3DPS_VERSION(3, 0), dcl_texcoord_10_9, ARRAY_SIZE(dcl_texcoord_10_9)}, + {D3DPS_VERSION(3, 0), mov_r2_v9, ARRAY_SIZE(mov_r2_v9), 0, dcl_texcoord_9_9, ARRAY_SIZE(dcl_texcoord_9_9)}, + {D3DPS_VERSION(3, 0), mov_r2_v10, ARRAY_SIZE(mov_r2_v10), 0x167}, + }; + + struct test_shader_validator_cb_context context; IDirect3DShaderValidator9 *validator; + HRESULT expected_hr, hr; + unsigned int i; ULONG refcount; - HRESULT hr; validator = Direct3DShaderValidatorCreate9(); @@ -14290,6 +14343,104 @@ static void test_shader_validator(void) hr = validator->vtbl->End(validator); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Begin(validator, test_shader_validator_cb, &context, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(&context, 0, sizeof(context)); + hr = validator->vtbl->Instruction(validator, test_file_name, 28, &simple_vs[1], 3); + todo_wine + { + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(context.call_count == 2, "Got unexpected call_count %u.\n", context.call_count); + ok(!!context.message[0], "Got NULL message.\n"); + ok(!!context.message[1], "Got NULL message.\n"); + ok(context.message_id[0] == 0xef, "Got unexpected message_id[0] %p.\n", (void *)context.message_id[0]); + ok(context.message_id[1] == 0xf0, "Got unexpected message_id[1] %p.\n", (void *)context.message_id[1]); + ok(context.line[0] == -1, "Got unexpected line %d.\n", context.line[0]); + } + ok(!context.file[0], "Got unexpected file[0] %s.\n", context.file[0]); + ok(!context.file[1], "Got unexpected file[0] %s.\n", context.file[1]); + ok(!context.line[1], "Got unexpected line %d.\n", context.line[1]); + + memset(&context, 0, sizeof(context)); + hr = validator->vtbl->End(validator); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!context.call_count, "Got unexpected call_count %u.\n", context.call_count); + + memset(&context, 0, sizeof(context)); + hr = validator->vtbl->Begin(validator, test_shader_validator_cb, &context, 0); + todo_wine + { + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(context.call_count == 1, "Got unexpected call_count %u.\n", context.call_count); + ok(context.message_id[0] == 0xeb, "Got unexpected message_id[0] %p.\n", (void *)context.message_id[0]); + ok(!!context.message[0], "Got NULL message.\n"); + } + ok(!context.file[0], "Got unexpected file[0] %s.\n", context.file[0]); + ok(!context.line[0], "Got unexpected line %d.\n", context.line[0]); + + hr = validator->vtbl->Begin(validator, NULL, &context, 0); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + refcount = validator->vtbl->Release(validator); + todo_wine ok(!refcount, "Validator has %u references left.\n", refcount); + validator = Direct3DShaderValidatorCreate9(); + + hr = validator->vtbl->Begin(validator, NULL, &context, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, test_file_name, 1, &ps_3_0, 1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, test_file_name, 5, &end_token, 1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->End(validator); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(instruction_tests); ++i) + { + const struct instruction_test *test = &instruction_tests[i]; + + hr = validator->vtbl->Begin(validator, test_shader_validator_cb, &context, 0); + ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + + hr = validator->vtbl->Instruction(validator, test_file_name, 1, &test->shader_version, 1); + ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + + if (test->decl) + { + memset(&context, 0, sizeof(context)); + hr = validator->vtbl->Instruction(validator, test_file_name, 3, test->decl, test->decl_length); + ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + ok(!context.call_count, "Got unexpected call_count %u, test %u.\n", context.call_count, i); + } + + memset(&context, 0, sizeof(context)); + hr = validator->vtbl->Instruction(validator, test_file_name, 3, test->instruction, test->instruction_length); + ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + if (test->message_id) + { + todo_wine + { + ok(context.call_count == 1, "Got unexpected call_count %u, test %u.\n", context.call_count, i); + ok(!!context.message[0], "Got NULL message, test %u.\n", i); + ok(context.message_id[0] == test->message_id, "Got unexpected message_id[0] %p, test %u.\n", + (void *)context.message_id[0], i); + ok(context.file[0] == test_file_name, "Got unexpected file[0] %s, test %u.\n", context.file[0], i); + ok(context.line[0] == 3, "Got unexpected line %d, test %u.\n", context.line[0], i); + } + } + else + { + ok(!context.call_count, "Got unexpected call_count %u, test %u.\n", context.call_count, i); + } + + hr = validator->vtbl->Instruction(validator, test_file_name, 5, &end_token, 1); + ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + + hr = validator->vtbl->End(validator); + expected_hr = test->message_id ? E_FAIL : S_OK; + todo_wine_if(expected_hr) ok(hr == expected_hr, "Got unexpected hr %#x, test %u.\n", hr, i); + } + refcount = validator->vtbl->Release(validator); todo_wine ok(!refcount, "Validator has %u references left.\n", refcount); }

1 0

Francois Gouget : testbot/build: ARCH_STRING has been renamed to GECKO_ARCH.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: tools Branch: master Commit: 6af8a63bf067a4a6d6bed9112efb681de0c49482 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6af8a63bf067a4a6d6bed91… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 15 16:14:41 2021 +0100 testbot/build: ARCH_STRING has been renamed to GECKO_ARCH. This matches the MONO_ARCH property. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index aa78618..a56a4f2 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -490,11 +490,7 @@ sub UpdateAddOns() my $Arch = ""; while (my $Line= <$fh>) { - if ($Line =~ /^\s*#\s*define\s+ARCH_STRING\s+"([^"]+)"/) - { - $Arch = $1; - } - elsif ($Line =~ /^\s*#\s*define\s+(?:GECKO|MONO)_ARCH\s+"([^"]+)"/) + if ($Line =~ /^\s*#\s*define\s+(?:GECKO|MONO)_ARCH\s+"([^"]+)"/) { $Arch = $1; }

1 0

Francois Gouget : testbot: Take into account configure for the build timeout.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: tools Branch: master Commit: e9d470d7e63724d8f989603b47830ece7fc1b1d9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e9d470d7e63724d8f989603… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 15 16:09:19 2021 +0100 testbot: Take into account configure for the build timeout. It is likely that configure will need to be rerun after a make_makefiles, even outside of full rebuilds. In particular this is the case when adding a new dll, program or test directory. So take the configure time out of the full-rebuild timeouts and into its own $ReconfigBuildTimeout setting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 11 +++++++---- testbot/lib/WineTestBot/PatchUtils.pm | 7 +++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 68709e5..2f01e95 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -31,7 +31,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc - $ExeBuildTimeout $ExeModuleTimeout + $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin $SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize $TagPrefix $ProjectName $PatchesMailingList $LDAPServer @@ -48,7 +48,7 @@ require Exporter; $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout - $ExeBuildTimeout $ExeModuleTimeout + $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin $SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize $TagPrefix $ProjectName $PatchesMailingList @@ -109,15 +109,18 @@ $MaxVMErrors = 3; # How many times to run a test that fails before giving up. $MaxTaskTries = 3; +# Build configure timeout (in seconds) +$ReconfigBuildTimeout = 60; + # Exe build timeouts (in seconds) # - For a full build -$ExeBuildTimeout = 7 * 60; +$ExeBuildTimeout = 6 * 60; # - For a single module $ExeModuleTimeout = 30; # Wine build timeouts (in seconds) # - For a full build -$WineBuildTimeout = 25 * 60; +$WineBuildTimeout = 24 * 60; # - For a single module $WineModuleTimeout = 60; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 26c16c4..974ff8e 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -521,19 +521,22 @@ sub GetBuildTimeout($$) # Set $ModuleCount to 0 if a full rebuild is needed my $ModuleCount = (!$Impacts or $Impacts->{RebuildRoot}) ? 0 : scalar(keys %{$Impacts->{BuildModules}}); + my $Reconfig = (!$Impacts or $Impacts->{Autoconf} or $Impacts->{MakeMakefiles}); my ($ExeTimeout, $WineTimeout) = (0, 0); if ($ExeCount) { my $OneBuild = $ModuleCount ? $ModuleCount * $ExeModuleTimeout : $ExeBuildTimeout; - $ExeTimeout = $ExeCount * min($ExeBuildTimeout, $OneBuild); + $ExeTimeout = $ExeCount * min($ExeBuildTimeout, $OneBuild) + + ($Reconfig ? $ExeCount * $ReconfigBuildTimeout : 0); } if ($WineCount) { my $OneBuild = $ModuleCount ? $ModuleCount * $WineModuleTimeout : $WineBuildTimeout; - $WineTimeout = $WineCount * min($WineBuildTimeout, $OneBuild); + $WineTimeout = $WineCount * min($WineBuildTimeout, $OneBuild) + + ($Reconfig ? $WineCount * $ReconfigBuildTimeout : 0); } return $ExeTimeout + $WineTimeout;

1 0

Alexandre Julliard : packaging: Update .deb package names for new OBS scheme.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: tools Branch: master Commit: d0538f3bad27a742ca19b37fae1ecdef16098399 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d0538f3bad27a742ca19b37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 21:19:06 2021 +0100 packaging: Update .deb package names for new OBS scheme. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 6ddbc48..29960d3 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -71,14 +71,14 @@ add_deb () test -d $dstdir || mkdir -p $dstdir for arch in $deb_archs do - rsync -aq $obsdir/$arch/${wine_pkg}_$debver\~${2}_$arch.deb $obsdir/$arch/${winehq_pkg}_$debver\~${2}_$arch.deb $dstdir/binary-$arch/ + rsync -aq $obsdir/$arch/${wine_pkg}_$debver\~${2}-1_$arch.deb $obsdir/$arch/${winehq_pkg}_$debver\~${2}-1_$arch.deb $dstdir/binary-$arch/ done - dscverify -u $obsdir/$source_pkg\~$2.dsc - if test -f $obsdir/$source_pkg\~$2.diff.gz + dscverify -u $obsdir/$source_pkg\~$2-1.dsc + if test -f $obsdir/$source_pkg\~$2-1.diff.gz then - rsync -aq $obsdir/$source_pkg\~$2.dsc $obsdir/$source_pkg\~$2.diff.gz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ + rsync -aq $obsdir/$source_pkg\~$2-1.dsc $obsdir/$source_pkg\~$2-1.diff.gz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ else - rsync -aq $obsdir/$source_pkg\~$2.dsc $obsdir/$source_pkg\~$2.tar.xz $dstdir/source/ + rsync -aq $obsdir/$source_pkg\~$2-1.dsc $obsdir/$source_pkg\~$2-1.debian.tar.xz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ fi if test -n "$4"

1 0

Francois Gouget : testbot/PatchUtils: Propagate all build flags.
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: tools Branch: master Commit: b093534160268a0ab11b5bc4ef50454cc6bb8d51 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b093534160268a0ab11b5bc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 12 18:18:37 2021 +0100 testbot/PatchUtils: Propagate all build flags. MakeErrors, MakeFir, MakeOpenGL and MakeUnicode must be propagated to the last patchset part too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index ffe0ec4..26c16c4 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -396,9 +396,10 @@ sub GetPatchImpacts($) $Impacts->{BuildModules} = {}; # Also backup the build-related fields. - foreach my $Field ("Autoconf", "MakeMakefiles", "MakeRequests", - "MakeVulkan", "PatchedRoot", "PatchedModules", - "PatchedTests") + foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles", + "MakeOpenGL", "MakeRequests", "MakeUnicode", + "MakeVulkan", + "PatchedRoot", "PatchedModules", "PatchedTests") { $PastImpacts->{$Field} = $Impacts->{$Field}; $Impacts->{$Field} = undef; @@ -490,10 +491,12 @@ sub GetPatchImpacts($) # ... even if the patch was in previous parts if ($PastImpacts) { - $Impacts->{Autoconf} ||= $PastImpacts->{Autoconf}; - $Impacts->{MakeMakefiles} ||= $PastImpacts->{MakeMakefiles}; - $Impacts->{MakeRequests} ||= $PastImpacts->{MakeRequests}; - $Impacts->{MakeVulkan} ||= $PastImpacts->{MakeVulkan}; + foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles", + "MakeOpenGL", "MakeRequests", "MakeUnicode", + "MakeVulkan") + { + $Impacts->{$Field} ||= $PastImpacts->{$Field}; + } $Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot}; $Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules}; map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}};

1 0

Francois Gouget : testbot: Update the build timeout calculations.
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: tools Branch: master Commit: 70f1d2799e3a094cea3ff31d82dfd97d58f7d9ea URL: https://source.winehq.org/git/tools.git/?a=commit;h=70f1d2799e3a094cea3ff31… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 12 18:15:33 2021 +0100 testbot: Update the build timeout calculations. Ever since the Wine build has been simplified there is no separate 'native' Wine build. So there is no need for the $ExeBuildNativeTimeout constant anymore. This allows renaming $ExeBuildTestTimeout to $ExeBuildTimeout, so it follows the same naming scheme as $WineBuildTimeout. Also notice that the 'exe*' and 'win*' timeout calculations have the same structure which makes sense since BuildWine() handles both. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47849 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 7 +++---- testbot/lib/WineTestBot/PatchUtils.pm | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index ca3e983..68709e5 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -31,7 +31,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc - $ExeBuildNativeTimeout $ExeBuildTestTimeout $ExeModuleTimeout + $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin $SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize $TagPrefix $ProjectName $PatchesMailingList $LDAPServer @@ -48,7 +48,7 @@ require Exporter; $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout - $ExeBuildNativeTimeout $ExeBuildTestTimeout $ExeModuleTimeout + $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin $SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize $TagPrefix $ProjectName $PatchesMailingList @@ -111,8 +111,7 @@ $MaxTaskTries = 3; # Exe build timeouts (in seconds) # - For a full build -$ExeBuildNativeTimeout = 2 * 60; -$ExeBuildTestTimeout = 7 * 60; +$ExeBuildTimeout = 7 * 60; # - For a single module $ExeModuleTimeout = 30; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index dbd14f2..ffe0ec4 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -523,9 +523,8 @@ sub GetBuildTimeout($$) if ($ExeCount) { my $OneBuild = $ModuleCount ? $ModuleCount * $ExeModuleTimeout : - $ExeBuildTestTimeout; - $ExeTimeout = ($ModuleCount ? 0 : $ExeBuildNativeTimeout) + - $ExeCount * min($ExeBuildTestTimeout, $OneBuild); + $ExeBuildTimeout; + $ExeTimeout = $ExeCount * min($ExeBuildTimeout, $OneBuild); } if ($WineCount) {

1 0

Francois Gouget : testbot/Engine: Fix attachment support in HandleWinePatchMLSubmission().
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: tools Branch: master Commit: 82e6398fe915ce4a4ef0c86c43c4b9bf8788b8fb URL: https://source.winehq.org/git/tools.git/?a=commit;h=82e6398fe915ce4a4ef0c86… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 12 18:15:03 2021 +0100 testbot/Engine: Fix attachment support in HandleWinePatchMLSubmission(). By default MIME:Parser::Filer uses the attachement's recommended filename to save it to disk. However that name is tainted which causes Perl to throw an exception. Since we don't actually care about the filename (all mailing list patches are called 'patch.diff'), simply tell the filer to generate its own filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 48bb797..db9d82d 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -428,6 +428,7 @@ sub HandleWinePatchMLSubmission() # Process the email my $Parser = new MIME::Parser; $Parser->output_dir($WorkDir); + $Parser->filer->ignore_filename(1); my $Entity = $Parser->parse_open($FullMessageFileName); my $ErrMessage = CreatePatches()->NewPatch($Entity); if (defined $ErrMessage)

1 0

Francois Gouget : testbot/Patches: The Patches::NewPatch()'s WebPatchId argument is optional.
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: tools Branch: master Commit: 57d774ffe3b35e94e2be47b8cbce4cdc709f945d URL: https://source.winehq.org/git/tools.git/?a=commit;h=57d774ffe3b35e94e2be47b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 12 18:12:10 2021 +0100 testbot/Patches: The Patches::NewPatch()'s WebPatchId argument is optional. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 54b6c5e..cb8c78c 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -516,7 +516,7 @@ others, then C<WineTestBot::Patch::Submit()> is called right away. =back =cut -sub NewPatch($$$) +sub NewPatch($$;$) { my ($self, $MsgEntity, $WebPatchId) = @_;

1 0

Francois Gouget : testbot/TestLauncher: Remove the unused bindir variable.
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: tools Branch: master Commit: 4aa44795dec4a7eae8e13927d8c4339e79b544f8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4aa44795dec4a7eae8e1392… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 12 18:11:58 2021 +0100 testbot/TestLauncher: Remove the unused bindir variable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile index b040353..7c9a351 100644 --- a/testbot/src/TestLauncher/Makefile +++ b/testbot/src/TestLauncher/Makefile @@ -1,5 +1,3 @@ -bindir = ../../bin/windows - CROSSCC32 = i686-w64-mingw32-gcc CROSSSTRIP32 = i686-w64-mingw32-strip CROSSCC64 = x86_64-w64-mingw32-gcc

1 0

Alexandre Julliard : update-winehq: Fix formatting of news item for major release.
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: tools Branch: master Commit: bfaa1e39cbbeceeb03e0f556ae018c4e3d427abe URL: https://source.winehq.org/git/tools.git/?a=commit;h=bfaa1e39cbbeceeb03e0f55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 14 17:08:48 2021 +0100 update-winehq: Fix formatting of news item for major release. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- update-winehq | 71 +++++++++++++++++++++++------------------------------------ 1 file changed, 27 insertions(+), 44 deletions(-) diff --git a/update-winehq b/update-winehq index 4ba11d4..9ea758d 100755 --- a/update-winehq +++ b/update-winehq @@ -33,9 +33,7 @@ system("git", "pull") == 0 or die "git pull failed"; # Parse the ANNOUNCE file open ANNOUNCE, $ARGV[1] || "ANNOUNCE" or die "cannot open ANNOUNCE"; -my $whats_new = 0; -my $release_notes = 0; -my $first = 1; +my $ul = 0; my $url; push @text, "<body>\n"; @@ -43,52 +41,37 @@ push @text, "<body>\n"; while (<ANNOUNCE>) { chomp; - if (!$whats_new && !$release_notes) + if (/^What's new in this release/) { - if (/^What's new in this release/) - { - $whats_new = 1; - push @text, " <a href=\"{\$root}/announce/$rel\">What's new</a> in this release:"; - next; - } - elsif (/See the release notes/) - { - $release_notes = 1; - xml_escape($_); - s/See the release notes/See the <a href=\"{\$root}\/announce\/$rel\">release notes<\/a>/; - push @text, " " . $_; - next; - } - if (/^\s*$/) - { - push @text, "\n"; - next; - } - last if (/^The source is available/); - last if (/^--------------------/); - push @text, " " . xml_escape($_); + push @text, " <a href=\"{\$root}/announce/$rel\">What's new</a> in this release:"; + next; } - else + elsif (/the release notes/) { - if (/^ *- (.*)$/) - { - push @text, ($first ? "\n<ul>\n <li>" : "</li>\n <li>") . xml_escape($1); - $first = 0; - next; - } - if (/^\s*$/) + xml_escape($_); + s/the release notes/the <a href=\"{\$root}\/announce\/$rel\">release notes<\/a>/; + push @text, " " . $_; + next; + } + if (/^\s*$/) + { + if ($ul) { - if ($release_notes) { - push @text, "\n"; - } else { - push @text, "</li>\n</ul>\n"; - } - $whats_new = 0; - $release_notes = 0; - next; + push @text, "</li>\n</ul>\n"; + $ul = 0; } - push @text, " " . xml_escape($_); + push @text, "\n"; + next; + } + if (/^ *- (.*)$/) + { + push @text, (!$ul ? "\n<ul>\n <li>" : "</li>\n <li>") . xml_escape($1); + $ul = 1; + next; } + last if (/^The source is available/); + last if (/^--------------------/); + push @text, " " . xml_escape($_); } while (<ANNOUNCE>) @@ -101,7 +84,7 @@ while (<ANNOUNCE>) } die "Download URL not found" unless $url; -push @text, "The source is <a href=\"$url\">available now</a>.\n"; +push @text, "The source is <a href=\"$url\">available now</a>.\n"; push @text, "Binary packages are in the process of being built, and will appear soon at their respective <a href=\"{\$root}/download\">download locations</a>.\n"; push @text, "</body></news>\n"; close ANNOUNCE;

1 0

Zebediah Figura : vkd3d-shader: Implement stringification.
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: vkd3d Branch: master Commit: d33a8964031274576dc7b713a8dd5d6355f9d587 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d33a8964031274576dc7b71… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 12 16:14:21 2021 -0600 vkd3d-shader: Implement stringification. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 41 ++++++++++++++++++++++++++++++++++++++++- libs/vkd3d-shader/preproc.y | 4 +++- tests/hlsl_d3d12.c | 2 +- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 18a59b7..388b77f 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -104,7 +104,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* const char *p; if (!ctx->last_was_newline) - return T_TEXT; + return T_HASHSTRING; for (p = yytext + 1; strchr(" \t", *p); ++p) ; @@ -247,6 +247,7 @@ static int return_token(int token, YYSTYPE *lval, const char *text) { switch (token) { + case T_HASHSTRING: case T_IDENTIFIER: case T_IDENTIFIER_PAREN: case T_INTEGER: @@ -389,6 +390,9 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) switch (func_state->state) { case STATE_NONE: + { + struct preproc_macro *macro; + if (token == T_CONCAT && should_concat(ctx)) { while (ctx->buffer.content_size @@ -397,6 +401,40 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) break; } + /* Stringification, however, is only done for function-like + * macro bodies. */ + if (token == T_HASHSTRING && (macro = preproc_get_top_macro(ctx)) && macro->arg_count) + { + const struct preproc_text *expansion; + const char *p = text + 1; + unsigned int i; + + if (ctx->current_directive) + return return_token(token, lval, text); + + while (*p == ' ' || *p == '\t') + ++p; + + vkd3d_string_buffer_printf(&ctx->buffer, "\""); + if ((expansion = find_arg_expansion(ctx, p))) + { + for (i = 0; i < expansion->text.content_size; ++i) + { + char c = expansion->text.buffer[i]; + + if (c == '\\' || c == '"') + vkd3d_string_buffer_printf(&ctx->buffer, "\\"); + vkd3d_string_buffer_printf(&ctx->buffer, "%c", c); + } + } + else + { + vkd3d_string_buffer_printf(&ctx->buffer, "%s", p); + } + vkd3d_string_buffer_printf(&ctx->buffer, "\""); + break; + } + if (token == T_IDENTIFIER || token == T_IDENTIFIER_PAREN) { const struct preproc_text *expansion; @@ -440,6 +478,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) vkd3d_string_buffer_printf(&ctx->buffer, "%s ", text); break; + } case STATE_IDENTIFIER: if (token == '(') diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 45577f2..72d6486 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -309,6 +309,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) struct parse_arg_names arg_names; } +%token <string> T_HASHSTRING %token <string> T_IDENTIFIER %token <string> T_IDENTIFIER_PAREN %token <string> T_INTEGER @@ -387,7 +388,8 @@ body_text } body_token - : T_IDENTIFIER + : T_HASHSTRING + | T_IDENTIFIER | T_IDENTIFIER_PAREN | T_INTEGER | T_TEXT diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index e726798..9d8d16d 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -350,7 +350,7 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { vkd3d_test_set_context("Source \"%s\"", tests[i].source); - todo_if (i <= 4 || i == 9 || (i >= 12 && i <= 14)) + todo_if (i == 9 || (i >= 12 && i <= 14)) check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); } vkd3d_test_set_context(NULL);

1 0

Zebediah Figura : vkd3d-shader: Implement concatenation.
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: vkd3d Branch: master Commit: 33df515f103205c78a2e669ab8a8723c4c86ea90 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=33df515f103205c78a2e669… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 12 16:14:20 2021 -0600 vkd3d-shader: Implement concatenation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 22 ++++++++++++++++++++++ libs/vkd3d-shader/preproc.y | 6 ++++++ tests/hlsl_d3d12.c | 7 ++----- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 9043ade..18a59b7 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -83,6 +83,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>0[0-7]*[ul]{0,2} {return T_INTEGER;} <INITIAL>[1-9][0-9]*[ul]{0,2} {return T_INTEGER;} +<INITIAL>## {return T_CONCAT;} + <INITIAL>"&&" {return T_TEXT;} <INITIAL>"||" {return T_TEXT;} <INITIAL>"++" {return T_TEXT;} @@ -189,6 +191,18 @@ static struct preproc_macro *preproc_get_top_macro(struct preproc_ctx *ctx) return ctx->expansion_stack[ctx->expansion_count - 1].macro; } +/* Concatenation is not done for object-like macros, but is done for both + * function-like macro bodies and their arguments. */ +static bool should_concat(struct preproc_ctx *ctx) +{ + struct preproc_macro *macro; + + if (!ctx->expansion_count) + return false; + macro = ctx->expansion_stack[ctx->expansion_count - 1].macro; + return !macro || macro->arg_count; +} + static void preproc_pop_buffer(struct preproc_ctx *ctx) { if (ctx->expansion_count) @@ -375,6 +389,14 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) switch (func_state->state) { case STATE_NONE: + if (token == T_CONCAT && should_concat(ctx)) + { + while (ctx->buffer.content_size + && strchr(" \t\r\n", ctx->buffer.buffer[ctx->buffer.content_size - 1])) + --ctx->buffer.content_size; + break; + } + if (token == T_IDENTIFIER || token == T_IDENTIFIER_PAREN) { const struct preproc_text *expansion; diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 4173af0..45577f2 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -327,6 +327,8 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_INCLUDE "#include" %token T_UNDEF "#undef" +%token T_CONCAT "##" + %type <integer> expr %type <string> body_token %type <const_string> body_token_const @@ -419,6 +421,10 @@ body_token_const { $$ = ","; } + | T_CONCAT + { + $$ = "##"; + } directive : T_DEFINE T_IDENTIFIER body_text T_NEWLINE diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 6980b99..e726798 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -349,10 +349,8 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - if (i == 10 || i == 11) - continue; vkd3d_test_set_context("Source \"%s\"", tests[i].source); - todo_if (i <= 4 || (i >= 9 && i <= 14)) + todo_if (i <= 4 || i == 9 || (i >= 12 && i <= 14)) check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); } vkd3d_test_set_context(NULL); @@ -407,8 +405,7 @@ static void test_preprocess(void) ok(include_count_file2 == 2, "file2 was included %u times.\n", include_count_file2); /* Macro invocation spread across multiple files. */ - if (0) - todo check_preprocess(test_include2_top, NULL, &test_include, "pass", NULL); + check_preprocess(test_include2_top, NULL, &test_include, "pass", NULL); blob = errors = (ID3D10Blob *)0xdeadbeef; hr = D3DPreprocess(test_include_top, strlen(test_include_top), NULL, NULL, &test_include_fail, &blob, &errors);

1 0

Zebediah Figura : vkd3d-shader: Implement function-like macro expansion.
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: vkd3d Branch: master Commit: e1a956f8f2f96f89baf8d723a3fa94a2071c2429 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e1a956f8f2f96f89baf8d72… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 12 16:14:19 2021 -0600 vkd3d-shader: Implement function-like macro expansion. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> 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> --- Makefile.am | 1 - libs/vkd3d-shader/preproc.h | 35 ++++ libs/vkd3d-shader/preproc.l | 329 ++++++++++++++++++++++++------- libs/vkd3d-shader/preproc.y | 46 ++++- libs/vkd3d-shader/vkd3d_shader_private.h | 2 + tests/hlsl_d3d12.c | 2 +- 6 files changed, 338 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=e1a956f8f2f96f89baf…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2021