- wine-devel - winehq.org

Dont allow SetSelectorBase to change into an kernel region
by Uwe Bonnes 01 Aug '01

01 Aug '01

Hallo, galep3 crashes with following sequence: 096c7b38:Call KERNEL.189: SETSELECTORLIMIT(0x0d87,0x0000045f) ret=02e7:6fb5 ds=099f 096c7b38:Ret KERNEL.189: SETSELECTORLIMIT() retval=0x0d87 ret=02e7:6fb5 ds=099f 096c7b38:Call KERNEL.187: SETSELECTORBASE(0x0d87,0xc02924e0) ret=02e7:6fc1 ds=099f 096c7b38:Ret KERNEL.187: SETSELECTORBASE() retval=0x0d87 ret=02e7:6fc1 ds=099f ... Unhandled exception: page fault on read access to 0xc0292545 Obviously the application trys to reach some kernel memory. If I only allow to set the selector base when (selector base + selector limit) is smaller than 0x8000000, the application goes on and lets me read an eprom plugged into the Galep3 Programmer. Is the appended fix a right acceptable? Index: wine/memory/selector.c =================================================================== RCS file: /home/wine/wine/memory/selector.c,v retrieving revision 1.39 diff -u -r1.39 selector.c --- wine/memory/selector.c 19 Jul 2001 00:39:10 -0000 1.39 +++ wine/memory/selector.c 1 Aug 2001 17:30:48 -0000 @@ -327,7 +327,12 @@ LDT_ENTRY entry; wine_ldt_get_entry( sel, &entry ); wine_ldt_set_base( &entry, DOSMEM_MapDosToLinear(base) ); - wine_ldt_set_entry( sel, &entry ); + if ((base + wine_ldt_copy.limit[sel >> __AHSHIFT]) > 0x8000000) + { + FIXME("Illegal region base %lx limit %lx\n", base,wine_ldt_copy.limit[sel >> __AHSHIFT]); + } + else + wine_ldt_set_entry( sel, &entry ); return sel; } Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

1 1

Strange window handle in the trace
by Marco Bizzarri <m.bizzarri＠icube.it> 01 Aug '01

01 Aug '01

Hi all. I'm working on a no-windows installation. The system is a RH 6.2 system, upgraded to the latest patches. I've installed XFree4 and KDE 2.1 I'm experiencing an unhandled exception when I try to a VC application. The application works (almost) fine until it opens a selection dialog, with a list on it. As you can see from the trace, it is trying to do an RDW_UpdateRgns with a wndPtr of 0xffff Unhandled exception: page fault on read access to 0x08fd506b in 32-bit code (0x406d1771). In 32-bit mode. Symbol h_errno is invalid Symbol hack_digit is invalid 0x406d1771 (RDW_UpdateRgns+0x3c9 [painting.c:720] in libuser32.so): testb $ 0x10,0x6b(%esi) 720 if( wnd->dwStyle & WS_VISIBLE ) Wine-dbg>bt Backtrace: =>0 0x406d1771 (RDW_UpdateRgns+0x3c9(wndPtr=0xffff, hRgn=0x0, flags=0x180, firstRecursLevel=0x0) [painting.c:720] in libuser32.so) (ebp=405b1bc4) 1 0x406d1787 (RDW_UpdateRgns+0x3df(wndPtr=0x40377824, hRgn=0x0, flags=0x180, firstRecursLevel=0x0) [painting.c:721] in libuser32.so) (ebp=405b1c20) 2 0x406d1787 (RDW_UpdateRgns+0x3df(wndPtr=0x40377538, hRgn=0x0, flags=0x180, firstRecursLevel=0x1) [painting.c:721] in libuser32.so) (ebp=405b1c7c) 3 0x406d1e08 (RedrawWindow+0x38c(hwnd=0x43f0, rectUpdate=0x0, hrgnUpdate=0x0, flags=0x180) [painting.c:982] in libuser32.so) (ebp=405b1cd4) 4 0x406d1f1d (UpdateWindow+0x21(hwnd=0x43f0) [painting.c:1015] in libuser32.so) (ebp=405b1cf0) 5 0x0043df7a (<Debugged process>.EntryPoint+0x13625 in <Debugged process>) (ebp=0046e660) 6 0x00000623 (ebp=000044e4) Just for "fun", I've tryied to add checks for 0xffff, but it crashes when it enters non Wine DLL (actually they are Spread dlls from Farpoint) Any clue? Thanks you all in advance Bye Marco -- Marco Bizzarri - Responsabile Tecnico - Icube S.r.l. Sede: Via Ridolfi 15 - 56124 Pisa (PI), Italia E-mail: m.bizzarri(a)icube.it WWW: www.icube.it Tel: (+39) 050 97 02 07 Fax: (+39) 050 31 36 588

1 0

CloseHandle with 0xffffffff parameter
by Marco Bizzarri 01 Aug '01

01 Aug '01

Hi All. While trying to make an application working under wine, I've stumped into the following trace fragment, obtained with --debugmsg +relay: 081612c8:Call kernel32.CreateFileA(405f6454 "c:\\rs\\project\\apitest\\vc\\32\\apitestvc60\\debug\\ret_dll.pdb",80000000,00000001,00000000,00000003,00000080,00000000) ret=404aa001 081612c8:Ret kernel32.CreateFileA() retval=ffffffff ret=404aa001 081612c8:Call kernel32.CloseHandle(ffffffff) ret=404aa0bd 081612c8:Ret kernel32.CloseHandle() retval=00000000 ret=404aa0bd As you can see, the program is trying to open a file, which is not found. An invalid handle (ffffffff) is returned. The program however closes the handle. My question is: is this correct? Should the CloseHandle check to see if it is a correct handle? Thank you all in advance Marco Bizzarri -- Marco Bizzarri - Responsabile Tecnico - Icube S.r.l. Sede: Via Ridolfi 15 - 56124 Pisa (PI), Italia E-mail: m.bizzarri(a)icube.it WWW: www.icube.it Tel: (+39) 050 97 02 07 Fax: (+39) 050 31 36 588

1 0

Documenting functions
by Bill Medland 01 Aug '01

01 Aug '01

Getting back to what we are and are not allowed to do.. Suppose I am looking at a low-level function that I believe is only 75%-complete (the most important 75% of course and no disrespect meant to those who have got it that far). One of the problems with it is it is not totally clear EXACTLY what the function should do in some of its more esoteric modes. To me the first task is to define what it should do and that should be part of the documentation of the function. The particular function currently does not have any true documentation within the code; the best documentation of what it does is the code itself, and the best documentation of what it should do is the MSDN description of the function. 1. Should the function be completely defined in its header in the source code (which will probably make the header twice as large as the function) or should the details be put somewhere else. 2. Are we walking into copyright danger if the Wine documentation of the function is clearly based on the MSDN documentation, even if we acknowledge that. 3. Are we interested in that level of documentation? Bill

4 3

Re: Patch to fix the Linux 2.2 joysitck interface
by Alexandre Julliard 31 Jul '01

31 Jul '01

David Hagood <wowbagger(a)sktc.net> writes: > To be done: the file descriptor is never closed under normal > circumstances - this might be a problem if a Wine app is opened and > accesses the stick, as the file descriptor will be open until that > process terminates. If this is viewed as a problem, it would be a simple > matter to add a device close function to the Wine driver to close the FD. Shouldn't this be done in the driver DRV_OPEN/DRV_CLOSE calls then? Any joystick experts out there? (BTW please use diff -u to generate patches, the default diff format is unreadable). -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: RFC: Patch for making GrabPointer work
by Alexandre Julliard 31 Jul '01

31 Jul '01

Jukka Heinonen <jhei(a)iki.fi> writes: > Storing old windows procedure in struct x11drv_win_data > would remove the worst race, but unless window > procedure update is atomic, it would not remove > all races. Since you have the window locked when changing the wnd proc the update will be atomic. The only problem I see is that your wnd proc might get called to process some other message, but you can solve this by having it chain to the previous wnd proc for all messages except the special one. -- Alexandre Julliard julliard(a)winehq.com

2 1

Relocatoion and ExceptionFilter problem?
by EriK W 30 Jul '01

30 Jul '01

