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

current version of "wine_adopt_thread"
by Paul Davis April 12, 2004

April 12, 2004

I offer this for Alexandre and other's consideration and comments. This is already in use in libfst, which is in turn used by Ardour, a native linux digital audio workstation, and gAlan, a native linux modular synthesis system. There is still no proper cleanup on failure, and nothing is done if the adopted thread calls pthread_exit(). Both are simple to fix. --p ---------------------------------------------------------------------- /* * winelib code - Initializes wine as shared library * * Copyright 2004 Novell, Inc. (http://www.novell.com/) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <stdio.h> #include <windows.h> #include <windows/ntstatus.h> #include <setjmp.h> #include <signal.h> #include <fcntl.h> #include <wine/library.h> #include <sys/mman.h> #include <dlfcn.h> #include <limits.h> #include <errno.h> #include <string.h> #include "thread.h" #include "pthread.h" #include "server.h" #include "libwinelib.h" #include "fst.h" #include <winternl.h> typedef NTSTATUS WINAPI (*NtProtectVirtualMemory_ptr)(HANDLE, PVOID*, ULONG*, ULONG, ULONG*); typedef NTSTATUS WINAPI (*NtFreeVirtualMemory_ptr)(HANDLE, PVOID, ULONG*, ULONG); typedef NTSTATUS WINAPI (*NtAllocateVirtualMemory_ptr)(HANDLE, PVOID*, PVOID, ULONG*, ULONG, ULONG); typedef VOID WINAPI (*RtlAcquirePebLock_ptr) (VOID); typedef VOID WINAPI (*RtlReleasePebLock_ptr) (VOID); static NtProtectVirtualMemory_ptr ntprotectvm; static NtAllocateVirtualMemory_ptr ntallocatevm; static NtFreeVirtualMemory_ptr ntfreevm; static RtlAcquirePebLock_ptr acquirepeblock; static RtlReleasePebLock_ptr releasepeblock; static LIST_ENTRY tls_link_head; static PEB* peb; static HTASK16 htask16; static unsigned int (*server_call)(void*); static void (*send_fd)(int); static void (*init_thread)(int,int,void*); static jmp_buf jump; static void (*sharedwine_signal_handler)(int signal, siginfo_t*, void*) = NULL; void* initial_teb; static void setup_signal (int sig) { struct sigaction sigact; struct sigaction oldact; sigact.sa_handler = (void (*)(int)) sharedwine_signal_handler; sigact.sa_flags = SA_RESTART|SA_SIGINFO; sigact.sa_sigaction = (void (*)(int signal, siginfo_t* info, void *ptr)) sharedwine_signal_handler; sigemptyset (&sigact.sa_mask); sigaddset (&sigact.sa_mask, SIGINT); sigaddset (&sigact.sa_mask, SIGUSR2); if (sigaction (sig, &sigact, NULL)) { fst_error ("could not install signal handler for signal %d", sig); } } void redirect_signals () { setup_signal (SIGINT); setup_signal (SIGFPE); setup_signal (SIGILL); setup_signal (SIGSEGV); setup_signal (SIGABRT); setup_signal (SIGTERM); setup_signal (SIGBUS); setup_signal (SIGTRAP); } /* The per-thread signal stack size */ #ifdef __i386__ #define SIGNAL_STACK_SIZE 4096 #else #define SIGNAL_STACK_SIZE 0 /* we don't need a signal stack on non-i386 */ #endif /* from winnt.h, but hard to make it appear */ #define MEM_SYSTEM 0x80000000 /*********************************************************************** * alloc_teb (no difference from libwine, but its static there) */ static TEB *shared_alloc_teb( ULONG *size ) { TEB *teb; *size = SIGNAL_STACK_SIZE + sizeof(TEB); teb = wine_anon_mmap( NULL, *size, PROT_READ | PROT_WRITE | PROT_EXEC, 0 ); if (teb == (TEB *)-1) return NULL; if (!(teb->teb_sel = wine_ldt_alloc_fs())) { munmap( teb, *size ); return NULL; } teb->Tib.ExceptionList = (void *)~0UL; teb->Tib.StackBase = (void *)~0UL; teb->Tib.Self = &teb->Tib; teb->Peb = peb; teb->StaticUnicodeString.Buffer = teb->StaticUnicodeBuffer; teb->StaticUnicodeString.MaximumLength = sizeof(teb->StaticUnicodeBuffer); return teb; } /*********************************************************************** * free_teb (no change from libwine, but its static there) */ static inline void shared_free_teb( TEB *teb ) { ULONG size = 0; void *addr = teb; ntfreevm ( GetCurrentProcess(), &addr, &size, MEM_RELEASE ); wine_ldt_free_fs( teb->teb_sel ); munmap( teb, SIGNAL_STACK_SIZE + sizeof(TEB) ); } static int proxy_pripe_request[2]; static int proxy_pripe_status[2]; static pthread_mutex_t proxy_thread_lock; static DWORD WINAPI new_thread_proxy (LPVOID param) { int request_pipe[2]; NTSTATUS status; struct __server_request_info sri; struct new_thread_request *req = &sri.u.req.new_thread_request; int fd = -1; TEB *teb; struct wine_pthread_thread_info thread_info; ULONG size; if (pipe (proxy_pripe_request)) { fst_error ("cannot set up proxy request pipe (%s)", strerror (errno)); return -1; } if (pipe (proxy_pripe_status)) { fst_error ("cannot set up proxy reply pipe (%s)", strerror (errno)); return -1; } while (1) { /* wait for a request size to be written */ if (read (proxy_pripe_request[0], &sri, sizeof (sri)) != sizeof (sri)) { fst_error ("cannot read new thread request from proxy request pipe (%s)", strerror (errno)); return -1; } if (pipe (request_pipe) >= 0) { /* set up a new request pipe */ fcntl (request_pipe[1], F_SETFD, 1); /* set close on exec flag */ /* server_*/ send_fd (request_pipe[0]); req->request_fd = request_pipe[0]; if ((status = server_call (req)) == 0) { fd = request_pipe[1]; } else { close (request_pipe[0]); close (request_pipe[1]); } } /* create a new TEB. the "thread_info" structure seems to be the most convenient way of passing back the result. */ teb = shared_alloc_teb (&size); thread_info.stack_base = NULL; thread_info.stack_size = 0; thread_info.teb_base = teb; thread_info.teb_size = size; thread_info.teb_sel = teb->teb_sel; /* send back the result, request fd and the newly allocated TEB info */ if (write (proxy_pripe_status[1], &sri, sizeof (sri)) != sizeof (sri)) { fst_error ("cannot write request/reply back to proxy reply pipe (%s)", strerror (errno)); /* XXX free teb */ return -1; } if (write (proxy_pripe_status[1], &fd, sizeof (fd)) != sizeof (status)) { fst_error ("cannot write status back to proxy reply pipe (%s)", strerror (errno)); /* XXX free teb */ return -1; } if (write (proxy_pripe_status[1], &thread_info, sizeof (thread_info)) != sizeof (thread_info)) { fst_error ("cannot write thread info to proxy reply pipe (%s)", strerror (errno)); /* XXX free teb */ return -1; } close (request_pipe[0]); } return; } extern int wine_shared_premain (); int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLine, int nCmdShow) { int jmpstat = 1; if (CreateThread (NULL, 0, new_thread_proxy, NULL, 0, NULL) == NULL) { fst_error ("could not create new thread proxy"); } if (wine_shared_premain ()) { jmpstat = 2; } // return to caller. longjmp (jump, jmpstat); } /* WineLoadLibrary is used by System.Windows.Forms to import the Wine dlls */ void * WineLoadLibrary(unsigned char *dll) { return(LoadLibraryA(dll)); } void * WineGetProcAddress(void *handle, unsigned char *function) { return(GetProcAddress(handle, function)); } int SharedWineInit (void (*sighandler)(int,siginfo_t*,void*)) { unsigned char Error[1024]=""; char *WineArguments[] = {"sharedapp", LIBPATH "/libfst.so", NULL}; void* stackbase; size_t stacksize; void *ntdll; void *ntso; char ntdllpath[PATH_MAX+1]; char* dlerr; sharedwine_signal_handler = sighandler; if (setjmp (jump) == 0) { wine_init (2, WineArguments, Error, sizeof (Error)); if (Error[0]!='\0') { fst_error ("Wine initialization error:%s\n", Error); return -1; } } redirect_signals (); initial_teb = NtCurrentTeb(); /* set the stack limits so that any exception handling based on tracking stack boundaries has a chance of working. */ NtCurrentTeb()->Tib.StackBase = (void*) ~0UL; NtCurrentTeb()->Tib.StackLimit = 0; putenv ("_WINE_SHAREDLIB_PATH=" DLLPATH); /* Loading this will pull in many other DLLs that would otherwise be loaded+unloaded over and over again during plugin discovery. */ if (WineLoadLibrary ("user32.dll") == NULL) { fst_error ("cannot load Windows DLL user32"); return 1; } if (WineLoadLibrary ("comdlg32.dll") == NULL) { fst_error ("cannot load Windows DLL comdlg32"); return 1; } if (WineLoadLibrary ("oleaut32.dll") == NULL) { fst_error ("cannot load Windows DLL oleaut32"); return 1; } /* set up the functions and data we need to be able to adopt threads. */ #define GET_SYMBOL(res,handle,name) if ((res = WineGetProcAddress (handle,name)) == NULL) { fst_error ("cannot find Windows function %s", name); return -1; } if ((ntdll = WineLoadLibrary( "ntdll.dll")) == NULL) { fst_error ("cannot load Windows DLL ntdll"); return 1; } GET_SYMBOL (ntallocatevm, ntdll, "NtAllocateVirtualMemory"); GET_SYMBOL (ntfreevm, ntdll, "NtFreeVirtualMemory"); GET_SYMBOL (ntprotectvm, ntdll, "NtProtectVirtualMemory"); GET_SYMBOL (acquirepeblock, ntdll, "RtlAcquirePebLock"); GET_SYMBOL (releasepeblock, ntdll, "RtlReleasePebLock"); tls_link_head = NtCurrentTeb()->TlsLinks; peb = NtCurrentTeb()->Peb; htask16 = NtCurrentTeb()->htask16; sprintf (ntdllpath, "%s/ntdll.dll.so", DLLPATH); if ((ntso = dlopen (ntdllpath, RTLD_NOW|RTLD_GLOBAL)) == NULL) { fst_error ("cannot open NT DLL (%s)", ntdllpath); return -1; } server_call = dlsym (ntso, "wine_server_call"); if ((dlerr = dlerror ()) != NULL) { fst_error ("cannot find wine_server_call (%s)", dlerr); return -1; } send_fd = dlsym (ntso, "wine_server_send_fd"); if ((dlerr = dlerror ()) != NULL) { fst_error ("cannot find wine_server_send_fd (%s)", dlerr); return -1; } init_thread = dlsym (ntso, "server_init_thread"); if ((dlerr = dlerror ()) != NULL) { fst_error ("cannot find server_init_thread (%s)", dlerr); return -1; } return 0; } /*********************************************************************** * adopt_thread - take an existing linux thread (of some kind), * make the wineserver aware of it, and set up the TEB so that * we can execute win32 functions in it. */ int wine_adopt_thread (void) { struct wine_pthread_thread_info thread_info; struct debug_info* debug_info; TEB* teb; int request_fd; int tid; stack_t altstack; void *addr; ULONG size; SERVER_START_REQ( new_thread ) { req->suspend = FALSE; req->inherit = 0; /* FIXME */ pthread_mutex_lock (&proxy_thread_lock); if (write (proxy_pripe_request[1], &__req, sizeof (__req)) != sizeof (__req) || read (proxy_pripe_status[0], &__req, sizeof (__req)) != sizeof (__req) || read (proxy_pripe_status[0], &request_fd, sizeof (request_fd)) != sizeof (request_fd) || read (proxy_pripe_status[0], &thread_info, sizeof (thread_info)) != sizeof (thread_info)) { fst_error ("cannot read/write proxy thread request (%s)", strerror (errno)); } pthread_mutex_unlock (&proxy_thread_lock); if (request_fd >= 0) { tid = reply->tid; } } SERVER_END_REQ; if (request_fd < 0) goto error; debug_info = (struct debug_info *) malloc (sizeof (struct debug_info)); debug_info->str_pos = debug_info->strings; debug_info->out_pos = debug_info->output; teb = (TEB*) thread_info.teb_base; size = thread_info.teb_size; teb->tibflags = TEBF_WIN32; teb->exit_code = STILL_ACTIVE; teb->request_fd = -1; teb->request_fd = -1; teb->reply_fd = -1; teb->wait_fd[0] = -1; teb->wait_fd[1] = -1; teb->debug_info = debug_info; teb->htask16 = htask16; wine_pthread_init_current_teb (&thread_info); teb->ClientId.UniqueProcess = (HANDLE)GetCurrentProcessId(); teb->ClientId.UniqueThread = (HANDLE)tid; teb->request_fd = request_fd; /* don't bother with signal initialization since we redirect all signals back to linux anyway. */ /* SIGNAL_Init(); */ /* server_*/ init_thread( thread_info.pid, thread_info.tid, NULL ); wine_pthread_init_thread( &thread_info ); /* create a memory view for the TEB */ ntallocatevm ( GetCurrentProcess(), &addr, teb, &size, MEM_SYSTEM, PAGE_EXECUTE_READWRITE ); /* allocate a memory view for the stack */ size = thread_info.stack_size; ntallocatevm ( GetCurrentProcess(), &teb->DeallocationStack, thread_info.stack_base, &size, MEM_SYSTEM, PAGE_EXECUTE_READWRITE ); /* limit is lower than base since the stack grows down */ teb->Tib.StackBase = (char *)thread_info.stack_base + thread_info.stack_size; teb->Tib.StackLimit = thread_info.stack_base; /* setup the guard page */ size = 1; ntprotectvm ( GetCurrentProcess(), &teb->DeallocationStack, &size, PAGE_EXECUTE_READWRITE | PAGE_GUARD, NULL ); acquirepeblock (); InsertHeadList( &tls_link_head, &teb->TlsLinks ); releasepeblock (); return 0; error: shared_free_teb (teb); /* XXX deallocate VM */ /* close thread handle */ close (request_fd); return -1; }

