April 2009 - Wine-Commits - list.winehq.org

Nicolas Le Cam : shell32/tests: Fix tests on localized platforms.
by Alexandre Julliard April 6, 2009

April 6, 2009

Module: wine Branch: master Commit: 69cd386b90a6506960d2f328dd64833fd487d49c URL: http://source.winehq.org/git/wine.git/?a=commit;h=69cd386b90a6506960d2f328d… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Apr 4 13:42:28 2009 +0200 shell32/tests: Fix tests on localized platforms. --- dlls/shell32/tests/shellpath.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 302448e..4cacb08 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -58,6 +58,9 @@ #ifndef PT_FOLDER #define PT_FOLDER 0x31 /* has path */ #endif +#ifndef PT_FOLDERW +#define PT_FOLDERW 0x35 /* has path */ +#endif #ifndef PT_WORKGRP #define PT_WORKGRP 0x41 /* no path */ #endif @@ -90,8 +93,8 @@ static DLLVERSIONINFO shellVersion = { 0 }; static LPMALLOC pMalloc; static const BYTE guidType[] = { PT_GUID }; static const BYTE controlPanelType[] = { PT_SHELLEXT, PT_GUID }; -static const BYTE folderType[] = { PT_FOLDER }; -static const BYTE favoritesType[] = { PT_FOLDER, 0, PT_IESPECIAL2 /* Win98 */ }; +static const BYTE folderType[] = { PT_FOLDER, PT_FOLDERW }; +static const BYTE favoritesType[] = { PT_FOLDER, PT_FOLDERW, 0, PT_IESPECIAL2 /* Win98 */ }; static const BYTE folderOrSpecialType[] = { PT_FOLDER, PT_IESPECIAL2 }; static const BYTE personalType[] = { PT_FOLDER, PT_GUID, PT_DRIVE, 0xff /* Win9x */, PT_IESPECIAL2 /* Win98 */, 0 /* Vista */ };

1 0

Marcus Meissner : wininet: Fixed memory corruption in urlcache.
by Alexandre Julliard April 6, 2009

April 6, 2009

Module: wine Branch: master Commit: cb80692cf86ef133a75d47b569568b43caee59a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb80692cf86ef133a75d47b56… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 5 13:55:21 2009 +0200 wininet: Fixed memory corruption in urlcache. --- dlls/wininet/urlcache.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index bf67fec..b4feba3 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -995,11 +995,13 @@ static DWORD URLCache_CopyEntry( /* FIXME: is source url optional? */ if (*lpdwBufferSize >= dwRequiredSize) { - lpCacheEntryInfo->lpszSourceUrlName = (LPSTR)lpCacheEntryInfo + dwRequiredSize - lenUrl - 1; + DWORD lenUrlBytes = (lenUrl+1) * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + + lpCacheEntryInfo->lpszSourceUrlName = (LPSTR)lpCacheEntryInfo + dwRequiredSize - lenUrlBytes; if (bUnicode) MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, (LPWSTR)lpCacheEntryInfo->lpszSourceUrlName, lenUrl + 1); else - memcpy(lpCacheEntryInfo->lpszSourceUrlName, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, (lenUrl + 1) * sizeof(CHAR)); + memcpy(lpCacheEntryInfo->lpszSourceUrlName, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, lenUrlBytes); } if ((dwRequiredSize % 4) && (dwRequiredSize < *lpdwBufferSize))

1 0

Marcus Meissner : mciqtz32: Fixed boolean condition for null string check ( Coverity 913).
by Alexandre Julliard April 6, 2009

April 6, 2009

