wine-devel

wine-devel@winehq.org

9 participants
84397 discussions

Re: Notes and Java test on 20010112.
by David.Goodenough＠dga.co.uk 02 Feb '01

02 Feb '01

Well the good news is that this patch does indeed fix the Callout problem. Unfortunately we are then back to the original font problem, where (at least with the Sun JRE) we just get black squares instead of characters. The IBM JRE still has problems and never even displays the frame for the characters, let alone the characters. But this may still be due to the same underlying problem. Ulrich Weigand <weigand(a)immd1.informatik.uni-erlangen.de> on 28-01-2001 11:43:03 PM To: gerard.patel(a)asi.fr (gerard patel) cc: David Goodenough/DGA/GB, wine-devel(a)winehq.com Subject: Re: Notes and Java test on 20010112. Gerard Patel wrote: > I did not include the trace as it's rather large (I can mail it to you > if you want...) but what happens is clear enough : the main exe loads > implicitely KERNEL32 but not USER - USER is loaded implicitely > by a DLL loaded by LoadLibrary. > So when the kernel initialisation is done, USER is not yet loaded. > It's unusual but seems perfectly valid IMO. > > What about adding a specific Wine call from User to Kernel to trigger the > initialization when USER is loaded ? (maybe there is already an > undocumented one - you are the undisputed master here :-)) Hmmm. Strictly speaking, if an app dynamically loads USER, it can also dynamically *unload* USER; we'd have to take care that we invalidate the Callout pointers if this happens. What do you think about the following solution? It just checks whenever any DLL is loaded or unloaded, whether the Callout pointers need to be updated ... Bye, Ulrich diff -ur wine-cvs/if1632/thunk.c wine-uw/if1632/thunk.c --- wine-cvs/if1632/thunk.c Wed Jan 3 22:51:30 2001 +++ wine-uw/if1632/thunk.c Mon Jan 29 00:35:49 2001 @@ -166,7 +166,7 @@ NE_MODULE *pModule; hModule = GetModuleHandleA( "user32.dll" ); - if ( hModule ) + if ( hModule && !Callout.PeekMessageA ) { #define GETADDR( name ) \ *(FARPROC *)&Callout.name = GetProcAddress( hModule, #name ) @@ -185,10 +185,24 @@ GETADDR( MessageBoxW ); #undef GETADDR } - else WARN("no 32-bit USER\n"); + if ( !hModule && Callout.PeekMessageA ) + { + Callout.PeekMessageA = NULL; + Callout.GetMessageA = NULL; + Callout.SendMessageA = NULL; + Callout.PostMessageA = NULL; + Callout.TranslateMessage = NULL; + Callout.DispatchMessageA = NULL; + Callout.RedrawWindow = NULL; + Callout.WaitForInputIdle = NULL; + Callout.MsgWaitForMultipleObjects = NULL; + Callout.WindowFromDC = NULL; + Callout.MessageBoxA = NULL; + Callout.MessageBoxW = NULL; + } pModule = NE_GetPtr( GetModuleHandle16( "USER.EXE" ) ); - if ( pModule ) + if ( pModule && !Callout.FinalUserInit16 ) { #define GETADDR( var, name, thk ) \ *(FARPROC *)&Callout.var = THUNK_GetCalloutThunk( pModule, name, \ @@ -201,5 +215,12 @@ GETADDR( UserSignalProc, "SignalProc32", word_lllw ); #undef GETADDR } - else WARN("no 16-bit USER\n"); + if ( !pModule && Callout.FinalUserInit16 ) + { + Callout.FinalUserInit16 = NULL; + Callout.InitThreadInput16 = NULL; + Callout.UserYield16 = NULL; + Callout.DestroyIcon32 = NULL; + Callout.UserSignalProc = NULL; + } } diff -ur wine-cvs/loader/module.c wine-uw/loader/module.c --- wine-cvs/loader/module.c Tue Jan 16 00:29:27 2001 +++ wine-uw/loader/module.c Mon Jan 29 00:30:20 2001 @@ -1432,6 +1432,9 @@ /* decrement the dependencies through the MODULE_FreeLibrary call. */ pwm->refCount++; + /* Update the kernel Callout tables */ + THUNK_InitCallout(); + RtlReleasePebLock(); SetLastError( err ); /* restore last error */ HeapFree ( GetProcessHeap(), 0, filename ); @@ -1526,6 +1529,9 @@ HeapFree( GetProcessHeap(), 0, wm->short_filename ); HeapFree( GetProcessHeap(), 0, wm ); } + + /* Update the kernel Callout tables */ + THUNK_InitCallout(); } /*********************************************************************** diff -ur wine-cvs/miscemu/main.c wine-uw/miscemu/main.c --- wine-cvs/miscemu/main.c Wed Jan 10 02:42:49 2001 +++ wine-uw/miscemu/main.c Mon Jan 29 00:36:05 2001 @@ -34,7 +34,6 @@ MESSAGE( "Cannot load user32.dll\n" ); ExitProcess( GetLastError() ); } - THUNK_InitCallout(); if ((instance = NE_StartMain( main_exe_name, main_exe_file )) < 32) { diff -ur wine-cvs/scheduler/process.c wine-uw/scheduler/process.c --- wine-cvs/scheduler/process.c Sun Jan 28 18:58:09 2001 +++ wine-uw/scheduler/process.c Mon Jan 29 00:36:17 2001 @@ -346,9 +346,6 @@ MODULE_DllProcessAttach( NULL, (LPVOID)1 ); RtlReleasePebLock(); - /* Get pointers to USER routines called by KERNEL */ - THUNK_InitCallout(); - /* Call FinalUserInit routine */ if (Callout.FinalUserInit16) Callout.FinalUserInit16(); -- Dr. Ulrich Weigand weigand(a)informatik.uni-erlangen.de