1 0

Winelib rookie...
by antonio serra April 12, 2004

April 12, 2004

Hi! I'm trying to port a windows code to linux via winelib. After running winemaker I get the project files and run ./configure. At a certain point the following message appears on the console: checking for windef.h... configure: error: Could not find the Wine headers (windef.h) I have the windef.h file in a directory named /usr/include/wine/windows/. Do I need to setup any environment variables or some kind of soft links? TIA, AS __________________________________ Do you Yahoo!? Yahoo! Tax Center - File online by April 15th http://taxes.yahoo.com/filing.html

2 1

Re: Remove "Path" lines from sample config
by Ivan Leo Murray-Smith April 12, 2004

April 12, 2004

> The cdrom is usually more often /mnt/cdrom rather than /cdrom, isnt't it ? Yes, it usually is under /mnt/, also, the floppy is /mnt/floppy under mandrake, and probably other distros. Ivan.

1 0

Re: Need to disable DTR on serial port
by Geoffrey Hausheer April 12, 2004

April 12, 2004

On Mon, 12 Apr 2004 09:26:30 +0200, "Rein Klazes" said: > > 1) it might be better to call COMM_WhackModem() after tcsetattr() so > > previous flow control settings don't interfere with setting the RTS/DTS > > lines. > > > > 2) #ifdef guards around TIOCM_DTR and TIOCM_RTS? > > > > Agreed, I will fix this in a moment. > Well, I tried Rein's latest patch out, and it still doesn't let me communicate with the device (using either my test program or TzMax). I am not sure if the patch isn't working (I can see the relevant code being called in winedbg), if there is something else required that wine isn't doing, or if it is a timing issue. In case it is interesting, here is my test app. This appears to be the minimum set of commands needed to communicate with the device. Note the tight write/query loop. Adding even a 'Sleep(1)' within that loop prevents the communication from working in Windows. I'm open to any other suggestions. Thanks, .Geoff

