June 2005 - Wine-devel - list.winehq.org

Re: wine/ include/wine/server.h dlls/ntdll/server. ...
by Robert Shearman 05 Jun '05

05 Jun '05

Alexandre Julliard wrote: >Index: wine/include/wine/server.h >diff -u -p wine/include/wine/server.h:1.21 wine/include/wine/server.h:1.22 >--- wine/include/wine/server.h:1.21 Sun Jun 5 20:45:53 2005 >+++ wine/include/wine/server.h Sun Jun 5 20:45:53 2005 >@@ -55,6 +55,7 @@ extern void wine_server_send_fd( int fd > extern int wine_server_fd_to_handle( int fd, unsigned int access, int inherit, obj_handle_t *handle ); > extern int wine_server_handle_to_fd( obj_handle_t handle, unsigned int access, int *unix_fd, int *flags ); > extern void wine_server_release_fd( obj_handle_t handle, int unix_fd ); >+extern void DECLSPEC_NORETURN wine_server_exit_thread( int status ); > > /* do a server call and set the last error code */ > inline static unsigned int wine_server_call_err( void *req_ptr ) > >Index: wine/dlls/ntdll/server.c >diff -u -p wine/dlls/ntdll/server.c:1.21 wine/dlls/ntdll/server.c:1.22 >--- wine/dlls/ntdll/server.c:1.21 Sun Jun 5 20:45:53 2005 >+++ wine/dlls/ntdll/server.c Sun Jun 5 20:45:53 2005 >@@ -119,6 +119,40 @@ static void fatal_perror( const char *er > > > /*********************************************************************** >+ * wine_server_exit_thread (NTDLL.@) >+ */ >+void wine_server_exit_thread( int status ) >+{ >+ struct wine_pthread_thread_info info; >+ ULONG size; >+ >+ RtlAcquirePebLock(); >+ RemoveEntryList( &NtCurrentTeb()->TlsLinks ); >+ RtlReleasePebLock(); >+ >+ info.stack_base = NtCurrentTeb()->DeallocationStack; >+ info.teb_base = NtCurrentTeb(); >+ info.teb_sel = wine_get_fs(); >+ info.exit_status = status; >+ >+ size = 0; >+ NtFreeVirtualMemory( GetCurrentProcess(), &info.stack_base, &size, MEM_RELEASE | MEM_SYSTEM ); >+ info.stack_size = size; >+ >+ size = 0; >+ NtFreeVirtualMemory( GetCurrentProcess(), &info.teb_base, &size, MEM_RELEASE | MEM_SYSTEM ); >+ info.teb_size = size; >+ >+ sigprocmask( SIG_BLOCK, &block_set, NULL ); >+ close( NtCurrentTeb()->wait_fd[0] ); >+ close( NtCurrentTeb()->wait_fd[1] ); >+ close( NtCurrentTeb()->reply_fd ); >+ close( NtCurrentTeb()->request_fd ); >+ wine_pthread_exit_thread( &info ); >+} >+ >+ >+/*********************************************************************** > * server_abort_thread > */ > void server_abort_thread( int status ) > >Index: wine/dlls/ntdll/ntdll.spec >diff -u -p wine/dlls/ntdll/ntdll.spec:1.182 wine/dlls/ntdll/ntdll.spec:1.183 >--- wine/dlls/ntdll/ntdll.spec:1.182 Sun Jun 5 20:45:53 2005 >+++ wine/dlls/ntdll/ntdll.spec Sun Jun 5 20:45:53 2005 >@@ -1027,6 +1027,7 @@ > @ cdecl wine_server_handle_to_fd(long long ptr ptr) > @ cdecl wine_server_release_fd(long long) > @ cdecl wine_server_send_fd(long) >+@ cdecl wine_server_exit_thread(long) > > # Codepages > @ cdecl __wine_init_codepages(ptr ptr ptr) > >Index: wine/dlls/kernel/thread.c >diff -u -p wine/dlls/kernel/thread.c:1.23 wine/dlls/kernel/thread.c:1.24 >--- wine/dlls/kernel/thread.c:1.23 Sun Jun 5 20:45:53 2005 >+++ wine/dlls/kernel/thread.c Sun Jun 5 20:45:53 2005 >@@ -24,7 +24,6 @@ > #include <assert.h> > #include <fcntl.h> > #include <stdarg.h> >-#include <signal.h> > #include <sys/types.h> > #ifdef HAVE_SYS_TIMES_H > #include <sys/times.h> >@@ -238,45 +237,8 @@ void WINAPI ExitThread( DWORD code ) /* > } > else > { >- struct wine_pthread_thread_info info; >- sigset_t block_set; >- ULONG size; >- > LdrShutdownThread(); >- RtlAcquirePebLock(); >- RemoveEntryList( &NtCurrentTeb()->TlsLinks ); >- RtlReleasePebLock(); >- >- info.stack_base = NtCurrentTeb()->DeallocationStack; >- info.teb_base = NtCurrentTeb(); >- info.teb_sel = wine_get_fs(); >- info.exit_status = code; >- >- size = 0; >- NtFreeVirtualMemory( GetCurrentProcess(), &info.stack_base, &size, MEM_RELEASE | MEM_SYSTEM ); >- info.stack_size = size; >- >- size = 0; >- NtFreeVirtualMemory( GetCurrentProcess(), &info.teb_base, &size, MEM_RELEASE | MEM_SYSTEM ); >- info.teb_size = size; >- >- /* block the async signals */ >- sigemptyset( &block_set ); >- sigaddset( &block_set, SIGALRM ); >- sigaddset( &block_set, SIGIO ); >- sigaddset( &block_set, SIGINT ); >- sigaddset( &block_set, SIGHUP ); >- sigaddset( &block_set, SIGUSR1 ); >- sigaddset( &block_set, SIGUSR2 ); >- sigaddset( &block_set, SIGTERM ); >- sigprocmask( SIG_BLOCK, &block_set, NULL ); >- >- close( NtCurrentTeb()->wait_fd[0] ); >- close( NtCurrentTeb()->wait_fd[1] ); >- close( NtCurrentTeb()->reply_fd ); >- close( NtCurrentTeb()->request_fd ); >- >- wine_pthread_exit_thread( &info ); >+ wine_server_exit_thread( code ); > } > } > > > > Couldn't wine_server_exit_thread be merged into LdrShutdownThread to avoid this Wine-specific export? -- Rob Shearman

2 1

Regression : Current CVS gives me a Segmentation Fault
by Paul Vriens 05 Jun '05

05 Jun '05

Hi, the current cvs (2005/06/05 14:19:50) gives me a Segmentation Fault on a simple 'wine' command. Regression testing is not ended yet, but the problem wasn't there this morning (with Saturday's CVS). It appears to be http://cvs.winehq.org/patch.py?id=17949 but I'm not a 100% sure on that one yet. Any ideas, or does someone have the same problem ? Cheers, Paul.

3 2

Re: [d3d] Light management API fix to handle an unlimited number of lights
by Christian Costa 05 Jun '05

05 Jun '05

Antoine Chavasse wrote: >Direct3D allows to set any number of light, and limits the number of >lights that can be active at the same time. > >The current wine code allows to setup only 16 lights. It made Anarchy >Online crash, because it tried to setup more lights than that and >didn't like to get returned an error when doing so. > >This patch is a rewrite of the d3d light management api and some related code. > >Another patch with test cases for the light api will follow. > >ChangeLog: > - Rewrote the light management API to allow for an unlimited amount >of lights to be set, > and only a subset of them to be enabled. > > > Hi Antoine, May I ask you to wait a little until I finish reorganizing the DDraw directory? This task involves file renaming so if your patch is aplly later, we can save the history of your modifications. :-) Bye, Christian

2 1

Re: [OLE #93] Disconnect IRemUnknown proxy after the others (resend)
by Robert Shearman 05 Jun '05

05 Jun '05

Mike Hearn wrote: >On Sun, 05 Jun 2005 11:32:14 -0500, Robert Shearman wrote: > > >>The IRemUnknown proxy shouldn't be disconnected at all. Can you try this >>patch for me? >> >> > >Yes, that works too. This patch is simpler and equivalent though? > > > Yes it is. -- Rob Shearman

1 0

Re: [OLE #93] Disconnect IRemUnknown proxy after the others (resend)
by Robert Shearman 05 Jun '05

05 Jun '05

Mike Hearn wrote: >Oops, I forgot to unapply various patches that aren't ready yet or will >be submitted separately. Here it is on its own. > >This fixes the FunFlash Polaroid installer. > >ChangeLog: >Disconnect IRemUnknown proxy after the others. Add some tracing. > > The IRemUnknown proxy shouldn't be disconnected at all. Can you try this patch for me? Changelog: Don't disconnect proxies flagged with SORFP_NOLIFETIMEMGMT. It makes no sense and only causes trouble for proxies that depend on these proxies being available. -- Rob Shearman

1 0

[QUARTZ] Several fixes
by Rolf Kalbermatter 05 Jun '05

05 Jun '05

>@@ -135,7 +154,7 @@ > IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; > ULONG refCount = InterlockedIncrement(&This->refCount); > >- TRACE("()\n"); >+ TRACE("(%p)->() Release from %ld\n", iface, refCount + 1); ^^^^^^^^^^ This is in AddRef so the comment (and calculation of refCount to report) seems wrong to me. > > return refCount; > } Rolf Kalbermatter

1 0

Error in make install
by Andrew Neil Ramage 05 Jun '05

05 Jun '05

Since I do not know which part is relevant, I have placed as much of the output from a wine build at http://www.anr1963.pwp.blueyonder.co.uk as was available on the terminal window. Below are the last few lines. /usr/bin/gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_ADVAPI32_ -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o security.o security.c {standard input}: Assembler messages: {standard input}:19402: Error: invalid character (0x8) in operand 2 make[2]: *** [security.o] Error 1 make[2]: Leaving directory `/home/andrew/Download/Software/wine/dlls/advapi32' make[1]: *** [advapi32/__install-lib__] Error 2 make[1]: Leaving directory `/home/andrew/Download/Software/wine/dlls' make: *** [dlls/__install-lib__] Error 2 -- Andrew You can be the captain I will draw the chart Sailing into destiny Closer to the heart Closer to the Heart by Rush (A Farewell to Kings, 1977) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 2

Steam with Wine
by Andreas 'GlaDiaC' Schneider 05 Jun '05

05 Jun '05

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello, I have updated our Steam How-To. It is possible to get Steam working without Internet Explorer. You need only 3 dll files. HL2 doesn't work very well at the moment. I hope Oliver will release a new patchset soon. You can find the howto here: http://www.linux-gamers.net/modules/wfsection/article.php?articleid=17 Comments are welcome. -- andreas - -- http://www.linux-gamers.net - your online gaming resource -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCojH5f94+j/M+P8YRAsZWAJ9R6GQEF4zKODmtT26fXmMfVzDCoQCfe3Qq /R28bLjrykGftpnvIhhsOaQ= =TtmQ -----END PGP SIGNATURE-----

3 2

Possible regression
by Robert Lunnon 04 Jun '05

04 Jun '05

Something has changed in the last couple of weeks, running the sidenet installer under solaris crashes Xorg, Under the Xsun Xserver I get an unhandled exception dialog at the same point and now the wmp7 installer just hangs there. Starting points anyone ?

1 0

Re: typelib test: test only stdole32.tlb as we don't have olepro32.dll in Wine
by Jacek Caban 04 Jun '05

04 Jun '05

This time with patch... Changelog: Test only stdole32.tlb as we don't have olepro32.dll in Win Index: dlls/oleaut32/tests/typelib.c =================================================================== RCS file: /home/wine/wine/dlls/oleaut32/tests/typelib.c,v retrieving revision 1.1 diff -u -p -r1.1 typelib.c --- dlls/oleaut32/tests/typelib.c 19 Aug 2004 20:29:16 -0000 1.1 +++ dlls/oleaut32/tests/typelib.c 4 Jun 2005 22:49:34 -0000 @@ -58,9 +58,6 @@ void ref_count_test(LPCWSTR type_lib) START_TEST(typelib) { - static const WCHAR type_lib_olepro32[] = {'o','l','e','p','r','o','3','2','.','d','l','l',0}; static const WCHAR type_lib_stdole32[] = {'s','t','d','o','l','e','3','2','.','t','l','b',0}; - - ref_count_test(type_lib_olepro32); ref_count_test(type_lib_stdole32); }

1 0