- wine-devel - winehq.org

Cygwin building part 2
by Steven Edwards 30 Apr '03

30 Apr '03

We have 5 bugs that are preventing building on cygwin. Not that it will work after it builds but lets get it to build first and then worry about running. Some of these seem like they are simple while others like the kernel32 building are very complex. I will see if I can fix the winsock bug tonight. 1. We cannot build kernel32 with the current CVS http://www.winehq.org/hypermail/wine-devel/2003/04/0765.html 2. when building wininet on cygwin we get this: internet.o(.text+0x1365): In function `InternetCloseHandle': /cygdrive/g/src/wine-dev/wine/dlls/wininet/internet.c:670: undefined reference t o `___wine_exception_handler' collect2: ld returned 1 exit status dllwrap: gcc exited with status 1 3. With winsock we are getting this: gcc -c -I. -I. -I../../include -I../../include -D_REENTRANT -D__WINESRC__ -DUSE _WS_PREFIX -Wall -mpreferred-stack-boundary=2 -gstabs+ -Wpointer-arith -g -O2 -o socket.o socket.c socket.c:286: `IP_HDRINCL' undeclared here (not in a function) socket.c:286: initializer element is not constant socket.c:286: (near initialization for `ws_ip_map[6][1]') socket.c:286: initializer element is not constant socket.c:286: (near initialization for `ws_ip_map[6]') socket.c:287: initializer element is not constant socket.c:287: (near initialization for `ws_ip_map[7]') socket.c:288: initializer element is not constant socket.c:288: (near initialization for `ws_ip_map[8]') socket.c:289: initializer element is not constant socket.c:289: (near initialization for `ws_ip_map[9]') make[1]: *** [socket.o] Error 1 4. miscemu fails to build main.c:34: warning: implicit declaration of function `exit' gcc -o wine main.o -L../libs/wine -lwine -L../libs/port -lwine_port main.o(.text+0x51): In function `main': /cygdrive/g/src/wine-dev/wine/miscemu/main.c:32: undefined reference to `_wine_i nit' collect2: ld returned 1 exit status 5. There is no get/set_thread_context support. This patch by David Fraser stubs it. Index: context_i386.c =================================================================== RCS file: /home/wine/wine/server/context_i386.c,v retrieving revision 1.28 diff -u -r1.28 context_i386.c --- context_i386.c 22 Mar 2003 21:00:09 -0000 1.28 +++ context_i386.c 30 Apr 2003 16:39:35 -0000 @@ -78,7 +78,26 @@ #define PTRACE_SETDBREGS PT_SETDBREGS #endif -#ifdef linux +#if defined(__CYGWIN__) + +/* retrieve a thread context */ +static void get_thread_context( struct thread *thread, unsigned int +flags, CONTEXT *context ) +{ + /* FIXME: implement this */ + file_set_error(); +} + + +/* set a thread context */ +static void set_thread_context( struct thread *thread, unsigned int +flags, const CONTEXT *context ) +{ + /* FIXME: implement this */ + file_set_error(); +} + +#elif defined(linux) #ifdef HAVE_SYS_USER_H # include <sys/user.h> #endif

1 0

dxdiag gui regression
by Robert Reif 30 Apr '03

30 Apr '03

I am having problems with the gui in dxdiag.exe with the latest cvs. It appears to be coming up in the spanish language and the tab labels are all set to the first one. It worked ok with a cvs from a few days ago. Here are the errors: wine dxdiag.exe err:wave:OSS_WaveOutInit /dev/mixer1: not found! err:wave:OSS_WaveInInit /dev/mixer1: not found! fixme:ole:CoCreateInstance no classfactory created for CLSID {4590f811-1d3a-11d0-891f-00aa004b2e24}, hres is 0x80040154 err:module:BUILTIN32_LoadLibraryExA loaded .so but dll user.exe still not found - 16-bit dll or version conflict. err:module:BUILTIN32_LoadLibraryExA loaded .so but dll user.exe still not found - 16-bit dll or version conflict. err:ver:VerQueryValueW called on NE resource! fixme:global:GlobalMemoryStatusEx we should emulate the 4GB bug here, as per MSDN fixme:dsound:IKsPropertySetImpl_Get unsupported property: {f2957840-260c-11d1-a4d8-00c04fc28aca} fixme:system:EnumDisplayDevicesW ((nil),0,0x40711968,0x00000000), stub! fixme:system:EnumDisplayDevicesW (0x4071196c,0,0x4071120c,0x00000000), stub! fixme:dsound:IKsPropertySetImpl_Get unsupported property: {1aeaa606-35f0-11d1-b161-00c04fc28aca} This is a unicode program and it has a lot of problems related to that. Did it just happen to work before and some of the recent changes changed that behavior? The strange thing is that it worked properly when I tried to trace it to see what was happening. Any ideas before I start digging into this deeper? Thanks, Bob.

1 0

WINE flag
by KK singh 30 Apr '03

30 Apr '03

hi, I have a win32 application that plays some hashing tricks with HWND while running on win98 and uses the fact that on win98 HWND is always 16bit. This application is crashing on wine configured as win98 because HWND is something bigger than 16bit on wine. Now Can I Check from inside my application code, whether the application is running on linux or win98 If yes then I might be able to avoid those hashing tricks and solve the crash Regards kks __________________________________ Do you Yahoo!? The New Yahoo! Search - Faster. Easier. Bingo. http://search.yahoo.com

4 3

Re: PATCH: aliasing problems in ole32
by Alexandre Julliard 29 Apr '03

29 Apr '03

Marcus Meissner <marcus(a)jet.franken.de> writes: > Changelog: > Fixed some warnings from newer gccs in regards to > pointer aliasing problems by using unions instead of > using (void**)&ptr constructs. All these unions are ugly IMO, it would be better to use an intermediate pointer instead, something like: void *ptr; ISomething *iface; IUnknown_QueryInterface(...,&ptr); iface = ptr; -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: Fix oleaut32/olepicture
by Alexandre Julliard 29 Apr '03

29 Apr '03

Maxime Bellengé <maxime.bellenge(a)laposte.net> writes: > + bits = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, > + (jd.output_height+1)*(jd.output_width+jd.output_width%sizeof(DWORD))*jd.output_components); > samprow=HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,jd.output_width*jd.output_components); > + > + oldbits = bits; > + oldsamprow = samprow; > + padding = jd.output_width%sizeof(DWORD); The computations of the total width and of the padding are wrong, "width % sizeof(DWORD)" doesn't yield the result you want. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: Support for pkgconfig
by Mike Hearn 29 Apr '03

29 Apr '03

Anything wrong with this patch Alexandre? On Fri, 2003-04-04 at 21:00, Mike Hearn wrote: > Hi, > > pkgconfig as you may know is a replacement for the various foo-config > programs that are usually used to retrieve compiler flags etc for > packages. Here's a patch to add a .pc file to wine, this will hopefully > help the Mono guys (they said it'd be nice to have) > > ChangeLog: > Add a pkgconfig file > > thanks -mike

11 61

Re: Patch to get Borland's bcc 5.5 (free beer compiler) to work
by Dimitrie O. Paun 29 Apr '03

29 Apr '03

On April 27, 2003 08:15 pm, Troy Rollo wrote: > The only problem in the head code appears to be in the linker, which it > turns out has a problem when it's told there's 3GB of user address space. This is pretty cool. I've added you to the Fun page: http://63.138.153.104/wine/Wine-Fun.html#source Few questions: * Do you build on Windows? * Could we run bcc in Wine on Linux to build on Linux using bcc? * How far do you get? Do you actually get an executable? * Does it run? * What are the steps you need to take? A concise list of instructions would be nice :) I can post it on the Fun page, so other can play with it was well. -- Dimi.

4 4

Re: Excessive Swap with MSVC++ and Wine
by hatky 29 Apr '03

29 Apr '03

Hi sounds like a memory leak in the code sould be addressed to wine-devel(a)winehq.com and you should probably open a bug on this ..... wine-devel, can someone comment/help on that? (I think there wore more details on the original message) Hatky. --- Stephen Mollett <molletts(a)yahoo.com> wrote: > On Sunday 27 Apr 2003 14:51, Phil Thompson wrote: > > The problem is the amount of memory used by > link.exe. At the moment, with > > 256M of real memory and 1G of swap I quickly run > out. Under Windows2000, on > > the same machine, the link takes a long time > (30mins - 1 hour) but does > > complete. > > That sounds very similar to a problem I used to have > with another program. I > used to run NewsXpress under Wine (quite a nice, and > somewhat non-traditional > in design, newsreader) but I found that, even with > 1GB of RAM, I had to add > lots of swap in order to download large numbers of > headers. When I used to > run it on Windows, I was able to get tens or > hundreds of thousands of headers > in 128MB RAM without even approaching the point > where swapping would be > needed. > > I think it may be some inefficiency in Wine's memory > allocation subsystem - > perhaps it consistently allocates too much which > mounts up each time the > program requests more. (When I exited NewsXpress, > only about half of the > memory it had claimed was freed; the rest had to be > reclaimed with 'killall > wine'.) > > Doesn't help you very much, but perhaps it might > help someone to track down > the problem. > > Stephen > _______________________________________________ > wine-users mailing list > wine-users(a)winehq.com > http://www.winehq.com/mailman/listinfo/wine-users ===== Hatky ��: http://www.hatky.myz.info __________________________________ Do you Yahoo!? The New Yahoo! Search - Faster. Easier. Bingo. http://search.yahoo.com

3 2

Re: slovene keyboard without dead keys
by Dmitry Timoshkov 29 Apr '03

29 Apr '03

"Rok Mandeljc" <rokmandeljc(a)hotmail.com> wrote: > I have problems with XFree86 4.3 and wine's keyboard layout detection > scheme. It seems that wine can't detect dead keys and use alt, therefore my > previous slovene layout isn't detected anymore. This one loads perfectly, > although alt-key combinations don't work. I'm strongly against fixing problems with new XFree86 4.3.0 this way and polluting x11drv with lots of similar keyboard layouts. A way to solve your problem is to use something like this in your XF86Config: Option "XkbLayout" "us,si" Option "XkbOptions" "grp:ctrl_shift_toggle" I.e. explicitly add "us" layout as the first language group and use Ctrl+Shift to switch between base and alternate keyboard layouts. -- Dmitry.

3 9

Dupes again, was: Re: Winword, StorageImpl_Commit
by Uwe Bonnes 29 Apr '03

29 Apr '03

Hallo, I am seeing duplicated messages like: Bye ------- start of forwarded message ------- Return-Path: <wine-devel-admin(a)winehq.com> Received: from mailserver2.hrz.tu-darmstadt.de (mailserver2.hrz.tu-darmstadt.de [130.83.22.129]) by elektron.ikp.physik.tu-darmstadt.de (8.11.2/8.11.2/SuSE Linux 8.11.1-0.5) with ESMTP id h3TGAqj31573 for <bon(a)elektron.ikp.physik.tu-darmstadt.de>; Tue, 29 Apr 2003 18:10:52 +0200 Received: from localhost.localdomain ([198.144.4.3]) by mailserver2.hrz.tu-darmstadt.de (8.12.9/8.12.8) with ESMTP id h3TGA6l3015786 for <bon(a)elektron.ikp.physik.tu-darmstadt.de>; Tue, 29 Apr 2003 18:10:06 +0200 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by localhost.localdomain (8.12.8/8.12.8) with ESMTP id h3TFv1Kp018851; Tue, 29 Apr 2003 10:57:01 -0500 Received: from ouse.qinetiq.com (ouse.qinetiq.com [192.102.214.3]) by localhost.localdomain (8.12.8/8.12.8) with SMTP id h3TFu2Kp018786 for <wine-devel(a)winehq.com>; Tue, 29 Apr 2003 10:56:02 -0500 Received: (qmail 10428 invoked from network); 29 Apr 2003 16:56:22 +0100 Received: from unknown (HELO dart.qinetiq.com) (10.0.5.21) by ouse.qinetiq.com with SMTP; 29 Apr 2003 16:56:22 +0100 Received: from allen.qinetiq.com (Not Verified[10.0.20.10]) by dart.qinetiq.com) id <B00054c995>; Tue, 29 Apr 2003 16:56:02 +0100 Received: from unknown (HELO signal.dra.hmg.gb) (10.184.84.139) by allen.qinetiq.com with SMTP; 29 Apr 2003 16:56:02 +0100 Received: from pershore.dra.hmg.gb (pershore.dra.hmg.gb [192.35.94.42]) by signal.dra.hmg.gb (8.9.3/) with ESMTP id RAA01224; Tue, 29 Apr 2003 17:02:17 GMT Received: from littlegreen.dra.hmg.gb by pershore.dra.hmg.gb (8.8.8+Sun/SMI-SVR4) id QAA27906; Tue, 29 Apr 2003 16:57:11 +0100 (BST) -- 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

Winword, StorageImpl_Commit, Crossover and Wine
by Uwe Bonnes 29 Apr '03

29 Apr '03

Hallo, running MS Word 2000 with builtin dlls doesn't allow to write files, because of at least StorageImpl_Commit and WriteFmtUserTypeStg still stubs? Does Crosover Office still require the native OLE dlls or has it some implementation? Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

3 3

RE: Wine, WIDE & Unix (was: Support for pkgconfig)
by Patrik Stridvall 29 Apr '03

29 Apr '03

> > Well, the point is that i'm pretty sure that both Trolltech (and the > > KDE project) would very much like to Qt themed Wine in order to > > compete in the desktop market so I'm sure it would be possible to > > get some sort of "deal" somehow. > > > > Perhaps just releasing the Qt drawing primatives implementation > > under the LGPL would be a solution that would be acceptable > > to all parties. I can't see Trolltech losing very much from > doing that. > > > > No work at all (except convincing Trolltech to do that). > > Hehehe, yeah, that's the hard part, especially as the > difference between > Qt/X11 and Qt/Win32 is mostly the drawing primitives/window creation > code. Ah OK. Minor problem. :-( Why can't they make Qt/Win32 GPL:ed as well with the exception of the drawing primitives that have to become LGPL:ed. They released Qt/X11 under the GPL, since the GPL according to their interpretation will protect them from "free commercial use". Why not release Qt/Win32 under the GPL as well? > Bah. This is stupid. Before we start adding theming to Wine, I think > somebody should at least make an attempt at a unified theming > standard. > Otherwise we're just going to end up with huge amounts of bloat and > duplication in Wine already. A standard system would be much > better. No, > I don't have time for that :( Agreed. This is a post 1.0 issue IMHO.

2 1

Re: A little Xlib adventure
by Dimitrie O. Paun 29 Apr '03

29 Apr '03

On April 29, 2003 08:59 am, Mike Hearn wrote: > + /* set the pid. together, these properties are needed so the window > manager can kill us if we freeze */ Wrapped patch alert! :) -- Dimi.

2 2

RE: Wine, WIDE & Unix (was: Support for pkgconfig)
by Patrik Stridvall 29 Apr '03

29 Apr '03

> > Well, I can't see why Trolltech (the owners of Qt) would object. > > > > Presumably the main reason that you would want a Qt skin for > > Windows application running under Wine is that you run several > > other Unix applications using Qt... > > > > So I can't see why they wouldn't give us special permission > > if we for some reason would need it... > > I'm not sure it's quite that simple though. IIRC Qt/KDE themes use the > Qt drawing primitives (like gtk skins do with gdk). Unfortunately, > Qt/Win32 is not free software, so we'd have to stub out Qt with Win32 > equivalents in order to allow Qt skins to draw correctly. As GDK is > already ported to Win32 though, that'd be easier to use. > > I'm sure if somebody was motivated enough they could do so, and we may > need to stub out Qt anyway for KHTML at some point. But it's a lot of > work. Well, the point is that i'm pretty sure that both Trolltech (and the KDE project) would very much like to Qt themed Wine in order to compete in the desktop market so I'm sure it would be possible to get some sort of "deal" somehow. Perhaps just releasing the Qt drawing primatives implementation under the LGPL would be a solution that would be acceptable to all parties. I can't see Trolltech losing very much from doing that. No work at all (except convincing Trolltech to do that).

3 2

bugs.winehq.com
by hatky 29 Apr '03

29 Apr '03

Hi all, I am not sure if this is the place to disscuse it but I have mailed bugs(a)winehq.com and web-admin(a)winehq.org and have yet to get a replay So my question is: "Am I the only one who can not retrive his password?" I mean it's saying mail sent and stuff but I am not getting it. I tried it a few times doing the last few days and I do not get any mail. I think it can be becouse of some configuration on the new server or it can be my sf.net filltering (it claimed to have one when I first registered a long time ago but with no details).... Hatky. __________________________________ Do you Yahoo!? The New Yahoo! Search - Faster. Easier. Bingo. http://search.yahoo.com

1 0

Re: Fix loading icon from resource
by BiGgUn 29 Apr '03

29 Apr '03

Hi Did you successfully load the splashscreen of emule ? I got a strange biased image instead of a clean one :-\ Stephan

2 1

RE: Wine, WIDE & Unix (was: Support for pkgconfig)
by Patrik Stridvall 29 Apr '03

29 Apr '03