Now I finally made a wine , :) But I can't get any program to excute so far, mostly It is like bash-2.03# wine --winver win95 sol.exe err:seh:UnhandledExceptionFilter Couldn't start debugger (debugger/winedbg 134639312 24) (2) Read the Wine Developers Guide on how to set up winedbg or another debugger or bash-2.03# wine --winver win98 icq2000b.exe err:win32:do_relocations Standard load address for a Win32 program not available - patched kernel ? err:win32:do_relocations FATAL: Need to relocate F:\export\home\ericw\system\icq2000b.exe, but no relocation records present (stripped during link). Try to run that file directly ! wine: can't exec 'icq2000b.exe': error=21 This wine seems taste not good, :) Francois Gouget wrote: > On Thu, 26 Jul 2001, EriK W wrote: > > > > What does not work? Do you have unicode/libwine_unicode.so or not? > > > Does the following command run or does it say it cannot find > > > libwine_unicode.so? > > > > > I does have the libwine_unicode.so > > but it just don't go to ~unicode directory to search for it, it always > > report " can't find it in /usr/local/lib" I don't know why, I am using bash, > > so I just simply copied libwine_unicode.so over to make it happy. > > I was wondering if it was the shell not exporting the environment > variable or something. Since you're using bash it should be all fine. > So you have to figure out why setting LD_LIBRARY_PATH does not work. > It's supposed to work. I'm 99.9% sure I did use it on Sparc Solaris so I > really don't see why it would not work on Solaris x86. Plus > LD_LIBRARY_PATH is such an important thing that it would be very > surprising if it really did not work and nothing else was broken in your > system. > > Did you try specifying an absolute path like: > LD_LIBRARY_PATH=/export/home/system/wine-20010629/unicode ./tools/winebuild/winebuild > > What does 'echo $LD_LIBRARY_PATH' normally say? Is it empty? > > [...] > > take it out? > > Can I do that by commenting " > > LIBPROGRAMS = \ > > debugger/winedbg" ? > > The following patch should do that nicely: > > --- cut here --- > Index: Makefile.in > =================================================================== > RCS file: /home/wine/wine/debugger/Makefile.in,v > retrieving revision 1.24 > diff -u -r1.24 Makefile.in > --- Makefile.in 2000/12/29 05:38:00 1.24 > +++ Makefile.in 2001/07/27 01:39:15 > @@ -3,7 +3,7 @@ > TOPOBJDIR = .. > SRCDIR = @srcdir@ > VPATH = @srcdir@ > -MODULE = winedbg > +MODULE = #winedbg > > C_SRCS = \ > break.c \ > --- Makefile.orig Thu Jul 26 19:03:36 2001 > +++ Makefile Thu Jul 26 19:00:53 2001 > @@ -3,7 +3,7 @@ > TOPSRCDIR = .. > TOPOBJDIR = .. > SRCDIR = . > -MODULE = winedbg > +MODULE = #winedbg > > C_SRCS = \ > break.c \ > --- cut here --- > > -- > Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ > Broadcast message : fin du monde dans cinq minutes, repentez vous !

2 2

RE: Small OpenGL patch
by Patrik Stridvall 30 Jul '01

30 Jul '01

> It also puts the 'make_opengl' script in line with the latest > modification > to the spec file. It also changes the OPENGL32.@ to OPENGL.@ > as per Patrik's > modifications in 'make_opengl'. Arrgghhh! I just saw that I didn't do the same change in the script as in the .c files (I didn't run the script, since it worked badly last time I tried with my OpenGL files). Braino. :-( It should of course be OPENGL32.@ not OPENGL.@. The .c files was correct as they were. Sorry to cause you problems but can you fix the script and rerun on your OpenGL files and resubmit. > PS: god I hate Perl... I may well rewrite 'make_opengl' in > Python one of > these days :-) Whats wrong with Perl? I write applications sometimes in Perl and sometimes in Python, and I like them both and a dislike somethings about each language as well. Of course Perl is a little more difficult to learn but still. PS. You will se one of the advantages of Perl if you add use strict; at the top of the script. Of course after that you will have to declare all variable to it keeps the number of bugs down.

1 0

RE: winapi update
by Patrik Stridvall 30 Jul '01

30 Jul '01

> > In short, please apply it, they facillitates using the > > winapi tools alot and might make more people actually > > use them. They don't hurt anything. > > The problem is if we make it part of the default make install all Wine > distributions will include these non-functional (from the user POV) > scripts, and I don't think this is a good idea. That is true. > So I have applied it > but it doesn't run by default; developers who want it should run make > install in the tools/winapi directory. Ah, of course. Good idea. Thanks. This brings to mind the fact that three different kinds of "users": 1. Ordinary users 2. Wine/Winelib developers 3. Winelib application developers that need different kinds of tools installed. Not that I have any good solution to the problem. And not something that really is a problem either. Is was just something that occured to me. Oh well. Never mind.

1 0

Re: winapi update
by Alexandre Julliard 30 Jul '01

30 Jul '01

Patrik Stridvall <ps(a)leissner.se> writes: > A full install is largely meaningless since the winapi tools are made > for work on a Wine source tree, so making them independant of such > a tree is largely meaningless. Agreed. > In short, please apply it, they facillitates using the > winapi tools alot and might make more people actually > use them. They don't hurt anything. The problem is if we make it part of the default make install all Wine distributions will include these non-functional (from the user POV) scripts, and I don't think this is a good idea. So I have applied it but it doesn't run by default; developers who want it should run make install in the tools/winapi directory. -- Alexandre Julliard julliard(a)winehq.com

1 0

broken misc/version.c (patch 1.43 -> 1.44) WIN95 value in version16
by Ladislav Sladecek 30 Jul '01

30 Jul '01

Two days ago a 16 bit application, which I use, started to complain about unknown windows version. After I rgressed to 1.43 of misc/version.c, everything was OK. I found the problem in the GetVersionInfo value that you changed at line 75 of the file. My windows 95 returns 0xC0000004 in WIN32 and 0x07005F03 in WIN16. You changed the 16bit value from 0x7005F03 to 0x7000304. Can you please check this? Do you have some docs? I think that we that we are both right; the value probably depends on longitude, altitude, and Windows language version. Mine iWindows 95 is Czech Edition, SR2. Regards Ladislav Sladecek

1 0

RE: winapi update
by Patrik Stridvall 30 Jul '01

30 Jul '01

> Patrik Stridvall <ps(a)leissner.se> writes: > > > I have resent winapi_install patch. > > > > While it probably that you didn't apply > > it because of lack of time I resend > > for your convinience. If not please > > explain. > > Correct me if I'm wrong, but it seems you are not actually installing > anything, only a script that needs the Wine source tree to work. That is a correct conclusion. > I don't really see the point. The point is that when you are in some sub directory of a wine tree, you can just write winapi_check or make_filter and whatever and it will call the correct version of the tool. Instead of having to type, if you are in dlls/winsock. ../../tools/winapi_check Sure you can currently do make winapi_check or make filter and adding winapi_{extract,fixup} is trivial but giving arguments through make is a little awkward. That why I wrote a few script to fix this and now when I have a tool (make_filter) that could possibly enjoy a wider use I decided to make a formalized "install" for them. > If you want to install something it should > be a complete installation that works without external files (not that > I suggest doing that for winapi_check, at least not by default). A full install is largely meaningless since the winapi tools are made for work on a Wine source tree, so making them independant of such a tree is largely meaningless. Well they actually are indendent of the specific tree they where install from. They do not reference to it at all. They use the current directory to find the real winapi tools in that tree. They will work equally well with any tree (of a later date than your hopefull application of the patch that is). They are as they are by design, not by mistake, and complete installation of them is almost completly meaningless. Sure there might be future winapi tools worthy of a complete install, a future tool for automatical generation of .spec files from any Winelib application, that we talked about some time ago, comes to mind, but I'm not there quite yet. I have begun to implement simple typedef parsing but it doesn't work 100% yet. In short, please apply it, they facillitates using the winapi tools alot and might make more people actually use them. They don't hurt anything.

1 0

Re: winapi update
by Alexandre Julliard 30 Jul '01

30 Jul '01

Patrik Stridvall <ps(a)leissner.se> writes: > I have resent winapi_install patch. > > While it probably that you didn't apply > it because of lack of time I resend > for your convinience. If not please > explain. Correct me if I'm wrong, but it seems you are not actually installing anything, only a script that needs the Wine source tree to work. I don't really see the point. If you want to install something it should be a complete installation that works without external files (not that I suggest doing that for winapi_check, at least not by default). -- Alexandre Julliard julliard(a)winehq.com

1 0

Possible printer driver bug
by Jukka Heinonen 30 Jul '01

30 Jul '01

Wine compiled from CVS crashes since file "wine/dlls/gdi/driver.c" passes a NULL pointer to function CreateICA. The following patch stops crashing, but since I have no idea how Wine printer drivers work, this patch might be plain wrong. After this patch, Wine no longer crashes, but I haven't been able to test whether printing works or not. Index: wine/dlls/gdi/driver.c =================================================================== RCS file: /home/wine/wine/dlls/gdi/driver.c,v retrieving revision 1.2 diff -u -r1.2 driver.c --- wine/dlls/gdi/driver.c 2001/07/28 00:18:02 1.2 +++ wine/dlls/gdi/driver.c 2001/07/29 14:10:18 @@ -376,7 +376,7 @@ if(!DRIVER_GetDriverName( lpszDevice, buf, sizeof(buf) )) return -1; - if (!(hdc = CreateICA( buf, NULL, lpszPort, NULL ))) return -1; + if (!(hdc = CreateICA( buf, lpszDevice, lpszPort, NULL ))) return -1; if ((dc = DC_GetDCPtr( hdc ))) { -- Jukka Heinonen <http://www.iki.fi/jhei/>

2 1

Hi There
by Robert Laverick 30 Jul '01

30 Jul '01

Hi, I'm new to wine and while I've been messing about with it I've not acctualy done anything significant. I'm mostly into Java but picked up some C recently doing some parallel comutational stuff as part of my Final year project as part of my degree. Now I'm officaly Unemployed as apposed to a Student I can give of my time freely. I'd love to get into this, if someone could give me a point at something that needs a good looking at then I'll start there. My biggest motivation is to get to understand this whole thing better and (if I'm luck) get Diablo II running so I don't have to reboot out of linux each time my Girlfriend comes round and demmands to kick my ass. :-) Well thanks in advance and I hope I can prove usefull. Rob PS anyone who want's to be nice enough to offer me a job DO IT NOW PLEASE I'M SKINT!

