February 2017 - Wine-commits

Nikolay Sivov : user32/tests: Test to show that original font is not selected back after painting buttons.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: a423f14a564c4983c876e77aa16cc6f06085a62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a423f14a564c4983c876e77aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 6 14:23:40 2017 +0300 user32/tests: Test to show that original font is not selected back after painting buttons. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c608c11..2d2f689 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5800,10 +5800,11 @@ static void test_button_messages(void) WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, WmSetTextButtonSeq }, }; + LOGFONTA logfont = { 0 }; + HFONT zfont, hfont2; unsigned int i; HWND hwnd, parent; DWORD dlg_code; - HFONT zfont; /* selection with VK_SPACE should capture button window */ hwnd = CreateWindowExA(0, "button", "test", BS_CHECKBOX | WS_VISIBLE | WS_POPUP, @@ -5822,11 +5823,21 @@ static void test_button_messages(void) 100, 100, 200, 200, 0, 0, 0, NULL); ok(parent != 0, "Failed to create parent window\n"); + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = -12; + logfont.lfWeight = FW_NORMAL; + strcpy(logfont.lfFaceName, "Tahoma"); + + hfont2 = CreateFontIndirectA(&logfont); + ok(hfont2 != NULL, "Failed to create Tahoma font\n"); + for (i = 0; i < sizeof(button)/sizeof(button[0]); i++) { MSG msg; DWORD style, state; + HFONT prevfont; char desc[64]; + HDC hdc; trace("button style %08x\n", button[i].style); @@ -6001,15 +6012,35 @@ static void test_button_messages(void) ok_sequence(button[i].lbuttonup, desc, FALSE); flush_sequence(); - zfont = GetStockObject(SYSTEM_FONT); + zfont = GetStockObject(DEFAULT_GUI_FONT); SendMessageA(hwnd, WM_SETFONT, (WPARAM)zfont, TRUE); UpdateWindow(hwnd); sprintf(desc, "button[%i]: WM_SETFONT on a button", i); ok_sequence(button[i].setfont, desc, FALSE); + /* Test that original font is not selected back after painting */ + hdc = CreateCompatibleDC(0); + + 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); + 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); + SelectObject(hdc, prevfont); + + DeleteDC(hdc); + DestroyWindow(hwnd); } + DeleteObject(hfont2); DestroyWindow(parent); }

1 0

Dmitry Timoshkov : user32: BUTTON_CalcLabelRect should use the button font.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: e45b80088bc4bf6f048e267c09dc0ce83c1a3485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e45b80088bc4bf6f048e267c0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 6 14:23:41 2017 +0300 user32: BUTTON_CalcLabelRect should use the button font. Otherwise WM_SETTEXT handler gets wrong rectangle to erase an old text. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index e85e30d..cc70e37 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -598,15 +598,22 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc) switch (style & (BS_ICON|BS_BITMAP)) { case BS_TEXT: + { + HFONT hFont, hPrevFont = 0; + if (!(text = get_button_text( hwnd ))) goto empty_rect; if (!text[0]) { HeapFree( GetProcessHeap(), 0, text ); goto empty_rect; } + + if ((hFont = get_button_font( hwnd ))) hPrevFont = SelectObject( hdc, hFont ); DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT); + if (hPrevFont) SelectObject( hdc, hPrevFont ); HeapFree( GetProcessHeap(), 0, text ); break; + } case BS_ICON: if (!GetIconInfo((HICON)GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ), &iconInfo))

1 0

Dmitry Timoshkov : user32: Fix groupbox rectangle calculation in the button's WM_SETTEXT handler.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: d639d3bba011bcae0134705bde5a47bf3934f166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d639d3bba011bcae0134705bd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 6 14:23:42 2017 +0300 user32: Fix groupbox rectangle calculation in the button's WM_SETTEXT handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index cc70e37..e5cee12 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -394,6 +394,9 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, GetClientRect(hWnd, &client); rc = client; + /* FIXME: check other BS_* handlers */ + if (btn_type == BS_GROUPBOX) + InflateRect(&rc, -7, 1); /* GB_Paint does this */ BUTTON_CalcLabelRect(hWnd, hdc, &rc); /* Clip by client rect bounds */ if (rc.right > client.right) rc.right = client.right;

