July 2012 - Wine-commits - list.winehq.org

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: c14e98dd320efea61f5ec428a4350f3d49684111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c14e98dd320efea61f5ec428a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 4 16:14:34 2012 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 34 ++++++++-------- dlls/msvcp70/msvcp70.spec | 34 ++++++++-------- dlls/msvcp71/msvcp71.spec | 74 +++++++++++++++++----------------- dlls/msvcp80/msvcp80.spec | 90 +++++++++++++++++++++--------------------- 4 files changed, 116 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c14e98dd320efea61f5ec…

1 0

Piotr Caban : msvcp90: Pass base class pointer to virtual functions.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 36f79a1c2dfccf1c0e019a8a697bda2fefc62c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=36f79a1c2dfccf1c0e019a8a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 4 16:15:15 2012 +0200 msvcp90: Pass base class pointer to virtual functions. --- dlls/msvcp90/ios.c | 304 +++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 242 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36f79a1c2dfccf1c0e019…

1 0

Piotr Caban : msvcp90/tests: Added destructor tests for class with virtual inheritance.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 3adb3a3c283c277c04976354744c396b851fe963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3adb3a3c283c277c049763547… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 4 16:16:01 2012 +0200 msvcp90/tests: Added destructor tests for class with virtual inheritance. --- dlls/msvcp90/tests/misc.c | 45 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 7d9ef39..5faa03c 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -80,16 +80,22 @@ static char* (__thiscall *p_char_allocate)(void*, size_t); static void (__thiscall *p_char_construct)(void*, char*, const char*); static size_t (__thiscall *p_char_max_size)(void*); -void* (__thiscall *p_collate_char_ctor_refs)(void*, size_t); -int (__thiscall *p_collate_char_compare)(const void*, const char*, +static void* (__thiscall *p_collate_char_ctor_refs)(void*, size_t); +static int (__thiscall *p_collate_char_compare)(const void*, const char*, const char*, const char*, const char*); -void (__thiscall *p_collate_char_dtor)(void*); -void* (__thiscall *p_numpunct_char_ctor)(void*); -basic_string_char* (__thiscall *p_numpunct_char_falsename)(void*,basic_string_char*); -void (__thiscall *p_numpunct_char_dtor)(void*); +static void (__thiscall *p_collate_char_dtor)(void*); +static void* (__thiscall *p_numpunct_char_ctor)(void*); +static basic_string_char* (__thiscall *p_numpunct_char_falsename)(void*,basic_string_char*); +static void (__thiscall *p_numpunct_char_dtor)(void*); static void (__thiscall *p_basic_string_char_dtor)(basic_string_char*); static const char* (__thiscall *p_basic_string_char_cstr)(basic_string_char*); +static const int *basic_ostringstream_char_vbtable; +static /*basic_ostringstream_char*/void* (__thiscall *p_basic_ostringstream_char_ctor_mode)( + /*basic_ostringstream_char*/void*, int, /*MSVCP_bool*/int); +static void (__thiscall *p_basic_ostringstream_char_dtor)(/*basic_ostringstream_char*/void*); +static void (__thiscall *p_basic_ostringstream_char_vbase_dtor)(/*basic_ostringstream_char*/void*); + static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, const wchar_t *function, const wchar_t *file, @@ -179,6 +185,7 @@ static BOOL init(void) SET(p_wctype, "wctype"); SET(p__Getctype, "_Getctype"); SET(p__Getcoll, "_Getcoll"); + SET(basic_ostringstream_char_vbtable, "??_8?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@7B@"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAEADAEBD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAEA_WAEB_W(a)Z"); @@ -207,6 +214,13 @@ static BOOL init(void) "??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ"); SET(p_basic_string_char_cstr, "?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAPEBDXZ"); + + SET(p_basic_ostringstream_char_ctor_mode, + "??0?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)H@Z"); + SET(p_basic_ostringstream_char_dtor, + "??1?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@UEAA(a)XZ"); + SET(p_basic_ostringstream_char_vbase_dtor, + "??_D?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXXZ"); } else { SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); @@ -235,6 +249,13 @@ static BOOL init(void) "??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ"); SET(p_basic_string_char_cstr, "?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ"); + + SET(p_basic_ostringstream_char_ctor_mode, + "??0?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)H@Z"); + SET(p_basic_ostringstream_char_dtor, + "??1?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@UAE(a)XZ"); + SET(p_basic_ostringstream_char_vbase_dtor, + "??_D?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXXZ"); } init_thiscall_thunk(); @@ -464,6 +485,17 @@ static void test_virtual_call(void) call_func1(p_numpunct_char_dtor, this); } +static void test_virtual_base_dtors(void) +{ + char this[512]; + + call_func3(p_basic_ostringstream_char_ctor_mode, this, 0, 1); + call_func1(p_basic_ostringstream_char_vbase_dtor, this); + + call_func3(p_basic_ostringstream_char_ctor_mode, this, 0, 0); + call_func1(p_basic_ostringstream_char_dtor, this+basic_ostringstream_char_vbtable[1]); +} + START_TEST(misc) { if(!init()) @@ -476,6 +508,7 @@ START_TEST(misc) test__Getctype(); test__Getcoll(); test_virtual_call(); + test_virtual_base_dtors(); test_allocator_char();