> > Once you have a skinning API, you just implement a 'gnome > compat' and 'kde > > compat' skin (or even just an automagical one that does > both) the thing would > > "just work", right? Why, it shouldn't take more than a > couple of hours ;) > > (WARNING: that last part was a joke, if you set your watch > by this you very > > well may miss work for several years). > > I don't think we could do KDE skins, as (surprise) they depend on Qt > which is GPLd. Well, I can't see why Trolltech (the owners of Qt) would object. Presumably the main reason that you would want a Qt skin for Windows application running under Wine is that you run several other Unix applications using Qt... So I can't see why they wouldn't give us special permission if we for some reason would need it... The alternative a GTK skinned only Wine would not benefit them at all, quite the opposite.

2 1

FindWindow timeouts
by Mike Hearn 29 Apr '03

29 Apr '03

Hi, After chatting to some people on IRC about windows message handling, I remembered a bug I hit where a frozen window could kill everything because FindWindow sends a message to every window with no timeout (to get the window text). Is this right? Wouldn't it be better to make FindWindow more robust by sending messages with a timeout so if one window in an app (or anothe process) has frozen, it doesn't kill the caller? thanks -mike

2 1

Re: Crash in BeginPaint running Sams Photofact index, a free VB app
by Dan Kegel 29 Apr '03

29 Apr '03

That did it. And yes, the workaround was needed in EndPaint, too; I tried Mike's patch first, and added the EndPaint workaround myself before I noticed Dmitry's patch. The app isn't very functional, but at least it doesn't crash. I encourage anyone who is working on Visual Basic compatibility to give http://www.servicesoftware.com/sams/SAMSINDEX.exe a spin. (And look at all the pretty fixme's :-) Thanks, Dan Dmitry Timoshkov wrote: > "Dan Kegel" <dank(a)kegel.com> wrote: > > >>Backtrace: >>=>0 0x409e5873 (BeginPaint+0x9f(hwnd=0x10029, lps=0x0) [painting.c:200] in user32.dll.so) (ebp=40892bc4) > > > Attached patch should help a bit. > > > > ------------------------------------------------------------------------ > > Protect BeginPaint and EndPaint from lps being NULL. > > --- cvs/hq/wine/dlls/user/painting.c Thu Jan 09 03:41:30 2003 > +++ painting.c Mon Apr 28 10:15:46 2003 > @@ -159,6 +159,8 @@ > HWND full_handle; > WND *wndPtr; > > + if (!lps) return 0; > + > if (!(full_handle = WIN_IsCurrentThread( hwnd ))) > { > if (IsWindow(hwnd)) > @@ -239,6 +241,8 @@ > */ > BOOL WINAPI EndPaint( HWND hwnd, const PAINTSTRUCT *lps ) > { > + if (!lps) return FALSE; > + > ReleaseDC( hwnd, lps->hdc ); > ShowCaret( hwnd ); > return TRUE; -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045

1 0

Re: Crash in BeginPaint running Sams Photofact index, a free VB app
by Uwe Bonnes 28 Apr '03

28 Apr '03

>>>>> "Dmitry" == Dmitry Timoshkov <dmitry(a)baikal.ru> writes: Dmitry> "Dan Kegel" <dank(a)kegel.com> wrote: >> Backtrace: =>0 0x409e5873 (BeginPaint+0x9f(hwnd=0x10029, lps=0x0) >> [painting.c:200] in user32.dll.so) (ebp=40892bc4) Dmitry> Attached patch should help a bit. Dmitry> -- Dmitry. Protect BeginPaint and EndPaint from lps being NULL. Dmitry> --- cvs/hq/wine/dlls/user/painting.c Thu Jan 09 03:41:30 2003 Dmitry> +++ painting.c Mon Apr 28 10:15:46 2003 @@ -159,6 +159,8 @@ HWND Dmitry> full_handle; WND *wndPtr; Dmitry> + if (!lps) return 0; + if (!(full_handle = WIN_IsCurrentThread( Dmitry> hwnd ))) { if (IsWindow(hwnd)) @@ -239,6 +241,8 @@ */ BOOL Dmitry> WINAPI EndPaint( HWND hwnd, const PAINTSTRUCT *lps ) { + if Dmitry> (!lps) return FALSE; + ReleaseDC( hwnd, lps->hdc ); ShowCaret( Dmitry> hwnd ); return TRUE; Is lps==NULL an argument that BeginPaint() and EndPaint() should cope with or is it a result for errors hidden deeper? -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

5 7

WineHQ: different pages with same content
by Stefan Leichter 28 Apr '03

28 Apr '03

Hello, during browsing WineHQ offline (via wwwoffle) i noticed that the links in the left column of the current WWN are different to the links on the main page and some other (have not tested all) e.g. in the development section of the WWN the CVS link is: http://www.winehq.com/index.php?page=cvs on the main page (and other) the link is http://www.winehq.com/?page=cvs Any reason for this? Bye Stefan

2 1

Re: Patch to get Borland's bcc 5.5 (free beer compiler) to work
by Uwe Bonnes 28 Apr '03

28 Apr '03

>>>>> "Troy" == Troy Rollo <wine(a)troy.rollo.name> writes: Troy> The only problem in the head code appears to be in the linker, Troy> which it turns out has a problem when it's told there's 3GB of Troy> user address space. Since Windows only offers a 3GB user address Troy> space in what passes for Microsoft's high end server editions of Troy> the operating system, it is unlikely that this is necessary. My Troy> solution is to drop the user address space to 2GB - if 3GB is Troy> desired, it probably should be a configurable option rather than Troy> hard coded as is the case now. Troy> I dealt with a related FIXME along the way. Troy> diff -u -r1.4 virtual.c --- dlls/ntdll/virtual.c 7 Jan 2003 Troy> 20:36:28 -0000 1.4 +++ dlls/ntdll/virtual.c 28 Apr 2003 00:05:58 Troy> -0000 @@ -102,7 +102,8 @@ # define page_mask 0xfff # define Troy> page_shift 12 # define page_size 0x1000 -# define What version did you specify in ~/.wine/config [windows] version? I guess you ran in non NT mode. And I guess your change will do havoc to programs needing NT mode (like Xilix ISE). Probably the limit has to be set in dependance of the version emulated. 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 0

Re: Mac OS X Support (patch with diff -u)
by Pierre d'Herbemont 28 Apr '03

28 Apr '03

On Sunday, April 27, 2003, at 10:09 PM, Pierre d'Herbemont wrote: > Hi, > Here is a patch which mostly enables compilation on Mac OS X. The > support is not full as there is still some makefiles issues on which I > can't find a *clean* correction and a new issue I discovered in this > cvs version related to the libwine_port and the getopt function. > I am sorry but there is still a lot of brokent things in this patch, it is only partially working on Mac OS X. I'll provide an other which will be better so, don't loose time while looking at this one... Sorry. Pierre

1 0

Re: Wine, WIDE & Unix (was: Support for pkgconfig)
by Brian Vincent (C) 28 Apr '03

28 Apr '03

> Wide doesn't change that. In fact, being based on Wine, it will implicitly > benefit from all the integration work we do on the Wine side. But at that > point, people will ask: what is the difference between Wide, and just Wine > running in Gnome? I think the problems you're going to run into immediately are: 1) Wine still isn't that far along to support something like this, bigger problems need to be solved first. Not the least of which is just good integration with the existing distributions (which will solve 90% of the problems you'll run into creating your own desktop.) 2) Finding people to do the work. Right now there seems to be a problem finding someone to work on the config tool, let alone a full blown desktop with multiple integrated apps. 3) Documentation.. it's never been one of the strong points of the project and a whole desktop environment needs a lot of it. 4) API.. Alexandre made an excellent point that promoting an API designed by MS puts the ball in their court. Pretty hard to compete on even terms with a company that has a lot of talented, motivated people and a war chest bigger than the GNP of a lot of nations. I think the proper thing to do is write it up an outline of it and put it on the "Fun Projects" page. Maybe someone will find the time to work on it. --------------- Brian Vincent Copper Mountain Telecom vincentb(a)coppercolorado.com

1 0

Re: Mac OS X Support (patch with diff -u)
by Marcus Meissner 28 Apr '03

28 Apr '03

On Sun, Apr 27, 2003 at 10:09:43PM +0200, Pierre d'Herbemont wrote: > Hi, > Here is a patch which mostly enables compilation on Mac OS X. The > support is not full as there is still some makefiles issues on which I > can't find a *clean* correction and a new issue I discovered in this > cvs version related to the libwine_port and the getopt function. > > Sorry for the -u option, I thought it was enabled by default :( The PPC assembly stuff appears correct to me :) Ciao, Marcus

2 1

New patch for WINE support in valgrind uploaded to sourceforge
by Adam Gundy 28 Apr '03

28 Apr '03

A new version of the patch to valgrind needed to support WINE has been uploaded to Sourceforge: http://sourceforge.net/tracker/index.php?func=detail&aid=710006&group_id=46… It should apply cleanly to current valgrind CVS. This version of the patch will now work with an unmodified WINE CVS version. This is because it now _fully_ implements clone() support - ie it really does create system level threads. Currently only one thread can run at a time, so there are no locking issues in the main valgrind code. To use with WINE, you need to get a CVS checkout of valgrind, then apply the patch using: export CVSROOT=:pserver:anonymous@cvs.sourceforge.net:/cvsroot/valgrind cvs login cvs co valgrind patch -p0 < valgrind-wine.patch.13 then build and install valgrind: autogen.sh ./configure make install Get a CVS checkout of WINE by following the instructions at: http://www.winehq.com/?page=cvs then configure (for debugging) and build: CFLAGS=-g ./configure make depend && make install now you can start looking for bugs in WINE, and bugs in your own (debug) Windows code. Copy any DLLs/EXEs to somewhere WINE can get to them, plus copy any .PDB files that go with them into the same directory. Run WINE under valgrind using eg: valgrind --num-callers=30 --workaround-gcc296-bugs=yes wine notepad.exe or even: valgrind --num-callers=30 --workaround-gcc296-bugs=yes --gdb-attach=yes wine notepad.exe enjoy. Seeya, Adam -- Real Programmers don't comment their code. If it was hard to write, it should be hard to read, and even harder to modify. These are all my own opinions.

1 0

Crash in BeginPaint running Sams Photofact index, a free VB app
by Dan Kegel 28 Apr '03

28 Apr '03

Wine is coming along! It can *almost* run a real world VB app I downloaded tonight. I'm trying to fix an old TV, and I wanted to see if Sams has a manual for it, so I downloaded their index program (http://www.servicesoftware.com/sams/) and was happy to discover it installed properly under a recent Wine (once I copied in the msiexec stuff, stdole2.tlb, etc.). However, it didn't quite run properly. Here's what I got running it under wine-20030408: Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x409e5873). In 32-bit mode. 0x409e5873 (BeginPaint+0x9f [painting.c:200] in user32.dll.so): movl %eax,0x0(%edx) 203 if (!lps->hdc) Wine-dbg>bt Backtrace: =>0 0x409e5873 (BeginPaint+0x9f(hwnd=0x10029, lps=0x0) [painting.c:200] in user32.dll.so) (ebp=40892bc4) 1 0x52195475 (GRIDX.OCX..text+0x14475 in C:\WINDOWS\SYSTEM\GRIDX.OCX) (ebp=40892c18) 2 0x52194fe0 (GRIDX.OCX..text+0x13fe0 in C:\WINDOWS\SYSTEM\GRIDX.OCX) (ebp=40892c40) 3 0x5218b961 (GRIDX.OCX..text+0xa961 in C:\WINDOWS\SYSTEM\GRIDX.OCX) (ebp=40892c88) 4 0x409cc817 (WINPROC_wrapper+0x17 in user32.dll.so) (ebp=40892cac) 5 0x409cc875 (WINPROC_CallWndProc+0x55(proc=0x41855438, hwnd=0x10029, msg=0xf, wParam=0x0, lParam=0x0) [winproc.c:185] in user32.dll.so) (ebp=40892cd8) 6 0x409d1535 (CallWindowProcA+0xf9(func=0x40df0908, hwnd=0x10029, msg=0xf, wParam=0x0, lParam=0x0) [winproc.c:2812] in user32.dll.so) (ebp=40892d0c) 7 0x409b5a3e (DispatchMessageA+0x96(msg=0x40892d68) [message.c:794] in user32.dll.so) (ebp=40892d50) 8 0x66014979 (MSVBVM60.DLL.__vbaInStr+0x3b7 in C:\WINDOWS\SYSTEM\MSVBVM60.DLL) (ebp=40892d90) 9 0x660148b2 (MSVBVM60.DLL.__vbaInStr+0x2f0 in C:\WINDOWS\SYSTEM\MSVBVM60.DLL) (ebp=40892dd4) 10 0x66014790 (MSVBVM60.DLL.__vbaInStr+0x1ce in C:\WINDOWS\SYSTEM\MSVBVM60.DLL) (ebp=6601a360) 11 0x66010e00 (MSVBVM60.DLL.BASIC_CLASS_QueryInterface+0x17 in C:\WINDOWS\SYSTEM\MSVBVM60.DLL) (ebp=660d3526) 12 0x0c2474ff (SAMSINDX.exe..rsrc+0xbe334ff) (ebp=0424448b) *** Invalid address 0x0424448b (SAMSINDX.exe..rsrc+0x3e3048b) I can run this app under real Windows, but this is such a juicy little testcase I bet someone will want to take a look at it :-) - Dan -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045

2 1

New plans for wintab work.
by Robert North 28 Apr '03

28 Apr '03

Ok, Here are my plans for wintab work. If Aric's pach is considered ready to go into CVS, then I can start working on this in the following areas: Painter support. I beleive there are some problems getting Painter to work with wintab. This is my priority. Additional configuration for wintab. Aric's wintab reqires no configuration. It is only targeted at Intuos tablets. My implementation was to have a zero config default for the intuos2 tablet, similar to Aric's. Config could be provided where necessary to modify how an intuos tablet is seen by wintab, or to allow other tablet types to be used by wintab. I could merge this work into Aric's implementation. This would require significant re-factoring of Aric's data structs to match the more generic data structs I implemented. I may not have too much time to do work for the next 3 weeks, but I'd hope to make some progress on the painter side. Comments/questions welcome. -Rob.

2 1

X11DRV_DIB_CreateDIBSection
by Robert Lunnon 27 Apr '03

27 Apr '03

