August 2010 - Wine-Commits - list.winehq.org

Austin English : ntdll: Sparc support for map_image().
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: b3b55ea4fa3a8d6326be59eeb86ce586025a98a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b55ea4fa3a8d6326be59eeb… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Aug 23 11:11:11 2010 -0500 ntdll: Sparc support for map_image(). --- dlls/ntdll/virtual.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 84427fb..fdfccb1 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1096,6 +1096,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz case IMAGE_FILE_MACHINE_ALPHA64: MESSAGE("Alpha-64"); break; case IMAGE_FILE_MACHINE_AMD64: MESSAGE("AMD-64"); break; case IMAGE_FILE_MACHINE_ARM: MESSAGE("ARM"); break; + case IMAGE_FILE_MACHINE_SPARC: MESSAGE("SPARC"); break; default: MESSAGE("Unknown-%04x", nt->FileHeader.Machine); break; } MESSAGE(")\n");

1 0

Austin English : kernel32/tests: Sparc fixes.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 90b5342fb8f85650be635ce20c03fdf4ebf2b400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90b5342fb8f85650be635ce20… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Aug 23 11:11:34 2010 -0500 kernel32/tests: Sparc fixes. --- dlls/kernel32/tests/file.c | 2 ++ dlls/kernel32/tests/loader.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 7cebbc7..033e53e 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1727,6 +1727,8 @@ static BOOL create_fake_dll( LPCSTR filename ) nt->FileHeader.Machine = IMAGE_FILE_MACHINE_AMD64; #elif defined __powerpc__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_POWERPC; +#elif defined __sparc__ + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_SPARC; #else # error You must specify the machine type #endif diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 9361ed5..5da70c8 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -54,6 +54,8 @@ static IMAGE_NT_HEADERS nt_header = IMAGE_FILE_MACHINE_AMD64, /* Machine */ #elif defined __powerpc__ IMAGE_FILE_MACHINE_POWERPC, /* Machine */ +#elif defined __sparc__ + IMAGE_FILE_MACHINE_SPARC, /* Machine */ #else # error You must specify the machine type #endif

1 0