1 0

Lauri Kenttä : msvcrt: Fix _creat and _wcreat.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 9924f009ce0fb6975eba8cdcbe7de4a64a3dda9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9924f009ce0fb6975eba8cdcb… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Feb 7 17:59:53 2017 +0200 msvcrt: Fix _creat and _wcreat. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 24a6e2e..c31ce77 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2430,19 +2430,19 @@ int CDECL MSVCRT__wopen(const MSVCRT_wchar_t *path,int flags,...) /********************************************************************* * _creat (MSVCRT.@) */ -int CDECL MSVCRT__creat(const char *path, int flags) +int CDECL MSVCRT__creat(const char *path, int pmode) { - int usedFlags = (flags & MSVCRT__O_TEXT)| MSVCRT__O_CREAT| MSVCRT__O_WRONLY| MSVCRT__O_TRUNC; - return MSVCRT__open(path, usedFlags); + int flags = MSVCRT__O_CREAT | MSVCRT__O_TRUNC | MSVCRT__O_RDWR; + return MSVCRT__open(path, flags, pmode); } /********************************************************************* * _wcreat (MSVCRT.@) */ -int CDECL MSVCRT__wcreat(const MSVCRT_wchar_t *path, int flags) +int CDECL MSVCRT__wcreat(const MSVCRT_wchar_t *path, int pmode) { - int usedFlags = (flags & MSVCRT__O_TEXT)| MSVCRT__O_CREAT| MSVCRT__O_WRONLY| MSVCRT__O_TRUNC; - return MSVCRT__wopen(path, usedFlags); + int flags = MSVCRT__O_CREAT | MSVCRT__O_TRUNC | MSVCRT__O_RDWR; + return MSVCRT__wopen(path, flags, pmode); } /*********************************************************************

1 0

Lauri Kenttä : msvcrt/tests: Add tests for _creat.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: cabf96512aefd1a10ee589d55e6aad5d16c98f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cabf96512aefd1a10ee589d55… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Feb 7 17:59:54 2017 +0200 msvcrt/tests: Add tests for _creat. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/file.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 9e2beee..2c356ea 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -49,6 +49,8 @@ static HANDLE proc_handles[2]; static int (__cdecl *p_fopen_s)(FILE**, const char*, const char*); static int (__cdecl *p__wfopen_s)(FILE**, const wchar_t*, const wchar_t*); +static errno_t (__cdecl *p__get_fmode)(int*); +static errno_t (__cdecl *p__set_fmode)(int); static const char* get_base_name(const char *path) { @@ -71,6 +73,8 @@ static void init(void) p_fopen_s = (void*)GetProcAddress(hmod, "fopen_s"); p__wfopen_s = (void*)GetProcAddress(hmod, "_wfopen_s"); __pioinfo = (void*)GetProcAddress(hmod, "__pioinfo"); + p__get_fmode = (void*)GetProcAddress(hmod, "_get_fmode"); + p__set_fmode = (void*)GetProcAddress(hmod, "_set_fmode"); } static void test_filbuf( void ) @@ -2386,6 +2390,59 @@ static void test_close(void) DeleteFileA( "fdopen.tst" ); } +static void test__creat(void) +{ + int fd, pos, count, readonly, old_fmode = 0, have_fmode; + char buf[6], testdata[4] = {'a', '\n', 'b', '\n'}; + + have_fmode = p__get_fmode && p__set_fmode && !p__get_fmode(&old_fmode); + if (!have_fmode) + win_skip("_fmode can't be set, skipping mode tests\n"); + + if (have_fmode) + p__set_fmode(_O_TEXT); + fd = _creat("_creat.tst", 0); + ok(fd > 0, "_creat failed\n"); + _write(fd, testdata, 4); + if (have_fmode) { + pos = _tell(fd); + ok(pos == 6, "expected pos 6 (text mode), got %d\n", pos); + } + ok(_lseek(fd, SEEK_SET, 0) == 0, "_lseek failed\n"); + count = _read(fd, buf, 6); + ok(count == 4, "_read returned %d, expected 4\n", count); + count = count > 0 ? count > 4 ? 4 : count : 0; + ok(memcmp(buf, testdata, count) == 0, "_read returned wrong contents\n"); + _close(fd); + readonly = GetFileAttributesA("_creat.tst") & FILE_ATTRIBUTE_READONLY; + ok(readonly, "expected read-only file\n"); + SetFileAttributesA("_creat.tst", FILE_ATTRIBUTE_NORMAL); + DeleteFileA("_creat.tst"); + + if (have_fmode) + p__set_fmode(_O_BINARY); + fd = _creat("_creat.tst", _S_IREAD | _S_IWRITE); + ok(fd > 0, "_creat failed\n"); + _write(fd, testdata, 4); + if (have_fmode) { + pos = _tell(fd); + ok(pos == 4, "expected pos 4 (binary mode), got %d\n", pos); + } + ok(_lseek(fd, SEEK_SET, 0) == 0, "_lseek failed\n"); + count = _read(fd, buf, 6); + ok(count == 4, "_read returned %d, expected 4\n", count); + count = count > 0 ? count > 4 ? 4 : count : 0; + ok(memcmp(buf, testdata, count) == 0, "_read returned wrong contents\n"); + _close(fd); + readonly = GetFileAttributesA("_creat.tst") & FILE_ATTRIBUTE_READONLY; + ok(!readonly, "expected rw file\n"); + SetFileAttributesA("_creat.tst", FILE_ATTRIBUTE_NORMAL); + DeleteFileA("_creat.tst"); + + if (have_fmode) + p__set_fmode(old_fmode); +} + START_TEST(file) { int arg_c; @@ -2453,6 +2510,7 @@ START_TEST(file) test__open_osfhandle(); test_write_flush(); test_close(); + test__creat(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order

1 0

Guillaume Charifi : wined3d: Add dual-source blend factors.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 8bb7b9498670460b4ae26dacc6de446767b3276e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bb7b9498670460b4ae26dacc… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Tue Feb 7 12:45:28 2017 +0100 wined3d: Add dual-source blend factors. Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 8 ++++++++ include/wine/wined3d.h | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4b21c57..e469414 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -406,6 +406,14 @@ static GLenum gl_blend_factor(enum wined3d_blend factor, const struct wined3d_fo return GL_CONSTANT_COLOR_EXT; case WINED3D_BLEND_INVBLENDFACTOR: return GL_ONE_MINUS_CONSTANT_COLOR_EXT; + case WINED3D_BLEND_SRC1COLOR: + return GL_SRC1_COLOR; + case WINED3D_BLEND_INVSRC1COLOR: + return GL_ONE_MINUS_SRC1_COLOR; + case WINED3D_BLEND_SRC1ALPHA: + return GL_SRC1_ALPHA; + case WINED3D_BLEND_INVSRC1ALPHA: + return GL_ONE_MINUS_SRC1_ALPHA; default: FIXME("Unhandled blend factor %#x.\n", factor); return GL_NONE; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8b8305b..7788e90 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -400,6 +400,10 @@ enum wined3d_blend WINED3D_BLEND_BOTHINVSRCALPHA = 13, WINED3D_BLEND_BLENDFACTOR = 14, WINED3D_BLEND_INVBLENDFACTOR = 15, + WINED3D_BLEND_SRC1COLOR = 16, + WINED3D_BLEND_INVSRC1COLOR = 17, + WINED3D_BLEND_SRC1ALPHA = 18, + WINED3D_BLEND_INVSRC1ALPHA = 19, }; enum wined3d_blend_op

1 0

Józef Kucia : ddraw: Implement D3DOP_TEXTURELOAD.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 19d85623cf4d5540be709de3040a298700c4a8eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d85623cf4d5540be709de30… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 6 14:12:11 2017 +0100 ddraw: Implement D3DOP_TEXTURELOAD. 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/executebuffer.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 98e9404..393c52c 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -352,8 +352,30 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, break; case D3DOP_TEXTURELOAD: - WARN("TEXTURELOAD-s (%u)\n", count); - instr += count * size; + TRACE("TEXTURELOAD (%u)\n", count); + + for (i = 0; i < count; ++i) + { + D3DTEXTURELOAD *ci = (D3DTEXTURELOAD *)instr; + struct ddraw_surface *dst, *src; + + instr += size; + + if (!(dst = ddraw_get_object(&device->handle_table, + ci->hDestTexture - 1, DDRAW_HANDLE_SURFACE))) + { + WARN("Invalid destination texture handle %#x.\n", ci->hDestTexture); + continue; + } + if (!(src = ddraw_get_object(&device->handle_table, + ci->hSrcTexture - 1, DDRAW_HANDLE_SURFACE))) + { + WARN("Invalid source texture handle %#x.\n", ci->hSrcTexture); + continue; + } + + IDirect3DTexture2_Load(&dst->IDirect3DTexture2_iface, &src->IDirect3DTexture2_iface); + } break; case D3DOP_EXIT:

1 0

Józef Kucia : ddraw/tests: Add basic test for D3DOP_TEXTURELOAD.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: a865aa368f94a7d6693782a69a44384b0f454399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a865aa368f94a7d6693782a69… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 6 14:12:12 2017 +0100 ddraw/tests: Add basic test for D3DOP_TEXTURELOAD. 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 | 168 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 2832095..c408024 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -352,6 +352,23 @@ static void emit_tquad_tlist(void **ptr, WORD base_idx) *ptr = tri; } +static void emit_texture_load(void **ptr, D3DTEXTUREHANDLE dst_texture, + D3DTEXTUREHANDLE src_texture) +{ + D3DINSTRUCTION *instruction = *ptr; + D3DTEXTURELOAD *texture_load = (D3DTEXTURELOAD *)(instruction + 1); + + instruction->bOpcode = D3DOP_TEXTURELOAD; + instruction->bSize = sizeof(*texture_load); + instruction->wCount = 1; + + texture_load->hDestTexture = dst_texture; + texture_load->hSrcTexture = src_texture; + ++texture_load; + + *ptr = texture_load; +} + static void emit_end(void **ptr) { D3DINSTRUCTION *inst = *ptr; @@ -9996,6 +10013,156 @@ static void test_surface_desc_size(void) ok(!refcount, "DirectDraw has %u references left.\n", refcount); } +static void test_texture_load(void) +{ + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + static D3DTLVERTEX tquad[] = + { + {{ 0.0f}, {480.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {0.0f}}, + {{ 0.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {1.0f}}, + {{640.0f}, {480.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {0.0f}}, + {{640.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {1.0f}}, + }; + D3DTEXTUREHANDLE dst_texture_handle, src_texture_handle; + IDirectDrawSurface *dst_surface, *src_surface; + IDirect3DExecuteBuffer *execute_buffer; + D3DEXECUTEBUFFERDESC exec_desc; + IDirect3DMaterial *background; + IDirect3DViewport *viewport; + DDSURFACEDESC surface_desc; + IDirect3DTexture *texture; + IDirect3DDevice *device; + IDirectDrawSurface *rt; + IDirectDraw *ddraw; + UINT inst_length; + D3DCOLOR color; + ULONG refcount; + HWND window; + DDBLTFX fx; + HRESULT hr; + void *ptr; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + background = create_diffuse_material(device, 1.0f, 1.0f, 1.0f, 1.0f); + viewport = create_viewport(device, 0, 0, 640, 480); + viewport_set_background(device, viewport, background); + + memset(&exec_desc, 0, sizeof(exec_desc)); + exec_desc.dwSize = sizeof(exec_desc); + exec_desc.dwFlags = D3DDEB_BUFSIZE | D3DDEB_CAPS; + exec_desc.dwBufferSize = 1024; + exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY; + hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + surface_desc.dwWidth = 256; + surface_desc.dwHeight = 256; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; + U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x000000ff; + + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &src_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(src_surface, &IID_IDirect3DTexture, (void **)&texture); + ok(SUCCEEDED(hr), "Failed to get texture interface, hr %#x.\n", hr); + hr = IDirect3DTexture_GetHandle(texture, device, &src_texture_handle); + ok(SUCCEEDED(hr), "Failed to get texture handle, hr %#x.\n", hr); + IDirect3DTexture_Release(texture); + + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &dst_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(dst_surface, &IID_IDirect3DTexture, (void **)&texture); + ok(SUCCEEDED(hr), "Failed to get texture interface, hr %#x.\n", hr); + hr = IDirect3DTexture_GetHandle(texture, device, &dst_texture_handle); + ok(SUCCEEDED(hr), "Failed to get texture handle, hr %#x.\n", hr); + IDirect3DTexture_Release(texture); + + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + U5(fx).dwFillColor = 0x0000ffff; + hr = IDirectDrawSurface_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to fill surface, hr %#x.\n", hr); + + hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); + ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#x.\n", hr); + memcpy(exec_desc.lpData, tquad, sizeof(tquad)); + ptr = (BYTE *)exec_desc.lpData + sizeof(tquad); + emit_process_vertices(&ptr, D3DPROCESSVERTICES_COPY, 0, 4); + emit_texture_load(&ptr, dst_texture_handle, src_texture_handle); + emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREHANDLE, dst_texture_handle); + emit_tquad(&ptr, 0); + emit_end(&ptr); + inst_length = (BYTE *)ptr - (BYTE *)exec_desc.lpData - sizeof(tquad); + hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); + ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr); + + hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", color); + set_execute_data(execute_buffer, 4, sizeof(tquad), inst_length); + hr = IDirect3DDevice_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); + ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); + hr = IDirect3DDevice_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x0000ffff, 1), "Got unexpected color 0x%08x.\n", color); + + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + U5(fx).dwFillColor = 0x000000ff; + hr = IDirectDrawSurface_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to fill surface, hr %#x.\n", hr); + + hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", color); + set_execute_data(execute_buffer, 4, sizeof(tquad), inst_length); + hr = IDirect3DDevice_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); + ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); + hr = IDirect3DDevice_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + + IDirectDrawSurface_Release(dst_surface); + IDirectDrawSurface_Release(src_surface); + IDirectDrawSurface_Release(rt); + IDirect3DExecuteBuffer_Release(execute_buffer); + IDirect3DMaterial_Release(background); + destroy_viewport(device, viewport); + IDirect3DDevice_Release(device); + refcount = IDirectDraw_Release(ddraw); + ok(!refcount, "DirectDraw has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw1) { IDirectDraw *ddraw; @@ -10081,4 +10248,5 @@ START_TEST(ddraw1) test_transform_vertices(); test_display_mode_surface_pixel_format(); test_surface_desc_size(); + test_texture_load(); }

1 0

Józef Kucia : wined3d: Recognize SM5 imm_atomic_iadd opcode.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 9311141cd47b7d34e437de574af1a6aaeb3409b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9311141cd47b7d34e437de574… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 6 14:12:13 2017 +0100 wined3d: Recognize SM5 imm_atomic_iadd opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7fc97b5..f9906b2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5142,6 +5142,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMM_ATOMIC_CMP_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, + /* WINED3DSIH_IMM_ATOMIC_IADD */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2df308e..e47d18b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9026,6 +9026,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_CMP_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, + /* WINED3DSIH_IMM_ATOMIC_IADD */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 00ed452..490c985 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -162,6 +162,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMM_ATOMIC_CMP_EXCH */ "imm_atomic_cmp_exch", /* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", /* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch", + /* WINED3DSIH_IMM_ATOMIC_IADD */ "imm_atomic_iadd", /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", /* WINED3DSIH_IMM_ATOMIC_UMAX */ "imm_atomic_umax", /* WINED3DSIH_IMM_ATOMIC_UMIN */ "imm_atomic_umin", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 9bd9b62..991fad7 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -277,6 +277,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_ATOMIC_UMIN = 0xb1, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, + WINED3D_SM5_OP_IMM_ATOMIC_IADD = 0xb4, WINED3D_SM5_OP_IMM_ATOMIC_AND = 0xb5, WINED3D_SM5_OP_IMM_ATOMIC_OR = 0xb6, WINED3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7, @@ -1000,6 +1001,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_ATOMIC_UMIN, WINED3DSIH_ATOMIC_UMIN, "U", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, + {WINED3D_SM5_OP_IMM_ATOMIC_IADD, WINED3DSIH_IMM_ATOMIC_IADD, "uU", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_AND, WINED3DSIH_IMM_ATOMIC_AND, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_OR, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_XOR, WINED3DSIH_IMM_ATOMIC_XOR, "uU", "iu"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7209ce8..9b16e14 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -692,6 +692,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMM_ATOMIC_CMP_EXCH, WINED3DSIH_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_EXCH, + WINED3DSIH_IMM_ATOMIC_IADD, WINED3DSIH_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMIN,