1 0

Wine Unreal and a strange old problem
by FT Rathore 29 Jul '01

29 Jul '01

Hi I have been using wine to play Unreal for a long time, but it would always crash in the start when I play as root or when I have my /dos filsystem mounted rw. It would always blow my mind, but I would fail to catch it. (been happenning for years too). I copied the whole Unreal tree to my ext2 filesystem and tried with different file permissions. I came to reallize that wine will allways crash if the file Unreal.log in Unreal/System is writeable. If I make that file read only, wine works flawlessly and I can do everything including save/load games. I tried to debug it, but the clues were very strange. There is only one message I see before the crash: err:seh:EXC_DefaultHandling Exception frame is not in stack limits => unable to dispatch exception. Besides that there is not much different between the good and the bad traces. I am attaching last 2000 lines of "-debugmsg +all" with this message. Someone might be able to get some sense from the trace. Anything else I sould do? FT

1 0

Re: wnd lock tracing
by Alexandre Julliard 29 Jul '01

29 Jul '01

Andreas Mohr <a.mohr(a)mailto.de> writes: > Add a #define DBG_WNDLOCK in order to have reasonable wndlock debugging Please don't add #ifdefs. You should use a debug channel. -- Alexandre Julliard julliard(a)winehq.com

1 0

RE: -DSTRICT warning fixes
by Patrik Stridvall 29 Jul '01

29 Jul '01

> Patrik Stridvall <ps(a)leissner.se> writes: > > > Sure Win64 should use 64-bit pointers as handles that is > > without questions, but forcing it on Win32 on 64-bit > > is totally unnessary > > This may be the root of your misunderstanding: there is no such thing > as Win32 on 64-bit platforms. Wine (and Winelib) implement Win32 on > 32-bit platforms, and Win64 on a 64-bit platform. Well, actually Win32 does exist (or rather existed, it has been discontinue by Microsoft) on Alpha. But, never mind, it doesn't matter. The point is somebody has souce code for a Windows application and wishes that it will run on Alpha. He or she doesn't care whether Win32 on 64-bit exists or not he wished to port his application with as little effort as possible. He or she doesn't care what magic Winelib does as long as it works and he has to change the source as little as possible. > If you want to > compile your apps as Win32, you need a 32-bit compiler. Sure thats an idea, but doing that is a little awkard, no 32-bit compiler currently exists for 64-bit platforms AFAIK. While this might work, at least in theory, if you only call the Win32 API, how do you suggest calls to 64-bit Unix libraries should be handled? > Then you use > the same compiler to build Wine as a Win32 library, and everything > works fine. If you use a 64-bit compiler, some types (including > handles) become 64-bit, and you have to deal with it. Since you refuse to make it easier for the porter, sure he or she will have to deal with it, that is pretty obvious isn't it? The question is what can we do to make it easier for the porters. We can almost always say "We don't care, its your problem", so that is not an argument by itself. Sure we can't do the impossible, and some things takes to much effort, but still. > The only possible exception would be running existing Win32 binaries > on ia64. And I'm not even convinced it needs an exception, it's > probably easier to simply build a version of Wine with the 32-bit gcc > than to try to come up with a translation layer. Well, that is a future problem. I don't know exactly how to handle it either, but as you pointed out earlier since we need to convert 32-bit pointers to 64-bit pointers we might as well convert 32-bit handlers to 64-bit handlers the same way. Of course that doesn't mean that being able to compile Winelib with handle as 32-bit integers won't help, but I really can't say whether or not right now.

1 0

Re: -DSTRICT warning fixes
by Alexandre Julliard 29 Jul '01

29 Jul '01

Patrik Stridvall <ps(a)leissner.se> writes: > Sure Win64 should use 64-bit pointers as handles that is > without questions, but forcing it on Win32 on 64-bit > is totally unnessary This may be the root of your misunderstanding: there is no such thing as Win32 on 64-bit platforms. Wine (and Winelib) implement Win32 on 32-bit platforms, and Win64 on a 64-bit platform. If you want to compile your apps as Win32, you need a 32-bit compiler. Then you use the same compiler to build Wine as a Win32 library, and everything works fine. If you use a 64-bit compiler, some types (including handles) become 64-bit, and you have to deal with it. The only possible exception would be running existing Win32 binaries on ia64. And I'm not even convinced it needs an exception, it's probably easier to simply build a version of Wine with the 32-bit gcc than to try to come up with a translation layer. -- Alexandre Julliard julliard(a)winehq.com

1 0

toolbar fix
by nog 29 Jul '01

29 Jul '01