1 0

RE: Handling dialog messages for non-template based dialogs
by Santosh Siddheshwar April 12, 2004

April 12, 2004

OK. I will resend the fix after incorporating your feedback. Thanks Santosh Siddheshwar > -----Original Message----- > From: Dmitry Timoshkov [SMTP:dmitry(a)baikal.ru] > Sent: Monday, April 12, 2004 6:34 PM > To: Santosh Siddheshwar > Cc: wine-devel(a)winehq.com > Subject: Re: Handling dialog messages for non-template based dialogs > > "Santosh Siddheshwar" <santosh.s(a)sonata-software.com> wrote: > > > Change Log: > > windows/defdlg.c - Added code for allocating DIALOGINFO structure and > > storing it as an attribute of the window > > windows/dialog.c - Removed code for allocating DIALOGINFO structure and > > moved initialization of DIALOGINFO structure > > to after CreateWindowEx has been called. > > Very nice! I'm glad to see that you finally have fixed that. However, > I see one minor point, which needs to be addressed as well: instead > of duplicating WM_CREATE code in both DefDlgProcA and W just move it > to DEFDLG_Proc. That way you will also fix 16-bit dialog creation code > by adding the same case into DefDlgProc16. > > Thanks for your great work! > > -- > Dmitry. ********************************************************************* Disclaimer: The information in this e-mail and any attachments is confidential / privileged. It is intended solely for the addressee or addressees. If you are not the addressee indicated in this message, you may not copy or deliver this message to anyone. In such case, you should destroy this message and kindly notify the sender by reply email. Please advise immediately if you or your employer does not consent to Internet email for messages of this kind. *********************************************************************