Piotr Caban : msvcp90: Added _String_base::Xinvarg implementation.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 256a08aea6c8a038cc2b3a74159875530c0df4dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=256a08aea6c8a038cc2b3a741… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 23 16:34:15 2010 +0200 msvcp90: Added _String_base::Xinvarg implementation. --- dlls/msvcp90/exception.c | 98 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 3 +- dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/string.c | 9 ++++ 4 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index b4c8bff..1b5552c 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -102,6 +102,7 @@ extern const vtable_ptr MSVCP_bad_alloc_vtable; 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; /* exception class data */ static type_info exception_type_info = { @@ -611,6 +612,97 @@ static const cxx_exception_type out_of_range_cxx_type = { &out_of_range_cxx_type_table }; +/* invalid_argument class data */ +typedef logic_error invalid_argument; + +DEFINE_THISCALL_WRAPPER(MSVCP_invalid_argument_ctor, 8) +invalid_argument* __stdcall MSVCP_invalid_argument_ctor( + invalid_argument *this, const char **name) +{ + TRACE("%p %s\n", this, *name); + MSVCP_logic_error_ctor(this, name); + this->e.vtable = &MSVCP_invalid_argument_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_invalid_argument_copy_ctor, 8) +invalid_argument* __stdcall MSVCP_invalid_argument_copy_ctor( + invalid_argument *this, invalid_argument *rhs) +{ + TRACE("%p %p\n", this, rhs); + MSVCP_logic_error_copy_ctor(this, rhs); + this->e.vtable = &MSVCP_invalid_argument_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_invalid_argument_vector_dtor, 8) +void* __stdcall MSVCP_invalid_argument_vector_dtor( + invalid_argument *this, unsigned int flags) +{ + TRACE("%p %x\n", this, flags); + return MSVCP_logic_error_vector_dtor(this, flags); +} + +static const type_info invalid_argument_type_info = { + &MSVCP_invalid_argument_vtable, + NULL, + ".?AVinvalid_argument(a)std@@" +}; + +static const rtti_base_descriptor invalid_argument_rtti_base_descriptor = { + &invalid_argument_type_info, + 2, + { 0, -1, 0 }, + 64 +}; + +static const rtti_base_array invalid_argument_rtti_base_array = { + { + &invalid_argument_rtti_base_descriptor, + &logic_error_rtti_base_descriptor, + &exception_rtti_base_descriptor + } +}; + +static const rtti_object_hierarchy invalid_argument_type_hierarchy = { + 0, + 0, + 3, + &invalid_argument_rtti_base_array +}; + +const rtti_object_locator invalid_argument_rtti = { + 0, + 0, + 0, + &invalid_argument_type_info, + &invalid_argument_type_hierarchy +}; + +static const cxx_type_info invalid_argument_cxx_type_info = { + 0, + &invalid_argument_type_info, + { 0, -1, 0 }, + sizeof(invalid_argument), + (cxx_copy_ctor)THISCALL(MSVCP_invalid_argument_copy_ctor) +}; + +static const cxx_type_info_table invalid_argument_cxx_type_table = { + 3, + { + &invalid_argument_cxx_type_info, + &logic_error_cxx_type_info, + &exception_cxx_type_info + } +}; + +static const cxx_exception_type invalid_argument_cxx_type = { + 0, + (cxx_copy_ctor)THISCALL(MSVCP_logic_error_dtor), + NULL, + &invalid_argument_cxx_type_table +}; + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif @@ -618,6 +710,7 @@ void __asm_dummy_vtables(void) { __ASM_EXCEPTION_STRING_VTABLE(logic_error) __ASM_EXCEPTION_STRING_VTABLE(length_error) __ASM_EXCEPTION_STRING_VTABLE(out_of_range) + __ASM_EXCEPTION_STRING_VTABLE(invalid_argument) #ifndef __GNUC__ } #endif @@ -657,5 +750,10 @@ void throw_exception(exception_type et, const char *str) MSVCP_out_of_range_ctor(&e, &addr); _CxxThrowException((exception*)&e, &out_of_range_cxx_type); } + case EXCEPTION_INVALID_ARGUMENT: { + invalid_argument e; + MSVCP_invalid_argument_ctor(&e, &addr); + _CxxThrowException((exception*)&e, &invalid_argument_cxx_type); + } } } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index bc3c73d..80b971a 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -62,7 +62,8 @@ typedef enum __exception_type { EXCEPTION_BAD_ALLOC, EXCEPTION_LOGIC_ERROR, EXCEPTION_LENGTH_ERROR, - EXCEPTION_OUT_OF_RANGE + EXCEPTION_OUT_OF_RANGE, + EXCEPTION_INVALID_ARGUMENT } exception_type; void throw_exception(exception_type, const char *); void set_exception_vtable(void); diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 898cac5..6f6544e 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2877,7 +2877,7 @@ @ stub ?_Xfunc(a)tr1@std@@YAXXZ @ stub -arch=win32 ?_Xinvalid(a)tr1@std@@YAXPBD(a)Z @ stub -arch=win64 ?_Xinvalid(a)tr1@std@@YAXPEBD(a)Z -@ stub ?_Xinvarg(a)_String_base@std@@SAXXZ +@ cdecl ?_Xinvarg(a)_String_base@std@@SAXXZ() MSVCP__String_base_Xinvarg @ cdecl ?_Xlen(a)_String_base@std@@SAXXZ() MSVCP__String_base_Xlen @ stub ?_Xmem(a)tr1@std@@YAXXZ @ stub ?_Xoutrange(a)tr1@std@@YAXXZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 97c47d0..0771903 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -485,6 +485,15 @@ void CDECL MSVCP__String_base_Xran(void) throw_exception(EXCEPTION_OUT_OF_RANGE, msg); } +/* ?_Xinvarg(a)_String_base@std@@SAXXZ */ +void CDECL MSVCP__String_base_Xinvarg(void) +{ + static const char msg[] = "invalid string argument"; + + TRACE("\n"); + throw_exception(EXCEPTION_INVALID_ARGUMENT, msg); +} + /* basic_string<char, char_traits<char>, allocator<char>> */ /* ?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2IB */

1 0

Piotr Caban : msvcp90/tests: Added basic_string<char> tests.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 0ca290921e0b055adfca5ef60dda6b6cb639b983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ca290921e0b055adfca5ef60… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 23 16:44:55 2010 +0200 msvcp90/tests: Added basic_string<char> tests. --- dlls/msvcp90/tests/Makefile.in | 3 +- dlls/msvcp90/tests/string.c | 279 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 281 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ca290921e0b055adfca5…

1 0

Austin English : winedump: Add Sparc CPU support.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: fac3282551f4e8022c1e41c3b5dd1a0f4aa6dd87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac3282551f4e8022c1e41c3b… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Aug 23 08:33:19 2010 -0500 winedump: Add Sparc CPU support. --- tools/winedump/pe.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index c06db31..48578d6 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -62,6 +62,7 @@ const char *get_machine_str(int mach) case IMAGE_FILE_MACHINE_AMD64: return "AMD64"; case IMAGE_FILE_MACHINE_IA64: return "IA64"; case IMAGE_FILE_MACHINE_ARM: return "ARM"; + case IMAGE_FILE_MACHINE_SPARC: return "SPARC"; } return "???"; }

