January 2019 - Wine-Commits

Paul Gofman : user32/tests: Factor out compare_bitmap_bits() function.
by Alexandre Julliard Jan. 9, 2019

Jan. 9, 2019

Module: wine Branch: master Commit: 9cd885f441c65d42ee607d84f35dbf2f13f98fd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cd885f441c65d42ee607d84… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jan 9 15:49:34 2019 +0300 user32/tests: Factor out compare_bitmap_bits() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 69 +++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index ed69400..6fe7bed 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2777,6 +2777,35 @@ static COLORREF get_color_from_bits(const unsigned char *bits, const BITMAPINFO return RGB(color.rgbRed, color.rgbGreen, color.rgbBlue); } +#define compare_bitmap_bits(a, b, c, d, e, f, g) compare_bitmap_bits_(__LINE__, a, b, c, d, e, f, g) +static void compare_bitmap_bits_(unsigned int line, HDC hdc, HBITMAP bitmap, BITMAPINFO *bmi, + size_t result_bits_size, const unsigned char *expected_bits, unsigned int test_index, BOOL todo) +{ + unsigned char *result_bits; + unsigned int row, column; + int ret; + + result_bits = HeapAlloc(GetProcessHeap(), 0, result_bits_size); + ret = GetDIBits(hdc, bitmap, 0, bmi->bmiHeader.biHeight, + result_bits, bmi, DIB_RGB_COLORS); + ok(ret == bmi->bmiHeader.biHeight, "Unexpected GetDIBits result %d, GetLastError() %u.\n", + ret, GetLastError()); + for (row = 0; row < bmi->bmiHeader.biHeight; ++row) + for (column = 0; column < bmi->bmiHeader.biWidth; ++column) + { + COLORREF result, expected; + + result = get_color_from_bits(result_bits, bmi, row, column); + expected = get_color_from_bits(expected_bits, bmi, row, column); + + todo_wine_if(todo) + ok_(__FILE__, line)(result == expected, "Colors do not match, " + "got 0x%06x, expected 0x%06x, test_index %u, row %u, column %u.\n", + result, expected, test_index, row, column); + } + HeapFree(GetProcessHeap(), 0, result_bits); +} + static void test_CopyImage_StretchMode(void) { static const unsigned char test_bits_24[] = @@ -2860,16 +2889,17 @@ static void test_CopyImage_StretchMode(void) sizeof(test_bits_16), sizeof(expected_bits_16), NULL, 0, TRUE}, }; + BITMAPINFO *bmi, *bmi_output; HBITMAP bitmap, bitmap_copy; - unsigned int row, column, i; - unsigned char *result_bits; unsigned int test_index; unsigned char *bits; - BITMAPINFO *bmi; + size_t bmi_size; + unsigned int i; HDC hdc; - int ret; - bmi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + bmi_size = sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD); + bmi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bmi_size); + bmi_output = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bmi_size); bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bmi->bmiHeader.biPlanes = 1; bmi->bmiHeader.biCompression = BI_RGB; @@ -2889,6 +2919,9 @@ static void test_CopyImage_StretchMode(void) bmi->bmiHeader.biWidth = tests[test_index].width; bmi->bmiHeader.biHeight = tests[test_index].height; bmi->bmiHeader.biBitCount = tests[test_index].bit_count; + memcpy(bmi_output, bmi, bmi_size); + bmi_output->bmiHeader.biWidth = tests[test_index].output_width; + bmi_output->bmiHeader.biHeight = tests[test_index].output_height; bitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, (void **)&bits, NULL, 0); ok(bitmap && bits, "CreateDIBSection() failed, result %u.\n", GetLastError()); @@ -2898,33 +2931,13 @@ static void test_CopyImage_StretchMode(void) tests[test_index].output_height, LR_CREATEDIBSECTION); ok(!!bitmap_copy, "CopyImage() failed, result %u.\n", GetLastError()); - result_bits = HeapAlloc(GetProcessHeap(), 0, tests[test_index].result_bits_size); - - bmi->bmiHeader.biWidth = tests[test_index].output_width; - bmi->bmiHeader.biHeight = tests[test_index].output_height; - ret = GetDIBits(hdc, bitmap_copy, 0, tests[test_index].output_height, - result_bits, bmi, DIB_RGB_COLORS); - ok(ret == tests[test_index].output_height, "Unexpected GetDIBits result %d, GetLastError() %u.\n", - ret, GetLastError()); - - for (row = 0; row < tests[test_index].output_height; ++row) - for (column = 0; column < tests[test_index].output_width; ++column) - { - COLORREF result, expected; - - result = get_color_from_bits(result_bits, bmi, row, column); - expected = get_color_from_bits(tests[test_index].expected_bits, bmi, row, column); - - todo_wine_if(tests[test_index].todo) - ok(result == expected, "Colors do not match, " - "got 0x%06x, expected 0x%06x, test_index %u, row %u, column %u.\n", - result, expected, test_index, row, column); - } + compare_bitmap_bits(hdc, bitmap_copy, bmi_output, tests[test_index].result_bits_size, + tests[test_index].expected_bits, test_index, tests[test_index].todo); DeleteObject(bitmap); DeleteObject(bitmap_copy); - HeapFree(GetProcessHeap(), 0, result_bits); } ReleaseDC(0, hdc); + HeapFree(GetProcessHeap(), 0, bmi_output); HeapFree(GetProcessHeap(), 0, bmi); }

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard Jan. 9, 2019

