October 2015 - Wine-commits

Dmitry Timoshkov : msi: Add a trace to msi_get_property.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 6b9a87c7a801e1776444ac96c555fbad80d34115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b9a87c7a801e1776444ac96c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 6 18:10:41 2015 +0800 msi: Add a trace to msi_get_property. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/package.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7ab2b19..01d2e89 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2125,6 +2125,8 @@ UINT msi_get_property( MSIDATABASE *db, LPCWSTR szName, MSIRECORD *row; UINT rc = ERROR_FUNCTION_FAILED; + TRACE("%p %s %p %p\n", db, debugstr_w(szName), szValueBuf, pchValueBuf); + row = msi_get_property_row( db, szName ); if (*pchValueBuf > 0)

1 0

Andrew Eikum : xapofx1_2: Forward to xapofx1_5.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 01a5e00479c1360596369892092a1f6a9cd11458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01a5e00479c13605963698920… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 5 11:33:42 2015 -0500 xapofx1_2: Forward to xapofx1_5. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/xapofx1_2/Makefile.in | 4 ++++ dlls/xapofx1_2/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++ dlls/xapofx1_2/xapofx1_2.spec | 1 + 5 files changed, 53 insertions(+) diff --git a/configure b/configure index 34edcce..9cd9ca3 100755 --- a/configure +++ b/configure @@ -1371,6 +1371,7 @@ enable_x3daudio1_5 enable_x3daudio1_6 enable_x3daudio1_7 enable_xapofx1_1 +enable_xapofx1_2 enable_xapofx1_3 enable_xapofx1_4 enable_xapofx1_5 @@ -17914,6 +17915,7 @@ wine_fn_config_dll x3daudio1_5 enable_x3daudio1_5 wine_fn_config_dll x3daudio1_6 enable_x3daudio1_6 wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 wine_fn_config_dll xapofx1_1 enable_xapofx1_1 +wine_fn_config_dll xapofx1_2 enable_xapofx1_2 wine_fn_config_dll xapofx1_3 enable_xapofx1_3 wine_fn_config_dll xapofx1_4 enable_xapofx1_4 wine_fn_config_dll xapofx1_5 enable_xapofx1_5 diff --git a/configure.ac b/configure.ac index d350ea6..62abe1b 100644 --- a/configure.ac +++ b/configure.ac @@ -3457,6 +3457,7 @@ WINE_CONFIG_DLL(x3daudio1_5) WINE_CONFIG_DLL(x3daudio1_6) WINE_CONFIG_DLL(x3daudio1_7) WINE_CONFIG_DLL(xapofx1_1) +WINE_CONFIG_DLL(xapofx1_2) WINE_CONFIG_DLL(xapofx1_3) WINE_CONFIG_DLL(xapofx1_4) WINE_CONFIG_DLL(xapofx1_5) diff --git a/dlls/xapofx1_2/Makefile.in b/dlls/xapofx1_2/Makefile.in new file mode 100644 index 0000000..fb76b12 --- /dev/null +++ b/dlls/xapofx1_2/Makefile.in @@ -0,0 +1,4 @@ +MODULE = xapofx1_2.dll + +C_SRCS = \ + main.c diff --git a/dlls/xapofx1_2/main.c b/dlls/xapofx1_2/main.c new file mode 100644 index 0000000..e873b58 --- /dev/null +++ b/dlls/xapofx1_2/main.c @@ -0,0 +1,45 @@ +/* + * Copyright 2015 Andrew Eikum for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xapofx); + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("(%p, %d, %p)\n", hinst, reason, reserved); + + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + break; + } + return TRUE; +} diff --git a/dlls/xapofx1_2/xapofx1_2.spec b/dlls/xapofx1_2/xapofx1_2.spec new file mode 100644 index 0000000..bc17511 --- /dev/null +++ b/dlls/xapofx1_2/xapofx1_2.spec @@ -0,0 +1 @@ +@ cdecl CreateFX(ptr ptr) xapofx1_5.CreateFX

1 0

Ken Thomases : winemac: Queue an event to reassert the WinAPI window position before Cocoa adjusts its position for a display change.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 9372af77a546609b703070d60ef773d5ae7c2ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9372af77a546609b703070d60… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 5 15:44:28 2015 -0500 winemac: Queue an event to reassert the WinAPI window position before Cocoa adjusts its position for a display change. When the display mode changes such that the screen height changes, we'd like our windows to keep their position relative to the top-left of the primary screen. That's how WinAPI's coordinate system works and we want the WinAPI position of the window to not change just because the display mode changed. Unfortunately that's not achievable in Cocoa. Cocoa keeps the window stationary relative to the screen it's on, not necessarily the primary screen, and it's sometimes relative to the bottom-left and sometimes the top-left of that screen. So, what we do instead is queue an event to get the back end to reassert the WinAPI position of the window. This is queued before Cocoa can adjust the Cocoa position of the window which would queue a WINDOW_FRAME_CHANGED to the back end and mess up the WinAPI position. The back end's reassertion of the WinAPI position won't be processed by the Cocoa thread until after Cocoa has adjusted the position and will thus override it. It will also discard any wrong WINDOW_FRAME_CHANGED that may have been queued. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 37 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/event.c | 5 +++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 24 ++++++++++++++++++------ 5 files changed, 62 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 4ac03a7..35488b0 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -150,6 +150,11 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif } +(a)interface NSWindow (WineAccessPrivateMethods) + - (id) _displayChanged; +(a)end + + @interface WineContentView : NSView <NSTextInputClient> { NSMutableArray* glContexts; @@ -1593,6 +1598,38 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif return frameRect; } + // This private method of NSWindow is called as Cocoa reacts to the display + // configuration changing. Among other things, it adjusts the window's + // frame based on how the screen(s) changed size. That tells Wine that the + // window has been moved. We don't want that. Rather, we want to make + // sure that the WinAPI notion of the window position is maintained/ + // restored, possibly undoing or overriding Cocoa's adjustment. + // + // So, we queue a REASSERT_WINDOW_POSITION event to the back end before + // Cocoa has a chance to adjust the frame, thus preceding any resulting + // WINDOW_FRAME_CHANGED event that may get queued. The back end will + // reassert its notion of the position. That call won't get processed + // until after this method returns, so it will override whatever this + // method does to the window position. It will also discard any pending + // WINDOW_FRAME_CHANGED events. + // + // Unfortunately, the only way I've found to know when Cocoa is _about to_ + // adjust the window's position due to a display change is to hook into + // this private method. This private method has remained stable from 10.6 + // through 10.11. If it does change, the most likely thing is that it + // will be removed and no longer called and this fix will simply stop + // working. The only real danger would be if Apple changed the return type + // to a struct or floating-point type, which would change the calling + // convention. + - (id) _displayChanged + { + macdrv_event* event = macdrv_create_event(REASSERT_WINDOW_POSITION, self); + [queue postEvent:event]; + macdrv_release_event(event); + + return [super _displayChanged]; + } + - (BOOL) isExcludedFromWindowsMenu { return !([self collectionBehavior] & NSWindowCollectionBehaviorParticipatesInCycle); diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 58b507c..785bc0a 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -45,6 +45,7 @@ static const char *dbgstr_event(int type) "MOUSE_MOVED_ABSOLUTE", "MOUSE_SCROLL", "QUERY_EVENT", + "REASSERT_WINDOW_POSITION", "RELEASE_CAPTURE", "STATUS_ITEM_MOUSE_BUTTON", "STATUS_ITEM_MOUSE_MOVE", @@ -115,6 +116,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) if (mask & QS_SENDMESSAGE) { event_mask |= event_mask_for_type(QUERY_EVENT); + event_mask |= event_mask_for_type(REASSERT_WINDOW_POSITION); event_mask |= event_mask_for_type(RELEASE_CAPTURE); event_mask |= event_mask_for_type(WINDOW_BROUGHT_FORWARD); event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); @@ -237,6 +239,9 @@ void macdrv_handle_event(const macdrv_event *event) case QUERY_EVENT: macdrv_query_event(hwnd, event); break; + case REASSERT_WINDOW_POSITION: + macdrv_reassert_window_position(hwnd); + break; case RELEASE_CAPTURE: macdrv_release_capture(hwnd, event); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index a31d7e3..44b79ac 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -175,6 +175,7 @@ extern void macdrv_window_resize_ended(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_restore_requested(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_window_drag_begin(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_drag_end(HWND hwnd) DECLSPEC_HIDDEN; +extern void macdrv_reassert_window_position(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_resize_size(HWND hwnd, macdrv_query *query) DECLSPEC_HIDDEN; extern BOOL query_resize_start(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_min_max_info(HWND hwnd) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index d5e3f46..2385097 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -195,6 +195,7 @@ enum { MOUSE_MOVED_ABSOLUTE, MOUSE_SCROLL, QUERY_EVENT, + REASSERT_WINDOW_POSITION, RELEASE_CAPTURE, STATUS_ITEM_MOUSE_BUTTON, STATUS_ITEM_MOUSE_MOVE, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 9d996ec..a48ac17 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1682,12 +1682,7 @@ LRESULT CDECL macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) macdrv_reset_device_metrics(); return 0; case WM_MACDRV_DISPLAYCHANGE: - if ((data = get_win_data(hwnd))) - { - if (data->cocoa_window && data->on_screen) - sync_window_position(data, SWP_NOZORDER | SWP_NOACTIVATE, NULL, NULL); - release_win_data(data); - } + macdrv_reassert_window_position(hwnd); SendMessageW(hwnd, WM_DISPLAYCHANGE, wp, lp); return 0; case WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS: @@ -2244,6 +2239,23 @@ void macdrv_window_drag_end(HWND hwnd) } +/*********************************************************************** + * macdrv_reassert_window_position + * + * Handler for REASSERT_WINDOW_POSITION events. + */ +void macdrv_reassert_window_position(HWND hwnd) +{ + struct macdrv_win_data *data = get_win_data(hwnd); + if (data) + { + if (data->cocoa_window && data->on_screen) + sync_window_position(data, SWP_NOZORDER | SWP_NOACTIVATE, NULL, NULL); + release_win_data(data); + } +} + + struct quit_info { HWND *wins; UINT capacity;

1 0

Hans Leidekker : msiexec: Fix parsing of basic UI level modifiers.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 171a4c4154d031f240616e76be80ba8041342185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=171a4c4154d031f240616e76b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 6 00:29:12 2015 +0200 msiexec: Fix parsing of basic UI level modifiers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/msiexec/msiexec.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index cb0984d..bb5c931 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -886,10 +886,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine { InstallUILevel = INSTALLUILEVEL_NONE; } - else if(msi_strequal(argvW[i]+2, "b")) - { - InstallUILevel = INSTALLUILEVEL_BASIC; - } else if(msi_strequal(argvW[i]+2, "r")) { InstallUILevel = INSTALLUILEVEL_REDUCED; @@ -902,28 +898,25 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine { InstallUILevel = INSTALLUILEVEL_NONE|INSTALLUILEVEL_ENDDIALOG; } - else if(msi_strequal(argvW[i]+2, "b+")) - { - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; - } - else if(msi_strequal(argvW[i]+2, "b-")) - { - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY; - } - else if(msi_strequal(argvW[i]+2, "b+!")) - { - WINE_FIXME("Unhandled modifier: !\n"); - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG|INSTALLUILEVEL_HIDECANCEL; - } - else if(msi_strequal(argvW[i]+2, "b-!")) - { - WINE_FIXME("Unhandled modifier: !\n"); - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL; - } - else if(msi_strequal(argvW[i]+2, "b!")) + else if(msi_strprefix(argvW[i]+2, "b")) { - WINE_FIXME("Unhandled modifier: !\n"); - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_HIDECANCEL; + const WCHAR *ptr = argvW[i] + 3; + + InstallUILevel = INSTALLUILEVEL_BASIC; + + while (*ptr) + { + if (msi_strprefix(ptr, "+")) + InstallUILevel |= INSTALLUILEVEL_ENDDIALOG; + if (msi_strprefix(ptr, "-")) + InstallUILevel |= INSTALLUILEVEL_PROGRESSONLY; + if (msi_strprefix(ptr, "!")) + { + WINE_FIXME("Unhandled modifier: !\n"); + InstallUILevel |= INSTALLUILEVEL_HIDECANCEL; + } + ptr++; + } } else {

1 0

Hans Leidekker : msiexec: Add support for /passive.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: c0b3f3f2e8ebc17b68ce31af7d02fb1a2ef9de6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b3f3f2e8ebc17b68ce31af7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 6 00:29:13 2015 +0200 msiexec: Add support for /passive. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/msiexec/msiexec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index bb5c931..b7999d1 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -924,6 +924,14 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine wine_dbgstr_w(argvW[i]+2)); } } + else if(msi_option_equal(argvW[i], "passive")) + { + static const WCHAR rebootpromptW[] = + {'R','E','B','O','O','T','P','R','O','M','P','T','=','"','S','"',0}; + + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL; + StringListAppend(&property_list, rebootpromptW); + } else if(msi_option_equal(argvW[i], "y")) { FunctionDllRegisterServer = TRUE;

1 0

Matteo Bruni : wined3d: Initialize unwritten texcoord varyings in the FFP replacement vertex shader.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 47bf62962a316ec99ec3e6f6cdb7a37c7eb7da19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47bf62962a316ec99ec3e6f6c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 2 14:54:46 2015 +0200 wined3d: Initialize unwritten texcoord varyings in the FFP replacement vertex shader. Only when the GPU supports enough varyings. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/utils.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 10 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index af44989..9fd48c4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5802,6 +5802,8 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe if (settings->texcoords & (1u << i)) shader_addline(buffer, "gl_TexCoord[%u] = ffp_texture_matrix[%u] * ffp_attrib_texcoord%u;\n", i, i, i); + else if (gl_info->limits.glsl_varyings >= wined3d_max_compat_varyings(gl_info)) + shader_addline(buffer, "gl_TexCoord[%u] = vec4(0.0);\n", i); break; case WINED3DTSS_TCI_CAMERASPACENORMAL: diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index aa6eb62..8265b9c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4343,6 +4343,13 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) { return size; } +unsigned int wined3d_max_compat_varyings(const struct wined3d_gl_info *gl_info) +{ + /* On core profile we have to also count diffuse and specular colors and the + * fog coordinate. */ + return gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? MAX_TEXTURES * 4 : (MAX_TEXTURES + 2) * 4 + 1; +} + void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d_state *state, struct ffp_frag_settings *settings, BOOL ignore_textype) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 758af54..d3c362b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1877,6 +1877,7 @@ extern const struct wine_rb_functions wined3d_ffp_frag_program_rb_functions DECL extern const struct wine_rb_functions wined3d_ffp_vertex_program_rb_functions DECLSPEC_HIDDEN; extern const struct wined3d_parent_ops wined3d_null_parent_ops DECLSPEC_HIDDEN; +unsigned int wined3d_max_compat_varyings(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d_state *state, struct ffp_frag_settings *settings, BOOL ignore_textype) DECLSPEC_HIDDEN; const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders,