Hi all, Changelog: Nog <nog(a)sdf.lonestar.org> Don't enable the 'hot' state of a toolbar button when it's not enabled. --- dlls/comctl32/toolbar.c Sun Jul 29 09:08:56 2001 +++ dlls/comctl32/toolbar.c Sun Jul 29 11:41:50 2001 @@ -4123,13 +4123,13 @@ if (nHit >= 0) { btnPtr = &infoPtr->buttons[nHit]; - btnPtr->bHot = TRUE; infoPtr->nHotItem = nHit; /* only enabled buttons show hot effect */ if(infoPtr->buttons[nHit].fsState & TBSTATE_ENABLED) { + btnPtr->bHot = TRUE; InvalidateRect(hwnd, &btnPtr->rect, TOOLBAR_HasText(infoPtr, btnPtr)); }

1 0

RFC: Patch for making GrabPointer work
by Jukka Heinonen 29 Jul '01

29 Jul '01

After the following patch DXGrab works again. However, this patch has quite a few potential races, so I am not going to submit this to wine-patches. Storing old windows procedure in struct x11drv_win_data would remove the worst race, but unless window procedure update is atomic, it would not remove all races. I'm starting to think that QueueUserAPC used together with OpenThread (which does exist in Windows 2000/Me, but not yet in Wine) is the correct way to fix DXGrab. Index: wine/dlls/x11drv/x11ddraw.c =================================================================== RCS file: /home/wine/wine/dlls/x11drv/x11ddraw.c,v retrieving revision 1.9 diff -u -r1.9 x11ddraw.c --- wine/dlls/x11drv/x11ddraw.c 2001/06/04 21:55:17 1.9 +++ wine/dlls/x11drv/x11ddraw.c 2001/07/29 13:41:52 @@ -45,20 +45,64 @@ } } -static void GrabPointer(HWND hWnd) -{ +static LRESULT WINAPI GrabWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ Display *display = thread_display(); - if (hWnd) { - /* find the X11 window that ddraw uses */ - Window win = X11DRV_get_whole_window(hWnd); - TRACE("WND: %x win: %ld\n", hWnd, win); - if (!win) { - TRACE("host off desktop\n"); - win = root_window; - } - TSXGrabPointer(display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime); + + if(message != 0x7777) { + ERR("Unrecognized message %d, expect trouble!\n", message); + return 0; } - else TSXUngrabPointer(display, CurrentTime); + + TRACE("hwnd=%d, grab=%d\n", hWnd, wParam); + + if (wParam) + { + /* find the X11 window that ddraw uses */ + Window win = X11DRV_get_whole_window(hWnd); + TRACE("X11 window: %ld\n", win); + if (!win) { + TRACE("host off desktop\n"); + win = root_window; + } + + TSXGrabPointer(display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime); + TSXSetInputFocus(display, win, RevertToParent, CurrentTime); + } + else + { + TSXUngrabPointer(display, CurrentTime); + } + + return 0; +} + +static void GrabPointer(HWND hWnd, BOOL grab) +{ + WND* pWnd; + WNDPROC pOldProcedure; + + pWnd = WIN_FindWndPtr(hWnd); + if(!pWnd) + return; + + pOldProcedure = pWnd->winproc; + pWnd->winproc = GrabWndProc; + + WIN_ReleaseWndPtr(pWnd); + + SendMessageA(hWnd, 0x7777, grab ? 1 : 0, 0); + + pWnd = WIN_FindWndPtr(hWnd); + if(!pWnd) + return; + + if(pWnd->winproc != GrabWndProc) + ERR("Window procedure has been changed!\n"); + else + pWnd->winproc = pOldProcedure; + + WIN_ReleaseWndPtr(pWnd); } static DWORD PASCAL X11DRV_DDHAL_DestroyDriver(LPDDHAL_DESTROYDRIVERDATA data) @@ -75,7 +119,7 @@ X11DRV_DD_PrimaryGbl = X11DRV_DD_Primary->lpGbl; SetPrimaryDIB(GET_LPDDRAWSURFACE_GBL_MORE(X11DRV_DD_PrimaryGbl)->hKernelSurface); X11DRV_DD_UserClass = GlobalFindAtomA("WINE_DDRAW"); - if (dxgrab) GrabPointer(X11DRV_DD_PrimaryWnd); + if (dxgrab) GrabPointer(X11DRV_DD_PrimaryWnd, TRUE); } data->ddRVal = DD_OK; return DDHAL_DRIVER_NOTHANDLED; @@ -108,12 +152,12 @@ static DWORD PASCAL X11DRV_DDHAL_DestroySurface(LPDDHAL_DESTROYSURFACEDATA data) { if (data->lpDDSurface == X11DRV_DD_Primary) { + if (dxgrab) GrabPointer(X11DRV_DD_PrimaryWnd, FALSE); X11DRV_DD_Primary = NULL; X11DRV_DD_PrimaryWnd = 0; X11DRV_DD_PrimaryGbl = NULL; SetPrimaryDIB(0); X11DRV_DD_UserClass = 0; - if (dxgrab) GrabPointer(0); } data->ddRVal = DD_OK; return DDHAL_DRIVER_HANDLED; -- Jukka Heinonen <http://www.iki.fi/jhei/>

1 0

RE: -DSTRICT warning fixes
by Patrik Stridvall 29 Jul '01

29 Jul '01

> Patrik Stridvall <ps(a)leissner.se> writes: > > > Does the Windows API really define exactly what a handle is? > > typedef void* HANDLE seems pretty clear to me. I was refering some documentation that said that application should always expect a handle to be a pointer. But never mind. Documentation and reality is often different things. > > However your suggestion that any Winelib application that > cares whether > > they are 32-bit or 64-bit are broken is a far too strict > IMHO and I see > > no reason to require porters to fix such things. > > An application that assumes that everything is 32-bit is broken, yes. > I don't see why handles are any different than other types; if > anything they should be less of a problem since they are supposed to > be opaque, so their size should not matter for the application. > > Of course most handles will fit in 32-bit, so we will still support > apps that do invalid casts and truncate the handles; but this doesn't > mean it is correct behavior, or that apps that do this should be able > to compile without warnings. OK, since you agree we should accept handles truncated to 32-bit, it still leaves the problem. Should API calls truncate the handles themselves ie take 32-bit integers as arguments or should they not ie take 64-bit pointers as arguments. There is no particular reason to not accept both and make the actual definition of handle be dependent on some define and leave the choice on whether they want warnings or not to the Winelib developers, not leave them without a choice. Actually we might also consider giving them the option to accept 64-bit integers. In short, the Winelib developers should decide what their application wants (warning wise), we shouldn't. > > So therefor I suggest that we should do the following > > TRACE("(%p)", (LPVOID) handle); > > You must be joking. No, I'm not. However reality forced me to change the solution somewhat. See below. > I said I didn't want any typecast, and here you > suggest to have one on every single debugging output. Well, we have (or should have) a debugstr_[aw]n? on every single string in the debugging output, because we have to. We might not like it, but we have it because we must. > Let me repeat it > once more just in case: *NO* *TYPECASTS*. I know that you said that and I have said that I support that whenever possible, which it fortunately is in the normal cases. > The whole point of STRICT and pointer handles is to be able to use > compiler type checks, and this is only possible without typecasts. Agreed, but there is no self value in having no exceptions on a rule. Remember no type cast is a means no a goal. Debugging output is hardly a critical piece of code so if we can gain something from it we should consider making an exception. But never mind, it turns out that we we needn't make a exception either. See below. > Not > to mention that your solution will probably still get a warning like > "converting integer to pointer of different size" on a 64-bit > platform. Ah, thats a good point. Practice often stand in the way of a good theory. :-( Unfurtunately I think you are right, it is more than probable that the compiler will generate such a warning, I if not now so sometime in the future. Casting to a 32-bit integer to 64-bit pointer is almost always bogus, so there is no reason for the compiler not give a warning epecially since you can do a double cast (32-bit integer to 64-bit integer to 64-bit pointer) if you really mean it. Fortunately the problem is solvable #ifdef __alpha__ #ifdef STRICT #define HANDLE2POINTER(handle) (handle) #else #define HANDLE2POINTER(handle) ((void *) (unsigned long) (handle)) #endif #ifdef STRICT #define HANDLE2POINTER(handle) (handle) #else #define HANDLE2POINTER(handle) ((void *) (handle)) #endif #endif TRACE("(%p)", HANDLE2POINTER(handle)); This solves your problem (at least for 32-bit developers) < The whole point of STRICT and pointer handles is to be able to use < compiler type checks, and this is only possible without typecasts. Francois problem < * Ignore gcc's warnings saying '%x format, pointer argument'. Fixing the format < at this stage would only introduce tons of warnings for the developpers not < participating in the switch (i.e. compiling with STRICT off). as well as my problem. Of course we might consider making it a debug output only construct instead Like s/HANDLE2POINTER/debugptr_handle/ and define it in debugtools.h. Non-debugging parts of Wine shouldn't need to use it either since as I said earlier just pass them long or must use an explict cast to a non-void pointer. Ah, wait a minute we will have "converting integer to pointer of different size" on 64-bit platforms for the actual cast to an object. Of course easily solved with a similar #ifdef __alpha__ #define HANDLE2OBJECT(type, handle) ((type *) (unsigned long) (handle)) #else #define HANDLE2OBJECT(type, handle) ((type *) (handle)) #endif but perhaps we should have the HANDLE2POINTER (debugptr_handle) in debugtools.h all the same, nobody else is intrested in a void pointer anyway. Of course, nothing forces us to define handles as the same both internally and externally. At least Alpha AFAIK will be binary compatible all the same, so we might not even need this. Oh well having to always using HANDLE2OBJECT is a small price to pay all the same and makes it possible for us to do adjustments on other 64-bit platforms if need be. And yes, I'm serious. My inital solutions wasn't so good, but thanks to your feedback I have managed to refine it to a much better solution, that I think actually works in reality. And yes, I still consider the 64-bit problem a real problem, you just tries to dismiss the problem by simply saying, that is the Winelib developers problem. Sure we could do that but, remember that Winelib is meant to help developers port application not make it more difficult by trying to enforce unnessary restriction on the code. Sure Win64 should use 64-bit pointers as handles that is without questions, but forcing it on Win32 on 64-bit is totally unnessary, especially since I now finally after your feedback managed to find a solution that solve all your stated problems (remember that no type casts is a means not a goal and actually there will be no type casts on 32-bit (-DSTRICT) either). But perhaps you can see any flaws in this refined solution as well?

1 0

Re: -DSTRICT warning fixes
by Alexandre Julliard 29 Jul '01

29 Jul '01

Patrik Stridvall <ps(a)leissner.se> writes: > Does the Windows API really define exactly what a handle is? typedef void* HANDLE seems pretty clear to me. > However your suggestion that any Winelib application that cares whether > they are 32-bit or 64-bit are broken is a far too strict IMHO and I see > no reason to require porters to fix such things. An application that assumes that everything is 32-bit is broken, yes. I don't see why handles are any different than other types; if anything they should be less of a problem since they are supposed to be opaque, so their size should not matter for the application. Of course most handles will fit in 32-bit, so we will still support apps that do invalid casts and truncate the handles; but this doesn't mean it is correct behavior, or that apps that do this should be able to compile without warnings. > So therefor I suggest that we should do the following > TRACE("(%p)", (LPVOID) handle); You must be joking. I said I didn't want any typecast, and here you suggest to have one on every single debugging output. Let me repeat it once more just in case: *NO* *TYPECASTS*. The whole point of STRICT and pointer handles is to be able to use compiler type checks, and this is only possible without typecasts. Not to mention that your solution will probably still get a warning like "converting integer to pointer of different size" on a 64-bit platform. -- Alexandre Julliard julliard(a)winehq.com

1 0

RE: -DSTRICT warning fixes
by Patrik Stridvall 28 Jul '01

28 Jul '01

> Patrik Stridvall <ps(a)leissner.se> writes: > > > However for the debugging output I disagree. I orginally thought > > as Francois (and you it seems) that handles are pointers and should > > be treated as such. But then I realized that when we > implement Win32 on > > 64-bit platforms we can't have handles as pointers even > internally if > > we wan't to support x86 emulation and even exposing a 64-bit > > handle to Winelib application can only cause trouble since they > > might store it is a 32-bit memory location. Sure we will probably be > > able to handle 64-bit pointers truncated to 32-bit by storing all > > objects in the lower 32-bit part of memory, but fear it might > > cause trouble all the same. > > Handles are pointers in the Windows API, and they should be pointers > inside of Wine. On a 64-bit platforms pointers will be 64-bit, and so > will handles. Does the Windows API really define exactly what a handle is? It is just a identifier for an object that can be passed to various APIs but should not be used directly. > If you want to run 32-bit code on such a platform you > need a conversion for pointers anyway, > so you might as well use the > same conversion for handles. > Not to mention that some handles are > actually pointers (like HMODULE). That is an internal Wine/Winelib problem and shouldn't need to concern porters of Winelib applications. > So no, there is absolutely no reason > to force handles to be 32 bits. Handles are some sort of values as for as whether they are integers or pointers any Winelib application that cares are IMHO broken. I guess you agree on that point. However your suggestion that any Winelib application that cares whether they are 32-bit or 64-bit are broken is a far too strict IMHO and I see no reason to require porters to fix such things. Note that it might no be so easy to fix it either. Perhaps the application uses some external lib that provides storage of some user defined 32-bit data and use it to store the handles. Now it will suddenly not work anymore, and fixing it is not trival. Hint you are on a 64-bit platform that requires 64-bit pointers and you have 32-bit storage. The obvious solution an index of an array might not always work so well because of memory management requirements and beside the maintainer of the project might not accept a special patch for the 64-bit version. Anyway, never mind. See below instead. Sure pointer face in some meaning the same problems, but that sort of problems is more obvious and there is no reason to add more to the burden. > > The real reason that we should support compiling Wine with -DSTRICT > > is not because handles becomes pointers but because callbacks gets > > the correct prototype. > > No, it's because handles become pointers; you cannot do the -DSTRICT > typechecking with integers anyway. True, you can't do typechecking with integers but since Wine is primarily compiled 32-bit platform that will use 32-bit pointers, we will get the benefit of typechecking at the platform, which happends the only one Wine currently works on. Sure future developers on 64-bit will not find the errors then they compile, but everybody else compiling for a 32-bit platform will, so I don't see the problem. > Callbacks are a very minor issue; > the real point is to fix all incorrect handle manipulations, like > implicit 16-bit handle conversions or arithmetic on handle values. The ones of the above that can be found automatically will be fixed by the 32-bit developers. So the actual problem is what? Anyway, this discusion is getting a little carried away (mostly my fault). While I do not currenly agree that we really should use 64-bit handles on 64-bit platforms, your objections have made me think some more and made me come to the following conclusions. In order to not "close the door to the future" whether this is Win32 on 64-bit or Win64, the Wine code shouldn't internally not care (give errors or warnings or be semantically wrong) whether the header files: 1. Defines handles as integers or pointers 2. Defines handles as 32-bit or 64-bit (regardless of whether we have 32-bit or 64-bit pointers) This is not so a for the normal (non-debugging) code. OK, we might have to force memory allocation of objects for the lower 32-bit of memory if we have 64-bit pointers but that is probably not so large problem. After all the Winelib application itself can allocate memory on the full 64-bit memory range and Winelib itself are not likely to need more that 4Gb memory for objects. However, I see no really good solution for the debug output. Neither mine nor your previously suggested solution have the above properties. However the solution below have, I think TRACE("(%p)", (LPVOID) handle); eventhough it might display unnessary information on 64-bit platforms, but perhaps we should worry about that in the future, if it indeed is a problem at all. After all it is only a few more bytes in the debug output. So therefor I suggest that we should do the following TRACE("(%p)", (LPVOID) handle); It will fix the problem that Francois speaks of in bug report #90. < * Ignore gcc's warnings saying '%x format, pointer argument'. Fixing the format < at this stage would only introduce tons of warnings for the developpers not < participating in the switch (i.e. compiling with STRICT off). It will allow us to fix the debug output one by one (or at least seperately per type) since it will allow us compile without related warnings even without -DSTRICT as well as to prepare us for a possible future where handles might be 32-bit integers on 64-bit.

1 0

RE: -DSTRICT warning fixes
by Patrik Stridvall 28 Jul '01

28 Jul '01

> On Sat, 28 Jul 2001, Patrik Stridvall wrote: > [...] > > The real reason that we should support compiling Wine with -DSTRICT > > is not because handles becomes pointers but because callbacks gets > > the correct prototype. > > > > I case not you haven't realized the obvious, it doesn't matter if > > the handles are 32-bit integer or 32-bit pointers as long as > > all handles are the same. The code either > > No, I think you have missed something: when compiling with -DSTRICT > on all handles are not the same. Note I said same but meant compatible. Wrong choice of words. > For instance you cannot do > hDesk=hAccel. That's because with -DSTRICT on you have: > > typedef struct HDESK__ { int unused; } *HDESK; > typedef struct HACCEL__ { int unused; } *HACCEL; > > Thus HDESK and HACCEL are incompatible pointer types. This > brings us > more type safety which is the whole point of -DSTRICT. Oh sure, but the point is that if code, that are semanticly correct, cares whether you are strict or relax the type, the code it wrong. Perhaps I was I little unclear on that point. Being strict obviously makes it easier to find semantic errors, but that was not the point at all. > About 64bits Windows I don't know yet how we are going to do that. > But you have to check exactly what Windows 64bit does, not just > extrapolate from the way Unix 64bit does things. AFAIK the > approach used > by windows is quite different from that which Unices took. Yes, unfortunately, but I'm primarily worried about Win32 on 64-bit platforms.

1 0

RE: -DSTRICT warning fixes
by Patrik Stridvall 28 Jul '01

28 Jul '01

> > If we do that can just do > > s/DECLARE_OLD_HANDLE/DECLARE_HANDLE/ > > on the handle types on by one and fix the warnings. > > That's precisely the plan, and it is just the opposite of what you are > doing with your patch (you are turning DECLARE_HANDLE back into > DECLARE_OLD_HANDLE). The reason I did that was that they can't be fixed as long as HANDLE/HGLOBAL is the wrong types. When they become the right types the warnings will automatically disappear and we can do s/DECLARE_OLD_HANDLE/DECLARE_HANDLE/. But there is no reason to have a lot of warnings that can't be fixed otherwise until then. > Yes you get a number of warnings if you turn > -DSTRICT on, most of them should disappear once the conversion is > complete; fixing them before that is a waste of time. Since we can't fix before that why show them at all? People that want to fix for example output messages can do, s/DECLARE_OLD_HANDLE/DECLARE_HANDLE/ in their tree, fix them and submit the patches (without the s/DECLARE_OLD_HANDLE/DECLARE_HANDLE/). > This is the > reason why -DSTRICT is not the default yet. Read bug report #90, > Francois explains everything there. OK. I have read bug report #90 now. > And don't forget the number one rule of the -DSTRICT conversion is: > *no* *typecasts*. If you have to add typecasts something is wrong. No typecasts where the handle is used in conjuction with other handles, certainly not, no argument there. The code some expect all handles to be the of same type. However for the debugging output I disagree. I orginally thought as Francois (and you it seems) that handles are pointers and should be treated as such. But then I realized that when we implement Win32 on 64-bit platforms we can't have handles as pointers even internally if we wan't to support x86 emulation and even exposing a 64-bit handle to Winelib application can only cause trouble since they might store it is a 32-bit memory location. Sure we will probably be able to handle 64-bit pointers truncated to 32-bit by storing all objects in the lower 32-bit part of memory, but fear it might cause trouble all the same. Beside doing TRACE("(%p)", handle) on 64-bit platforms will needlessly display the always the same presumably zero upper 32-bit part of the handle. That why I decided to should use TRACE("(0x%08lx)", (DWORD) handle) instead to avoid such issues. In short, the code should IMHO support both 32-bit pointers as well and 32-bit integers as handles presuming of course that all handles use the same. The real reason that we should support compiling Wine with -DSTRICT is not because handles becomes pointers but because callbacks gets the correct prototype. I case not you haven't realized the obvious, it doesn't matter if the handles are 32-bit integer or 32-bit pointers as long as all handles are the same. The code either 1. Just pass them around as the same type of handles of other types of handles (HANDLE/HGLOBAL). 2. Tries to access the underlying object, in such case a void pointer will not do use any good, we must use a cast either after calls to functions like GlobalLock or alone.

2 1

Re: -DSTRICT warning fixes
by Alexandre Julliard 28 Jul '01

28 Jul '01

Patrik Stridvall <ps(a)leissner.se> writes: > However for the debugging output I disagree. I orginally thought > as Francois (and you it seems) that handles are pointers and should > be treated as such. But then I realized that when we implement Win32 on > 64-bit platforms we can't have handles as pointers even internally if > we wan't to support x86 emulation and even exposing a 64-bit > handle to Winelib application can only cause trouble since they > might store it is a 32-bit memory location. Sure we will probably be > able to handle 64-bit pointers truncated to 32-bit by storing all > objects in the lower 32-bit part of memory, but fear it might > cause trouble all the same. Handles are pointers in the Windows API, and they should be pointers inside of Wine. On a 64-bit platforms pointers will be 64-bit, and so will handles. If you want to run 32-bit code on such a platform you need a conversion for pointers anyway, so you might as well use the same conversion for handles. Not to mention that some handles are actually pointers (like HMODULE). So no, there is absolutely no reason to force handles to be 32 bits. > Beside doing TRACE("(%p)", handle) on 64-bit platforms will needlessly > display the always the same presumably zero upper 32-bit part > of the handle. That why I decided to should use > TRACE("(0x%08lx)", (DWORD) handle) instead to avoid such issues. Sorry but this is wrong. Handles are pointers and must be printed as pointers. Assuming that handles are always exactly 32-bit is very shortsighted. > The real reason that we should support compiling Wine with -DSTRICT > is not because handles becomes pointers but because callbacks gets > the correct prototype. No, it's because handles become pointers; you cannot do the -DSTRICT typechecking with integers anyway. Callbacks are a very minor issue; the real point is to fix all incorrect handle manipulations, like implicit 16-bit handle conversions or arithmetic on handle values. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: -DSTRICT warning fixes
by Alexandre Julliard 28 Jul '01

28 Jul '01

Patrik Stridvall <ps(a)leissner.se> writes: > Concerning some parts of my warnings patch that was > partly rejected I disagree with the rejection. > The patch in question is in warnings_rejected.diff. > Note the field "u" is a union. But perhaps you know > and rejected it for other reasons? I know it is a union; I thought it was one of these cases that would get fixed by -DSTRICT, but now I see that it is a slightly different problem. I'll apply it. > If you accept all the strict_*.diff patches, perhaps we > should consider adding -DSTRICT as a permanent flag? > It removes the HOOKPROC/TIMERPROC warnings that is not > possible to fix otherwise. > > If we do that can just do > s/DECLARE_OLD_HANDLE/DECLARE_HANDLE/ > on the handle types on by one and fix the warnings. That's precisely the plan, and it is just the opposite of what you are doing with your patch (you are turning DECLARE_HANDLE back into DECLARE_OLD_HANDLE). Yes you get a number of warnings if you turn -DSTRICT on, most of them should disappear once the conversion is complete; fixing them before that is a waste of time. This is the reason why -DSTRICT is not the default yet. Read bug report #90, Francois explains everything there. And don't forget the number one rule of the -DSTRICT conversion is: *no* *typecasts*. If you have to add typecasts something is wrong. -- Alexandre Julliard julliard(a)winehq.com

1 0

(no subject)
by Ladislav Sladecek 28 Jul '01

28 Jul '01

Alexandre Julliard: > I think GetClipBox is correct, the problem is > that the WM_ERASEBKGND > handler should not be using it, but > GetClientRect. You can try this: Hello Alexandre, thank you for your reccomendation. Unfortunately the DefWindowProc improvement does not help, because the default handler newer gets called in my app. The application (Progress _prowin.exe version 7) uses custom dialog boxes (forms) and also custom controls. The controls handle WM_ERASEBKGND themeselves. I have no access to the sources. What I know about GetClipRect, I know from the trace. I agree that your method (GetClientRect in the handler) is much better, but I cannot use it. I also agree that Windows should return the parent area in GetClipBox as Wine does. Unfortunalelly, the Windows do not do that while the _prowin.exe depends on it. I enclose a simple C example which I hacked to demonstrate this. The example displays two red children in a white parent. The value returned by GetClipBox is wsprintf-ed. If you run the binary in the Windows, you will see two properly sized red rectangles on a white background. If you run the same binary in Wine, you will see only one large red child but no white parent background. If either the CS_PARENTDC or WS_CLIPSIBLINGS gets removed from my example, both Windows and Wine give identical results. Regards Ladislav Sladecek

1 0

Re: -DSTRICT warning fixes
by Francois Gouget 28 Jul '01

28 Jul '01

- FIXME("(%x),stub!\n",hrasconn); + FIXME("(0x%08lx): stub\n", (DWORD) hrasconn); [...] I think I would rather use %p to print handles. After all they are pointers, not integers. The annoying aspect of it is that %08p is not very well supported IIRC. Maybe gcc has been fixed though. I forgot to mention it before. But I assume you saw bug #90. -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Advice is what we ask for when we already know the answer but wish we didn't -- Eric Jong

1 0

wine on clusters ??
by Francisco Perez 28 Jul '01

28 Jul '01

Hi everybody: Has anybody tried to run wine on a High Availabity cluster ?. Especifically we are interested on a Mosix environment where applications don't need be changed. The windows application to be clustered is a Remote IP network back-up system so no grafic intensive or plug modern like ActiveX and so. Any comments are highly apreciated thanks

1 0

Re: PATCH: wrong clipRect when CS_PARENTDC and WS_CLIPSIBLINGS styles are combined
by Alexandre Julliard 28 Jul '01

28 Jul '01

lsla(a)post.cz writes: > Where the Wine's GetClipRect returns the area of the parent, the > Windows version returns only the area of the child. Therefore in > Wine the WM_ERASEBKGND message erases the whole parent including the > other radio buttons. I think GetClipBox is correct, the problem is that the WM_ERASEBKGND handler should not be using it, but GetClientRect. You can try this: Index: windows/defwnd.c =================================================================== RCS file: /opt/cvs-commit/wine/windows/defwnd.c,v retrieving revision 1.57 diff -u -r1.57 defwnd.c --- windows/defwnd.c 2001/06/20 23:16:34 1.57 +++ windows/defwnd.c 2001/07/27 23:47:26 @@ -457,20 +457,15 @@ case WM_ICONERASEBKGND: { RECT rect; + HDC hdc = (HDC)wParam; HBRUSH hbr = GetClassLongW( wndPtr->hwndSelf, GCL_HBRBACKGROUND ); if (!hbr) return 0; - /* Since WM_ERASEBKGND may receive either a window dc or a */ - /* client dc, the area to be erased has to be retrieved from */ - /* the device context. */ - GetClipBox( (HDC)wParam, &rect ); - - /* Always call the Win32 variant of FillRect even on Win16, - * since despite the fact that Win16, as well as Win32, - * supports special background brushes for a window class, - * the Win16 variant of FillRect does not. - */ - FillRect( (HDC) wParam, &rect, hbr ); + /* GetClientRect used to be GetClipBox, but it is not what + * Windows does, and it breaks badly with CS_PARENTDC */ + GetClientRect( wndPtr->hwndSelf, &rect ); + DPtoLP( hdc, (LPPOINT)&rect, 2 ); + FillRect( hdc, &rect, hbr ); return 1; } -- Alexandre Julliard julliard(a)winehq.com

1 0

RE: winapi update
by Patrik Stridvall 27 Jul '01

27 Jul '01

> make_filter: : can't parse output: 'Make.rules.in is newer > than Make.rules, please rerun ./configure!' Fixed in my tree. > Would it be possible to have the messages pass through as-is when > they are not recognized (with the current directory for context)? [snip] > make_filter: gcc: can't parse output: 'd3ddevice/mesa.c:817: > warning: unused variable `xvis'' I have fixed that for gcc messages (unless --pedantic is specified), however I'm not sure it is good always doing that. I will think about it. > It looks like there's an incompatibility with colorgcc. [snip] > So it must be the controls characters added by colorgcc > that confuse > make_filter. No it wasn't, colorgcc checks whether STDOUT is a TTY or not.

1 0

RE: Even more misc fixes
by Patrik Stridvall 27 Jul '01

27 Jul '01

> > But OK I will try and compile with -DSTRICT and see what happends. > > IIRC somebody tried that but it didn't turn out so well. > > That would be me, probably. I started the conversion to -DSTRICT but > then other priorities came up and now it's on the back burner. I will > get back to it eventually but at the current rate it's hard > to know when > that will be :-( > Compiling with -DSTRICT is not that bad: with a relatively simple > patch it compiles (see attachement). Or at least, it used to. No patch is needed for the file in question. windows/property.c needs a simple patch though. > But there > are tons of warnings, which means tons of places that need > attention and > possibly fixing. That's where the work is. Yes. I've noticed that and I have fixed a few of them as well. However I'm not optimistic on fixing them all on the short term. The problem is not the number of them, the problem is that some of the warnings like the Global* can't be fixing in the .c files. It involves changing the .h files and that generated even more warnings. :-( I will investigate furher, but as I said, I'm not optimistic.

1 0

Re:Re: native dll's
by José Soriano Díaz 27 Jul '01

27 Jul '01

>From: Francois Gouget <fgouget(a)free.fr> >To: José Soriano Díaz <jose__sor(a)hotmail.com> >CC: wine-devel(a)winehq.com >Subject: Re: native dll's >Date: Thu, 26 Jul 2001 10:10:17 -0700 (PDT) > >On Wed, 25 Jul 2001, José Soriano Díaz wrote: > > > > > Hi there, I'm working in a telerobotics project and I need to >link a > > windows dll in order to use a Cybernet Joystick. > > First I tried to use the winAPI functions LoadLibrary, > > FreeLibrary and GetProccessAddress as I were working on Windows, and > > I recompiled my program with winelib: > > *. winemaker /my_path/ > > *. ./configure > > *. make all > > but it didn't create any executable, what I obtained was a > > lib*.so, because winemaker thought I was trying to compile a dll, > > not to use one. > > To force winemaker to generate an executable simply use it as >follows: > * type "winemaker --cuiexe /my_path" to indicate a console executable > * type "winemaker --guiexe /my_path" to indicate a graphical executable > > You can also use "winemaker -?" to get a list of options supported by >winemaker. > > > > So my question is quite siple How can I link a native dll in > > a Unix project? > > I think you have used the right approach: LoadLibrary / >GetProccessAddress / FreeLibrary. If that works for you then it's the >simplest approach. I'm afraid it doesn't work, when I executed what I compiled , I obtained "Undefined Symbol" in any call to the native dll. Thanks anyway for the advice. _________________________________________________________________ Descargue GRATUITAMENTE MSN Explorer en http://explorer.msn.es/intl.asp

2 1

[Fwd: Re: Any use for glyph bounding boxes in printer driver?]
by Ian Pilcher 27 Jul '01

27 Jul '01

Travis Michielsen wrote: > > What about GetCharABCWidth* what does this function use? (or could it use > this?) I see the function still shows a fixme (or atleast the last time I > checked). > The only one that works for printer fonts is GetCharABCWidthsFloat. I just tested it on Windows 2000 and verified that it always returns 0 for abcfA and abcfC (and returns the advance width in abcfB) when it is called on a printer font. -- ======================================================================== Ian Pilcher ian.pilcher(a)home.com ========================================================================

1 0

Re: ChangeDisplaySettings
by Travis Michielsen 27 Jul '01

27 Jul '01

--- Lionel Ulmer <lionel.ulmer(a)free.fr> wrote: > > This patch partially implements the ChangeDisplaySettings* functions. > > Well, I am 100 % sure that Alexandre will reject it :-) :-\ > If you want to do something like that, you need to implement the feature in > the X11 driver and then call it via the 'USER_Driver.pFunctionName' > protocol. Hmm, I was going to try something like that, however, I had problems with that method simply b/c of the load order between the dlls. ChangeDisplaySettings is implemented in user32.dll which loads BEFORE x11drv. This makes it impossible to initalize the function with the user32.dll. However, with DDraw, the x11drv.dll is loaded before the ddraw.dll! The only way I saw to exchange info was to initialize the function with a call from x11drv.dll. If you can suggest an alternative that takes load order into account I will likely use it. > Moreover, there are already some DDraw-related mode change functions (in > dlls/x11drv/xvidmode.c). This should be factorized between both code. Already using so of that code, although it could probably be cleaned up a bit. I will get to that soon. - Travis Michielsen __________________________________________________ Do You Yahoo!? Make international calls for as low as $.04/minute with Yahoo! Messenger http://phonecard.yahoo.com/

2 2

Re: How do I stop clipping?
by Travis Michielsen 27 Jul '01

27 Jul '01

--- Bill Medland <medbi01(a)accpac.com> wrote: > I don't like submitting incomplete code but I may have little choice unless > someone can point me in the correct direction here. As you may guess from > the following, my Windows experience is not that extensive but I think it's > enough to allow me to make sensible contributions. > > I am working on correcting the LISTVIEW_DrawLargeItem function, especially > when the item text is large. I have already got most of the way. However > the problem is this. > > When a user selects a large icon the text should be written completely (by > calling DrawText with DT_NOCLIP). It is doing so; I can prove it by > resizing the window and I will see the full text being displayed for a > selected item. However when drawing it at the moment of selecting it, the > text is being clipped to the usual two and a bit rows. Presumably this > means that there is a clipping rectangle in the DC or the window that I > need to inflate. Or Do I simply invalidate that rectangle (from within the > WM_PAINT handler!!!). > > Any help would be appreciated. > > Bill Looking at the DrawText code I see that DrawText just passes the NOCLIP flag to ExtTextOut, so the problem I likely not with DrawText but with ExtTextOut instead. I can take a look at the code for both functions (time providing) and find out what is happening. - Travis Michielsen __________________________________________________ Do You Yahoo!? Make international calls for as low as $.04/minute with Yahoo! Messenger http://phonecard.yahoo.com/

1 0

Any use for glyph bounding boxes in printer driver?
by Ian Pilcher 27 Jul '01

27 Jul '01

Currently, the Wine PostScript driver stores the bounding box (xMin, yMin, xMax, yMax) for every glyph in every font. This information is not currently used, and I'd like to get rid of it. (Note: this is distinct from the advance width of each glyph, which is certainly required.) >From what I can tell, there is no API that a Win32 application or the Windows GDI can use to get this information from a printer driver. Since I'm not that familiar with either, however, I figure I should try to confirm that this is indeed the case. So, does anyone know of any API that an application or the GDI can use to get the dimensions of an individual glyph from a "real" Windows printer driver? (I have verified that calling the GetTextExtentPoint functions with a one-character string returns the height of the font, not the height of the glyph. For example, it returns the same height for 'A' and '_'.) Thanks! -- ======================================================================== Ian Pilcher ian.pilcher(a)home.com ========================================================================

2 1

RE: winapi update
by Patrik Stridvall 27 Jul '01

27 Jul '01

> Btw, what does make filter do? > > Your post to wine-patches says it's nice an all but it does not say > what it does. Try and run it it is self describing. :-) Since Alexandre didn't apply the Makefile patch, running it is a little awkwark. Will fix that it later versions though. Try do: cd wine ./tools/winapi/make_filter make You can also give it parameters like ./tools/winapi/make_filter make clean Warning "make clean" doesn't look that good currently. PS. It filters the make messages and only display important messages. It might not always work 100% though, but I will fix problems as I find them. I wrote it many months ago and have run it from time to time since, so most issues have been fixed. The reason I wrote it was that I was irritated that important messages scrolled of screen. > If it's nice isn't it worth advertising to the Wine > developper community? I had intended to do that if but since I was unsure that Alexandre would apply my Makefile patch I decided to wait until it could present a better "user interface". But by all means test it.

2 1

RE: Even more misc fixes
by Patrik Stridvall 26 Jul '01

26 Jul '01

> [...] > > > Most of these are because of the transition to making > HANDLE a void* > > > and compiling with STRICT. > > > > Yes, I notice this was the case with TIMERPROC casts. > > However it is no so with the HOOKPROC casts, > > and yes it is the same with the real Windows headers. > > ??? > AFAICS there are two versions of HOOKPROC: one for -DSTRICT and a > FARPROC one. Hmm. I looked again and it seems you are right. Must have missed it somehow. Strange. > [...] > > But OK I will try and compile with -DSTRICT and see what happends. > > IIRC somebody tried that but it didn't turn out so well. > > That would be me, probably. I started the conversion to -DSTRICT but > then other priorities came up and now it's on the back burner. I will > get back to it eventually but at the current rate it's hard > to know when > that will be :-( > Compiling with -DSTRICT is not that bad: with a relatively simple > patch it compiles (see attachement). Or at least, it used to. > But there > are tons of warnings, which means tons of places that need > attention and > possibly fixing. That's where the work is. OK. Will look at it later.

1 0

RE: Even more misc fixes
by Patrik Stridvall 26 Jul '01

26 Jul '01

> The volatile stuff in dplay.h is part of the Windows header, you > cannot remove it. No it isn't. I'm not sure why it was added in the first place. It is neither used by Wine, nor defined by Windows. In fact only a few strange headers use volitile at all, and none of them is supported by Wine. > Most of these are because of the transition to making HANDLE a void* > and compiling with STRICT. Yes, I notice this was the case with TIMERPROC casts. However it is no so with the HOOKPROC casts, and yes it is the same with the real Windows headers. > Please don't add typecasts, consider the > warnings as an incentive to do the right fix... As you wish, but as I said HOOKPROC can't be fixed with STRICT. But OK I will try and compile with -DSTRICT and see what happends. IIRC somebody tried that but it didn't turn out so well. Oh well, lets see what happends.

2 1

RE: Even more misc fixes
by Patrik Stridvall 26 Jul '01

26 Jul '01

> Patrik Stridvall <ps(a)leissner.se> writes: > > > No it isn't. I'm not sure why it was added in the first place. > > It is neither used by Wine, nor defined by Windows. > > It is in the Windows headers I have. It is not in my Microsoft Visual C++ 6.0 header, but perhaps you have a newer version? DPlay using volatile seems a little strange, so I thought is was wrong especially since it was not in my version, but then I have seen stranger things. :-) > > As you wish, but as I said HOOKPROC can't be fixed with STRICT. > > Why not? Because it would be incompatible (warning wise) with Winelib applications compile with -DSTRICT since Windows doesn't provide a special -DSTRICT version of HOOKPROC. The application might pass a FARPROC to it and expect it to work. Well, of course it works but it would generate a warning.

