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

Stefan Dösinger : d3dx9_36/tests: Initialize some test values.
by Alexandre Julliard April 1, 2014

April 1, 2014

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: Include wine/ port.h in parsing.c.
by Alexandre Julliard April 1, 2014

April 1, 2014

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 April 1, 2014

April 1, 2014

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

Hans Leidekker : shell32/tests: Mark some test results as broken.
by Alexandre Julliard April 1, 2014

April 1, 2014

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 April 1, 2014

April 1, 2014

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 April 1, 2014

April 1, 2014

1 0

Stefan Dösinger : include: The NumUAVs parameter of OMGetRenderTargetsAndUnorderedAccessViews is an input parameter.
by Alexandre Julliard April 1, 2014

April 1, 2014

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

Henri Verbeet : d3d9/tests: Handle the Windows 8 testbot results in cnd_test().
by Alexandre Julliard April 1, 2014

April 1, 2014

Module: wine Branch: master Commit: 7f9c0d45e7e399b3d4cb5615faa38e8e3b17cb91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9c0d45e7e399b3d4cb5615f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 1 09:50:46 2014 +0200 d3d9/tests: Handle the Windows 8 testbot results in cnd_test(). --- dlls/d3d9/tests/visual.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 74cbd9f..80e8be9 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6313,7 +6313,9 @@ static void cnd_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - /* Retest with the coissue flag on the alpha instruction instead. This works "as expected". */ + /* Retest with the coissue flag on the alpha instruction instead. This + * works "as expected". The Windows 8 testbot (WARP) seems to handle this + * the same as coissue on .rgb. */ hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); @@ -6357,13 +6359,13 @@ static void cnd_test(void) /* 1.1 shader */ color = getPixelColor(device, 238, 358); - ok(color_match(color, 0x00ffffff, 1), + ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)), "pixel 238, 358 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 242, 358); ok(color_match(color, 0x00000000, 1), "pixel 242, 358 has color %08x, expected 0x00000000\n", color); color = getPixelColor(device, 238, 362); - ok(color_match(color, 0x00ffffff, 1), + ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)), "pixel 238, 362 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 242, 362); ok(color_match(color, 0x00000000, 1), @@ -6371,13 +6373,13 @@ static void cnd_test(void) /* 1.2 shader */ color = getPixelColor(device, 558, 358); - ok(color_match(color, 0x00ffffff, 1), + ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)), "pixel 558, 358 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 562, 358); ok(color_match(color, 0x00000000, 1), "pixel 562, 358 has color %08x, expected 0x00000000\n", color); color = getPixelColor(device, 558, 362); - ok(color_match(color, 0x00ffffff, 1), + ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)), "pixel 558, 362 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 562, 362); ok(color_match(color, 0x00000000, 1), @@ -6385,13 +6387,13 @@ static void cnd_test(void) /* 1.3 shader */ color = getPixelColor(device, 558, 118); - ok(color_match(color, 0x00ffffff, 1), + ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)), "pixel 558, 118 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 562, 118); ok(color_match(color, 0x00000000, 1), "pixel 562, 118 has color %08x, expected 0x00000000\n", color); color = getPixelColor(device, 558, 122); - ok(color_match(color, 0x00ffffff, 1), + ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)), "pixel 558, 122 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 562, 122); ok(color_match(color, 0x00000000, 1),

1 0

Hans Leidekker : fonts: Add Hungarian localization of Tahoma font names.
by Alexandre Julliard April 1, 2014

April 1, 2014

Module: wine Branch: master Commit: 5a2fc716312de5fc547e56762ed96c046e16b090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2fc716312de5fc547e56762… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 31 19:43:49 2014 +0200 fonts: Add Hungarian localization of Tahoma font names. --- fonts/tahoma.sfd | 1 + fonts/tahoma.ttf | Bin 143628 -> 143652 bytes fonts/tahomabd.sfd | 1 + fonts/tahomabd.ttf | Bin 136708 -> 136780 bytes 4 files changed, 2 insertions(+) diff --git a/fonts/tahoma.sfd b/fonts/tahoma.sfd index 47a0651..3d6b44e 100644 --- a/fonts/tahoma.sfd +++ b/fonts/tahoma.sfd @@ -102,6 +102,7 @@ TtfTable: VDMX 1504 !<)rC!;6Els31Q<!<<)D!;HQps3(K=!<N5E!;Z]ts3(K?!<`AG!;lj#s3(KA!=&SJ!<*!'s3(KC !=/YK EndTtf +LangName: 1038 "" "" "Norm+AOEA-l" LangName: 1033 "" "" "" "Wine Tahoma Regular" "" "Version 0.001" "" "(C) 2004 Larry Snyder Based on Bitstream Vera Sans (C) Bitstream Inc." "" "" "" "http://www.winehq.org" "" "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.+AAoACgAA-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.+AAoACgAA-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 Street, Fifth Floor, Boston, MA 02110-1301 USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" GaspTable: 3 8 0 16 1 65535 3 0 Encoding: UnicodeBmp diff --git a/fonts/tahoma.ttf b/fonts/tahoma.ttf index c535eae..4f68d1e 100644 Binary files a/fonts/tahoma.ttf and b/fonts/tahoma.ttf differ diff --git a/fonts/tahomabd.sfd b/fonts/tahomabd.sfd index ae0e946..b3f935b 100644 --- a/fonts/tahomabd.sfd +++ b/fonts/tahomabd.sfd @@ -102,6 +102,7 @@ TtfTable: VDMX 1504 !<)rC!;6Els31Q<!<<)D!;HQps3(K=!<N5E!;Z]ts3(K?!<`AG!;lj#s3(KA!=&SJ!<*!'s3(KC !=/YK EndTtf +LangName: 1038 "" "" "F+AOkA-lk+APYA-v+AOkA-r" "" "Tahoma F+AOkA-lk+APYA-v+AOkA-r" LangName: 1033 "" "" "" "Wine Tahoma Bold" "" "Version 0.001" "" "(C) 2004 Larry Snyder Based on Bitstream Vera Sans (C) Bitstream Inc." "" "" "" "http://www.winehq.org" "" "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.+AAoACgAA-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.+AAoACgAA-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 Street, Fifth Floor, Boston, MA 02110-1301 USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" GaspTable: 3 8 0 16 1 65535 3 0 Encoding: UnicodeBmp diff --git a/fonts/tahomabd.ttf b/fonts/tahomabd.ttf index b4b0b41..f7d9c46 100644 Binary files a/fonts/tahomabd.ttf and b/fonts/tahomabd.ttf differ

1 0

Eriks Dobelis : wintab: Initialize lcOutExtX and Y values.
by Alexandre Julliard April 1, 2014

April 1, 2014

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