Jan. 9, 2019

Module: wine Branch: master Commit: 9e0f7c228284e0d0560a198fee89ade5185f9d9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e0f7c228284e0d0560a198f… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Mon Jan 7 21:52:42 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 212 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 106 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e0f7c228284e0d0560a…

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Jan. 9, 2019

Jan. 9, 2019

Module: wine Branch: master Commit: 4803bf1e43f1d4d3bcf24c9679f30b100c7ee2de URL: https://source.winehq.org/git/wine.git/?a=commit;h=4803bf1e43f1d4d3bcf24c96… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 9 14:33:34 2019 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 416 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 198 insertions(+), 218 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4803bf1e43f1d4d3bcf2…

1 0

Alexandre Julliard : inetcpl.cpl: Fix Piotr's name.
by Alexandre Julliard Jan. 9, 2019

Jan. 9, 2019

Module: wine Branch: master Commit: feab24fffdf1fa907355042aa794e6997dc3e815 URL: https://source.winehq.org/git/wine.git/?a=commit;h=feab24fffdf1fa907355042a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 9 08:45:48 2019 -0600 inetcpl.cpl: Fix Piotr's name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcpl.cpl/connections.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index 648cd3d..2132ac5 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/dlls/inetcpl.cpl/connections.c @@ -1,5 +1,5 @@ /* - * Copyright 2018 Piotr cabna for CodeWeavers + * Copyright 2018 Piotr Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Olivier F. R. Dierick : explorer: Don' t change Z-order of the taskbar when displaying it.
by Alexandre Julliard Jan. 9, 2019

Jan. 9, 2019

Module: wine Branch: master Commit: 5afd80307ed2487998c0ccd552f883560ac24cfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=5afd80307ed2487998c0ccd5… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Mon Jan 7 01:51:18 2019 +0100 explorer: Don't change Z-order of the taskbar when displaying it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40828 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Hamish Claxton <hamishclaxton(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 3d36f74..f9e6661 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -766,8 +766,8 @@ static void do_show_systray(void) tray_width = GetSystemMetrics( SM_CXSCREEN ); tray_height = max( icon_cy, size.cy ); start_button_width = size.cx; - SetWindowPos( tray_window, HWND_TOPMOST, 0, GetSystemMetrics( SM_CYSCREEN ) - tray_height, - tray_width, tray_height, SWP_NOACTIVATE | SWP_SHOWWINDOW ); + SetWindowPos( tray_window, 0, 0, GetSystemMetrics( SM_CYSCREEN ) - tray_height, + tray_width, tray_height, SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW ); sync_taskbar_buttons(); }

1 0

Alexandre Julliard : Update copyright info for 2019.
by Alexandre Julliard Jan. 9, 2019

Jan. 9, 2019

Module: wine Branch: master Commit: 9e0cb0125f32c56f6093d5699ecbf351eb4154ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e0cb0125f32c56f6093d569… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 9 08:43:23 2019 -0600 Update copyright info for 2019. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 765b9c3..6269a3b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2018 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2019 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index df4ff81..74d7494 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2018 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2019 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index b9d903d..b8d4c5c 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -76,7 +76,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2018 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2019 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

1 0

Józef Kucia : ddraw/tests: Fix compilation on systems that don't support nameless unions.
by Alexandre Julliard Jan. 9, 2019

Jan. 9, 2019