1 0

Re: winapi update
by Alexandre Julliard 26 Jul '01

26 Jul '01

Patrik Stridvall <ps(a)leissner.se> writes: > The make_filter.diff patch is quite nice. > > Try it after applying it with by running: > make filter I'm not sure about the portability of the wildcard rule. Why don't you have make_filter call make instead of the other way around? This would avoid the need for changing the makefiles at all. -- Alexandre Julliard julliard(a)winehq.com

2 1

RE: winapi update
by Patrik Stridvall 26 Jul '01

26 Jul '01

> Patrik Stridvall <ps(a)leissner.se> writes: > > > The make_filter.diff patch is quite nice. > > > > Try it after applying it with by running: > > make filter > > I'm not sure about the portability of the wildcard rule. Why don't you > have make_filter call make instead of the other way around? This > would avoid the need for changing the makefiles at all. Well, make_filter actually calls make already. :-) Seriously, one reason that I added it to the Makefiles in the first place is that make_filter doesn't know what version of make to use. Sure it is called make on almost all systems and gmake (GNU Make) on most of rest, but since the user knows and calls "make", $(MAKE) contains the correct "make". Oh well, I guess just calling make will work on most platforms, it will on all platforms that I current use. The Wine Makefile is supposed to be portable so I guess it will have to do.