1 0

Piotr Caban : msvcp90: Fix EOF handling in basic_filebuf<char>::underflow.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 0d3dcd23f4028fa77cb6c5e5a8dca9bde60c6647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d3dcd23f4028fa77cb6c5e5a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 4 18:15:55 2012 +0200 msvcp90: Fix EOF handling in basic_filebuf<char>::underflow. --- dlls/msvcp90/ios.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 8550c6e..9501c8a 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2513,7 +2513,7 @@ int __thiscall basic_filebuf_char_underflow(basic_filebuf_char *this) return *basic_streambuf_char_gptr(&this->base); ret = call_basic_filebuf_char_uflow(this); - if(ret) + if(ret != EOF) ret = call_basic_filebuf_char_pbackfail(this, ret); return ret; }

1 0

Piotr Caban : msvcp90: Fix off by one issues in basic_string functions operating on iterators.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 4c73236d8631dfc2a3f60f27697ff317fd93d73d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c73236d8631dfc2a3f60f276… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 5 11:51:06 2012 +0200 msvcp90: Fix off by one issues in basic_string functions operating on iterators. --- dlls/msvcp90/string.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index f4811cd..d8bc6f3 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -841,7 +841,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_assign_iter, 20) basic_string_char* __thiscall MSVCP_basic_string_char_assign_iter(basic_string_char *this, String_iterator_char beg, String_iterator_char end) { - return MSVCP_basic_string_char_assign_ptr_ptr(this, beg.pos, end.pos+1); + return MSVCP_basic_string_char_assign_ptr_ptr(this, beg.pos, end.pos); } /* ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAEXIID(a)Z */ @@ -1060,7 +1060,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor_iter, 20) basic_string_char* __thiscall MSVCP_basic_string_char_ctor_iter(basic_string_char *this, String_iterator_char beg, String_iterator_char end) { - return MSVCP_basic_string_char_ctor_cstr_len(this, beg.pos, end.pos-beg.pos+1); + return MSVCP_basic_string_char_ctor_cstr_len(this, beg.pos, end.pos-beg.pos); } /* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ @@ -1224,7 +1224,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_iter, 20) basic_string_char* __thiscall MSVCP_basic_string_char_append_iter( basic_string_char *this, String_iterator_char beg, String_iterator_char end) { - return MSVCP_basic_string_char_append_cstr_len(this, beg.pos, end.pos-beg.pos+1); + return MSVCP_basic_string_char_append_cstr_len(this, beg.pos, end.pos-beg.pos); } /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ID@Z */ @@ -2680,7 +2680,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_assign_iter, 20) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_iter(basic_string_wchar *this, String_iterator_wchar beg, String_iterator_wchar end) { - return MSVCP_basic_string_wchar_assign_ptr_ptr(this, beg.pos, end.pos+1); + return MSVCP_basic_string_wchar_assign_ptr_ptr(this, beg.pos, end.pos); } /* ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAEXII_W(a)Z */ @@ -2939,7 +2939,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_ctor_iter, 20) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_iter(basic_string_wchar *this, String_iterator_wchar beg, String_iterator_wchar end) { - return MSVCP_basic_string_wchar_ctor_cstr_len(this, beg.pos, end.pos-beg.pos+1); + return MSVCP_basic_string_wchar_ctor_cstr_len(this, beg.pos, end.pos-beg.pos); } /* ??1?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ */ @@ -3133,7 +3133,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_iter, 20) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_iter( basic_string_wchar *this, String_iterator_wchar beg, String_iterator_wchar end) { - return MSVCP_basic_string_wchar_append_cstr_len(this, beg.pos, end.pos-beg.pos+1); + return MSVCP_basic_string_wchar_append_cstr_len(this, beg.pos, end.pos-beg.pos); } /* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)I_W@Z */

