August 2004 - Wine-Devel - list.winehq.org

Re: CreateRemoteThread and related stuff (patch)

by Mike Hearn

> There is no need to export __wine_is_current_process from ntdll and use > it here when standard win32 apis will suffice. Oh yes, I was wondering why this was bothering me. I think you can achieve the same effect like this: if ((handle == (HANDLE)0xffffffff) || (handle == (HANDLE) NtCurrentTeb()->ClientId.UniqueProcess)) seeing as -1 is a magic handle value that means the current process so I guess either input could be valid. On the multiplexing - I spent a few minutes kicking around ideas for others way to do it, but they all basically boiled down to variations on what you've done here ... the only way to make it race free is via the server, and that means marshalling the call into a structure and uploading it to the server so the other process can download it when it's been forced onto the right codepath. That leaves the question of how to do the forcing. The simplest is to have a worker thread which simply sits blocked on a semaphore or something, and then when signalled downloads a request from the server, dispatches it, and returns. That means spinning up a thread at startup though, and I seem to recall that due to the dubious history of the 'service thread' people are no longer keen on that. So ... another way would be to send a signal and use a signal handler to invoke the RPC. I don't really know enough to comment on this approach: I think the way signals work differs in kthread/pthread systems, ie on NPTL boxes signals are sent to threads not processes which could cause wierd races and bugs inside apps. Maybe you can still send signals to processes in NPTL ... I don't know. The final way I can think of is to suspend the entire app using ptrace, grab a thread (which?) and rewrite its register context and stack to point at some remote_op_dispatcher function the address of which is registered at startup with the wineserver. This downloads the struct using the host threads wineserver connection, deals with the request and returns. Then the stack is cleaned up, the register context restored, and the app resumed. Ick. That sounds really really complicated. I'd be tempted to go for bringing back the service thread but I wasn't around when it was busy causing pain so maybe I sound a bit blase about that :)

Aug. 23, 2004

Re: CreateRemoteThread and related stuff (patch)

by Robert Shearman

Alexander Yaworsky wrote: >Hello > >This is a basic framework. Not finished, not really tested -- just stable point. It does no harm for applications I'm using. I would >be glad to get some comments and suggestions. > > Looks good so far, apart from a few comments below. >@@ -168,16 +137,68 @@ > * Success: Handle to the new thread. > * Failure: NULL. Use GetLastError() to find the error cause. > * >- * BUGS >- * Unimplemented > */ > HANDLE WINAPI CreateRemoteThread( HANDLE hProcess, SECURITY_ATTRIBUTES *sa, SIZE_T stack, > LPTHREAD_START_ROUTINE start, LPVOID param, > DWORD flags, LPDWORD id ) > { >- FIXME("(): stub, Write Me.\n"); >+ extern BOOL __wine_is_current_process( HANDLE hProcess ); >+ >+ HANDLE handle; >+ CLIENT_ID client_id; >+ NTSTATUS status; >+ SIZE_T stack_reserve = 0, stack_commit = 0; >+ struct new_thread_info *info; >+ PRTL_THREAD_START_ROUTINE start_addr; >+ >+ if (!(info = VirtualAllocEx( hProcess, NULL, sizeof(*info), >+ MEM_COMMIT, PAGE_READWRITE ))) >+ return 0; >+ >+ if( __wine_is_current_process( hProcess ) ) > > There is no need to export __wine_is_current_process from ntdll and use it here when standard win32 apis will suffice. >+ { >+ info->func = start; >+ info->arg = param; >+ start_addr = (void*) THREAD_Start; >+ } >+ else >+ { >+ struct new_thread_info local_info; >+ DWORD written; >+ >+ local_info.func = start; >+ local_info.arg = param; >+ if( ! WriteProcessMemory( hProcess, &info, &local_info, > This looks wrong. &info? Don't you mean just info? > /*********************************************************************** >+ * remote_op >+ * >+ */ >+NTSTATUS remote_op( HANDLE process, int type, >+ void* params, int params_size, void* result, int* result_size ) >+{ >+ HANDLE event; >+ NTSTATUS status, remote_status; >+ >+ /* send params */ >+ SERVER_START_REQ( remote_operation ) >+ { >+ req->handle = process; >+ req->type = type; >+ if (params) wine_server_add_data( req, params, params_size ); >+ if (!(status = wine_server_call( req ))) >+ event = reply->event; >+ } >+ SERVER_END_REQ; >+ if (status) >+ return status; >+ >+ /* wait for completion */ >+ status = NtWaitForMultipleObjects( 1, &event, FALSE, FALSE, NULL ); >+ NtClose( event ); >+ if (HIWORD(status)) >+ return status; >+ >+ /* get result */ >+ remote_status = 0; /* make compiler happy */ >+ SERVER_START_REQ( remote_operation_result ) >+ { >+ wine_server_set_reply( req, result, *result_size ); >+ if (!(status = wine_server_call( req ))) >+ { >+ remote_status = reply->status; >+ if (result) >+ *result_size = wine_server_reply_size( reply ); >+ } >+ } >+ SERVER_END_REQ; >+ >+ return status? status : remote_status; >+} > > I don't really like the idea of a multiplexer like this, but I guess otherwise we would end up with duplicated code. >+ >+/* return address of internal thread start function in kernel32 */ >+DECL_HANDLER(get_kernel_thread_start) >+{ >+ struct process *process; >+ >+ /* because this is used for CreateRemoteThread, >+ required access rights must be the same >+ */ >+ if ((process = get_process_from_handle( req->handle, >+ PROCESS_CREATE_THREAD >+ | PROCESS_QUERY_INFORMATION >+ | PROCESS_VM_OPERATION >+ | PROCESS_VM_READ | PROCESS_VM_WRITE ))) > > I would argue that it is perfectly alright for the access rights to be just PROCESS_QUERY_INFORMATION here. >+ { >+ reply->address = process->kernel_thread_start; >+ release_object( process ); >+ } >+} >+ >+/* Accept parameters for remote operation and start it */ >+DECL_HANDLER(remote_operation) >+{ >+ int access; >+ struct process *process; >+ struct event *event; >+ >+ /* define required access rights */ >+ switch( req->type ) >+ { >+ case REMOTE_OP_NEW_THREAD: >+ access = PROCESS_CREATE_THREAD | PROCESS_QUERY_INFORMATION >+ | PROCESS_VM_OPERATION | PROCESS_VM_READ | PROCESS_VM_WRITE; >+ break; >+ case REMOTE_OP_VM_ALLOC: access = PROCESS_VM_OPERATION; break; >+ case REMOTE_OP_VM_FREE: access = PROCESS_VM_OPERATION; break; >+ case REMOTE_OP_VM_PROTECT: access = PROCESS_VM_OPERATION; break; >+ case REMOTE_OP_VM_QUERY: access = PROCESS_QUERY_INFORMATION; break; >+ case REMOTE_OP_VM_MAP: access = PROCESS_VM_OPERATION; break; >+ case REMOTE_OP_VM_UNMAP: access = PROCESS_VM_OPERATION; break; >+ case REMOTE_OP_VM_FLUSH: access = PROCESS_VM_OPERATION; break; /* FIXME: is access right? */ >+ default: >+ set_error( STATUS_INVALID_PARAMETER ); >+ return; >+ } >+ >+ /* get process object */ >+ if (!(process = get_process_from_handle( req->handle, access ))) return; >+ >+ /* dispose result data buffer if allocated */ >+ if (current->result_data) >+ { >+ free( current->result_data ); >+ current->result_data = NULL; >+ } >+ >+ /* create event object */ >+ reply->event = NULL; >+ if (current->result_event) >+ { >+ release_object( current->result_event ); >+ current->result_event = NULL; >+ } >+ if (!(event = create_event( NULL, 0, 1, 0 ))) >+ goto error; >+ >+ if (!(reply->event = alloc_handle( current->process, event, EVENT_ALL_ACCESS, FALSE ))) >+ goto error; >+ >+ /* FIXME: pass somehow operation type, params and originator thread id >+ for some thread in the process and force execution of operation */ >+ set_error( STATUS_NOT_IMPLEMENTED ); >+ >+ /* save event object in thread structure for future set operation; >+ we do not release it here */ >+ current->result_event = event; >+ release_object( process ); >+ return; >+ >+error: >+ if (reply->event) close_handle( current->process, reply->event, NULL ); >+ if (event) release_object( event ); >+ release_object( process ); >+} > > Is it really necessary to perform the action required for remote invocation of some operation asynchronously? It seems to add a lot of unneeded complexity. >+/* save result of remote operation and wakeup originator */ >+DECL_HANDLER(remote_operation_complete) >+{ >+ struct thread *thread = get_thread_from_id( req->originator ); >+ >+ if (!thread) return; >+ >+ /* save status */ >+ thread->remote_status = req->status; >+ >+ /* allocate buffer for result data, if required */ >+ if (thread->result_data) >+ { >+ free( thread->result_data ); >+ thread->result_data = NULL; >+ } >+ if ((thread->result_size = get_req_data_size())) >+ { >+ if ((thread->result_data = mem_alloc( thread->result_size ))) >+ memcpy( thread->result_data, get_req_data(), thread->result_size ); >+ else >+ thread->remote_status = get_error(); >+ } >+ >+ /* set event */ >+ if (thread->result_event) >+ { >+ set_event( thread->result_event ); >+ release_object( thread->result_event ); >+ thread->result_event = NULL; >+ } >+ release_object( thread ); >+} >+ >+/* return status and result data from remote opertaion */ >+DECL_HANDLER(remote_operation_result) >+{ >+ reply->status = current->remote_status; >+ >+ if (current->result_data) >+ { >+ void *result = current->result_data; >+ current->result_data = NULL; >+ set_reply_data_ptr( result, current->result_size ); > } > } > > Rob