1 0

Matteo Bruni : wined3d: Initialize unwritten texcoord varyings in the VS.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: b90b61aa68c593b4ab5fa2e611018a551dddc0a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b90b61aa68c593b4ab5fa2e61… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 2 14:54:47 2015 +0200 wined3d: Initialize unwritten texcoord varyings in the VS. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9fd48c4..c85b334 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4939,6 +4939,8 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, if (ps_major < 3) { + DWORD texcoords_written_mask[MAX_TEXTURES] = {0}; + if (!legacy_context) { declare_out_varying(gl_info, buffer, FALSE, "float ffp_varying_fogcoord;\n"); @@ -4975,15 +4977,11 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, } else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) { - if (semantic_idx < 8) + if (semantic_idx < MAX_TEXTURES) { - if (!(gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) || ps_major > 0) - write_mask |= WINED3DSP_WRITEMASK_3; - shader_addline(buffer, "gl_TexCoord[%u]%s = vs_out[%u]%s;\n", semantic_idx, reg_mask, output->register_idx, reg_mask); - if (!(write_mask & WINED3DSP_WRITEMASK_3)) - shader_addline(buffer, "gl_TexCoord[%u].w = 1.0;\n", semantic_idx); + texcoords_written_mask[semantic_idx] = write_mask; } } else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_PSIZE) && per_vertex_point_size) @@ -4998,7 +4996,22 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, output->register_idx, reg_mask[1]); } } - shader_addline(buffer, "}\n"); + + for (i = 0; i < MAX_TEXTURES; ++i) + { + if (ps && !(ps->reg_maps.texcoord & (1u << i))) + continue; + + if (texcoords_written_mask[i] != WINED3DSP_WRITEMASK_ALL) + { + if (gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(gl_info) + && !texcoords_written_mask[i]) + continue; + + shader_glsl_write_mask_to_str(~texcoords_written_mask[i] & WINED3DSP_WRITEMASK_ALL, reg_mask); + shader_addline(buffer, "gl_TexCoord[%u]%s = vec4(0.0)%s;\n", i, reg_mask, reg_mask); + } + } } else { @@ -5034,10 +5047,10 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, /* Then, fix the pixel shader input */ handle_ps3_input(priv, gl_info, ps->u.ps.input_reg_map, &ps->input_signature, &ps->reg_maps, &vs->output_signature, &vs->reg_maps); - - shader_addline(buffer, "}\n"); } + shader_addline(buffer, "}\n"); + ret = GL_EXTCALL(glCreateShader(GL_VERTEX_SHADER)); checkGLcall("glCreateShader(GL_VERTEX_SHADER)"); shader_glsl_compile(gl_info, ret, buffer->buffer);