Under Solaris I have a problem with this function.which appears to protect a section of the DIB giving a portion of it no access at all and when the application tries to blit from it later, a segfault results. Anyone had any similar experiences/know of this problem ? The offending application was little fighter II ntdll.dll.so`VIRTUAL_SetProt() ntdll.dll.so`VirtualProtectEx+0x27() ntdll.dll.so`VirtualProtect+0x23() x11drv.dll.so`X11DRV_DIB_DoProtectDIBSection+0x43() x11drv.dll.so`X11DRV_DIB_CreateDIBSection+0x32d() gdi32.dll.so`DIB_CreateDIBSection+0x4b() ddraw.dll.so`create_dib+0x14e() ddraw.dll.so`DIB_DirectDrawSurface_Construct+0xe3(dd5c2da0, dd5c16c8, dd532648) ddraw.dll.so`DIB_DirectDrawSurface_Create+0x6c() ddraw.dll.so`Main_create_offscreen+0x42() ddraw.dll.so`create_offscreen+0x105() ddraw.dll.so`Main_DirectDraw_CreateSurface+0xed() ddraw.dll.so`IDirectDrawImpl_CreateSurface+0x2f() 0x439a00()

2 1

Wine on cygwin
by Steven Edwards 27 Apr '03

27 Apr '03

It seems kernel and ntdll are not seperated properly as I can build ntdll.dll on cygwin now with no problems but when it gets to dlls/kernel it is failing with this error. If I include the ntdll files wine/memory/* wine/loaders/* and others in kernel32 then it will build. Thanks Steven dllwrap -k --def kernel32.spec.def -o kernel32.dll kernel.res.o ../../ole/ole2nl s.o change.o comm.o computername.o console.o debugger.o editline.o format_msg.o kernel_main.o lcformat.o locale.o stress.o string.o sync.o thunk.o time.o toolhe lp.o utthunk.o win87em.o windebug.o wowthunk.o kernel32.dll.dbg.o --entry _MAIN _KernelInit -L../../dlls -lntdll -L../../libs/wine -lwine -L../../libs/unicode -lwine_unicode -L../../libs/port -lwine_port -lm Warning: resolving _MAIN_KernelInit by linking to _MAIN_KernelInit@12 Use --enable-stdcall-fixup to disable these warnings Use --disable-stdcall-fixup to disable these fixups comm.o(.text+0x10f5): In function `EscapeCommFunction': /cygdrive/g/src/wine-dev/wine/dlls/kernel/comm.c:593: undefined reference to `_F ILE_GetUnixHandle' comm.o(.text+0x15b2): In function `PurgeComm': /cygdrive/g/src/wine-dev/wine/dlls/kernel/comm.c:710: undefined reference to `_F ILE_GetUnixHandle' comm.o(.text+0x1761): In function `ClearCommError': /cygdrive/g/src/wine-dev/wine/dlls/kernel/comm.c:751: undefined reference to `_F ILE_GetUnixHandle' comm.o(.text+0x1939): In function `SetupComm': /cygdrive/g/src/wine-dev/wine/dlls/kernel/comm.c:815: undefined reference to `_F ILE_GetUnixHandle' comm.o(.text+0x1e12): In function `SetCommState': /cygdrive/g/src/wine-dev/wine/dlls/kernel/comm.c:910: undefined reference to `_F ILE_GetUnixHandle' comm.o(.text+0x25fc):/cygdrive/g/src/wine-dev/wine/dlls/kernel/comm.c:1255: more undefined references to `_FILE_GetUnixHandle' follow computername.o(.text+0x5e4): In function `COMPUTERNAME_Init': /cygdrive/g/src/wine-dev/wine/dlls/kernel/computername.c:219: undefined referenc e to `_PROFILE_GetWineIniBool' computername.o(.text+0x161c): In function `SetComputerNameW': /cygdrive/g/src/wine-dev/wine/dlls/kernel/computername.c:542: undefined referenc e to `_PROFILE_GetWineIniBool' kernel_main.o(.text+0x86): In function `process_attach': /cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main.c:75: undefined reference to `_FILE_umask' kernel_main.o(.text+0x98):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main. c:82: undefined reference to `_RELAY_Init' kernel_main.o(.text+0xf3):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main. c:127: undefined reference to `_TASK_CreateMainTask' kernel_main.o(.text+0x13f):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:138: undefined reference to `_main_create_flags' kernel_main.o(.text+0x196):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:141: undefined reference to `_main_create_flags' kernel_main.o(.text+0x1bb):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:95: undefined reference to `_NE_SetEntryPoint' kernel_main.o(.text+0x1d5): In function `process_attach': /cygdrive/g/src/wine-dev/wine/dlls/kernel/../../include/wine/library.h:186: unde fined reference to `_NE_SetEntryPoint' kernel_main.o(.text+0x1ef):/cygdrive/g/src/wine-dev/wine/dlls/kernel/../../inclu de/wine/library.h:187: undefined reference to `_NE_SetEntryPoint' kernel_main.o(.text+0x219): In function `process_attach': /cygdrive/g/src/wine-dev/wine/dlls/kernel/../../include/wine/winbase16.h:402: un defined reference to `_TASK_InstallTHHook' kernel_main.o(.text+0x225): In function `process_attach': /cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main.c:110: undefined reference to `_DOSMEM_MapDosToLinear' kernel_main.o(.text+0x249):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:110: undefined reference to `_GLOBAL_CreateBlock' kernel_main.o(.text+0x260):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:110: undefined reference to `_NE_SetEntryPoint' kernel_main.o(.text+0x26c):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:111: undefined reference to `_DOSMEM_MapDosToLinear' kernel_main.o(.text+0x290):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:111: undefined reference to `_GLOBAL_CreateBlock' kernel_main.o(.text+0x2a7):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:111: undefined reference to `_NE_SetEntryPoint' kernel_main.o(.text+0x2b3):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:112: undefined reference to `_DOSMEM_MapDosToLinear' kernel_main.o(.text+0x2d7):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:112: undefined reference to `_GLOBAL_CreateBlock' kernel_main.o(.text+0x2ee):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:112: undefined reference to `_NE_SetEntryPoint' kernel_main.o(.text+0x2fa):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:113: undefined reference to `_DOSMEM_MapDosToLinear' kernel_main.o(.text+0x31e):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:113: undefined reference to `_GLOBAL_CreateBlock' kernel_main.o(.text+0x335):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:113: undefined reference to `_NE_SetEntryPoint' kernel_main.o(.text+0x341):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:114: undefined reference to `_DOSMEM_MapDosToLinear' kernel_main.o(.text+0x365):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:114: undefined reference to `_GLOBAL_CreateBlock' kernel_main.o(.text+0x37c):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:114: undefined reference to `_NE_SetEntryPoint' kernel_main.o(.text+0x388):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:115: undefined reference to `_DOSMEM_MapDosToLinear' kernel_main.o(.text+0x3ac):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:115: undefined reference to `_GLOBAL_CreateBlock' kernel_main.o(.text+0x3c3):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:115: undefined reference to `_NE_SetEntryPoint' kernel_main.o(.text+0x3ca):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:116: undefined reference to `_DOSMEM_0000H' kernel_main.o(.text+0x3de):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:116: undefined reference to `_NE_SetEntryPoint' kernel_main.o(.text+0x3e5):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:117: undefined reference to `_DOSMEM_BiosSysSeg' kernel_main.o(.text+0x3f9):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:117: undefined reference to `_NE_SetEntryPoint' kernel_main.o(.text+0x400):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:118: undefined reference to `_DOSMEM_BiosDataSeg' kernel_main.o(.text+0x414):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:118: undefined reference to `_NE_SetEntryPoint' kernel_main.o(.text+0x41b):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:119: undefined reference to `_DOSMEM_BiosSysSeg' kernel_main.o(.text+0x42f):/cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main .c:119: undefined reference to `_NE_SetEntryPoint' kernel_main.o(.text+0x471): In function `MAIN_KernelInit': /cygdrive/g/src/wine-dev/wine/dlls/kernel/kernel_main.c:160: undefined reference to `_WriteOutProfiles16@0' locale.o(.text+0x2792): In function `LOCALE_Init': /cygdrive/g/src/wine-dev/wine/dlls/kernel/locale.c:1012: undefined reference to `_CODEPAGE_Init' thunk.o(.text+0x4ab): In function `_loadthunk': /cygdrive/g/src/wine-dev/wine/dlls/kernel/thunk.c:164: undefined reference to `_ NE_GetOrdinal' thunk.o(.text+0x515): In function `_loadthunk': /cygdrive/g/src/wine-dev/wine/dlls/kernel/../../include/wine/winbase16.h:402: un defined reference to `_NE_GetEntryPointEx' thunk.o(.text+0x1c82): In function `IsPeFormat16': /cygdrive/g/src/wine-dev/wine/dlls/kernel/thunk.c:1115: undefined reference to ` _OpenFile16@12' thunk.o(.text+0x1ca8):/cygdrive/g/src/wine-dev/wine/dlls/kernel/thunk.c:1117: un defined reference to `__llseek16@12' thunk.o(.text+0x1cc2):/cygdrive/g/src/wine-dev/wine/dlls/kernel/thunk.c:1118: un defined reference to `__lread16@12' thunk.o(.text+0x1d0b):/cygdrive/g/src/wine-dev/wine/dlls/kernel/thunk.c:1120: un defined reference to `__llseek16@12' thunk.o(.text+0x1d28):/cygdrive/g/src/wine-dev/wine/dlls/kernel/thunk.c:1121: un defined reference to `__lread16@12' thunk.o(.text+0x2531): In function `C16ThkSL': /cygdrive/g/src/wine-dev/wine/dlls/kernel/thunk.c:1368: undefined reference to ` ___wine_call_from_16_thunk' thunk.o(.text+0x2729): In function `C16ThkSL01': /cygdrive/g/src/wine-dev/wine/dlls/kernel/thunk.c:1425: undefined reference to ` ___wine_call_from_16_thunk' thunk.o(.text+0x2b8d): In function `THUNK_AllocLSThunklet': /cygdrive/g/src/wine-dev/wine/dlls/kernel/thunk.c:1592: undefined reference to ` _TASK_GetPtr' thunk.o(.text+0x2c85): In function `THUNK_AllocSLThunklet': /cygdrive/g/src/wine-dev/wine/dlls/kernel/thunk.c:1626: undefined reference to ` _TASK_GetPtr' thunk.o(.text+0x3341): In function `CBClientThunkSL': /cygdrive/g/src/wine-dev/wine/dlls/kernel/thunk.c:1894: undefined reference to ` _CALL32_CBClient' thunk.o(.text+0x33b6): In function `CBClientThunkSLEx': /cygdrive/g/src/wine-dev/wine/dlls/kernel/thunk.c:1910: undefined reference to ` _CALL32_CBClientEx' wowthunk.o(.text+0xc4): In function `K32WOWGetVDMPointer': /cygdrive/g/src/wine-dev/wine/dlls/kernel/wowthunk.c:92: undefined reference to `_DOSMEM_MapRealToLinear' wowthunk.o(.text+0x3c4): In function `K32WOWHandle32': /cygdrive/g/src/wine-dev/wine/dlls/kernel/wowthunk.c:238: undefined reference to `_TASK_GetPtr' wowthunk.o(.text+0x5b4): In function `K32WOWHandle16': /cygdrive/g/src/wine-dev/wine/dlls/kernel/wowthunk.c:279: undefined reference to `_THREAD_IdToTEB' wowthunk.o(.text+0x6ec): In function `GetVDMPointer32W16': /cygdrive/g/src/wine-dev/wine/dlls/kernel/wowthunk.c:341: undefined reference to `_GlobalHandle16@4' wowthunk.o(.text+0x6fa):/cygdrive/g/src/wine-dev/wine/dlls/kernel/wowthunk.c:341 : undefined reference to `_GlobalPageLock16@4' wowthunk.o(.text+0x7ac): In function `LoadLibraryEx32W16': /cygdrive/g/src/wine-dev/wine/dlls/kernel/wowthunk.c:373: undefined reference to `_DIR_SearchPath' wowthunk.o(.text+0x225): In function `K32WOWYield16': /cygdrive/g/src/wine-dev/wine/dlls/kernel/wowthunk.c:195: undefined reference to `_Yield16@0' wowthunk.o(.text+0x23e): In function `K32WOWDirectedYield16': /cygdrive/g/src/wine-dev/wine/dlls/kernel/wowthunk.c:208: undefined reference to `_DirectedYield16@4' collect2: ld returned 1 exit status dllwrap: gcc exited with status 1 make: *** [kernel32.dll] Error 1

1 0

Mac OS X and Wine troubles
by Pierre d'Herbemont 27 Apr '03

27 Apr '03

Hi, First of all I have a good news :) : Wine is able to build on Mac OS X. We decided not to follow WineHQ cvs version for early build, in order not to be so much disturbed by others wine development and not to produce bad patches, but don't worry ;) we are (of course!) planing to send patches, I hope they would be integrated... I had never use Wine before so sorry for the basic questions. I ran wineinstall, everything goes well until wineinstall attempts to launch regedit. Wine goes wrong, it tells me : Warning: no valid DOS drive found, check your configuration file. Warning: could not find wine config [Drive x] entry for current working directory /Users/steg/Documents/Programmation/wine; starting in windows directory. /Users/steg/Documents/Programmation/wine/miscemu/wine: cannot find './programs/regedit/regedit.exe.so' For me the problem comes from somewhere in the reading of the file ~/.wine/config, which exists and is parsed, but maybe I missed something in wine configuration (like a register file or something)? Could someone tell we wether I am wrong or not? Secondly I manage to copy a windows folder to the root '/' of my disk, so I can launch an app with the command "wine notepad.exe". I added a basic Mach-O (Mac OS X binary file format) compatibility to libwine in order the file type to be recognized. But now I am getting error like: wine: could not load 'C:\windows\regedit.exe': dlcompat: dyld: wine Undefined symbols: _FormatMessageA _RegCloseKey _RegCreateKeyExA _RegDeleteKeyA _RegEnumKeyExA _RegEnumValueA _RegOpenKeyA _RegQueryInfoKeyA _RegSetValueExA I suppose that the problem comes from the fact that the dlls are not loaded before the notepad.exe, assuming that the problem is still related with the ~/.wine/config reading. Do I suppose right? If you have any idea of what could be wrong, or just a thought drop me a line, it could be very useful :) Cheers, Pierre

3 3

cvs hangs
by Ferenc Wagner 27 Apr '03

27 Apr '03

Hello, since the crash, every cvs operation I do hangs at the end. [Concurrent Versions System (CVS) 1.11.1p1 (client/server)] For example: tba:/usr/local/src/wine/ $ cvs status configure.ac =================================================================== File: configure.ac Status: Up-to-date Working revision: 1.151 Repository revision: 1.151 /home/wine/wine/configure.ac,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: (none) <wait for a very long time, then get bored and press ^C> cvs [status aborted]: received interrupt signal The same for an update, too. It seems to do a perfect job, though. cvs is sleeping in tcp_data_wait indefinitely. I have no idea what can cause this. Any advice? Feri.

4 4

winevdm changes break non-Linux platforms
by Gerald Pfeifer 27 Apr '03

27 Apr '03