1 0

Re: Handling dialog messages for non-template based dialogs
by Dmitry Timoshkov April 12, 2004

April 12, 2004

"Santosh Siddheshwar" <santosh.s(a)sonata-software.com> wrote: > Change Log: > windows/defdlg.c - Added code for allocating DIALOGINFO structure and > storing it as an attribute of the window > windows/dialog.c - Removed code for allocating DIALOGINFO structure and > moved initialization of DIALOGINFO structure > to after CreateWindowEx has been called. Very nice! I'm glad to see that you finally have fixed that. However, I see one minor point, which needs to be addressed as well: instead of duplicating WM_CREATE code in both DefDlgProcA and W just move it to DEFDLG_Proc. That way you will also fix 16-bit dialog creation code by adding the same case into DefDlgProc16. Thanks for your great work! -- Dmitry.

1 0

Re: shell32: open desktop.ini to fetch icon
by Dmitry Timoshkov April 12, 2004

April 12, 2004

"Juan Lang" <juan_lang(a)yahoo.com> wrote: > ChangeLog: if a folder contains a desktop.ini, check > it for the icon location before using the default > folder icon It would be much better if you could mark all string constants as such using 'const' key word in all your patches (including already committed, submitted and future ones). Taking into account Wine size that should considerably improve overall virtual memory usage. -- Dmitry.

