March 2016 - Wine-commits - list.winehq.org

Hans Leidekker : winhttp/tests: Fix test failures.
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: 05a13fb1558f19687f2a22c6566ed81108f5a5e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a13fb1558f19687f2a22c65… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 17 10:13:59 2016 +0100 winhttp/tests: Fix test failures. These were introduced with the web server upgrade. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index d676dd8..f81c07c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1004,11 +1004,13 @@ static void test_secure_connection(void) ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(!ret || proxy_active(), "succeeded unexpectedly\n"); + ok(ret, "failed to receive response %u\n", GetLastError()); - size = 0; - ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); - ok(!ret, "succeeded unexpectedly\n"); + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "header query failed %u\n", GetLastError()); + ok(status == HTTP_STATUS_BAD_REQUEST, "got %u\n", status); WinHttpCloseHandle(req);

1 0

Vincent Povirk : user32: Set capture earlier on popup menus.
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: a9bff001a1e2c919b3f6e68d642abb8da957a2bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9bff001a1e2c919b3f6e68d6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 14 16:13:56 2016 -0500 user32: Set capture earlier on popup menus. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index bb737ac..76fcd70 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3003,7 +3003,6 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, INT executedMenuId = -1; MTRACKER mt; BOOL enterIdleSent = FALSE; - HWND capture_win; mt.trackFlags = 0; mt.hCurrentMenu = hmenu; @@ -3031,9 +3030,8 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, if (wFlags & TF_ENDMENU) fEndMenu = TRUE; - /* owner may not be visible when tracking a popup, so use the menu itself */ - capture_win = (wFlags & TPM_POPUPMENU) ? menu->hWnd : mt.hOwnerWnd; - set_capture_window( capture_win, GUI_INMENUMODE, NULL ); + if (!(wFlags & TPM_POPUPMENU)) + set_capture_window( mt.hOwnerWnd, GUI_INMENUMODE, NULL ); __TRY while (!fEndMenu) { @@ -3326,6 +3324,10 @@ static BOOL MENU_InitTracking(HWND hWnd, HMENU hMenu, BOOL bPopup, UINT wFlags) SendMessageW( hWnd, WM_SETCURSOR, (WPARAM)hWnd, HTCAPTION ); + if (bPopup) + /* owner may not be visible when tracking a popup, so use the menu itself */ + set_capture_window( menu->hWnd, GUI_INMENUMODE, NULL ); + if (!(wFlags & TPM_NONOTIFY)) { SendMessageW( hWnd, WM_INITMENU, (WPARAM)hMenu, 0 ); @@ -3479,6 +3481,9 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y, if (MENU_ShowPopup( hWnd, hMenu, 0, wFlags, x, y, 0, 0 )) ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd, lpTpm ? &lpTpm->rcExclude : NULL ); + + set_capture_window( 0, GUI_INMENUMODE, NULL ); + MENU_ExitTracking(hWnd, TRUE); if (menu->hWnd)

1 0

Vincent Povirk : user32: Skip menu loop for empty popup menus.
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: 906db769f14eb237be503726e03b35951a5bf07d URL: http://source.winehq.org/git/wine.git/?a=commit;h=906db769f14eb237be503726e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 14 16:13:57 2016 -0500 user32: Skip menu loop for empty popup menus. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 3 +++ dlls/user32/tests/menu.c | 14 +++++++------- dlls/user32/tests/msg.c | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 76fcd70..7a49ac0 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3033,6 +3033,9 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, if (!(wFlags & TPM_POPUPMENU)) set_capture_window( mt.hOwnerWnd, GUI_INMENUMODE, NULL ); + if ((wFlags & TPM_POPUPMENU) && menu->nItems == 0) + return FALSE; + __TRY while (!fEndMenu) { menu = MENU_GetMenu( mt.hCurrentMenu ); diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 88b9df9..65c8e93 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3820,25 +3820,25 @@ static void test_emptypopup(void) ok(gflag_initmenupopup == 1, "got %i\n", gflag_initmenupopup); ok(gflag_entermenuloop == 1, "got %i\n", gflag_entermenuloop); ok(gflag_initmenu == 1, "got %i\n", gflag_initmenu); - todo_wine ok(gflag_enteridle == 0, "got %i\n", gflag_initmenu); + ok(gflag_enteridle == 0, "got %i\n", gflag_initmenu); - todo_wine ok(selectitem_wp == 0xdeadbeef, "got %lx\n", selectitem_wp); - todo_wine ok(selectitem_lp == 0xdeadbeef, "got %lx\n", selectitem_lp); + ok(selectitem_wp == 0xdeadbeef, "got %lx\n", selectitem_wp); + ok(selectitem_lp == 0xdeadbeef, "got %lx\n", selectitem_lp); gflag_initmenupopup = gflag_entermenuloop = gflag_initmenu = gflag_enteridle = 0; selectitem_wp = 0xdeadbeef; selectitem_lp = 0xdeadbeef; ret = TrackPopupMenu( hmenu, 0, 100,100, 0, hwnd, NULL); - todo_wine ok(ret == 0, "got %i\n", ret); + ok(ret == 0, "got %i\n", ret); ok(gflag_initmenupopup == 1, "got %i\n", gflag_initmenupopup); ok(gflag_entermenuloop == 1, "got %i\n", gflag_entermenuloop); ok(gflag_initmenu == 1, "got %i\n", gflag_initmenu); - todo_wine ok(gflag_enteridle == 0, "got %i\n", gflag_initmenu); + ok(gflag_enteridle == 0, "got %i\n", gflag_initmenu); - todo_wine ok(selectitem_wp == 0xdeadbeef, "got %lx\n", selectitem_wp); - todo_wine ok(selectitem_lp == 0xdeadbeef, "got %lx\n", selectitem_lp); + ok(selectitem_wp == 0xdeadbeef, "got %lx\n", selectitem_wp); + ok(selectitem_lp == 0xdeadbeef, "got %lx\n", selectitem_lp); SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)menu_fill_in_init); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 47d754f..97bf443 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15373,7 +15373,7 @@ static void test_TrackPopupMenuEmpty(void) flush_sequence(); ret = TrackPopupMenu(hpopupmenu, 0, 100,100, 0, hwnd, NULL); ok_sequence(WmTrackPopupMenuEmpty, "TrackPopupMenuEmpty", TRUE); - todo_wine ok(ret == 0, "TrackPopupMenu succeeded\n"); + ok(ret == 0, "TrackPopupMenu succeeded\n"); DestroyMenu(hpopupmenu); DestroyWindow(hwnd);

1 0

Jacek Caban : mshtml: Fixed cloning comment nodes.
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: 13079c56961bffdb83ce8205b7ed6fcb2d5cf9e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13079c56961bffdb83ce8205b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 17 11:49:26 2016 +0100 mshtml: Fixed cloning comment nodes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcomment.c | 16 +++++++++++++++- dlls/mshtml/tests/dom.c | 7 ++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 23bbc82..abb71a8 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -169,11 +169,25 @@ static void HTMLCommentElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } +HRESULT HTMLCommentElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) +{ + HTMLCommentElement *This = impl_from_HTMLDOMNode(iface); + HTMLElement *new_elem; + HRESULT hres; + + hres = HTMLCommentElement_Create(This->element.node.doc, nsnode, &new_elem); + if(FAILED(hres)) + return hres; + + *ret = &new_elem->node; + return S_OK; +} + static const NodeImplVtbl HTMLCommentElementImplVtbl = { HTMLCommentElement_QI, HTMLCommentElement_destructor, HTMLElement_cpc, - HTMLElement_clone, + HTMLCommentElement_clone, HTMLElement_handle_event, HTMLElement_get_attr_col }; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 15a3027..4206e9c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6244,12 +6244,10 @@ static void test_unique_id(IHTMLDocument2 *doc, IHTMLElement *elem) hres = IHTMLUniqueName_get_uniqueID(unique_name, &id); ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); - trace("id %s\n", wine_dbgstr_w(id)); hres = IHTMLUniqueName_get_uniqueID(unique_name, &id2); ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); ok(!lstrcmpW(id, id2), "unique names differ\n"); - trace("id %s\n", wine_dbgstr_w(id2)); hres = IHTMLUniqueName_get_uniqueNumber(unique_name, &num); ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); @@ -6257,7 +6255,6 @@ static void test_unique_id(IHTMLDocument2 *doc, IHTMLElement *elem) sprintf(buf, "ms__id%u", num); ok(!strcmp_wa(id, buf), "unexpected id %s\n", wine_dbgstr_w(id)); - trace("num %d\n", num); SysFreeString(id); SysFreeString(id2); @@ -8907,6 +8904,10 @@ static void test_create_elems(IHTMLDocument2 *doc) test_elem_outerhtml((IUnknown*)comment, ""); test_comment_attrs((IUnknown*)comment); + node2 = clone_node((IUnknown*)comment, VARIANT_TRUE); + test_comment_text((IUnknown*)node2, ""); + IHTMLDOMNode_Release(node2); + IHTMLDOMNode_Release(comment); }