1 0

Re: Even more misc fixes
by Alexandre Julliard 26 Jul '01

26 Jul '01

Patrik Stridvall <ps(a)leissner.se> writes: > No it isn't. I'm not sure why it was added in the first place. > It is neither used by Wine, nor defined by Windows. It is in the Windows headers I have. > As you wish, but as I said HOOKPROC can't be fixed with STRICT. Why not? > But OK I will try and compile with -DSTRICT and see what happends. > IIRC somebody tried that but it didn't turn out so well. No it needs a lot of fixes, which is what the warnings are here to remind us of. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: Even more misc fixes
by Alexandre Julliard 26 Jul '01

26 Jul '01

Patrik Stridvall <ps(a)leissner.se> writes: > * include/commctrl.h, > include/dplay.h: > Cleanup/removal of unnessary things that would have made > winapi_* parsing more complicated. The volatile stuff in dplay.h is part of the Windows header, you cannot remove it. > * dlls/comctl32/commctrl.c, > dlls/comctl32/tab.c, > dlls/dinput/dinput_main.c, > dlls/dsound/dsound_main.c, > dlls/ole32/clipboard.c, > dlls/ole32/ole2.c, > dlls/wineps/ps.c, > dlls/winmm/joystick.c, > dlls/winmm/wineoss/midi.c, > loader/dos/dosmod.c, > windows/caret.c: > Fixed some warnings. Most of these are because of the transition to making HANDLE a void* and compiling with STRICT. Please don't add typecasts, consider the warnings as an incentive to do the right fix... -- Alexandre Julliard julliard(a)winehq.com

