March 2018 - Wine-Commits - list.winehq.org

Józef Kucia : configure: Sort AC_ARG_WITH() calls.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 6ae777319e8bc33fd8d0ba7a12f6eb13bf938761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ae777319e8bc33fd8d0ba7a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 1 16:37:06 2018 +0100 configure: Sort AC_ARG_WITH() calls. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 16 ++++++++-------- configure.ac | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 20be8b9..28e678e 100755 --- a/configure +++ b/configure @@ -860,9 +860,9 @@ with_png with_pthread with_pulse with_sane +with_sdl with_tiff with_udev -with_sdl with_v4l with_vulkan with_xcomposite @@ -2436,9 +2436,9 @@ Optional Packages: --without-pthread do not use the pthread library --without-pulse do not use PulseAudio sound support --without-sane do not use SANE (scanner support) + --without-sdl do not use SDL --without-tiff do not use TIFF --without-udev do not use udev (plug and play support) - --without-sdl do not use SDL --without-v4l do not use v4l1 (v4l support) --without-vulkan do not use Vulkan --without-xcomposite do not use the Xcomposite extension @@ -3737,6 +3737,12 @@ if test "${with_sane+set}" = set; then : fi +# Check whether --with-sdl was given. +if test "${with_sdl+set}" = set; then : + withval=$with_sdl; +fi + + # Check whether --with-tiff was given. if test "${with_tiff+set}" = set; then : withval=$with_tiff; @@ -3749,12 +3755,6 @@ if test "${with_udev+set}" = set; then : fi -# Check whether --with-sdl was given. -if test "${with_sdl+set}" = set; then : - withval=$with_sdl; -fi - - # Check whether --with-v4l was given. if test "${with_v4l+set}" = set; then : withval=$with_v4l; diff --git a/configure.ac b/configure.ac index 3b93966..2695c67 100644 --- a/configure.ac +++ b/configure.ac @@ -77,9 +77,9 @@ AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthrea [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) AC_ARG_WITH(pulse, AS_HELP_STRING([--without-pulse],[do not use PulseAudio sound support])) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) +AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)])) -AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),

1 0

Roderick Colenbrander : winevulkan/winex11: Implement vkCreateInstance.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 75b68a8585f3f3de23d56d35b9e0b08d952014d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75b68a8585f3f3de23d56d35… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Mar 1 16:37:03 2018 +0100 winevulkan/winex11: Implement vkCreateInstance. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 74 ++++++++++++++++++++++++++++++++++++++++ configure.ac | 9 +++++ dlls/winevulkan/vulkan.c | 49 ++++++++++++++++++++++++-- dlls/winevulkan/vulkan_private.h | 45 ++++++++++++++++++++++++ dlls/winex11.drv/vulkan.c | 67 +++++++++++++++++++++++++++++++++--- include/config.h.in | 3 ++ 6 files changed, 240 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=75b68a8585f3f3de23d5…

1 0

Andrew Eikum : maintainers: Remove myself from a dmusic DLL.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 7600847da01b50c9c51de854eba29e790f4e286d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7600847da01b50c9c51de854… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Mar 1 07:57:23 2018 -0600 maintainers: Remove myself from a dmusic DLL. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 6845a7a..d957e31 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -38,7 +38,6 @@ F: programs/winedbg/be_arm* Audio I/O M: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dsound/ -F: dlls/dswave/ F: dlls/mmdevapi/ F: dlls/winealsa.drv/ F: dlls/winecoreaudio.drv/

1 0