1 0

Piotr Caban : msvcp90: Fix parsing of floating point numbers starting with decimal separator.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 9b34a3a75c9d96e42a202a63b3a693a345c3f8d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b34a3a75c9d96e42a202a63b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 5 17:35:01 2012 +0200 msvcp90: Fix parsing of floating point numbers starting with decimal separator. --- dlls/msvcp90/locale.c | 34 ++++++++++++++++++++++++++-------- 1 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 8e3778f..9927dc5 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4441,7 +4441,7 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator char *dest_beg = dest, *num_end = dest+25, *exp_end = dest+31, *groups = NULL; wchar_t sep, digits[11], *digits_pos; const char *grouping; - BOOL error = TRUE, dest_empty = TRUE; + BOOL error = FALSE, got_digit = FALSE, dest_empty = TRUE; TRACE("(%p %p %p %p)\n", dest, first, last, loc); @@ -4485,7 +4485,7 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator break; } }else { - error = FALSE; + got_digit = TRUE; if(dest_empty && first->val == digits[0]) continue; dest_empty = FALSE; @@ -4532,8 +4532,10 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator istreambuf_iterator_wchar_inc(first); if(dest_empty) { - for(; first->strbuf && first->val==digits[0]; istreambuf_iterator_wchar_inc(first)) + for(; first->strbuf && first->val==digits[0]; istreambuf_iterator_wchar_inc(first)) { + got_digit = TRUE; exp--; + } if(!first->strbuf || !wcschr(digits, first->val)) dest--; @@ -4543,8 +4545,15 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator for(; first->strbuf; istreambuf_iterator_wchar_inc(first)) { if(!(digits_pos = wcschr(digits, first->val))) break; - else if(dest<num_end) + else if(dest<num_end) { + got_digit = TRUE; *dest++ = '0'+digits_pos-digits; + } + } + + if(!got_digit) { + *dest_beg = '\0'; + return 0; } if(first->strbuf && (first->val==mb_to_wc('e', &this->cvt) || first->val==mb_to_wc('E', &this->cvt))) { @@ -5541,7 +5550,7 @@ int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_it int groups_no = 0, cur_group = 0, exp = 0; char *dest_beg = dest, *num_end = dest+25, *exp_end = dest+31, *groups = NULL, sep; const char *grouping; - BOOL error = TRUE, dest_empty = TRUE; + BOOL error = FALSE, got_digit = FALSE, dest_empty = TRUE; TRACE("(%p %p %p %p)\n", dest, first, last, loc); @@ -5578,7 +5587,7 @@ int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_it break; } }else { - error = FALSE; + got_digit = TRUE; if(dest_empty && first->val == '0') continue; dest_empty = FALSE; @@ -5625,8 +5634,10 @@ int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_it istreambuf_iterator_char_inc(first); if(dest_empty) { - for(; first->strbuf && first->val=='0'; istreambuf_iterator_char_inc(first)) + for(; first->strbuf && first->val=='0'; istreambuf_iterator_char_inc(first)) { + got_digit = TRUE; exp--; + } if(!first->strbuf || first->val<'1' || first->val>'9') dest--; @@ -5636,8 +5647,15 @@ int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_it for(; first->strbuf; istreambuf_iterator_char_inc(first)) { if(first->val<'0' || first->val>'9') break; - else if(dest<num_end) + else if(dest<num_end) { + got_digit = TRUE; *dest++ = first->val; + } + } + + if(!got_digit) { + *dest_beg = '\0'; + return 0; } if(first->strbuf && (first->val=='e' || first->val=='E')) {

1 0

Hans Leidekker : fusion: Also copy external files in IAssemblyCache:: InstallAssembly.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 45473a65a0a1fe2e61809d80f6d09bb96f923126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45473a65a0a1fe2e61809d80f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 6 15:51:00 2012 +0200 fusion: Also copy external files in IAssemblyCache::InstallAssembly. --- dlls/fusion/asmcache.c | 79 +++++++++++++++++++++++++++++++++++++++------ dlls/fusion/assembly.c | 53 +++++++++++++++++++++++++++++- dlls/fusion/fusionpriv.h | 1 + 3 files changed, 120 insertions(+), 13 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index 1cba6f6..485a56c 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -370,6 +370,32 @@ static HRESULT WINAPI IAssemblyCacheImpl_CreateAssemblyScavenger(IAssemblyCache return E_NOTIMPL; } +static HRESULT copy_file( const WCHAR *src_dir, DWORD src_len, const WCHAR *dst_dir, DWORD dst_len, + const WCHAR *filename ) +{ + WCHAR *src_file, *dst_file; + DWORD len = strlenW( filename ); + HRESULT hr = S_OK; + + if (!(src_file = HeapAlloc( GetProcessHeap(), 0, (src_len + len + 1) * sizeof(WCHAR) ))) + return E_OUTOFMEMORY; + memcpy( src_file, src_dir, src_len * sizeof(WCHAR) ); + strcpyW( src_file + src_len, filename ); + + if (!(dst_file = HeapAlloc( GetProcessHeap(), 0, (dst_len + len + 1) * sizeof(WCHAR) ))) + { + HeapFree( GetProcessHeap(), 0, src_file ); + return E_OUTOFMEMORY; + } + memcpy( dst_file, dst_dir, dst_len * sizeof(WCHAR) ); + strcpyW( dst_file + dst_len, filename ); + + if (!CopyFileW( src_file, dst_file, FALSE )) hr = HRESULT_FROM_WIN32( GetLastError() ); + HeapFree( GetProcessHeap(), 0, src_file ); + HeapFree( GetProcessHeap(), 0, dst_file ); + return hr; +} + static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, DWORD dwFlags, LPCWSTR pszManifestFilePath, @@ -383,11 +409,12 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, static const WCHAR ext_dll[] = {'.','d','l','l',0}; IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); ASSEMBLY *assembly; - WCHAR *filename, *ext; + const WCHAR *extension, *filename, *src_dir; WCHAR *name = NULL, *token = NULL, *version = NULL, *asmpath = NULL; - WCHAR path[MAX_PATH], asmdir[MAX_PATH]; + WCHAR asmdir[MAX_PATH], *p, **external_files = NULL, *dst_dir = NULL; PEKIND architecture; char *clr_version; + DWORD i, count = 0, src_len, dst_len = sizeof(format_v40)/sizeof(format_v40[0]); HRESULT hr; TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, @@ -396,10 +423,10 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, if (!pszManifestFilePath || !*pszManifestFilePath) return E_INVALIDARG; - if (!(ext = strrchrW(pszManifestFilePath, '.'))) + if (!(extension = strrchrW(pszManifestFilePath, '.'))) return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); - if (lstrcmpiW(ext, ext_exe) && lstrcmpiW(ext, ext_dll)) + if (lstrcmpiW(extension, ext_exe) && lstrcmpiW(extension, ext_dll)) return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); if (GetFileAttributesW(pszManifestFilePath) == INVALID_FILE_ATTRIBUTES) @@ -428,33 +455,63 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, if (FAILED(hr)) goto done; + hr = assembly_get_external_files(assembly, &external_files, &count); + if (FAILED(hr)) + goto done; + cache_lock( cache ); architecture = assembly_get_architecture(assembly); get_assembly_directory(asmdir, MAX_PATH, clr_version, architecture); + dst_len += strlenW(asmdir) + strlenW(name) + strlenW(version) + strlenW(token); + if (!(dst_dir = HeapAlloc(GetProcessHeap(), 0, dst_len * sizeof(WCHAR)))) + { + hr = E_OUTOFMEMORY; + goto done; + } if (!strcmp(clr_version, "v4.0.30319")) - sprintfW(path, format_v40, asmdir, name, version, token); + dst_len = sprintfW(dst_dir, format_v40, asmdir, name, version, token); else - sprintfW(path, format, asmdir, name, version, token); + dst_len = sprintfW(dst_dir, format, asmdir, name, version, token); - create_full_path(path); + create_full_path(dst_dir); hr = assembly_get_path(assembly, &asmpath); if (FAILED(hr)) goto done; - filename = PathFindFileNameW(asmpath); + if ((p = strrchrW(asmpath, '\\'))) + { + filename = p + 1; + src_dir = asmpath; + src_len = filename - asmpath; + } + else + { + filename = asmpath; + src_dir = NULL; + src_len = 0; + } + hr = copy_file(src_dir, src_len, dst_dir, dst_len, filename); + if (FAILED(hr)) + goto done; - strcatW(path, filename); - if (!CopyFileW(asmpath, path, FALSE)) - hr = HRESULT_FROM_WIN32(GetLastError()); + for (i = 0; i < count; i++) + { + hr = copy_file(src_dir, src_len, dst_dir, dst_len, external_files[i]); + if (FAILED(hr)) + break; + } done: HeapFree(GetProcessHeap(), 0, name); HeapFree(GetProcessHeap(), 0, token); HeapFree(GetProcessHeap(), 0, version); HeapFree(GetProcessHeap(), 0, asmpath); + HeapFree(GetProcessHeap(), 0, dst_dir); + for (i = 0; i < count; i++) HeapFree(GetProcessHeap(), 0, external_files[i]); + HeapFree(GetProcessHeap(), 0, external_files); assembly_release(assembly); cache_unlock( cache ); return hr; diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index b655df1..d04ba73 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -761,9 +761,9 @@ HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name) ptr += FIELD_OFFSET(ASSEMBLYTABLE, PublicKey) + assembly->blobsz; if (assembly->stringsz == sizeof(DWORD)) - stridx = *((DWORD *)ptr); + stridx = *(DWORD *)ptr; else - stridx = *((WORD *)ptr); + stridx = *(WORD *)ptr; *name = assembly_dup_str(assembly, stridx); if (!*name) @@ -912,3 +912,52 @@ HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) *version = assembly->metadatahdr->Version; return S_OK; } + +HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *count) +{ + LONG offset; + INT i, num_rows; + WCHAR **ret; + BYTE *ptr; + DWORD idx; + + *count = 0; + + offset = assembly->tables[TableFromToken(mdtFile)].offset; + if (offset == -1) + return S_OK; + + ptr = assembly_data_offset(assembly, offset); + if (!ptr) + return S_OK; + + num_rows = assembly->tables[TableFromToken(mdtFile)].rows; + if (num_rows <= 0) + return S_OK; + + ret = HeapAlloc(GetProcessHeap(), 0, num_rows * sizeof(WCHAR *)); + if (!ret) + return E_OUTOFMEMORY; + + for (i = 0; i < num_rows; i++) + { + ptr += sizeof(DWORD); /* skip Flags field */ + if (assembly->stringsz == sizeof(DWORD)) + idx = *(DWORD *)ptr; + else + idx = *(WORD *)ptr; + + ret[i] = assembly_dup_str(assembly, idx); + if (!ret[i]) + { + for (; i >= 0; i--) HeapFree(GetProcessHeap(), 0, ret[i]); + HeapFree(GetProcessHeap(), 0, ret); + return E_OUTOFMEMORY; + } + ptr += assembly->stringsz; /* skip Name field */ + ptr += assembly->blobsz; /* skip Hash field */ + } + *count = num_rows; + *files = ret; + return S_OK; +} diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index 3d538e3..95b1282 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -436,6 +436,7 @@ HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) DECLSPEC_HIDDE PEKIND assembly_get_architecture(ASSEMBLY *assembly) DECLSPEC_HIDDEN; HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) DECLSPEC_HIDDEN; HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN; +HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) DECLSPEC_HIDDEN; extern HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len) DECLSPEC_HIDDEN;