Aug. 23, 2004

Re: {Begin,End,}UpdateResource{A,W}

by Vincent Béron

Le dim 22/08/2004 à 18:46, Vincent Béron a écrit : > Changelog: > First step for implementing the UpdateResource functions. Please don't apply, it's not ready for inclusion yet. Vincent

Aug. 23, 2004

Re: IShellLink and non-existant exe files

by Aric Stewart

You are right, I missed that second usage of exePath. I will rework my patch and resubmit it. thanks for the sharp eyes. -aric Christian Costa wrote: > Hi, > > I don't know much about this code but some line below there is: > > Stream_WriteLocationInfo( stm, exePath ); > > In our case exePath is still empty. > > Shouldn't we set exePath to the same value as This->sPath ? > > Christian > > Aric Stewart wrote: > >> It is possible under windows to create a .Lnk file to an exe file >> before it exists. Office 2000 does this, Scientific Word does this as >> do other apps as well. >> >> So a quick fix so that in IPersistFile_Save if the exe file is not >> found, trust the path we are given and allow creation of the link. >> >> ------------------------------------------------------------------------ >> >> Index: dlls/shell32/shelllink.c >> =================================================================== >> RCS file: /home/wine/wine/dlls/shell32/shelllink.c,v >> retrieving revision 1.70 >> diff -u -w -r1.70 shelllink.c >> --- dlls/shell32/shelllink.c 12 Aug 2004 23:00:53 -0000 1.70 >> +++ dlls/shell32/shelllink.c 20 Aug 2004 13:27:38 -0000 >> @@ -683,9 +683,14 @@ >> /* if there's no PIDL, generate one */ >> if( ! This->pPidl ) >> { >> + /* + * windows can create lnk files to executables >> that do not exist yet >> + * so if the executable does not exist the just trust the >> path they >> + * gave us >> + */ >> if( !*exePath ) >> - return E_FAIL; >> - >> + This->pPidl = ILCreateFromPathW(This->sPath); >> + else >> This->pPidl = ILCreateFromPathW(exePath); >> } >> >> >> > > >

Aug. 23, 2004

Re: [QUARTZDRV] Preliminary support for native OS X graphics

by Pierre d'Herbemont

Mike, Having Native Graphics Driver for Mac OS X is important for Mac User, since a X11 Apps doesn't behaves like a "normal" Mac OS X App. For instance, there is no icon for it in the Dock, which is indeed important. Moreover I am not convinced about the x11drv speed on Mac OS X. I didn't investigate much here, but the DGA extensions seems to be capital, and I don't think we'll get DGA on Mac OS X due to its windowserver architecture. Any way it is exciting to have an other driver other than x11drv and ttydrv ;) Pierre

Aug. 23, 2004

Re: CreateRemoteThread and related stuff (patch)

by Mike Hearn

Alexander Yaworsky wrote: > Hello > > This is a basic framework. Not finished, not really tested -- just stable point. It does no harm for applications I'm using. I would > be glad to get some comments and suggestions. Looks OK to me but it's missing the most important part :) How are you intending to make the client do a remote op - signals? ptrace? worker thread? (I think Alexandre dislikes such worker threads, but it'd seem to be the simplest/most understandable solution) cool! -mike

Aug. 23, 2004

Re: [QUARTZDRV] Preliminary support for native OS X graphics

by Mike Hearn

> Well, by 'the entire Wine development team' you mean Alexandre :-) ? Not so, quite a few people work on the x11drv. For instance Alexs winedesktop work, various NETWM interop patches from me, fullscreening windows (not applied yet, but ...), system tray integration and so on. Plus all the work to make OpenGL/DirectX go of course! :) > I, for one, am happy that people are using our driver model to write new > drivers as it could serve as a proof of concept that our driver model is > sound (think about GL / Cairo / 'DBI engine' kind of drivers).... Heck, if > we only wanted to support one driver, why do all the job of doing a clean > separation and not include X11 in Wine's GDI directly ? Well the driver model is lifted from Windows so I think it is sound. And as for why we use separate drivers, well, when the DLL separation is complete it means we can make a real Windows box display via X11 which is Just Plain Cool :) It also allows for portability to operating systems that don't have X11. MacOS X *does* have X, in fact it's a modified XFree but with some proprietary bits added. So I'm thinking the added effort is not worth the gain. I'm not a Mac user though so who knows, maybe the extra native-ness is worth all the pain ....

Aug. 23, 2004

CreateRemoteThread and related stuff (patch)

by Alexander Yaworsky