Nikolay Sivov : user32/button: Do not select old font back after painting.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: b7a08c92811c0a6c10b65b8b317e7f2d178e5bf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7a08c92811c0a6c10b65b8b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 1 14:17:31 2018 +0300 user32/button: Do not select old font back after painting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 5 ++--- dlls/user32/tests/msg.c | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 52e718f..0f56e4e 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -1096,7 +1096,7 @@ static void OB_Paint( HWND hwnd, HDC hDC, UINT action ) DRAWITEMSTRUCT dis; LONG_PTR id = GetWindowLongPtrW( hwnd, GWLP_ID ); HWND parent; - HFONT hFont, hPrevFont = 0; + HFONT hFont; HRGN hrgn; dis.CtlType = ODT_BUTTON; @@ -1111,7 +1111,7 @@ static void OB_Paint( HWND hwnd, HDC hDC, UINT action ) dis.itemData = 0; GetClientRect( hwnd, &dis.rcItem ); - if ((hFont = get_button_font( hwnd ))) hPrevFont = SelectObject( hDC, hFont ); + if ((hFont = get_button_font( hwnd ))) SelectObject( hDC, hFont ); parent = GetParent(hwnd); if (!parent) parent = hwnd; SendMessageW( parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)hwnd ); @@ -1119,7 +1119,6 @@ static void OB_Paint( HWND hwnd, HDC hDC, UINT action ) hrgn = set_control_clipping( hDC, &dis.rcItem ); SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); - if (hPrevFont) SelectObject(hDC, hPrevFont); SelectClipRgn( hDC, hrgn ); if (hrgn) DeleteObject( hrgn ); } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 1d569a3..36d1e33 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6466,15 +6466,13 @@ static void test_button_messages(void) prevfont = SelectObject(hdc, hfont2); ok(prevfont == GetStockObject(SYSTEM_FONT), "Unexpected default font\n"); SendMessageA(hwnd, WM_PRINTCLIENT, (WPARAM)hdc, 0); - todo_wine - ok(GetStockObject(SYSTEM_FONT) == GetCurrentObject(hdc, OBJ_FONT), "button[%u]: unexpected font selected after WM_PRINTCLIENT\n", i); + ok(hfont2 != GetCurrentObject(hdc, OBJ_FONT), "button[%u]: unexpected font selected after WM_PRINTCLIENT\n", i); SelectObject(hdc, prevfont); prevfont = SelectObject(hdc, hfont2); ok(prevfont == GetStockObject(SYSTEM_FONT), "Unexpected default font\n"); SendMessageA(hwnd, WM_PAINT, (WPARAM)hdc, 0); - todo_wine - ok(GetStockObject(SYSTEM_FONT) == GetCurrentObject(hdc, OBJ_FONT), "button[%u]: unexpected font selected after WM_PAINT\n", i); + ok(hfont2 != GetCurrentObject(hdc, OBJ_FONT), "button[%u]: unexpected font selected after WM_PAINT\n", i); SelectObject(hdc, prevfont); DeleteDC(hdc);

1 0

Dmitry Timoshkov : secur32: Fix GetComputerObjectNameW for the cases of NULL or insufficient buffer size.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 652090f598facd514fd55106abf54443adcaf4f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=652090f598facd514fd55106… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 1 16:25:44 2018 +0800 secur32: Fix GetComputerObjectNameW for the cases of NULL or insufficient buffer size. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/secur32.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 4408e7c..889883c 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -996,29 +996,21 @@ BOOLEAN WINAPI GetComputerObjectNameW( if (GetComputerNameW(name, &size)) { DWORD len = domainInfo->Name.Length + size + 3; - if (lpNameBuffer) + if (lpNameBuffer && *nSize >= len) { - if (*nSize < len) - { - *nSize = len; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - status = FALSE; - } - else - { - WCHAR bs[] = { '\\', 0 }; - WCHAR ds[] = { '$', 0 }; - lstrcpyW(lpNameBuffer, domainInfo->Name.Buffer); - lstrcatW(lpNameBuffer, bs); - lstrcatW(lpNameBuffer, name); - lstrcatW(lpNameBuffer, ds); - status = TRUE; - } + WCHAR bs[] = { '\\', 0 }; + WCHAR ds[] = { '$', 0 }; + lstrcpyW(lpNameBuffer, domainInfo->Name.Buffer); + lstrcatW(lpNameBuffer, bs); + lstrcatW(lpNameBuffer, name); + lstrcatW(lpNameBuffer, ds); + status = TRUE; } else /* just requesting length required */ { *nSize = len; - status = TRUE; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + status = FALSE; } } else

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in surface_load_drawable().
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 4d84feb542592271afec1b9e7cef7a3b1dec1670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d84feb542592271afec1b9e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 1 10:04:53 2018 +0330 wined3d: Explicitly calculate the sub-resource level in surface_load_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b6235ce..a339171 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2226,6 +2226,7 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, struct wined3d_texture *texture = surface->container; struct wined3d_surface *restore_rt = NULL; struct wined3d_device *device; + unsigned int level; RECT r; if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) @@ -2250,8 +2251,9 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, else restore_rt = NULL; - SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, surface->texture_level), - wined3d_texture_get_level_height(texture, surface->texture_level)); + level = sub_resource_idx % texture->level_count; + SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level)); wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_COLOR_BLIT, context, surface, WINED3D_LOCATION_TEXTURE_RGB, &r,

1 0