1 0

Józef Kucia : wined3d: Implement applying state for compute pipeline.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 1b400f74335e8c4b9e919aeeb72de60f16a44b4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b400f74335e8c4b9e919aeeb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 6 14:12:14 2017 +0100 wined3d: Implement applying state for compute pipeline. 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/context.c | 45 +++++++++++++++++++++++++++++++++++++----- dlls/wined3d/cs.c | 19 ++++++++++++++---- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 5 +++++ 4 files changed, 68 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c141d70..5ae1bdc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1405,6 +1405,16 @@ static void context_enter(struct wined3d_context *context) } } +void context_invalidate_compute_state(struct wined3d_context *context, DWORD state_id) +{ + DWORD representative = context->state_table[state_id].representative; + unsigned int index, shift; + + index = representative / (sizeof(*context->dirty_compute_states) * CHAR_BIT); + shift = representative & (sizeof(*context->dirty_compute_states) * CHAR_BIT - 1); + context->dirty_compute_states[index] |= (1u << shift); +} + void context_invalidate_state(struct wined3d_context *context, DWORD state) { DWORD rep = context->state_table[state].representative; @@ -3312,7 +3322,8 @@ static void context_preload_textures(struct wined3d_context *context, const stru } } -static void context_load_shader_resources(struct wined3d_context *context, const struct wined3d_state *state) +static void context_load_shader_resources(struct wined3d_context *context, const struct wined3d_state *state, + unsigned int shader_mask) { struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; @@ -3321,6 +3332,9 @@ static void context_load_shader_resources(struct wined3d_context *context, const for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) { + if (!(shader_mask & (1u << i))) + continue; + if (!(shader = state->shader[i])) continue; @@ -3489,7 +3503,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, * updating a resource location. */ context_update_tex_unit_map(context, state); context_preload_textures(context, state); - context_load_shader_resources(context, state); + context_load_shader_resources(context, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); /* TODO: Right now the dependency on the vertex shader is necessary * since context_stream_info_from_declaration depends on the reg_maps of * the current VS but maybe it's possible to relax the coupling in some @@ -3528,10 +3542,10 @@ BOOL context_apply_draw_state(struct wined3d_context *context, state_table[rep].apply(context, state, rep); } - if (context->shader_update_mask) + if (context->shader_update_mask & ~(1u << WINED3D_SHADER_TYPE_COMPUTE)) { device->shader_backend->shader_select(device->shader_priv, context, state); - context->shader_update_mask = 0; + context->shader_update_mask &= 1u << WINED3D_SHADER_TYPE_COMPUTE; } if (context->constant_update_mask) @@ -3566,7 +3580,28 @@ BOOL context_apply_draw_state(struct wined3d_context *context, void context_apply_compute_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { - FIXME("Implement applying compute state.\n"); + const struct StateEntry *state_table = context->state_table; + unsigned int state_id, i, j; + + context_load_shader_resources(context, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + + for (i = 0, state_id = 0; i < ARRAY_SIZE(context->dirty_compute_states); ++i) + { + for (j = 0; j < sizeof(*context->dirty_compute_states) * CHAR_BIT; ++j, ++state_id) + { + if (context->dirty_compute_states[i] & (1u << j)) + state_table[state_id].apply(context, state, state_id); + } + } + memset(context->dirty_compute_states, 0, sizeof(*context->dirty_compute_states)); + + if (context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE)) + { + device->shader_backend->shader_select_compute(device->shader_priv, context, state); + context->shader_update_mask &= ~(1u << WINED3D_SHADER_TYPE_COMPUTE); + } + + context->last_was_blit = FALSE; } static void context_setup_target(struct wined3d_context *context, diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 220ddee..d575159 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -907,7 +907,10 @@ static void wined3d_cs_exec_set_constant_buffer(struct wined3d_cs *cs, const voi if (prev) InterlockedDecrement(&prev->resource.bind_count); - device_invalidate_state(cs->device, STATE_CONSTANT_BUFFER(op->type)); + if (op->type != WINED3D_SHADER_TYPE_COMPUTE) + device_invalidate_state(cs->device, STATE_CONSTANT_BUFFER(op->type)); + else + device_invalidate_compute_state(cs->device, STATE_CONSTANT_BUFFER(op->type)); } void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, @@ -1020,7 +1023,8 @@ static void wined3d_cs_exec_set_shader_resource_view(struct wined3d_cs *cs, cons const struct wined3d_cs_set_shader_resource_view *op = data; cs->state.shader_resource_view[op->type][op->view_idx] = op->view; - device_invalidate_state(cs->device, STATE_SHADER_RESOURCE_BINDING); + if (op->type != WINED3D_SHADER_TYPE_COMPUTE) + device_invalidate_state(cs->device, STATE_SHADER_RESOURCE_BINDING); } void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, unsigned int view_idx, @@ -1093,8 +1097,15 @@ static void wined3d_cs_exec_set_shader(struct wined3d_cs *cs, const void *data) const struct wined3d_cs_set_shader *op = data; cs->state.shader[op->type] = op->shader; - device_invalidate_state(cs->device, STATE_SHADER(op->type)); - device_invalidate_state(cs->device, STATE_SHADER_RESOURCE_BINDING); + if (op->type != WINED3D_SHADER_TYPE_COMPUTE) + { + device_invalidate_state(cs->device, STATE_SHADER(op->type)); + device_invalidate_state(cs->device, STATE_SHADER_RESOURCE_BINDING); + } + else + { + device_invalidate_compute_state(cs->device, STATE_SHADER(op->type)); + } } void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type type, struct wined3d_shader *shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0e969be..71bb929 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5113,6 +5113,14 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) } } +void device_invalidate_compute_state(const struct wined3d_device *device, DWORD state_id) +{ + unsigned int i; + + for (i = 0; i < device->context_count; ++i) + context_invalidate_compute_state(device->contexts[i], state_id); +} + LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9b16e14..ead8847 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1427,6 +1427,8 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; #define STATE_HIGHEST (STATE_COLOR_KEY) +#define STATE_COMPUTE_HIGHEST (STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE)) + enum fogsource { FOGSOURCE_FFP, FOGSOURCE_VS, @@ -1530,6 +1532,7 @@ struct wined3d_context DWORD dirtyArray[STATE_HIGHEST + 1]; /* Won't get bigger than that, a state is never marked dirty 2 times */ DWORD numDirtyEntries; DWORD isStateDirty[STATE_HIGHEST / (sizeof(DWORD) * CHAR_BIT) + 1]; /* Bitmap to find out quickly if a state is dirty */ + unsigned int dirty_compute_states[STATE_COMPUTE_HIGHEST / (sizeof(unsigned int) * CHAR_BIT) + 1]; struct wined3d_device *device; struct wined3d_swapchain *swapchain; @@ -1811,6 +1814,7 @@ GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) DE DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN; +void context_invalidate_compute_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; void context_invalidate_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_resource_released(const struct wined3d_device *device, @@ -2627,6 +2631,7 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; +void device_invalidate_compute_state(const struct wined3d_device *device, DWORD state_id) DECLSPEC_HIDDEN; void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state)

1 0