Hello This is a basic framework. Not finished, not really tested -- just stable point. It does no harm for applications I'm using. I would be glad to get some comments and suggestions. This patch does not contain files generated by tools/make_requests Index: dlls/kernel/kernel_private.h =================================================================== RCS file: /home/wine/wine/dlls/kernel/kernel_private.h,v retrieving revision 1.20 diff -u -r1.20 kernel_private.h --- dlls/kernel/kernel_private.h 14 May 2004 21:43:18 -0000 1.20 +++ dlls/kernel/kernel_private.h 23 Aug 2004 09:28:39 -0000 @@ -91,4 +91,6 @@ } INSTANCEDATA; #include "poppack.h" +extern void CALLBACK THREAD_Start( void *ptr ); + #endif Index: dlls/kernel/process.c =================================================================== RCS file: /home/wine/wine/dlls/kernel/process.c,v retrieving revision 1.71 diff -u -r1.71 process.c --- dlls/kernel/process.c 18 Aug 2004 21:03:32 -0000 1.71 +++ dlls/kernel/process.c 23 Aug 2004 09:29:03 -0000 @@ -894,6 +894,7 @@ { req->peb = peb; req->ldt_copy = &wine_ldt_copy; + req->kernel_thread_start = THREAD_Start; if ((ret = !wine_server_call_err( req ))) { main_exe_file = reply->exe_file; Index: dlls/kernel/thread.c =================================================================== RCS file: /home/wine/wine/dlls/kernel/thread.c,v retrieving revision 1.19 diff -u -r1.19 thread.c --- dlls/kernel/thread.c 7 Jul 2004 00:49:34 -0000 1.19 +++ dlls/kernel/thread.c 23 Aug 2004 09:29:08 -0000 @@ -90,13 +90,13 @@ * * Start execution of a newly created thread. Does not return. */ -static void CALLBACK THREAD_Start( void *ptr ) +void CALLBACK THREAD_Start( void *ptr ) { struct new_thread_info *info = ptr; LPTHREAD_START_ROUTINE func = info->func; void *arg = info->arg; - RtlFreeHeap( GetProcessHeap(), 0, info ); + VirtualFree( info, 0, MEM_RELEASE ); if (TRACE_ON(relay)) DPRINTF("%04lx:Starting thread (entryproc=%p)\n", GetCurrentThreadId(), func ); @@ -121,39 +121,8 @@ LPTHREAD_START_ROUTINE start, LPVOID param, DWORD flags, LPDWORD id ) { - HANDLE handle; - CLIENT_ID client_id; - NTSTATUS status; - SIZE_T stack_reserve = 0, stack_commit = 0; - struct new_thread_info *info; - - if (!(info = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*info) ))) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return 0; - } - info->func = start; - info->arg = param; - - if (flags & STACK_SIZE_PARAM_IS_A_RESERVATION) stack_reserve = stack; - else stack_commit = stack; - - status = RtlCreateUserThread( GetCurrentProcess(), NULL, (flags & CREATE_SUSPENDED) != 0, - NULL, stack_reserve, stack_commit, - THREAD_Start, info, &handle, &client_id ); - if (status == STATUS_SUCCESS) - { - if (id) *id = (DWORD)client_id.UniqueThread; - if (sa && (sa->nLength >= sizeof(*sa)) && sa->bInheritHandle) - SetHandleInformation( handle, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT ); - } - else - { - RtlFreeHeap( GetProcessHeap(), 0, info ); - SetLastError( RtlNtStatusToDosError(status) ); - handle = 0; - } - return handle; + return CreateRemoteThread( GetCurrentProcess(), + sa, stack, start, param, flags, id ); } @@ -168,16 +137,68 @@ * Success: Handle to the new thread. * Failure: NULL. Use GetLastError() to find the error cause. * - * BUGS - * Unimplemented */ HANDLE WINAPI CreateRemoteThread( HANDLE hProcess, SECURITY_ATTRIBUTES *sa, SIZE_T stack, LPTHREAD_START_ROUTINE start, LPVOID param, DWORD flags, LPDWORD id ) { - FIXME("(): stub, Write Me.\n"); + extern BOOL __wine_is_current_process( HANDLE hProcess ); + + HANDLE handle; + CLIENT_ID client_id; + NTSTATUS status; + SIZE_T stack_reserve = 0, stack_commit = 0; + struct new_thread_info *info; + PRTL_THREAD_START_ROUTINE start_addr; + + if (!(info = VirtualAllocEx( hProcess, NULL, sizeof(*info), + MEM_COMMIT, PAGE_READWRITE ))) + return 0; + + if( __wine_is_current_process( hProcess ) ) + { + info->func = start; + info->arg = param; + start_addr = (void*) THREAD_Start; + } + else + { + struct new_thread_info local_info; + DWORD written; + + local_info.func = start; + local_info.arg = param; + if( ! WriteProcessMemory( hProcess, &info, &local_info, + sizeof(struct new_thread_info), &written ) ) + return NULL; + SERVER_START_REQ( get_kernel_thread_start ) + { + req->handle = hProcess; + if (!(status = wine_server_call( req ))) + start_addr = (PRTL_THREAD_START_ROUTINE) reply->address; + } + SERVER_END_REQ; + if (status) + goto error; + } + + if (flags & STACK_SIZE_PARAM_IS_A_RESERVATION) stack_reserve = stack; + else stack_commit = stack; + + status = RtlCreateUserThread( hProcess, NULL, (flags & CREATE_SUSPENDED) != 0, + NULL, stack_reserve, stack_commit, + start_addr, info, &handle, &client_id ); + if (status) + goto error; + + if (id) *id = (DWORD)client_id.UniqueThread; + if (sa && (sa->nLength >= sizeof(*sa)) && sa->bInheritHandle) + SetHandleInformation( handle, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT ); + return handle; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); +error: + VirtualFreeEx( hProcess, info, 0, MEM_RELEASE ); + SetLastError( RtlNtStatusToDosError(status) ); return NULL; } Index: dlls/ntdll/ntdll.spec =================================================================== RCS file: /home/wine/wine/dlls/ntdll/ntdll.spec,v retrieving revision 1.162 diff -u -r1.162 ntdll.spec --- dlls/ntdll/ntdll.spec 18 Aug 2004 00:04:58 -0000 1.162 +++ dlls/ntdll/ntdll.spec 23 Aug 2004 09:29:22 -0000 @@ -1135,6 +1135,9 @@ @ cdecl wine_nt_to_unix_file_name(ptr ptr long long) @ cdecl __wine_init_windows_dir(wstr wstr) +# remote operations +@ cdecl __wine_is_current_process(long) + ################################################################ # Wine dll separation hacks, these will go away, don't use them # Index: dlls/ntdll/ntdll_misc.h =================================================================== RCS file: /home/wine/wine/dlls/ntdll/ntdll_misc.h,v retrieving revision 1.48 diff -u -r1.48 ntdll_misc.h --- dlls/ntdll/ntdll_misc.h 15 Jul 2004 22:07:21 -0000 1.48 +++ dlls/ntdll/ntdll_misc.h 23 Aug 2004 09:29:22 -0000 @@ -98,4 +98,9 @@ extern int ntdll_wcstoumbs(DWORD flags, const WCHAR* src, int srclen, char* dst, int dstlen, const char* defchar, int *used ); +/* remote operations */ +extern BOOL __wine_is_current_process( HANDLE handle ); +extern NTSTATUS remote_op( HANDLE process, int type, + void* params, int params_size, void* result, int* result_size ); + #endif Index: dlls/ntdll/thread.c =================================================================== RCS file: /home/wine/wine/dlls/ntdll/thread.c,v retrieving revision 1.20 diff -u -r1.20 thread.c --- dlls/ntdll/thread.c 13 Aug 2004 23:20:27 -0000 1.20 +++ dlls/ntdll/thread.c 23 Aug 2004 09:29:26 -0000 @@ -215,6 +215,29 @@ ULONG size; int request_pipe[2]; NTSTATUS status; + + if( ! __wine_is_current_process( process ) ) + { + struct remote_op_params_new_thread op_params; + struct remote_op_result_new_thread op_result; + int result_size = sizeof(struct remote_op_result_new_thread); + + op_params.suspend = suspended; + op_params.stack_addr = stack_addr; + op_params.stack_reserve = stack_reserve; + op_params.stack_commit = stack_commit; + op_params.start = start; + op_params.param = param; + status = remote_op( process, REMOTE_OP_NEW_THREAD, + &op_params, sizeof(op_params), + &op_result, &result_size ); + if (status) + return status; + + handle = op_result.handle; + tid = op_result.tid; + goto success; + } if (pipe( request_pipe ) == -1) return STATUS_TOO_MANY_OPENED_FILES; fcntl( request_pipe[1], F_SETFD, 1 ); /* set close on exec flag */ @@ -284,6 +307,7 @@ goto error; } +success: if (id) id->UniqueThread = (HANDLE)tid; if (handle_ptr) *handle_ptr = handle; else NtClose( handle ); Index: dlls/ntdll/virtual.c =================================================================== RCS file: /home/wine/wine/dlls/ntdll/virtual.c,v retrieving revision 1.38 diff -u -r1.38 virtual.c --- dlls/ntdll/virtual.c 18 Aug 2004 00:04:58 -0000 1.38 +++ dlls/ntdll/virtual.c 23 Aug 2004 09:29:36 -0000 @@ -1024,11 +1024,11 @@ /*********************************************************************** - * is_current_process + * __wine_is_current_process * * Check whether a process handle is for the current process. */ -static BOOL is_current_process( HANDLE handle ) +BOOL __wine_is_current_process( HANDLE handle ) { BOOL ret = FALSE; @@ -1045,6 +1045,53 @@ /*********************************************************************** + * remote_op + * + */ +NTSTATUS remote_op( HANDLE process, int type, + void* params, int params_size, void* result, int* result_size ) +{ + HANDLE event; + NTSTATUS status, remote_status; + + /* send params */ + SERVER_START_REQ( remote_operation ) + { + req->handle = process; + req->type = type; + if (params) wine_server_add_data( req, params, params_size ); + if (!(status = wine_server_call( req ))) + event = reply->event; + } + SERVER_END_REQ; + if (status) + return status; + + /* wait for completion */ + status = NtWaitForMultipleObjects( 1, &event, FALSE, FALSE, NULL ); + NtClose( event ); + if (HIWORD(status)) + return status; + + /* get result */ + remote_status = 0; /* make compiler happy */ + SERVER_START_REQ( remote_operation_result ) + { + wine_server_set_reply( req, result, *result_size ); + if (!(status = wine_server_call( req ))) + { + remote_status = reply->status; + if (result) + *result_size = wine_server_reply_size( reply ); + } + } + SERVER_END_REQ; + + return status? status : remote_status; +} + + +/*********************************************************************** * virtual_init */ void virtual_init(void) @@ -1158,19 +1205,38 @@ { void *base; BYTE vprot; - DWORD size = *size_ptr; + DWORD size; NTSTATUS status = STATUS_SUCCESS; struct file_view *view; - if (!is_current_process( process )) - { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; - } + TRACE("%p %p %p %p %lx %08lx\n", process, ret, addr, size_ptr, type, protect ); + + /* sanity check */ + if (NULL == ret || NULL == size_ptr) return STATUS_INVALID_PARAMETER; + + TRACE("size=%08lx\n", *size_ptr ); + if (!(size = *size_ptr)) return STATUS_INVALID_PARAMETER; - TRACE("%p %08lx %lx %08lx\n", addr, size, type, protect ); + if (!__wine_is_current_process( process )) + { + struct remote_op_params_vm_alloc alloc_params; + struct remote_op_result_vm_alloc alloc_result; + int result_size = sizeof(struct remote_op_result_vm_alloc); - if (!size) return STATUS_INVALID_PARAMETER; + alloc_params.addr = addr; + alloc_params.size = size; + alloc_params.type = type; + alloc_params.protect = protect; + status = remote_op( process, REMOTE_OP_VM_ALLOC, + &alloc_params, sizeof(alloc_params), + &alloc_result, &result_size ); + if (!status) + { + *ret = alloc_result.base; + *size_ptr = alloc_result.size; + } + return status; + } /* Round parameters to a page boundary */ @@ -1265,16 +1331,37 @@ FILE_VIEW *view; char *base; NTSTATUS status = STATUS_SUCCESS; - LPVOID addr = *addr_ptr; - DWORD size = *size_ptr; + LPVOID addr; + DWORD size; - if (!is_current_process( process )) + TRACE("%p %p %p %lx\n", process, addr_ptr, size_ptr, type ); + + /* sanity check */ + if (NULL == addr_ptr || NULL == size_ptr) return ERROR_INVALID_PARAMETER; + + addr = *addr_ptr; + size = *size_ptr; + TRACE("addr=%p size=%08lx\n", addr, size ); + + if (!__wine_is_current_process( process )) { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; - } + struct remote_op_params_vm_free free_params; + struct remote_op_result_vm_free free_result; + int result_size = sizeof(struct remote_op_result_vm_free); - TRACE("%p %08lx %lx\n", addr, size, type ); + free_params.addr = addr; + free_params.size = size; + free_params.type = type; + status = remote_op( process, REMOTE_OP_VM_FREE, + &free_params, sizeof(free_params), + &free_result, &result_size ); + if (!status) + { + *addr_ptr = free_result.base; + *size_ptr = free_result.size; + } + return status; + } /* Fix the parameters */ @@ -1341,16 +1428,38 @@ char *base; UINT i; BYTE vprot, *p; - DWORD prot, size = *size_ptr; - LPVOID addr = *addr_ptr; + DWORD prot, size; + LPVOID addr; - if (!is_current_process( process )) + TRACE("%p %p %p %08lx %p\n", process, addr_ptr, size_ptr, new_prot, old_prot ); + + /* sanity check */ + if (NULL == addr_ptr || NULL == size_ptr) return ERROR_INVALID_PARAMETER; + + addr = *addr_ptr; + size = *size_ptr; + TRACE("addr=%p size=%08lx\n", addr, size ); + + if (!__wine_is_current_process( process )) { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; - } + struct remote_op_params_vm_protect protect_params; + struct remote_op_result_vm_protect protect_result; + int result_size = sizeof(struct remote_op_result_vm_protect); - TRACE("%p %08lx %08lx\n", addr, size, new_prot ); + protect_params.addr = addr; + protect_params.size = size; + protect_params.new_prot = new_prot; + status = remote_op( process, REMOTE_OP_VM_PROTECT, + &protect_params, sizeof(protect_params), + &protect_result, &result_size ); + if (!status) + { + *addr_ptr = protect_result.base; + *size_ptr = protect_result.size; + if (old_prot) *old_prot = protect_result.old_prot; + } + return status; + } /* Fix the parameters */ @@ -1409,15 +1518,40 @@ UINT size = 0; MEMORY_BASIC_INFORMATION *info = buffer; + TRACE("%p %p %d %p %lu %p\n", process, addr, info_class, buffer, len, res_len ); + + /* sanity check */ + if (NULL == buffer) return ERROR_INVALID_PARAMETER; + + if (!__wine_is_current_process( process )) + { + struct remote_op_params_vm_query *query_params; + int result_size = len; + NTSTATUS status; + + query_params = (struct remote_op_params_vm_query*) + RtlAllocateHeap( GetProcessHeap(), 0, sizeof(struct remote_op_params_vm_query) + len ); + if (!query_params) + return STATUS_NO_MEMORY; + + query_params->addr = (void*) addr; + query_params->info_class = info_class; + if (len) memcpy( query_params + 1, buffer, len ); + status = remote_op( process, REMOTE_OP_VM_QUERY, + query_params, sizeof(struct remote_op_params_vm_query) + len, + buffer, &result_size ); + RtlFreeHeap( GetProcessHeap(), 0, query_params ); + if (!status) + if (res_len) *res_len = result_size; + return status; + } + if (info_class != MemoryBasicInformation) return STATUS_INVALID_INFO_CLASS; if (ADDRESS_SPACE_LIMIT && addr >= ADDRESS_SPACE_LIMIT) return STATUS_WORKING_SET_LIMIT_RANGE; - if (!is_current_process( process )) - { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; - } + /* sanity check */ + if (len < sizeof(MEMORY_BASIC_INFORMATION)) return ERROR_INVALID_PARAMETER; base = ROUND_ADDR( addr, page_mask ); @@ -1497,10 +1631,10 @@ */ NTSTATUS WINAPI NtLockVirtualMemory( HANDLE process, PVOID *addr, ULONG *size, ULONG unknown ) { - if (!is_current_process( process )) + /* FIXME */ + if (!__wine_is_current_process( process )) { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; + return STATUS_SUCCESS; } return STATUS_SUCCESS; } @@ -1512,10 +1646,10 @@ */ NTSTATUS WINAPI NtUnlockVirtualMemory( HANDLE process, PVOID *addr, ULONG *size, ULONG unknown ) { - if (!is_current_process( process )) + /* FIXME */ + if (!__wine_is_current_process( process )) { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; + return STATUS_SUCCESS; } return STATUS_SUCCESS; } @@ -1608,14 +1742,39 @@ HANDLE shared_file; BOOL removable = FALSE; - if (!is_current_process( process )) - { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; - } + TRACE("%p %p %p %lu %lu %p %p %d %lu %lx\n", handle, process, addr_ptr, zero_bits, + commit_size, offset, size_ptr, inherit, alloc_type, protect ); - TRACE("handle=%p addr=%p off=%lx%08lx size=%x access=%lx\n", - handle, *addr_ptr, offset->u.HighPart, offset->u.LowPart, size, protect ); + /* sanity check */ + if (NULL == addr_ptr || NULL == size_ptr || NULL == offset) return ERROR_INVALID_PARAMETER; + + TRACE("addr=%p off=%lx%08lx\n", *addr_ptr, offset->u.HighPart, offset->u.LowPart ); + + if (!__wine_is_current_process( process )) + { + struct remote_op_params_vm_map map_params; + struct remote_op_result_vm_map map_result; + int result_size = sizeof(struct remote_op_result_vm_map); + + map_params.addr = *addr_ptr; + map_params.zero_bits = zero_bits; + map_params.commit_size = commit_size; + map_params.offset_low = offset->u.LowPart; + map_params.offset_high = offset->u.HighPart; + map_params.size = *size_ptr; + map_params.inherit = inherit; + map_params.alloc_type = alloc_type; + map_params.protect = protect; + res = remote_op( process, REMOTE_OP_VM_MAP, + &map_params, sizeof(map_params), + &map_result, &result_size ); + if (!res) + { + *addr_ptr = map_result.base; + *size_ptr = map_result.size; + } + return res; + } /* Check parameters */ @@ -1764,11 +1923,14 @@ NTSTATUS status = STATUS_INVALID_PARAMETER; void *base = ROUND_ADDR( addr, page_mask ); - if (!is_current_process( process )) + TRACE("%p %p base=%p\n", process, addr, base ); + + if (!__wine_is_current_process( process )) { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; + return remote_op( process, REMOTE_OP_VM_UNMAP, + &addr, sizeof(addr), NULL, NULL ); } + RtlEnterCriticalSection( &csVirtual ); if ((view = VIRTUAL_FindView( base )) && (base == view->base)) { @@ -1789,13 +1951,38 @@ { FILE_VIEW *view; NTSTATUS status = STATUS_SUCCESS; - void *addr = ROUND_ADDR( *addr_ptr, page_mask ); + void *addr; + ULONG size; - if (!is_current_process( process )) + TRACE("%p %p %p %lx\n", process, addr_ptr, size_ptr, unknown ); + + /* sanity check */ + if (NULL == addr_ptr || NULL == size_ptr) return ERROR_INVALID_PARAMETER; + + size = *size_ptr; + TRACE("addr=%p size=%08lx\n", *addr_ptr, size ); + + if (!__wine_is_current_process( process )) { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; + struct remote_op_params_vm_flush flush_params; + struct remote_op_result_vm_flush flush_result; + int result_size = sizeof(struct remote_op_result_vm_flush); + + flush_params.addr = (void*) *addr_ptr; + flush_params.size = size; + flush_params.unknown = unknown; + status = remote_op( process, REMOTE_OP_VM_FLUSH, + &flush_params, sizeof(flush_params), + &flush_result, &result_size ); + if (!status) + { + *addr_ptr = flush_result.base; + if (!*size_ptr) *size_ptr = flush_result.size; + } + return status; } + + addr = ROUND_ADDR( *addr_ptr, page_mask ); RtlEnterCriticalSection( &csVirtual ); if (!(view = VIRTUAL_FindView( addr ))) status = STATUS_INVALID_PARAMETER; else Index: server/process.c =================================================================== RCS file: /home/wine/wine/server/process.c,v retrieving revision 1.117 diff -u -r1.117 process.c --- server/process.c 14 Jun 2004 17:02:00 -0000 1.117 +++ server/process.c 23 Aug 2004 09:30:22 -0000 @@ -45,6 +45,7 @@ #include "request.h" #include "console.h" #include "user.h" +#include "object.h" /* process structure */ @@ -972,6 +973,7 @@ reply->info_size = 0; current->process->peb = req->peb; current->process->ldt_copy = req->ldt_copy; + current->process->kernel_thread_start = req->kernel_thread_start; current->process->startup_info = init_process( reply ); } @@ -1188,5 +1190,136 @@ reply->event = alloc_handle( current->process, process->idle_event, EVENT_ALL_ACCESS, 0 ); release_object( process ); + } +} + +/* return address of internal thread start function in kernel32 */ +DECL_HANDLER(get_kernel_thread_start) +{ + struct process *process; + + /* because this is used for CreateRemoteThread, + required access rights must be the same + */ + if ((process = get_process_from_handle( req->handle, + PROCESS_CREATE_THREAD + | PROCESS_QUERY_INFORMATION + | PROCESS_VM_OPERATION + | PROCESS_VM_READ | PROCESS_VM_WRITE ))) + { + reply->address = process->kernel_thread_start; + release_object( process ); + } +} + +/* Accept parameters for remote operation and start it */ +DECL_HANDLER(remote_operation) +{ + int access; + struct process *process; + struct event *event; + + /* define required access rights */ + switch( req->type ) + { + case REMOTE_OP_NEW_THREAD: + access = PROCESS_CREATE_THREAD | PROCESS_QUERY_INFORMATION + | PROCESS_VM_OPERATION | PROCESS_VM_READ | PROCESS_VM_WRITE; + break; + case REMOTE_OP_VM_ALLOC: access = PROCESS_VM_OPERATION; break; + case REMOTE_OP_VM_FREE: access = PROCESS_VM_OPERATION; break; + case REMOTE_OP_VM_PROTECT: access = PROCESS_VM_OPERATION; break; + case REMOTE_OP_VM_QUERY: access = PROCESS_QUERY_INFORMATION; break; + case REMOTE_OP_VM_MAP: access = PROCESS_VM_OPERATION; break; + case REMOTE_OP_VM_UNMAP: access = PROCESS_VM_OPERATION; break; + case REMOTE_OP_VM_FLUSH: access = PROCESS_VM_OPERATION; break; /* FIXME: is access right? */ + default: + set_error( STATUS_INVALID_PARAMETER ); + return; + } + + /* get process object */ + if (!(process = get_process_from_handle( req->handle, access ))) return; + + /* dispose result data buffer if allocated */ + if (current->result_data) + { + free( current->result_data ); + current->result_data = NULL; + } + + /* create event object */ + reply->event = NULL; + if (current->result_event) + { + release_object( current->result_event ); + current->result_event = NULL; + } + if (!(event = create_event( NULL, 0, 1, 0 ))) + goto error; + + if (!(reply->event = alloc_handle( current->process, event, EVENT_ALL_ACCESS, FALSE ))) + goto error; + + /* FIXME: pass somehow operation type, params and originator thread id + for some thread in the process and force execution of operation */ + set_error( STATUS_NOT_IMPLEMENTED ); + + /* save event object in thread structure for future set operation; + we do not release it here */ + current->result_event = event; + release_object( process ); + return; + +error: + if (reply->event) close_handle( current->process, reply->event, NULL ); + if (event) release_object( event ); + release_object( process ); +} + +/* save result of remote operation and wakeup originator */ +DECL_HANDLER(remote_operation_complete) +{ + struct thread *thread = get_thread_from_id( req->originator ); + + if (!thread) return; + + /* save status */ + thread->remote_status = req->status; + + /* allocate buffer for result data, if required */ + if (thread->result_data) + { + free( thread->result_data ); + thread->result_data = NULL; + } + if ((thread->result_size = get_req_data_size())) + { + if ((thread->result_data = mem_alloc( thread->result_size ))) + memcpy( thread->result_data, get_req_data(), thread->result_size ); + else + thread->remote_status = get_error(); + } + + /* set event */ + if (thread->result_event) + { + set_event( thread->result_event ); + release_object( thread->result_event ); + thread->result_event = NULL; + } + release_object( thread ); +} + +/* return status and result data from remote opertaion */ +DECL_HANDLER(remote_operation_result) +{ + reply->status = current->remote_status; + + if (current->result_data) + { + void *result = current->result_data; + current->result_data = NULL; + set_reply_data_ptr( result, current->result_size ); } } Index: server/process.h =================================================================== RCS file: /home/wine/wine/server/process.h,v retrieving revision 1.42 diff -u -r1.42 process.h --- server/process.h 10 Dec 2003 04:08:06 -0000 1.42 +++ server/process.h 23 Aug 2004 09:30:24 -0000 @@ -79,6 +79,8 @@ struct process_dll exe; /* main exe file */ void *peb; /* PEB address in client address space */ void *ldt_copy; /* pointer to LDT copy in client addr space */ + void *kernel_thread_start; /* addr of internal kernel32 thread routine */ + /* (in client address space) */ }; struct process_snapshot Index: server/protocol.def =================================================================== RCS file: /home/wine/wine/server/protocol.def,v retrieving revision 1.110 diff -u -r1.110 protocol.def --- server/protocol.def 18 Aug 2004 00:04:58 -0000 1.110 +++ server/protocol.def 23 Aug 2004 09:30:45 -0000 @@ -232,6 +232,7 @@ @REQ(init_process) void* peb; /* addr of PEB */ void* ldt_copy; /* addr of LDT copy */ + void* kernel_thread_start; /* addr of internal kernel32 thread routine */ @REPLY int create_flags; /* creation flags */ unsigned int server_start; /* server start time (GetTickCount) */ @@ -2166,3 +2167,133 @@ #define SET_GLOBAL_SHELL_WINDOWS 0x01 /* set both main shell and listview windows */ #define SET_GLOBAL_PROGMAN_WINDOW 0x02 #define SET_GLOBAL_TASKMAN_WINDOW 0x04 + +/* Get address of kernel32 internal THREAD_Start function */ +(a)REQ(get_kernel_thread_start) + obj_handle_t handle; /* process handle */ +(a)REPLY + void* address; +(a)END + +/* Accept parameters for remote operation and start it */ +(a)REQ(remote_operation) + obj_handle_t handle; /* process handle */ + int type; /* operation type (see below) */ + VARARG(data,bytes); /* operation parameters (see below) */ +(a)REPLY + obj_handle_t event; /* originator waits for it */ +(a)END +enum remote_op_type +{ + REMOTE_OP_NEW_THREAD, + REMOTE_OP_VM_ALLOC, + REMOTE_OP_VM_FREE, + REMOTE_OP_VM_PROTECT, + REMOTE_OP_VM_QUERY, + REMOTE_OP_VM_MAP, + REMOTE_OP_VM_UNMAP, + REMOTE_OP_VM_FLUSH +}; + +/* Notify that remote operation has been complete */ +(a)REQ(remote_operation_complete) + thread_id_t originator; /* originator thread id */ + unsigned int status; /* operation status */ + VARARG(data,bytes); /* operation result data (see below) */ +(a)END + +/* Get result of remote opertaion */ +(a)REQ(remote_operation_result) +(a)REPLY + unsigned int status; /* operation status */ + VARARG(data,bytes); /* operation result data (see below) */ +(a)END + +struct remote_op_params_new_thread +{ + int suspend; + void *stack_addr; + unsigned int stack_reserve; + unsigned int stack_commit; + void *start; + void *param; +}; +struct remote_op_result_new_thread +{ + obj_handle_t handle; + thread_id_t tid; +}; + +struct remote_op_params_vm_alloc +{ + void *addr; + unsigned long size; + unsigned long type; + unsigned long protect; +}; +struct remote_op_result_vm_alloc +{ + void *base; + unsigned long size; +}; + +struct remote_op_params_vm_free +{ + void *addr; + unsigned long size; + unsigned long type; +}; +struct remote_op_result_vm_free +{ + void *base; + unsigned long size; +}; + +struct remote_op_params_vm_protect +{ + void *addr; + unsigned long size; + unsigned long new_prot; +}; +struct remote_op_result_vm_protect +{ + void *base; + unsigned long size; + unsigned long old_prot; +}; + +struct remote_op_params_vm_query +{ + void *addr; + int info_class; +}; + +struct remote_op_params_vm_map +{ + void *addr; + unsigned long zero_bits; + unsigned long commit_size; + unsigned long offset_low; + long offset_high; + unsigned long size; + int inherit; + unsigned long alloc_type; + unsigned long protect; +}; +struct remote_op_result_vm_map +{ + void *base; + unsigned long size; +}; + +struct remote_op_params_vm_flush +{ + void *addr; + unsigned long size; + unsigned long unknown; +}; +struct remote_op_result_vm_flush +{ + void *base; + unsigned long size; +}; Index: server/thread.c =================================================================== RCS file: /home/wine/wine/server/thread.c,v retrieving revision 1.103 diff -u -r1.103 thread.c --- server/thread.c 27 Oct 2003 22:10:22 -0000 1.103 +++ server/thread.c 23 Aug 2004 09:30:54 -0000 @@ -142,6 +142,8 @@ thread->suspend = 0; thread->creation_time = time(NULL); thread->exit_time = 0; + thread->result_data = NULL; + thread->result_event = NULL; for (i = 0; i < MAX_INFLIGHT_FDS; i++) thread->inflight[i].server = thread->inflight[i].client = -1; @@ -210,6 +212,8 @@ if (thread->request_fd) release_object( thread->request_fd ); if (thread->reply_fd) release_object( thread->reply_fd ); if (thread->wait_fd) release_object( thread->wait_fd ); + if (thread->result_data) free( thread->result_data ); + if (thread->result_event) release_object( thread->result_event ); free_msg_queue( thread ); cleanup_clipboard_thread(thread); destroy_thread_windows( thread ); @@ -226,6 +230,8 @@ thread->request_fd = NULL; thread->reply_fd = NULL; thread->wait_fd = NULL; + thread->result_data = NULL; + thread->result_event = NULL; if (thread == booting_thread) /* killing booting thread */ { Index: server/thread.h =================================================================== RCS file: /home/wine/wine/server/thread.h,v retrieving revision 1.56 diff -u -r1.56 thread.h --- server/thread.h 10 Dec 2003 01:12:18 -0000 1.56 +++ server/thread.h 23 Aug 2004 09:30:56 -0000 @@ -94,6 +94,10 @@ time_t creation_time; /* Thread creation time */ time_t exit_time; /* Thread exit time */ struct token *token; /* security token associated with this thread */ + unsigned int remote_status; /* error code from remote operation */ + void *result_data; /* result data from remote operation */ + int result_size; /* size of result data */ + struct event *result_event; /* originator of remote operation waits for it */ }; struct thread_snapshot