Piotr Caban : comctl32/tests: Add listbox WM_MEASUREITEM tests.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 2c0f6d9614062ceef3063a20065e7ee654927ce6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c0f6d9614062ceef3063a20… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 28 17:37:18 2018 +0100 comctl32/tests: Add listbox WM_MEASUREITEM tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 23c2e2b..1513bea 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -43,6 +43,15 @@ static const char * const strings[4] = { static const char BAD_EXTENSION[] = "*.badtxt"; +static int strcmp_aw(LPCWSTR strw, const char *stra) +{ + WCHAR buf[1024]; + + if (!stra) return 1; + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + return lstrcmpW(strw, buf); +} + static HWND create_listbox(DWORD add_style, HWND parent) { INT_PTR ctl_id = 0; @@ -229,6 +238,31 @@ static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA { switch (msg) { + case WM_MEASUREITEM: + { + DWORD style = GetWindowLongA(GetWindow(hwnd, GW_CHILD), GWL_STYLE); + MEASUREITEMSTRUCT *mi = (void*)lparam; + + ok(wparam == mi->CtlID, "got wParam=%08lx, expected %08x\n", wparam, mi->CtlID); + ok(mi->CtlType == ODT_LISTBOX, "mi->CtlType = %u\n", mi->CtlType); + ok(mi->CtlID == 1, "mi->CtlID = %u\n", mi->CtlID); + ok(mi->itemHeight, "mi->itemHeight = 0\n"); + + if (mi->itemID > 4 || style & LBS_OWNERDRAWFIXED) + break; + + if (style & LBS_HASSTRINGS) + { + ok(!strcmp_aw((WCHAR*)mi->itemData, strings[mi->itemID]), + "mi->itemData = %s (%d)\n", wine_dbgstr_w((WCHAR*)mi->itemData), mi->itemID); + } + else + { + ok((void*)mi->itemData == strings[mi->itemID], + "mi->itemData = %08lx, expected %p\n", mi->itemData, strings[mi->itemID]); + } + break; + } case WM_DRAWITEM: { RECT rc_item, rc_client, rc_clip; @@ -1837,6 +1871,26 @@ static void test_listbox(void) run_test(EMS_NS); } +static void test_WM_MEASUREITEM(void) +{ + HWND parent, listbox; + LRESULT data; + + parent = create_parent(); + listbox = create_listbox(WS_CHILD | LBS_OWNERDRAWVARIABLE, parent); + + data = SendMessageA(listbox, LB_GETITEMDATA, 0, 0); + ok(data == (LRESULT)strings[0], "data = %08lx, expected %p\n", data, strings[0]); + DestroyWindow(parent); + + parent = create_parent(); + listbox = create_listbox(WS_CHILD | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS, parent); + + data = SendMessageA(listbox, LB_GETITEMDATA, 0, 0); + ok(!data, "data = %08lx\n", data); + DestroyWindow(parent); +} + START_TEST(listbox) { ULONG_PTR ctx_cookie; @@ -1859,6 +1913,7 @@ START_TEST(listbox) test_GetListBoxInfo(); test_missing_lbuttonup(); test_extents(); + test_WM_MEASUREITEM(); unload_v6_module(ctx_cookie, hCtx); }

1 0

Michael Müller : fonts/tahoma.sfd: Add glyphs U+FB01 and U+FB02.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: e2cbfb68ad63e01384826f4d509cd257280b1197 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2cbfb68ad63e01384826f4d… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 28 23:22:01 2018 -0600 fonts/tahoma.sfd: Add glyphs U+FB01 and U+FB02. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- fonts/tahoma.sfd | 16 ++++++++++++++++ fonts/tahoma.ttf | Bin 143652 -> 143884 bytes 2 files changed, 16 insertions(+) diff --git a/fonts/tahoma.sfd b/fonts/tahoma.sfd index 3d6b44e..466f250 100644 --- a/fonts/tahoma.sfd +++ b/fonts/tahoma.sfd @@ -24398,6 +24398,10 @@ BDFChar: 252 8364 7 0 5 0 8 4@"GpJGap_49,?] BDFChar: 253 8482 11 1 9 5 8 k^ZBX8q9H_ +BDFChar: 266 64257 6 0 5 0 9 +0LS1u6psF26pq"T +BDFChar: 267 64258 6 0 5 0 9 +1djb(6psF26pq"T BDFChar: 280 278 7 0 5 0 10 &-2WYJ:RQJJ:ROt BDFChar: 306 279 6 0 5 0 8 @@ -25127,6 +25131,10 @@ BDFChar: 252 8364 7 0 5 0 8 4@"GpJGap_49,?] BDFChar: 253 8482 11 1 9 5 8 k^ZBX8q9H_ +BDFChar: 266 64257 7 0 5 0 9 +0LS1u6psF26pq"T +BDFChar: 267 64258 7 0 5 0 9 +1djb(6psF26pq"T BDFChar: 280 278 7 1 6 0 11 0JEM)J:RQJJ:N1J BDFChar: 306 279 7 0 5 0 8 @@ -25856,6 +25864,10 @@ BDFChar: 252 8364 8 0 6 0 10 *$RXur.+]q5U%0J BDFChar: 253 8482 13 0 11 6 10 q(a)Fl*,1%O\+qO_S +BDFChar: 266 64257 8 0 6 0 11 +3'okqnj5Z06:+"* +BDFChar: 267 64258 8 0 6 0 11 +3^Q/"nj5Z06:+"* BDFChar: 280 278 8 1 7 0 12 &-2][J:RWLJ:N0#rVuou BDFChar: 306 279 8 0 6 0 10 @@ -26585,6 +26597,10 @@ BDFChar: 252 8364 9 0 7 0 11 %M9gK5lO%J5TgXK BDFChar: 253 8482 14 1 12 7 11 q(a)Fl*,1%O\+qO_S +BDFChar: 266 64257 9 0 6 0 12 +3'oqsnj5Z06:+"*63$uc +BDFChar: 267 64258 8 0 6 0 12 +3^Q/"nj5Z06:+"*63$uc BDFChar: 280 278 9 1 8 0 14 (`38QJ:N0#s+#WMJ:RY" BDFChar: 306 279 8 0 6 0 11 diff --git a/fonts/tahoma.ttf b/fonts/tahoma.ttf index 4f68d1e..8bee8ad 100644 Binary files a/fonts/tahoma.ttf and b/fonts/tahoma.ttf differ

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in surface_load_texture().
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 4fc70a3b6a0ad9261bc4499df63f7168abe97d44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fc70a3b6a0ad9261bc4499d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 1 10:04:54 2018 +0330 wined3d: Explicitly calculate the sub-resource level in surface_load_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a339171..c82da87 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2269,7 +2269,7 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, static BOOL surface_load_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { - unsigned int width, height, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; + unsigned int width, height, level, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *texture = surface->container; @@ -2295,8 +2295,9 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, return TRUE; } - width = wined3d_texture_get_level_width(texture, surface->texture_level); - height = wined3d_texture_get_level_height(texture, surface->texture_level); + level = sub_resource_idx % texture->level_count; + width = wined3d_texture_get_level_width(texture, level); + height = wined3d_texture_get_level_height(texture, level); SetRect(&src_rect, 0, 0, width, height); if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) @@ -2360,7 +2361,7 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, wined3d_texture_prepare_texture(texture, context, srgb); wined3d_texture_bind_and_dirtify(texture, context, srgb); - wined3d_texture_get_pitch(texture, surface->texture_level, &src_row_pitch, &src_slice_pitch); + wined3d_texture_get_pitch(texture, level, &src_row_pitch, &src_slice_pitch); format = *texture->resource.format; if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE)))

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in fb_copy_to_texture_direct( ).
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 6be6bf7d708521f6c97f398cd308011b3e5efa64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6be6bf7d708521f6c97f398c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 1 10:04:51 2018 +0330 wined3d: Explicitly calculate the sub-resource level in fb_copy_to_texture_direct(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 12370ed..668cfba 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1722,9 +1722,9 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, struct wined3d_surface *src_surface, const RECT *src_rect, const RECT *dst_rect_in, enum wined3d_texture_filter_type filter) { + unsigned int src_width, src_height, src_pow2_width, src_pow2_height, src_level; unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - unsigned int src_width, src_height, src_pow2_width, src_pow2_height; struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = dst_texture->resource.device; @@ -1752,10 +1752,11 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st wined3d_texture_load(dst_texture, context, FALSE); offscreen_buffer = context_get_offscreen_gl_buffer(context); - src_width = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); - src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); - src_pow2_width = wined3d_texture_get_level_pow2_width(src_texture, src_surface->texture_level); - src_pow2_height = wined3d_texture_get_level_pow2_height(src_texture, src_surface->texture_level); + src_level = src_sub_resource_idx % src_texture->level_count; + src_width = wined3d_texture_get_level_width(src_texture, src_level); + src_height = wined3d_texture_get_level_height(src_texture, src_level); + src_pow2_width = wined3d_texture_get_level_pow2_width(src_texture, src_level); + src_pow2_height = wined3d_texture_get_level_pow2_height(src_texture, src_level); src_offscreen = wined3d_resource_is_offscreen(&src_texture->resource); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO;

1 0