January 2016 - Wine-Commits

Francois Gouget : shell32/tests: Check the hProcess field when ShellExecuteEx() fails.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: 0a867de22d0f2fc4ff7a44396fac55e0fdbc9978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a867de22d0f2fc4ff7a44396… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 11 02:18:12 2016 +0100 shell32/tests: Check the hProcess field when ShellExecuteEx() fails. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 047d041..5dcda39 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -198,7 +198,7 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR verb, LPCSTR file, sei.hkeyClass=NULL; sei.dwHotKey=0; U(sei).hIcon=NULL; - sei.hProcess=NULL; /* Out */ + sei.hProcess=(HANDLE)0xdeadbeef; /* Out */ DeleteFileA(child_file); SetLastError(0xcafebabe); @@ -221,6 +221,9 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR verb, LPCSTR file, else todo_wine ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait_rc); } + else + ok(sei.hProcess==NULL, "%s returned a process handle %p\n", shell_call, sei.hProcess); + /* The child process may have changed the result file, so let profile * functions know about it */

1 0

Francois Gouget : shell32/tests: The expectedArgs parameter of the DDE tests is an argument count, not a boolean.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: 2fb84d5c50304875631d3215e9fe2ac8a5aa4413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb84d5c50304875631d3215e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 11 02:17:58 2016 +0100 shell32/tests: The expectedArgs parameter of the DDE tests is an argument count, not a boolean. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 3d95b41..047d041 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2143,26 +2143,26 @@ static dde_tests_t dde_tests[] = { /* Test passing and not passing command-line * argument, no DDE */ - {"", NULL, NULL, NULL, NULL, FALSE, ""}, - {"\"%1\"", NULL, NULL, NULL, NULL, TRUE, ""}, + {"", NULL, NULL, NULL, NULL, 0, ""}, + {"\"%1\"", NULL, NULL, NULL, NULL, 1, ""}, /* Test passing and not passing command-line * argument, with DDE */ - {"", "[open(\"%1\")]", "shlexec", "dde", NULL, FALSE, "[open(\"%s\")]"}, - {"\"%1\"", "[open(\"%1\")]", "shlexec", "dde", NULL, TRUE, "[open(\"%s\")]"}, + {"", "[open(\"%1\")]", "shlexec", "dde", NULL, 0, "[open(\"%s\")]"}, + {"\"%1\"", "[open(\"%1\")]", "shlexec", "dde", NULL, 1, "[open(\"%s\")]"}, /* Test unquoted %1 in command and ddeexec * (test filename has space) */ {"%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\")]"}, + {"", "[open(\"%1\")]", "shlexec", "dde", "[ifexec(\"%1\")]", 0, "[ifexec(\"%s\")]"}, /* Test default DDE topic */ - {"", "[open(\"%1\")]", "shlexec", NULL, NULL, FALSE, "[open(\"%s\")]"}, + {"", "[open(\"%1\")]", "shlexec", NULL, NULL, 0, "[open(\"%s\")]"}, /* Test default DDE application */ - {"", "[open(\"%1\")]", NULL, "dde", NULL, FALSE, "[open(\"%s\")]"}, + {"", "[open(\"%1\")]", NULL, "dde", NULL, 0, "[open(\"%s\")]"}, {NULL} };

1 0

Anthony Fok : include: Suppress "use msvcrt" error in tchar.h when -mno-cygwin is used.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: e034c419533065e82e60a22e02e3812335a5b02b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e034c419533065e82e60a22e0… Author: Anthony Fok <foka(a)debian.org> Date: Tue Jan 5 10:50:23 2016 -0700 include: Suppress "use msvcrt" error in tchar.h when -mno-cygwin is used. Signed-off-by: Anthony Fok <foka(a)debian.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/tchar.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/tchar.h b/include/tchar.h index 38885d4..13c8ee6 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -23,8 +23,8 @@ #error Wine should not include tchar.h internally #endif -#if defined(_UNICODE) || defined(_MBCS) -#error You must use msvcrt when building in Unicode/MBCS mode +#if !defined(__MSVCRT__) && (defined(_UNICODE) || defined(_MBCS)) +#error You must use msvcrt when building in Unicode/MBCS mode [-mno-cygwin] #endif #ifdef __cplusplus