Aug. 23, 2004

Re: [QUARTZDRV] Preliminary support for native OS X graphics

by Lionel Ulmer

> Is it? Given the complexity and amount of work done on the x11drv it > seems silly to duplicate all that effort. The x11drv is worked on by the > entire Wine development team right now, so any quartzdrv would always be > playing catchup. Well, if they want to spend their time doing that, fine > by me ... Well, by 'the entire Wine development team' you mean Alexandre :-) ? I, for one, am happy that people are using our driver model to write new drivers as it could serve as a proof of concept that our driver model is sound (think about GL / Cairo / 'DBI engine' kind of drivers).... Heck, if we only wanted to support one driver, why do all the job of doing a clean separation and not include X11 in Wine's GDI directly ? Lionel -- Lionel Ulmer - http://www.bbrox.org/

Aug. 23, 2004

Re: A new regression

by Mike Hearn

http://www.cyborgname.com/cyborger.cgi?acronym=JULLIARD&robotchoice=governo… ;) But seriously, that patch changed a lot of very important core code in Wine, and the relevant math is hideously complicated (in fact nobody does it anymore, we all just copy/paste the X server code). There have already been several regressions caused by that fixed, the best way to get more fixed is to describe exactly what you see (with screenshots, if possible). If the app isn't free, that's especially critical. Ivan Leo Puoti wrote: > For those of you who don't belive A.J. is a human, he does introduce regressions > from time to time. > This patch > http://www.winehq.com/hypermail/wine-cvs/2004/06/0196.html > Has broken this app > http://www.anim8or.com > and at least one user has complained about this regression. > > Ivan.