I'm sorry to bother you, but the following change Moved the functionality of starting Win16 and DOS programs from the common process startup into a separate winevdm application. breaks non-Linux (actually "non-MZ" platforms as far as I can tell): /sw/test/wine/dlls/winedos% make /sw/gcc-3.2.2/bin/gcc -shared -Wl,-Bsymbolic,-z,defs winedos.spec.o devices.o dma.o dosaspi.o dosconf.o dosvm.o fpu.o himem.o int09.o int10.o int11.o int12.o int13.o int15.o int16.o int17.o int19.o int1a.o int20.o int21.o int25.o int26.o int29.o int2a.o int2f.o int31.o int33.o int41.o int4b.o int5c.o int67.o interrupts.o ioports.o module.o relay.o soundblaster.o vga.o xms.o winedos.dll.dbg.o -o winedos.dll.so -L../../dlls -L../../libs/wine -lwine -L../../libs/unicode -lwine_unicode -L../../libs/port -lwine_port -lm -lc winedos.spec.o: In function `__wine_spec_exports_funcs': winedos.spec.o(.data+0x40): undefined reference to `wine_load_dos_exe' winedos.spec.o: In function `__wine_spec_exp_ordinals': winedos.spec.o(.data+0xd8): undefined reference to `wine_load_dos_exe' winedos.spec.o(.data+0xd1): undefined reference to `wine_load_dos_exe' collect2: ld returned 1 exit status *** Error code 1 Gerald -- Gerald "Jerry" pfeifer(a)dbai.tuwien.ac.at http://www.pfeifer.com/gerald/

1 0

Re: commctrl: fix indentation
by Francois Gouget 27 Apr '03

27 Apr '03

On Sat, 26 Apr 2003, Dimitrie O. Paun wrote: > > ChangeLog > Indentation fixes. I noticed the resulting file still uses a mixture of spaces and tabs for alignment. Maybe some tabs escaped? Tabs really shouldn't be used unless they are at the beginning of a line. -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ The greatest programming project of all took six days; on the seventh day the programmer rested. We've been trying to debug the *&^%$#@ thing ever since. Moral: design before you implement.

2 1

Re: wine/ scheduler/process.c programs/Makefile.in ...
by Dimitrie O. Paun 27 Apr '03

27 Apr '03

On April 26, 2003 08:47 pm, Alexandre Julliard wrote: > Moved the functionality of starting Win16 and DOS programs from the > common process startup into a separate winevdm application. Wow -- very nice! It almost makes miscemu/main.c wanna move to something like programs/wine ;) This is very cool, the source starts to look better and better every day. Thanks! -- Dimi.

1 0

need you experts to confirm this about wine and mingw
by Kai 26 Apr '03

26 Apr '03

Hi, lists, I try to compile wine in mingw, is it possible? Can the compiled wine run in mingw? What I need? I installed the following package on my win2000: MinGW-2.0.0-3.exe MSYS-1.0.8.exe msysDTK-1.0.1.exe gdb-5.2.1.1-1.exe is it enough? But when I try, i got the following error: configure: error: no suitable bison/yacc found. Please install the 'bison' package. Where can I get the package? Any idea is very appreciated! Kai _________________________________________________________ Do You Yahoo!? 下载免费即时聊天软件“雅虎通”感受动感聊天魅力，赶快用你的雅虎电邮帐号登陆吧~ http://cn.rd.yahoo.com/mail_cn/tag/?http://cn.messenger.yahoo.com/

3 2

[FYI] cvsup on glibc2.3 systems (e.g. RedHat 9)
by Dimitrie O. Paun 26 Apr '03

26 Apr '03

Folks, As I've reported earlier on the list, cvsup compiled for glibc 2.x (x < 3) systems does not work on the new glibc2.3 systems, such as RedHat 9, or Mandrake 9.1, due to the threading changes. I've been looking all over the net for a precompiled binary of cvsup that works on these new systems, as cvsup is written in Modula 3, which is a bitch to setup. Finally I gave up and did the work myself. I've created a complete binary package which can be download from: http://www.dssd.ca/wine/cvsup-glibc2.3.tar.gz Note that the binaries are not small as they are statically linked, but they should work on all glibc2.3 system. The archive contains the following files: cvsup-glibc2.3/bin/cvpasswd cvsup-glibc2.3/bin/cvsup cvsup-glibc2.3/sbin/cvsupd cvsup-glibc2.3/man/man1/cvpasswd.1 cvsup-glibc2.3/man/man1/cvsup.1 cvsup-glibc2.3/man/man8/cvsupd.8 Simply copy them to the /usr/local prefix. They are compiled to go to /usr/local, they may work even if copied in /usr, but I haven't tried that. Enjoy! -- Dimi.

2 2

Re: Missing message TCM_SETPADDING implemented
by Dimitrie O. Paun 26 Apr '03

26 Apr '03

On April 26, 2003 05:40 am, BiGgUn wrote: > + * Positioning variables > + */ > +USHORT HORIZONTAL_ITEM_PADDING = 6; > +USHORT VERTICAL_ITEM_PADDING = 3; > + Shouldn't these go in the TAB_INFO structure? -- Dimi.

2 2

Re: oleaut32 patch
by Maxime Bellengé 26 Apr '03

26 Apr '03

Hi, I have problems with this patch, gcc complains about : gcc -c -I. -I. -I../../include -I../../include -D_REENTRANT -fPIC -D__WINESRC__ -D_OLEAUT32_ -DCOM_NO_WINDOWS_H -Wall -mpreferred-stack-boundary=2 -gstabs+ -Wpointer-arith -g -O2 -o usrmarshal.o usrmarshal.c usrmarshal.c: In function `VARIANT_UserMarshal': usrmarshal.c:240: structure has no member named `u' usrmarshal.c:251: structure has no member named `u' usrmarshal.c:253: structure has no member named `u' usrmarshal.c: In function `VARIANT_UserUnmarshal': usrmarshal.c:294: structure has no member named `u' usrmarshal.c:298: structure has no member named `u' usrmarshal.c:309: structure has no member named `u' usrmarshal.c:312: structure has no member named `u' a+ Max On Sat, 2003-04-19 at 18:29, Ove Kaaven wrote: > This is the implementation of a rpcrt4-based IDispatch marshaller. It is > still dead code though, the main DllGetClassObject must also be patched > to use it (I can supply a patch for that if this is accepted). (Also the > InstallShield hack in typelib.c would have to be removed, but that > should wait until more of the DCOM infrastructure is in place.) > > The oaidl_p.c is almost unmodified MIDL output generated from Wine's > oaidl.idl (I only had to add an #undef __WINE__ at the top to get all > the Winelib definitions, perhaps this isn't needed under Wine anymore), > so it shouldn't be hard to maintain, and Alexandre once said MIDL output > is acceptable as a stopgap solution. I don't know if proper > InstallShield repaint support calls for stopgaps, though. > > The usrmarshal.c is not so stopgap, but it's a pretty minimal > implementation of the user-marshallers (wire_marshal and call_as) > declared in oaidl.idl. But it's sufficient for remoting all the > IDispatch that InstallShield needs. > > Log: > Ove Kaaven <ovek(a)transgaming.com> > Preliminary implementation of proper IDispatch marshalling. ________________________________________________________________________ -- Maxime Bellengé <maxime.bellenge(a)laposte.net>

2 1

re: need you experts to confirm this about wine and mingw
by Dan Kegel 26 Apr '03

26 Apr '03

shorthair_kai(a)yahoo.com.cn wrote: > I try to compile wine in mingw, is it possible? > Can the compiled wine run in mingw? What are you trying to do? We really can't advise you until we understand why you're trying to build wine in mingw. Please tell us a story about why you decided to try this, and what you hope to get out of it. > What I need? > I installed the following package on my win2000: > MinGW-2.0.0-3.exe > MSYS-1.0.8.exe > msysDTK-1.0.1.exe > gdb-5.2.1.1-1.exe > is it enough? > > But when I try, i got the following error: > configure: error: no suitable bison/yacc found. Please > install the 'bison' package. > Where can I get the package? Since I have no idea what you're trying to really do, and I've never compiled Wine under MinGW or Cygwin, take this advice with a grain of salt: You may be happier building under cygwin, which comes with bison. MinGW is like a fork of cygwin. Only difference is you'll need the --mno-cygwin option to the gcc commandline to avoid linking with cygwin.dll. - Dan - Dan -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045

1 0

Debugging
by Ann and Jason Edmeades 25 Apr '03

25 Apr '03

2 questions... 1. Is there any macro to dump out a hex dump of memory, eg. TRACE_DUMP("Memory", pMem, numBytes); If not, can I add one (inline in debug.h?) 2. When debugging using winedbg, is there any way to view the contents of a lot of memory in one go (eg. hex dump of 256 bytes)? Jason

4 4

New Server?
by hatky 25 Apr '03

25 Apr '03

Since the Slash Dot pice on Wine the server is dead half the day.... Why not get the site on a new server I know what you are going to say: "Have you got one?" :) How about wine.sf.net? You already have a project open on source forge is it that difficult to move the site to their server? I THINK they can handle the load I assume there is some reason it has not been done but if there is not any meager issue I think it will be done at least for now (till the users stop coming :) ) What do you think? Hatky. __________________________________________________ Do you Yahoo!? The New Yahoo! Search - Faster. Easier. Bingo http://search.yahoo.com

3 3

[FYI] Mozilla & MinGW
by Dimitrie O. Paun 25 Apr '03

25 Apr '03

Folks, Mozilla officially builds on MinGW: http://www.mozilla.org/build/win32.html#ss2.2 Bug #134113 tracking this effort was closed: http://bugzilla.mozilla.org/show_bug.cgi?id=134113 Unfortunately, the new windres I was working on did not make it in time for this release, so a bunch of ugly hacks had to be checked in to work around various problems, but hopefully we'll be able to remove them in a few weeks, when the next binutils package is released. We can now start looking into the real Winelib port. :) -- Dimi.

1 0

help, service thread, pthread, segv
by KK singh 25 Apr '03

25 Apr '03

hi, am a newbee and in need of help about wine, following are my querries. using wine20030408 on linux rhl 8.0 1. wine-devel doc says that the code for service thread should be in scheduler/services.c, I could not locate the file in my source code. 2. scheduler/pthread.c baffled me. It seems a pthread implementation using windows code. The header says. /* * pthread emulation for re-entrant libcs * * We can't use pthreads directly, so why not let libcs * that want pthreads use Wine's own threading */ Why cannot we use pthreads directly ? 3. I get a SIGBUS and repeated SIGSEGV, keeps coming, while running wine under gdb, this segv or sigbus is not normally visible, I mean running without gdb. This must be affecting the performance severly ? How can i know which thread is causing this ? gdb version is 5.2.1-4 4. The stack trace of sisegv looks like ..... for SIGBUS #0 0x4207be77 in memset () from /lib/i686/libc.so.6 #1 0x00000010 in ?? () #2 0x400c4bf8 in NtAllocateVirtualMemory (process=0xffffffff, ret=0x40722854, addr=0x41920000, size_ptr=0x40722858, type=4096, protect=64) at virtual.c:1045 #3 0x400b6b57 in HEAP_FindFreeBlock (heap=0x418f0000, size=65040, ppSubHeap=0x40722884) at heap.c:340 #4 0x400b74a5 in RtlAllocateHeap (heap=0x418f0000, flags=3, size=65040) at heap.c:1102 #5 0x004014f6 in ?? () ========================================== FOR SIGSEGV #0 RtlImageNtHeader (hModule=0x0) at loader.c:1242 #1 0x400ba560 in RtlImageDirectoryEntryToData (module=0x0, image=1, dir=0, size=0x40722650) at loader.c:1270 #2 0x400b97c7 in LdrGetProcedureAddress (module=0x0, name=0x4072267c, ord=0, address=0x40722678) at loader.c:754 #3 0x4007c8f9 in GetProcAddress (hModule=0x0, function=0xac46c4 "IID_ITextServices") at ../../loader/module.c:1053 #4 0x0046b5ed in ?? () #5 0x006074d7 in ?? () #6 0x00467708 in ?? () #7 0x00469e99 in ?? () #8 0x00607865 in ?? () #9 0x004671ae in ?? () #10 0x004610f1 in ?? () #11 0x00466ffa in ?? () #12 0x00466fa5 in ?? () #13 0x00463e07 in ?? () #14 0x0040b610 in ?? () #15 0x00463c22 in ?? () #16 0x00431979 in ?? () #17 0x00462662 in ?? () #18 0x00463a94 in ?? () #19 0x00463a0d in ?? () #20 0x004631b2 in ?? () ---------------------------------------- Please help me to know what are these functions ?? () tia -kks __________________________________________________ Do you Yahoo!? The New Yahoo! Search - Faster. Easier. Bingo http://search.yahoo.com

2 1

Re: wintab32 (from CrossOver Office)
by Mike Hearn 25 Apr '03

25 Apr '03

Thanks, I already have some code in the form of libegg, but I suspect Chris' code might be clearer. Chris - if you have any tips or could send me that code, it'd be good. Just remember that if you start getting it to work with Wine, please drop me a line. On Fri, 2003-04-25 at 04:09, Mike McCormack wrote: > Hi Mike, > > Now is a good time to mention to you that Chris Hoff did some work on > getting XEmbed to work with Wine. As far as I know, he had a standalone > program that could put something in the gnome toolbar, but no Wine code. > > You might want to write him an email to see how far he got with it. > > Mike > > Mike Hearn wrote: > > > I don't really have any, I'm much happier now that the policy has been > > made clear. It seems fine to me. No promised on xembed though ;) > -- Mike Hearn <m.hearn(a)signal.qinetiq.com> QinetiQ - Malvern Technology Center

1 0

wintab32 (from CrossOver Office)
by Aric Stewart 25 Apr '03

25 Apr '03

Changelog: Adds wintab32 support using XInput. Merged from CrossOver Office. I am including this on the wine-devel list because there was discussion and comment about it there. -aric Index: dlls/wintab32/Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/wintab32/Makefile.in,v retrieving revision 1.2 diff -u -r1.2 Makefile.in --- dlls/wintab32/Makefile.in 23 Mar 2003 20:00:02 -0000 1.2 +++ dlls/wintab32/Makefile.in 23 Apr 2003 13:55:27 -0000 @@ -3,7 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wintab32.dll -IMPORTS = kernel32 +IMPORTS = kernel32 user32 ALTNAMES = wintab.dll LDDLLFLAGS = @LDDLLFLAGS@ @@ -13,7 +13,8 @@ C_SRCS = \ context.c \ - manager.c + manager.c \ + wintab32.c C_SRCS16 = \ wintab16.c Index: dlls/wintab32/context.c =================================================================== RCS file: /home/wine/wine/dlls/wintab32/context.c,v retrieving revision 1.1 diff -u -r1.1 context.c --- dlls/wintab32/context.c 17 Dec 2002 01:49:16 -0000 1.1 +++ dlls/wintab32/context.c 23 Apr 2003 13:55:27 -0000 @@ -2,6 +2,7 @@ * Tablet Context * * Copyright 2002 Patrik Stridvall + * Copyright 2003 Codeweavers, Aric Stewart * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,27 +20,737 @@ */ #include "config.h" +#include <stdio.h> +#include <stdlib.h> -#include "windef.h" #include "winbase.h" +#include "windef.h" #include "winerror.h" +#include "winuser.h" +#include "user.h" #include "wintab.h" +#include "wintab_internal.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wintab32); +/* + * Documentation found at + * http://www.csl.sony.co.jp/projects/ar/restricted/wintabl.html + */ + +#define CURSORMAX 10 + +BOOL gLoaded= FALSE; +LOGCONTEXTA gSysContext; +WTI_CURSORS_INFO gSysCursor[CURSORMAX]; +WTI_DEVICES_INFO gSysDevice; +INT gNumCursors; + +LPOPENCONTEXT gOpenContexts = NULL; +INT gContextCount = 0; +HCTX gTopContext = (HCTX)0xc00; + +extern HWND hwndDefault; +extern CRITICAL_SECTION csTablet; + +char* DUMPBITS(int x, char* buf) +{ + strcpy(buf,"{"); + if (x&PK_CONTEXT) strcat(buf,"PK_CONTEXT "); + if (x&PK_STATUS) strcat(buf, "PK_STATUS "); + if (x&PK_TIME) strcat(buf, "PK_TIME "); + if (x&PK_CHANGED) strcat(buf, "PK_CHANGED "); + if (x&PK_SERIAL_NUMBER) strcat(buf, "PK_SERIAL_NUMBER "); + if (x&PK_CURSOR) strcat(buf, "PK_CURSOR "); + if (x&PK_BUTTONS) strcat(buf, "PK_BUTTONS "); + if (x&PK_X) strcat(buf, "PK_X "); + if (x&PK_Y) strcat(buf, "PK_Y "); + if (x&PK_Z) strcat(buf, "PK_Z "); + if (x&PK_NORMAL_PRESSURE) strcat(buf, "PK_NORMAL_PRESSURE "); + if (x&PK_TANGENT_PRESSURE) strcat(buf, "PK_TANGENT_PRESSURE "); + if (x&PK_ORIENTATION) strcat(buf, "PK_ORIENTATION "); + if (x&PK_ROTATION) strcat(buf, "PK_ROTATION "); + strcat(buf, "}"); + return buf; +} + +static inline void DUMPPACKET(WTPACKET packet) +{ + TRACE("pkContext: 0x%x pkStatus: 0x%x pkTime : 0x%x pkChanged: 0x%x pkSerialNumber: 0x%x pkCursor : %i pkButtons: %x pkX: %li pkY: %li pkZ: %li pkNormalPressure: %i pkTangentPressure: %i pkOrientation: (%i,%i,%i) pkRotation: (%i,%i,%i)\n" +,(UINT)packet.pkContext, + (UINT)packet.pkStatus, + (UINT)packet.pkTime, + (UINT)packet.pkChanged, + packet.pkSerialNumber, + packet.pkCursor, + (UINT)packet.pkButtons, + packet.pkX, + packet.pkY, + packet.pkZ, + packet.pkNormalPressure, + packet.pkTangentPressure, + packet.pkOrientation.orAzimuth, + packet.pkOrientation.orAltitude, packet.pkOrientation.orTwist, + packet.pkRotation.roPitch, + packet.pkRotation.roRoll, packet.pkRotation.roYaw); +} + +static inline void DUMPCONTEXT(LOGCONTEXTA lc) +{ + CHAR mmsg[4000]; + CHAR bits[100]; + CHAR bits1[100]; + CHAR bits2[100]; + + sprintf(mmsg,"%s, %x, %x, %x, %x, %x, %x, %x%s, %x%s, %x%s, %x, %x, %i, %i, %i, %li ,%li, %li, %li, %li, %li,%li, %li, %li, %li, %li, %li, %i, %i, %i, %i, %i %li %li\n", + debugstr_a(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, +lc.lcDevice, lc.lcPktRate, (UINT)lc.lcPktData, DUMPBITS(lc.lcPktData,bits), +(UINT)lc.lcPktMode, DUMPBITS(lc.lcPktMode,bits1), (UINT)lc.lcMoveMask, +DUMPBITS(lc.lcMoveMask,bits2), (INT)lc.lcBtnDnMask, (INT)lc.lcBtnUpMask, +(INT)lc.lcInOrgX, (INT)lc.lcInOrgY, (INT)lc.lcInOrgZ, lc.lcInExtX, lc.lcInExtY, +lc.lcInExtZ, lc.lcOutOrgX, lc.lcOutOrgY, lc.lcOutOrgZ, lc.lcOutExtX, +lc.lcOutExtY, lc.lcOutExtZ, lc.lcSensX, lc.lcSensY, lc.lcSensZ, lc.lcSysMode, +lc.lcSysOrgX, lc.lcSysOrgY, lc.lcSysExtX, lc.lcSysExtY, lc.lcSysSensX, +lc.lcSysSensY); + TRACE("context: %s",mmsg); +} + + +/* Find an open context given the handle */ +LPOPENCONTEXT TABLET_FindOpenContext(HCTX hCtx) +{ + LPOPENCONTEXT ptr = gOpenContexts; + while (ptr) + { + if (ptr->handle == hCtx) return ptr; + ptr = ptr->next; + } + return NULL; +} + +static void LoadTablet() +{ + TRACE("Initilizing the tablet to hwnd 0x%x\n",(INT)hwndDefault); + gLoaded= TRUE; + memset(&gSysContext,0,sizeof(LOGCONTEXTA)); + memset(&gSysDevice,0,sizeof(WTI_DEVICES_INFO)); + memset(gSysCursor,0,sizeof(WTI_CURSORS_INFO)*gNumCursors); + gNumCursors = pLoadTabletInfo(&gSysContext, &gSysDevice, gSysCursor, + CURSORMAX, hwndDefault); +} + +int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam, + LPARAM lParam, BOOL send_always) +{ + if ((send_always) || (newcontext->context.lcOptions & CXO_MESSAGES)) + { + TRACE("Posting message %x to %x\n",msg, (UINT)newcontext->hwndOwner); + return PostMessageA(newcontext->hwndOwner, msg, wParam, lParam); + } + return 0; +} + +static inline DWORD ScaleForContext(DWORD In, DWORD InOrg, DWORD InExt, DWORD + OutOrg, DWORD OutExt) +{ + if (((InExt > 0 )&&(OutExt > 0)) || ((InExt<0) && (OutExt < 0))) + return ((In - InOrg) * abs(OutExt) / abs(InExt)) + OutOrg; + else + return ((abs(InExt) - (In - InOrg))*abs(OutExt) / abs(InExt)) + OutOrg; +} + +LPOPENCONTEXT FindOpenContext(HWND hwnd) +{ + LPOPENCONTEXT ptr=NULL; + ptr = gOpenContexts; + while (ptr) + { + TRACE("Trying Context %lx (%x %x)\n",(LONG)ptr->handle,(INT)hwnd, + (INT)ptr->hwndOwner); + + if (ptr->hwndOwner == hwnd) + return ptr; + } + return NULL; +} + +LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) +{ + LPOPENCONTEXT ptr=NULL; + + EnterCriticalSection(&csTablet); + + ptr = gOpenContexts; + while (ptr) + { + TRACE("Trying Queue %lx (%x %x)\n",(LONG)ptr->handle,(INT)hwnd, + (INT)ptr->hwndOwner); + + if (ptr->hwndOwner == hwnd) + { + int tgt; + if (!ptr->enabled) + { + ptr = ptr->next; + continue; + } + + tgt = ptr->PacketsQueued; + + packet->pkContext = ptr->handle; + + /* translate packet data to the context */ + + /* Scale as per documentation */ + packet->pkY = ScaleForContext(packet->pkY, ptr->context.lcInOrgY, + ptr->context.lcInExtY, ptr->context.lcOutOrgY, + ptr->context.lcOutExtY); + + packet->pkX = ScaleForContext(packet->pkX, ptr->context.lcInOrgX, + ptr->context.lcInExtX, ptr->context.lcOutOrgX, + ptr->context.lcOutExtX); + + /* flip the Y axis */ + if (ptr->context.lcOutExtY > 0) + packet->pkY = ptr->context.lcOutExtY - packet->pkY; + + DUMPPACKET(*packet); + + if (tgt + 1 == ptr->QueueSize) + { + TRACE("Queue Overflow %p\n",ptr->handle); + packet->pkStatus = TPS_QUEUE_ERR; + } + else + { + TRACE("Placed in queue %p index %i\n",ptr->handle,tgt); + memcpy(&ptr->PacketQueue[tgt], packet, sizeof + (WTPACKET)); + ptr->PacketsQueued++; + + if (ptr->ActiveCursor != packet->pkCursor) + { + ptr->ActiveCursor = packet->pkCursor; + if (ptr->context.lcOptions & CXO_CSRMESSAGES) + TABLET_PostTabletMessage(ptr, WT_CSRCHANGE, + (WPARAM)packet->pkSerialNumber, (LPARAM)ptr->handle, + FALSE); + } + } + break; + } + ptr = ptr->next; + } + LeaveCriticalSection(&csTablet); + TRACE("Done (%p)\n",ptr); + return ptr; +} + +int static inline CopyTabletData(LPVOID target, LPVOID src, INT size) +{ + memcpy(target,src,size); + return(size); +} + +static INT TABLET_FindPacket(LPOPENCONTEXT context, UINT wSerial, + LPWTPACKET *pkt) +{ + int loop; + int index = -1; + for (loop = 0; loop < context->PacketsQueued; loop++) + if (context->PacketQueue[loop].pkSerialNumber == wSerial) + { + index = loop; + *pkt = &context->PacketQueue[loop]; + break; + } + + TRACE("%i .. %i\n",context->PacketsQueued,index); + + return index; +} + + +static LPVOID TABLET_CopyPacketData(LPOPENCONTEXT context, LPVOID lpPkt, + LPWTPACKET wtp) +{ + LPBYTE ptr; + CHAR bits[100]; + + ptr = lpPkt; + TRACE("Packet Bits %s\n",DUMPBITS(context->context.lcPktData,bits)); + + if (context->context.lcPktData & PK_CONTEXT) + ptr+=CopyTabletData(ptr,&wtp->pkContext,sizeof(HCTX)); + if (context->context.lcPktData & PK_STATUS) + ptr+=CopyTabletData(ptr,&wtp->pkStatus,sizeof(UINT)); + if (context->context.lcPktData & PK_TIME) + ptr+=CopyTabletData(ptr,&wtp->pkTime,sizeof(LONG)); + if (context->context.lcPktData & PK_CHANGED) + ptr+=CopyTabletData(ptr,&wtp->pkChanged,sizeof(WTPKT)); + if (context->context.lcPktData & PK_SERIAL_NUMBER) + ptr+=CopyTabletData(ptr,&wtp->pkChanged,sizeof(UINT)); + if (context->context.lcPktData & PK_CURSOR) + ptr+=CopyTabletData(ptr,&wtp->pkCursor,sizeof(UINT)); + if (context->context.lcPktData & PK_BUTTONS) + ptr+=CopyTabletData(ptr,&wtp->pkButtons,sizeof(DWORD)); + if (context->context.lcPktData & PK_X) + ptr+=CopyTabletData(ptr,&wtp->pkX,sizeof(DWORD)); + if (context->context.lcPktData & PK_Y) + ptr+=CopyTabletData(ptr,&wtp->pkY,sizeof(DWORD)); + if (context->context.lcPktData & PK_Z) + ptr+=CopyTabletData(ptr,&wtp->pkZ,sizeof(DWORD)); + if (context->context.lcPktData & PK_NORMAL_PRESSURE) + ptr+=CopyTabletData(ptr,&wtp->pkNormalPressure,sizeof(UINT)); + if (context->context.lcPktData & PK_TANGENT_PRESSURE) + ptr+=CopyTabletData(ptr,&wtp->pkTangentPressure,sizeof(UINT)); + if (context->context.lcPktData & PK_ORIENTATION) + ptr+=CopyTabletData(ptr,&wtp->pkOrientation,sizeof(ORIENTATION)); + if (context->context.lcPktData & PK_ROTATION) + ptr+=CopyTabletData(ptr,&wtp->pkRotation,sizeof(ROTATION)); + + //TRACE("Copied %i bytes\n",(INT)ptr - (INT)lpPkt); + return ptr; +} + +static VOID TABLET_BlankPacketData(LPOPENCONTEXT context, LPVOID lpPkt, INT n) +{ + int rc = 0; + + if (context->context.lcPktData & PK_CONTEXT) + rc +=sizeof(HCTX); + if (context->context.lcPktData & PK_STATUS) + rc +=sizeof(UINT); + if (context->context.lcPktData & PK_TIME) + rc += sizeof(LONG); + if (context->context.lcPktData & PK_CHANGED) + rc += sizeof(WTPKT); + if (context->context.lcPktData & PK_SERIAL_NUMBER) + rc += sizeof(UINT); + if (context->context.lcPktData & PK_CURSOR) + rc += sizeof(UINT); + if (context->context.lcPktData & PK_BUTTONS) + rc += sizeof(DWORD); + if (context->context.lcPktData & PK_X) + rc += sizeof(DWORD); + if (context->context.lcPktData & PK_Y) + rc += sizeof(DWORD); + if (context->context.lcPktData & PK_Z) + rc += sizeof(DWORD); + if (context->context.lcPktData & PK_NORMAL_PRESSURE) + rc += sizeof(UINT); + if (context->context.lcPktData & PK_TANGENT_PRESSURE) + rc += sizeof(UINT); + if (context->context.lcPktData & PK_ORIENTATION) + rc += sizeof(ORIENTATION); + if (context->context.lcPktData & PK_ROTATION) + rc += sizeof(ROTATION); + + rc *= n; + memset(lpPkt,0,rc); +} + + /*********************************************************************** * WTInfoA (WINTAB32.20) */ UINT WINAPI WTInfoA(UINT wCategory, UINT nIndex, LPVOID lpOutput) { - FIXME("(%u, %u, %p): stub\n", wCategory, nIndex, lpOutput); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - - return 0; + int rc = 0; + LPWTI_CURSORS_INFO tgtcursor; + TRACE("(%u, %u, %p)\n", wCategory, nIndex, lpOutput); + + if (gLoaded == FALSE) + LoadTablet(); + switch(wCategory) + { + case 0: + /* return largest nessecary buffer */ + TRACE("%i cursors\n",gNumCursors); + if (gNumCursors>0) + { + FIXME("Return proper size\n"); + return 200; + } + else + return 0; + break; + case WTI_INTERFACE: + switch (nIndex) + { + WORD version; + case IFC_WINTABID: + strcpy(lpOutput,"Wine Wintab 1.1"); + rc = 16; + break; + case IFC_SPECVERSION: + version = (0x01) | (0x01 << 8); + rc = CopyTabletData(lpOutput, &version,sizeof(WORD)); + break; + case IFC_IMPLVERSION: + version = (0x00) | (0x01 << 8); + rc = CopyTabletData(lpOutput, &version,sizeof(WORD)); + break; + default: + FIXME("WTI_INTERFACE unhandled index %i\n",nIndex); + rc = 0; + + } + case WTI_DEFSYSCTX: + case WTI_DDCTXS: + case WTI_DEFCONTEXT: + DUMPCONTEXT(gSysContext); + switch (nIndex) + { + case 0: + memcpy(lpOutput, &gSysContext, + sizeof(LOGCONTEXTA)); + rc = sizeof(LOGCONTEXTA); + break; + case CTX_NAME: + rc = CopyTabletData(lpOutput, &gSysContext.lcName, + strlen(gSysContext.lcName)+1); + break; + case CTX_OPTIONS: + rc = CopyTabletData(lpOutput, &gSysContext.lcOptions, + sizeof(UINT)); + break; + case CTX_STATUS: + rc = CopyTabletData(lpOutput, &gSysContext.lcStatus, + sizeof(UINT)); + break; + case CTX_LOCKS: + rc= CopyTabletData (lpOutput, &gSysContext.lcLocks, + sizeof(UINT)); + break; + case CTX_MSGBASE: + rc = CopyTabletData(lpOutput, &gSysContext.lcMsgBase, + sizeof(UINT)); + break; + case CTX_DEVICE: + rc = CopyTabletData(lpOutput, &gSysContext.lcDevice, + sizeof(UINT)); + break; + case CTX_PKTRATE: + rc = CopyTabletData(lpOutput, &gSysContext.lcPktRate, + sizeof(UINT)); + break; + case CTX_PKTMODE: + rc = CopyTabletData(lpOutput, &gSysContext.lcPktMode, + sizeof(WTPKT)); + break; + case CTX_MOVEMASK: + rc = CopyTabletData(lpOutput, &gSysContext.lcMoveMask, + sizeof(WTPKT)); + break; + case CTX_BTNDNMASK: + rc = CopyTabletData(lpOutput, &gSysContext.lcBtnDnMask, + sizeof(DWORD)); + break; + case CTX_BTNUPMASK: + rc = CopyTabletData(lpOutput, &gSysContext.lcBtnUpMask, + sizeof(DWORD)); + break; + case CTX_INORGX: + rc = CopyTabletData(lpOutput, &gSysContext.lcInOrgX, + sizeof(LONG)); + break; + case CTX_INORGY: + rc = CopyTabletData(lpOutput, &gSysContext.lcInOrgY, + sizeof(LONG)); + break; + case CTX_INORGZ: + rc = CopyTabletData(lpOutput, &gSysContext.lcInOrgZ, + sizeof(LONG)); + break; + case CTX_INEXTX: + rc = CopyTabletData(lpOutput, &gSysContext.lcInExtX, + sizeof(LONG)); + break; + case CTX_INEXTY: + rc = CopyTabletData(lpOutput, &gSysContext.lcInExtY, + sizeof(LONG)); + break; + case CTX_INEXTZ: + rc = CopyTabletData(lpOutput, &gSysContext.lcInExtZ, + sizeof(LONG)); + break; + case CTX_OUTORGX: + rc = CopyTabletData(lpOutput, &gSysContext.lcOutOrgX, + sizeof(LONG)); + break; + case CTX_OUTORGY: + rc = CopyTabletData(lpOutput, &gSysContext.lcOutOrgY, + sizeof(LONG)); + break; + case CTX_OUTORGZ: + rc = CopyTabletData(lpOutput, &gSysContext.lcOutOrgZ, + sizeof(LONG)); + break; + case CTX_OUTEXTX: + rc = CopyTabletData(lpOutput, &gSysContext.lcOutExtX, + sizeof(LONG)); + break; + case CTX_OUTEXTY: + rc = CopyTabletData(lpOutput, &gSysContext.lcOutExtY, + sizeof(LONG)); + break; + case CTX_OUTEXTZ: + rc = CopyTabletData(lpOutput, &gSysContext.lcOutExtZ, + sizeof(LONG)); + break; + case CTX_SENSX: + rc = CopyTabletData(lpOutput, &gSysContext.lcSensX, + sizeof(LONG)); + break; + case CTX_SENSY: + rc = CopyTabletData(lpOutput, &gSysContext.lcSensY, + sizeof(LONG)); + break; + case CTX_SENSZ: + rc = CopyTabletData(lpOutput, &gSysContext.lcSensZ, + sizeof(LONG)); + break; + case CTX_SYSMODE: + rc = CopyTabletData(lpOutput, &gSysContext.lcSysMode, + sizeof(LONG)); + break; + case CTX_SYSORGX: + rc = CopyTabletData(lpOutput, &gSysContext.lcSysOrgX, + sizeof(LONG)); + break; + case CTX_SYSORGY: + rc = CopyTabletData(lpOutput, &gSysContext.lcSysOrgY, + sizeof(LONG)); + break; + case CTX_SYSEXTX: + rc = CopyTabletData(lpOutput, &gSysContext.lcSysExtX, + sizeof(LONG)); + break; + case CTX_SYSEXTY: + rc = CopyTabletData(lpOutput, &gSysContext.lcSysExtY, + sizeof(LONG)); + break; + case CTX_SYSSENSX: + rc = CopyTabletData(lpOutput, &gSysContext.lcSysSensX, + sizeof(LONG)); + break; + case CTX_SYSSENSY: + rc = CopyTabletData(lpOutput, &gSysContext.lcSysSensY, + sizeof(LONG)); + break; + default: + FIXME("WTI_DEFSYSCTX unhandled index %i\n",nIndex); + rc = 0; + } + break; + case WTI_CURSORS: + case WTI_CURSORS+1: + case WTI_CURSORS+2: + case WTI_CURSORS+3: + case WTI_CURSORS+4: + case WTI_CURSORS+5: + case WTI_CURSORS+6: + case WTI_CURSORS+7: + case WTI_CURSORS+8: + case WTI_CURSORS+9: + case WTI_CURSORS+10: + tgtcursor = &gSysCursor[wCategory - WTI_CURSORS]; + switch (nIndex) + { + case CSR_NAME: + rc = CopyTabletData(lpOutput, &tgtcursor->NAME, + strlen(tgtcursor->NAME)+1); + break; + case CSR_ACTIVE: + rc = CopyTabletData(lpOutput,&tgtcursor->ACTIVE, + sizeof(BOOL)); + break; + case CSR_PKTDATA: + rc = CopyTabletData(lpOutput,&tgtcursor->PKTDATA, + sizeof(WTPKT)); + break; + case CSR_BUTTONS: + rc = CopyTabletData(lpOutput,&tgtcursor->BUTTONS, + sizeof(BYTE)); + break; + case CSR_BUTTONBITS: + rc = CopyTabletData(lpOutput,&tgtcursor->BUTTONBITS, + sizeof(BYTE)); + break; + case CSR_BTNNAMES: + FIXME("Button Names not returned correctly\n"); + rc = CopyTabletData(lpOutput,&tgtcursor->BTNNAMES, + strlen(tgtcursor->BTNNAMES)+1); + break; + case CSR_BUTTONMAP: + rc = CopyTabletData(lpOutput,&tgtcursor->BUTTONMAP, + sizeof(BYTE)*32); + break; + case CSR_SYSBTNMAP: + rc = CopyTabletData(lpOutput,&tgtcursor->SYSBTNMAP, + sizeof(BYTE)*32); + break; + case CSR_NPBTNMARKS: + memcpy(lpOutput,&tgtcursor->NPBTNMARKS,sizeof(UINT)*2); + rc = sizeof(UINT)*2; + break; + case CSR_NPBUTTON: + rc = CopyTabletData(lpOutput,&tgtcursor->NPBUTTON, + sizeof(BYTE)); + break; + case CSR_NPRESPONSE: + FIXME("Not returning CSR_NPRESPONSE correctly\n"); + rc = 0; + break; + case CSR_TPBUTTON: + rc = CopyTabletData(lpOutput,&tgtcursor->TPBUTTON, + sizeof(BYTE)); + break; + case CSR_TPBTNMARKS: + memcpy(lpOutput,&tgtcursor->TPBTNMARKS,sizeof(UINT)*2); + rc = sizeof(UINT)*2; + break; + case CSR_TPRESPONSE: + FIXME("Not returning CSR_TPRESPONSE correctly\n"); + rc = 0; + break; + case CSR_PHYSID: + { + DWORD id; + rc = CopyTabletData(&id,&tgtcursor->PHYSID, + sizeof(DWORD)); + id += (wCategory - WTI_CURSORS); + memcpy(lpOutput,&id,sizeof(DWORD)); + } + break; + case CSR_MODE: + rc = CopyTabletData(lpOutput,&tgtcursor->MODE,sizeof(UINT)); + break; + case CSR_MINPKTDATA: + rc = CopyTabletData(lpOutput,&tgtcursor->MINPKTDATA, + sizeof(UINT)); + break; + case CSR_MINBUTTONS: + rc = CopyTabletData(lpOutput,&tgtcursor->MINBUTTONS, + sizeof(UINT)); + break; + case CSR_CAPABILITIES: + rc = CopyTabletData(lpOutput,&tgtcursor->CAPABILITIES, + sizeof(UINT)); + break; + case CSR_TYPE: + rc = CopyTabletData(lpOutput,&tgtcursor->TYPE, + sizeof(UINT)); + break; + default: + FIXME("WTI_CURSORS unhandled index %i\n",nIndex); + rc = 0; + } + break; + case WTI_DEVICES: + switch (nIndex) + { + case DVC_NAME: + rc = CopyTabletData(lpOutput,gSysDevice.NAME, + strlen(gSysDevice.NAME)+1); + break; + case DVC_HARDWARE: + rc = CopyTabletData(lpOutput,&gSysDevice.HARDWARE, + sizeof(UINT)); + break; + case DVC_NCSRTYPES: + rc = CopyTabletData(lpOutput,&gSysDevice.NCSRTYPES, + sizeof(UINT)); + break; + case DVC_FIRSTCSR: + rc = CopyTabletData(lpOutput,&gSysDevice.FIRSTCSR, + sizeof(UINT)); + break; + case DVC_PKTRATE: + rc = CopyTabletData(lpOutput,&gSysDevice.PKTRATE, + sizeof(UINT)); + break; + case DVC_PKTDATA: + rc = CopyTabletData(lpOutput,&gSysDevice.PKTDATA, + sizeof(WTPKT)); + break; + case DVC_PKTMODE: + rc = CopyTabletData(lpOutput,&gSysDevice.PKTMODE, + sizeof(WTPKT)); + break; + case DVC_CSRDATA: + rc = CopyTabletData(lpOutput,&gSysDevice.CSRDATA, + sizeof(WTPKT)); + break; + case DVC_XMARGIN: + rc = CopyTabletData(lpOutput,&gSysDevice.XMARGIN, + sizeof(INT)); + break; + case DVC_YMARGIN: + rc = CopyTabletData(lpOutput,&gSysDevice.YMARGIN, + sizeof(INT)); + break; + case DVC_ZMARGIN: + rc = 0; /* unsupported */ + /* + rc = CopyTabletData(lpOutput,&gSysDevice.ZMARGIN, + sizeof(INT)); + */ + break; + case DVC_X: + rc = CopyTabletData(lpOutput,&gSysDevice.X, + sizeof(AXIS)); + break; + case DVC_Y: + rc = CopyTabletData(lpOutput,&gSysDevice.Y, + sizeof(AXIS)); + break; + case DVC_Z: + rc = 0; /* unsupported */ + /* + rc = CopyTabletData(lpOutput,&gSysDevice.Z, + sizeof(AXIS)); + */ + break; + case DVC_NPRESSURE: + rc = CopyTabletData(lpOutput,&gSysDevice.NPRESSURE, + sizeof(AXIS)); + break; + case DVC_TPRESSURE: + rc = 0; /* unsupported */ + /* + rc = CopyTabletData(lpOutput,&gSysDevice.TPRESSURE, + sizeof(AXIS)); + */ + break; + case DVC_ORIENTATION: + memcpy(lpOutput,&gSysDevice.ORIENTATION,sizeof(AXIS)*3); + rc = sizeof(AXIS)*3; + break; + case DVC_ROTATION: + rc = 0; /* unsupported */ + /* + memcpy(lpOutput,&gSysDevice.ROTATION,sizeof(AXIS)*3); + rc = sizeof(AXIS)*3; + */ + break; + case DVC_PNPID: + rc = CopyTabletData(lpOutput,gSysDevice.PNPID, + strlen(gSysDevice.PNPID)+1); + break; + default: + FIXME("WTI_DEVICES unhandled index %i\n",nIndex); + rc = 0; + } + break; + default: + FIXME("Unhandled Category %i\n",wCategory); + } + return rc; } /*********************************************************************** @@ -59,11 +770,38 @@ */ HCTX WINAPI WTOpenA(HWND hWnd, LPLOGCONTEXTA lpLogCtx, BOOL fEnable) { - FIXME("(%p, %p, %u): stub\n", hWnd, lpLogCtx, fEnable); + LPOPENCONTEXT newcontext; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("(%p, %p, %u)\n", hWnd, lpLogCtx, fEnable); + DUMPCONTEXT(*lpLogCtx); - return NULL; + newcontext = HeapAlloc(GetProcessHeap(), 0 , sizeof(OPENCONTEXT)); + memcpy(&(newcontext->context),lpLogCtx,sizeof(LOGCONTEXTA)); + newcontext->hwndOwner = hWnd; + newcontext->enabled = fEnable; + newcontext->ActiveCursor = -1; + newcontext->QueueSize = 10; + newcontext->PacketsQueued = 0; + newcontext->PacketQueue=HeapAlloc(GetProcessHeap(),0,sizeof(WTPACKET)*10); + newcontext->handle = gTopContext++; + newcontext->next = gOpenContexts; + + EnterCriticalSection(&csTablet); + gOpenContexts = newcontext; + LeaveCriticalSection(&csTablet); + + pAttachEventQueueToTablet(hWnd, gSysCursor, gNumCursors); + + TABLET_PostTabletMessage(newcontext, WT_CTXOPEN, (WPARAM)newcontext->handle, + newcontext->context.lcStatus, TRUE); + + newcontext->context.lcStatus = CXS_ONTOP; + + TABLET_PostTabletMessage(newcontext, WT_CTXOVERLAP, + (WPARAM)newcontext->handle, + newcontext->context.lcStatus, TRUE); + + return newcontext->handle; } /*********************************************************************** @@ -83,9 +821,32 @@ */ BOOL WINAPI WTClose(HCTX hCtx) { - FIXME("(%p): stub\n", hCtx); + LPOPENCONTEXT context,ptr; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("(%p)\n", hCtx); + + ptr = context = gOpenContexts; + + while ((context->handle != hCtx) && (context)) + { + ptr = context; + context = context->next; + } + if (!context) + return TRUE; + + EnterCriticalSection(&csTablet); + if (context == gOpenContexts) + gOpenContexts = context->next; + else + ptr->next = context->next; + LeaveCriticalSection(&csTablet); + + TABLET_PostTabletMessage(context, WT_CTXCLOSE, (WPARAM)context->handle, + context->context.lcStatus,TRUE); + + HeapFree(GetProcessHeap(),0,context->PacketQueue); + HeapFree(GetProcessHeap(),0,context); return TRUE; } @@ -95,11 +856,36 @@ */ int WINAPI WTPacketsGet(HCTX hCtx, int cMaxPkts, LPVOID lpPkts) { - FIXME("(%p, %d, %p): stub\n", hCtx, cMaxPkts, lpPkts); + int limit; + LPOPENCONTEXT context; + LPVOID ptr = lpPkts; + + TRACE("(%p, %d, %p)\n", hCtx, cMaxPkts, lpPkts); + + context = TABLET_FindOpenContext(hCtx); + TABLET_BlankPacketData(context,lpPkts,cMaxPkts); + + EnterCriticalSection(&csTablet); + if (context->PacketsQueued == 0) + { + LeaveCriticalSection(&csTablet); + return 0; + } + + for(limit = 0; limit < cMaxPkts && limit < context->PacketsQueued; limit++) + ptr=TABLET_CopyPacketData(context ,ptr, &context->PacketQueue[limit]); + + if (limit < context->PacketsQueued) + { + memcpy(context->PacketQueue, &context->PacketQueue[limit], + (context->QueueSize - (limit))*sizeof(WTPACKET)); + } + context->PacketsQueued -= limit; + LeaveCriticalSection(&csTablet); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("Copied %i packets\n",limit); - return 0; + return limit; } /*********************************************************************** @@ -107,11 +893,33 @@ */ BOOL WINAPI WTPacket(HCTX hCtx, UINT wSerial, LPVOID lpPkt) { - FIXME("(%p, %d, %p): stub\n", hCtx, wSerial, lpPkt); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + int rc = 0; + LPOPENCONTEXT context; + LPWTPACKET wtp; + + TRACE("(%p, %d, %p)\n", hCtx, wSerial, lpPkt); + + context = TABLET_FindOpenContext(hCtx); + + EnterCriticalSection(&csTablet); + rc = TABLET_FindPacket(context ,wSerial, &wtp); + + if (rc >= 0) + { + if (lpPkt) + TABLET_CopyPacketData(context ,lpPkt, wtp); + + if ((rc+1) < context->QueueSize) + { + memcpy(context->PacketQueue, &context->PacketQueue[rc+1], + (context->QueueSize - (rc+1))*sizeof(WTPACKET)); + } + context->PacketsQueued -= (rc+1); + } + LeaveCriticalSection(&csTablet); - return FALSE; + TRACE("Returning %i\n",rc+1); + return rc+1; } /*********************************************************************** @@ -119,11 +927,14 @@ */ BOOL WINAPI WTEnable(HCTX hCtx, BOOL fEnable) { - FIXME("(%p, %u): stub\n", hCtx, fEnable); + LPOPENCONTEXT context; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("(%p, %u)\n", hCtx, fEnable); - return FALSE; + context = TABLET_FindOpenContext(hCtx); + context->enabled = fEnable; + + return TRUE; } /*********************************************************************** @@ -133,9 +944,7 @@ { FIXME("(%p, %u): stub\n", hCtx, fToTop); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - - return FALSE; + return TRUE; } /*********************************************************************** @@ -155,11 +964,14 @@ */ BOOL WINAPI WTGetA(HCTX hCtx, LPLOGCONTEXTA lpLogCtx) { - FIXME("(%p, %p): stub\n", hCtx, lpLogCtx); + LPOPENCONTEXT context; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("(%p, %p)\n", hCtx, lpLogCtx); + context = TABLET_FindOpenContext(hCtx); - return FALSE; + memcpy(lpLogCtx,&context->context,sizeof(LOGCONTEXTA)); + + return TRUE; } /*********************************************************************** @@ -251,11 +1063,27 @@ */ int WINAPI WTPacketsPeek(HCTX hCtx, int cMaxPkts, LPVOID lpPkts) { - FIXME("(%p, %d, %p): stub\n", hCtx, cMaxPkts, lpPkts); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - - return 0; + int limit; + LPOPENCONTEXT context; + LPVOID ptr = lpPkts; + + TRACE("(%p, %d, %p)\n", hCtx, cMaxPkts, lpPkts); + + context = TABLET_FindOpenContext(hCtx); + + EnterCriticalSection(&csTablet); + if (context->PacketsQueued == 0) + { + LeaveCriticalSection(&csTablet); + return 0; + } + + for (limit = 0; limit < cMaxPkts && limit < context->PacketsQueued; limit++) + ptr = TABLET_CopyPacketData(context ,ptr, &context->PacketQueue[limit]); + + LeaveCriticalSection(&csTablet); + TRACE("Copied %i packets\n",limit); + return limit; } /*********************************************************************** @@ -264,12 +1092,53 @@ int WINAPI WTDataGet(HCTX hCtx, UINT wBegin, UINT wEnd, int cMaxPkts, LPVOID lpPkts, LPINT lpNPkts) { - FIXME("(%p, %u, %u, %d, %p, %p): stub\n", + LPOPENCONTEXT context; + LPVOID ptr = lpPkts; + UINT bgn = 0; + UINT end = 0; + UINT num = 0; + + TRACE("(%p, %u, %u, %d, %p, %p)\n", hCtx, wBegin, wEnd, cMaxPkts, lpPkts, lpNPkts); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + context = TABLET_FindOpenContext(hCtx); - return 0; + EnterCriticalSection(&csTablet); + if (context->PacketsQueued == 0) + { + LeaveCriticalSection(&csTablet); + return 0; + } + + while (bgn < context->PacketsQueued && + context->PacketQueue[bgn].pkSerialNumber != wBegin) + bgn++; + + end = bgn; + while (end < context->PacketsQueued && + context->PacketQueue[end].pkSerialNumber != wEnd) + end++; + + if (bgn == end == context->PacketsQueued) + { + LeaveCriticalSection(&csTablet); + return 0; + } + + for (num = bgn; num <= end; num++) + ptr = TABLET_CopyPacketData(context ,ptr, &context->PacketQueue[end]); + + /* remove read packets */ + if ((end+1) < context->PacketsQueued) + memcpy( &context->PacketQueue[bgn], &context->PacketQueue[end+1], + (context->PacketsQueued - ((end-bgn)+1)) * sizeof (WTPACKET)); + + context->PacketsQueued -= ((end-bgn)+1); + *lpNPkts = ((end-bgn)+1); + + LeaveCriticalSection(&csTablet); + TRACE("Copied %i packets\n",*lpNPkts); + return (end - bgn)+1; } /*********************************************************************** @@ -278,12 +1147,48 @@ int WINAPI WTDataPeek(HCTX hCtx, UINT wBegin, UINT wEnd, int cMaxPkts, LPVOID lpPkts, LPINT lpNPkts) { - FIXME("(%p, %u, %u, %d, %p, %p): stub\n", + LPOPENCONTEXT context; + LPVOID ptr = lpPkts; + UINT bgn = 0; + UINT end = 0; + UINT num = 0; + + TRACE("(%p, %u, %u, %d, %p, %p)\n", hCtx, wBegin, wEnd, cMaxPkts, lpPkts, lpNPkts); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + context = TABLET_FindOpenContext(hCtx); - return 0; + EnterCriticalSection(&csTablet); + if (context->PacketsQueued == 0) + { + LeaveCriticalSection(&csTablet); + return 0; + } + + while (bgn < context->PacketsQueued && + context->PacketQueue[bgn].pkSerialNumber != wBegin) + bgn++; + + end = bgn; + while (end < context->PacketsQueued && + context->PacketQueue[end].pkSerialNumber != wEnd) + end++; + + if (bgn == context->PacketsQueued || end == context->PacketsQueued) + { + TRACE("%i %i %i \n", bgn, end, context->PacketsQueued); + LeaveCriticalSection(&csTablet); + return 0; + } + + for (num = bgn; num <= end; num++) + ptr = TABLET_CopyPacketData(context ,ptr, &context->PacketQueue[end]); + + *lpNPkts = ((end-bgn)+1); + LeaveCriticalSection(&csTablet); + + TRACE("Copied %i packets\n",*lpNPkts); + return (end - bgn)+1; } /*********************************************************************** @@ -291,9 +1196,24 @@ */ BOOL WINAPI WTQueuePacketsEx(HCTX hCtx, UINT *lpOld, UINT *lpNew) { - FIXME("(%p, %p, %p): stub\n", hCtx, lpOld, lpNew); + LPOPENCONTEXT context; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("(%p, %p, %p)\n", hCtx, lpOld, lpNew); + context = TABLET_FindOpenContext(hCtx); + + EnterCriticalSection(&csTablet); + if (context->PacketsQueued) + { + *lpOld = context->PacketQueue[0].pkSerialNumber; + *lpNew = context->PacketQueue[context->PacketsQueued-1].pkSerialNumber; + } + else + { + TRACE("No packets\n"); + LeaveCriticalSection(&csTablet); + return FALSE; + } + LeaveCriticalSection(&csTablet); return TRUE; } @@ -303,11 +1223,11 @@ */ int WINAPI WTQueueSizeGet(HCTX hCtx) { - FIXME("(%p): stub\n", hCtx); + LPOPENCONTEXT context; + TRACE("(%p)\n", hCtx); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - - return 0; + context = TABLET_FindOpenContext(hCtx); + return context->QueueSize; } /*********************************************************************** @@ -315,9 +1235,18 @@ */ BOOL WINAPI WTQueueSizeSet(HCTX hCtx, int nPkts) { - FIXME("(%p, %d): stub\n", hCtx, nPkts); + LPOPENCONTEXT context; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("(%p, %d)\n", hCtx, nPkts); - return 0; + context = TABLET_FindOpenContext(hCtx); + + EnterCriticalSection(&csTablet); + context->PacketQueue = HeapReAlloc(GetProcessHeap(), 0, + context->PacketQueue, sizeof(WTPACKET)*nPkts); + + context->QueueSize = nPkts; + LeaveCriticalSection(&csTablet); + + return nPkts; } Index: dlls/x11drv/Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/x11drv/Makefile.in,v retrieving revision 1.30 diff -u -r1.30 Makefile.in --- dlls/x11drv/Makefile.in 31 Oct 2002 02:38:20 -0000 1.30 +++ dlls/x11drv/Makefile.in 23 Apr 2003 13:55:27 -0000 @@ -38,7 +38,8 @@ x11ddraw.c \ x11drv_main.c \ xrender.c \ - xvidmode.c + xvidmode.c \ + wintab.c PROGRAMS = wineclipsrv Index: dlls/x11drv/event.c =================================================================== RCS file: /home/wine/wine/dlls/x11drv/event.c,v retrieving revision 1.18 diff -u -r1.18 event.c --- dlls/x11drv/event.c 23 Jan 2003 01:29:58 -0000 1.18 +++ dlls/x11drv/event.c 23 Apr 2003 13:55:28 -0000 @@ -275,8 +275,18 @@ WARN( "Got event %s for unknown Window %08lx\n", event_names[event->type], event->xany.window ); else - TRACE("Got event %s for hwnd %p\n", - event_names[event->type], hWnd ); + if (event->type <= MappingNotify) + TRACE("Got event %s for hwnd/window %p/%lx, GetFocus()=%p\n", + event_names[event->type], hWnd, event->xany.window, GetFocus() ); + else + TRACE("Got extention event for hwnd/window %p/%lx, GetFocus()=%p\n", + hWnd, event->xany.window, GetFocus() ); + + if (X11DRV_ProcessTabletEvent(hWnd, event)) + { + TRACE("Return: filtered by tablet\n"); + return; + } switch(event->type) { Index: dlls/x11drv/x11drv.spec =================================================================== RCS file: /home/wine/wine/dlls/x11drv/x11drv.spec,v retrieving revision 1.45 diff -u -r1.45 x11drv.spec --- dlls/x11drv/x11drv.spec 22 Apr 2003 00:15:48 -0000 1.45 +++ dlls/x11drv/x11drv.spec 23 Apr 2003 13:55:28 -0000 @@ -104,3 +104,8 @@ # X11 locks @ cdecl -norelay wine_tsx11_lock() @ cdecl -norelay wine_tsx11_unlock() + +# WinTab32 +@ cdecl LoadTabletInfo(ptr ptr ptr long ptr) X11DRV_LoadTabletInfo +@ cdecl AttachEventQueueToTablet(ptr ptr long) X11DRV_AttachEventQueueToTablet +@ cdecl GetCurrentPacket(ptr) X11DRV_GetCurrentPacket Index: include/wintab.h =================================================================== RCS file: /home/wine/wine/include/wintab.h,v retrieving revision 1.1 diff -u -r1.1 wintab.h --- include/wintab.h 17 Dec 2002 01:49:16 -0000 1.1 +++ include/wintab.h 23 Apr 2003 13:55:28 -0000 @@ -328,7 +328,9 @@ #define CSR_MINPKTDATA 17 /* 1.1 */ #define CSR_MINBUTTONS 18 /* 1.1 */ #define CSR_CAPABILITIES 19 /* 1.1 */ -#define CSR_MAX 19 +/* from http://www.wacomeng.com/devsupport/ibmpc/wacomwindevfaq.html */ +#define CSR_TYPE 20 +#define CSR_MAX 20 #endif --- /dev/null Thu Aug 30 15:30:55 2001 +++ dlls/wintab32/wintab32.c Wed Apr 23 08:22:37 2003 @@ -0,0 +1,150 @@ +/* + * WinTab32 library + * + * Copyright 2003 Codeweavers, Aric Stewart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "winbase.h" +#include "windef.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" +#include "wintab.h" +#include "wintab_internal.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wintab32); + +HWND hwndDefault = (HWND)NULL; +static HANDLE hTabletInst; +static const WCHAR +WC_TABLETCLASSNAME[] = {'W','i','n','e','T','a','b','l','e','t','C','l','a','s','s',0}; +CRITICAL_SECTION csTablet; + +static LRESULT WINAPI TABLET_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, + LPARAM lParam); + +static VOID TABLET_Register() +{ + WNDCLASSW wndClass; + ZeroMemory(&wndClass, sizeof(WNDCLASSW)); + wndClass.style = CS_GLOBALCLASS; + wndClass.lpfnWndProc = (WNDPROC) TABLET_WindowProc; + wndClass.cbClsExtra = 0; + wndClass.cbWndExtra = 0; + wndClass.hCursor = (HCURSOR)NULL; + wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW +1); + wndClass.lpszClassName = WC_TABLETCLASSNAME; + RegisterClassW(&wndClass); +} + +static VOID TABLET_Unregister() +{ + UnregisterClassW(WC_TABLETCLASSNAME, (HINSTANCE)NULL); +} + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) +{ + static const WCHAR name[] = {'T','a','b','l','e','t',0}; + static HMODULE hx11drv = NULL; + + TRACE("%p, %lx, %p\n",hInstDLL,fdwReason,lpReserved); + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + TRACE("Initialization\n"); + InitializeCriticalSection(&csTablet); + hx11drv = LoadLibraryA("x11drv.dll"); + if (hx11drv) + { + pLoadTabletInfo = (X11_LoadTabletInfo*)GetProcAddress(hx11drv, + "LoadTabletInfo"); + pAttachEventQueueToTablet = (X11_AttachEventQueueToTablet*) + GetProcAddress(hx11drv, "AttachEventQueueToTablet"); + pGetCurrentPacket = (X11_GetCurrentPacket*) + GetProcAddress(hx11drv, "GetCurrentPacket"); + TABLET_Register(); + hTabletInst = hInstDLL; + hwndDefault = CreateWindowW(WC_TABLETCLASSNAME, name, + WS_POPUPWINDOW,0,0,0,0,0,0,hTabletInst,0); + } + else + return FALSE; + break; + case DLL_PROCESS_DETACH: + TRACE("Detaching\n"); + if (hx11drv) + { + FreeLibrary(hx11drv); + if (hwndDefault) + { + DestroyWindow(hwndDefault); + hwndDefault = 0; + } + TABLET_Unregister(); + } + DeleteCriticalSection(&csTablet); + break; + } + return TRUE; +} + + +/* + * The window proc for the default TABLET window + */ +static LRESULT WINAPI TABLET_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, + LPARAM lParam) +{ + TRACE("Incomming Message 0x%x (0x%08x, 0x%08x)\n", uMsg, (UINT)wParam, + (UINT)lParam); + + switch(uMsg) + { + case WM_NCCREATE: + return TRUE; + + case WT_PACKET: + { + WTPACKET packet; + LPOPENCONTEXT handler; + pGetCurrentPacket(&packet); + handler = AddPacketToContextQueue(&packet,(HWND)lParam); + if (handler) + TABLET_PostTabletMessage(handler, WT_PACKET, + (WPARAM)packet.pkSerialNumber, + (LPARAM)handler->handle, FALSE); + break; + } + case WT_PROXIMITY: + { + LPOPENCONTEXT handler; + LPARAM prox; + handler = FindOpenContext((HWND)lParam); + if (handler) + { + prox = wParam | 0x1 << 16; + TABLET_PostTabletMessage(handler, WT_PROXIMITY, + (WPARAM)handler->handle, (LPARAM)prox, + TRUE); + } + break; + } + } + return 0; +} + --- /dev/null Thu Aug 30 15:30:55 2001 +++ dlls/wintab32/wintab_internal.h Wed Apr 23 08:26:57 2003 @@ -0,0 +1,329 @@ +/* + * Tablet header + * + * Copyright 2003 Codeweavers (Aric Stewart) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +typedef struct tagWTI_INTERFACE_INFO { + CHAR WINTABID[1024]; + /* a copy of the null-terminated tablet hardware identification string + * in the user buffer. This string should include make, model, and + * revision information in user-readable format. + */ + WORD SPECVERSION; + /* the specification version number. The high-order byte contains the + * major version number; the low-order byte contains the minor version + * number. + */ + WORD IMPLVERSION; + /* the implementation version number. The high-order byte contains the + * major version number; the low-order byte contains the minor version + * number. + */ + UINT NDEVICES; + /* the number of devices supported. */ + UINT NCURSORS; + /* the total number of cursor types supported. */ + UINT NCONTEXTS; + /* the number of contexts supported. */ + UINT CTXOPTIONS; + /* flags indicating which context options are supported */ + UINT CTXSAVESIZE; + /* the size of the save information returned from WTSave.*/ + UINT NEXTENSIONS; + /* the number of extension data items supported.*/ + UINT NMANAGERS; + /* the number of manager handles supported.*/ + }WTI_INTERFACE_INFO, *LPWTI_INTERFACE_INFO; + +typedef struct tagWTI_STATUS_INFO{ + UINT CONTEXTS; + /* the number of contexts currently open.*/ + UINT SYSCTXS; + /* the number of system contexts currently open.*/ + UINT PKTRATE; + /* the maximum packet report rate currently being received by any + * context, in Hertz. + */ + WTPKT PKTDATA; + /* a mask indicating which packet data items are requested by at + * least one context. + */ + UINT MANAGERS; + /* the number of manager handles currently open.*/ + BOOL SYSTEM; + /* a non-zero value if system pointing is available to the whole + * screen; zero otherwise. + */ + DWORD BUTTONUSE; + /* a button mask indicating the logical buttons whose events are + * requested by at least one context. + */ + DWORD SYSBTNUSE; + /* a button mask indicating which logical buttons are assigned a system + * button function by the current cursor's system button map. + */ +} WTI_STATUS_INFO, *LPWTI_STATUS_INFO; + + +typedef struct tagWTI_DEVICES_INFO +{ + CHAR NAME[256]; + /* a displayable null- terminated string describing the device, + * manufacturer, and revision level. + */ + UINT HARDWARE; + /* flags indicating hardware and driver capabilities, as defined + * below: + HWC_INTEGRATED: + Indicates that the display and digitizer share the same surface. + HWC_TOUCH + Indicates that the cursor must be in physical contact with the + device to report position. + HWC_HARDPROX + Indicates that device can generate events when the cursor is + entering and leaving the physical detection range. + HWC_PHYSID_CURSORS + Indicates that device can uniquely identify the active cursor in + hardware. + */ + UINT NCSRTYPES; + /* the number of supported cursor types.*/ + UINT FIRSTCSR; + /* the first cursor type number for the device. */ + UINT PKTRATE; + /* the maximum packet report rate in Hertz. */ + WTPKT PKTDATA; + /* a bit mask indicating which packet data items are always available.*/ + WTPKT PKTMODE; + /* a bit mask indicating which packet data items are physically + * relative, i.e., items for which the hardware can only report change, + * not absolute measurement. + */ + WTPKT CSRDATA; + /* a bit mask indicating which packet data items are only available when + * certain cursors are connected. The individual cursor descriptions + * must be consulted to determine which cursors return which data. + */ + INT XMARGIN; + INT YMARGIN; + INT ZMARGIN; + /* the size of tablet context margins in tablet native coordinates, in + * the x, y, and z directions, respectively. + */ + AXIS X; + AXIS Y; + AXIS Z; + /* the tablet's range and resolution capabilities, in the x, y, and z + * axes, respectively. + */ + AXIS NPRESSURE; + AXIS TPRESSURE; + /* the tablet's range and resolution capabilities, for the normal and + * tangential pressure inputs, respectively. + */ + AXIS ORIENTATION[3]; + /* a 3-element array describing the tablet's orientation range and + * resolution capabilities. + */ + AXIS ROTATION[3]; + /* a 3-element array describing the tablet's rotation range and + * resolution capabilities. + */ + CHAR PNPID[256]; + /* a null-terminated string containing the devices Plug and Play ID.*/ +} WTI_DEVICES_INFO, *LPWTI_DEVICES_INFO; + +typedef struct tagWTI_CURSORS_INFO +{ + CHAR NAME[256]; + /* a displayable zero-terminated string containing the name of the + * cursor. + */ + BOOL ACTIVE; + /* whether the cursor is currently connected. */ + WTPKT PKTDATA; + /* a bit mask indicating the packet data items supported when this + * cursor is connected. + */ + BYTE BUTTONS; + /* the number of buttons on this cursor. */ + BYTE BUTTONBITS; + /* the number of bits of raw button data returned by the hardware.*/ + CHAR BTNNAMES[1024]; /* FIXME: make this dynamic */ + /* a list of zero-terminated strings containing the names of the + * cursor's buttons. The number of names in the list is the same as the + * number of buttons on the cursor. The names are separated by a single + * zero character; the list is terminated by two zero characters. + */ + BYTE BUTTONMAP[32]; + /* a 32 byte array of logical button numbers, one for each physical + * button. + */ + BYTE SYSBTNMAP[32]; + /* a 32 byte array of button action codes, one for each logical + * button. + */ + BYTE NPBUTTON; + /* the physical button number of the button that is controlled by normal + * pressure. + */ + UINT NPBTNMARKS[2]; + /* an array of two UINTs, specifying the button marks for the normal + * pressure button. The first UINT contains the release mark; the second + * contains the press mark. + */ + UINT *NPRESPONSE; + /* an array of UINTs describing the pressure response curve for normal + * pressure. + */ + BYTE TPBUTTON; + /* the physical button number of the button that is controlled by + * tangential pressure. + */ + UINT TPBTNMARKS[2]; + /* an array of two UINTs, specifying the button marks for the tangential + * pressure button. The first UINT contains the release mark; the second + * contains the press mark. + */ + UINT *TPRESPONSE; + /* an array of UINTs describing the pressure response curve for + * tangential pressure. + */ + DWORD PHYSID; + /* a manufacturer-specific physical identifier for the cursor. This + * value will distinguish the physical cursor from others on the same + * device. This physical identifier allows applications to bind + * functions to specific physical cursors, even if category numbers + * change and multiple, otherwise identical, physical cursors are + * present. + */ + UINT MODE; + /* the cursor mode number of this cursor type, if this cursor type has + * the CRC_MULTIMODE capability. + */ + UINT MINPKTDATA; + /* the minimum set of data available from a physical cursor in this + * cursor type, if this cursor type has the CRC_AGGREGATE capability. + */ + UINT MINBUTTONS; + /* the minimum number of buttons of physical cursors in the cursor type, + * if this cursor type has the CRC_AGGREGATE capability. + */ + UINT CAPABILITIES; + /* flags indicating cursor capabilities, as defined below: + CRC_MULTIMODE + Indicates this cursor type describes one of several modes of a + single physical cursor. Consecutive cursor type categories + describe the modes; the CSR_MODE data item gives the mode number + of each cursor type. + CRC_AGGREGATE + Indicates this cursor type describes several physical cursors + that cannot be distinguished by software. + CRC_INVERT + Indicates this cursor type describes the physical cursor in its + inverted orientation; the previous consecutive cursor type + category describes the normal orientation. + */ + UINT TYPE; + /* Manufacturer Unique id for the item type */ +} WTI_CURSORS_INFO, *LPWTI_CURSORS_INFO; + + +typedef struct tagWTI_EXTENSIONS_INFO +{ + CHAR NAME[256]; + /* a unique, null-terminated string describing the extension.*/ + UINT TAG; + /* a unique identifier for the extension. */ + WTPKT MASK; + /* a mask that can be bitwise OR'ed with WTPKT-type variables to select + * the extension. + */ + UINT SIZE[2]; + /* an array of two UINTs specifying the extension's size within a packet + * (in bytes). The first is for absolute mode; the second is for + * relative mode. + */ + AXIS *AXES; + /* an array of axis descriptions, as needed for the extension. */ + BYTE *DEFAULT; + /* the current global default data, as needed for the extension. This + * data is modified via the WTMgrExt function. + */ + BYTE *DEFCONTEXT; + BYTE *DEFSYSCTX; + /* the current default context-specific data, as needed for the + * extension. The indices identify the digitizing- and system-context + * defaults, respectively. + */ + BYTE *CURSORS; + /* Is the first of one or more consecutive indices, one per cursor type. + * Each returns the current default cursor-specific data, as need for + * the extension. This data is modified via the WTMgrCsrExt function. + */ +} WTI_EXTENSIONS_INFO, *LPWTI_EXTENSIONS_INFO; + +typedef struct tagWTPACKET { + HCTX pkContext; + UINT pkStatus; + LONG pkTime; + WTPKT pkChanged; + UINT pkSerialNumber; + UINT pkCursor; + DWORD pkButtons; + DWORD pkX; + DWORD pkY; + DWORD pkZ; + UINT pkNormalPressure; + UINT pkTangentPressure; + ORIENTATION pkOrientation; + ROTATION pkRotation; /* 1.1 */ +} WTPACKET, *LPWTPACKET; + +typedef struct tagOPENCONTEXT +{ + HCTX handle; + LOGCONTEXTA context; + HWND hwndOwner; + BOOL enabled; + INT ActiveCursor; + INT QueueSize; + INT PacketsQueued; + LPWTPACKET PacketQueue; + struct tagOPENCONTEXT *next; +} OPENCONTEXT, *LPOPENCONTEXT; + +LPOPENCONTEXT TABLET_FindOpenContext(HCTX hCtx); +int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam, + LPARAM lParam, BOOL send_always); +LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd); +LPOPENCONTEXT FindOpenContext(HWND hwnd); + +/* X11drv functions */ +typedef int X11_LoadTabletInfo(LPLOGCONTEXTA context, LPWTI_DEVICES_INFO + device, LPWTI_CURSORS_INFO cursor_list, int + num_cursors, HWND hwnddefault); + +typedef int X11_GetCurrentPacket(LPWTPACKET packet); + +typedef int X11_AttachEventQueueToTablet(HWND hOwner, LPWTI_CURSORS_INFO + cursor_list, int num_cursors); + +X11_LoadTabletInfo *pLoadTabletInfo; +X11_AttachEventQueueToTablet *pAttachEventQueueToTablet; +X11_GetCurrentPacket *pGetCurrentPacket; --- /dev/null Thu Aug 30 15:30:55 2001 +++ dlls/x11drv/wintab.c Wed Apr 23 08:27:47 2003 @@ -0,0 +1,551 @@ +/* + * X11 tablet driver + * + * Copyright 2003 Codeweavers (Aric Stewart) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" + +#include "ts_xlib.h" +#include <X11/extensions/XInput.h> +#include <X11/extensions/XI.h> + +#include "windef.h" +#include "x11drv.h" +#include "wine/debug.h" +#include "wintab.h" +#include <dlfcn.h> +#include "../wintab32/wintab_internal.h" +#include <stdlib.h> + +WINE_DEFAULT_DEBUG_CHANNEL(wintab32); +WINE_DECLARE_DEBUG_CHANNEL(event); + +static int motion_type = -1; +static int button_press_type = -1; +static int button_release_type = -1; +static int key_press_type = -1; +static int key_release_type = -1; +static int proximity_in_type = -1; +static int proximity_out_type = -1; + +HWND hwndTabletDefault = (HWND)NULL; +WTPACKET gMsgPacket; +static DWORD gSerial = 0; +static INT button_state[10] = {0,0,0,0,0,0,0,0,0,0}; + + +/* XInput stuff */ +static void *xinput_handle; + +#define MAKE_FUNCPTR(f) static typeof(f) * p##f; +MAKE_FUNCPTR(XListInputDevices) +MAKE_FUNCPTR(XOpenDevice) +MAKE_FUNCPTR(XQueryDeviceState) +MAKE_FUNCPTR(XGetDeviceButtonMapping) +MAKE_FUNCPTR(XCloseDevice) +MAKE_FUNCPTR(XSelectExtensionEvent) +MAKE_FUNCPTR(XFreeDeviceState) +#undef MAKE_FUNCPTR + +INT X11DRV_XInput_Init(void) +{ + xinput_handle = wine_dlopen("libXi.so", RTLD_NOW, NULL, 0); + if (xinput_handle) + { +#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(xinput_handle, #f, NULL, 0)) == NULL) goto sym_not_found; + LOAD_FUNCPTR(XListInputDevices) + LOAD_FUNCPTR(XOpenDevice) + LOAD_FUNCPTR(XGetDeviceButtonMapping) + LOAD_FUNCPTR(XCloseDevice) + LOAD_FUNCPTR(XSelectExtensionEvent) + LOAD_FUNCPTR(XQueryDeviceState) + LOAD_FUNCPTR(XFreeDeviceState) +#undef LOAD_FUNCPTR + return 1; + } +sym_not_found: + return 0; +} + +int X11DRV_LoadTabletInfo(LPLOGCONTEXTA context, LPWTI_DEVICES_INFO device, + LPWTI_CURSORS_INFO cursor_list, int num_cursors, HWND + hwnddefault) +{ + struct x11drv_thread_data *data = x11drv_thread_data(); + int num_devices; + int loop; + int cursor_target; + XDeviceInfo *devices; + XDeviceInfo *target = NULL; + BOOL axis_read_complete= FALSE; + + XAnyClassPtr any; + XButtonInfoPtr Button; + XValuatorInfoPtr Val; + XAxisInfoPtr Axis; + + XDevice *opendevice; + + if (!X11DRV_XInput_Init()) + { + ERR("Unable to initialized the XInput library.\n"); + return 0; + } + + hwndTabletDefault = hwnddefault; + + /* Do base initializaion */ + strcpy(context->lcName, "Wine Tablet Context"); + strcpy(device->NAME,"Wine Tablet Device"); + + context->lcOptions = CXO_SYSTEM | CXO_MESSAGES | CXO_CSRMESSAGES; + context->lcLocks = CXL_INSIZE | CXL_INASPECT | CXL_MARGIN | + CXL_SENSITIVITY | CXL_SYSOUT; + + context->lcMsgBase= WT_DEFBASE; + context->lcDevice = 0; + context->lcPktData = + PK_CONTEXT | PK_STATUS | PK_SERIAL_NUMBER| PK_TIME | PK_CURSOR | + PK_BUTTONS | PK_X | PK_Y | PK_NORMAL_PRESSURE | PK_ORIENTATION; + context->lcMoveMask= + PK_BUTTONS | PK_X | PK_Y | PK_NORMAL_PRESSURE | PK_ORIENTATION; + context->lcStatus = CXS_ONTOP; + context->lcPktRate = 100; + context->lcBtnDnMask = 0xffffffff; + context->lcBtnUpMask = 0xffffffff; + context->lcSensX = 65536; + context->lcSensY = 65536; + context->lcSensX = 65536; + context->lcSensZ = 65536; + context->lcSysSensX= 65536; + context->lcSysSensY= 65536; + + /* Device Defaults */ + device->HARDWARE = HWC_HARDPROX|HWC_PHYSID_CURSORS; + device->FIRSTCSR= 0; + device->PKTRATE = 100; + device->PKTDATA = + PK_CONTEXT | PK_STATUS | PK_SERIAL_NUMBER| PK_TIME | PK_CURSOR | + PK_BUTTONS | PK_X | PK_Y | PK_NORMAL_PRESSURE | PK_ORIENTATION; + strcpy(device->PNPID,"non-pluginplay"); + + wine_tsx11_lock(); + + cursor_target = -1; + devices = pXListInputDevices(data->display, &num_devices); + if (!devices) + { + WARN("XInput Extenstions reported as not avalable\n"); + wine_tsx11_unlock(); + return 0; + } + for (loop=0; loop < num_devices; loop++) + { + int class_loop; + + TRACE("Trying device %i(%s)\n",loop,devices[loop].name); + if (devices[loop].use == IsXExtensionDevice) + { + LPWTI_CURSORS_INFO cursor; + + TRACE("Is Extention Device\n"); + cursor_target++; + target = &devices[loop]; + cursor = &cursor_list[cursor_target]; + + opendevice = pXOpenDevice(data->display,target->id); + if (opendevice) + { + unsigned char map[32]; + int i; + int shft = 0; + + pXGetDeviceButtonMapping(data->display, opendevice, map, 32); + + for (i=0; i< cursor->BUTTONS; i++,shft++) + { + cursor->BUTTONMAP[i] = map[i]; + cursor->SYSBTNMAP[i] = (1<<shft); + } + pXCloseDevice(data->display, opendevice); + } + else + { + WARN("Unable to open device %s\n",target->name); + cursor_target --; + continue; + } + + strcpy(cursor->NAME,target->name); + + cursor->ACTIVE = 1; + cursor->PKTDATA = PK_TIME | PK_CURSOR | PK_BUTTONS | PK_X | PK_Y | + PK_NORMAL_PRESSURE | PK_TANGENT_PRESSURE | + PK_ORIENTATION; + + cursor->PHYSID = cursor_target; + cursor->NPBUTTON = 1; + cursor->NPBTNMARKS[0] = 0 ; + cursor->NPBTNMARKS[1] = 1 ; + cursor->CAPABILITIES = 1; + if (strcasecmp(cursor->NAME,"stylus")==0) + cursor->TYPE = 0x4825; + if (strcasecmp(cursor->NAME,"eraser")==0) + cursor->TYPE = 0xc85a; + + + any = (XAnyClassPtr) (target->inputclassinfo); + + for (class_loop = 0; class_loop < target->num_classes; class_loop++) + { + switch (any->class) + { + case ValuatorClass: + if (!axis_read_complete) + { + Val = (XValuatorInfoPtr) any; + Axis = (XAxisInfoPtr) ((char *) Val + sizeof + (XValuatorInfo)); + + if (Val->num_axes>=1) + { + /* Axis 1 is X */ + device->X.axMin = Axis->min_value; + device->X.axMax= Axis->max_value; + device->X.axUnits = 1; + device->X.axResolution = Axis->resolution; + context->lcInOrgX = Axis->min_value; + context->lcSysOrgX = Axis->min_value; + context->lcInExtX = Axis->max_value; + context->lcSysExtX = Axis->max_value; + Axis++; + } + if (Val->num_axes>=2) + { + /* Axis 2 is Y */ + device->Y.axMin = Axis->min_value; + device->Y.axMax= Axis->max_value; + device->Y.axUnits = 1; + device->Y.axResolution = Axis->resolution; + context->lcInOrgY = Axis->min_value; + context->lcSysOrgY = Axis->min_value; + context->lcInExtY = Axis->max_value; + context->lcSysExtY = Axis->max_value; + Axis++; + } + if (Val->num_axes>=3) + { + /* Axis 3 is Normal Pressure */ + device->NPRESSURE.axMin = Axis->min_value; + device->NPRESSURE.axMax= Axis->max_value; + device->NPRESSURE.axUnits = 1; + device->NPRESSURE.axResolution = + Axis->resolution; + Axis++; + } + if (Val->num_axes >= 5) + { + /* Axis 4 and 5 are X and Y tilt */ + XAxisInfoPtr XAxis = Axis; + Axis++; + if (max (abs(Axis->max_value), + abs(XAxis->max_value))) + { + device->ORIENTATION[0].axMin = 0; + device->ORIENTATION[0].axMax = 3600; + device->ORIENTATION[0].axUnits = 1; + device->ORIENTATION[0].axResolution = + 235929600; + device->ORIENTATION[1].axMin = -1000; + device->ORIENTATION[1].axMax = 1000; + device->ORIENTATION[1].axUnits = 1; + device->ORIENTATION[1].axResolution = + 235929600; + Axis++; + } + } + axis_read_complete = TRUE; + } + break; + case ButtonClass: + { + CHAR *ptr = cursor->BTNNAMES; + int i; + + Button = (XButtonInfoPtr) any; + cursor->BUTTONS = Button->num_buttons; + for (i = 0; i < cursor->BUTTONS; i++) + { + strcpy(ptr,cursor->NAME); + ptr+=8; + } + } + break; + } + any = (XAnyClassPtr) ((char*) any + any->length); + } + } + } + wine_tsx11_unlock(); + device->NCSRTYPES = cursor_target+1; + return cursor_target+1; +} + +static int figure_deg(int x, int y) +{ + int rc; + + if (y != 0) + { + rc = (int) 10 * (atan( (FLOAT)abs(y) / (FLOAT)abs(x)) / (3.1415 / 180)); + if (y>0) + { + if (x>0) + rc += 900; + else + rc = 2700 - rc; + } + else + { + if (x>0) + rc = 900 - rc; + else + rc += 2700; + } + } + else + { + if (x >= 0) + rc = 900; + else + rc = 2700; + } + + return rc; +} + +static int get_button_state(int deviceid) +{ + return button_state[deviceid]; +} + +static void set_button_state(XID deviceid) +{ + struct x11drv_thread_data *data = x11drv_thread_data(); + XDevice *device; + XDeviceState *state; + XInputClass *class; + int loop; + int rc = 0; + + wine_tsx11_lock(); + device = pXOpenDevice(data->display,deviceid); + state = pXQueryDeviceState(data->display,device); + + if (state) + { + class = state->data; + for (loop = 0; loop < state->num_classes; loop++) + { + if (class->class == ButtonClass) + { + int loop2; + XButtonState *button_state = (XButtonState*)class; + for (loop2 = 1; loop2 <= button_state->num_buttons; loop2++) + { + if (button_state->buttons[loop2 / 8] & (1 << (loop2 % 8))) + { + rc |= (1<<(loop2-1)); + } + } + } + class = (XInputClass *) ((char *) class + class->length); + } + } + pXFreeDeviceState(state); + wine_tsx11_unlock(); + button_state[deviceid] = rc; +} + +int X11DRV_ProcessTabletEvent(HWND hwnd, XEvent *event) +{ + memset(&gMsgPacket,0,sizeof(WTPACKET)); + + if(event->type == motion_type) + { + XDeviceMotionEvent *motion = (XDeviceMotionEvent *)event; + + TRACE_(event)("Recieved tablet motion event (%p)\n",hwnd); + TRACE("Recieved tablet motion event (%p)\n",hwnd); + gMsgPacket.pkTime = motion->time; + gMsgPacket.pkSerialNumber = gSerial++; + gMsgPacket.pkCursor = motion->deviceid; + gMsgPacket.pkX = motion->axis_data[0]; + gMsgPacket.pkY = motion->axis_data[1]; + gMsgPacket.pkOrientation.orAzimuth = + figure_deg(motion->axis_data[3],motion->axis_data[4]); + gMsgPacket.pkOrientation.orAltitude = 1000 - 15 * max + (abs(motion->axis_data[3]),abs(motion->axis_data[4])); + gMsgPacket.pkNormalPressure = motion->axis_data[2]; + + if (!gMsgPacket.pkNormalPressure) + button_state[motion->deviceid] &= ~(1); + else + button_state[motion->deviceid] |= 1; + + gMsgPacket.pkButtons = get_button_state(motion->deviceid); + SendMessageW(hwndTabletDefault,WT_PACKET,0,(LPARAM)hwnd); + } + else if ((event->type == button_press_type)||(event->type == + button_release_type)) + { + XDeviceButtonEvent *button = (XDeviceButtonEvent *) event; + + TRACE_(event)("Recieved tablet button event\n"); + TRACE("Recieved tablet button %s event\n", (event->type == + button_press_type)?"press":"release"); + + set_button_state(button->deviceid); + } + else if (event->type == key_press_type) + { + TRACE_(event)("Recieved tablet key press event\n"); + FIXME("Recieved tablet key press event\n"); + } + else if (event->type == key_release_type) + { + TRACE_(event)("Recieved tablet key release event\n"); + FIXME("Recieved tablet key release event\n"); + } + else if ((event->type == proximity_in_type) || + (event->type == proximity_out_type)) + { + TRACE_(event)("Recieved tablet proximity event\n"); + TRACE("Recieved tablet proximity event\n"); + gMsgPacket.pkStatus = (event->type==proximity_out_type)?TPS_PROXIMITY:0; + SendMessageW(hwndTabletDefault, WT_PROXIMITY, + (event->type==proximity_out_type)?0:1, (LPARAM)hwnd); + } + else + return 0; + + return 1; +} + +int X11DRV_AttachEventQueueToTablet(HWND hOwner, LPWTI_CURSORS_INFO cursor_list, + int num_cursors) +{ + struct x11drv_thread_data *data = x11drv_thread_data(); + int num_devices; + int loop; + int cur_loop; + XDeviceInfo *devices; + XDeviceInfo *target = NULL; + XDevice *the_device; + XInputClassInfo *ip; + XEventClass event_list[7]; + Window win; + WND *wndPtr; + + wine_tsx11_lock(); + + wndPtr = WIN_GetPtr(hOwner); + win = ((struct x11drv_win_data*)wndPtr->pDriverData)->whole_window; + + TRACE("Creating context for window 0x%x (%lx) %i cursors\n",(INT)hOwner, + win, num_cursors); + + devices = pXListInputDevices(data->display, &num_devices); + + for (cur_loop=0; cur_loop < num_cursors; cur_loop++) + { + int event_number=0; + + for (loop=0; loop < num_devices; loop ++) + if (strcmp(devices[loop].name,cursor_list[cur_loop].NAME)==0) + target = &devices[loop]; + + TRACE("Opening cursor %i id %i\n",cur_loop,(INT)target->id); + + the_device = pXOpenDevice(data->display, target->id); + + if (!the_device) + { + WARN("Unable to Open device\n"); + continue; + } + + if (the_device->num_classes > 0) + { + for (ip = the_device->classes, loop=0; loop < target->num_classes; + ip++, loop++) + { + switch(ip->input_class) + { + case KeyClass: + DeviceKeyPress(the_device, key_press_type, + event_list[event_number]); + event_number++; + DeviceKeyRelease(the_device, key_release_type, + event_list[event_number]); + event_number++; + break; + case ButtonClass: + DeviceButtonPress(the_device, button_press_type, + event_list[event_number]); + event_number++; + DeviceButtonRelease(the_device, button_release_type, + event_list[event_number]); + event_number++; + break; + case ValuatorClass: + DeviceMotionNotify(the_device, motion_type, + event_list[event_number]); + event_number++; + ProximityIn(the_device, proximity_in_type, + event_list[event_number]); + event_number++; + ProximityOut(the_device, proximity_out_type, + event_list[event_number]); + event_number++; + break; + default: + ERR("unknown class\n"); + break; + } + } + if (pXSelectExtensionEvent(data->display, win, event_list, + event_number)) + { + ERR( "error selecting extended events\n"); + goto end; + } + } + } + +end: + WIN_ReleasePtr(wndPtr); + wine_tsx11_unlock(); + return 0; +} + +int X11DRV_GetCurrentPacket(LPWTPACKET *packet) +{ + memcpy(packet,&gMsgPacket,sizeof(WTPACKET)); + return 1; +}

6 6

wine-dbg gone mad?
by Kye Lewis 24 Apr '03

24 Apr '03

I've just had this problem: A program had crashed and wing-dbg has been initiated, when I pressed CTRL+C it went back to the console. however then like mad "wine-dbg>" kept appearing over and over until I exited the console. Like "winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg> winedbg>" Over and over and over (and over... and over...... and over..... etc) Any ideas why this is? Oh, and on an unrelated note, I noticed that Opera 5 runs well in wine - do the newer versions run just as well?

3 2

Re: Fix comctl/trackbar creation
by BiGgUn 24 Apr '03

24 Apr '03

> If you run for example edonkey 0.26+, you can see that it crashes as > soon as you enter the preference dialog box. do u talk about edonkey or emule ? Anyway, this path fixes a crash bug in emule 0.27c :)

3 2

Re: winehq mailing list archives being harvested by spammers
by Brian Vincent (C) 24 Apr '03

24 Apr '03

> executive summary: "please obscure the email addresses in the > winehq mailing list archives, I'm drowning in spam"! FWIW, Zack Brown and I began obscuring all the email address in the Wine Traffic / Kernel Traffic newsletters a while ago. They used to be embedded in the XML, HTML and various pages referenced on the site. However, any email sent to wine-devel before mid October will show up in the mailing list stats in the XML pages on both WineHQ and Wine Traffic (Zack's site). --------------- Brian Vincent Copper Mountain Telecom vincentb(a)coppercolorado.com

3 2

winehq mailing list archives being harvested by spammers
by Dan Kegel 24 Apr '03

24 Apr '03

Hi, executive summary: "please obscure the email addresses in the winehq mailing list archives, I'm drowning in spam"! I am facing a tidal wave of spam. Recent research showed that the main way spammers get email addresses is by web crawling. Therefore, I'm doing a web search for my work email address (dank at ixiacom.com), and doing my best to erase all mention of it. I hate doing this, but the spam is getting so bad I have to do something, and spam filtering isn't quite doing the job. I expect others are now or will soon be in the same situation. Most mentions of my work address are in web archives of mailing lists. While many mailing lists have instituted some privacy controls, many others have not. Here's a couple examples of archived messages containing my work address: http://www.winehq.com/hypermail/wine-users/2001/09/0474.html http://www.winehq.com/hypermail/wine-devel/2003/02/0190.html I have no specific evidence the wine archives in particular have been harvested by spammers, but if Google can see my address there, so can they... Examples of effective privacy measures for mailing list archives include: * restricting archive access to list members * not restricting access, but using the HTTP password mechanism to discourage spiders (e.g. perforce-users mailing list) * simply obscuring all email addresses in message headers or trailers That last countermeasure is my favorite one, since it means that Google will still have full access to the info in the list archive. I would greatly appreciate it if the archive would institute one of the above spam countermeasures (preferably the last one). I understand that overly harsh spam countermeasures would be harmful to normal discourse, but I trust some useful middle ground can be found. Thanks, Dan Kegel -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045

6 6

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