1 0

Andrew Eikum : xaudio2_6: Use shared source.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: 4a361b048908404754bc2fabb463eda8c8203053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a361b048908404754bc2fabb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 11 13:53:01 2016 -0600 xaudio2_6: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/xaudio2_6/Makefile.in | 7 ++++- dlls/xaudio2_6/xaudio2_6.spec | 2 +- dlls/xaudio2_6/xaudio_classes.idl | 42 ------------------------------ dlls/xaudio2_6/xaudio_dll.c | 54 --------------------------------------- dlls/xaudio2_7/xaudio_classes.idl | 23 +++++++++++++++++ 7 files changed, 32 insertions(+), 98 deletions(-) diff --git a/configure b/configure index e000469..91c21aa 100755 --- a/configure +++ b/configure @@ -13719,6 +13719,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported" + enable_xaudio2_6=${enable_xaudio2_6:-no} enable_xaudio2_7=${enable_xaudio2_7:-no} enable_xaudio2_8=${enable_xaudio2_8:-no} fi diff --git a/configure.ac b/configure.ac index 296f11d..6535b4a 100644 --- a/configure.ac +++ b/configure.ac @@ -1662,6 +1662,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported]) + enable_xaudio2_6=${enable_xaudio2_6:-no} enable_xaudio2_7=${enable_xaudio2_7:-no} enable_xaudio2_8=${enable_xaudio2_8:-no} fi diff --git a/dlls/xaudio2_6/Makefile.in b/dlls/xaudio2_6/Makefile.in index c56b079..b1e7584 100644 --- a/dlls/xaudio2_6/Makefile.in +++ b/dlls/xaudio2_6/Makefile.in @@ -1,7 +1,12 @@ +EXTRADEFS = -DXAUDIO2_VER=6 MODULE = xaudio2_6.dll -IMPORTS = ole32 +IMPORTS = advapi32 kernel32 ole32 user32 uuid +EXTRALIBS = $(OPENAL_LIBS) +PARENTSRC = ../xaudio2_7 C_SRCS = \ + compat.c \ + xapofx.c \ xaudio_dll.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_6/xaudio2_6.spec b/dlls/xaudio2_6/xaudio2_6.spec index cb263d4..b16365d 100644 --- a/dlls/xaudio2_6/xaudio2_6.spec +++ b/dlls/xaudio2_6/xaudio2_6.spec @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) xaudio2_7.DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/xaudio2_6/xaudio_classes.idl b/dlls/xaudio2_6/xaudio_classes.idl deleted file mode 100644 index 1b76a6a..0000000 --- a/dlls/xaudio2_6/xaudio_classes.idl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * COM Classes for xaudio - * - * 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 - */ - -#pragma makedep register - -[ - helpstring("XAudio2.6 Class"), - threading(both), - uuid(3eda9b49-2085-498b-9bb2-39a6778493de) -] -coclass XAudio26 { interface IXAudio27; } - -[ - helpstring("XAudio2.6 AudioReverb Class"), - threading(both), - uuid(cecec95a-d894-491a-bee3-5e106fb59f2d) -] -coclass AudioReverb26 { interface IXAPO; } - -[ - helpstring("XAudio2.6 AudioVolumeMeter Class"), - threading(both), - uuid(e48c5a3f-93ef-43bb-a092-2c7ceb946f27) -] -coclass AudioVolumeMeter26 { interface IXAPO; } diff --git a/dlls/xaudio2_6/xaudio_dll.c b/dlls/xaudio2_6/xaudio_dll.c deleted file mode 100644 index e55861c..0000000 --- a/dlls/xaudio2_6/xaudio_dll.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 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 <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "rpcproxy.h" - -static HINSTANCE instance; - -BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - instance = hinstance; - DisableThreadLibraryCalls(hinstance); - break; - } - return TRUE; -} - -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - -HRESULT WINAPI DllRegisterServer(void) -{ - return __wine_register_resources(instance); -} - -HRESULT WINAPI DllUnregisterServer(void) -{ - return __wine_unregister_resources(instance); -} diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl index d7ddb42..0dc2104 100644 --- a/dlls/xaudio2_7/xaudio_classes.idl +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -119,3 +119,26 @@ coclass FXEQ14 { interface IXAPO; } ] coclass FXEQ15 { interface IXAPO; } #endif /* XAUDIO2_VER == 7 */ + +#if XAUDIO2_VER == 6 +[ + helpstring("XAudio2.6 Class"), + threading(both), + uuid(3eda9b49-2085-498b-9bb2-39a6778493de) +] +coclass XAudio26 { interface IXAudio27; } + +[ + helpstring("XAudio2.6 AudioReverb Class"), + threading(both), + uuid(cecec95a-d894-491a-bee3-5e106fb59f2d) +] +coclass AudioReverb26 { interface IXAPO; } + +[ + helpstring("XAudio2.6 AudioVolumeMeter Class"), + threading(both), + uuid(e48c5a3f-93ef-43bb-a092-2c7ceb946f27) +] +coclass AudioVolumeMeter26 { interface IXAPO; } +#endif /* XAUDIO2_VER == 6 */