1 0

Jacek Caban : vbscript: Better representation of statement context.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: b675164be4cc4f12761b9cd6b8ed953933c9388d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b675164be4cc4f12761b9cd6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 3 19:17:07 2012 +0200 vbscript: Better representation of statement context. --- dlls/vbscript/compile.c | 132 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 90 insertions(+), 42 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index ab76bc7..e93b257 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -27,6 +27,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); WINE_DECLARE_DEBUG_CHANNEL(vbscript_disas); +typedef struct _statement_ctx_t { + unsigned stack_use; + + unsigned while_end_label; + unsigned for_end_label; + + struct _statement_ctx_t *next; +} statement_ctx_t; + typedef struct { parser_ctx_t parser; @@ -34,12 +43,12 @@ typedef struct { unsigned instr_size; vbscode_t *code; + statement_ctx_t *stat_ctx; + unsigned *labels; unsigned labels_size; unsigned labels_cnt; - unsigned while_end_label; - unsigned for_end_label; unsigned sub_end_label; unsigned func_end_label; unsigned prop_end_label; @@ -58,7 +67,7 @@ typedef struct { } compile_ctx_t; static HRESULT compile_expression(compile_ctx_t*,expression_t*); -static HRESULT compile_statement(compile_ctx_t*,statement_t*); +static HRESULT compile_statement(compile_ctx_t*,statement_ctx_t*,statement_t*); static const struct { const char *op_str; @@ -524,7 +533,7 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) if(!cnd_jmp) return E_OUTOFMEMORY; - hres = compile_statement(ctx, stat->if_stat); + hres = compile_statement(ctx, NULL, stat->if_stat); if(FAILED(hres)) return hres; @@ -549,7 +558,7 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) if(!cnd_jmp) return E_OUTOFMEMORY; - hres = compile_statement(ctx, elseif_decl->stat); + hres = compile_statement(ctx, NULL, elseif_decl->stat); if(FAILED(hres)) return hres; @@ -561,7 +570,7 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) instr_ptr(ctx, cnd_jmp)->arg1.uint = ctx->instr_cnt; if(stat->else_stat) { - hres = compile_statement(ctx, stat->else_stat); + hres = compile_statement(ctx, NULL, stat->else_stat); if(FAILED(hres)) return hres; } @@ -573,7 +582,8 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *stat) { - unsigned start_addr, prev_label; + statement_ctx_t stat_ctx = {0}, *loop_ctx; + unsigned start_addr; unsigned jmp_end; HRESULT hres; @@ -587,11 +597,15 @@ static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *st if(!jmp_end) return E_OUTOFMEMORY; - prev_label = ctx->while_end_label; - if(stat->stat.type != STAT_WHILE && !(ctx->while_end_label = alloc_label(ctx))) - return E_OUTOFMEMORY; + if(stat->stat.type == STAT_WHILE) { + loop_ctx = NULL; + }else { + if(!(stat_ctx.while_end_label = alloc_label(ctx))) + return E_OUTOFMEMORY; + loop_ctx = &stat_ctx; + } - hres = compile_statement(ctx, stat->body); + hres = compile_statement(ctx, loop_ctx, stat->body); if(FAILED(hres)) return hres; @@ -601,26 +615,24 @@ static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *st instr_ptr(ctx, jmp_end)->arg1.uint = ctx->instr_cnt; - if(stat->stat.type != STAT_WHILE) { - label_set_addr(ctx, ctx->while_end_label); - ctx->while_end_label = prev_label; - } + if(loop_ctx) + label_set_addr(ctx, stat_ctx.while_end_label); return S_OK; } static HRESULT compile_dowhile_statement(compile_ctx_t *ctx, while_statement_t *stat) { - unsigned start_addr, prev_label; + statement_ctx_t loop_ctx = {0}; + unsigned start_addr; HRESULT hres; start_addr = ctx->instr_cnt; - prev_label = ctx->while_end_label; - if(!(ctx->while_end_label = alloc_label(ctx))) + if(!(loop_ctx.while_end_label = alloc_label(ctx))) return E_OUTOFMEMORY; - hres = compile_statement(ctx, stat->body); + hres = compile_statement(ctx, &loop_ctx, stat->body); if(FAILED(hres)) return hres; @@ -632,8 +644,7 @@ static HRESULT compile_dowhile_statement(compile_ctx_t *ctx, while_statement_t * if(FAILED(hres)) return hres; - label_set_addr(ctx, ctx->while_end_label); - ctx->while_end_label = prev_label; + label_set_addr(ctx, loop_ctx.while_end_label); return S_OK; } @@ -657,7 +668,7 @@ static HRESULT compile_foreach_statement(compile_ctx_t *ctx, foreach_statement_t if(FAILED(hres)) return hres; - hres = compile_statement(ctx, stat->body); + hres = compile_statement(ctx, NULL, stat->body); if(FAILED(hres)) return hres; @@ -671,7 +682,8 @@ static HRESULT compile_foreach_statement(compile_ctx_t *ctx, foreach_statement_t static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *stat) { - unsigned step_instr, instr, prev_label; + statement_ctx_t loop_ctx = {0}; + unsigned step_instr, instr; BSTR identifier; HRESULT hres; @@ -708,18 +720,17 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st return hres; } - prev_label = ctx->for_end_label; - ctx->for_end_label = alloc_label(ctx); - if(!ctx->for_end_label) + loop_ctx.for_end_label = alloc_label(ctx); + if(!loop_ctx.for_end_label) return E_OUTOFMEMORY; step_instr = push_instr(ctx, OP_step); if(!step_instr) return E_OUTOFMEMORY; instr_ptr(ctx, step_instr)->arg2.bstr = identifier; - instr_ptr(ctx, step_instr)->arg1.uint = ctx->for_end_label; + instr_ptr(ctx, step_instr)->arg1.uint = loop_ctx.for_end_label; - hres = compile_statement(ctx, stat->body); + hres = compile_statement(ctx, &loop_ctx, stat->body); if(FAILED(hres)) return hres; @@ -732,8 +743,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st if(FAILED(hres)) return hres; - label_set_addr(ctx, ctx->for_end_label); - ctx->for_end_label = prev_label; + label_set_addr(ctx, loop_ctx.for_end_label); return push_instr_uint(ctx, OP_pop, 2); } @@ -883,22 +893,54 @@ static HRESULT compile_function_statement(compile_ctx_t *ctx, function_statement static HRESULT compile_exitdo_statement(compile_ctx_t *ctx) { - if(!ctx->while_end_label) { + statement_ctx_t *iter; + unsigned pop_cnt = 0; + + for(iter = ctx->stat_ctx; iter; iter = iter->next) { + pop_cnt += iter->stack_use; + if(iter->while_end_label) + break; + } + if(!iter) { FIXME("Exit Do outside Do Loop\n"); return E_FAIL; } - return push_instr_addr(ctx, OP_jmp, ctx->while_end_label); + if(pop_cnt) { + HRESULT hres; + + hres = push_instr_uint(ctx, OP_pop, pop_cnt); + if(FAILED(hres)) + return hres; + } + + return push_instr_addr(ctx, OP_jmp, iter->while_end_label); } static HRESULT compile_exitfor_statement(compile_ctx_t *ctx) { - if(!ctx->for_end_label) { - FIXME("Exit For outside For Loop\n"); + statement_ctx_t *iter; + unsigned pop_cnt = 0; + + for(iter = ctx->stat_ctx; iter; iter = iter->next) { + pop_cnt += iter->stack_use; + if(iter->for_end_label) + break; + } + if(!iter) { + FIXME("Exit For outside For loop\n"); return E_FAIL; } - return push_instr_addr(ctx, OP_jmp, ctx->for_end_label); + if(pop_cnt) { + HRESULT hres; + + hres = push_instr_uint(ctx, OP_pop, pop_cnt); + if(FAILED(hres)) + return hres; + } + + return push_instr_addr(ctx, OP_jmp, iter->for_end_label); } static HRESULT compile_exitsub_statement(compile_ctx_t *ctx) @@ -936,10 +978,15 @@ static HRESULT compile_onerror_statement(compile_ctx_t *ctx, onerror_statement_t return push_instr_int(ctx, OP_errmode, stat->resume_next); } -static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) +static HRESULT compile_statement(compile_ctx_t *ctx, statement_ctx_t *stat_ctx, statement_t *stat) { HRESULT hres; + if(stat_ctx) { + stat_ctx->next = ctx->stat_ctx; + ctx->stat_ctx = stat_ctx; + } + while(stat) { switch(stat->type) { case STAT_ASSIGN: @@ -1009,6 +1056,11 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) stat = stat->next; } + if(stat_ctx) { + assert(ctx->stat_ctx == stat_ctx); + ctx->stat_ctx = stat_ctx->next; + } + return S_OK; } @@ -1033,8 +1085,6 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f func->code_off = ctx->instr_cnt; - ctx->while_end_label = 0; - ctx->for_end_label = 0; ctx->sub_end_label = 0; ctx->func_end_label = 0; ctx->prop_end_label = 0; @@ -1065,14 +1115,11 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f ctx->func = func; ctx->dim_decls = NULL; ctx->const_decls = NULL; - hres = compile_statement(ctx, stat); + hres = compile_statement(ctx, NULL, stat); ctx->func = NULL; if(FAILED(hres)) return hres; - assert(!ctx->while_end_label); - assert(!ctx->for_end_label); - if(ctx->sub_end_label) label_set_addr(ctx, ctx->sub_end_label); if(ctx->func_end_label) @@ -1500,6 +1547,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) ctx.classes = NULL; ctx.labels = NULL; ctx.global_consts = NULL; + ctx.stat_ctx = NULL; ctx.labels_cnt = ctx.labels_size = 0; hres = compile_func(&ctx, ctx.parser.stats, &ctx.code->global_code);

1 0

Jacek Caban : vbscript: Fixed 'exit do' statements crossing for in loops.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: 8de35a45143c48d80b522441558f1a1b2fdaa174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de35a45143c48d80b5224415… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 3 19:17:23 2012 +0200 vbscript: Fixed 'exit do' statements crossing for in loops. --- dlls/vbscript/compile.c | 9 ++++++--- dlls/vbscript/interp.c | 6 ++++-- dlls/vbscript/tests/lang.vbs | 6 ++++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index e93b257..68e0a70 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -682,7 +682,7 @@ static HRESULT compile_foreach_statement(compile_ctx_t *ctx, foreach_statement_t static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *stat) { - statement_ctx_t loop_ctx = {0}; + statement_ctx_t loop_ctx = {2}; unsigned step_instr, instr; BSTR identifier; HRESULT hres; @@ -743,9 +743,12 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st if(FAILED(hres)) return hres; - label_set_addr(ctx, loop_ctx.for_end_label); + hres = push_instr_uint(ctx, OP_pop, 2); + if(FAILED(hres)) + return hres; - return push_instr_uint(ctx, OP_pop, 2); + label_set_addr(ctx, loop_ctx.for_end_label); + return S_OK; } static HRESULT compile_assignment(compile_ctx_t *ctx, member_expression_t *member_expr, expression_t *value_expr, BOOL is_set) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 9a8f97e..3a6fb38 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -894,10 +894,12 @@ static HRESULT interp_step(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - if(hres == VARCMP_EQ || hres == (gteq_zero ? VARCMP_LT : VARCMP_GT)) + if(hres == VARCMP_EQ || hres == (gteq_zero ? VARCMP_LT : VARCMP_GT)) { ctx->instr++; - else + }else { + stack_popn(ctx, 2); instr_jmp(ctx, ctx->instr->arg1.uint); + } return S_OK; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 1636de1..f203e83 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -415,6 +415,12 @@ for x = 1 to 100 Call ok(false, "exit for not escaped the loop?") next +do while true + for x = 1 to 100 + exit do + next +loop + Call collectionObj.reset() y = 0 x = 10

1 0

Jacek Caban : vbscript: Fixed function return crossing for loop.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: f8deed7c2fd5912ad819259ba76fc3f23f920017 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8deed7c2fd5912ad819259ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 3 19:17:47 2012 +0200 vbscript: Fixed function return crossing for loop. --- dlls/vbscript/compile.c | 25 ++++++++++++++++++++++--- dlls/vbscript/tests/lang.vbs | 18 ++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 68e0a70..de29777 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -946,6 +946,25 @@ static HRESULT compile_exitfor_statement(compile_ctx_t *ctx) return push_instr_addr(ctx, OP_jmp, iter->for_end_label); } +static HRESULT exit_label(compile_ctx_t *ctx, unsigned jmp_label) +{ + statement_ctx_t *iter; + unsigned pop_cnt = 0; + + for(iter = ctx->stat_ctx; iter; iter = iter->next) + pop_cnt += iter->stack_use; + + if(pop_cnt) { + HRESULT hres; + + hres = push_instr_uint(ctx, OP_pop, pop_cnt); + if(FAILED(hres)) + return hres; + } + + return push_instr_addr(ctx, OP_jmp, jmp_label); +} + static HRESULT compile_exitsub_statement(compile_ctx_t *ctx) { if(!ctx->sub_end_label) { @@ -953,7 +972,7 @@ static HRESULT compile_exitsub_statement(compile_ctx_t *ctx) return E_FAIL; } - return push_instr_addr(ctx, OP_jmp, ctx->sub_end_label); + return exit_label(ctx, ctx->sub_end_label); } static HRESULT compile_exitfunc_statement(compile_ctx_t *ctx) @@ -963,7 +982,7 @@ static HRESULT compile_exitfunc_statement(compile_ctx_t *ctx) return E_FAIL; } - return push_instr_addr(ctx, OP_jmp, ctx->func_end_label); + return exit_label(ctx, ctx->func_end_label); } static HRESULT compile_exitprop_statement(compile_ctx_t *ctx) @@ -973,7 +992,7 @@ static HRESULT compile_exitprop_statement(compile_ctx_t *ctx) return E_FAIL; } - return push_instr_addr(ctx, OP_jmp, ctx->prop_end_label); + return exit_label(ctx, ctx->prop_end_label); } static HRESULT compile_onerror_statement(compile_ctx_t *ctx, onerror_statement_t *stat) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index f203e83..c03fa8f 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -489,6 +489,13 @@ End Sub Call TestSubExit(true) +Sub TestSubExit2 + for x = 1 to 100 + Exit Sub + next +End Sub +Call TestSubExit2 + TestSubMultiArgs 1, 2, 3, 4, 5 Call TestSubMultiArgs(1, 2, 3, 4, 5) @@ -584,6 +591,17 @@ End Function Call TestFuncExit(true) +Function TestFuncExit2(ByRef a) + For x = 1 to 100 + For y = 1 to 100 + Exit Function + Next + Next + Call ok(false, "Exit Function not called?") +End Function + +Call TestFuncExit2(true) + Sub SubParseTest End Sub : x = false Call SubParseTest

1 0