November 2011 - Wine-Commits

Frédéric Delanoy : winefile: Avoid uninitialized field in SYSTEMTIME structure (Coverity).
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: f38e0be5ea11784410c6e0781c72b194fc95fd14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f38e0be5ea11784410c6e0781… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 25 14:55:40 2011 +0100 winefile: Avoid uninitialized field in SYSTEMTIME structure (Coverity). --- programs/winefile/winefile.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 7876da5..63ce463 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -526,6 +526,7 @@ static BOOL time_to_filetime(const time_t* t, FILETIME* ftime) stime.wHour = tm->tm_hour; stime.wMinute = tm->tm_min; stime.wSecond = tm->tm_sec; + stime.wMilliseconds = 0; return SystemTimeToFileTime(&stime, ftime); }

1 0

Jacek Caban : urlmon: Make canonicalize_path_hierarchical Uri object and parse_data struct independent .
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 29cdb357508eeca115cd5d815ea031657677b2bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=29cdb357508eeca115cd5d815… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 15:58:22 2011 +0100 urlmon: Make canonicalize_path_hierarchical Uri object and parse_data struct independent. --- dlls/urlmon/uri.c | 120 +++++++++++++++++++++++++---------------------------- 1 files changed, 57 insertions(+), 63 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 22fe3fe..c0233bf 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -2828,60 +2828,56 @@ static BOOL canonicalize_authority(const parse_data *data, Uri *uri, DWORD flags * file:///c:/test%20test -> file:///c:/test%20test * file:///c:/test%test -> file:///c:/test%25test */ -static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, - DWORD flags, BOOL computeOnly) { +static DWORD canonicalize_path_hierarchical(const WCHAR *path, DWORD path_len, URL_SCHEME scheme_type, BOOL has_host, DWORD flags, + WCHAR *ret_path) { + const BOOL known_scheme = scheme_type != URL_SCHEME_UNKNOWN; + const BOOL is_file = scheme_type == URL_SCHEME_FILE; + const BOOL is_res = scheme_type == URL_SCHEME_RES; const WCHAR *ptr; - const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; - const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; - const BOOL is_res = data->scheme_type == URL_SCHEME_RES; - BOOL escape_pct = FALSE; + DWORD len = 0; - if(!data->path) { - uri->path_start = -1; - uri->path_len = 0; - return TRUE; - } + if(!path) + return 0; - uri->path_start = uri->canon_len; - ptr = data->path; + ptr = path; - if(is_file && uri->host_start == -1) { + if(is_file && !has_host) { /* Check if a '/' needs to be appended for the file scheme. */ - if(data->path_len > 1 && is_drive_path(ptr) && !(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { - if(!computeOnly) - uri->canon_uri[uri->canon_len] = '/'; - uri->canon_len++; + if(path_len > 1 && is_drive_path(ptr) && !(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { + if(ret_path) + ret_path[len] = '/'; + len++; escape_pct = TRUE; } else if(*ptr == '/') { if(!(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* Copy the extra '/' over. */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = '/'; - ++uri->canon_len; + if(ret_path) + ret_path[len] = '/'; + len++; } ++ptr; } if(is_drive_path(ptr)) { - if(!computeOnly) { - uri->canon_uri[uri->canon_len] = *ptr; + if(ret_path) { + ret_path[len] = *ptr; /* If there's a '|' after the drive letter, convert it to a ':'. */ - uri->canon_uri[uri->canon_len+1] = ':'; + ret_path[len+1] = ':'; } ptr += 2; - uri->canon_len += 2; + len += 2; } } - if(!is_file && *(data->path) && *(data->path) != '/') { + if(!is_file && *path && *path != '/') { /* Prepend a '/' to the path if it doesn't have one. */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = '/'; - ++uri->canon_len; + if(ret_path) + ret_path[len] = '/'; + len++; } - for(; ptr < data->path+data->path_len; ++ptr) { + for(; ptr < path+path_len; ++ptr) { BOOL do_default_action = TRUE; if(*ptr == '%' && !is_res) { @@ -2894,76 +2890,69 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, if(force_encode || escape_pct) { /* Escape the percent sign in the file URI. */ - if(!computeOnly) - pct_encode_val(*ptr, uri->canon_uri+uri->canon_len); - uri->canon_len += 3; + if(ret_path) + pct_encode_val(*ptr, ret_path+len); + len += 3; do_default_action = FALSE; } else if((is_unreserved(val) && known_scheme) || (is_file && (is_unreserved(val) || is_reserved(val) || (val && flags&Uri_CREATE_FILE_USE_DOS_PATH && !is_forbidden_dos_path_char(val))))) { - if(!computeOnly) - uri->canon_uri[uri->canon_len] = val; - ++uri->canon_len; + if(ret_path) + ret_path[len] = val; + len++; ptr += 2; continue; } } else if(*ptr == '/' && is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* Convert the '/' back to a '\\'. */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = '\\'; - ++uri->canon_len; + if(ret_path) + ret_path[len] = '\\'; + len++; do_default_action = FALSE; } else if(*ptr == '\\' && known_scheme) { if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH))) { /* Convert '\\' into a '/'. */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = '/'; - ++uri->canon_len; + if(ret_path) + ret_path[len] = '/'; + len++; do_default_action = FALSE; } } else if(known_scheme && !is_res && !is_unreserved(*ptr) && !is_reserved(*ptr) && (!(flags & Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS) || is_file)) { if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH))) { /* Escape the forbidden character. */ - if(!computeOnly) - pct_encode_val(*ptr, uri->canon_uri+uri->canon_len); - uri->canon_len += 3; + if(ret_path) + pct_encode_val(*ptr, ret_path+len); + len += 3; do_default_action = FALSE; } } if(do_default_action) { - if(!computeOnly) - uri->canon_uri[uri->canon_len] = *ptr; - ++uri->canon_len; + if(ret_path) + ret_path[len] = *ptr; + len++; } } - uri->path_len = uri->canon_len - uri->path_start; - /* Removing the dot segments only happens when it's not in * computeOnly mode and it's not a wildcard scheme. File schemes * with USE_DOS_PATH set don't get dot segments removed. */ if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) && - data->scheme_type != URL_SCHEME_WILDCARD) { - if(!(flags & Uri_CREATE_NO_CANONICALIZE) && !computeOnly) { + scheme_type != URL_SCHEME_WILDCARD) { + if(!(flags & Uri_CREATE_NO_CANONICALIZE) && ret_path) { /* Remove the dot segments (if any) and reset everything to the new * correct length. */ - DWORD new_len = remove_dot_segments(uri->canon_uri+uri->path_start, uri->path_len); - uri->canon_len -= uri->path_len-new_len; - uri->path_len = new_len; + len = remove_dot_segments(ret_path, len); } } - if(!computeOnly) - TRACE("Canonicalized path %s len=%d\n", - debugstr_wn(uri->canon_uri+uri->path_start, uri->path_len), - uri->path_len); - - return TRUE; + if(ret_path) + TRACE("Canonicalized path %s len=%d\n", debugstr_wn(ret_path, len), len); + return len; } /* Attempts to canonicalize the path for an opaque URI. @@ -3121,8 +3110,13 @@ static BOOL canonicalize_hierpart(const parse_data *data, Uri *uri, DWORD flags, if(!canonicalize_path_opaque(data, uri, flags, computeOnly)) return FALSE; } else { - if(!canonicalize_path_hierarchical(data, uri, flags, computeOnly)) - return FALSE; + if(!computeOnly) + uri->path_start = uri->canon_len; + uri->path_len = canonicalize_path_hierarchical(data->path, data->path_len, data->scheme_type, data->host_len != 0, + flags, computeOnly ? NULL : uri->canon_uri+uri->canon_len); + uri->canon_len += uri->path_len; + if(!computeOnly && !uri->path_len) + uri->path_start = -1; } } else { /* Opaque URI's don't have an authority. */

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 420e2e99f8b1007e69df4fbd049d67b8ab332990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=420e2e99f8b1007e69df4fbd0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 24 22:09:55 2011 +0100 po: Update German translation. --- po/de.po | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/po/de.po b/po/de.po index e9e2ce1..61f1ef6 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-11-21 20:10+0100\n" +"PO-Revision-Date: 2011-11-24 22:08+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -9376,7 +9376,6 @@ msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" #: notepad.rc:99 -#, fuzzy msgid "" "%1\n" "This file contains Unicode characters which will be lost if\n" @@ -9385,9 +9384,9 @@ msgid "" "one of the Unicode options in the Encoding drop down list.\n" "Continue?" msgstr "" -"%s\n" +"%1\n" "Diese Datei enthält Unicode-Zeichen, die verloren gehen, wenn\n" -"Sie die Datei mit %s-Zeichenkodierung speichern.\n" +"Sie die Datei mit %2-Zeichenkodierung speichern.\n" "Um die Zeichen beizubehalten, klicken Sie Abbrechen und wählen\n" "Sie eine der Unicode-Optionen in der Liste.\n" "Möchten Sie fortfahren?" @@ -11202,9 +11201,8 @@ msgid "Processes: %d" msgstr "Prozesse: %d" #: taskmgr.rc:267 -#, fuzzy msgid "Mem Usage: %1!u!kB / %2!u!kB" -msgstr "Speicherauslastung: %dK / %dK" +msgstr "Speicherauslastung: %1!u!kB / %2!u!kB" #: taskmgr.rc:272 msgid "Image Name"

1 0

Jacek Caban : urlmon: Added file URIs compare tests.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: d4d51a489ea123cc7d726a8708aff735147cf09e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d51a489ea123cc7d726a870… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 15:59:00 2011 +0100 urlmon: Added file URIs compare tests. --- dlls/urlmon/tests/uri.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index c8fb522..ad63ccf 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -280,6 +280,31 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, + { "file://c:\\tests\\../tests/foo%20bar.mp3", Uri_CREATE_NO_CANONICALIZE, S_OK, FALSE, + { + {"file:///c:/tests/../tests/foo%2520bar.mp3",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file:///c:/tests/../tests/foo%2520bar.mp3",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".mp3",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"/c:/tests/../tests/foo%2520bar.mp3",S_OK,FALSE}, + {"/c:/tests/../tests/foo%2520bar.mp3",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file://c:\\tests\\../tests/foo%20bar.mp3",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, { "FILE://localhost/test dir\\../tests/test%20file.README.txt", 0, S_OK, FALSE, { {"file:///tests/test%20file.README.txt",S_OK,FALSE}, @@ -4501,6 +4526,41 @@ static const uri_equality equality_tests[] = { "http://google.com:70/",0, "http://google.com:71/",0, FALSE + }, + { + "file:///c:/dir/file.txt", 0, + "file:///c:/dir/file.txt", Uri_CREATE_FILE_USE_DOS_PATH, + TRUE + }, + { + "file:///c:/dir/file.txt", 0, + "file:///c:\\dir\\file.txt", Uri_CREATE_NO_CANONICALIZE, + TRUE + }, + { + "file:///c:/dir/file.txt", 0, + "file:///c:\\dir2\\..\\dir\\file.txt", Uri_CREATE_NO_CANONICALIZE, + TRUE + }, + { + "file:///c:\\dir2\\..\\ dir\\file.txt", Uri_CREATE_NO_CANONICALIZE, + "file:///c:/%20dir/file.txt", 0, + TRUE + }, + { + "file:///c:/Dir/file.txt", 0, + "file:///C:/dir/file.TXT", Uri_CREATE_FILE_USE_DOS_PATH, + TRUE + }, + { + "file:///c:/dir/file.txt", 0, + "file:///c:\\dir\\file.txt", Uri_CREATE_FILE_USE_DOS_PATH, + TRUE + }, + { + "file:///c:/dir/file.txt#a", 0, + "file:///c:\\dir\\file.txt#b", Uri_CREATE_FILE_USE_DOS_PATH, + FALSE } };

1 0

Piotr Caban : msvcp90: Added locale::name implementation.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: e10dcd0c328d7ed26e6d38f25bb87f9603938ccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10dcd0c328d7ed26e6d38f25… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 25 10:46:06 2011 +0100 msvcp90: Added locale::name implementation. --- dlls/msvcp90/locale.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f985136..29069e7 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -647,9 +647,8 @@ const locale* __cdecl locale_classic(void) DEFINE_THISCALL_WRAPPER_RETPTR(locale_name, 4) basic_string_char __thiscall locale_name(const locale *this) { - basic_string_char ret = { 0 }; /* FIXME */ - FIXME( "(%p) stub\n", this); - return ret; + TRACE( "(%p)\n", this); + return this->ptr->name; } /* ??0_Timevec(a)std@@QAE(a)ABV01@@Z */

1 0

Piotr Caban : msvcp90: Added runtime_exception implementation.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 400c887e857e86f3155c293a2d0293479b527c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=400c887e857e86f3155c293a2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 25 10:46:48 2011 +0100 msvcp90: Added runtime_exception implementation. --- dlls/msvcp90/exception.c | 136 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcp90/msvcp90.h | 3 +- 2 files changed, 134 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 77e1e60..0008f43 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -77,6 +77,7 @@ extern const vtable_ptr MSVCP_logic_error_vtable; extern const vtable_ptr MSVCP_length_error_vtable; extern const vtable_ptr MSVCP_out_of_range_vtable; extern const vtable_ptr MSVCP_invalid_argument_vtable; +extern const vtable_ptr MSVCP_runtime_error_vtable; /* exception class data */ static type_info exception_type_info = { @@ -677,6 +678,131 @@ static const cxx_exception_type invalid_argument_cxx_type = { &invalid_argument_cxx_type_table }; +/* runtime_error class data */ +typedef struct { + exception e; + basic_string_char str; +} runtime_error; + +DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_ctor, 8) +runtime_error* __thiscall MSVCP_runtime_error_ctor( + runtime_error *this, const char **name) +{ + TRACE("%p %s\n", this, *name); + this->e.vtable = &MSVCP_runtime_error_vtable; + this->e.name = NULL; + this->e.do_free = FALSE; + MSVCP_basic_string_char_ctor_cstr(&this->str, *name); + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_copy_ctor, 8) +runtime_error* __thiscall MSVCP_runtime_error_copy_ctor( + runtime_error *this, runtime_error *rhs) +{ + TRACE("%p %p\n", this, rhs); + MSVCP_exception_copy_ctor(&this->e, &rhs->e); + MSVCP_basic_string_char_copy_ctor(&this->str, &rhs->str); + this->e.vtable = &MSVCP_runtime_error_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_dtor, 4) +void __thiscall MSVCP_runtime_error_dtor(runtime_error *this) +{ + TRACE("%p\n", this); + MSVCP_exception_dtor(&this->e); + MSVCP_basic_string_char_dtor(&this->str); +} + +DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_vector_dtor, 8) +void* __thiscall MSVCP_runtime_error_vector_dtor( + runtime_error *this, unsigned int flags) +{ + TRACE("%p %x\n", this, flags); + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + int i, *ptr = (int *)this-1; + + for(i=*ptr-1; i>=0; i--) + MSVCP_runtime_error_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + MSVCP_runtime_error_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + +static const type_info runtime_error_type_info = { + &MSVCP_runtime_error_vtable, + NULL, + ".?AVruntime_error(a)std@@" +}; + +static const rtti_base_descriptor runtime_error_rtti_base_descriptor = { + &runtime_error_type_info, + 1, + { 0, -1, 0 }, + 64 +}; + +static const rtti_base_array runtime_error_rtti_base_array = { + { + &runtime_error_rtti_base_descriptor, + &exception_rtti_base_descriptor, + NULL + } +}; + +static const rtti_object_hierarchy runtime_error_type_hierarchy = { + 0, + 0, + 2, + &runtime_error_rtti_base_array +}; + +const rtti_object_locator runtime_error_rtti = { + 0, + 0, + 0, + &runtime_error_type_info, + &runtime_error_type_hierarchy +}; + +static const cxx_type_info runtime_error_cxx_type_info = { + 0, + &runtime_error_type_info, + { 0, -1, 0 }, + sizeof(runtime_error), + (cxx_copy_ctor)THISCALL(MSVCP_runtime_error_copy_ctor) +}; + +static const cxx_type_info_table runtime_error_cxx_type_table = { + 2, + { + &runtime_error_cxx_type_info, + &exception_cxx_type_info, + NULL + } +}; + +static const cxx_exception_type runtime_error_cxx_type = { + 0, + (cxx_copy_ctor)THISCALL(MSVCP_runtime_error_dtor), + NULL, + &runtime_error_cxx_type_table +}; + +DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_what, 4) +const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) +{ + TRACE("%p\n", this); + return MSVCP_basic_string_char_c_str(&this->str); +} + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif @@ -685,6 +811,7 @@ void __asm_dummy_vtables(void) { __ASM_EXCEPTION_VTABLE(length_error, MSVCP_logic_error_what); __ASM_EXCEPTION_VTABLE(out_of_range, MSVCP_logic_error_what); __ASM_EXCEPTION_VTABLE(invalid_argument, MSVCP_logic_error_what); + __ASM_EXCEPTION_VTABLE(runtime_error, MSVCP_runtime_error_what); #ifndef __GNUC__ } #endif @@ -699,25 +826,21 @@ void throw_exception(exception_type et, const char *str) exception e; MSVCP_exception_ctor(&e, &addr); _CxxThrowException(&e, &exception_cxx_type); - return; } case EXCEPTION_BAD_ALLOC: { bad_alloc e; MSVCP_bad_alloc_ctor(&e, &addr); _CxxThrowException(&e, &bad_alloc_cxx_type); - return; } case EXCEPTION_LOGIC_ERROR: { logic_error e; MSVCP_logic_error_ctor(&e, &addr); _CxxThrowException((exception*)&e, &logic_error_cxx_type); - return; } case EXCEPTION_LENGTH_ERROR: { length_error e; MSVCP_length_error_ctor(&e, &addr); _CxxThrowException((exception*)&e, &length_error_cxx_type); - return; } case EXCEPTION_OUT_OF_RANGE: { out_of_range e; @@ -729,5 +852,10 @@ void throw_exception(exception_type et, const char *str) MSVCP_invalid_argument_ctor(&e, &addr); _CxxThrowException((exception*)&e, &invalid_argument_cxx_type); } + case EXCEPTION_RUNTIME_ERROR: { + runtime_error e; + MSVCP_runtime_error_ctor(&e, &addr); + _CxxThrowException((exception*)&e, &runtime_error_cxx_type); + } } } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index cb2a9b8..72e5d11 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -104,7 +104,8 @@ typedef enum __exception_type { EXCEPTION_LOGIC_ERROR, EXCEPTION_LENGTH_ERROR, EXCEPTION_OUT_OF_RANGE, - EXCEPTION_INVALID_ARGUMENT + EXCEPTION_INVALID_ARGUMENT, + EXCEPTION_RUNTIME_ERROR } exception_type; void throw_exception(exception_type, const char *); void set_exception_vtable(void);

1 0

Jacek Caban : jscript: Fixed memory leaks.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 172fa4fa99873bb1a98e658c3cdba950044f0eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=172fa4fa99873bb1a98e658c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 12:05:31 2011 +0100 jscript: Fixed memory leaks. Spotted by Piotr. --- dlls/jscript/engine.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3d9858d..e706407 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2290,6 +2290,8 @@ HRESULT interp_add(exec_ctx_t *ctx) TRACE("%s + %s\n", debugstr_variant(l), debugstr_variant(r)); hres = add_eval(ctx->parser->script, l, r, &ctx->ei, &ret); + VariantClear(l); + VariantClear(r); if(FAILED(hres)) return hres; @@ -3362,6 +3364,7 @@ static HRESULT interp_tree(exec_ctx_t *ctx) return hres; hres = exprval_to_value(ctx->parser->script, &val, &ctx->ei, &v); + exprval_release(&val); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Use bytecode for comma expression implementation.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 47314a92d7c1d46739108ba21994ea3c2abba9af URL: http://source.winehq.org/git/wine.git/?a=commit;h=47314a92d7c1d46739108ba21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 12:05:50 2011 +0100 jscript: Use bytecode for comma expression implementation. --- dlls/jscript/compile.c | 17 +++++++++++++++++ dlls/jscript/engine.c | 28 ++++++++-------------------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 4b5b91b..77391bd 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -156,6 +156,21 @@ static HRESULT compile_unary_expression(compiler_ctx_t *ctx, unary_expression_t return push_instr(ctx, op) == -1 ? E_OUTOFMEMORY : S_OK; } +/* ECMA-262 3rd Edition 11.14 */ +static HRESULT compile_comma_expression(compiler_ctx_t *ctx, binary_expression_t *expr) +{ + HRESULT hres; + + hres = compile_expression(ctx, expr->expression1); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_pop) == -1) + return E_OUTOFMEMORY; + + return compile_expression(ctx, expr->expression2); +} + static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, expression_t *expr) { unsigned instr; @@ -211,6 +226,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add); case EXPR_BITNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); + case EXPR_COMMA: + return compile_comma_expression(ctx, (binary_expression_t*)expr); case EXPR_EQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq2); case EXPR_IN: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e706407..87f873c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1910,26 +1910,6 @@ HRESULT property_value_expression_eval(script_ctx_t *ctx, expression_t *_expr, D return S_OK; } -/* ECMA-262 3rd Edition 11.14 */ -HRESULT comma_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - VARIANT lval, rval; - HRESULT hres; - - TRACE("\n"); - - hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); - if(FAILED(hres)) - return hres; - - VariantClear(&lval); - - ret->type = EXPRVAL_VARIANT; - ret->u.var = rval; - return S_OK; -} - /* ECMA-262 3rd Edition 11.11 */ HRESULT logical_or_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { @@ -3342,6 +3322,14 @@ HRESULT assign_xor_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD return assign_oper_eval(ctx, expr->expression1, expr->expression2, xor_eval, ei, ret); } +static HRESULT interp_pop(exec_ctx_t *ctx) +{ + TRACE("\n"); + + stack_popn(ctx, 1); + return S_OK; +} + static HRESULT interp_ret(exec_ctx_t *ctx) { TRACE("\n"); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index c42b2e8..a713e02 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -52,6 +52,7 @@ typedef struct _func_stack { X(neg, 1, 0,0) \ X(neq2, 1, 0,0) \ X(null, 1, 0,0) \ + X(pop, 1, 0,0) \ X(regexp, 1, ARG_STR, ARG_INT) \ X(str, 1, ARG_STR, 0) \ X(this, 1, 0,0) \ @@ -534,7 +535,6 @@ HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT array_literal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT comma_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT logical_or_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT logical_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_or_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index f051c0c..d8daa59 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1305,7 +1305,7 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide } static const expression_eval_t expression_eval_table[] = { - comma_expression_eval, + compiled_expression_eval, logical_or_expression_eval, logical_and_expression_eval, binary_or_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for '-' expression implementation.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: b13c6a27c3113e898989063416512a35b56831e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b13c6a27c3113e89898906341… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 12:06:05 2011 +0100 jscript: Use bytecode for '-' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 34 +++++++++++++++++++++++++++++++--- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 77391bd..12dd04f 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -240,6 +240,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq2); case EXPR_PLUS: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_tonum); + case EXPR_SUB: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_THIS: return push_instr(ctx, OP_this) == -1 ? E_OUTOFMEMORY : S_OK; case EXPR_VOID: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 87f873c..a004326 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -86,6 +86,14 @@ static HRESULT stack_push_bool(exec_ctx_t *ctx, BOOL b) return stack_push(ctx, &v); } +static inline HRESULT stack_push_number(exec_ctx_t *ctx, double number) +{ + VARIANT v; + + num_set_val(&v, number); + return stack_push(ctx, &v); +} + static inline VARIANT *stack_pop(exec_ctx_t *ctx) { assert(ctx->top); @@ -98,6 +106,17 @@ static void stack_popn(exec_ctx_t *ctx, unsigned n) VariantClear(stack_pop(ctx)); } +static HRESULT stack_pop_number(exec_ctx_t *ctx, VARIANT *r) +{ + VARIANT *v; + HRESULT hres; + + v = stack_pop(ctx); + hres = to_number(ctx->parser->script, v, &ctx->ei, r); + VariantClear(v); + return hres; +} + static void exprval_release(exprval_t *val) { switch(val->type) { @@ -2297,13 +2316,22 @@ static HRESULT sub_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep } /* ECMA-262 3rd Edition 11.6.2 */ -HRESULT sub_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_sub(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + VARIANT l, r; + HRESULT hres; TRACE("\n"); - return binary_expr_eval(ctx, expr, sub_eval, ei, ret); + hres = stack_pop_number(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_number(ctx, &l); + if(FAILED(hres)) + return hres; + + return stack_push_number(ctx, num_val(&l)-num_val(&r)); } /* ECMA-262 3rd Edition 11.5.1 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index a713e02..736fe5a 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -59,6 +59,7 @@ typedef struct _func_stack { X(tonum, 1, 0,0) \ X(tree, 1, ARG_EXPR, 0) \ X(ret, 0, 0,0) \ + X(sub, 1, 0,0) \ X(void, 1, 0,0) typedef enum { @@ -541,7 +542,6 @@ HRESULT binary_or_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*, HRESULT binary_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT sub_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT mul_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT div_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT mod_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index d8daa59..2e8c0d8 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1314,7 +1314,7 @@ static const expression_eval_t expression_eval_table[] = { instanceof_expression_eval, compiled_expression_eval, compiled_expression_eval, - sub_expression_eval, + compiled_expression_eval, mul_expression_eval, div_expression_eval, mod_expression_eval,

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DVERTEXELEMENT typedef.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 6a529e58471deb15be72eb248c8a69dfcde78419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a529e58471deb15be72eb248… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 24 22:52:36 2011 +0100 wined3d: Get rid of the WINED3DVERTEXELEMENT typedef. --- dlls/d3d10core/inputlayout.c | 6 +++--- dlls/d3d8/vertexdeclaration.c | 8 ++++---- dlls/d3d9/vertexdeclaration.c | 8 ++++---- dlls/wined3d/vertexdeclaration.c | 19 ++++++++++--------- include/wine/wined3d.h | 6 +++--- 5 files changed, 24 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a529e58471deb15be72e…

1 0