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

[PATCH] d3dx10/tests: Remove todo_wine from succeeding tests.
by Zebediah Figura April 23, 2018

April 23, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3dx10_43/tests/d3dx10.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index ac0852b..0baba65 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -526,15 +526,14 @@ float4 main(float4 color : COLOR) : SV_TARGET wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D10Device_RSGetViewports(device, &count, NULL); - todo_wine ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, + ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, "Got unexpected viewport count %u.\n", count); memset(tmp_viewport, 0x55, sizeof(tmp_viewport)); count = D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ID3D10Device_RSGetViewports(device, &count, tmp_viewport); for (i = 0; i < D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i) { - todo_wine_if(i) - ok(tmp_viewport[i].TopLeftX == i * 3 + ok(tmp_viewport[i].TopLeftX == i * 3 && tmp_viewport[i].TopLeftY == i * 4 && tmp_viewport[i].Width == 3 && tmp_viewport[i].Height == 4 -- 2.7.4

2 1

[PATCH v2] shell32/tests: Add small test for SHGetSetFolderCustomSettings
by Louis Lenders April 23, 2018

April 23, 2018

v2: - use temp path instead of hardcoded path - Delete the temperorary file before removing directory Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/shell32/tests/shlfolder.c | 52 ++++++++++++++++++++++++++++++++++++++++++ include/shlobj.h | 3 ++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c976c85..d4ded64 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -65,6 +65,7 @@ static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); static BOOL (WINAPI *pSHGetPathFromIDListEx)(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS); +static HRESULT (WINAPI *pSHGetSetFolderCustomSettings)(LPSHFOLDERCUSTOMSETTINGS,PCWSTR,DWORD); static WCHAR *make_wstr(const char *str) { @@ -118,6 +119,7 @@ static void init_function_pointers(void) MAKEFUNC(SHGetItemFromObject); MAKEFUNC(SHCreateDefaultContextMenu); MAKEFUNC(SHGetPathFromIDListEx); + MAKEFUNC(SHGetSetFolderCustomSettings); #undef MAKEFUNC /* test named exports */ @@ -5246,6 +5248,55 @@ todo_wine IShellFolder_Release(desktop); } +static void test_SHGetSetFolderCustomSettings(void) +{ + HRESULT hr; + SHFOLDERCUSTOMSETTINGS fcs; + static WCHAR pathW[MAX_PATH]; + static WCHAR iconpathW[MAX_PATH]; + static const WCHAR somedirW[] = {'\\','s','o','m','e','_','d','i','r',0}; + static const WCHAR iconW[] = {'\\','s','o','m','e','_','i','c','o','n','.','i','c','o',0}; + WCHAR bufferW[MAX_PATH] = {0}; + + if (!pSHGetSetFolderCustomSettings) + { + win_skip("SHGetSetFolderCustomSetting not exported by name (only by ordinal) for version XP/win2003\n"); + return; + } + + GetTempPathW(sizeof(pathW), pathW); + lstrcatW(pathW, somedirW); + GetTempPathW(sizeof(iconpathW), iconpathW); + lstrcatW(iconpathW, somedirW); + lstrcatW(iconpathW, iconW); + + CreateDirectoryW(pathW, NULL); + + memset(&fcs, 0, sizeof(fcs)); + fcs.dwSize = sizeof(fcs); + fcs.dwMask = FCSM_ICONFILE; + fcs.pszIconFile = iconpathW; + + hr = pSHGetSetFolderCustomSettings(&fcs, pathW, FCS_FORCEWRITE); /*creates and writes to a Desktop.ini*/ + todo_wine ok(hr == S_OK, "Expected S_OK, got %#x\n", hr); + + memset(&fcs, 0, sizeof(fcs)); + fcs.dwSize = sizeof(fcs); + fcs.dwMask = FCSM_ICONFILE; + fcs.cchIconFile = MAX_PATH; + fcs.pszIconFile = bufferW; + + hr = pSHGetSetFolderCustomSettings(&fcs, pathW, FCS_READ); + todo_wine ok(hr == S_OK, "Expected S_OK, got %#x\n", hr); + todo_wine ok(!lstrcmpW(iconpathW, fcs.pszIconFile), "Expected %s, got %s\n", wine_dbgstr_w(iconpathW), wine_dbgstr_w(fcs.pszIconFile)); + + hr = pSHGetSetFolderCustomSettings(&fcs, NULL, FCS_READ); + todo_wine ok(hr == E_FAIL, "Expected E_FAIL, got %#x\n", hr); + + DeleteFileW(iconpathW); + RemoveDirectoryW(pathW); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5288,6 +5339,7 @@ START_TEST(shlfolder) test_GetDefaultColumn(); test_GetDefaultSearchGUID(); test_SHLimitInputEdit(); + test_SHGetSetFolderCustomSettings(); OleUninitialize(); } diff --git a/include/shlobj.h b/include/shlobj.h index 9d6dcdd..7bf0d2e 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1489,7 +1489,7 @@ int WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES); #define FCSM_ICONFILE 0x00000010 #define FCSM_LOGO 0x00000020 #define FCSM_FLAGS 0x00000040 - +#include <pshpack8.h> typedef struct { DWORD dwSize; DWORD dwMask; @@ -1507,6 +1507,7 @@ typedef struct { LPWSTR pszLogo; DWORD cchLogo; } SHFOLDERCUSTOMSETTINGS, *LPSHFOLDERCUSTOMSETTINGS; +#include <poppack.h> HRESULT WINAPI SHGetSetFolderCustomSettings(LPSHFOLDERCUSTOMSETTINGS pfcs, PCWSTR pszPath, DWORD dwReadWrite); -- 2.7.4

2 1

[PATCH] shell32/tests: Add small test for SHGetSetFolderCustomSettings
by Louis Lenders April 23, 2018

April 23, 2018

Small test for SHGetSetFolderCustomSettings; the 12 failures on win2003 are not due to this test (happen in other test), as explained in another mail Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/shell32/tests/shlfolder.c | 43 ++++++++++++++++++++++++++++++++++++++++++ include/shlobj.h | 3 ++- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c976c85..94cc147 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -65,6 +65,7 @@ static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); static BOOL (WINAPI *pSHGetPathFromIDListEx)(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS); +static HRESULT (WINAPI *pSHGetSetFolderCustomSettings)(LPSHFOLDERCUSTOMSETTINGS,PCWSTR,DWORD); static WCHAR *make_wstr(const char *str) { @@ -118,6 +119,7 @@ static void init_function_pointers(void) MAKEFUNC(SHGetItemFromObject); MAKEFUNC(SHCreateDefaultContextMenu); MAKEFUNC(SHGetPathFromIDListEx); + MAKEFUNC(SHGetSetFolderCustomSettings); #undef MAKEFUNC /* test named exports */ @@ -5246,6 +5248,46 @@ todo_wine IShellFolder_Release(desktop); } +static void test_SHGetSetFolderCustomSettings(void) +{ + HRESULT hr; + SHFOLDERCUSTOMSETTINGS fcs; + static const WCHAR pathW[] = {'c',':','\\','s','o','m','e','_','d','i','r',0}; + static const WCHAR iconW[] = {'c',':','\\','s','o','m','e','_','d','i','r','\\','s','o','m','e','_','i','c','o','n','.','i','c','o',0}; + WCHAR bufferW[MAX_PATH] = {0}; + + if (!pSHGetSetFolderCustomSettings) + { + win_skip("SHGetSetFolderCustomSetting not exported by name (only by ordinal) for version XP/win2003\n"); + return; + } + + CreateDirectoryW(pathW, NULL); + + memset(&fcs, 0, sizeof(fcs)); + fcs.dwSize = sizeof(fcs); + fcs.dwMask = FCSM_ICONFILE; + fcs.pszIconFile = (WCHAR *)iconW; + + hr = pSHGetSetFolderCustomSettings(&fcs, pathW, FCS_FORCEWRITE); /*creates and writes to a Desktop.ini*/ + todo_wine ok(hr == S_OK, "Expected S_OK, got %#x\n", hr); + + memset(&fcs, 0, sizeof(fcs)); + fcs.dwSize = sizeof(fcs); + fcs.dwMask = FCSM_ICONFILE; + fcs.cchIconFile = MAX_PATH; + fcs.pszIconFile = bufferW; + + hr = pSHGetSetFolderCustomSettings(&fcs, pathW, FCS_READ); + todo_wine ok(hr == S_OK, "Expected S_OK, got %#x\n", hr); + todo_wine ok(!lstrcmpW(iconW, fcs.pszIconFile), "Expected %s, got %s\n", wine_dbgstr_w(iconW), wine_dbgstr_w(fcs.pszIconFile)); + + hr = pSHGetSetFolderCustomSettings(&fcs, NULL, FCS_READ); + todo_wine ok(hr == E_FAIL, "Expected E_FAIL, got %#x\n", hr); + + RemoveDirectoryW(pathW); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5288,6 +5330,7 @@ START_TEST(shlfolder) test_GetDefaultColumn(); test_GetDefaultSearchGUID(); test_SHLimitInputEdit(); + test_SHGetSetFolderCustomSettings(); OleUninitialize(); } diff --git a/include/shlobj.h b/include/shlobj.h index 9d6dcdd..7bf0d2e 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1489,7 +1489,7 @@ int WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES); #define FCSM_ICONFILE 0x00000010 #define FCSM_LOGO 0x00000020 #define FCSM_FLAGS 0x00000040 - +#include <pshpack8.h> typedef struct { DWORD dwSize; DWORD dwMask; @@ -1507,6 +1507,7 @@ typedef struct { LPWSTR pszLogo; DWORD cchLogo; } SHFOLDERCUSTOMSETTINGS, *LPSHFOLDERCUSTOMSETTINGS; +#include <poppack.h> HRESULT WINAPI SHGetSetFolderCustomSettings(LPSHFOLDERCUSTOMSETTINGS pfcs, PCWSTR pszPath, DWORD dwReadWrite); -- 2.7.4

3 2

[PATCH 2/2] reg: Null terminate hex-formatted REG_SZ data if necessary
by Hugh McMaster April 23, 2018

April 23, 2018

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/import.c | 3 ++- programs/reg/tests/reg.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index f2ce80e7cb..779ea2863b 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -409,7 +409,8 @@ static void free_parser_data(struct parser *parser) static void prepare_hex_string_data(struct parser *parser) { - if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ) + if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ || + parser->data_type == REG_SZ) { if (parser->is_unicode) { diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 5004414450..aba71b7b87 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4668,7 +4668,7 @@ static void test_export(void) err = RegQueryValueExA(hkey, "Wine4d", NULL, &type, (BYTE *)&buffer, &size); ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); ok(type == REG_SZ, "got wrong type %u, expected %u\n", type, REG_SZ); - todo_wine ok(size == 5 || broken(size == 4) /* WinXP */, "got wrong size %u, expected 5\n", size); + ok(size == 5 || broken(size == 4) /* WinXP */, "got wrong size %u, expected 5\n", size); ok(memcmp(buffer, "\0abc", size) == 0, "got wrong data\n"); dword = 0x100; verify_reg(hkey, "Wine4e", REG_DWORD, &dword, sizeof(dword), 0); -- 2.17.0

1 0

[PATCH 1/2] regedit: Null terminate hex-formatted REG_SZ data if necessary
by Hugh McMaster April 23, 2018

April 23, 2018

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/regproc.c | 3 ++- programs/regedit/tests/regedit.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 35b03228c4..84a16f93c4 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -507,7 +507,8 @@ static void free_parser_data(struct parser *parser) static void prepare_hex_string_data(struct parser *parser) { - if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ) + if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ || + parser->data_type == REG_SZ) { if (parser->is_unicode) { diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 41712a13f1..845ab00ac9 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3679,7 +3679,7 @@ static void test_export(void) verify_reg(hkey, "Wine4a", REG_DWORD, &dword, sizeof(dword), 0); verify_reg(hkey, "Wine4b", REG_SZ, "\0\0\0\0\0\0\0", 4, 0); verify_reg(hkey, "Wine4c", REG_SZ, "Value", 6, 0); - verify_reg(hkey, "Wine4d", REG_SZ, "\0abc", 5, TODO_REG_SIZE); + verify_reg(hkey, "Wine4d", REG_SZ, "\0abc", 5, 0); dword = 0x100; verify_reg(hkey, "Wine4e", REG_DWORD, &dword, sizeof(dword), 0); verify_reg(hkey, "Wine4f", REG_SZ, "\0Value", 7, 0); -- 2.17.0

1 0

[PATCH 2/2] include: Add more DXGI swapchain flags.
by Henri Verbeet April 23, 2018

April 23, 2018

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/dxgi.idl | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index 0626315b52b..b724770ab7b 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -108,10 +108,21 @@ typedef struct DXGI_ADAPTER_DESC { LUID AdapterLuid; } DXGI_ADAPTER_DESC; -typedef enum DXGI_SWAP_CHAIN_FLAG { - DXGI_SWAP_CHAIN_FLAG_NONPREROTATED = 1, - DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH = 2, - DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE = 4 +typedef enum DXGI_SWAP_CHAIN_FLAG +{ + DXGI_SWAP_CHAIN_FLAG_NONPREROTATED = 0x0001, + DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH = 0x0002, + DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE = 0x0004, + DXGI_SWAP_CHAIN_FLAG_RESTRICTED_CONTEXT = 0x0008, + DXGI_SWAP_CHAIN_FLAG_RESTRICT_SHARED_RESOURCE_DRIVER = 0x0010, + DXGI_SWAP_CHAIN_FLAG_DISPLAY_ONLY = 0x0020, + DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT = 0x0040, + DXGI_SWAP_CHAIN_FLAG_FOREGROUND_LAYER = 0x0080, + DXGI_SWAP_CHAIN_FLAG_FULLSCREEN_VIDEO = 0x0100, + DXGI_SWAP_CHAIN_FLAG_YUV_VIDEO = 0x0200, + DXGI_SWAP_CHAIN_FLAG_HW_PROTECTED = 0x0400, + DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING = 0x0800, + DXGI_SWAP_CHAIN_FLAG_RESTRICTED_TO_ALL_HOLOGRAPHIC_DISPLAYS = 0x1000, } DXGI_SWAP_CHAIN_FLAG; typedef struct DXGI_SWAP_CHAIN_DESC { -- 2.11.0

1 0

[PATCH 1/2] wined3d: Add support for setting multiple scissor rectangles.
by Henri Verbeet April 23, 2018

April 23, 2018

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 4 ++-- dlls/d3d9/device.c | 2 +- dlls/wined3d/context.c | 4 ++++ dlls/wined3d/cs.c | 34 ++++++++++++++++++------------ dlls/wined3d/device.c | 45 +++++++++++++++++++++++++-------------- dlls/wined3d/state.c | 48 ++++++++++++++++++++++++++++++++---------- dlls/wined3d/stateblock.c | 17 ++++++++++----- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 6 ++++-- include/wine/wined3d.h | 3 ++- 10 files changed, 113 insertions(+), 52 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 73779520360..a8251aad27a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -998,7 +998,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11De return; wined3d_mutex_lock(); - wined3d_device_set_scissor_rect(device->wined3d_device, rects); + wined3d_device_set_scissor_rects(device->wined3d_device, 1, rects); wined3d_mutex_unlock(); } @@ -4192,7 +4192,7 @@ static void STDMETHODCALLTYPE d3d10_device_RSSetScissorRects(ID3D10Device1 *ifac return; wined3d_mutex_lock(); - wined3d_device_set_scissor_rect(device->wined3d_device, rects); + wined3d_device_set_scissor_rects(device->wined3d_device, 1, rects); wined3d_mutex_unlock(); } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0a77b3e316b..b73d9748607 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2564,7 +2564,7 @@ static HRESULT WINAPI d3d9_device_SetScissorRect(IDirect3DDevice9Ex *iface, cons TRACE("iface %p, rect %p.\n", iface, rect); wined3d_mutex_lock(); - wined3d_device_set_scissor_rect(device->wined3d_device, rect); + wined3d_device_set_scissor_rects(device->wined3d_device, 1, rect); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d5378e203e0..4e1e032c00d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2244,6 +2244,10 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (device->dummy_textures.tex_2d) context_bind_dummy_textures(device, ret); + /* Initialise all rectangles to avoid resetting unused ones later. */ + gl_info->gl_ops.gl.p_glScissor(0, 0, 0, 0); + checkGLcall("glScissor"); + TRACE("Created context %p.\n", ret); return ret; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 221e51eb94b..517b5997905 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -34,7 +34,7 @@ enum wined3d_cs_op WINED3D_CS_OP_FLUSH, WINED3D_CS_OP_SET_PREDICATION, WINED3D_CS_OP_SET_VIEWPORTS, - WINED3D_CS_OP_SET_SCISSOR_RECT, + WINED3D_CS_OP_SET_SCISSOR_RECTS, WINED3D_CS_OP_SET_RENDERTARGET_VIEW, WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW, WINED3D_CS_OP_SET_VERTEX_DECLARATION, @@ -145,10 +145,11 @@ struct wined3d_cs_set_viewports struct wined3d_viewport viewports[1]; }; -struct wined3d_cs_set_scissor_rect +struct wined3d_cs_set_scissor_rects { enum wined3d_cs_op opcode; - RECT rect; + unsigned int rect_count; + RECT rects[1]; }; struct wined3d_cs_set_rendertarget_view @@ -545,7 +546,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * 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]) - IntersectRect(&op->draw_rect, &op->draw_rect, &state->scissor_rect); + IntersectRect(&op->draw_rect, &op->draw_rect, &state->scissor_rects[0]); op->color = *color; op->depth = depth; op->stencil = stencil; @@ -989,21 +990,28 @@ void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_ cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } -static void wined3d_cs_exec_set_scissor_rect(struct wined3d_cs *cs, const void *data) +static void wined3d_cs_exec_set_scissor_rects(struct wined3d_cs *cs, const void *data) { - const struct wined3d_cs_set_scissor_rect *op = data; + const struct wined3d_cs_set_scissor_rects *op = data; - cs->state.scissor_rect = op->rect; + if (op->rect_count) + memcpy(cs->state.scissor_rects, op->rects, op->rect_count * sizeof(*op->rects)); + else + SetRectEmpty(cs->state.scissor_rects); + cs->state.scissor_rect_count = op->rect_count; device_invalidate_state(cs->device, STATE_SCISSORRECT); } -void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) +void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_count, const RECT *rects) { - struct wined3d_cs_set_scissor_rect *op; + struct wined3d_cs_set_scissor_rects *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECT; - op->rect = *rect; + op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_set_scissor_rects, rects[rect_count]), + WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECTS; + if (rect_count) + memcpy(op->rects, rects, rect_count * sizeof(*rects)); + op->rect_count = rect_count; cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } @@ -2411,7 +2419,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_FLUSH */ wined3d_cs_exec_flush, /* WINED3D_CS_OP_SET_PREDICATION */ wined3d_cs_exec_set_predication, /* WINED3D_CS_OP_SET_VIEWPORTS */ wined3d_cs_exec_set_viewports, - /* WINED3D_CS_OP_SET_SCISSOR_RECT */ wined3d_cs_exec_set_scissor_rect, + /* WINED3D_CS_OP_SET_SCISSOR_RECTS */ wined3d_cs_exec_set_scissor_rects, /* WINED3D_CS_OP_SET_RENDERTARGET_VIEW */ wined3d_cs_exec_set_rendertarget_view, /* WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW */ wined3d_cs_exec_set_depth_stencil_view, /* WINED3D_CS_OP_SET_VERTEX_DECLARATION */ wined3d_cs_exec_set_vertex_declaration, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8d4f4cde0e0..3af4531d4f9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -413,9 +413,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c gl_info->gl_ops.gl.p_glScissor(draw_rect->left, drawable_height - draw_rect->bottom, draw_rect->right - draw_rect->left, draw_rect->bottom - draw_rect->top); } - checkGLcall("glScissor"); gl_info->gl_ops.gl.p_glClear(clear_mask); - checkGLcall("glClear"); } else { @@ -450,12 +448,11 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c gl_info->gl_ops.gl.p_glScissor(current_rect.left, drawable_height - current_rect.bottom, current_rect.right - current_rect.left, current_rect.bottom - current_rect.top); } - checkGLcall("glScissor"); - gl_info->gl_ops.gl.p_glClear(clear_mask); - checkGLcall("glClear"); } } + context->scissor_rect_count = WINED3D_MAX_VIEWPORTS; + checkGLcall("clear"); if (flags & WINED3DCLEAR_TARGET && target->swapchain && target->swapchain->front_buffer == target) gl_info->gl_ops.gl.p_glFlush(); @@ -2123,19 +2120,33 @@ DWORD CDECL wined3d_device_get_sampler_state(const struct wined3d_device *device return device->state.sampler_states[sampler_idx][state]; } -void CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect) +void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsigned int rect_count, + const RECT *rects) { - TRACE("device %p, rect %s.\n", device, wine_dbgstr_rect(rect)); + unsigned int i; + + TRACE("device %p, rect_count %u, rects %p.\n", device, rect_count, rects); + + for (i = 0; i < rect_count; ++i) + { + TRACE("%u: %s\n", i, wine_dbgstr_rect(&rects[i])); + } if (device->recording) device->recording->changed.scissorRect = TRUE; - if (EqualRect(&device->update_state->scissor_rect, rect)) + if (device->update_state->scissor_rect_count == rect_count + && !memcmp(device->update_state->scissor_rects, rects, rect_count * sizeof(*rects))) { - TRACE("App is setting the old scissor rectangle over, nothing to do.\n"); + TRACE("App is setting the old scissor rectangles over, nothing to do.\n"); return; } - CopyRect(&device->update_state->scissor_rect, rect); + + if (rect_count) + memcpy(device->update_state->scissor_rects, rects, rect_count * sizeof(*rects)); + else + memset(device->update_state->scissor_rects, 0, sizeof(device->update_state->scissor_rects)); + device->update_state->scissor_rect_count = rect_count; if (device->recording) { @@ -2143,14 +2154,14 @@ void CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const return; } - wined3d_cs_emit_set_scissor_rect(device->cs, rect); + wined3d_cs_emit_set_scissor_rects(device->cs, rect_count, rects); } void CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect) { TRACE("device %p, rect %p.\n", device, rect); - *rect = device->state.scissor_rect; + *rect = device->state.scissor_rects[0]; TRACE("Returning rect %s.\n", wine_dbgstr_rect(rect)); } @@ -4476,8 +4487,9 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device state->viewport_count = 1; wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports); - SetRect(&state->scissor_rect, 0, 0, view->width, view->height); - wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); + SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); + state->scissor_rect_count = 1; + wined3d_cs_emit_set_scissor_rects(device->cs, 1, state->scissor_rects); } prev = device->fb.render_targets[view_idx]; @@ -4986,8 +4998,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state->viewport_count = 1; wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports); - SetRect(&state->scissor_rect, 0, 0, view->width, view->height); - wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); + SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); + state->scissor_rect_count = 1; + wined3d_cs_emit_set_scissor_rects(device->cs, 1, state->scissor_rects); } if (device->d3d_initialized) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3563b4b0fdd..c869b63b11d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4252,27 +4252,53 @@ static void light(struct wined3d_context *context, const struct wined3d_state *s static void scissorrect(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; - const RECT *r = &state->scissor_rect; + unsigned int height = 0; + const RECT *r; /* Warning: glScissor uses window coordinates, not viewport coordinates, * so our viewport correction does not apply. Warning2: Even in windowed * mode the coords are relative to the window, not the screen. */ - TRACE("Setting new scissor rect to %s.\n", wine_dbgstr_rect(r)); - if (context->render_offscreen) - { - gl_info->gl_ops.gl.p_glScissor(r->left, r->top, r->right - r->left, r->bottom - r->top); - } - else + if (!context->render_offscreen) { const struct wined3d_rendertarget_view *target = state->fb->render_targets[0]; - UINT height; - UINT width; + unsigned int width; wined3d_rendertarget_view_get_drawable_size(target, context, &width, &height); - gl_info->gl_ops.gl.p_glScissor(r->left, height - r->bottom, r->right - r->left, r->bottom - r->top); } - checkGLcall("glScissor"); + + if (gl_info->supported[ARB_VIEWPORT_ARRAY]) + { + GLint sr[4 * WINED3D_MAX_VIEWPORTS]; + unsigned int i, reset_count = 0; + + for (i = 0; i < state->scissor_rect_count; ++i) + { + r = &state->scissor_rects[i]; + + sr[i * 4] = r->left; + sr[i * 4 + 1] = height ? height - r->top : r->top; + sr[i * 4 + 2] = r->right - r->left; + sr[i * 4 + 3] = r->bottom - r->top; + } + + if (context->scissor_rect_count > state->scissor_rect_count) + reset_count = context->scissor_rect_count - state->scissor_rect_count; + + if (reset_count) + memset(&sr[state->scissor_rect_count * 4], 0, reset_count * 4 * sizeof(GLint)); + + GL_EXTCALL(glScissorArrayv(0, state->scissor_rect_count + reset_count, sr)); + checkGLcall("glScissorArrayv"); + context->scissor_rect_count = state->scissor_rect_count; + } + else + { + r = &state->scissor_rects[0]; + gl_info->gl_ops.gl.p_glScissor(r->left, height ? height - r->top : r->top, + r->right - r->left, r->bottom - r->top); + checkGLcall("glScissor"); + } } static void indexbuffer(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4ad0331f94b..b4d17517b4b 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -825,12 +825,18 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) memset(stateblock->state.viewports, 0, sizeof(*stateblock->state.viewports)); } - if (stateblock->changed.scissorRect && memcmp(&src_state->scissor_rect, - &stateblock->state.scissor_rect, sizeof(stateblock->state.scissor_rect))) + if (stateblock->changed.scissorRect + && (src_state->scissor_rect_count != stateblock->state.scissor_rect_count + || memcmp(src_state->scissor_rects, stateblock->state.scissor_rects, + src_state->scissor_rect_count * sizeof(*stateblock->state.scissor_rects)))) { - TRACE("Updating scissor rect.\n"); + TRACE("Updating scissor rects.\n"); - stateblock->state.scissor_rect = src_state->scissor_rect; + if ((stateblock->state.scissor_rect_count = src_state->scissor_rect_count)) + memcpy(stateblock->state.scissor_rects, src_state->scissor_rects, + src_state->scissor_rect_count * sizeof(*src_state->scissor_rects)); + else + SetRectEmpty(stateblock->state.scissor_rects); } map = stateblock->changed.streamSource; @@ -1065,7 +1071,8 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) wined3d_device_set_viewports(device, stateblock->state.viewport_count, stateblock->state.viewports); if (stateblock->changed.scissorRect) - wined3d_device_set_scissor_rect(device, &stateblock->state.scissor_rect); + wined3d_device_set_scissor_rects(device, stateblock->state.scissor_rect_count, + stateblock->state.scissor_rects); map = stateblock->changed.streamSource; for (i = 0; map; map >>= 1, ++i) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1b591782969..21b2414bbef 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -176,7 +176,7 @@ @ cdecl wined3d_device_set_render_state(ptr long long) @ cdecl wined3d_device_set_rendertarget_view(ptr long ptr long) @ cdecl wined3d_device_set_sampler_state(ptr long long long) -@ cdecl wined3d_device_set_scissor_rect(ptr ptr) +@ cdecl wined3d_device_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_set_software_vertex_processing(ptr long) @ cdecl wined3d_device_set_stream_output(ptr long ptr long) @ cdecl wined3d_device_set_stream_source(ptr long ptr long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8cdc3ef6f93..e9e3f86b910 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1995,6 +1995,7 @@ struct wined3d_context GLuint dummy_arbfp_prog; unsigned int viewport_count; + unsigned int scissor_rect_count; }; struct wined3d_fb_state @@ -2863,7 +2864,8 @@ struct wined3d_state struct wined3d_material material; struct wined3d_viewport viewports[WINED3D_MAX_VIEWPORTS]; unsigned int viewport_count; - RECT scissor_rect; + RECT scissor_rects[WINED3D_MAX_VIEWPORTS]; + unsigned int scissor_rect_count; /* Light hashmap. Collisions are handled using linked lists. */ #define LIGHTMAP_SIZE 43 @@ -3599,7 +3601,7 @@ void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type UINT sampler_idx, struct wined3d_sampler *sampler) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_count, const RECT *rects) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type type, struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ccda987405c..6223706f578 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2426,7 +2426,8 @@ HRESULT __cdecl wined3d_device_set_rendertarget_view(struct wined3d_device *devi unsigned int view_idx, struct wined3d_rendertarget_view *view, BOOL set_viewport); void __cdecl wined3d_device_set_sampler_state(struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); -void __cdecl wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect); +void __cdecl wined3d_device_set_scissor_rects(struct wined3d_device *device, + unsigned int rect_count, const RECT *rect); void __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software); void __cdecl wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer, UINT offset); -- 2.11.0

