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

Alexandre Julliard : user32: Implement SystemParametersInfoForDpi().
by Alexandre Julliard April 13, 2018

April 13, 2018

Module: wine Branch: master Commit: a02ed147328e072574485bbd2bec320c630cb5c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a02ed147328e072574485bbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 14:18:15 2018 +0200 user32: Implement SystemParametersInfoForDpi(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 162 ++++++++++++++++++++++++++++++++---------- dlls/user32/tests/sysparams.c | 99 +++++++++++++++++++++++++- dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 4 files changed, 225 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a02ed147328e07257448…

1 0

Alexandre Julliard : user32: Implement GetSystemMetricsForDpi().
by Alexandre Julliard April 13, 2018

April 13, 2018

Module: wine Branch: master Commit: 3458af7db00c4ba3efd4378d7f2190df62f29b95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3458af7db00c4ba3efd4378d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 14:31:43 2018 +0200 user32: Implement GetSystemMetricsForDpi(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 112 ++++++++++++++++++++++++++++++++++++++++-- dlls/user32/tests/sysparams.c | 81 ++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 4 files changed, 192 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3458af7db00c4ba3efd4…

1 0

Zebediah Figura : ole32: Fix conditions in HGLOBAL_User*().
by Alexandre Julliard April 13, 2018

April 13, 2018

Module: wine Branch: master Commit: 5293cb71838bba86961f62e2317f532c9812db0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5293cb71838bba86961f62e2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 12 10:20:29 2018 -0500 ole32: Fix conditions in HGLOBAL_User*(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/usrmarshal.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 63eead1..8d36e13 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -387,7 +387,7 @@ ULONG __RPC_USER HGLOBAL_UserSize(ULONG *pFlags, ULONG StartingSize, HGLOBAL *ph size += sizeof(ULONG); - if (LOWORD(*pFlags == MSHCTX_INPROC)) + if (LOWORD(*pFlags) == MSHCTX_INPROC) size += sizeof(HGLOBAL); else { @@ -429,7 +429,7 @@ unsigned char * __RPC_USER HGLOBAL_UserMarshal(ULONG *pFlags, unsigned char *pBu ALIGN_POINTER(pBuffer, 3); - if (LOWORD(*pFlags == MSHCTX_INPROC)) + if (LOWORD(*pFlags) == MSHCTX_INPROC) { if (sizeof(*phGlobal) == 8) *(ULONG *)pBuffer = WDT_INPROC64_CALL; @@ -572,7 +572,7 @@ void __RPC_USER HGLOBAL_UserFree(ULONG *pFlags, HGLOBAL *phGlobal) { TRACE("(%s, &%p\n", debugstr_user_flags(pFlags), *phGlobal); - if (LOWORD(*pFlags != MSHCTX_INPROC) && *phGlobal) + if (LOWORD(*pFlags) != MSHCTX_INPROC && *phGlobal) GlobalFree(*phGlobal); }

1 0

Louis Lenders : srclient: Add new stub dll.
by Alexandre Julliard April 13, 2018

April 13, 2018

Module: wine Branch: master Commit: a56e57b3ec6c8e0cf4ba839282bc2b0fb0dee683 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a56e57b3ec6c8e0cf4ba8392… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Apr 13 09:31:55 2018 +0200 srclient: Add new stub dll. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/srclient/Makefile.in | 4 ++++ dlls/srclient/main.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/srclient/srclient.spec | 13 +++++++++++++ 5 files changed, 61 insertions(+) diff --git a/configure b/configure index 73d909f..8976ad3 100755 --- a/configure +++ b/configure @@ -1508,6 +1508,7 @@ enable_slc enable_snmpapi enable_softpub enable_spoolss +enable_srclient enable_sspicli enable_stdole2_tlb enable_stdole32_tlb @@ -19001,6 +19002,7 @@ wine_fn_config_makefile dlls/softpub enable_softpub wine_fn_config_makefile dlls/sound.drv16 enable_win16 wine_fn_config_makefile dlls/spoolss enable_spoolss wine_fn_config_makefile dlls/spoolss/tests enable_tests +wine_fn_config_makefile dlls/srclient enable_srclient wine_fn_config_makefile dlls/sspicli enable_sspicli wine_fn_config_makefile dlls/stdole2.tlb enable_stdole2_tlb wine_fn_config_makefile dlls/stdole32.tlb enable_stdole32_tlb diff --git a/configure.ac b/configure.ac index 60c410c..b9ef668 100644 --- a/configure.ac +++ b/configure.ac @@ -3624,6 +3624,7 @@ WINE_CONFIG_MAKEFILE(dlls/softpub) WINE_CONFIG_MAKEFILE(dlls/sound.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/spoolss) WINE_CONFIG_MAKEFILE(dlls/spoolss/tests) +WINE_CONFIG_MAKEFILE(dlls/srclient) WINE_CONFIG_MAKEFILE(dlls/sspicli) WINE_CONFIG_MAKEFILE(dlls/stdole2.tlb) WINE_CONFIG_MAKEFILE(dlls/stdole32.tlb) diff --git a/dlls/srclient/Makefile.in b/dlls/srclient/Makefile.in new file mode 100644 index 0000000..5c11e75 --- /dev/null +++ b/dlls/srclient/Makefile.in @@ -0,0 +1,4 @@ +MODULE = srclient.dll + +C_SRCS = \ + main.c diff --git a/dlls/srclient/main.c b/dlls/srclient/main.c new file mode 100644 index 0000000..6c2e7b4 --- /dev/null +++ b/dlls/srclient/main.c @@ -0,0 +1,41 @@ +/* + * Copyright 2018 Louis Lenders + * + * 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 "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(srclient); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) +{ + TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + return TRUE; +} diff --git a/dlls/srclient/srclient.spec b/dlls/srclient/srclient.spec new file mode 100644 index 0000000..0d7a812 --- /dev/null +++ b/dlls/srclient/srclient.spec @@ -0,0 +1,13 @@ +1 stub SysprepCleanup +2 stub SysprepGeneralize +@ stub DisableSR +@ stub DisableSRInternal +@ stub EnableSR +@ stub EnableSREx +@ stub EnableSRInternal +@ stub SRNewSystemId +@ stub SRRemoveRestorePoint +@ stdcall SRSetRestorePointA(ptr ptr) sfc_os.SRSetRestorePointA +@ stub SRSetRestorePointInternal +@ stdcall SRSetRestorePointW(ptr ptr) sfc_os.SRSetRestorePointW +@ stub SetSRStateAfterSetup

1 0

Anton Romanov : wmp: Add media completion notifications.
by Alexandre Julliard April 13, 2018

April 13, 2018

Module: wine Branch: master Commit: a072899794919ffc72b5531a9ec10866e287e9ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=a072899794919ffc72b5531a… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Thu Apr 12 22:55:00 2018 -0700 wmp: Add media completion notifications. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/oleobj.c | 26 ++++++----- dlls/wmp/player.c | 92 ++++++++++++++++++++++++++++++++++++- dlls/wmp/tests/media.c | 113 +++++++++++++++++++++++++++++++++++++++++----- dlls/wmp/tests/rsrc.rc | 3 ++ dlls/wmp/tests/test1s.mp3 | Bin 0 -> 4365 bytes dlls/wmp/wmp_main.c | 1 + dlls/wmp/wmp_private.h | 7 ++- 7 files changed, 216 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a072899794919ffc72b5…

1 0

Alexandre Julliard : user32: Included padded border into the border width in NONCLIENTMETRICS.
by Alexandre Julliard April 13, 2018

April 13, 2018

Module: wine Branch: master Commit: d4d12801bc15b1ec0bdf13d935f7040256f1c303 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4d12801bc15b1ec0bdf13d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 14:15:40 2018 +0200 user32: Included padded border into the border width in NONCLIENTMETRICS. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 14 ++++++++------ dlls/user32/tests/sysparams.c | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 7b948eb..3ee0781 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1616,10 +1616,12 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_GETNONCLIENTMETRICS: { LPNONCLIENTMETRICSW lpnm = pvParam; + int padded_border; if (!pvParam) return FALSE; ret = get_entry( &entry_BORDER, 0, &lpnm->iBorderWidth ) && + get_entry( &entry_PADDEDBORDERWIDTH, 0, &padded_border ) && get_entry( &entry_SCROLLWIDTH, 0, &lpnm->iScrollWidth ) && get_entry( &entry_SCROLLHEIGHT, 0, &lpnm->iScrollHeight ) && get_entry( &entry_CAPTIONWIDTH, 0, &lpnm->iCaptionWidth ) && @@ -1633,19 +1635,22 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, get_entry( &entry_MENULOGFONT, 0, &lpnm->lfMenuFont ) && get_entry( &entry_STATUSLOGFONT, 0, &lpnm->lfStatusFont ) && get_entry( &entry_MESSAGELOGFONT, 0, &lpnm->lfMessageFont ); - if (ret && lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) - ret = get_entry( &entry_PADDEDBORDERWIDTH, 0, &lpnm->iPaddedBorderWidth ); + lpnm->iBorderWidth += padded_border; + if (ret && lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) lpnm->iPaddedBorderWidth = 0; normalize_nonclientmetrics( lpnm ); break; } case SPI_SETNONCLIENTMETRICS: { LPNONCLIENTMETRICSW lpnm = pvParam; + int padded_border; if (lpnm && (lpnm->cbSize == sizeof(NONCLIENTMETRICSW) || lpnm->cbSize == FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth))) { - ret = set_entry( &entry_BORDER, lpnm->iBorderWidth, NULL, fWinIni ) && + get_entry( &entry_PADDEDBORDERWIDTH, 0, &padded_border ); + + ret = set_entry( &entry_BORDER, lpnm->iBorderWidth - padded_border, NULL, fWinIni ) && set_entry( &entry_SCROLLWIDTH, lpnm->iScrollWidth, NULL, fWinIni ) && set_entry( &entry_SCROLLHEIGHT, lpnm->iScrollHeight, NULL, fWinIni ) && set_entry( &entry_CAPTIONWIDTH, lpnm->iCaptionWidth, NULL, fWinIni ) && @@ -1659,9 +1664,6 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, set_entry( &entry_SMCAPTIONLOGFONT, 0, &lpnm->lfSmCaptionFont, fWinIni ) && set_entry( &entry_STATUSLOGFONT, 0, &lpnm->lfStatusFont, fWinIni ) && set_entry( &entry_MESSAGELOGFONT, 0, &lpnm->lfMessageFont, fWinIni ); - - if (ret && lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) - set_entry( &entry_PADDEDBORDERWIDTH, lpnm->iPaddedBorderWidth, NULL, fWinIni ); } break; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 3fa6fe2..95273f2 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2710,8 +2710,10 @@ static void test_GetSystemMetrics( void) ncm.cbSize = sizeof(ncm); /* Vista added padding */ SetLastError(0xdeadbeef); + ncm.iPaddedBorderWidth = 0xcccc; rc = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); ok(rc || broken(!rc) /* before Vista */, "SystemParametersInfoA failed\n"); + if (rc) ok( ncm.iPaddedBorderWidth == 0, "wrong iPaddedBorderWidth %u\n", ncm.iPaddedBorderWidth ); minim.cbSize = sizeof( minim); ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth);

1 0

Dan Bassi : comctl32/treeview: Improve item text change detection.
by Alexandre Julliard April 13, 2018

April 13, 2018

Module: wine Branch: master Commit: c5cb2f1c503106cca066985c79aed727168a2f07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5cb2f1c503106cca066985c… Author: Dan Bassi <wine.fixes(a)gmail.com> Date: Fri Apr 13 10:24:40 2018 +0300 comctl32/treeview: Improve item text change detection. Signed-off-by: Dan Bassi <wine.fixes(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 65eff8b..49eec4a 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1125,8 +1125,10 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, if (tvItem->mask & TVIF_TEXT) { item->textWidth = 0; /* force width recalculation */ - if (tvItem->pszText != LPSTR_TEXTCALLBACKW && tvItem->pszText != NULL) /* covers != TEXTCALLBACKA too, and undocumented: pszText of NULL also means TEXTCALLBACK */ - { + + /* Covers != TEXTCALLBACKA too, and undocumented: pszText of NULL also means TEXTCALLBACK */ + if (tvItem->pszText != LPSTR_TEXTCALLBACKW && tvItem->pszText != NULL) + { int len; LPWSTR newText; if (isW) @@ -1134,12 +1136,14 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, else len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)tvItem->pszText, -1, NULL, 0); - newText = heap_realloc(item->pszText, len * sizeof(WCHAR)); + /* Allocate new block to make pointer comparison in item_changed() work. */ + newText = heap_alloc(len * sizeof(WCHAR)); if (newText == NULL) return FALSE; callbackClear |= TVIF_TEXT; + heap_free(item->pszText); item->pszText = newText; item->cchTextMax = len; if (isW) @@ -2199,7 +2203,7 @@ TREEVIEW_SetItemT(TREEVIEW_INFO *infoPtr, const TVITEMEXW *tvItem, BOOL isW) if (!TREEVIEW_ValidItem(infoPtr, item)) return FALSE; - /* store the original item values */ + /* Store the original item values. Text buffer will be freed in TREEVIEW_DoSetItemT() below. */ originalItem = *item; if (!TREEVIEW_DoSetItemT(infoPtr, item, tvItem, isW))

1 0

Matteo Bruni : ddraw: Forbid setting viewport extents larger than the render target in SetViewport2 ().
by Alexandre Julliard April 13, 2018

April 13, 2018

Module: wine Branch: master Commit: 7df2060167a8df4020191d3eb17c245b617ac764 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7df2060167a8df4020191d3e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 13 00:07:43 2018 +0200 ddraw: Forbid setting viewport extents larger than the render target in SetViewport2(). 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> --- dlls/ddraw/viewport.c | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 61b3138..0bc746e 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -915,7 +915,10 @@ static HRESULT WINAPI d3d_viewport_SetViewport2(IDirect3DViewport3 *iface, D3DVI { struct d3d_viewport *viewport = impl_from_IDirect3DViewport3(iface); struct d3d_device *device = viewport->active_device; + struct wined3d_sub_resource_desc rt_desc; + struct wined3d_rendertarget_view *rtv; IDirect3DViewport3 *current_viewport; + struct ddraw_surface *surface; TRACE("iface %p, vp %p.\n", iface, vp); @@ -928,20 +931,42 @@ static HRESULT WINAPI d3d_viewport_SetViewport2(IDirect3DViewport3 *iface, D3DVI _dump_D3DVIEWPORT2(vp); } + if (!device) + { + WARN("Viewport not bound to a device, returning D3DERR_VIEWPORTHASNODEVICE.\n"); + return D3DERR_VIEWPORTHASNODEVICE; + } + wined3d_mutex_lock(); + if (device->version > 1) + { + if (!(rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + { + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + surface = wined3d_rendertarget_view_get_sub_resource_parent(rtv); + wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, surface->sub_resource_idx, &rt_desc); + + if (vp->dwX > rt_desc.width || vp->dwWidth > rt_desc.width - vp->dwX + || vp->dwY > rt_desc.height || vp->dwHeight > rt_desc.height - vp->dwY) + { + WARN("Invalid viewport, returning DDERR_INVALIDPARAMS.\n"); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + } + viewport->use_vp2 = 1; memset(&viewport->viewports.vp2, 0, sizeof(viewport->viewports.vp2)); memcpy(&viewport->viewports.vp2, vp, vp->dwSize); - if (device) + if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(&device->IDirect3DDevice3_iface, &current_viewport))) { - if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(&device->IDirect3DDevice3_iface, &current_viewport))) - { - if (current_viewport == iface) - viewport_activate(viewport, FALSE); - IDirect3DViewport3_Release(current_viewport); - } + if (current_viewport == iface) + viewport_activate(viewport, FALSE); + IDirect3DViewport3_Release(current_viewport); } wined3d_mutex_unlock();

1 0

Alexandre Julliard : user32: Fix position of the small icon in the caption bar.
by Alexandre Julliard April 13, 2018

April 13, 2018

Module: wine Branch: master Commit: 9c225fc3f962f587459774f2c400720b436ba696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c225fc3f962f587459774f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 14:33:58 2018 +0200 user32: Fix position of the small icon in the caption bar. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index fcf32f0..3f3d96a 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -703,7 +703,7 @@ BOOL NC_DrawSysButton (HWND hwnd, HDC hdc, BOOL down) NC_GetInsideRect( hwnd, COORDS_WINDOW, &rect, style, ex_style ); pt.x = rect.left + 2; - pt.y = (rect.top + GetSystemMetrics(SM_CYCAPTION) - GetSystemMetrics(SM_CYSMICON)) / 2; + pt.y = rect.top + (GetSystemMetrics(SM_CYCAPTION) - GetSystemMetrics(SM_CYSMICON)) / 2; DrawIconEx (hdc, pt.x, pt.y, hIcon, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0, 0, DI_NORMAL);

1 0

Matteo Bruni : d3d9: Don' t store currently used textures in the d3d9 device.
by Alexandre Julliard April 13, 2018

April 13, 2018

Module: wine Branch: master Commit: 6cfab2f7adf8d8a32b5fad6bf75f9859e6fa0b01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cfab2f7adf8d8a32b5fad6b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 13 00:07:41 2018 +0200 d3d9: Don't store currently used textures in the d3d9 device. The texture tracking in d3d9 was not correct for applications using stateblocks. 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> --- dlls/d3d9/d3d9_private.h | 1 - dlls/d3d9/device.c | 23 ++++++++--------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 38fe06c..c50aabf 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -101,7 +101,6 @@ struct d3d9_device UINT index_buffer_size; UINT index_buffer_pos; - struct d3d9_texture *textures[D3D9_MAX_TEXTURE_UNITS]; struct d3d9_surface *render_targets[D3D_MAX_SIMULTANEOUS_RENDERTARGETS]; LONG device_state; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2265c1d..d533afb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -981,10 +981,6 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, device->device_state = D3D9_DEVICE_STATE_OK; } - if (!device->d3d_parent->extended) - for (i = 0; i < ARRAY_SIZE(device->textures); ++i) - device->textures[i] = NULL; - rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0); device->render_targets[0] = wined3d_rendertarget_view_get_sub_resource_parent(rtv); for (i = 1; i < ARRAY_SIZE(device->render_targets); ++i) @@ -2402,13 +2398,6 @@ static HRESULT WINAPI d3d9_device_SetTexture(IDirect3DDevice9Ex *iface, DWORD st wined3d_mutex_lock(); hr = wined3d_device_set_texture(device->wined3d_device, stage, texture_impl ? texture_impl->wined3d_texture : NULL); - if (SUCCEEDED(hr)) - { - unsigned int i = stage >= D3DVERTEXTEXTURESAMPLER0 ? stage - D3DVERTEXTEXTURESAMPLER0 + 16 : stage; - - if (stage < ARRAY_SIZE(device->textures)) - device->textures[i] = texture_impl; - } wined3d_mutex_unlock(); return hr; @@ -2652,11 +2641,15 @@ static float WINAPI d3d9_device_GetNPatchMode(IDirect3DDevice9Ex *iface) /* wined3d critical section must be taken by the caller. */ static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) { - unsigned int i; + struct wined3d_texture *texture; + unsigned int i, stage; - for (i = 0; i < ARRAY_SIZE(device->textures); ++i) - if (device->textures[i]) - d3d9_texture_gen_auto_mipmap(device->textures[i]); + for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) + { + stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; + if ((texture = wined3d_device_get_texture(device->wined3d_device, stage))) + d3d9_texture_gen_auto_mipmap(wined3d_texture_get_parent(texture)); + } } static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface,

1 0