1 0

Austin English : ntdll: Add Sparc processor support.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 7b37a6d47ea36b2c616507dee63d8d4e221a0f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b37a6d47ea36b2c616507dee… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Aug 23 08:39:09 2010 -0500 ntdll: Add Sparc processor support. --- dlls/ntdll/nt.c | 2 ++ include/winnt.h | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 4472734..ee50921 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -922,6 +922,8 @@ void fill_cpu_info(void) cached_sci.Architecture = PROCESSOR_ARCHITECTURE_PPC; #elif defined(__ALPHA__) cached_sci.Architecture = PROCESSOR_ARCHITECTURE_ALPHA; +#elif defined(__sparc__) + cached_sci.Architecture = PROCESSOR_ARCHITECTURE_SPARC; #else #error Unknown CPU #endif diff --git a/include/winnt.h b/include/winnt.h index 9b6477c..e3ccd8d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -526,6 +526,9 @@ typedef DWORD FLONG; #define PROCESSOR_ARCHITECTURE_AMD64 9 #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF +/* Wine extension */ +#define PROCESSOR_ARCHITECTURE_SPARC 20 + /* dwProcessorType */ #define PROCESSOR_INTEL_386 386 #define PROCESSOR_INTEL_486 486

1 0

Austin English : ntdll: Make sure ill_handler() and bus_handler() are used on Sparc.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 51e4f9a5a6d5c3ec9364c0bbbd1feed2c282d7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e4f9a5a6d5c3ec9364c0bbb… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Aug 23 11:09:08 2010 -0500 ntdll: Make sure ill_handler() and bus_handler() are used on Sparc. --- dlls/ntdll/signal_sparc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index 660bc9c..318e5a9 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -797,8 +797,10 @@ void signal_init_process(void) sig_act.sa_sigaction = segv_handler; if (sigaction( SIGSEGV, &sig_act, NULL ) == -1) goto error; + sig_act.sa_sigaction = ill_handler; if (sigaction( SIGILL, &sig_act, NULL ) == -1) goto error; #ifdef SIGBUS + sig_act.sa_sigaction = bus_handler; if (sigaction( SIGBUS, &sig_act, NULL ) == -1) goto error; #endif

1 0