1 0

Józef Kucia : wined3d: Implement SM4 ftou instruction.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: 5a1b7dbec7d2f8a78cc4fc38d7c09661bf561d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a1b7dbec7d2f8a78cc4fc38d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 11 11:53:25 2016 +0100 wined3d: Implement SM4 ftou instruction. 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/glsl_shader.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 27c079b..75ac4d5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3363,6 +3363,23 @@ static void shader_glsl_to_int(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "int(%s));\n", src_param.param_str); } +static void shader_glsl_to_uint(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param src_param; + unsigned int mask_size; + DWORD write_mask; + + write_mask = shader_glsl_append_dst(buffer, ins); + mask_size = shader_glsl_get_write_mask_size(write_mask); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); + + if (mask_size > 1) + shader_addline(buffer, "uvec%u(%s));\n", mask_size, src_param.param_str); + else + shader_addline(buffer, "uint(%s));\n", src_param.param_str); +} + static void shader_glsl_to_float(const struct wined3d_shader_instruction *ins) { struct wined3d_string_buffer *buffer = ins->ctx->buffer; @@ -7899,7 +7916,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ shader_glsl_to_int, - /* WINED3DSIH_FTOU */ NULL, + /* WINED3DSIH_FTOU */ shader_glsl_to_uint, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_IADD */ shader_glsl_binop, /* WINED3DSIH_IEQ */ NULL,

1 0

Józef Kucia : wined3d: Recognize SM4 ilt opcode.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: 893619dfcd16d05981c8b5b836a3482fb960cc10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=893619dfcd16d05981c8b5b83… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 11 11:53:21 2016 +0100 wined3d: Recognize SM4 ilt 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 6b67c7d..e54fc24 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5258,6 +5258,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */, /* WINED3DSIH_IFC */ shader_hw_ifc, /* WINED3DSIH_IGE */ NULL, + /* WINED3DSIH_ILT */ NULL, /* WINED3DSIH_IMAX */ NULL, /* WINED3DSIH_IMIN */ NULL, /* WINED3DSIH_IMUL */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a18e7a8..fa02ed8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7906,6 +7906,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, + /* WINED3DSIH_ILT */ NULL, /* WINED3DSIH_IMAX */ shader_glsl_map2gl, /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMUL */ shader_glsl_imul, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d63a377..d3482fc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -86,6 +86,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IF */ "if", /* WINED3DSIH_IFC */ "ifc", /* WINED3DSIH_IGE */ "ige", + /* WINED3DSIH_ILT */ "ilt", /* WINED3DSIH_IMAX */ "imax", /* WINED3DSIH_IMIN */ "imin", /* WINED3DSIH_IMUL */ "imul", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index c1f20b0..acc1b4b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -99,6 +99,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IF = 0x1f, WINED3D_SM4_OP_IEQ = 0x20, WINED3D_SM4_OP_IGE = 0x21, + WINED3D_SM4_OP_ILT = 0x22, WINED3D_SM4_OP_IMAX = 0x24, WINED3D_SM4_OP_IMIN = 0x25, WINED3D_SM4_OP_IMUL = 0x26, @@ -271,6 +272,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IF, WINED3DSIH_IF, "", "U"}, {WINED3D_SM4_OP_IEQ, WINED3DSIH_IEQ, "U", "II"}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, "U", "II"}, + {WINED3D_SM4_OP_ILT, WINED3DSIH_ILT, "U", "II"}, {WINED3D_SM4_OP_IMAX, WINED3DSIH_IMAX, "I", "II"}, {WINED3D_SM4_OP_IMIN, WINED3DSIH_IMIN, "I", "II"}, {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, "II", "II"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86f4123..d603898 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -501,6 +501,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IF, WINED3DSIH_IFC, WINED3DSIH_IGE, + WINED3DSIH_ILT, WINED3DSIH_IMAX, WINED3DSIH_IMIN, WINED3DSIH_IMUL,

1 0

Andrew Eikum : xaudio2: Explicitly version the 2.7 coclasses.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: 4ad4c61100c06cbd9eb6587c543ceac94b932621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad4c61100c06cbd9eb6587c5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 11 13:52:02 2016 -0600 xaudio2: Explicitly version the 2.7 coclasses. In versions 2.8 and later, no coclasses are provided by the API, so we should version the old ones to make it clear they're out of date. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 10 +++++----- dlls/xaudio2_7/xapofx.c | 4 ++-- dlls/xaudio2_7/xaudio_classes.idl | 2 +- dlls/xaudio2_7/xaudio_dll.c | 40 +++++++++++++++++++-------------------- dlls/xaudio2_8/xaudio_dll.c | 6 +++--- include/xapofx.h | 8 ++++---- include/xaudio2.idl | 14 +++++++------- include/xaudio2fx.idl | 18 +++++++++--------- 8 files changed, 51 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ad4c61100c06cbd9eb65…

1 0

Jacek Caban : oleaut32: Added more Invoke tests.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: 17baf1e769f2e777b68c978aacad7e7ba1ad5685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17baf1e769f2e777b68c978aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 20:11:05 2016 +0100 oleaut32: Added more Invoke tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/test_reg.idl | 2 ++ dlls/oleaut32/tests/typelib.c | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/test_reg.idl b/dlls/oleaut32/tests/test_reg.idl index efc7c89..179d8c5 100644 --- a/dlls/oleaut32/tests/test_reg.idl +++ b/dlls/oleaut32/tests/test_reg.idl @@ -141,6 +141,8 @@ library register_test LONG testprop([in] LONG *i); [propputref, id(2)] LONG testprop2([in] IUnknown *i); + [id(3)] + HRESULT testfunc([in] int i, [out, retval] int *p); } /* uuid is same as for test_struct2 in test_tlb.idl, fields are different */ diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index adc98b5..fe80b70 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -37,6 +37,7 @@ #include "ocidl.h" #include "shlwapi.h" #include "tmarshal.h" +#include "olectl.h" #include "test_reg.h" #include "test_tlb.h" @@ -156,6 +157,12 @@ static LONG WINAPI invoketest_putref_testprop2(IInvokeTest *iface, IUnknown *i) return 6; } +static HRESULT WINAPI invoketest_testfunc(IInvokeTest *iface, int i, int *p) +{ + *p = i+1; + return S_OK; +} + static const IInvokeTestVtbl invoketestvtbl = { invoketest_QueryInterface, invoketest_AddRef, @@ -166,7 +173,8 @@ static const IInvokeTestVtbl invoketestvtbl = { invoketest_Invoke, invoketest_get_test, invoketest_putref_testprop, - invoketest_putref_testprop2 + invoketest_putref_testprop2, + invoketest_testfunc }; static IInvokeTest invoketest = { &invoketestvtbl }; @@ -667,6 +675,33 @@ static void write_typelib(int res_no, const char *filename) CloseHandle( file ); } +static void test_invoke_func(ITypeInfo *typeinfo) +{ + DISPID named_args[3] = { DISPID_THIS }; + VARIANT args[3], res; + DISPPARAMS dp = {args, named_args, 1, 0}; + UINT i; + HRESULT hres; + + V_VT(args) = VT_INT; + V_INT(args) = 3; + V_VT(&res) = VT_ERROR; + hres = ITypeInfo_Invoke(typeinfo, &invoketest, 3, DISPATCH_METHOD, &dp, &res, NULL, &i); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(V_VT(&res) == VT_I4, "got %d\n", V_VT(&res)); + ok(V_I4(&res) == 4, "got %d\n", V_I4(&res)); + + V_VT(args) = VT_DISPATCH; + V_DISPATCH(args) = (IDispatch*)&invoketest; + V_VT(args+1) = VT_INT; + V_INT(args+1) = 3; + V_VT(&res) = VT_ERROR; + dp.cNamedArgs = 1; + dp.cArgs = 2; + hres = ITypeInfo_Invoke(typeinfo, &invoketest, 3, DISPATCH_METHOD, &dp, &res, NULL, &i); + ok(hres == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hres); +} + static const char *create_test_typelib(int res_no) { static char filename[MAX_PATH]; @@ -959,6 +994,8 @@ static void test_TypeInfo(void) hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 2, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x, %d\n", hr, i); + test_invoke_func(pTypeInfo); + ITypeInfo_Release(pTypeInfo); ITypeLib_Release(pTypeLib); DeleteFileA(filenameA);

