April 2014 - Wine-commits - list.winehq.org

Nikolay Sivov : regsvr32: Fix some usage message issues.
by Alexandre Julliard 01 Apr '14

01 Apr '14

1 0

Hans Leidekker : shell32/tests: Remove todo handling from DDE tests.
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: e957dd89f9f0c44dc5f6d3cf4406c69e32cc3718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e957dd89f9f0c44dc5f6d3cf4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 1 16:41:38 2014 +0200 shell32/tests: Remove todo handling from DDE tests. --- dlls/shell32/tests/shlexec.c | 66 +++++++++++------------------------------- 1 file changed, 17 insertions(+), 49 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 418b73a..c18d145 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2118,35 +2118,34 @@ typedef struct const char* ifexec; int expectedArgs; const char* expectedDdeExec; - int todo; } dde_tests_t; static dde_tests_t dde_tests[] = { /* Test passing and not passing command-line * argument, no DDE */ - {"", NULL, NULL, NULL, NULL, FALSE, "", 0x0}, - {"\"%1\"", NULL, NULL, NULL, NULL, TRUE, "", 0x0}, + {"", NULL, NULL, NULL, NULL, FALSE, ""}, + {"\"%1\"", NULL, NULL, NULL, NULL, TRUE, ""}, /* Test passing and not passing command-line * argument, with DDE */ - {"", "[open(\"%1\")]", "shlexec", "dde", NULL, FALSE, "[open(\"%s\")]", 0x0}, - {"\"%1\"", "[open(\"%1\")]", "shlexec", "dde", NULL, TRUE, "[open(\"%s\")]", 0x0}, + {"", "[open(\"%1\")]", "shlexec", "dde", NULL, FALSE, "[open(\"%s\")]"}, + {"\"%1\"", "[open(\"%1\")]", "shlexec", "dde", NULL, TRUE, "[open(\"%s\")]"}, /* Test unquoted %1 in command and ddeexec * (test filename has space) */ - {"%1", "[open(%1)]", "shlexec", "dde", NULL, 2, "[open(%s)]", 0x0}, + {"%1", "[open(%1)]", "shlexec", "dde", NULL, 2, "[open(%s)]"}, /* Test ifexec precedence over ddeexec */ - {"", "[open(\"%1\")]", "shlexec", "dde", "[ifexec(\"%1\")]", FALSE, "[ifexec(\"%s\")]", 0x0}, + {"", "[open(\"%1\")]", "shlexec", "dde", "[ifexec(\"%1\")]", FALSE, "[ifexec(\"%s\")]"}, /* Test default DDE topic */ - {"", "[open(\"%1\")]", "shlexec", NULL, NULL, FALSE, "[open(\"%s\")]", 0x0}, + {"", "[open(\"%1\")]", "shlexec", NULL, NULL, FALSE, "[open(\"%s\")]"}, /* Test default DDE application */ - {"", "[open(\"%1\")]", NULL, "dde", NULL, FALSE, "[open(\"%s\")]", 0x0}, + {"", "[open(\"%1\")]", NULL, "dde", NULL, FALSE, "[open(\"%s\")]"}, - {NULL, NULL, NULL, NULL, NULL, 0, 0x0} + {NULL} }; static DWORD WINAPI hooked_WaitForInputIdle(HANDLE process, DWORD timeout) @@ -2266,47 +2265,16 @@ static void test_dde(void) dde_ready_event = CreateEventA(NULL, FALSE, FALSE, "winetest_shlexec_dde_ready"); rc = shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, filename, NULL, NULL, NULL); CloseHandle(dde_ready_event); - if ((test->todo & 0x1)==0) - { - ok(32 < rc, "%s failed: rc=%lu err=%u\n", shell_call, - rc, GetLastError()); - } - else todo_wine - { - ok(32 < rc, "%s failed: rc=%lu err=%u\n", shell_call, - rc, GetLastError()); - } + ok(32 < rc, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); + if (32 < rc) { - if ((test->todo & 0x2)==0) - { - okChildInt("argcA", test->expectedArgs + 3); - } - else todo_wine - { - okChildInt("argcA", test->expectedArgs + 3); - } - if (test->expectedArgs == 1) - { - if ((test->todo & 0x4) == 0) - { - okChildPath("argvA3", filename); - } - else todo_wine - { - okChildPath("argvA3", filename); - } - } - if ((test->todo & 0x8) == 0) - { - sprintf(params, test->expectedDdeExec, filename); - okChildPath("ddeExec", params); - } - else todo_wine - { - sprintf(params, test->expectedDdeExec, filename); - okChildPath("ddeExec", params); - } + okChildInt("argcA", test->expectedArgs + 3); + + if (test->expectedArgs == 1) okChildPath("argvA3", filename); + + sprintf(params, test->expectedDdeExec, filename); + okChildPath("ddeExec", params); } delete_test_association(".sde");