Module: wine Branch: master Commit: 088790e8e402335c12a0783972c35de9db7ccef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=088790e8e402335c12a078397… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Apr 4 17:43:57 2009 +0200 mciqtz32: Fixed boolean condition for null string check (Coverity 913). --- dlls/mciqtz32/mciqtz.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 507956c..874b876 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -172,7 +172,7 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, goto err; } - if (!lpOpenParms->lpstrElementName && !lstrlenW(lpOpenParms->lpstrElementName)) { + if (!lpOpenParms->lpstrElementName || !lpOpenParms->lpstrElementName[0]) { TRACE("Invalid filename specified\n"); goto err; }

1 0

Nicolas Le Cam : shell32: Define PT_FOLDERW.
by Alexandre Julliard April 6, 2009

April 6, 2009

Module: wine Branch: master Commit: b4923a32b849609608d1874bffe1a224478741b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4923a32b849609608d1874bf… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Apr 4 13:43:18 2009 +0200 shell32: Define PT_FOLDERW. --- dlls/shell32/pidl.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h index 78a9bc3..73bc3fb 100644 --- a/dlls/shell32/pidl.h +++ b/dlls/shell32/pidl.h @@ -97,10 +97,11 @@ #define PT_FOLDER1 0x30 #define PT_FOLDER 0x31 #define PT_VALUE 0x32 -#define PT_VALUEW 0x34 +#define PT_VALUEW 0x34 +#define PT_FOLDERW 0x35 #define PT_WORKGRP 0x41 #define PT_COMP 0x42 -#define PT_NETPROVIDER 0x46 +#define PT_NETPROVIDER 0x46 #define PT_NETWORK 0x47 #define PT_IESPECIAL1 0x61 #define PT_YAGUID 0x70 /* yet another guid.. */

1 0

Jeff Zaroyko : bugzilla: provide some tips for being a better user on the account registration page
by Jeremy Newman April 3, 2009

April 3, 2009

Module: bugzilla Branch: master Commit: 5072ad6a593945604757c99729146630dfbac5bf URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=5072ad6a593945604757c… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Thu Apr 2 09:25:41 2009 +1100 bugzilla: provide some tips for being a better user on the account registration page >From 59445b850235da681b506ac547a75ad9c71b0b05 Mon Sep 17 00:00:00 2001 From: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Thu, 2 Apr 2009 09:21:54 +1100 Subject: provide some tips for being a better user on the account registration page --- template/en/default/account/create.html.tmpl | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl index 2e8739b..6bef0d9 100644 --- a/template/en/default/account/create.html.tmpl +++ b/template/en/default/account/create.html.tmpl @@ -46,6 +46,12 @@ at <a href="mailto:[% Param("maintainer") %]">[% Param("maintainer") %]</a>. </p> +<h4>Remember...</h4> +<ul> + <li>Avoid posting requests such as, "please fix this, I really need it to work"</li> + <li>Use the <a href="http://forum.winehq.org">forum</a> or <a href="irc://irc.freenode.net/#winehq">IRC channel</a> for troubleshooting advice or general help.</li> + <li>Describe the problem's symptoms, not your guesses</li> +</ul> <form id="account_creation_form" method="get" action="createaccount.cgi"> <table> <tr>

1 0

Alexandre Julliard : server: Use the thread entry point field to pass the PEB in the initial thread.
by Alexandre Julliard April 3, 2009

April 3, 2009

Module: wine Branch: master Commit: b06a919c3c5c3f923f53f25ad6d3261172833f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06a919c3c5c3f923f53f25ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 14:30:34 2009 +0200 server: Use the thread entry point field to pass the PEB in the initial thread. --- dlls/ntdll/server.c | 1 - dlls/ntdll/thread.c | 2 +- include/wine/server_protocol.h | 3 +-- server/protocol.def | 3 +-- server/request.h | 1 - server/thread.c | 4 ++-- server/trace.c | 4 +--- 7 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index d16a248..46dfc1d 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1026,7 +1026,6 @@ size_t server_init_thread( void *entry_point ) req->unix_pid = getpid(); req->unix_tid = get_unix_tid(); req->teb = wine_server_client_ptr( NtCurrentTeb() ); - req->peb = wine_server_client_ptr( NtCurrentTeb()->Peb ); req->entry = wine_server_client_ptr( entry_point ); req->reply_fd = reply_pipe[1]; req->wait_fd = ntdll_get_thread_data()->wait_fd[1]; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 8c6d72c..190dfdc 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -294,7 +294,7 @@ HANDLE thread_init(void) /* setup the server connection */ server_init_process(); - info_size = server_init_thread( NULL ); + info_size = server_init_thread( peb ); /* create the process heap */ if (!(peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL ))) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index fcf062b..a8865e6 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -567,7 +567,6 @@ struct init_thread_request client_ptr_t entry; int reply_fd; int wait_fd; - client_ptr_t peb; }; struct init_thread_reply { @@ -5215,6 +5214,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 381 +#define SERVER_PROTOCOL_VERSION 382 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index a8f3569..5cc93da 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -551,10 +551,9 @@ typedef union int unix_tid; /* Unix tid of new thread */ int debug_level; /* new debug level */ client_ptr_t teb; /* TEB of new thread (in thread address space) */ - client_ptr_t entry; /* thread entry point (in thread address space) */ + client_ptr_t entry; /* entry point or PEB if initial thread (in thread address space) */ int reply_fd; /* fd for reply pipe */ int wait_fd; /* fd for blocking calls pipe */ - client_ptr_t peb; /* address of PEB (in thread address space) */ @REPLY process_id_t pid; /* process id of the new thread's process */ thread_id_t tid; /* thread id of the new thread */ diff --git a/server/request.h b/server/request.h index b8d78f3..1adc03b 100644 --- a/server/request.h +++ b/server/request.h @@ -663,7 +663,6 @@ C_ASSERT( FIELD_OFFSET(struct init_thread_request, teb) == 24 ); C_ASSERT( FIELD_OFFSET(struct init_thread_request, entry) == 32 ); C_ASSERT( FIELD_OFFSET(struct init_thread_request, reply_fd) == 40 ); C_ASSERT( FIELD_OFFSET(struct init_thread_request, wait_fd) == 44 ); -C_ASSERT( FIELD_OFFSET(struct init_thread_request, peb) == 48 ); C_ASSERT( FIELD_OFFSET(struct init_thread_reply, pid) == 8 ); C_ASSERT( FIELD_OFFSET(struct init_thread_reply, tid) == 12 ); C_ASSERT( FIELD_OFFSET(struct init_thread_reply, server_start) == 16 ); diff --git a/server/thread.c b/server/thread.c index 397ad9b..6c68a9e 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1031,7 +1031,7 @@ DECL_HANDLER(init_thread) if (!(current->wait_fd = create_anonymous_fd( &thread_fd_ops, wait_fd, &current->obj, 0 ))) return; - if (!is_valid_address(req->teb) || !is_valid_address(req->peb)) + if (!is_valid_address(req->teb)) { set_error( STATUS_INVALID_PARAMETER ); return; @@ -1044,7 +1044,7 @@ DECL_HANDLER(init_thread) if (!process->peb) /* first thread, initialize the process too */ { process->unix_pid = current->unix_pid; - process->peb = req->peb; + process->peb = req->entry; reply->info_size = init_process( current ); } else diff --git a/server/trace.c b/server/trace.c index 9643feb..13a3ddc 100644 --- a/server/trace.c +++ b/server/trace.c @@ -991,9 +991,7 @@ static void dump_init_thread_request( const struct init_thread_request *req ) dump_uint64( &req->entry ); fprintf( stderr, "," ); fprintf( stderr, " reply_fd=%d,", req->reply_fd ); - fprintf( stderr, " wait_fd=%d,", req->wait_fd ); - fprintf( stderr, " peb=" ); - dump_uint64( &req->peb ); + fprintf( stderr, " wait_fd=%d", req->wait_fd ); } static void dump_init_thread_reply( const struct init_thread_reply *req )

1 0

Alexandre Julliard : ntdll: Set the WOW64 flag according to the server supported CPUs.
by Alexandre Julliard April 3, 2009

April 3, 2009

Module: wine Branch: master Commit: 7e47d19d9a5ad0ab2b47376ab429fb77b4fb8680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e47d19d9a5ad0ab2b47376ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 17:05:29 2009 +0200 ntdll: Set the WOW64 flag according to the server supported CPUs. --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/process.c | 10 +++++++--- dlls/ntdll/server.c | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 75e60ef..542607a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -66,6 +66,7 @@ extern void virtual_init_threading(void); /* server support */ extern timeout_t server_start_time; +extern unsigned int server_cpus; extern void server_init_process(void); extern NTSTATUS server_init_process_done(void); extern size_t server_init_thread( void *entry_point ); diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 76c8410..c129e0a 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -305,10 +305,14 @@ NTSTATUS WINAPI NtQueryInformationProcess( else ret = STATUS_INFO_LENGTH_MISMATCH; break; case ProcessWow64Information: - if (ProcessInformationLength == 4) + if (ProcessInformationLength == sizeof(DWORD)) { - memset(ProcessInformation, 0, ProcessInformationLength); - len = 4; +#ifdef __i386__ + *(DWORD *)ProcessInformation = (server_cpus & (1 << CPU_x86_64)) != 0; +#else + *(DWORD *)ProcessInformation = FALSE; +#endif + len = sizeof(DWORD); } else ret = STATUS_INFO_LENGTH_MISMATCH; break; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 8571325..a7bc493 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -90,6 +90,8 @@ static const enum cpu_type client_cpu = CPU_SPARC; #error Unsupported CPU #endif +unsigned int server_cpus = 0; + #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS /* data structure used to pass an fd with sendmsg/recvmsg */ struct cmsg_fd @@ -1050,6 +1052,7 @@ size_t server_init_thread( void *entry_point ) NtCurrentTeb()->ClientId.UniqueThread = ULongToHandle(reply->tid); info_size = reply->info_size; server_start_time = reply->server_start; + server_cpus = reply->all_cpus; } SERVER_END_REQ;

1 0

Alexandre Julliard : server: Store the type of CPU that the client is running on.
by Alexandre Julliard April 3, 2009

April 3, 2009

Module: wine Branch: master Commit: 653d2c4a8de0ff1be7a7db81c9b9fb8fd6b2296c URL: http://source.winehq.org/git/wine.git/?a=commit;h=653d2c4a8de0ff1be7a7db81c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 14:49:10 2009 +0200 server: Store the type of CPU that the client is running on. --- dlls/ntdll/server.c | 15 +++++++++++++++ include/wine/server_protocol.h | 10 +++++++++- server/process.h | 1 + server/protocol.def | 8 ++++++++ server/request.h | 2 ++ server/thread.c | 6 ++++++ server/trace.c | 19 ++++++++++++++++++- tools/make_requests | 1 + 8 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 46dfc1d..db4f7ce 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -76,6 +76,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(server); #define SOCKETNAME "socket" /* name of the socket file */ #define LOCKNAME "lock" /* name of the lock file */ +#ifdef __i386__ +static const enum cpu_type client_cpu = CPU_x86; +#elif defined(__x86_64__) +static const enum cpu_type client_cpu = CPU_x86_64; +#elif defined(__ALPHA__) +static const enum cpu_type client_cpu = CPU_ALPHA; +#elif defined(__powerpc__) +static const enum cpu_type client_cpu = CPU_POWERPC; +#elif defined(__sparc__) +static const enum cpu_type client_cpu = CPU_SPARC; +#else +#error Unsupported CPU +#endif + #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS /* data structure used to pass an fd with sendmsg/recvmsg */ struct cmsg_fd @@ -1030,6 +1044,7 @@ size_t server_init_thread( void *entry_point ) req->reply_fd = reply_pipe[1]; req->wait_fd = ntdll_get_thread_data()->wait_fd[1]; req->debug_level = (TRACE_ON(server) != 0); + req->cpu = client_cpu; ret = wine_server_call( req ); NtCurrentTeb()->ClientId.UniqueProcess = ULongToHandle(reply->pid); NtCurrentTeb()->ClientId.UniqueThread = ULongToHandle(reply->tid); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a8865e6..7436626 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -128,6 +128,13 @@ typedef union } debug_event_t; +enum cpu_type +{ + CPU_x86, CPU_x86_64, CPU_ALPHA, CPU_POWERPC, CPU_SPARC +}; +typedef int cpu_type_t; + + struct send_fd { thread_id_t tid; @@ -567,6 +574,7 @@ struct init_thread_request client_ptr_t entry; int reply_fd; int wait_fd; + cpu_type_t cpu; }; struct init_thread_reply { @@ -5214,6 +5222,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 382 +#define SERVER_PROTOCOL_VERSION 383 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.h b/server/process.h index 5b6dcda..250c5ce 100644 --- a/server/process.h +++ b/server/process.h @@ -58,6 +58,7 @@ struct process process_id_t id; /* id of the process */ process_id_t group_id; /* group id of the process */ struct timeout_user *sigkill_timeout; /* timeout for final SIGKILL */ + enum cpu_type cpu; /* client CPU type */ int unix_pid; /* Unix pid for final SIGKILL */ int exit_code; /* process exit code */ int running_threads; /* number of threads running in this process */ diff --git a/server/protocol.def b/server/protocol.def index 5cc93da..0ef309e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -143,6 +143,13 @@ typedef union } rip_info; } debug_event_t; +/* supported CPU types */ +enum cpu_type +{ + CPU_x86, CPU_x86_64, CPU_ALPHA, CPU_POWERPC, CPU_SPARC +}; +typedef int cpu_type_t; + /* structure used in sending an fd from client to server */ struct send_fd { @@ -554,6 +561,7 @@ typedef union client_ptr_t entry; /* entry point or PEB if initial thread (in thread address space) */ int reply_fd; /* fd for reply pipe */ int wait_fd; /* fd for blocking calls pipe */ + cpu_type_t cpu; /* CPU that this thread is running on */ @REPLY process_id_t pid; /* process id of the new thread's process */ thread_id_t tid; /* thread id of the new thread */ diff --git a/server/request.h b/server/request.h index 1adc03b..29ed8c9 100644 --- a/server/request.h +++ b/server/request.h @@ -600,6 +600,7 @@ C_ASSERT( sizeof(atom_t) == 4 ); C_ASSERT( sizeof(char) == 1 ); C_ASSERT( sizeof(char_info_t) == 4 ); C_ASSERT( sizeof(client_ptr_t) == 8 ); +C_ASSERT( sizeof(cpu_type_t) == 4 ); C_ASSERT( sizeof(data_size_t) == 4 ); C_ASSERT( sizeof(file_pos_t) == 8 ); C_ASSERT( sizeof(int) == 4 ); @@ -663,6 +664,7 @@ C_ASSERT( FIELD_OFFSET(struct init_thread_request, teb) == 24 ); C_ASSERT( FIELD_OFFSET(struct init_thread_request, entry) == 32 ); C_ASSERT( FIELD_OFFSET(struct init_thread_request, reply_fd) == 40 ); C_ASSERT( FIELD_OFFSET(struct init_thread_request, wait_fd) == 44 ); +C_ASSERT( FIELD_OFFSET(struct init_thread_request, cpu) == 48 ); C_ASSERT( FIELD_OFFSET(struct init_thread_reply, pid) == 8 ); C_ASSERT( FIELD_OFFSET(struct init_thread_reply, tid) == 12 ); C_ASSERT( FIELD_OFFSET(struct init_thread_reply, server_start) == 16 ); diff --git a/server/thread.c b/server/thread.c index 6c68a9e..dcf1da2 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1045,10 +1045,16 @@ DECL_HANDLER(init_thread) { process->unix_pid = current->unix_pid; process->peb = req->entry; + process->cpu = req->cpu; reply->info_size = init_process( current ); } else { + if (req->cpu != process->cpu) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } if (process->unix_pid != current->unix_pid) process->unix_pid = -1; /* can happen with linuxthreads */ if (current->suspend + process->suspend > 0) stop_thread( current ); diff --git a/server/trace.c b/server/trace.c index 13a3ddc..3583cc3 100644 --- a/server/trace.c +++ b/server/trace.c @@ -105,6 +105,21 @@ static void dump_ioctl_code( const ioctl_code_t *code ) } } +static void dump_cpu_type( const cpu_type_t *code ) +{ + switch (*code) + { +#define CASE(c) case CPU_##c: fputs( #c, stderr ); break + CASE(x86); + CASE(x86_64); + CASE(ALPHA); + CASE(POWERPC); + CASE(SPARC); + default: fprintf( stderr, "%u", *code ); break; +#undef CASE + } +} + static void dump_apc_call( const apc_call_t *call ) { fputc( '{', stderr ); @@ -991,7 +1006,9 @@ static void dump_init_thread_request( const struct init_thread_request *req ) dump_uint64( &req->entry ); fprintf( stderr, "," ); fprintf( stderr, " reply_fd=%d,", req->reply_fd ); - fprintf( stderr, " wait_fd=%d", req->wait_fd ); + fprintf( stderr, " wait_fd=%d,", req->wait_fd ); + fprintf( stderr, " cpu=" ); + dump_cpu_type( &req->cpu ); } static void dump_init_thread_reply( const struct init_thread_reply *req ) diff --git a/tools/make_requests b/tools/make_requests index b43fe85..95c5647 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -50,6 +50,7 @@ my %formats = "async_data_t" => [ 40, 8, "&dump_async_data" ], "luid_t" => [ 8, 4, "&dump_luid" ], "ioctl_code_t" => [ 4, 4, "&dump_ioctl_code" ], + "cpu_type_t" => [ 4, 4, "&dump_cpu_type" ], ); my @requests = ();

1 0

Alexandre Julliard : server: Verify that the client is using a supported CPU type.
by Alexandre Julliard April 3, 2009

April 3, 2009

Module: wine Branch: master Commit: 279defe66e1265eeae3e2a72126c2b2f75e20c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=279defe66e1265eeae3e2a721… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 14:59:12 2009 +0200 server: Verify that the client is using a supported CPU type. --- dlls/ntdll/server.c | 11 ++++++++++- include/wine/server_protocol.h | 4 +++- server/protocol.def | 1 + server/request.h | 3 ++- server/thread.c | 21 +++++++++++++++++++++ server/trace.c | 3 ++- 6 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index db4f7ce..8571325 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1053,6 +1053,15 @@ size_t server_init_thread( void *entry_point ) } SERVER_END_REQ; - if (ret) server_protocol_error( "init_thread failed with status %x\n", ret ); + if (ret) + { + if (ret == STATUS_NOT_SUPPORTED) + { + static const char * const cpu_arch[] = { "x86", "x86_64", "Alpha", "PowerPC", "Sparc" }; + server_protocol_error( "the running wineserver doesn't support the %s architecture.\n", + cpu_arch[client_cpu] ); + } + else server_protocol_error( "init_thread failed with status %x\n", ret ); + } return info_size; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 7436626..06eb4ae 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -584,6 +584,8 @@ struct init_thread_reply timeout_t server_start; data_size_t info_size; int version; + unsigned int all_cpus; + char __pad_36[4]; }; @@ -5222,6 +5224,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 383 +#define SERVER_PROTOCOL_VERSION 384 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 0ef309e..0f7e7de 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -568,6 +568,7 @@ typedef union timeout_t server_start; /* server start time */ data_size_t info_size; /* total size of startup info */ int version; /* protocol version */ + unsigned int all_cpus; /* bitset of supported CPUs */ @END diff --git a/server/request.h b/server/request.h index 29ed8c9..3984ab1 100644 --- a/server/request.h +++ b/server/request.h @@ -670,7 +670,8 @@ C_ASSERT( FIELD_OFFSET(struct init_thread_reply, tid) == 12 ); C_ASSERT( FIELD_OFFSET(struct init_thread_reply, server_start) == 16 ); C_ASSERT( FIELD_OFFSET(struct init_thread_reply, info_size) == 24 ); C_ASSERT( FIELD_OFFSET(struct init_thread_reply, version) == 28 ); -C_ASSERT( sizeof(struct init_thread_reply) == 32 ); +C_ASSERT( FIELD_OFFSET(struct init_thread_reply, all_cpus) == 32 ); +C_ASSERT( sizeof(struct init_thread_reply) == 40 ); C_ASSERT( FIELD_OFFSET(struct terminate_process_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct terminate_process_request, exit_code) == 16 ); C_ASSERT( FIELD_OFFSET(struct terminate_process_reply, self) == 8 ); diff --git a/server/thread.c b/server/thread.c index dcf1da2..5520d68 100644 --- a/server/thread.c +++ b/server/thread.c @@ -50,6 +50,21 @@ #include "security.h" +#define CPU_FLAG(cpu) (1 << (cpu)) +#ifdef __i386__ +static const unsigned int supported_cpus = CPU_FLAG(CPU_x86); +#elif defined(__x86_64__) +static const unsigned int supported_cpus = CPU_FLAG(CPU_x86_64) | CPU_FLAG(CPU_x86); +#elif defined(__ALPHA__) +static const unsigned int supported_cpus = CPU_FLAG(CPU_ALPHA); +#elif defined(__powerpc__) +static const unsigned int supported_cpus = CPU_FLAG(CPU_POWERPC); +#elif defined(__sparc__) +static const unsigned int supported_cpus = CPU_FLAG(CPU_SPARC); +#else +#error Unsupported CPU +#endif + /* thread queues */ struct thread_wait @@ -1043,6 +1058,11 @@ DECL_HANDLER(init_thread) if (!process->peb) /* first thread, initialize the process too */ { + if (!CPU_FLAG(req->cpu) || !(supported_cpus & CPU_FLAG(req->cpu))) + { + set_error( STATUS_NOT_SUPPORTED ); + return; + } process->unix_pid = current->unix_pid; process->peb = req->entry; process->cpu = req->cpu; @@ -1066,6 +1086,7 @@ DECL_HANDLER(init_thread) reply->tid = get_thread_id( current ); reply->version = SERVER_PROTOCOL_VERSION; reply->server_start = server_start_time; + reply->all_cpus = supported_cpus; return; error: diff --git a/server/trace.c b/server/trace.c index 3583cc3..612d723 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1019,7 +1019,8 @@ static void dump_init_thread_reply( const struct init_thread_reply *req ) dump_timeout( &req->server_start ); fprintf( stderr, "," ); fprintf( stderr, " info_size=%u,", req->info_size ); - fprintf( stderr, " version=%d", req->version ); + fprintf( stderr, " version=%d,", req->version ); + fprintf( stderr, " all_cpus=%08x", req->all_cpus ); } static void dump_terminate_process_request( const struct terminate_process_request *req )

1 0

Paul Vriens : riched20/tests: Remove the todo_wine logic where appropriate.
by Alexandre Julliard April 3, 2009

April 3, 2009

Module: wine Branch: master Commit: 30041c283a77903a1439bef65f96eebbdf90e461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30041c283a77903a1439bef65… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 3 14:02:53 2009 +0200 riched20/tests: Remove the todo_wine logic where appropriate. --- dlls/riched20/tests/editor.c | 37 +++++++++++++++---------------------- 1 files changed, 15 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index e5d7e2d..78a9541 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4216,32 +4216,31 @@ struct exsetsel_s { long expected_retval; int expected_getsel_start; int expected_getsel_end; - int _exsetsel_todo_wine; int _getsel_todo_wine; }; const struct exsetsel_s exsetsel_tests[] = { /* sanity tests */ - {5, 10, 10, 5, 10, 0, 0}, - {15, 17, 17, 15, 17, 0, 0}, + {5, 10, 10, 5, 10, 0}, + {15, 17, 17, 15, 17, 0}, /* test cpMax > strlen() */ - {0, 100, 18, 0, 18, 0, 1}, + {0, 100, 18, 0, 18, 1}, /* test cpMin == cpMax */ - {5, 5, 5, 5, 5, 0, 0}, + {5, 5, 5, 5, 5, 0}, /* test cpMin < 0 && cpMax >= 0 (bug 4462) */ - {-1, 0, 5, 5, 5, 0, 0}, - {-1, 17, 5, 5, 5, 0, 0}, - {-1, 18, 5, 5, 5, 0, 0}, + {-1, 0, 5, 5, 5, 0}, + {-1, 17, 5, 5, 5, 0}, + {-1, 18, 5, 5, 5, 0}, /* test cpMin < 0 && cpMax < 0 */ - {-1, -1, 17, 17, 17, 0, 0}, - {-4, -5, 17, 17, 17, 0, 0}, + {-1, -1, 17, 17, 17, 0}, + {-4, -5, 17, 17, 17, 0}, /* test cMin >=0 && cpMax < 0 (bug 6814) */ - {0, -1, 18, 0, 18, 0, 1}, - {17, -5, 18, 17, 18, 0, 1}, - {18, -3, 17, 17, 17, 0, 0}, + {0, -1, 18, 0, 18, 1}, + {17, -5, 18, 17, 18, 1}, + {18, -3, 17, 17, 17, 0}, /* test if cpMin > cpMax */ - {15, 19, 18, 15, 18, 0, 1}, - {19, 15, 18, 15, 18, 0, 1} + {15, 19, 18, 15, 18, 1}, + {19, 15, 18, 15, 18, 1} }; static void check_EM_EXSETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) { @@ -4253,13 +4252,7 @@ static void check_EM_EXSETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id cr.cpMax = setsel->max; result = SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM) &cr); - if (setsel->_exsetsel_todo_wine) { - todo_wine { - ok(result == setsel->expected_retval, "EM_EXSETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); - } - } else { - ok(result == setsel->expected_retval, "EM_EXSETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); - } + ok(result == setsel->expected_retval, "EM_EXSETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); SendMessage(hwnd, EM_GETSEL, (WPARAM) &start, (LPARAM) &end);

1 0