1 0

Re: psdrv: map Courier New to Courier
by Dmitry Timoshkov 02 Feb '01

02 Feb '01

Gavriel State <gav(a)transgaming.com> wrote: >It's at http://opensource.corel.com > >It hasn't been updated in quite a while, and the last import from >WineHQ was back in December '99, I believe. In addition to the >font/printing work, there may still be a few other outstanding fixes >that haven't made it into the Wine tree - but the only way to tell >is probably going to be manual inspection of the diffs. Yes, this is a pain to do for instance cvs log -N corelwine/windows/defwnd.c >defwnd.c.log then inspect it for some interesting log message, then do cvs log -N -r1.3 corelwine/windows/defwnd.c >defwnd.c.patch cvs diff -u -r 1.2 -r 1.3 corelwine/windows/defwnd.c >>defwnd.c.patch especially if the patch actually changed several files.

1 0

Re: psdrv: map Courier New to Courier
by Ian Pilcher 02 Feb '01

02 Feb '01

Gavriel State wrote: > > Just FYI, the corelwine tree has support for psdrv font mapping that > you might be able to use - it uses the wine config file rather than > the registry to store font aliases, but as I recall it was a pretty > minor change in the psdrv code. > This may be a stupid question, but where is the Corel Wine tree? -- ======================================================================== Ian Pilcher pilcher(a)concentric.net ========================================================================

3 2

Re: fix teb crash
by Andreas Mohr 01 Feb '01

01 Feb '01