1 0

Hans Leidekker : shell32/tests: Mark some test results as broken.
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: 807998ed4c564940b448e0b3ea4dc7e1b6268cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=807998ed4c564940b448e0b3e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 1 16:42:13 2014 +0200 shell32/tests: Mark some test results as broken. --- dlls/shell32/tests/shlexec.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index c18d145..9f4b1a3 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -747,10 +747,19 @@ static void _okChildInt(const char* file, int line, const char* key, int expecte "%s expected %d, but got %d\n", key, expected, result); } +static void _okChildIntBroken(const char* file, int line, const char* key, int expected) +{ + INT result; + result=GetPrivateProfileIntA("Arguments", key, expected, child_file); + ok_(file, line)(result == expected || broken(result != expected), + "%s expected %d, but got %d\n", key, expected, result); +} + #define okChildString(key, expected) _okChildString(__FILE__, __LINE__, (key), (expected), (expected)) #define okChildStringBroken(key, expected, broken) _okChildString(__FILE__, __LINE__, (key), (expected), (broken)) #define okChildPath(key, expected) _okChildPath(__FILE__, __LINE__, (key), (expected)) -#define okChildInt(key, expected) _okChildInt(__FILE__, __LINE__, (key), (expected)) +#define okChildInt(key, expected) _okChildInt(__FILE__, __LINE__, (key), (expected)) +#define okChildIntBroken(key, expected) _okChildIntBroken(__FILE__, __LINE__, (key), (expected)) /*** * @@ -2118,6 +2127,7 @@ typedef struct const char* ifexec; int expectedArgs; const char* expectedDdeExec; + BOOL broken; } dde_tests_t; static dde_tests_t dde_tests[] = @@ -2134,7 +2144,7 @@ static dde_tests_t dde_tests[] = /* Test unquoted %1 in command and ddeexec * (test filename has space) */ - {"%1", "[open(%1)]", "shlexec", "dde", NULL, 2, "[open(%s)]"}, + {"%1", "[open(%1)]", "shlexec", "dde", NULL, 2, "[open(%s)]", TRUE /* before vista */}, /* Test ifexec precedence over ddeexec */ {"", "[open(\"%1\")]", "shlexec", "dde", "[ifexec(\"%1\")]", FALSE, "[ifexec(\"%s\")]"}, @@ -2269,7 +2279,10 @@ static void test_dde(void) if (32 < rc) { - okChildInt("argcA", test->expectedArgs + 3); + if (test->broken) + okChildIntBroken("argcA", test->expectedArgs + 3); + else + okChildInt("argcA", test->expectedArgs + 3); if (test->expectedArgs == 1) okChildPath("argvA3", filename);

1 0

Stefan Dösinger : d3dx9_36/tests: Initialize some test values.
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: ed3b1037f9d9a266579d330a1c99be820b5db4b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3b1037f9d9a266579d330a1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 31 11:44:54 2014 +0200 d3dx9_36/tests: Initialize some test values. --- dlls/d3dx9_36/tests/effect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 44f931c..482f064 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1683,9 +1683,9 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) UINT res_value_offset = res[k].value_offset; D3DXHANDLE parameter; D3DXPARAMETER_DESC pdesc; - BOOL bvalue; - INT ivalue; - FLOAT fvalue; + BOOL bvalue = TRUE; + INT ivalue = 42; + FLOAT fvalue = 2.71828f; DWORD input_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; DWORD expected_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; UINT l, n, m, element;

1 0

