wine-commits April 2014

wine-commits@winehq.org

2 participants
500 discussions

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

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 : 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 : 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

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

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

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

01 Apr '14

1 0

Eriks Dobelis : wintab: Initialize lcOutExtX and Y values.
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: 235100bb72882dcab5553716f172dda3877a709a URL: http://source.winehq.org/git/wine.git/?a=commit;h=235100bb72882dcab5553716f… Author: Eriks Dobelis <eriks.dobelis(a)biti.lv> Date: Thu Mar 20 16:18:17 2014 +0200 wintab: Initialize lcOutExtX and Y values. --- dlls/winex11.drv/wintab.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index ca0f35e..3642a47 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -536,6 +536,8 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) gSysContext.lcSensZ = 65536; gSysContext.lcSysSensX= 65536; gSysContext.lcSysSensY= 65536; + gSysContext.lcOutExtX= GetSystemMetrics(SM_CXSCREEN); + gSysContext.lcOutExtY= GetSystemMetrics(SM_CYSCREEN); /* initialize cursors */ disable_system_cursors();

1 0

Eriks Dobelis : wintab: Fix incorrectly classifying cursor as stylus instead of eraser.
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: 2de64560fe3e36e56eccafa220836f73d1188687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de64560fe3e36e56eccafa22… Author: Eriks Dobelis <eriks.dobelis(a)biti.lv> Date: Mon Mar 31 16:54:10 2014 +0300 wintab: Fix incorrectly classifying cursor as stylus instead of eraser. --- dlls/winex11.drv/wintab.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 23a5423..ca0f35e 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -415,7 +415,7 @@ static BOOL is_tablet_cursor(const char *name, const char *type) return FALSE; } -static BOOL is_stylus(const char *name, const char *type) +static UINT get_cursor_type(const char *name, const char *type) { int i; static const char* tablet_stylus_whitelist[] = { @@ -426,23 +426,21 @@ static BOOL is_stylus(const char *name, const char *type) NULL }; + /* First check device type to avoid cases where name is "Pen and Eraser" and type is "ERASER" */ for (i=0; tablet_stylus_whitelist[i] != NULL; i++) { - if (name && match_token(name, tablet_stylus_whitelist[i])) - return TRUE; if (type && match_token(type, tablet_stylus_whitelist[i])) - return TRUE; + return CSR_TYPE_PEN; } - - return FALSE; -} - -static BOOL is_eraser(const char *name, const char *type) -{ - if (name && match_token(name, "eraser")) - return TRUE; if (type && match_token(type, "eraser")) - return TRUE; - return FALSE; + return CSR_TYPE_ERASER; + for (i=0; tablet_stylus_whitelist[i] != NULL; i++) { + if (name && match_token(name, tablet_stylus_whitelist[i])) + return CSR_TYPE_PEN; + } + if (name && match_token(name, "eraser")) + return CSR_TYPE_ERASER; + + return CSR_TYPE_OTHER; } /* cursors are placed in gSysCursor rows depending on their type @@ -635,13 +633,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) cursor.NPBTNMARKS[1] = 1 ; cursor.CAPABILITIES = CRC_MULTIMODE; - /* prefer finding TYPE_PEN(most capable) */ - if (is_stylus(target->name, device_type)) - cursor.TYPE = CSR_TYPE_PEN; - else if (is_eraser(target->name, device_type)) - cursor.TYPE = CSR_TYPE_ERASER; - else - cursor.TYPE = CSR_TYPE_OTHER; + cursor.TYPE = get_cursor_type(target->name, device_type); any = target->inputclassinfo;

1 0

Hans Leidekker : wldap32/tests: Skip tests if the connection times out.
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: 165081e53cd1e31eab1719243d05d7e5dd5b6a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=165081e53cd1e31eab1719243… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 1 10:44:19 2014 +0200 wldap32/tests: Skip tests if the connection times out. --- dlls/wldap32/tests/parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 88a7e20..5c84929 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -48,7 +48,7 @@ static void test_ldap_parse_sort_control( LDAP *ld ) timeout.tv_sec = 20; timeout.tv_usec = 0; ret = ldap_search_ext_sA( ld, (char *)"", LDAP_SCOPE_ONELEVEL, (char *)"(ou=*)", NULL, 0, ctrls, NULL, &timeout, 10, &res ); - if (ret == LDAP_SERVER_DOWN) + if (ret == LDAP_SERVER_DOWN || ret == LDAP_TIMEOUT) { skip("test server can't be reached\n"); ldap_control_freeA( sort );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2014