On Thu, Feb 01, 2001 at 12:32:34AM +0100, gerard patel wrote: > At 12:12 PM 31/1/01 +0100, you (amohr(a)codeweavers.com) wrote: > >The terminated thread had done a SendMessage before, however, and when > >the receiving thread tried to reply to that SendMessage, the sending thread > >was gone, which resulted in a crash as queue->teb was invalid. > > <snip> > > I remember having looked at some crash akin to this one; I had > never the time to find the proper fix, but my impression was rather > that the problem was that Wine don't destroy windows when a thread > is terminated through TerminateThread(). Nope, I don't think so. The part doing this is: [cleanup] Call kernel32.443: GlobalFree(403b4864) ret=010043cd fs=02c7 Ret kernel32.443: GlobalFree() retval=00000000 ret=010043cd fs=02c7 Call kernel32.273: FreeResource(0101225c) ret=01004730 fs=02c7 Ret kernel32.273: FreeResource() retval=00000000 ret=01004730 fs=02c7 Call user32.500: SendMessageA(00000138,00000fa1,00000001,00000000) ret=01004777 fs=02c7 trace:relay:WINPROC_CallWndProc (wndproc=0x40751990,hwnd=00000138,msg=WM_USER+0ba1,wp=00000001,lp=00000000) trace:relay:WINPROC_CallWndProc (wndproc=0x1002f20,hwnd=00000138,msg=WM_USER+0ba1,wp=00000001,lp=00000000) Call kernel32.685: TerminateThread(00000048,00000000) ret=01002f65 fs=008f err:win:UserSignalProc uCode: 32 err:system:UserSignalProc Ret kernel32.685: TerminateThread() retval=00000001 ret=01002f65 fs=008f Call user32.188: EndDialog(00000138,00000001) ret=0100307f fs=008f trace:dialog:EndDialog 0138 1 trace:relay:WINPROC_CallWndProc (wndproc=0x40722ac0,hwnd=00000228,msg=WM_KILLFOCUS,wp=00000138,lp=00000000) trace:win:GetClientRect (0,0 - 75,21) trace:relay:WINPROC_CallWndProc (wndproc=0x40751990,hwnd=00000138,msg=WM_CTLCOLORBTN,wp=0000005c,lp=00000228) trace:relay:WINPROC_CallWndProc (wndproc=0x1002f20,hwnd=00000138,msg=WM_CTLCOLORBTN,wp=0000005c,lp=00000228) trace:relay:WINPROC_CallWndProc (wndproc=0x1002f20,hwnd=00000138,msg=WM_CTLCOLOR This is a dialog with a progress bar, BTW. So it seems the progress bar is a separate thread of the dialog, which is probably also responsible for extracting files. And this worker thread does a SendMessage to the original thread, which then does a TerminateThread of the sending thread and an EndDialog to close the whole dialog. And after that the window proc returns and Wine wants to send the window procs result to the sending thread, only to discover that the originating thread doesn't *exist* any more and to crash ! That's why we need this fix IMHO. Andreas Mohr

1 0

Present status of DOS support
by Uwe Bonnes 01 Feb '01

01 Feb '01

Hallo, it seems that libwinedos.so is missing some functions on my system: hertz:/spare/bon/wine> wine -- /dosc/local/pkunzip.exe eagle-4.0g.exe ... fixme:win32:ELF_FindExportedFunction function GetCurrent not found: /spare/bon/wine/dlls/libwinedos.so: undefined symbol: GetCurrent fixme:win32:ELF_FindExportedFunction function LoadDPMI not found: /spare/bon/wine/dlls/libwinedos.so: undefined symbol: LoadDPMI ... Did I forget to configure something? But with a grep through the sources, I couldn't find a place were LoadDPMI was defined. Bye Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

2 1

Re: WINE_UNICODE_TEXT
by Francois Gouget 01 Feb '01

01 Feb '01

On Mon, 29 Jan 2001, Jon Griffiths wrote: > Hi, > > This patch removes the warnings from the WINE_UNICODE_TEXT macro and fixes an > obscure (read: uninvestgated) bug where the value of WCHAR('x') + 1 is off by You mean WINE_UNICODE_TEXT('x')+1 != WINE_UNICODE_TEXT('y') ? I see why this could happen: gcc considers that the expression is of type WCHAR* and since sizeof(WCHAR)==2, it just adds two. > one. Currently 2-3 warnings are generated whenever TEXT() is used in Winelib > programs, depending on whether a string or char is the target. > > Only one warning remains, when using WCHAR('x') the result should be > explicitly cast to WCHAR to get rid of it. If you do this -Wall is blissfully > silent once again... Which means you get warnings too. I'm not too convinced about this patch especially because it does not return the proper type. On the other hand it seems what I did returns a WCHAR* (after a fashion). But it seems there's no really good solution (besides -fshort-wchar) :-(. If you are going to modify your source, I think casting TEXT('x') to WCHAR is not the solution. The solution is to not use TEXT (and equivalents) on characters. -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Linux: It is now safe to turn on your computer.

2 3

Re: signed char
by Uwe Bonnes 01 Feb '01

01 Feb '01

Josh DuBois writes: > { > - char *p = (char*) p_data; > + signed char *p = (char*) p_data; ^signed Shouldn't the cast be for the targert variable? Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel