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

Nikolay Sivov : scrrun: Return float type size when signed I4 limit exceeded.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: f82cb7003338f4614582d429fc68cc1a2ad87bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f82cb7003338f4614582d429f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 20 15:17:24 2014 +0400 scrrun: Return float type size when signed I4 limit exceeded. --- dlls/scrrun/filesystem.c | 2 +- dlls/scrrun/tests/filesystem.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 9412491..6473210 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -892,7 +892,7 @@ static HRESULT variant_from_largeint(const ULARGE_INTEGER *src, VARIANT *v) { HRESULT hr = S_OK; - if (src->HighPart) + if (src->HighPart || src->LowPart > INT_MAX) { V_VT(v) = VT_R8; hr = VarR8FromUI8(src->QuadPart, &V_R8(v)); diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 61cadb9..c06b43d 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -20,6 +20,7 @@ #define COBJMACROS #include <stdio.h> +#include <limits.h> #include "windows.h" #include "ole2.h" @@ -1296,7 +1297,7 @@ static void test_DriveCollection(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); if (V_VT(&size) == VT_R8) - ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + ok(V_R8(&size) > (double)INT_MAX, "got %f\n", V_R8(&size)); else ok(V_I4(&size) > 0, "got %d\n", V_I4(&size));

1 0

Piotr Caban : msvcp100: Export basic_istream::gcount function.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 48c9a90a81b44a7c158b2857488eea9870332cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c9a90a81b44a7c158b28574… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 20 10:46:51 2014 +0200 msvcp100: Export basic_istream::gcount function. --- dlls/msvcp100/msvcp100.spec | 6 +++--- dlls/msvcp110/msvcp110.spec | 12 ++++++------ dlls/msvcp90/ios.c | 10 ++++++++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 1dcbded..ab0b1d0 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1736,11 +1736,11 @@ @ cdecl -arch=win64 ?gbump@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEAAXH(a)Z(ptr long) basic_streambuf_wchar_gbump @ thiscall -arch=win32 ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXH(a)Z(ptr long) basic_streambuf_wchar_gbump @ cdecl -arch=win64 ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXH(a)Z(ptr long) basic_streambuf_wchar_gbump -@ stub -arch=win32 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ +@ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ(ptr) basic_istream_char_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEBA_JXZ(ptr) basic_istream_char_gcount -@ stub -arch=win32 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ +@ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount -@ stub -arch=win32 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ +@ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount @ stub -arch=win32 ?generic_category(a)std@@YAABVerror_category(a)1@XZ @ stub -arch=win64 ?generic_category(a)std@@YAAEBVerror_category(a)1@XZ diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 0527936..40f5577 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -2433,14 +2433,14 @@ @ cdecl -arch=arm ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAAXH(a)Z(ptr long) basic_streambuf_wchar_gbump @ thiscall -arch=i386 ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXH(a)Z(ptr long) basic_streambuf_wchar_gbump @ cdecl -arch=win64 ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXH(a)Z(ptr long) basic_streambuf_wchar_gbump -@ stub -arch=arm ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBA_JXZ -@ stub -arch=i386 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ +@ cdecl -ret64 -arch=arm ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBA_JXZ(ptr) basic_istream_char_gcount +@ thiscall -ret64 -arch=i386 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ(ptr) basic_istream_char_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEBA_JXZ(ptr) basic_istream_char_gcount -@ stub -arch=arm ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBA_JXZ -@ stub -arch=i386 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ +@ cdecl -ret64 -arch=arm ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBA_JXZ(ptr) basic_istream_wchar_gcount +@ thiscall -ret64 -arch=i386 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount -@ stub -arch=arm ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBA_JXZ -@ stub -arch=i386 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ +@ cdecl -ret64 -arch=arm ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBA_JXZ(ptr) basic_istream_wchar_gcount +@ thiscall -ret64 -arch=i386 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=arm ?get@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV12(a)AAD@Z(ptr ptr) basic_istream_char_get_ch @ thiscall -arch=i386 ?get@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)AAD@Z(ptr ptr) basic_istream_char_get_ch diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index e8d4b06..d8f1e1c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -7785,8 +7785,10 @@ static void basic_istream_char_sentry_destroy(basic_istream_char *istr) /* ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBEHXZ */ /* ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEBA_JXZ */ +/* ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBA_JXZ */ +/* ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ */ DEFINE_THISCALL_WRAPPER(basic_istream_char_gcount, 4) -int __thiscall basic_istream_char_gcount(const basic_istream_char *this) +streamsize __thiscall basic_istream_char_gcount(const basic_istream_char *this) { TRACE("(%p)\n", this); return this->count; @@ -9066,8 +9068,12 @@ static void basic_istream_wchar_sentry_destroy(basic_istream_wchar *istr) /* ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEBA_JXZ */ /* ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBEHXZ */ /* ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEBA_JXZ */ +/* ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBA_JXZ */ +/* ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ */ +/* ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBA_JXZ */ +/* ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ */ DEFINE_THISCALL_WRAPPER(basic_istream_wchar_gcount, 4) -int __thiscall basic_istream_wchar_gcount(const basic_istream_wchar *this) +streamsize __thiscall basic_istream_wchar_gcount(const basic_istream_wchar *this) { TRACE("(%p)\n", this); return this->count;

1 0

Marcus Meissner : jsproxy: Avoid potential NULL dereference (Coverity).
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 0dda8a14db8d83505670f1375966d35ed3c05ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dda8a14db8d83505670f1375… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue May 20 08:47:38 2014 +0200 jsproxy: Avoid potential NULL dereference (Coverity). --- dlls/jsproxy/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index 4d02b07..0399173 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -103,8 +103,11 @@ static inline WCHAR *strdupAW( const char *src, DWORD len ) if (src) { int dst_len = MultiByteToWideChar( CP_ACP, 0, src, len, NULL, 0 ); - if ((dst = heap_alloc( (dst_len + 1) * sizeof(WCHAR) ))) len = MultiByteToWideChar( CP_ACP, 0, src, len, dst, dst_len ); - dst[dst_len] = 0; + if ((dst = heap_alloc( (dst_len + 1) * sizeof(WCHAR) ))) + { + len = MultiByteToWideChar( CP_ACP, 0, src, len, dst, dst_len ); + dst[dst_len] = 0; + } } return dst; }

1 0

Henri Verbeet : wined3d: Recognize the SM4 dp2 opcode.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 3555eab8b9d18059ce0cb37b2595460164b4c1f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3555eab8b9d18059ce0cb37b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 20 07:38:46 2014 +0200 wined3d: Recognize the SM4 dp2 opcode. --- 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 195c3ae..ecbaec6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5191,6 +5191,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DEFB */ shader_hw_nop, /* WINED3DSIH_DEFI */ shader_hw_nop, /* WINED3DSIH_DIV */ NULL, + /* WINED3DSIH_DP2 */ NULL, /* WINED3DSIH_DP2ADD */ pshader_hw_dp2add, /* WINED3DSIH_DP3 */ shader_hw_map2gl, /* WINED3DSIH_DP4 */ shader_hw_map2gl, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bce0097..84b638e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6650,6 +6650,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DEFB */ shader_glsl_nop, /* WINED3DSIH_DEFI */ shader_glsl_nop, /* WINED3DSIH_DIV */ shader_glsl_binop, + /* WINED3DSIH_DP2 */ shader_glsl_dot, /* WINED3DSIH_DP2ADD */ shader_glsl_dp2add, /* WINED3DSIH_DP3 */ shader_glsl_dot, /* WINED3DSIH_DP4 */ shader_glsl_dot, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a9b3d9f..05e7168 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -62,6 +62,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DEFB */ "defb", /* WINED3DSIH_DEFI */ "defi", /* WINED3DSIH_DIV */ "div", + /* WINED3DSIH_DP2 */ "dp2", /* WINED3DSIH_DP2ADD */ "dp2add", /* WINED3DSIH_DP3 */ "dp3", /* WINED3DSIH_DP4 */ "dp4", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b001aad..f01463b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -80,6 +80,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DERIV_RTY = 0x0c, WINED3D_SM4_OP_DISCARD = 0x0d, WINED3D_SM4_OP_DIV = 0x0e, + WINED3D_SM4_OP_DP2 = 0x0f, WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP4 = 0x11, WINED3D_SM4_OP_EMIT = 0x13, @@ -215,6 +216,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DERIV_RTY, WINED3DSIH_DSY, "F", "F"}, {WINED3D_SM4_OP_DISCARD, WINED3DSIH_TEXKILL, "", "U"}, {WINED3D_SM4_OP_DIV, WINED3DSIH_DIV, "F", "FF"}, + {WINED3D_SM4_OP_DP2, WINED3DSIH_DP2, "F", "FF"}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, "F", "FF"}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, "F", "FF"}, {WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, "", ""}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9233148..6e6534f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -446,6 +446,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DEFB, WINED3DSIH_DEFI, WINED3DSIH_DIV, + WINED3DSIH_DP2, WINED3DSIH_DP2ADD, WINED3DSIH_DP3, WINED3DSIH_DP4,

1 0

Andrew Eikum : riched20/tests: Allow conversions to non-English codepages.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 704d1695f3d0b14e8eee9a5f786dfce55589ecb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704d1695f3d0b14e8eee9a5f7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 20 14:09:45 2014 -0500 riched20/tests: Allow conversions to non-English codepages. --- dlls/riched20/tests/editor.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 309de7a..e14d7f6 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5071,7 +5071,7 @@ static void test_EM_STREAMIN(void) DWORD phase; LRESULT result; EDITSTREAM es; - char buffer[1024] = {0}; + char buffer[1024] = {0}, tmp[16]; const char * streamText0 = "{\\rtf1 TestSomeText}"; const char * streamText0a = "{\\rtf1 TestSomeText\\par}"; @@ -5100,6 +5100,9 @@ static void test_EM_STREAMIN(void) "This text just needs to be long enough to cause run to be split onto " "two separate lines and make sure the null terminating character is " "handled properly.\0"; + + const WCHAR UTF8Split_exp[4] = {0xd6, 0xcf, 0xcb, 0}; + int length4 = strlen(streamText4) + 1; struct StringWithLength cookieForStream4 = { length4, @@ -5217,10 +5220,12 @@ static void test_EM_STREAMIN(void) result = SendMessageA(hwndRichEdit, EM_STREAMIN, SF_TEXT, (LPARAM)&es); ok(result == 8, "got %ld\n", result); + WideCharToMultiByte(CP_ACP, 0, UTF8Split_exp, -1, tmp, sizeof(tmp), NULL, NULL); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); ok(result == 3, "EM_STREAMIN: Test UTF8Split returned %ld\n", result); - result = memcmp (buffer,"\xd6\xcf\xcb", 3); + result = memcmp (buffer, tmp, 3); ok(result == 0, "EM_STREAMIN: Test UTF8Split set wrong text: Result: %s\n",buffer); ok(es.dwError == 0, "EM_STREAMIN: Test UTF8Split set error %d, expected %d\n", es.dwError, 0);

1 0

Henri Verbeet : wined3d: Recognize the SM4 ishl opcode.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 7b8aa8606cd4af99dbeae57584febf8559efb6a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8aa8606cd4af99dbeae5758… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 20 07:38:47 2014 +0200 wined3d: Recognize the SM4 ishl opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ecbaec6..5d23eed 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5215,6 +5215,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IFC */ shader_hw_ifc, /* WINED3DSIH_IGE */ NULL, /* WINED3DSIH_IMUL */ NULL, + /* WINED3DSIH_ISHL */ NULL, /* WINED3DSIH_ITOF */ NULL, /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LD */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 84b638e..e5eb685 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2335,6 +2335,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_AND: op = "&"; break; case WINED3DSIH_DIV: op = "/"; break; case WINED3DSIH_IADD: op = "+"; break; + case WINED3DSIH_ISHL: op = "<<"; break; case WINED3DSIH_MUL: op = "*"; break; case WINED3DSIH_SUB: op = "-"; break; case WINED3DSIH_USHR: op = ">>"; break; @@ -6674,6 +6675,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, /* WINED3DSIH_IMUL */ shader_glsl_imul, + /* WINED3DSIH_ISHL */ shader_glsl_binop, /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 05e7168..06ed09a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -86,6 +86,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IFC */ "ifc", /* WINED3DSIH_IGE */ "ige", /* WINED3DSIH_IMUL */ "imul", + /* WINED3DSIH_ISHL */ "ishl", /* WINED3DSIH_ITOF */ "itof", /* WINED3DSIH_LABEL */ "label", /* WINED3DSIH_LD */ "ld", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f01463b..f10969b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -96,6 +96,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IEQ = 0x20, WINED3D_SM4_OP_IGE = 0x21, WINED3D_SM4_OP_IMUL = 0x26, + WINED3D_SM4_OP_ISHL = 0x29, WINED3D_SM4_OP_ITOF = 0x2b, WINED3D_SM4_OP_LD = 0x2d, WINED3D_SM4_OP_LOG = 0x2f, @@ -232,6 +233,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IEQ, WINED3DSIH_IEQ, "U", "II"}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, "U", "II"}, {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, "II", "II"}, + {WINED3D_SM4_OP_ISHL, WINED3DSIH_ISHL, "I", "II"}, {WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, "F", "I"}, {WINED3D_SM4_OP_LD, WINED3DSIH_LD, "U", "FR"}, {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, "F", "F"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6e6534f..b3cb884 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -470,6 +470,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IFC, WINED3DSIH_IGE, WINED3DSIH_IMUL, + WINED3DSIH_ISHL, WINED3DSIH_ITOF, WINED3DSIH_LABEL, WINED3DSIH_LD,

1 0

Jacek Caban : ieframe: Added InternetExplore::get_HWND implementation.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 92841b3195276a12a320fa0b3dd854401cbef943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92841b3195276a12a320fa0b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 20 18:30:57 2014 +0200 ieframe: Added InternetExplore::get_HWND implementation. --- dlls/ieframe/ie.c | 7 +++++-- dlls/ieframe/tests/ie.c | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index 454eb0f..5eb1d26 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -358,8 +358,11 @@ static HRESULT WINAPI InternetExplorer_get_Name(IWebBrowser2 *iface, BSTR *Name) static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, pHWND); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pHWND); + + *pHWND = (SHANDLE_PTR)This->frame_hwnd; + return S_OK; } static HRESULT WINAPI InternetExplorer_get_FullName(IWebBrowser2 *iface, BSTR *FullName) diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index daf47f7..9ddd25c 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -205,6 +205,22 @@ static void test_html_window(IWebBrowser2 *wb) IHTMLWindow2_Release(html_window); } +static void test_window(IWebBrowser2 *wb) +{ + SHANDLE_PTR handle = 0; + HWND hwnd = NULL; + char buf[100]; + HRESULT hres; + + hres = IWebBrowser2_get_HWND(wb, &handle); + ok(hres == S_OK, "get_HWND faile: %08x\n", hres); + ok(handle, "handle == 0\n"); + + hwnd = (HWND)handle; + GetClassNameA(hwnd, buf, sizeof(buf)); + ok(!strcmp(buf, "IEFrame"), "Unexpected class name %s\n", buf); +} + static void test_navigate(IWebBrowser2 *wb, const char *url) { VARIANT urlv, emptyv; @@ -249,6 +265,7 @@ static void test_InternetExplorer(void) test_visible(wb); test_html_window(wb); + test_window(wb); test_navigate(wb, "http://test.winehq.org/tests/hello.html"); advise_cp(unk, FALSE);

1 0

Shuai Meng : vbscript: Implemented CCur.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 14f68a988bda797917f778a748ee8920531b734a URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f68a988bda797917f778a74… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Tue May 20 09:05:07 2014 +0800 vbscript: Implemented CCur. --- dlls/vbscript/global.c | 21 +++++++++++++++++-- dlls/vbscript/tests/api.vbs | 47 +++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/run.c | 2 ++ 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 7c44661..f8c875d 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -375,8 +375,25 @@ static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, VARIANT *res) static HRESULT Global_CCur(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_CY); + if(FAILED(hres)) + return hres; + + if(!res) { + VariantClear(&v); + return DISP_E_BADVARTYPE; + } + + *res = v; + return S_OK; } static HRESULT Global_CInt(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index d7af8e9..46c80d4 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -587,4 +587,51 @@ MyObject.myval = 0 Call ok(CByte(MyObject) = 0, "CByte(MyObject) = " & CByte(MyObject)) Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) +Sub testCCurError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CCur(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CCur(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CCur(Empty) = 0, "CCur(Empty) = " & CCur(Empty)) +Call ok(getVT(CCur(Empty)) = "VT_CY", "getVT(CCur(Empty)) = " & getVT(CCur(Empty))) +Call ok(CCur(-32768) = -32768, "CCur(-32768) = " & CCur(-32768)) +Call ok(getVT(CCur(-32768)) = "VT_CY", "getVT(CCur(-32768)) = " & getVT(CCur(-32768))) +Call ok(CCur(32768) = 32768, "CCur(32768) = " & CCur(32768)) +Call ok(getVT(CCur(32768)) = "VT_CY", "getVT(CCur(32768)) = " & getVT(CCur(32768))) +Call ok(CCur(0.000149) = 0.0001, "CCur(0.000149) = " & CCur(0.000149)) +Call ok(getVT(CCur(0.000149)) = "VT_CY", "getVT(CCur(0.000149)) = " & getVT(CCur(0.000149))) +Call ok(CCur(2147483647.99) = 2147483647.99, "CCur(2147483647.99) = " & CCur(2147483647.99)) +Call ok(getVT(CCur(2147483647.99)) = "VT_CY", "getVT(CCur(2147483647.99)) = " & getVT(CCur(2147483647.99))) +Call ok(CCur("-1") = -1, "CCur(""-1"") = " & CCur("-1")) +Call ok(getVT(CCur("-1")) = "VT_CY", "getVT(CCur(""-1"")) = " & getVT(CCur("-1"))) +If isEnglishLang Then + Call ok(CCur("-0.5") = -0.5, "CCur(""-0.5"") = " & CCur("-0.5")) + Call ok(getVT(CCur("-0.5")) = "VT_CY", "getVT(CCur(""-0.5"")) = " & getVT(CCur("-0.5"))) +End If +Call testCCurError("", 13, 13) +Call testCCurError("-1", 0, 458) +Call testCCurError("TRUE", 13, 13) +Call testCCurError("FALSE", 13, 13) +Call testCCurError("#TRue#", 13, 13) +Call testCCurError("#fAlSE#", 13, 13) +Call testCCurError(1, 0, 458) +Call ok(CCur(True) = -1, "CCur(True) = " & CCur(True)) +Call ok(getVT(CCur(True)) = "VT_CY", "getVT(CCur(True)) = " & getVT(CCur(True))) +Call ok(CCur(False) = 0, "CCur(False) = " & CCur(False)) +Call ok(getVT(CCur(False)) = "VT_CY", "getVT(CCur(False)) = " & getVT(CCur(False))) +MyObject.myval = 0.1 +Call ok(CCur(MyObject) = 0.1, "CCur(MyObject) = " & CCur(MyObject)) +Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) +MyObject.myval = 0 +Call ok(CCur(MyObject) = 0, "CCur(MyObject) = " & CCur(MyObject)) +Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) + Call reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9620398..0188c12 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -169,6 +169,8 @@ static const char *vt2a(VARIANT *v) return "VT_I4"; case VT_R8: return "VT_R8"; + case VT_CY: + return "VT_CY"; case VT_DATE: return "VT_DATE"; case VT_BSTR:

1 0

Henri Verbeet : d2d1: Implement d2d_factory_CreateDxgiSurfaceRenderTarget( ).
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 53d1bbf04186763d00cde8db65efa1f284b8c8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d1bbf04186763d00cde8db6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 20 07:38:44 2014 +0200 d2d1: Implement d2d_factory_CreateDxgiSurfaceRenderTarget(). --- dlls/d2d1/Makefile.in | 3 +- dlls/d2d1/d2d1_private.h | 36 +++ dlls/d2d1/factory.c | 18 +- dlls/d2d1/render_target.c | 533 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 584 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53d1bbf04186763d00cde…

1 0

Bruno Jesus : ws2_32: Avoid memory allocation for simple receives.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 1184fe90b2ba89c40a54ed93b8b991ab13796b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1184fe90b2ba89c40a54ed93b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon May 19 18:16:39 2014 -0300 ws2_32: Avoid memory allocation for simple receives. --- dlls/ws2_32/socket.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 04c715e..e31f396 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6531,8 +6531,8 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPWSABUF lpControlBuffer ) { unsigned int i, options; - int n, fd, err; - struct ws2_async *wsa; + int n, fd, err, overlapped; + struct ws2_async *wsa, localwsa; BOOL is_blocking; DWORD timeout_start = GetTickCount(); ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; @@ -6547,11 +6547,18 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (fd == -1) return SOCKET_ERROR; - if (!(wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(struct ws2_async, iovec[dwBufferCount]) ))) + overlapped = (lpOverlapped || lpCompletionRoutine) && + !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); + if (overlapped || dwBufferCount > 1) { - err = WSAEFAULT; - goto error; + if (!(wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(struct ws2_async, iovec[dwBufferCount]) ))) + { + err = WSAEFAULT; + goto error; + } } + else + wsa = &localwsa; wsa->hSocket = SOCKET2HANDLE(s); wsa->flags = *lpFlags; @@ -6588,8 +6595,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } else if (lpNumberOfBytesRecvd) *lpNumberOfBytesRecvd = n; - if ((lpOverlapped || lpCompletionRoutine) && - !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) + if (overlapped) { IO_STATUS_BLOCK *iosb = lpOverlapped ? (IO_STATUS_BLOCK *)lpOverlapped : &wsa->local_iosb; @@ -6673,14 +6679,14 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } TRACE(" -> %i bytes\n", n); - HeapFree( GetProcessHeap(), 0, wsa ); + if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0); return 0; error: - HeapFree( GetProcessHeap(), 0, wsa ); + if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); WARN(" -> ERROR %d\n", err); WSASetLastError( err );

1 0