Stefan Dösinger : d3dxof: Make the get_primitive_string parameter a DWORD.
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: 49c7cba040a623234f6b48a931e6b499b0db7aba URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c7cba040a623234f6b48a93… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 31 11:44:55 2014 +0200 d3dxof: Make the get_primitive_string parameter a DWORD. --- dlls/d3dxof/parsing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 49ff964..d10eb24 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -90,7 +90,7 @@ static const char *debugstr_fourcc(DWORD fourcc) (char)(fourcc >> 16), (char)(fourcc >> 24)); } -static const char* get_primitive_string(WORD token) +static const char* get_primitive_string(DWORD token) { switch(token) {

1 0

Stefan Dösinger : d3dxof: Include wine/ port.h in parsing.c.
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: 244e3d01dba0c705abe4b40e3b540a084f617526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=244e3d01dba0c705abe4b40e3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 31 11:44:56 2014 +0200 d3dxof: Include wine/port.h in parsing.c. --- dlls/d3dxof/parsing.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index d10eb24..769e815 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include "wine/debug.h" #define COBJMACROS

1 0

Stefan Dösinger : include: The NumUAVs parameter of OMGetRenderTargetsAndUnorderedAccessViews is an input parameter.
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: ed2b31125ceeaa74a46ab4e92b286ba51842ab67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed2b31125ceeaa74a46ab4e92… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 31 11:44:57 2014 +0200 include: The NumUAVs parameter of OMGetRenderTargetsAndUnorderedAccessViews is an input parameter. --- include/d3d11.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3d11.idl b/include/d3d11.idl index 72d5358..e88ae7f 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -1728,7 +1728,7 @@ interface ID3D11DeviceContext : ID3D11DeviceChild [out] ID3D11RenderTargetView **ppRenderTargetViews, [out] ID3D11DepthStencilView **ppDepthStencilView, [in] UINT UAVStartSlot, - [out] UINT NumUAVs, + [in] UINT NumUAVs, [out] ID3D11UnorderedAccessView **ppUnorderedAccessViews); void OMGetBlendState( [out] ID3D11BlendState **ppBlendState,

1 0

Vincent Povirk : msi: Fix infinite loop.
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: a4c6107d81422dcd7cec507e18ba66764cab855c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c6107d81422dcd7cec507e1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 31 16:40:01 2014 -0500 msi: Fix infinite loop. --- dlls/msi/classes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index a5139f8..2719a8e 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -1054,7 +1054,7 @@ static const MSICLASS *get_progid_class( const MSIPROGID *progid ) { if (progid->Parent) progid = progid->Parent; if (progid->Class) return progid->Class; - if (!progid->Parent) break; + if (!progid->Parent || progid->Parent == progid) break; } return NULL; }

1 0

Ken Thomases : winex11: Maintain the swap interval when the drawable is recreated.
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: 4325ecdca841d6d161f723339afe9277f5d09704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4325ecdca841d6d161f723339… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 31 21:46:48 2014 -0500 winex11: Maintain the swap interval when the drawable is recreated. The swap interval is a property of the GLX drawable, which is destroyed and recreated by set_gl_drawable_parent() and wglSetPixelFormatWINE(). When that happens, copy the interval from the old gl_drawable and apply it at the next call to wglSwapBuffers(). --- dlls/winex11.drv/opengl.c | 82 ++++++++++++++++++++++++++++----------------- 1 file changed, 52 insertions(+), 30 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b3bd45b..85231f0 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -252,6 +252,7 @@ struct gl_drawable XVisualInfo *visual; /* information about the GL visual */ RECT rect; /* drawable rect, relative to whole window drawable */ int swap_interval; + BOOL refresh_swap_interval; }; enum glx_swap_control_method @@ -1185,6 +1186,43 @@ static inline void sync_context(struct wgl_context *context) } } +static BOOL set_swap_interval(Drawable drawable, int interval) +{ + BOOL ret = TRUE; + + switch (swap_control_method) + { + case GLX_SWAP_CONTROL_EXT: + X11DRV_expect_error(gdi_display, GLXErrorHandler, NULL); + pglXSwapIntervalEXT(gdi_display, drawable, interval); + XSync(gdi_display, False); + ret = !X11DRV_check_error(); + break; + + case GLX_SWAP_CONTROL_MESA: + ret = !pglXSwapIntervalMESA(interval); + break; + + case GLX_SWAP_CONTROL_SGI: + /* wglSwapIntervalEXT considers an interval value of zero to mean that + * vsync should be disabled, but glXSwapIntervalSGI considers such a + * value to be an error. Just silently ignore the request for now. + */ + if (!interval) + WARN("Request to disable vertical sync is not handled\n"); + else + ret = !pglXSwapIntervalSGI(interval); + break; + + case GLX_SWAP_CONTROL_NONE: + /* Unlikely to happen on modern GLX implementations */ + WARN("Request to adjust swap interval is not handled\n"); + break; + } + + return ret; +} + static struct gl_drawable *get_gl_drawable( HWND hwnd, HDC hdc ) { struct gl_drawable *gl; @@ -1314,6 +1352,8 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) } } + if (gl->drawable) + gl->refresh_swap_interval = TRUE; return gl->drawable != 0; } @@ -1330,6 +1370,7 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) * there is no way to query it, so we have to store it here. */ gl->swap_interval = 1; + gl->refresh_swap_interval = TRUE; gl->format = format; gl->visual = pglXGetVisualFromFBConfig( gdi_display, format->fbconfig ); if (!gl->visual) @@ -1355,7 +1396,10 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) EnterCriticalSection( &context_section ); if (!XFindContext( gdi_display, (XID)hwnd, gl_hwnd_context, (char **)&prev )) + { + gl->swap_interval = prev->swap_interval; free_gl_drawable( prev ); + } XSaveContext( gdi_display, (XID)hwnd, gl_hwnd_context, (char *)gl ); LeaveCriticalSection( &context_section ); @@ -2957,36 +3001,8 @@ static BOOL X11DRV_wglSwapIntervalEXT(int interval) return FALSE; } - switch (swap_control_method) - { - case GLX_SWAP_CONTROL_EXT: - X11DRV_expect_error(gdi_display, GLXErrorHandler, NULL); - pglXSwapIntervalEXT(gdi_display, gl->drawable, interval); - XSync(gdi_display, False); - ret = !X11DRV_check_error(); - break; - - case GLX_SWAP_CONTROL_MESA: - ret = !pglXSwapIntervalMESA(interval); - break; - - case GLX_SWAP_CONTROL_SGI: - /* wglSwapIntervalEXT considers an interval value of zero to mean that - * vsync should be disabled, but glXSwapIntervalSGI considers such a - * value to be an error. Just silently ignore the request for now. - */ - if (!interval) - WARN("Request to disable vertical sync is not handled\n"); - else - ret = !pglXSwapIntervalSGI(interval); - break; - - case GLX_SWAP_CONTROL_NONE: - /* Unlikely to happen on modern GLX implementations */ - WARN("Request to adjust swap interval is not handled\n"); - break; - } - + ret = set_swap_interval(gl->drawable, interval); + gl->refresh_swap_interval = FALSE; if (ret) gl->swap_interval = interval; else @@ -3202,6 +3218,12 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) return FALSE; } + if (gl->refresh_swap_interval) + { + set_swap_interval(gl->drawable, gl->swap_interval); + gl->refresh_swap_interval = FALSE; + } + switch (gl->type) { case DC_GL_PIXMAP_WIN:

1 0

Ken Thomases : winex11: Remove set-but-never-read hwnd and fbconfig_id fields of struct x11drv_escape_set_drawable.
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: 809166def711a8261647a31fb370a0d11c64971f URL: http://source.winehq.org/git/wine.git/?a=commit;h=809166def711a8261647a31fb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 31 21:47:04 2014 -0500 winex11: Remove set-but-never-read hwnd and fbconfig_id fields of struct x11drv_escape_set_drawable. --- dlls/winex11.drv/opengl.c | 2 -- dlls/winex11.drv/window.c | 8 ++------ dlls/winex11.drv/x11drv.h | 2 -- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 85231f0..0077ac3 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2323,11 +2323,9 @@ static HDC X11DRV_wglGetPbufferDCARB( struct wgl_pbuffer *object ) LeaveCriticalSection( &context_section ); escape.code = X11DRV_SET_DRAWABLE; - escape.hwnd = 0; escape.drawable = object->drawable; escape.mode = IncludeInferiors; SetRect( &escape.dc_rect, 0, 0, object->width, object->height ); - escape.fbconfig_id = object->fmt->fmt_id; ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); TRACE( "(%p)->(%p)\n", object, hdc ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 2ca5ec2..a9caa0d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1970,10 +1970,8 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, struct x11drv_escape_set_drawable escape; HWND parent; - escape.code = X11DRV_SET_DRAWABLE; - escape.hwnd = hwnd; - escape.mode = IncludeInferiors; - escape.fbconfig_id = 0; + escape.code = X11DRV_SET_DRAWABLE; + escape.mode = IncludeInferiors; escape.dc_rect.left = win_rect->left - top_rect->left; escape.dc_rect.top = win_rect->top - top_rect->top; @@ -2019,12 +2017,10 @@ void CDECL X11DRV_ReleaseDC( HWND hwnd, HDC hdc ) struct x11drv_escape_set_drawable escape; escape.code = X11DRV_SET_DRAWABLE; - escape.hwnd = GetDesktopWindow(); escape.drawable = root_window; escape.mode = IncludeInferiors; escape.dc_rect = get_virtual_screen_rect(); OffsetRect( &escape.dc_rect, -2 * escape.dc_rect.left, -2 * escape.dc_rect.top ); - escape.fbconfig_id = 0; ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9008db6..7a3374d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -283,11 +283,9 @@ enum x11drv_escape_codes struct x11drv_escape_set_drawable { enum x11drv_escape_codes code; /* escape code (X11DRV_SET_DRAWABLE) */ - HWND hwnd; /* window for this drawable */ Drawable drawable; /* X drawable */ int mode; /* ClipByChildren or IncludeInferiors */ RECT dc_rect; /* DC rectangle relative to drawable */ - XID fbconfig_id; /* fbconfig id used by the GL drawable */ }; struct x11drv_escape_get_drawable

1 0