Aug. 23, 2004

Re: MSTS installer - files inside setupenu.dll

by Mike Hearn

What were th efile paths it was looking for? Frank Eising wrote: > I am trying to get the Train SImulator setup working. Last time I debugged it I found that the setup looks for jpeg images in a certain directory to set up the setup menu. They are not found, because those files are non-existent on the cdrom. They are inside setupenu.dll. > Anyone knows what kind of thing needs to be implemented, in order to make files inside a dll accessable by wine? I could not find any errors in the debug messages referring to it. > > Frank >

Aug. 23, 2004

Re: [QUARTZDRV] Preliminary support for native OS X graphics

by Mike Hearn

Roderick Colenbrander wrote: > Quartz support is ofcourse great but without a patch it isn't very usefull > ;) Is it? Given the complexity and amount of work done on the x11drv it seems silly to duplicate all that effort. The x11drv is worked on by the entire Wine development team right now, so any quartzdrv would always be playing catchup. Well, if they want to spend their time doing that, fine by me ...

Aug. 23, 2004

Re: Optimize Critical Section Functions

by Mike Hearn

> Win2k - 1000ms > Wine w/ patch - 1346ms > Wine w/o patch - 1294ms That's a fascinatingly round number for Win2K, isn't it? I suspect the slowness is caused by the involution: any cycles saved from the branch hinting is lost in the double-not. thanks -mike

