wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Alexandre Julliard : msvcrt: Undefine __thiscall before redefining it.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: cdef3287dba7702f7c379101c769e587d3a14e4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdef3287dba7702f7c379101c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 13:48:55 2015 +0900 msvcrt: Undefine __thiscall before redefining it. --- dlls/msvcp60/cxx.h | 3 ++- dlls/msvcp90/cxx.h | 3 ++- dlls/msvcrt/cxx.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/cxx.h b/dlls/msvcp60/cxx.h index 0a1241c..e34a9e3 100644 --- a/dlls/msvcp60/cxx.h +++ b/dlls/msvcp60/cxx.h @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Copied from dlls/msvcrt/cpp.c */ +/* Copied from dlls/msvcrt/cxx.h */ +#undef __thiscall #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) __thiscall_ ## func diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index fe45bf6..12a7f84 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Copied from dlls/msvcrt/cpp.c */ +/* Copied from dlls/msvcrt/cxx.h */ +#undef __thiscall #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) __thiscall_ ## func diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index e649f03..8f31f24 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef __thiscall #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) __thiscall_ ## func

1 0

Alexandre Julliard : msvcp90: Add support for throwing bad cast exception to avoid unused variable warning.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: e1cf7f5a2ef83460fd1e8639636b2ce68349232c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1cf7f5a2ef83460fd1e86396… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 13:42:13 2015 +0900 msvcp90: Add support for throwing bad cast exception to avoid unused variable warning. --- dlls/msvcp90/cxx.h | 1 + dlls/msvcp90/exception.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index cf63ac4..fe45bf6 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -303,6 +303,7 @@ typedef enum __exception_type { EXCEPTION_RERAISE, EXCEPTION, EXCEPTION_BAD_ALLOC, + EXCEPTION_BAD_CAST, EXCEPTION_LOGIC_ERROR, EXCEPTION_LENGTH_ERROR, EXCEPTION_OUT_OF_RANGE, diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index da3a4bf..568fa5f 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -623,6 +623,11 @@ void throw_exception(exception_type et, const char *str) MSVCP_bad_alloc_ctor(&e, &addr); _CxxThrowException(&e, &bad_alloc_cxx_type); } + case EXCEPTION_BAD_CAST: { + bad_cast e; + MSVCP_bad_cast_ctor(&e, str); + _CxxThrowException(&e, &bad_cast_cxx_type); + } case EXCEPTION_LOGIC_ERROR: { logic_error e; MSVCP_logic_error_ctor(&e, &addr);

1 0

Alexandre Julliard : winebuild: Avoid assigning values outside of the target_cpu enum range.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 109738437749028bacb747984a7fe1271d895691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=109738437749028bacb747984… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 17:25:06 2015 +0900 winebuild: Avoid assigning values outside of the target_cpu enum range. --- tools/winebuild/build.h | 2 +- tools/winebuild/main.c | 7 +++++-- tools/winebuild/parser.c | 2 +- tools/winebuild/utils.c | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 41cec91..4a71eed 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -262,7 +262,7 @@ extern DLLSPEC *alloc_dll_spec(void); extern void free_dll_spec( DLLSPEC *spec ); extern const char *make_c_identifier( const char *str ); extern const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ); -extern enum target_cpu get_cpu_from_name( const char *name ); +extern int get_cpu_from_name( const char *name ); extern unsigned int get_alignment(unsigned int align); extern unsigned int get_page_size(void); extern unsigned int get_ptr_size(void); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 807cf61..d1717c0 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -199,9 +199,12 @@ static void set_target( const char *target ) if ((p = strchr( spec, '-' ))) { + int cpu; + *p++ = 0; - if ((target_cpu = get_cpu_from_name( spec )) == -1) - fatal_error( "Unrecognized CPU '%s'\n", spec ); + cpu = get_cpu_from_name( spec ); + if (cpu == -1) fatal_error( "Unrecognized CPU '%s'\n", spec ); + target_cpu = cpu; platform = p; if ((p = strrchr( p, '-' ))) platform = p + 1; } diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 0498e75..bae2b47 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -473,7 +473,7 @@ static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp ) odp->flags |= FLAG_CPU_WIN64; else { - enum target_cpu cpu = get_cpu_from_name( cpu_name ); + int cpu = get_cpu_from_name( cpu_name ); if (cpu == -1) { error( "Unknown architecture '%s'\n", cpu_name ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 566911f..b9318c3 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -869,7 +869,7 @@ const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ) } /* parse a cpu name and return the corresponding value */ -enum target_cpu get_cpu_from_name( const char *name ) +int get_cpu_from_name( const char *name ) { unsigned int i;

1 0

Alexandre Julliard : wrc: Remove duplicate parentheses.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: f15d077f936e01c7b95f55e26dffde990420d91f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f15d077f936e01c7b95f55e26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 11:40:01 2015 +0900 wrc: Remove duplicate parentheses. --- tools/wrc/translation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c index b7caa07..bdbcb43 100644 --- a/tools/wrc/translation.c +++ b/tools/wrc/translation.c @@ -611,7 +611,7 @@ static int compare_ver_block(ver_block_t *ver_block1, ver_block_t *ver_block2); static int compare_ver_value(ver_value_t *ver_value1, ver_value_t *ver_value2) { int different = 0; int i = 0; - if((ver_value1->type == ver_value2->type)) { + if (ver_value1->type == ver_value2->type) { switch(ver_value1->type) { case val_str: if(ver_value1->key && ver_value2->key)

1 0

Alexandre Julliard : include: Avoid IKsPropertySet forward type redefinition.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: ecd350c3ff214bc731f03d30ba743deaf7db82b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd350c3ff214bc731f03d30b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 11:40:12 2015 +0900 include: Avoid IKsPropertySet forward type redefinition. --- include/dsound.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dsound.h b/include/dsound.h index c7a2bd5..fa23e86 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -1138,6 +1138,7 @@ DECLARE_INTERFACE_(IDirectSound3DBuffer,IUnknown) */ #ifndef _IKsPropertySet_ #define _IKsPropertySet_ +#define __IKsPropertySet_FWD_DEFINED__ typedef struct IKsPropertySet *LPKSPROPERTYSET;

1 0

Alexandre Julliard : Revert "shell32: Also return Attributes in GetFolderDefinition."
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 39f6d04aa0d69cf417e6a9c119a13b09c603f8b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f6d04aa0d69cf417e6a9c11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 11:34:15 2015 +0900 Revert "shell32: Also return Attributes in GetFolderDefinition." This reverts commit 0becff824466b330675fabbd59241a150eebabeb. The wrong patch was committed. --- dlls/vbscript/global.c | 25 ++----------------------- dlls/vbscript/tests/api.vbs | 42 ------------------------------------------ 2 files changed, 2 insertions(+), 65 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 012383b..448b886 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1268,29 +1268,8 @@ static HRESULT Global_ChrB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_Asc(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - HRESULT hres; - BSTR bstr; - WCHAR ret; - - TRACE("(%s)\n", debugstr_variant(arg)); - - switch(V_VT(arg)) { - case VT_NULL: - return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); - case VT_EMPTY: - return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); - case VT_BSTR: - bstr = V_BSTR(arg); - default: - hres = to_string(arg, &bstr); - if(FAILED(hres)) - return hres; - } - - ret = bstr[0]; - if(ret == 0) - return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); - return return_short(res, ret); + FIXME("\n"); + return E_NOTIMPL; } /* The function supports only single-byte and double-byte character sets. It diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index a44f8e6..8c92cf5 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1324,46 +1324,4 @@ Call testRGBError(&h4d&, -2, &h2f&, 5) Call ok(getVT(Timer) = "VT_R4", "getVT(Timer) = " & getVT(Timer)) - -Sub testAscError(strings, error_num) - on error resume next - Dim x - - Call Err.clear() - x = Asc(strings) - Call ok(Err.number = error_num, "Err.number = " & Err.number) -End Sub - -Call ok(Asc(0) = 48, "Asc(0) = " & Asc(0)) -Call ok(getVT(Asc(0)) = "VT_I2", "getVT(Asc(0)) = " & getVT(Asc(0))) -Call ok(Asc(-32769) = 45, "Asc(-32769) = " & Asc(-32769)) -Call ok(getVT(Asc(-32769)) = "VT_I2", "getVT(Asc(-32769)) = " & getVT(Asc(-32769))) -Call ok(Asc(CSng(90.68)) = 57, "Asc(CSng(90.68)) = " & Asc(CSng(90.68))) -Call ok(getVT(Asc(CSng(90.68))) = "VT_I2", "getVT(Asc(CSng(90.68))) = " & getVT(Asc(CSng(90.68)))) -Call ok(Asc(123) = 49, "Asc(123) = " & Asc(123)) -Call ok(getVT(Asc(123)) = "VT_I2", "getVT(Asc(123)) = " & getVT(Asc(123))) -Call ok(Asc(CCur(234)) = 50, "Asc(CCur(234)) = " & Asc(CCur(234))) -Call ok(getVT(Asc(CCur(234))) = "VT_I2", "getVT(Asc(CCur(234))) = " & getVT(Asc(CCur(234)))) -Call ok(Asc("abc") = 97, "Asc(""abc"") = " & Asc("abc")) -Call ok(getVT(Asc("abc")) = "VT_I2", "getVT(Asc(""abc"")) = " & getVT(Asc("abc"))) -Call ok(Asc("?") = 63, "Asc(""?"") = " & Asc("?")) -Call ok(getVT(Asc("?")) = "VT_I2", "getVT(Asc(""?"")) = " & getVT(Asc("?"))) -Call ok(Asc(" space") = 32, "Asc("" space"") = " & Asc(" space")) -Call ok(getVT(Asc(" space")) = "VT_I2", "getVT(Asc("" space"")) = " & getVT(Asc(" space"))) -Call ok(Asc("@") = 64, "Asc(""@"") = " & Asc("@")) -Call ok(getVT(Asc("@")) = "VT_I2", "getVT(Asc(""@"")) = " & getVT(Asc("@"))) -Call ok(Asc("\n") = 92, "Asc(""\n"") = " & Asc("\n")) -Call ok(getVT(Asc("\n")) = "VT_I2", "getVT(Asc(""\n"")) = " & getVT(Asc("\n"))) -if isEnglishLang then - Call ok(Asc(False) = 70, "Asc(False) = " & Asc(False)) - Call ok(getVT(Asc(False)) = "VT_I2", "getVT(Asc(False)) = " & getVT(Asc(False))) - Call ok(Asc(True) = 84, "Asc(True) = " & Asc(True)) - Call ok(getVT(Asc(True)) = "VT_I2", "getVT(Asc(True)) = " & getVT(Asc(True))) -End if -Call ok(Asc(CByte(7)) = 55, "Asc(CByte(7)) = " & Asc(CByte(7))) -Call ok(getVT(Asc(CByte(7))) = "VT_I2", "getVT(Asc(CByte(7))) = " & getVT(Asc(CByte(7)))) -Call testAscError(Empty, 5) -Call testAscError(Null, 94) -Call testAscError("", 5) - Call reportSuccess()

1 0

Jacek Caban : download.inc.php: Use SourceForge auto-select for all appwiz.cpl downloads from recent Wine.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: tools Branch: master Commit: 19fb458756ee4d96a24ff7926ff28f73f8e308a3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=19fb458756ee4d96a24ff792… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 4 12:09:02 2015 +0100 download.inc.php: Use SourceForge auto-select for all appwiz.cpl downloads from recent Wine. --- download.inc.php | 15 +++++++++++++++ winegecko.php | 14 -------------- winemono.php | 4 ---- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/download.inc.php b/download.inc.php index 06e5b81..17811a6 100644 --- a/download.inc.php +++ b/download.inc.php @@ -5,6 +5,21 @@ * Copyright (c) 2006 Jonathan Ernst */ +// SourceForge can do better job at redirecting to the mirror than us. However, +// it redirects to HTML page by default for web browser user agents. New enough +// Wine set user agent to 'Wine Addon Downloader', so redirect them directly +// to SourceForge. For older Wine and other user agents, fallback to random +// known mirror. +if(strcmp($_SERVER['HTTP_USER_AGENT'], 'Wine Addon Downloader') === 0) { + header("Location: http://sourceforge.net/projects/wine/files/".$sFileName); + exit; +} + +if(!$iFileSize) { + header("HTTP/1.0 404 Not Found"); + exit; +} + // List of common locations for files $aList += array("http://freefr.dl.sourceforge.net/project/wine/", "http://heanet.dl.sourceforge.net/project/wine/", diff --git a/winegecko.php b/winegecko.php index e44b9e3..0e07406 100644 --- a/winegecko.php +++ b/winegecko.php @@ -48,16 +48,6 @@ default: // Name of the file $sFileName = sprintf('%s/%s/wine_gecko-%s.%s', $sFolder, $sVersion, $sFileSuffix, $sExt); -// SourceForge can do better job at redirecting to the mirror than us. However, -// it redirects to HTML page by default for web browser user agents. New enough -// Wine set user agent to 'Wine Addon Downloader', so redirect them directly -// to SourceForge. For older Wine and other user agents, fallback to random -// known mirror. -if(strcmp($_SERVER['HTTP_USER_AGENT'], 'Wine Addon Downloader') === 0) { - header("Location: http://sourceforge.net/projects/wine/files/".$sFileName); - exit; -} - // Size array $aFileSizes = array( '0.0.1'=>5219822, @@ -103,10 +93,6 @@ $aFileSizes = array( // Exact size of the file: $iFileSize = $aFileSizes[$sFileSuffix]; -if(!$iFileSize) { - header("HTTP/1.0 404 Not Found"); - exit; -} // List of additional locations (commonly used locations are already in download.inc.php) $aList = array(); diff --git a/winemono.php b/winemono.php index 3758d0e..a6d7583 100644 --- a/winemono.php +++ b/winemono.php @@ -36,10 +36,6 @@ $aFileSizes = array( // Exact size of the file: $iFileSize = $aFileSizes[$sFileSuffix]; -if(!$iFileSize) { - header("HTTP/1.0 404 Not Found"); - exit; -} // List of additional locations (commonly used locations are already in download.inc.php) $aList = array();

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.5.6.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 129ff974b48bc90a23f35b7a9eab4f2e3a0bd7c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129ff974b48bc90a23f35b7a9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 2 13:34:02 2015 -0600 mscoree: Update Wine Mono to 4.5.6. --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 9fbb386..f4edd02 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.5.4" -#define MONO_SHA "2b271d0bc92d5c9c45febd76fb11f9fcc29ea6d8" +#define MONO_VERSION "4.5.6" +#define MONO_SHA "12ec9a4fa5958426292effd40d9230c7acbba1e8" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index c84b25f..8b46fd5 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -675,7 +675,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.5.4"; + static const char* mono_version = "4.5.6"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Jacek Caban : vbscript: Added DISPATCH_PROPERTYPUTREF tests.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 33c5a7d14c6a52b0a2a8a325d190335f6d159c0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c5a7d14c6a52b0a2a8a325d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:41:38 2015 +0100 vbscript: Added DISPATCH_PROPERTYPUTREF tests. --- dlls/vbscript/tests/run.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index c916382..a86711a 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -83,6 +83,8 @@ DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_vbvar_d); DEFINE_EXPECT(global_vbvar_i); +DEFINE_EXPECT(global_letobj_i); +DEFINE_EXPECT(global_setobj_i); DEFINE_EXPECT(testobj_propget_d); DEFINE_EXPECT(testobj_propget_i); DEFINE_EXPECT(testobj_propput_d); @@ -117,6 +119,8 @@ DEFINE_EXPECT(EnableModeless); #define DISPID_GLOBAL_TESTARRAY 1015 #define DISPID_GLOBAL_THROWINT 1016 #define DISPID_GLOBAL_TESTOPTIONALARG 1017 +#define DISPID_GLOBAL_LETOBJ 1018 +#define DISPID_GLOBAL_SETOBJ 1019 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -133,6 +137,7 @@ static BOOL strict_dispid_check, is_english, allow_ui; static const char *test_name = "(null)"; static int test_counter; static SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_NOUIERROR; +static IDispatchEx testObj; static BSTR a2bstr(const char *str) { @@ -333,9 +338,60 @@ static void test_disp(IDispatch *disp) ok(hres == DISP_E_MEMBERNOTFOUND, "InvokeEx failed: %08x, expected DISP_E_MEMBERNOTFOUND\n", hres); ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); + SET_EXPECT(testobj_value_i); + V_VT(args) = VT_DISPATCH; + V_DISPATCH(args) = (IDispatch*)&testObj; + dp.cArgs = dp.cNamedArgs = 1; + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + CHECK_CALLED(testobj_value_i); + + dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I2, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I2(&v) == 0, "V_I2(v) = %d\n", V_I2(&v)); + + V_VT(args) = VT_DISPATCH; + V_DISPATCH(args) = (IDispatch*)&testObj; + dp.cArgs = dp.cNamedArgs = 1; + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF, &dp, NULL, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + + V_VT(args) = VT_DISPATCH; + V_DISPATCH(args) = (IDispatch*)&testObj; + dp.cArgs = dp.cNamedArgs = 1; + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + + dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == (IDispatch*)&testObj, "V_DISPATCH(v) != testObj\n"); + + V_VT(args) = VT_BOOL; + V_BOOL(args) = VARIANT_TRUE; + dp.cArgs = dp.cNamedArgs = 1; + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF, &dp, NULL, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + + dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); + + V_VT(args) = VT_BOOL; + V_BOOL(args) = VARIANT_FALSE; + dp.cArgs = dp.cNamedArgs = 1; + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, &ei, NULL); + ok(hres == DISP_E_EXCEPTION, "InvokeEx failed: %08x, expected DISP_E_EXCEPTION\n", hres); + V_VT(args) = VT_BOOL; V_BOOL(args) = VARIANT_FALSE; dp.cArgs = 1; + dp.cNamedArgs = 0; V_VT(&v) = VT_BOOL; hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, NULL); ok(hres == DISP_E_PARAMNOTOPTIONAL, "InvokeEx failed: %08x, expected DISP_E_PARAMNOTOPTIONAL\n", hres); @@ -962,6 +1018,16 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_VBVAR; return S_OK; } + if(!strcmp_wa(bstrName, "letobj")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_LETOBJ; + return S_OK; + } + if(!strcmp_wa(bstrName, "setobj")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_SETOBJ; + return S_OK; + } if(!strcmp_wa(bstrName, "isNullDisp")) { test_grfdex(grfdex, fdexNameCaseInsensitive); *pid = DISPID_GLOBAL_ISNULLDISP; @@ -1124,6 +1190,40 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(V_I2(pdp->rgvarg) == 3, "V_I2(psp->rgvargs) = %d\n", V_I2(pdp->rgvarg)); return S_OK; + case DISPID_GLOBAL_LETOBJ: + CHECK_EXPECT(global_letobj_i); + + ok(wFlags == DISPATCH_PROPERTYPUT, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(pdp->rgdispidNamedArgs != NULL, "rgdispidNamedArgs == NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_DISPATCH(pdp->rgvarg) == (IDispatch*)&testObj, "V_DISPATCH(psp->rgvargs) != testObj\n"); + return S_OK; + + case DISPID_GLOBAL_SETOBJ: + CHECK_EXPECT(global_setobj_i); + + ok(wFlags == DISPATCH_PROPERTYPUTREF, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(pdp->rgdispidNamedArgs != NULL, "rgdispidNamedArgs == NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_DISPATCH(pdp->rgvarg) == (IDispatch*)&testObj, "V_DISPATCH(psp->rgvargs) != testObj\n"); + return S_OK; + case DISPID_GLOBAL_TESTOBJ: ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); @@ -2027,6 +2127,22 @@ static void run_tests(void) CHECK_CALLED(global_vbvar_d); CHECK_CALLED(global_vbvar_i); + SET_EXPECT(global_letobj_i); + parse_script_a("Option Explicit\nletobj = testObj"); + CHECK_CALLED(global_letobj_i); + + SET_EXPECT(global_letobj_i); + parse_script_a("Option Explicit\ntest.letobj = testObj"); + CHECK_CALLED(global_letobj_i); + + SET_EXPECT(global_setobj_i); + parse_script_a("Option Explicit\nset setobj = testObj"); + CHECK_CALLED(global_setobj_i); + + SET_EXPECT(global_setobj_i); + parse_script_a("Option Explicit\nset test.setobj = testObj"); + CHECK_CALLED(global_setobj_i); + SET_EXPECT(testobj_propget_d); SET_EXPECT(testobj_propget_i); parse_script_a("dim x\nx = testObj.propget");

1 0

Jacek Caban : vbscript: Leave converting object to trivial values up to calee.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: bd42594da9b6b5fc2af94f2fc8ce40223c956450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd42594da9b6b5fc2af94f2fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:41:30 2015 +0100 vbscript: Leave converting object to trivial values up to calee. --- dlls/vbscript/interp.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 1fe7304..64f998d 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -697,6 +697,29 @@ static HRESULT interp_mcallv(exec_ctx_t *ctx) return do_mcall(ctx, NULL); } +static HRESULT assign_value(exec_ctx_t *ctx, VARIANT *dst, VARIANT *src, WORD flags) +{ + HRESULT hres; + + hres = VariantCopyInd(dst, src); + if(FAILED(hres)) + return hres; + + if(V_VT(dst) == VT_DISPATCH && !(flags & DISPATCH_PROPERTYPUTREF)) { + DISPPARAMS dp = {NULL}; + VARIANT value; + + hres = disp_call(ctx->script, V_DISPATCH(dst), DISPID_VALUE, &dp, &value); + IDispatch_Release(V_DISPATCH(dst)); + if(FAILED(hres)) + return hres; + + *dst = value; + } + + return S_OK; +} + static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, WORD flags, DISPPARAMS *dp) { ref_t ref; @@ -746,7 +769,7 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, WORD flags, DISPPARAMS * return E_NOTIMPL; } - hres = VariantCopyInd(v, dp->rgvarg); + hres = assign_value(ctx, v, dp->rgvarg, flags); break; } case REF_DISP: @@ -776,7 +799,7 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, WORD flags, DISPPARAMS * TRACE("creating variable %s\n", debugstr_w(name)); hres = add_dynamic_var(ctx, name, FALSE, &new_var); if(SUCCEEDED(hres)) - hres = VariantCopyInd(new_var, dp->rgvarg); + hres = assign_value(ctx, new_var, dp->rgvarg, flags); } } @@ -792,10 +815,6 @@ static HRESULT interp_assign_ident(exec_ctx_t *ctx) TRACE("%s\n", debugstr_w(arg)); - hres = stack_assume_val(ctx, arg_cnt); - if(FAILED(hres)) - return hres; - vbstack_to_dp(ctx, arg_cnt, TRUE, &dp); hres = assign_ident(ctx, arg, DISPATCH_PROPERTYPUT, &dp); if(FAILED(hres)) @@ -852,10 +871,6 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) return E_FAIL; } - hres = stack_assume_val(ctx, arg_cnt); - if(FAILED(hres)) - return hres; - hres = disp_get_id(obj, identifier, VBDISP_LET, FALSE, &id); if(SUCCEEDED(hres)) { vbstack_to_dp(ctx, arg_cnt, TRUE, &dp);

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
78
Older →

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 March 2015