1 0

Józef Kucia : wined3d: Reduce code duplication in shader_glsl_to_ functions.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: 69d34caf55db96983340ba907323ebb002e9fa58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d34caf55db96983340ba907… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 11 11:53:26 2016 +0100 wined3d: Reduce code duplication in shader_glsl_to_ functions. 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/glsl_shader.c | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 75ac4d5..23acdcc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3346,7 +3346,8 @@ static void shader_glsl_expp(const struct wined3d_shader_instruction *ins) shader_glsl_scalar_op(ins); } -static void shader_glsl_to_int(const struct wined3d_shader_instruction *ins) +static void shader_glsl_cast(const struct wined3d_shader_instruction *ins, + const char *vector_constructor, const char *scalar_constructor) { struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct glsl_src_param src_param; @@ -3358,43 +3359,24 @@ static void shader_glsl_to_int(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); if (mask_size > 1) - shader_addline(buffer, "ivec%u(%s));\n", mask_size, src_param.param_str); + shader_addline(buffer, "%s%u(%s));\n", vector_constructor, mask_size, src_param.param_str); else - shader_addline(buffer, "int(%s));\n", src_param.param_str); + shader_addline(buffer, "%s(%s));\n", scalar_constructor, src_param.param_str); } -static void shader_glsl_to_uint(const struct wined3d_shader_instruction *ins) +static void shader_glsl_to_int(const struct wined3d_shader_instruction *ins) { - struct wined3d_string_buffer *buffer = ins->ctx->buffer; - struct glsl_src_param src_param; - unsigned int mask_size; - DWORD write_mask; - - write_mask = shader_glsl_append_dst(buffer, ins); - mask_size = shader_glsl_get_write_mask_size(write_mask); - shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); + shader_glsl_cast(ins, "ivec", "int"); +} - if (mask_size > 1) - shader_addline(buffer, "uvec%u(%s));\n", mask_size, src_param.param_str); - else - shader_addline(buffer, "uint(%s));\n", src_param.param_str); +static void shader_glsl_to_uint(const struct wined3d_shader_instruction *ins) +{ + shader_glsl_cast(ins, "uvec", "uint"); } static void shader_glsl_to_float(const struct wined3d_shader_instruction *ins) { - struct wined3d_string_buffer *buffer = ins->ctx->buffer; - struct glsl_src_param src_param; - unsigned int mask_size; - DWORD write_mask; - - write_mask = shader_glsl_append_dst(buffer, ins); - mask_size = shader_glsl_get_write_mask_size(write_mask); - shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); - - if (mask_size > 1) - shader_addline(buffer, "vec%u(%s));\n", mask_size, src_param.param_str); - else - shader_addline(buffer, "float(%s));\n", src_param.param_str); + shader_glsl_cast(ins, "vec", "float"); } /** Process signed comparison opcodes in GLSL. */