Aug. 23, 2004

Re: Take monospace fonts into account in default font selectionalgorithm.

by Mike Hearn

Mike Hearn wrote: >>This also wouldn't work as you expect. The way to create a fixed >>pitch font is to use FIXED_PITCH not MONO_FONT. Which app was >>setting this flag? > > > There wasn't one, I assumed MONO_FONT meant monospace, which is what I > was trying to stop Wine selecting. I didn't have MSDN handy at the time > though so it was basically just a guess ... > If I resubmit this patch using FIXED_PITCH not MONO_FONT (which seems to be undocumented) would that be correct? /me wishing he had MSDN on his laptop ...

Aug. 23, 2004

A new regression

by Ivan Leo Puoti

For those of you who don't belive A.J. is a human, he does introduce regressions from time to time. This patch http://www.winehq.com/hypermail/wine-cvs/2004/06/0196.html Has broken this app http://www.anim8or.com and at least one user has complained about this regression. Ivan.

Aug. 23, 2004

MSTS installer - files inside setupenu.dll

by Frank Eising

I am trying to get the Train SImulator setup working. Last time I debugged it I found that the setup looks for jpeg images in a certain directory to set up the setup menu. They are not found, because those files are non-existent on the cdrom. They are inside setupenu.dll. Anyone knows what kind of thing needs to be implemented, in order to make files inside a dll accessable by wine? I could not find any errors in the debug messages referring to it. Frank -- _____________________________________________________________ Web-based SMS services available at http://www.operamail.com. >From your mailbox to local or overseas cell phones. Powered by Outblaze

