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

Józef Kucia : wined3d: Recognize SM5 deriv_rty_fine opcode.
by Alexandre Julliard March 17, 2016

March 17, 2016

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

Józef Kucia : wined3d: Recognize SM5 deriv_rtx_fine opcode.
by Alexandre Julliard March 17, 2016

March 17, 2016

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: Use GLuint instead of GLenum to store ARB blitter shaders.
by Alexandre Julliard March 17, 2016

March 17, 2016

Module: wine Branch: master Commit: 966a07149a029191d3d9ba010e5bcb8ccb8114a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=966a07149a029191d3d9ba010… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 17 11:47:15 2016 +0100 wined3d: Use GLuint instead of GLenum to store ARB blitter shaders. 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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 189a516..99c21db 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6939,7 +6939,7 @@ struct arbfp_blit_type struct arbfp_blit_desc { - GLenum shader; + GLuint shader; struct arbfp_blit_type type; struct wine_rb_entry entry; }; @@ -7393,7 +7393,7 @@ static BOOL gen_nv12_read(struct wined3d_string_buffer *buffer, const struct arb static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) { - GLenum shader; + GLuint shader; struct wined3d_string_buffer buffer; const char *tex_target = arbfp_texture_target(type->res_type); @@ -7482,7 +7482,7 @@ static void upload_palette(const struct wined3d_texture *texture, struct wined3d static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) { - GLenum shader; + GLuint shader; struct wined3d_string_buffer buffer; char luminance_component; @@ -7607,7 +7607,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) { - GLenum shader; + GLuint shader; struct wined3d_string_buffer buffer; const char *tex_target = arbfp_texture_target(type->res_type); @@ -7661,7 +7661,7 @@ static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv, static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface, const struct wined3d_color_key *color_key) { - GLenum shader; + GLuint shader; float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f}; const struct wined3d_texture *texture = surface->container; struct arbfp_blit_priv *priv = blit_priv;

1 0

Józef Kucia : wined3d: Recognize SM5 ld_structured opcode.
by Alexandre Julliard March 17, 2016

March 17, 2016

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

Jacek Caban : mshtml: Fixed copy&paste typo in GetAsciiHostPort implementation.
by Alexandre Julliard March 17, 2016

March 17, 2016

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

Vincent Povirk : user32: Set capture earlier on popup menus.
by Alexandre Julliard March 17, 2016

March 17, 2016

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

Alexandre Julliard : gdi32: Take into account the fontdir directory specified at build time.
by Alexandre Julliard March 17, 2016

March 17, 2016

Module: wine Branch: master Commit: 1eac54ef7d6d90fcc973c5ea92a53be73f61ff12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eac54ef7d6d90fcc973c5ea9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 17:23:24 2016 +0900 gdi32: Take into account the fontdir directory specified at build time. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 2 ++ dlls/gdi32/freetype.c | 49 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 6cc026c..a0f76d2 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -49,3 +49,5 @@ C_SRCS = \ vertical.c RC_SRCS = gdi32.rc + +freetype_EXTRADEFS = -DWINE_FONT_DIR=\"`$(MAKEDEP) -R ${datadir}/wine ${fontdir}`\" diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 184e1d3..a7ac1bb 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -214,6 +214,10 @@ MAKE_FUNCPTR(FcPatternGetString); #define GET_BE_WORD(x) RtlUshortByteSwap(x) #endif +#ifndef WINE_FONT_DIR +#define WINE_FONT_DIR "fonts" +#endif + /* This is basically a copy of FT_Bitmap_Size with an extra element added */ typedef struct { FT_Short height; @@ -2969,22 +2973,44 @@ static void load_mac_fonts(void) #endif +static char *get_font_dir(void) +{ + const char *build_dir, *data_dir; + char *name = NULL; + + if ((data_dir = wine_get_data_dir())) + { + if (!(name = HeapAlloc( GetProcessHeap(), 0, strlen(data_dir) + 1 + sizeof(WINE_FONT_DIR) ))) + return NULL; + strcpy( name, data_dir ); + strcat( name, "/" ); + strcat( name, WINE_FONT_DIR ); + } + else if ((build_dir = wine_get_build_dir())) + { + if (!(name = HeapAlloc( GetProcessHeap(), 0, strlen(build_dir) + sizeof("/fonts") ))) + return NULL; + strcpy( name, build_dir ); + strcat( name, "/fonts" ); + } + return name; +} + static char *get_data_dir_path( LPCWSTR file ) { char *unix_name = NULL; - const char *data_dir = wine_get_data_dir(); - - if (!data_dir) data_dir = wine_get_build_dir(); + char *font_dir = get_font_dir(); - if (data_dir) + if (font_dir) { INT len = WideCharToMultiByte(CP_UNIXCP, 0, file, -1, NULL, 0, NULL, NULL); - unix_name = HeapAlloc(GetProcessHeap(), 0, strlen(data_dir) + len + sizeof("/fonts/")); - strcpy(unix_name, data_dir); - strcat(unix_name, "/fonts/"); + unix_name = HeapAlloc(GetProcessHeap(), 0, strlen(font_dir) + len + 1 ); + strcpy(unix_name, font_dir); + strcat(unix_name, "/"); WideCharToMultiByte(CP_UNIXCP, 0, file, -1, unix_name + strlen(unix_name), len, NULL, NULL); + HeapFree( GetProcessHeap(), 0, font_dir ); } return unix_name; } @@ -4131,7 +4157,6 @@ static void init_font_list(void) DWORD valuelen, datalen, i = 0, type, dlen, vlen; WCHAR windowsdir[MAX_PATH]; char *unixname; - const char *data_dir; delete_external_font_keys(); @@ -4147,13 +4172,9 @@ static void init_font_list(void) HeapFree(GetProcessHeap(), 0, unixname); } - /* load the system truetype fonts */ - data_dir = wine_get_data_dir(); - if (!data_dir) data_dir = wine_get_build_dir(); - if (data_dir && (unixname = HeapAlloc(GetProcessHeap(), 0, strlen(data_dir) + sizeof("/fonts/")))) + /* load the wine fonts */ + if ((unixname = get_font_dir())) { - strcpy(unixname, data_dir); - strcat(unixname, "/fonts/"); ReadFontDir(unixname, TRUE); HeapFree(GetProcessHeap(), 0, unixname); }

1 0

Zhenbo Li : authz: Stub AuthzAccessCheck, AuthzFreeContext, AuthzInitializeContextFromSid, AuthzInitializeContextFromToken.
by Alexandre Julliard March 17, 2016

March 17, 2016

Module: wine Branch: master Commit: 0c164207fc47d926e6654132013e5756a386161c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c164207fc47d926e66541320… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Mar 1 17:46:01 2016 +1100 authz: Stub AuthzAccessCheck, AuthzFreeContext, AuthzInitializeContextFromSid, AuthzInitializeContextFromToken. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/authz/authz.c | 74 +++++++++++++++++++++++++++++++++++++++++++++------ dlls/authz/authz.spec | 8 +++--- 2 files changed, 70 insertions(+), 12 deletions(-) diff --git a/dlls/authz/authz.c b/dlls/authz/authz.c index 08ca8c3..5502e79 100644 --- a/dlls/authz/authz.c +++ b/dlls/authz/authz.c @@ -23,6 +23,8 @@ #include "winbase.h" #include "wine/debug.h" +#include "authz.h" + WINE_DEFAULT_DEBUG_CHANNEL(authz); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -46,13 +48,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /*********************************************************************** * AuthzInitializeResourceManager (AUTHZ.@) */ -BOOL WINAPI AuthzInitializeResourceManager(DWORD flags, LPVOID pfnAccessChecker, - LPVOID pfnComputeDynGroups, LPVOID pfnFreeDynGroups, - LPCWSTR managerName, LPVOID lpManagerHandle ) +BOOL WINAPI AuthzInitializeResourceManager(DWORD flags, PFN_AUTHZ_DYNAMIC_ACCESS_CHECK access_checker, + PFN_AUTHZ_COMPUTE_DYNAMIC_GROUPS compute_dyn_groups, PFN_AUTHZ_FREE_DYNAMIC_GROUPS free_dyn_groups, + const WCHAR *managername, AUTHZ_RESOURCE_MANAGER_HANDLE *handle ) { - FIXME("(0x%X,%p,%p,%p,%s,%p): stub\n", flags, pfnAccessChecker, - pfnComputeDynGroups, pfnFreeDynGroups, - debugstr_w(managerName), lpManagerHandle); + FIXME("(0x%x,%p,%p,%p,%s,%p): stub\n", flags, access_checker, + compute_dyn_groups, free_dyn_groups, + debugstr_w(managername), handle); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -61,9 +63,65 @@ BOOL WINAPI AuthzInitializeResourceManager(DWORD flags, LPVOID pfnAccessChecker, /*********************************************************************** * AuthzInstallSecurityEventSource (AUTHZ.@) */ -BOOL WINAPI AuthzInstallSecurityEventSource(DWORD dwFlags, LPVOID pRegistration) +BOOL WINAPI AuthzInstallSecurityEventSource(DWORD flags, AUTHZ_SOURCE_SCHEMA_REGISTRATION *registration) +{ + FIXME("(0x%x,%p): stub\n", flags, registration); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/*********************************************************************** + * AuthzAccessCheck (AUTHZ.@) + */ +BOOL WINAPI AuthzAccessCheck(DWORD flags, AUTHZ_CLIENT_CONTEXT_HANDLE client_context, + AUTHZ_ACCESS_REQUEST *request, AUTHZ_AUDIT_EVENT_HANDLE audit_event, + PSECURITY_DESCRIPTOR security, PSECURITY_DESCRIPTOR *optional_security, + DWORD optional_security_count, AUTHZ_ACCESS_REPLY *reply, + AUTHZ_ACCESS_CHECK_RESULTS_HANDLE *access_check_result) +{ + FIXME("(0x%x,%p,%p,%p,%p,%p,0x%x,%p,%p): stub\n", flags, client_context, + request, audit_event, security, optional_security, + optional_security_count, reply, access_check_result); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/*********************************************************************** + * AuthzFreeContext (AUTHZ.@) + */ +BOOL WINAPI AuthzFreeContext(AUTHZ_CLIENT_CONTEXT_HANDLE client_context) +{ + FIXME("(%p): stub\n", client_context); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/*********************************************************************** + * AuthzInitializeContextFromSid (AUTHZ.@) + */ +BOOL WINAPI AuthzInitializeContextFromSid(DWORD flags, PSID sid, + AUTHZ_RESOURCE_MANAGER_HANDLE resource_manager, LARGE_INTEGER *expire_time, + LUID id, void *dynamic_group, AUTHZ_CLIENT_CONTEXT_HANDLE *client_context) +{ + FIXME("(0x%x,%p,%p,%p,%08x:%08x,%p,%p): stub\n", flags, sid, resource_manager, + expire_time, id.HighPart, id.LowPart, dynamic_group, client_context); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/*********************************************************************** + * AuthzInitializeContextFromToken (AUTHZ.@) + */ +BOOL WINAPI AuthzInitializeContextFromToken(DWORD flags, HANDLE token_handle, + AUTHZ_RESOURCE_MANAGER_HANDLE resource_manager, LARGE_INTEGER *expire_time, + LUID id, void *dynamic_group, AUTHZ_CLIENT_CONTEXT_HANDLE *client_context) { - FIXME("(0x%X,%p): stub\n", dwFlags, pRegistration); + FIXME("(0x%x,%p,%p,%p,%08x:%08x,%p,%p): stub\n", flags, token_handle, resource_manager, + expire_time, id.HighPart, id.LowPart, dynamic_group, client_context); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } diff --git a/dlls/authz/authz.spec b/dlls/authz/authz.spec index acf3228..eb9e044 100644 --- a/dlls/authz/authz.spec +++ b/dlls/authz/authz.spec @@ -1,16 +1,16 @@ -@ stub AuthzAccessCheck +@ stdcall AuthzAccessCheck(long long ptr long ptr ptr long ptr ptr) @ stub AuthzAddSidsToContext @ stub AuthzCachedAccessCheck @ stub AuthzEnumerateSecurityEventSources @ stub AuthzEvaluateSacl @ stub AuthzFreeAuditEvent -@ stub AuthzFreeContext +@ stdcall AuthzFreeContext(long) @ stub AuthzFreeHandle @ stub AuthzFreeResourceManager @ stub AuthzGetInformationFromContext @ stub AuthzInitializeContextFromAuthzContext -@ stub AuthzInitializeContextFromSid -@ stub AuthzInitializeContextFromToken +@ stdcall AuthzInitializeContextFromSid(long ptr long ptr int64 ptr ptr) +@ stdcall AuthzInitializeContextFromToken(long long long ptr int64 ptr ptr) @ stub AuthzInitializeObjectAccessAuditEvent @ stub AuthzInitializeObjectAccessAuditEvent2 @ stdcall AuthzInitializeResourceManager(long ptr ptr ptr wstr ptr)

1 0

Józef Kucia : wined3d: Recognize SM5 deriv_rtx_coarse opcode.
by Alexandre Julliard March 17, 2016

March 17, 2016

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

Vincent Povirk : user32: Skip menu loop for empty popup menus.
by Alexandre Julliard March 17, 2016

March 17, 2016

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