1 0

[PATCH] d3d11.idl: Fixed a typo in CD3D11_BLEND_DESC constructor.
by Jacek Caban April 23, 2018

April 23, 2018

Spotted by Tom Ritter. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/d3d11.idl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

2 1

[PATCH] msi: Avoid returning an uninitialized variable.
by Zebediah Figura April 23, 2018

April 23, 2018

Fixes https://bugs.winehq.org/show_bug.cgi?id=45044. Thanks to Anastasius Focht for reporting and thoroughly debugging this issue. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/record.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 5804046..a7d5588 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -1059,7 +1059,7 @@ UINT copy_remote_record(const struct wire_record *in, MSIHANDLE out) { MSIRECORD *rec; unsigned int i; - UINT r; + UINT r = ERROR_SUCCESS; if (!(rec = msihandle2msiinfo(out, MSIHANDLETYPE_RECORD))) return ERROR_INVALID_HANDLE; -- 2.7.4

2 1

[PATCH 1/5] msi: Make MsiDoAction() RPC-compatible.
by Zebediah Figura April 23, 2018

April 23, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/install.c | 20 +------------------- dlls/msi/package.c | 5 ++--- dlls/msi/tests/custom.c | 21 +++++++++++++++++++++ dlls/msi/tests/custom.spec | 1 + dlls/msi/tests/install.c | 2 ++ dlls/msi/winemsi.idl | 2 +- 6 files changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 814addc..f488674 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -75,29 +75,11 @@ UINT WINAPI MsiDoActionW( MSIHANDLE hInstall, LPCWSTR szAction ) if (!package) { MSIHANDLE remote; - HRESULT hr; - BSTR action; if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - action = SysAllocString( szAction ); - if (!action) - return ERROR_OUTOFMEMORY; - - hr = remote_DoAction(remote, action); - - SysFreeString( action ); - - if (FAILED(hr)) - { - if (HRESULT_FACILITY(hr) == FACILITY_WIN32) - return HRESULT_CODE(hr); - - return ERROR_FUNCTION_FAILED; - } - - return ERROR_SUCCESS; + return remote_DoAction(remote, szAction); } ret = ACTION_PerformAction( package, szAction, SCRIPT_NONE ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index d18736b..0681189 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2464,10 +2464,9 @@ int __cdecl remote_ProcessMessage(MSIHANDLE hinst, INSTALLMESSAGE message, struc return ret; } -HRESULT __cdecl remote_DoAction(MSIHANDLE hinst, BSTR action) +UINT __cdecl remote_DoAction(MSIHANDLE hinst, LPCWSTR action) { - UINT r = MsiDoActionW(hinst, action); - return HRESULT_FROM_WIN32(r); + return MsiDoActionW(hinst, action); } HRESULT __cdecl remote_Sequence(MSIHANDLE hinst, BSTR table, int sequence) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index e782311..5bdb8d2 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -426,6 +426,26 @@ static void test_db(MSIHANDLE hinst) ok(hinst, !r, "got %u\n", r); } +static void test_doaction(MSIHANDLE hinst) +{ + UINT r; + + r = MsiDoActionA(hinst, "nested51"); + ok(hinst, !r, "got %u\n", r); + check_prop(hinst, "nested", "1"); + + r = MsiDoActionA(hinst, "nested1"); + ok(hinst, !r, "got %u\n", r); + check_prop(hinst, "nested", "2"); +} + +UINT WINAPI nested(MSIHANDLE hinst) +{ + MsiSetPropertyA(hinst, "nested", "2"); + + return ERROR_SUCCESS; +} + /* Main test. Anything that doesn't depend on a specific install configuration * or have undesired side effects should go here. */ UINT WINAPI main_test(MSIHANDLE hinst) @@ -451,6 +471,7 @@ UINT WINAPI main_test(MSIHANDLE hinst) test_props(hinst); test_db(hinst); + test_doaction(hinst); return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index bb400ff..51bb60e 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -2,3 +2,4 @@ @ stdcall test_retval(long) @ stdcall da_immediate(long) @ stdcall da_deferred(long) +@ stdcall nested(long) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 41a77cd..b63e5da 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -703,6 +703,8 @@ static const CHAR ca1_custom_action_dat[] = "Action\tType\tSource\tTarget\n" "s72\ti2\tS64\tS0\n" "CustomAction\tAction\n" "embednull\t51\tembednullprop\ta[~]b\n" + "nested51\t51\tnested\t1\n" + "nested1\t1\tcustom.dll\tnested\n" "maintest\t1\tcustom.dll\tmain_test\n" "testretval\t1\tcustom.dll\ttest_retval\n"; diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 7613fd3..57790d1 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -74,7 +74,7 @@ interface IWineMsiRemote UINT remote_GetProperty( [in] MSIHANDLE hinst, [in, string] LPCWSTR property, [out, string] LPWSTR *value, [out] DWORD *size ); UINT remote_SetProperty( [in] MSIHANDLE hinst, [in, string, unique] LPCWSTR property, [in, string, unique] LPCWSTR value ); int remote_ProcessMessage( [in] MSIHANDLE hinst, [in] INSTALLMESSAGE message, [in] struct wire_record *record ); - HRESULT remote_DoAction( [in] MSIHANDLE hinst, [in] BSTR action ); + UINT remote_DoAction( [in] MSIHANDLE hinst, [in, string] LPCWSTR action ); HRESULT remote_Sequence( [in] MSIHANDLE hinst, [in] BSTR table, [in] int sequence ); HRESULT remote_GetTargetPath( [in] MSIHANDLE hinst, [in] BSTR folder, [out, size_is(*size)] BSTR value, [in, out] DWORD *size ); HRESULT remote_SetTargetPath( [in] MSIHANDLE hinst, [in] BSTR folder, [in] BSTR value ); -- 2.7.4

3 14