1 0

How do I stop clipping?
by Bill Medland 26 Jul '01

26 Jul '01

I don't like submitting incomplete code but I may have little choice unless someone can point me in the correct direction here. As you may guess from the following, my Windows experience is not that extensive but I think it's enough to allow me to make sensible contributions. I am working on correcting the LISTVIEW_DrawLargeItem function, especially when the item text is large. I have already got most of the way. However the problem is this. When a user selects a large icon the text should be written completely (by calling DrawText with DT_NOCLIP). It is doing so; I can prove it by resizing the window and I will see the full text being displayed for a selected item. However when drawing it at the moment of selecting it, the text is being clipped to the usual two and a bit rows. Presumably this means that there is a clipping rectangle in the DC or the window that I need to inflate. Or Do I simply invalidate that rectangle (from within the WM_PAINT handler!!!). Any help would be appreciated. Bill

1 0

Re: Handling X errors using exception handlers
by Alexandre Julliard 26 Jul '01

26 Jul '01

Lionel Ulmer <lionel.ulmer(a)free.fr> writes: > Do you plan to implement it or should I do it (be warned though that I can > work on it only if the weather is bad this week-end :-) ). I'll do it. I had a version working some time ago, I just need to adapt it to the new per-thread displays. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: Handling X errors using exception handlers
by Alexandre Julliard 26 Jul '01

26 Jul '01

Lionel Ulmer <lionel.ulmer(a)free.fr> writes: > The only problems I could see with this approach is that : > > - it cannot 'expect' more than one kind of error at the same time I was thinking you could use a special value as a "wildcard" for the error codes, in which case it wouldn't be tested for a match. > - I am not sure that the parameters thing are really a good idea. Are we > sure that the error code are the same on all X servers ? Are they > standardized ? They are part of the X spec AFAICT, so yes it should be pretty much standard. -- Alexandre Julliard julliard(a)winehq.com

2 1

2025

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