1 0

Jacek Caban : mshtml: Fixed copy&paste typo in GetAsciiHostPort implementation.
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: 0eba20def85f9d6b689bb922f93733eec1d6545d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eba20def85f9d6b689bb922f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 17 13:23:57 2016 +0100 mshtml: Fixed copy&paste typo in GetAsciiHostPort implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 81dc211..dac9798 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2821,7 +2821,7 @@ static nsresult NSAPI nsURI_GetAsciiHostPort(nsIFileURL *iface, nsACString *aAsc WARN("(%p)->(%p) FIXME: Use Uri_PUNYCODE_IDN_HOST flag\n", This, aAsciiHostPort); - return nsIFileURL_GetAsciiHostPort(&This->nsIFileURL_iface, aAsciiHostPort); + return nsIFileURL_GetHostPort(&This->nsIFileURL_iface, aAsciiHostPort); } static nsresult NSAPI nsURI_GetAsciiHost(nsIFileURL *iface, nsACString *aAsciiHost)

1 0

Józef Kucia : wined3d: Recognize SM5 ld_structured opcode.
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: f0de33ba1450a3cd8e4f10da79793fc107816843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0de33ba1450a3cd8e4f10da7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 17 11:47:10 2016 +0100 wined3d: Recognize SM5 ld_structured 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 7c4c1db..00d876e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5281,6 +5281,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ITOF */ NULL, /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LD */ NULL, + /* WINED3DSIH_LD_STRUCTURED */ NULL, /* WINED3DSIH_LIT */ shader_hw_map2gl, /* WINED3DSIH_LOG */ shader_hw_scalar_op, /* WINED3DSIH_LOGP */ shader_hw_scalar_op, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d9311b9..0ef15ae 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8123,6 +8123,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ shader_glsl_ld, + /* WINED3DSIH_LD_STRUCTURED */ NULL, /* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LOG */ shader_glsl_scalar_op, /* WINED3DSIH_LOGP */ shader_glsl_scalar_op, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 17611dd..5e8df04 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -109,6 +109,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ITOF */ "itof", /* WINED3DSIH_LABEL */ "label", /* WINED3DSIH_LD */ "ld", + /* WINED3DSIH_LD_STRUCTURED */ "ld_structured", /* WINED3DSIH_LIT */ "lit", /* WINED3DSIH_LOG */ "log", /* WINED3DSIH_LOGP */ "logp", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 9cf74a5..5757aca 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -183,6 +183,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_OUTPUT_SIV = 0x67, WINED3D_SM4_OP_DCL_TEMPS = 0x68, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, + WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, }; enum wined3d_sm4_register_type @@ -384,6 +385,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DCL_OUTPUT_SIV, WINED3DSIH_DCL_OUTPUT_SIV, "", ""}, {WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", ""}, {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", ""}, + {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "U", "UUR"}, }; static const enum wined3d_shader_register_type register_type_table[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 09fbb76..d474bee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -561,6 +561,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ITOF, WINED3DSIH_LABEL, WINED3DSIH_LD, + WINED3DSIH_LD_STRUCTURED, WINED3DSIH_LIT, WINED3DSIH_LOG, WINED3DSIH_LOGP,

1 0

Józef Kucia : wined3d: Recognize SM5 deriv_rtx_coarse opcode.
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: 07562768bb3b5318cf89637ff163beb148d672ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=07562768bb3b5318cf89637ff… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 17 11:47:11 2016 +0100 wined3d: Recognize SM5 deriv_rtx_coarse 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 00d876e..4885065 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5252,6 +5252,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DP4 */ shader_hw_map2gl, /* WINED3DSIH_DST */ shader_hw_map2gl, /* WINED3DSIH_DSX */ shader_hw_map2gl, + /* WINED3DSIH_DSX_COARSE */ NULL, /* WINED3DSIH_DSY */ shader_hw_dsy, /* WINED3DSIH_ELSE */ shader_hw_else, /* WINED3DSIH_EMIT */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0ef15ae..c915470 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8094,6 +8094,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DP4 */ shader_glsl_dot, /* WINED3DSIH_DST */ shader_glsl_dst, /* WINED3DSIH_DSX */ shader_glsl_map2gl, + /* WINED3DSIH_DSX_COARSE */ NULL, /* WINED3DSIH_DSY */ shader_glsl_map2gl, /* WINED3DSIH_ELSE */ shader_glsl_else, /* WINED3DSIH_EMIT */ shader_glsl_emit, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5e8df04..c946640 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -80,6 +80,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DP4 */ "dp4", /* WINED3DSIH_DST */ "dst", /* WINED3DSIH_DSX */ "dsx", + /* WINED3DSIH_DSX_COARSE */ "deriv_rtx_coarse", /* WINED3DSIH_DSY */ "dsy", /* WINED3DSIH_ELSE */ "else", /* WINED3DSIH_EMIT */ "emit", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5757aca..aaacd44 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -183,6 +183,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_OUTPUT_SIV = 0x67, WINED3D_SM4_OP_DCL_TEMPS = 0x68, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, + WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, }; @@ -385,6 +386,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DCL_OUTPUT_SIV, WINED3DSIH_DCL_OUTPUT_SIV, "", ""}, {WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", ""}, {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", ""}, + {WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "F", "F"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "U", "UUR"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d474bee..cb69b6b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -532,6 +532,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DP4, WINED3DSIH_DST, WINED3DSIH_DSX, + WINED3DSIH_DSX_COARSE, WINED3DSIH_DSY, WINED3DSIH_ELSE, WINED3DSIH_EMIT,

1 0

Józef Kucia : wined3d: Recognize SM5 deriv_rty_coarse opcode.
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: 9108fe72335baa63555e1999b105c3cfe713a7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9108fe72335baa63555e1999b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 17 11:47:12 2016 +0100 wined3d: Recognize SM5 deriv_rty_coarse 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 4885065..923c7bd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5254,6 +5254,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DSX */ shader_hw_map2gl, /* WINED3DSIH_DSX_COARSE */ NULL, /* WINED3DSIH_DSY */ shader_hw_dsy, + /* WINED3DSIH_DSY_COARSE */ NULL, /* WINED3DSIH_ELSE */ shader_hw_else, /* WINED3DSIH_EMIT */ NULL, /* WINED3DSIH_ENDIF */ shader_hw_endif, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c915470..2879b44 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8096,6 +8096,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DSX */ shader_glsl_map2gl, /* WINED3DSIH_DSX_COARSE */ NULL, /* WINED3DSIH_DSY */ shader_glsl_map2gl, + /* WINED3DSIH_DSY_COARSE */ NULL, /* WINED3DSIH_ELSE */ shader_glsl_else, /* WINED3DSIH_EMIT */ shader_glsl_emit, /* WINED3DSIH_ENDIF */ shader_glsl_end, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c946640..5ef39ff 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -82,6 +82,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DSX */ "dsx", /* WINED3DSIH_DSX_COARSE */ "deriv_rtx_coarse", /* WINED3DSIH_DSY */ "dsy", + /* WINED3DSIH_DSY_COARSE */ "deriv_rty_coarse", /* WINED3DSIH_ELSE */ "else", /* WINED3DSIH_EMIT */ "emit", /* WINED3DSIH_ENDIF */ "endif", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index aaacd44..65bcfa4 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -184,6 +184,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_TEMPS = 0x68, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, + WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, }; @@ -387,6 +388,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", ""}, {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", ""}, {WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "F", "F"}, + {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "F", "F"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "U", "UUR"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb69b6b..3cfb480 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -534,6 +534,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DSX, WINED3DSIH_DSX_COARSE, WINED3DSIH_DSY, + WINED3DSIH_DSY_COARSE, WINED3DSIH_ELSE, WINED3DSIH_EMIT, WINED3DSIH_ENDIF,

1 0

Józef Kucia : wined3d: Recognize SM5 deriv_rtx_fine opcode.
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: 7fccd3bd1361268b2ec5862b4a367ef49d68dfac URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fccd3bd1361268b2ec5862b4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 17 11:47:13 2016 +0100 wined3d: Recognize SM5 deriv_rtx_fine 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 923c7bd..f14caaa 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5253,6 +5253,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DST */ shader_hw_map2gl, /* WINED3DSIH_DSX */ shader_hw_map2gl, /* WINED3DSIH_DSX_COARSE */ NULL, + /* WINED3DSIH_DSX_FINE */ NULL, /* WINED3DSIH_DSY */ shader_hw_dsy, /* WINED3DSIH_DSY_COARSE */ NULL, /* WINED3DSIH_ELSE */ shader_hw_else, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2879b44..a063071 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8095,6 +8095,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DST */ shader_glsl_dst, /* WINED3DSIH_DSX */ shader_glsl_map2gl, /* WINED3DSIH_DSX_COARSE */ NULL, + /* WINED3DSIH_DSX_FINE */ NULL, /* WINED3DSIH_DSY */ shader_glsl_map2gl, /* WINED3DSIH_DSY_COARSE */ NULL, /* WINED3DSIH_ELSE */ shader_glsl_else, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5ef39ff..eb57171 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -81,6 +81,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DST */ "dst", /* WINED3DSIH_DSX */ "dsx", /* WINED3DSIH_DSX_COARSE */ "deriv_rtx_coarse", + /* WINED3DSIH_DSX_FINE */ "deriv_rtx_fine", /* WINED3DSIH_DSY */ "dsy", /* WINED3DSIH_DSY_COARSE */ "deriv_rty_coarse", /* WINED3DSIH_ELSE */ "else", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 65bcfa4..5f12c55 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -184,6 +184,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_TEMPS = 0x68, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, + WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, }; @@ -388,6 +389,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", ""}, {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", ""}, {WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "F", "F"}, + {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "F", "F"}, {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "F", "F"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "U", "UUR"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3cfb480..30254ab 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -533,6 +533,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DST, WINED3DSIH_DSX, WINED3DSIH_DSX_COARSE, + WINED3DSIH_DSX_FINE, WINED3DSIH_DSY, WINED3DSIH_DSY_COARSE, WINED3DSIH_ELSE,

1 0

Józef Kucia : wined3d: Recognize SM5 deriv_rty_fine opcode.
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: 4b926f91b41a54255bc263ac0a2368890b1b96f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b926f91b41a54255bc263ac0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 17 11:47:14 2016 +0100 wined3d: Recognize SM5 deriv_rty_fine 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 f14caaa..189a516 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5256,6 +5256,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DSX_FINE */ NULL, /* WINED3DSIH_DSY */ shader_hw_dsy, /* WINED3DSIH_DSY_COARSE */ NULL, + /* WINED3DSIH_DSY_FINE */ NULL, /* WINED3DSIH_ELSE */ shader_hw_else, /* WINED3DSIH_EMIT */ NULL, /* WINED3DSIH_ENDIF */ shader_hw_endif, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a063071..8664172 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8098,6 +8098,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DSX_FINE */ NULL, /* WINED3DSIH_DSY */ shader_glsl_map2gl, /* WINED3DSIH_DSY_COARSE */ NULL, + /* WINED3DSIH_DSY_FINE */ NULL, /* WINED3DSIH_ELSE */ shader_glsl_else, /* WINED3DSIH_EMIT */ shader_glsl_emit, /* WINED3DSIH_ENDIF */ shader_glsl_end, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index eb57171..59103b6 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -84,6 +84,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DSX_FINE */ "deriv_rtx_fine", /* WINED3DSIH_DSY */ "dsy", /* WINED3DSIH_DSY_COARSE */ "deriv_rty_coarse", + /* WINED3DSIH_DSY_FINE */ "deriv_rty_fine", /* WINED3DSIH_ELSE */ "else", /* WINED3DSIH_EMIT */ "emit", /* WINED3DSIH_ENDIF */ "endif", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5f12c55..86c5b1b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -186,6 +186,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, + WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, }; @@ -391,6 +392,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "F", "F"}, {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "F", "F"}, {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "F", "F"}, + {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "F", "F"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "U", "UUR"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 30254ab..34ea6cd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -536,6 +536,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DSX_FINE, WINED3DSIH_DSY, WINED3DSIH_DSY_COARSE, + WINED3DSIH_DSY_FINE, WINED3DSIH_ELSE, WINED3DSIH_EMIT, WINED3DSIH_ENDIF,

1 0