Alexandre Julliard : server: Always free the process handle table even if the process didn't start.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 350c0caba0e0db23acaade79e2f2170a5295a111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=350c0caba0e0db23acaade79e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 12:10:51 2010 +0200 server: Always free the process handle table even if the process didn't start. --- server/handle.c | 9 +++++++++ server/handle.h | 1 + server/process.c | 6 ++---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/server/handle.c b/server/handle.c index 4e52f0e..2aaec37 100644 --- a/server/handle.c +++ b/server/handle.c @@ -171,6 +171,15 @@ static void handle_table_destroy( struct object *obj ) free( table->entries ); } +/* close all the process handles and free the handle table */ +void close_process_handles( struct process *process ) +{ + struct handle_table *table = process->handles; + + process->handles = NULL; + if (table) release_object( table ); +} + /* allocate a new handle table */ struct handle_table *alloc_handle_table( struct process *process, int count ) { diff --git a/server/handle.h b/server/handle.h index 7860f52..821c4ef 100644 --- a/server/handle.h +++ b/server/handle.h @@ -49,6 +49,7 @@ extern obj_handle_t open_object( const struct namespace *namespace, const struct extern obj_handle_t find_inherited_handle( struct process *process, const struct object_ops *ops ); extern obj_handle_t enumerate_handles( struct process *process, const struct object_ops *ops, unsigned int *index ); +extern void close_process_handles( struct process *process ); extern struct handle_table *alloc_handle_table( struct process *process, int count ); extern struct handle_table *copy_handle_table( struct process *process, struct process *parent ); extern unsigned int get_handle_table_count( struct process *process); diff --git a/server/process.c b/server/process.c index 36e462a..a3aa586 100644 --- a/server/process.c +++ b/server/process.c @@ -416,6 +416,7 @@ static void process_destroy( struct object *obj ) assert( !process->sigkill_timeout ); /* timeout should hold a reference to the process */ + close_process_handles( process ); set_process_startup_state( process, STARTUP_ABORTED ); if (process->console) release_object( process->console ); if (process->parent) release_object( process->parent ); @@ -615,15 +616,12 @@ void kill_console_processes( struct thread *renderer, int exit_code ) /* a process has been killed (i.e. its last thread died) */ static void process_killed( struct process *process ) { - struct handle_table *handles; struct list *ptr; assert( list_empty( &process->thread_list )); process->end_time = current_time; if (!process->is_system) close_process_desktop( process ); - handles = process->handles; - process->handles = NULL; - if (handles) release_object( handles ); + close_process_handles( process ); process->winstation = 0; process->desktop = 0; if (process->idle_event)

1 0

Alexandre Julliard : server: Avoid a potential server crash when a thread dies on startup.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 3557b9818cccb0c5ceab8bb52d5780208163b771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3557b9818cccb0c5ceab8bb52… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 23 19:50:23 2010 +0200 server: Avoid a potential server crash when a thread dies on startup. --- server/thread.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/server/thread.c b/server/thread.c index 67ef6cf..a1d2d4b 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1102,8 +1102,18 @@ DECL_HANDLER(init_thread) { unsigned int prefix_cpu_mask = get_prefix_cpu_mask(); struct process *process = current->process; - int reply_fd = thread_get_inflight_fd( current, req->reply_fd ); - int wait_fd = thread_get_inflight_fd( current, req->wait_fd ); + int wait_fd, reply_fd; + + if ((reply_fd = thread_get_inflight_fd( current, req->reply_fd )) == -1) + { + set_error( STATUS_TOO_MANY_OPENED_FILES ); + return; + } + if ((wait_fd = thread_get_inflight_fd( current, req->wait_fd )) == -1) + { + set_error( STATUS_TOO_MANY_OPENED_FILES ); + goto error; + } if (current->reply_fd) /* already initialised */ { @@ -1111,19 +1121,11 @@ DECL_HANDLER(init_thread) goto error; } - if (reply_fd == -1 || fcntl( reply_fd, F_SETFL, O_NONBLOCK ) == -1) goto error; + if (fcntl( reply_fd, F_SETFL, O_NONBLOCK ) == -1) goto error; current->reply_fd = create_anonymous_fd( &thread_fd_ops, reply_fd, &current->obj, 0 ); - reply_fd = -1; - if (!current->reply_fd) goto error; - - if (wait_fd == -1) - { - set_error( STATUS_TOO_MANY_OPENED_FILES ); /* most likely reason */ - return; - } - if (!(current->wait_fd = create_anonymous_fd( &thread_fd_ops, wait_fd, &current->obj, 0 ))) - return; + current->wait_fd = create_anonymous_fd( &thread_fd_ops, wait_fd, &current->obj, 0 ); + if (!current->reply_fd || !current->wait_fd) return; if (!is_valid_address(req->teb)) {

1 0

Alexandre Julliard : server: Change the removable fd flag to a cacheable flag to make it possible for fd users to set it dynamically .
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: a2ca2ebd505bb628f0870fb246b0aa77dd34a5d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2ca2ebd505bb628f0870fb24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 23 17:09:45 2010 +0200 server: Change the removable fd flag to a cacheable flag to make it possible for fd users to set it dynamically. --- dlls/ntdll/server.c | 2 +- include/wine/server_protocol.h | 4 ++-- server/fd.c | 14 +++++++++++++- server/file.c | 1 + server/file.h | 1 + server/mailslot.c | 10 +++++++--- server/mapping.c | 1 + server/named_pipe.c | 2 ++ server/protocol.def | 2 +- server/request.h | 2 +- server/sock.c | 2 ++ server/trace.c | 2 +- 12 files changed, 33 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2ca2ebd505bb628f0870…

1 0