Aug. 22, 2004

Re: [QUARTZDRV] Preliminary support for native OS X graphics

by Roderick Colenbrander

Quartz support is ofcourse great but without a patch it isn't very usefull ;) Roderick Colenbrander > This patch includes a partially graphics driver for OS X. Everything > except the basic window management functions of the user driver are > stubs. The patch depends on Pierre d'Herbemont's "Support for > disabling symbols import in WineBuild based on a prefix." > > Changelog: > Rib Rdb <ribrdb(a)gmail.com> > Add preliminary support for native graphics on Mac OS X. > -- Superg�nstige DSL-Tarife + WLAN-Router f�r 0,- EUR* Jetzt zu GMX wechseln und sparen http://www.gmx.net/de/go/dsl

Aug. 22, 2004

Re: [Darwine] Beginnings of quartzdrv

by Rib Rdb

I tried SDL's CPS code, but aparently it only works with Cocoa. I tries searching the internet for c programs that used it, and I only found one which also didn't work. I'd be fine to use Cocoa (there'd probably be fewer name conflicts), but I couldn't get the Obj-C files to build. On Sun, 22 Aug 2004 13:11:17 +0200, Pierre d'Herbemont <stegefin(a)free.fr> wrote: > Rib, > > If you want to get Docking support see the SDL code for it [1], > especially the CPS (docking) related code. SDL can set up a dock item > without using the .app bundle. I think it will be enough to have get > window focus. > > I sent the patch you were talking about to then wine-patches [Support > for disabling symbols import in WineBuild based on a prefix.] > > Pierre. > > [1] > http://www.libsdl.org/cgi/cvsweb.cgi/SDL12/src/main/macosx/SDLMain.m? > rev=1.11&content-type=text/x-cvsweb-markup > > Le 22 août 04, à 09:57, Rib Rdb a écrit : > > > > > Attached is a very preliminary driver for native graphics on OS X. So > > far all it does is let you make windows. No events or drawing work > > yet (I was baffled by the GetDC function. It looked like the existing > > drivers only call windows functions, and I didn't see any way for > > setting the window's context.) To compile this requires a patch by > > Pierre d'Herbemont to deal with conflicting function names in windows > > and Carbon. He said he will send it here. > > Also, to get the windows to focus, you have to place the executable in > > an application bundle. I just took one I had sitting around, copied > > the wine binary over the executable in the bundle and ran it from the > > commandline like so: > > /Users/ribrdb/Desktop/winemine.app/Contents/MacOS/CarbonTest winemine > > > > Things are getting busy with work, so I'm not sure when I'll have more > > time to work on this. > > <quartzdrv.tar.gz> >