1 0

Stefan Dösinger : d3d9/tests: Port test_flip to d3d9.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 178d0030a2fa7a7b4ff393670b25719dec638429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=178d0030a2fa7a7b4ff393670… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 5 23:13:13 2015 +0200 d3d9/tests: Port test_flip to d3d9. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d49d3b2..a9b1ade 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19796,6 +19796,112 @@ done: DestroyWindow(window); } +static void test_flip(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + IDirect3DSurface9 *back_buffers[3], *test_surface; + unsigned int i; + D3DCOLOR color; + D3DPRESENT_PARAMETERS present_parameters = {0}; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = window; + present_parameters.Windowed = TRUE; + present_parameters.BackBufferCount = 3; + present_parameters.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + { + hr = IDirect3DDevice9_GetBackBuffer(device, 0, i, D3DBACKBUFFER_TYPE_MONO, &back_buffers[i]); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + } + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &test_surface); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(test_surface == back_buffers[0], "Expected render target %p, got %p.\n", back_buffers[0], test_surface); + IDirect3DSurface9_Release(test_surface); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, back_buffers[2]); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_ColorFill(device, back_buffers[0], NULL, 0xffff0000); + ok(SUCCEEDED(hr), "Failed to color fill, hr %#x.\n", hr); + hr = IDirect3DDevice9_ColorFill(device, back_buffers[1], NULL, 0xff00ff00); + ok(SUCCEEDED(hr), "Failed to color fill, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + /* Render target is unmodified. */ + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &test_surface); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(test_surface == back_buffers[2], "Expected render target %p, got %p.\n", back_buffers[2], test_surface); + IDirect3DSurface9_Release(test_surface); + + /* Backbuffer surface pointers are unmodified */ + for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + { + hr = IDirect3DDevice9_GetBackBuffer(device, 0, i, D3DBACKBUFFER_TYPE_MONO, &test_surface); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + ok(test_surface == back_buffers[i], "Expected back buffer %u = %p, got %p.\n", + i, back_buffers[i], test_surface); + IDirect3DSurface9_Release(test_surface); + } + + /* Contents were changed. */ + color = getPixelColorFromSurface(back_buffers[0], 1, 1); + todo_wine ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); + color = getPixelColorFromSurface(back_buffers[1], 1, 1); + todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff808080, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + color = getPixelColorFromSurface(back_buffers[0], 1, 1); + todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + color = getPixelColorFromSurface(back_buffers[1], 1, 1); + todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + color = getPixelColorFromSurface(back_buffers[0], 1, 1); + todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + + for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + IDirect3DSurface9_Release(back_buffers[i]); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -19914,4 +20020,5 @@ START_TEST(visual) test_vertex_blending(); test_updatetexture(); test_depthbias(); + test_flip(); }

1 0

Stefan Dösinger : d3d8/tests: Port test_flip to d3d8.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: c9c622f083b0d09908e775967b5b06eaaa1e3411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9c622f083b0d09908e775967… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 5 23:13:14 2015 +0200 d3d8/tests: Port test_flip to d3d8. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 41ef2f9..318d3ca 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -114,6 +114,38 @@ out: return ret; } +static D3DCOLOR get_surface_color(IDirect3DSurface8 *surface, UINT x, UINT y) +{ + DWORD color; + HRESULT hr; + D3DSURFACE_DESC desc; + RECT rectToLock = {x, y, x+1, y+1}; + D3DLOCKED_RECT lockedRect; + + hr = IDirect3DSurface8_GetDesc(surface, &desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr=%#x.\n", hr); + + hr = IDirect3DSurface8_LockRect(surface, &lockedRect, &rectToLock, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Failed to lock surface, hr=%#x.\n", hr); + + switch(desc.Format) + { + case D3DFMT_A8R8G8B8: + color = ((D3DCOLOR *)lockedRect.pBits)[0]; + break; + + default: + trace("Error: unknown surface format: %u.\n", desc.Format); + color = 0xdeadbeef; + break; + } + + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr=%#x.\n", hr); + + return color; +} + static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND focus_window, BOOL windowed) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -7885,6 +7917,118 @@ done: DestroyWindow(window); } +static void test_flip(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + IDirect3DSurface8 *back_buffers[3], *test_surface; + unsigned int i; + D3DCOLOR color; + D3DPRESENT_PARAMETERS present_parameters = {0}; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = window; + present_parameters.Windowed = TRUE; + present_parameters.BackBufferCount = 3; + present_parameters.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; + hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + { + hr = IDirect3DDevice8_GetBackBuffer(device, i, D3DBACKBUFFER_TYPE_MONO, &back_buffers[i]); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + } + hr = IDirect3DDevice8_GetRenderTarget(device, &test_surface); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(test_surface == back_buffers[0], "Expected render target %p, got %p.\n", back_buffers[0], test_surface); + IDirect3DSurface8_Release(test_surface); + + + hr = IDirect3DDevice8_SetRenderTarget(device, back_buffers[0], NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, back_buffers[1], NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, back_buffers[2], NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + /* Render target is unmodified. */ + hr = IDirect3DDevice8_GetRenderTarget(device, &test_surface); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(test_surface == back_buffers[2], "Expected render target %p, got %p.\n", back_buffers[2], test_surface); + IDirect3DSurface8_Release(test_surface); + + /* Backbuffer surface pointers are unmodified */ + for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + { + hr = IDirect3DDevice8_GetBackBuffer(device, i, D3DBACKBUFFER_TYPE_MONO, &test_surface); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + ok(test_surface == back_buffers[i], "Expected back buffer %u = %p, got %p.\n", + i, back_buffers[i], test_surface); + IDirect3DSurface8_Release(test_surface); + } + + /* Contents were changed. */ + color = get_surface_color(back_buffers[0], 1, 1); + todo_wine ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(back_buffers[1], 1, 1); + todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff808080, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + color = get_surface_color(back_buffers[0], 1, 1); + todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(back_buffers[1], 1, 1); + todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + color = get_surface_color(back_buffers[0], 1, 1); + todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + + for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + IDirect3DSurface8_Release(back_buffers[i]); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -7946,4 +8090,5 @@ START_TEST(visual) test_texcoordindex(); test_vshader_input(); test_fixed_function_fvf(); + test_flip(); }

1 0

Józef Kucia : d3d10core/tests: Use 'd3d10core_test' as window name in test_scissor().
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 5b0fb73c1b013a2bd76f1121e26ec847b662a3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0fb73c1b013a2bd76f1121e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 6 01:49:23 2015 +0200 d3d10core/tests: Use 'd3d10core_test' as window name in test_scissor(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ec835ab..5dc3049 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1520,7 +1520,7 @@ static void test_scissor(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + window = CreateWindowA("static", "d3d10core_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 640, 480, NULL, NULL, NULL, NULL); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&backbuffer);

1 0