1 0

Józef Kucia : wined3d: Recognize SM4 ine opcode.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: 3df7e0bbbe45f93821a7a9a3196b6cab9670ce90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3df7e0bbbe45f93821a7a9a31… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 11 11:53:23 2016 +0100 wined3d: Recognize SM4 ine 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 5aa5669..ac7964e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5263,6 +5263,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMAX */ NULL, /* WINED3DSIH_IMIN */ NULL, /* WINED3DSIH_IMUL */ NULL, + /* WINED3DSIH_INE */ NULL, /* WINED3DSIH_ISHL */ NULL, /* WINED3DSIH_ITOF */ NULL, /* WINED3DSIH_LABEL */ shader_hw_label, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 218585c..f11acc4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7911,6 +7911,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMAX */ shader_glsl_map2gl, /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMUL */ shader_glsl_imul, + /* WINED3DSIH_INE */ NULL, /* WINED3DSIH_ISHL */ shader_glsl_binop, /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ef6b141..3ddaa0f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -91,6 +91,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMAX */ "imax", /* WINED3DSIH_IMIN */ "imin", /* WINED3DSIH_IMUL */ "imul", + /* WINED3DSIH_INE */ "ine", /* WINED3DSIH_ISHL */ "ishl", /* WINED3DSIH_ITOF */ "itof", /* WINED3DSIH_LABEL */ "label", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 91db7da..4636c5f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -104,6 +104,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IMAX = 0x24, WINED3D_SM4_OP_IMIN = 0x25, WINED3D_SM4_OP_IMUL = 0x26, + WINED3D_SM4_OP_INE = 0x27, WINED3D_SM4_OP_ISHL = 0x29, WINED3D_SM4_OP_ITOF = 0x2b, WINED3D_SM4_OP_LD = 0x2d, @@ -278,6 +279,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IMAX, WINED3DSIH_IMAX, "I", "II"}, {WINED3D_SM4_OP_IMIN, WINED3DSIH_IMIN, "I", "II"}, {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, "II", "II"}, + {WINED3D_SM4_OP_INE, WINED3DSIH_INE, "U", "II"}, {WINED3D_SM4_OP_ISHL, WINED3DSIH_ISHL, "I", "II"}, {WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, "F", "I"}, {WINED3D_SM4_OP_LD, WINED3DSIH_LD, "U", "IR"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8274a98..22dd551 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -506,6 +506,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMAX, WINED3DSIH_IMIN, WINED3DSIH_IMUL, + WINED3DSIH_INE, WINED3DSIH_ISHL, WINED3DSIH_ITOF, WINED3DSIH_LABEL,

1 0