Aug. 22, 2004

Re: iostream and msvcrt?

by Boaz Harrosh

Scott Snell wrote: >which throws up a world of errors, such as: > >In file included from ../stlport/cstdlib:25, >from ../stlport/stl/debug/_debug.c:160, >from ../stlport/stl/debug/_debug.h:418, >from ../stlport/utility:40, >from dll_main.cpp:35: >/usr/include/c++/3.3.2/cstdlib:97: error: `div' not declared >/usr/include/c++/3.3.2/cstdlib:102: error: `ldiv' not declared >/usr/include/c++/3.3.2/cstdlib: In function `ldiv_t std::div(long int, long >int)': > >I'm sure its something simple but I'm still not comfortable around >gcc/winegcc. > >thanks, > >Scott. > > > >>-----Original Message----- >>From: Dimitrie O. Paun [SMTP:dpaun(a)rogers.com] >> >> >> >>>>adding a path pointing to /include/wine/MSVCRT. >>>> >>>> >>>> >>No, you shouldn't need that. You just need to make sure you pass >>the -mno-cygwin flag to winegcc/wineg++. >> >>-- >>Dimi. >> >> You need to have your stlport/config/stl_wine.h (I based mine on stl_mycomp.h, not stl_gcc.h) and change /stlport/config/stlcomp.h to include it (based on a WINE_GCC flag). You need to do that because of the way STLPort works with headers. you must put a path that will Definitely select wine/msvcrt as the source of stdc. I used ../msvcrt in the header and than Just fixed up the -I list in makefiles (and the WINE_GCC flag or is there a flag that is defined by wingcc). Free Life Boaz

Aug. 22, 2004

Re: [Darwine] Beginnings of quartzdrv

by Pierre d'Herbemont

Rib, If you want to get Docking support see the SDL code for it [1], especially the CPS (docking) related code. SDL can set up a dock item without using the .app bundle. I think it will be enough to have get window focus. I sent the patch you were talking about to then wine-patches [Support for disabling symbols import in WineBuild based on a prefix.] Pierre. [1] http://www.libsdl.org/cgi/cvsweb.cgi/SDL12/src/main/macosx/SDLMain.m? rev=1.11&content-type=text/x-cvsweb-markup Le 22 août 04, à 09:57, Rib Rdb a écrit : > Attached is a very preliminary driver for native graphics on OS X. So > far all it does is let you make windows. No events or drawing work > yet (I was baffled by the GetDC function. It looked like the existing > drivers only call windows functions, and I didn't see any way for > setting the window's context.) To compile this requires a patch by > Pierre d'Herbemont to deal with conflicting function names in windows > and Carbon. He said he will send it here. > Also, to get the windows to focus, you have to place the executable in > an application bundle. I just took one I had sitting around, copied > the wine binary over the executable in the bundle and ran it from the > commandline like so: > /Users/ribrdb/Desktop/winemine.app/Contents/MacOS/CarbonTest winemine > > Things are getting busy with work, so I'm not sure when I'll have more > time to work on this. > <quartzdrv.tar.gz>

Aug. 22, 2004

Beginnings of quartzdrv

by Rib Rdb

Attached is a very preliminary driver for native graphics on OS X. So far all it does is let you make windows. No events or drawing work yet (I was baffled by the GetDC function. It looked like the existing drivers only call windows functions, and I didn't see any way for setting the window's context.) To compile this requires a patch by Pierre d'Herbemont to deal with conflicting function names in windows and Carbon. He said he will send it here. Also, to get the windows to focus, you have to place the executable in an application bundle. I just took one I had sitting around, copied the wine binary over the executable in the bundle and ran it from the commandline like so: /Users/ribrdb/Desktop/winemine.app/Contents/MacOS/CarbonTest winemine Things are getting busy with work, so I'm not sure when I'll have more time to work on this.

Aug. 22, 2004

More Darwine news (was Re: New Darwine Binary Released)

by Jim White

Sanjay Connare wrote: > Hey All, I am proud and happy to announce the release of a new binary > labeled Darwine 20040820 DP. This binary is based upon the 20040813 > wine release. > ... Thought I would post a follow-up as Sanjay neglected to include a link to the new binary: http://darwine.opendarwin.org/ http://sourceforge.net/projects/darwine/ Other Darwine news is that there was an interview with moi on osViews: > the article(s) are posted > > Text: > http://www.osviews.com/modules.php?op=modload&name=News&file=article&sid=20… > > Broadcast: > http://www.osviews.com/modules.php?op=modload&name=News&file=article&sid=20… > > > Thank you for your help and support. It is greatly appreciated. I > hope this helps bring about increased awareness for the Darwine project. > > -- > Kelly McNeill > OSV And perhaps the most interesting news is that Darwine's lead developer Pierre d'Herbemont has sucessfully ported QEMU (fast X86 emulator) to Mac OS X: > QEMU on Mac OS X > by Pierre d'Herbemont > 2004-07-04 at 11:07:13 > > I am proud to announce that QEMU is now working on Mac OS X. > • Original announcement on the qemu-devel list > • Download the installer for Mac OS X > • Screenshots of QEMU running on Mac OS X > • The FreeOSZoo, to download ready-to-run images of QEMU virtual > computers, pre-installed with a Free Operating System and a set of > popular free software. > > I would like to thanks Matt Reda for its collaboration. http://www.freeoszoo.org/download.php Jim White

Aug. 22, 2004

Re: Wrong call convention for SHAllocShared & co?

by Ivan Leo Puoti

>Hence my confusion and my call for help. The solution that comes in mind is write a test program and find out. Ivan.

Aug. 21, 2004

Re: Wrong call convention for SHAllocShared & co?

by Francois Gouget

On Sun, 22 Aug 2004, Ivan Leo Puoti wrote: > > So who's right? The platform SDK that says this is a cdecl function or > > Wine's headers? > If the SDK is wrong and is diffrent from the windows implementation, then > programs calling that function will have > problems bacause of imcompatible headers between the ones used to build windows > and the SDK ones used to build the program, no? Yes and that would seem to indicate that the Platform SDK is correct. However if Wine's implementation is wrong then Windows applications that call this API should crash and we should have noticed, no? So that seems to indicate that Wine's implementation must be correct. Hence my confusion and my call for help. -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Stolen from an Internet user: "f u cn rd ths, u cn gt a gd jb n cmptr prgrmmng !"

Aug. 21, 2004

Re: Wrong call convention for SHAllocShared & co?

by Ivan Leo Puoti

> So who's right? The platform SDK that says this is a cdecl function or > Wine's headers? If the SDK is wrong and is diffrent from the windows implementation, then programs calling that function will have problems bacause of imcompatible headers between the ones used to build windows and the SDK ones used to build the program, no? Ivan.

Aug. 21, 2004