Module: wine Branch: master Commit: f667e65116cfc81849b868523e7f32362a0c561d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f667e65116cfc81849b86852… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 8 17:12:50 2019 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 18 +++++++++--------- dlls/ddraw/tests/ddraw2.c | 22 +++++++++++----------- dlls/ddraw/tests/ddraw4.c | 44 ++++++++++++++++++++++---------------------- dlls/ddraw/tests/ddraw7.c | 44 ++++++++++++++++++++++---------------------- 4 files changed, 64 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f667e65116cfc81849b8…

1 0

Józef Kucia : ddraw/tests: Add tests for attaching depth buffers of different sizes.
by Alexandre Julliard Jan. 9, 2019

Jan. 9, 2019

Module: wine Branch: master Commit: 8a3923b316fb2489100dffdf5b7cf519ee3b17df URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a3923b316fb2489100dffdf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 8 17:12:49 2019 +0100 ddraw/tests: Add tests for attaching depth buffers of different sizes. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a3923b316fb2489100d…

1 0

Józef Kucia : wined3d: Simplify wined3d_cs_emit_clear () slightly.
by Alexandre Julliard Jan. 9, 2019

Jan. 9, 2019

Module: wine Branch: master Commit: 11c94a2ef6a847e26835b136f291b730d3c6f8fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=11c94a2ef6a847e26835b136… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 8 17:12:51 2019 +0100 wined3d: Simplify wined3d_cs_emit_clear() slightly. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5ea25e9..aa8eef7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -600,22 +600,20 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - unsigned int rt_count = cs->device->adapter->d3d_info.limits.max_rt_count; const struct wined3d_state *state = &cs->device->state; const struct wined3d_viewport *vp = &state->viewports[0]; struct wined3d_rendertarget_view *view; struct wined3d_cs_clear *op; + unsigned int rt_count, i; RECT view_rect; - unsigned int i; + + rt_count = flags & WINED3DCLEAR_TARGET ? cs->device->adapter->d3d_info.limits.max_rt_count : 0; op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags; - if (flags & WINED3DCLEAR_TARGET) - op->rt_count = rt_count; - else - op->rt_count = 0; + op->rt_count = rt_count; op->fb = &cs->fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); if (state->render_states[WINED3D_RS_SCISSORTESTENABLE]) @@ -626,16 +624,13 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->rect_count = rect_count; memcpy(op->rects, rects, sizeof(*rects) * rect_count); - if (flags & WINED3DCLEAR_TARGET) + for (i = 0; i < rt_count; ++i) { - for (i = 0; i < rt_count; ++i) + if ((view = state->fb->render_targets[i])) { - if ((view = state->fb->render_targets[i])) - { - SetRect(&view_rect, 0, 0, view->width, view->height); - IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); - wined3d_resource_acquire(view->resource); - } + SetRect(&view_rect, 0, 0, view->width, view->height); + IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); + wined3d_resource_acquire(view->resource); } } if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL))

1 0

Paul Gofman : d3dx9: Return correct comment length from get_instr_length() .
by Alexandre Julliard Jan. 9, 2019

Jan. 9, 2019

Module: wine Branch: master Commit: 807e5fc04af7a7ea563af1e7da6ebe6662536e6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=807e5fc04af7a7ea563af1e7… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jan 9 20:17:52 2019 +0100 d3dx9: Return correct comment length from get_instr_length(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46435 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/shader.c | 8 +++++--- dlls/d3dx9_36/tests/shader.c | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index acbbf07..e8ce3dd 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2415,18 +2415,20 @@ HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader static unsigned int get_instr_length(const DWORD *byte_code, unsigned int major, unsigned int minor) { + DWORD opcode = *byte_code & 0xffff; unsigned int len = 0; + if (opcode == D3DSIO_COMMENT) + return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; + if (major > 1) return (*byte_code & D3DSI_INSTLENGTH_MASK) >> D3DSI_INSTLENGTH_SHIFT; - switch (*byte_code & 0xffff) + switch (opcode) { case D3DSIO_END: ERR("Unexpected END token.\n"); return 0; - case D3DSIO_COMMENT: - return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; case D3DSIO_DEF: case D3DSIO_DEFI: return 5; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 1086e5e..b67ffb2 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6457,6 +6457,7 @@ static void test_shader_semantics(void) vs_3_0[] = { 0xfffe0300, /* vs_3_0 */ + 0x0002fffe, 0x0200000f, 0x00000000, /* comment */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ 0x0200001f, 0x8001000a, 0x900f0002, /* dcl_color1 v2 */

1 0