1 0

Need to disable DTR on serial port
by Geoffrey Hausheer April 12, 2004

April 12, 2004

In an ongoing effort to get TzMax working, I've been fighting to get it to talk to the device through the COM port. The problem is that the device (a wrist-watch...the program is used to download heart-rate data from said watch) is very difficult to comunicate with. In theory it is quite simple: send a 'ping' command, wait for a response, then send the 'receive' command, and read the data. In practice, getting the watch to acknowledge the initial ping is challenging. You need to repetitively send the 'ping' at odd intervals until the watch responds. Once it does, it will respond to commands readily. In any case, it turns out that one of the many requirements to get the watch to respond is to have DTR disabled (done by setting fDtrControl = DTR_CONTROL_DISABLE). But apparently the default for linux is DTR_CONTROL_ENABLE, and Wine will ignore any requests to change it (DTR_CONTROL_HANDSHAKE being unimplemented as well) I assume that driving the DTR line low is the trigger that tells the watch to listen to the Rx line. I am not sure if this is a Wine or Linux limitation, (as I have very limited knowledge of serial protocols), so I was wondering if anyone had any ideas for a suibtable workaround? Thanks, .Geoff

3 4

Re: win32 build error log
by Ivan Leo Murray-Smith April 11, 2004

April 11, 2004

> Patch is in Wine CVS. w32 packages are built against the release source, not the CVS. These fixes will affect next months build. > Patch is in MinGW CVS. Will this be ready for next month, or should I install mingw from CVS? Ivan.

1 0

Wine menu woes
by Geoffrey Hausheer April 11, 2004

April 11, 2004

I have an application that seems to work very well, except that the menus don't work (in wine, they are fine in Windows) The app is located here (free download): http://www.acumeninc.com/download/tzmax50v3.21.exe After some debugging, I found that the app creates a menu, then destroys it and recreates it using different titles. Something like: hMenu = CreateMenu(); hSub1 = CreatePopupMenu(); ... hSub2 = CreatePopupMenu(); ... AppendMenu(hMenu, MF_STRING | MF_POPUP, hSub1, "&File"); AppendMenu(hMenu, MF_STRING | MF_POPUP, hSub2, "&Other"); ... SetMenu(hWnd,hMenu); while(GetMenuItemCount(hMenu)) RemoveMenu(hMenu,0, 0x400); //Note: this just detaches the menus hOldMenu = hMenu; DestroyMenu(hMenu); hMenu=CreateMenu(); AppendMenu(hMenu, MF_STRING | MF_POPUP, hSub1, "[&File]"); AppendMenu(hMenu, MF_STRING | MF_POPUP, hSub2, "[&Other]"); if(hMenu != hOldMenu) SetMenu(hWnd, hMenu); That last line is where wine and Windows differ. In windows, the menuid is always different, so hMenu never equals hOldMenu. In wine, we reuse the menuid, so hMenu always equals hOldMenu. Since SetMenu didn't get called after the last createMenu, the menus don't work. I have no idea why the app implements its menus this way, but I removed the 'USER_HEAP_FREE( hMenu );' in DestroyMenu() and the menus work fine, as expected (obviously this isn't a fix, just a validation that the code behaves this way). I've included a test app that does the above if anyone is interested. As a secondary issue, for some reason the 'Exit' item executes the ID_DO_SOMETHING code instead of the ID_FILE_EXIT code. It doesn't do that in windows (it correctly exits instead). I don't think it is related, and i haven't looked into it, but I thought I'd mention it. Thanks, .Geoff

4 3