wine-devel

wine-devel@winehq.org

10 participants
84459 discussions

Re: File media type
by Alexandre Julliard 19 Oct '01

19 Oct '01

Ove Kaaven <ovehk(a)ping.uio.no> writes: > But since to do this, MapViewOfFile needs to know the media type, and the > file name is only known in CreateFile, I apparently need to store the > media type in the wineserver object to accomplish this. > > Would changing the wineserver protocol in this way be a good idea? It's certainly a possibility. It would be nice to be able to tell directly from the file descriptor, so that we wouldn't depend on the user getting the drive specifications right. But I can't think of a Unix function that would allow doing this cleanly. -- Alexandre Julliard julliard(a)winehq.com

3 2

Re: wine/port.h #include fixes
by Roger Fujii 19 Oct '01

19 Oct '01

> It's slowly coming around (Francois recent patches are key), > but we still have some fairly serious issues. Is this in? As of 10/17, it still blows up in NtCurrentTeb(). What does this function do? - is it trying to use a protected instruction? (in x86 instruction knowledge is pretty dated). > You've hit the first issue - being sure to use the > GNU tool chain. yup... want to try tackling that once I get the program to at least come up... > Doing a cvs update and trying again (after, of course, > Alexandre commits Francois' recent patches) may > bring you more joy. a bold statement.. :) I presume that you don't have to install it to test it out, right? (so long as I have LD_LIBRARY_PATH set to dlls:.). I take it that someone does have something that works on solx86? -r

3 6

Re: wine/port.h #include fixes
by Alexandre Julliard 19 Oct '01

19 Oct '01

Roger Fujii <rmf(a)lookhere.com> writes: > well, I think more to the point is that something says what > steps need to be done to run a specific version. The current > instructions just say to set LD_LIBRARY_PATH, which isn't > really correct. So, just for the record, all you have to do > is set LD_LIBRARY_PATH to srcdir:srcdir/dlls and WINESERVER > to srcdir/server/wineserver? Or do you need access to things > like winebuild? To make absolutely sure you don't pick anything from the configured prefix directory, you have to set WINESERVER, WINELOADER, WINEDLLPATH and LD_LIBRARY_PATH. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: Page faults and instruction emulation
by Alexandre Julliard 19 Oct '01

19 Oct '01

Ove Kaaven <ovehk(a)ping.uio.no> writes: > I know of two Wine architecture issues that must be resolved before the > anti-debugger check can succeed in win95 mode. > > 1. it checks that teb->debug_context (TEB offset 0x20) is zero. In Wine, > it isn't (the NT pid is stored there), so this check fails. > > Is it possible to change Wine's TEB structure to fix this? It would probably break some of the NT native dlls. > 2. it messes with the IDT. It uses the sidt instruction and tries to > change the INT5 vector (BOUND exception vector), later to try to execute a > BOUND and expect this vector to be branched to, all protected with > exception handlers. Now, this would actually be possible for Wine to > emulate, even though sidt is not a privileged instruction. The idea is > that sidt returns an address to kernel space, where all access is > prohibited, hence causing page faults. Wine could trap these, and then > emulate the faulting instruction by operating on a fake IDT instead. And > then the segfault caused by BOUND could then look up the fake IDT entry, > and call the vector therein. > > But to emulate an instruction from Wine's pre-exception page fault handler > (VIRTUAL_HandleFault()), the current context must be passed along to it, > so VIRTUAL_HandleFault and all Wine handlers that can be registered with > VIRTUAL_SetFaultHandler must get an extra parameter. Is this too > objectionable to do? The extra parameter is not that bad, but having to do full emulation of all instructions accessing memory, plus the complete IDT handling, is going to lead to major ugliness. Wouldn't it be possible to somehow emulate the kernel driver to make the NT version work? That would be much cleaner. -- Alexandre Julliard julliard(a)winehq.com

2 1

Re: wine/port.h #include fixes
by Alexandre Julliard 19 Oct '01

19 Oct '01

Fran�ois Gouget <fgouget(a)codeweavers.com> writes: > Should Wine really try the installed prefix first? It seems to me > that it should try it last instead. After all, if you change the path > you would expect your change to have an effect, no? No, you don't want changing the PATH suddenly to start breaking your applications. > Plus checking the > installed prefix first assumes that whichever version of wine is started > (e.g. /home/fgouget/bin/wine) is the same as that of > /usr/bin/wineserver! Yes of course, if you compiled it with /usr/bin as prefix it assumes that /usr/bin is where its wineserver is. If you don't want that you have to change the prefix, or set WINESERVER explicitly. -- Alexandre Julliard julliard(a)winehq.com

2 1

Page faults and instruction emulation
by Ove Kaaven 19 Oct '01

19 Oct '01

As we all know, some (kinda worthless) "copy protection" software exist out there that doesn't work under Wine. Some of these work under win9x and winNT by using a different set of techniques for each OS. The winNT code installs a kernel driver, so I'm mainly interested in the win95 code, which only messes with Win95 internals to check that no debugger is snooping, before proceeding. I know of two Wine architecture issues that must be resolved before the anti-debugger check can succeed in win95 mode. 1. it checks that teb->debug_context (TEB offset 0x20) is zero. In Wine, it isn't (the NT pid is stored there), so this check fails. Is it possible to change Wine's TEB structure to fix this? 2. it messes with the IDT. It uses the sidt instruction and tries to change the INT5 vector (BOUND exception vector), later to try to execute a BOUND and expect this vector to be branched to, all protected with exception handlers. Now, this would actually be possible for Wine to emulate, even though sidt is not a privileged instruction. The idea is that sidt returns an address to kernel space, where all access is prohibited, hence causing page faults. Wine could trap these, and then emulate the faulting instruction by operating on a fake IDT instead. And then the segfault caused by BOUND could then look up the fake IDT entry, and call the vector therein. But to emulate an instruction from Wine's pre-exception page fault handler (VIRTUAL_HandleFault()), the current context must be passed along to it, so VIRTUAL_HandleFault and all Wine handlers that can be registered with VIRTUAL_SetFaultHandler must get an extra parameter. Is this too objectionable to do? Alexandre?

1 0

File media type
by Ove Kaaven 18 Oct '01

18 Oct '01

I'm trying to think of a way to make multi-CD installers work under Wine. Right now, the hardest part is that when the installers tell you to change discs, the Setup.exe file mappings are still open. I'm thinking of making Wine not map the file, but read it straight into RAM, if the executable to be mapped is on removable media. But since to do this, MapViewOfFile needs to know the media type, and the file name is only known in CreateFile, I apparently need to store the media type in the wineserver object to accomplish this. Would changing the wineserver protocol in this way be a good idea? Index: server/protocol.def =================================================================== RCS file: /cvsroot/winex/wine/server/protocol.def,v retrieving revision 1.5 diff -u -r1.5 protocol.def --- server/protocol.def 2001/10/13 20:20:06 1.5 +++ server/protocol.def 2001/10/18 22:50:29 @@ -505,6 +505,7 @@ unsigned int sharing; /* sharing flags */ int create; /* file create action */ unsigned int attrs; /* file attributes for creation */ + int mediatype; /* media type file is on */ VARARG(filename,string); /* file name */ @REPLY handle_t handle; /* handle to the file */ @@ -527,6 +528,7 @@ @REPLY int fd; /* file descriptor */ int type; /* the type of file */ + int mediatype; /* media type file is on */ @END #define FD_TYPE_INVALID 0 #define FD_TYPE_DEFAULT 1

2 1

Re: Use the debugmsg for the pthread FIXME messages.
by Alexandre Julliard 18 Oct '01

18 Oct '01

"Medland, Bill" <Bill.Medland(a)accpac.com> writes: > I am fed up with the pthread fixmes; we ought at least to be able to turn > them off with debugmsg. This will crash and burn if glibc calls a pthread function before ntdll has been properly initialized. Besides, the messages are annoying on purpose: to motivate someone to implement the missing functions... -- Alexandre Julliard julliard(a)winehq.com

1 0

lsarpc.idl API
by Luke Kenneth Casson Leighton 18 Oct '01

18 Oct '01

Mail-Followup-To: tng-technical(a)samba-tng.org, lsa-dev(a)lists.dcerpc.net, freedce-dev(a)lists.dcerpc.net, samba-ntdom(a)samba.org, samba-technical(a)samba.org, wine-dev(a)winehq.com User-Agent: Mutt/1.2.4i X-original-sender: lkcl(a)samba-tng.org Precedence: bulk Reply-To: tng-technical(a)lists.dcerpc.org X-list: tng-technical thanks to matty for the lsarpc.idl file: it compiles in dceidl (slightly modified) and we're away! client-side header file and API is generated _automatically_ by dceidl, for immediate use with freedce libraries. porting of TNG's srv_lsa_nt.c can now take place if anyone's interested. volunteers, anyone? luke p.s. we also have winreg.idl so that means that the Reg* API is also automatically available for immediate use. if anyone's interested.

1 0

Wine press : Safedisc by Transgaming
by Gerard Patel 18 Oct '01

18 Oct '01

http://www.businesswire.com/cgi-bin/f_headline.cgi?bw.101701/212902145&ticke r=MVSN Gerard

1 0

Re: RtlEnterCriticalSection
by Marcus Meissner 18 Oct '01

18 Oct '01

On Thu, Oct 18, 2001 at 12:22:10AM +0200, Michael Marxmeier wrote: > After encountering timeout messages from > RtlEnterCriticalSection i had a look at it. > > Since interlocked_inc() should never return zero > the following patch is likely necessary. > I was unable to test this as now wine crashes with > a segmentation fault (which also terminates gdb). That is a sign that your patch is faulty. Any number of threads can increase this counter, it only succeeds if the count is really 0 before the call. (0 meaning the critical section is completely unlocked). If it is any other number, it is either a recursive enter or a different thread. Ciao, Marcus > Michael > > --- critsection.c.orig Wed Oct 17 23:24:13 2001 > +++ critsection.c Thu Oct 18 00:04:32 2001 > @@ -233,7 +233,7 @@ > */ > NTSTATUS WINAPI RtlEnterCriticalSection( RTL_CRITICAL_SECTION *crit ) > { > - if (interlocked_inc( &crit->LockCount )) > + if (interlocked_inc( &crit->LockCount ) != 1) > { > if (crit->OwningThread == GetCurrentThreadId()) > { > >

2 2

Re: SystemParametersInfo / GetSystemMetrics
by Alexandre Julliard 18 Oct '01

18 Oct '01

Andriy Palamarchuk <apa3a(a)yahoo.com> writes: > One more question while we are on it. > We are going to check whether X settings correspond to > our settings only on initialization and reload > requests and are not going to do the check in "Get" > logic, right? Yes; in fact I'd argue that we shouldn't care at all about X settings in most cases, except maybe to get initial values. For instance if the app remaps mouse buttons, or changes mouse threshold or whatever, you don't want to apply this to the whole X session IMO. If users want to reconfigure X behavior, they have to use the X configuration programs. -- Alexandre Julliard julliard(a)winehq.com

2 2

Re: MDI FindWndPtr fix
by Alexandre Julliard 18 Oct '01

18 Oct '01

Mike McCormack <mike_mccormack(a)start.com.au> writes: > i think i fixed that one too in the patch... there's probably similar > problems in other files, since WIN_GetPtr and WIN_FindWndPtr seem do > basically the same thing, but one reference counts and one doesn't. i > think we're going to see WIN_GetPtr disappear eventually... maybe. No, it is WIN_FindWndPtr and the whole reference counting that is going to disappear. The reference counting is needed only when we give control to the application while holding the window lock, and this is something we should never do. Another difference is that WIN_GetPtr returns a special value for windows belonging to another process, to force us to think about this case and handle it properly. -- Alexandre Julliard julliard(a)winehq.com

1 0

Problem with kernel32 on SPARC solaris 8.0
by Mrugan 18 Oct '01

18 Oct '01

I am trying to link kernel32 and ntdll libraries to my source code on SPARC Solaris 8.0. My executable does not exit. It gets stuck after spawning 4 threads. The gdb trace is as below: Starting program: /export/home/mrugan/src/HACore/HaNuanceChannelComRCE/nuancetest.exe warning: Lowest section in /usr/lib/libintl.so.1 is .hash at 00000074 warning: Lowest section in /usr/lib/libw.so.1 is .hash at 00000074 [New LWP 1] [New LWP 2] [New LWP 3] [New LWP 4] ^C Program received signal SIGINT, Interrupt. 0xff19b390 in ___lwp_cond_wait () from /usr/lib/libc.so.1 (gdb) where #0 0xff19b390 in ___lwp_cond_wait () from /usr/lib/libc.so.1 #1 0xff192c08 in _lwp_cond_wait () from /usr/lib/libc.so.1 #2 0xfef8c2f0 in _lrw_wrlock () from /usr/lib/libthread.so.1 #3 0xff3bdacc in ?? () #4 0xff3c34f0 in ?? () #5 0xff3b29a0 in ?? () #6 0xff0863c8 in __DTOR_END__ () from /opt/wine/dlls/libkernel32.so #7 0xff02e140 in frame_dummy () from /opt/wine/dlls/libkernel32.so #8 0xff02cf80 in _init () from /opt/wine/dlls/libkernel32.so #9 0xff3bada0 in ?? () #10 0xff3baa18 in ?? () #11 0xff3c4da0 in ?? () #12 0xff3b2958 in ?? () (gdb) inf thr 8 Thread 3 0xfef8d948 in _reap_wait () from /usr/lib/libthread.so.1 7 Thread 2 (LWP 2) 0xff19ad50 in _signotifywait () from /usr/lib/libc.so.1 6 Thread 1 (LWP 1) 0xff19b390 in ___lwp_cond_wait () from /usr/lib/libc.so.1 * 5 LWP 1 0xff19b390 in ___lwp_cond_wait () from /usr/lib/libc.so.1 4 LWP 4 0xff19b390 in ___lwp_cond_wait () from /usr/lib/libc.so.1 3 LWP 3 0xff1988f4 in door_restart () from /usr/lib/libc.so.1 2 LWP 2 0xff19ad50 in _signotifywait () from /usr/lib/libc.so.1 * 1 LWP 1 0xff19b390 in ___lwp_cond_wait () from /usr/lib/libc.so.1 Note that I had to hit cntl-C to come out of thread message. I guess this is happening because kernel32 tries to use thread library. Is there any way I can make it use pthread or is there any other solution to this? Any help will be greatly appreciated Thanks Mrugan

1 1

RE: Q: Unimplemented control 256 for VxD device VNETBIOS
by Patrik Stridvall 18 Oct '01

18 Oct '01

> > NETBIOS.VXD. I propose you run with --debugmsg > +relay,+snoop,+vxd and try > > to decipher what is going on before that failing VXD call. > In the easiest > > Done. Please find the messages in the attachement. I shrinked > the 7 MB > file to those lines around the error message. But because I'm a > Windows's internal newbie it'll take me some hours to understand the > messages. But anyhow I'll investigate the messages later but also any > help is very welcome. >From the attachment: < 0806a488:CALL netapi32.1: Netbios(<unknown, check return>) ret=1001de6e < 0806a488:CALL netbios.6: _Netbios(<unknown, check return>) ret=7f9c1026 [snip] < 0806a488:Call kernel32.CreateFileA(7f875000 "\\\\.\\VNETBIOS",c0000000,00000003,00000000,00000003,00000080,00000000) ret=7f8710a6 [snip] < 0806a488:Call kernel32.DeviceIoControl(00000070,00000100,405f193c,00000040,00000000,000000 00,00000000,00000000) ret=7f871b0d < fixme:win32:DeviceIoControl Unimplemented control 256 for VxD device VNETBIOS < 0806a488:Ret kernel32.DeviceIoControl() retval=00000000 ret=7f871b0d [snip] < 0806a488:RET netbios.6: _Netbios(405f193c) retval = 00000000 ret=7f9c1026 < 0806a488:RET netapi32.1: Netbios(405f193c) retval = 00000000 ret=1001de6e Good. It seems to work exactly the way I thought (or rather hoped) it would. Now we can presumably forget about the VxD and the undocumented NETBIOS DLL and concentrate on implementing the documented NETAPI32 DLL. It would be intresting to know what the content of NCB structure that Netbios takes as pointer to as argument. So the next step would be to make a Wine implementation of the NETAPI32.DLL with a stub with an appropriate TRACE to display to NCB structure. I don't think I have time do it is the next few days though. Can somebody else please do it? PS. On second thought perhaps we should make the NETAPI32.DLL just a forward to the NETBIOS.DLL. It seems from the trace above that the Netbios function in NETAPI32.DLL is the same function as _Netbios in NETAPI32.DLL and Netbios is the only function in NETAPI32 while NETBIOS have more functions eventhough they are AFAIK undocumented.

2 3

Q: Unimplemented control 256 for VxD device VNETBIOS
by Michael Riedel 18 Oct '01

18 Oct '01

I am going to migrate the EDA software environment from Windows NT to Linux but I have still some software components requireing Windows. That's why I use Wine. I own and use some software packages licensed to a valid MAC address (flexlm MAC based license) and the corresponding NIC is present in the Linux system. Using wine-20010824 I get the following message: fixme:win32:DeviceIoControl Unimplemented control 256 for VxD device VNETBIOS I scanned the Web resources and studied the file 'win32/device.c' a little bit but I got no answers to my questions. Is there already a solution/implementation for this service? I am also ready to contribute (at least I hope I'm able to do so and it would be fun ;-) but I need some advice (docus, especially related to the VNETBIOS VxD and some general hints). I'm looking forward for any hints. Michael -- ---------------------------------------- mriedel(a)inova-semiconductors.de ----------------------------------------

3 3

Re: MDI FindWndPtr fix
by Mike McCormack 18 Oct '01

18 Oct '01

Hey Uwe, i think i fixed that one too in the patch... there's probably similar problems in other files, since WIN_GetPtr and WIN_FindWndPtr seem do basically the same thing, but one reference counts and one doesn't. i think we're going to see WIN_GetPtr disappear eventually... maybe. Mike > Mike> This fixes a reference counting problem with MDI. (tested with > Mike> Koala term) > > Hallo, > > aren't there more problems of that kind, e.g. in windows/mdi.c > MDIClientWndProc_common in the WM_CREATE path? > > Bye ------------------------------------------ mailto:Mike_McCormack@start.com.au ph +82 16 430 0425 __________________________________________________________________ Get your free Australian email account at http://www.Looksmart.com.au

1 0

Re: SystemParametersInfo / GetSystemMetrics
by Andriy Palamarchuk 18 Oct '01

18 Oct '01

By mistake I sent the response to you directly, instead of the newsgroup. --- Alexandre Julliard <julliard(a)winehq.com> wrote: > Andriy Palamarchuk <apa3a(a)yahoo.com> writes: > > > Do you mean we can keep GetSystemMetrics simple if > we don't use all > > these synchronizations? Use some hardcoded values, > maybe load from > > registry and that's it? > > You need the synchronizations, but this doesn't mean > sysmetrics have > to be more complex. All it means is that when > something changes in > registry or x11, the code that does the change has > to do a > SYSMETRICS_Set to update the sysmetrics. But the > sysmetrics themselves > don't need to know anything except how to get the > initial value. > > > I don't see big difference between > SystemParametersInfo and > > GetSystemMetrics data. Sometimes these are even > the same! Example - flag > > SHOWSOUNDS. It can be read by GetSystemMetrics and > read and set by > > SystemParametersInfo. > > Yes they are the same, that's why you can have the > registry update > code either in sysparams.c or in sysmetrics.c; and > since we want to > keep sysmetrics simple it has to be in sysparams.c. > > > The infrastructure I created is used to access and > update SHOWSOUNDS > > flag. Can you suggest how to implement it in other > way? > > The existing implementation is OK, what you need is > to add registry > update in sysparams.c upon SPI_SETSHOWSOUNDS, and > add a call to > SystemParametersInfo(SPI_GETSHOWSOUNDS) in > SYSMETRICS_Init. You do not > need to add any registry access in sysmetrics.c, > everything will be > done by SystemParametersInfo. Ok, I see. I'll change the code and resend the patch. One more question while we are on it. We are going to check whether X settings correspond to our settings only on initialization and reload requests and are not going to do the check in "Get" logic, right? Andriy Palamarchuk __________________________________________________ Do You Yahoo!? Make a great connection at Yahoo! Personals. http://personals.yahoo.com

1 0

RE: Q: Unimplemented control 256 for VxD device VNETBIOS
by Patrik Stridvall 18 Oct '01

18 Oct '01

> Michael> I'm looking forward for any hints. > > These FLEX LMs are always a problem. > > I guess, the license isn't bind to a physical dongle on the parallel > port. So one can conclude that the software tries to read the > MAC. This > probably happens in a NETBIOS.DLL call which then probably calls the > NETBIOS.VXD. I propose you run with --debugmsg > +relay,+snoop,+vxd and try > to decipher what is going on before that failing VXD call. In > the easiest > approach, you can build a fake builtin NETBIOS DLL, with the > appropriate > function returning the MAC in the first approach hardcoded or > really reading > it with OS calls. > > If running with --debugmsg +snoop crashes, I have a hack that may help > there. I have also patches for an empty NETBIOS dll. Why haven't you submitted it? Did Alexandre reject it? Having empty version of a standard DLL is almost always useful. Of course Wine should be configured to use the native DLL in the first place but still. > However I guess that this probably isn't enough to make FLEX LM happy. It is worth trying as well. However NETBIOS.DLL is not documented like NETAPI32 AFAIK is so it is more likely that it calls NETAPI32. Also note the NETAPI32 imports the NETBIOS.DLL function _Netbios so it would be a little strange if the application called NETBIOS directly but you never know. :-) Oh, well. Only one way to find out. Please do as Uwe suggest and run wine with --debugmsg +relay,+snoop,+vxd and post the result.

2 1

RE: Unimplemented control 256 for VxD device VNETBIOS
by Patrik Stridvall 18 Oct '01

18 Oct '01

> I am going to migrate the EDA software environment from Windows NT to > Linux but I have still some software components requireing Windows. > That's why I use Wine. I own and use some software packages > licensed to > a valid MAC address (flexlm MAC based license) and the > corresponding NIC > is present in the Linux system. > > Using wine-20010824 I get the following message: > > fixme:win32:DeviceIoControl Unimplemented control 256 for VxD device > VNETBIOS Given what you said above I wouldn't be entirely suprised if control 256 of VNETBIOS return the MAC address. However... > I scanned the Web resources and studied the file 'win32/device.c' a > little bit but I got no answers to my questions. Is there already a > solution/implementation for this service? I am also ready to > contribute > (at least I hope I'm able to do so and it would be fun ;-) but I need > some advice (docus, especially related to the VNETBIOS VxD and some > general hints). ... documentation for VxD:s is virtually non existant. Find out how VxD:s work generally involves low level reverse engineering. > I'm looking forward for any hints. Hmm. Reading MSDN... There is a DLL called NETAPI32.DLL that is not currentlu implemented in Wine that has a function Netbios that possible calls the VNETBIOS VxD. Perhaps implementing this DLL in Wine would help at least it would be better than trying the figure out what the VNETBIOS VxD does. The function Netbios in NETAPI32.DLL is at least documented. Hmm. Reading some more... Netbios has a command NCBASTAT that retreives the adapter status in a structure called ADAPTER_STATUS that has a field: UCHAR adapter_address[6]; // Specifies encoded address of the adapter. This might be the MAC address. Implementing this in Wine wouldn't be that hard. If Linux provides a way to get the MAC that is. I assume Linux does but I don't know how. Does anybody else know?

5 4

Re: MDI FindWndPtr fix
by Uwe Bonnes 18 Oct '01

18 Oct '01

>>>>> "Mike" == Mike McCormack <mike_mccormack(a)start.com.au> writes: Mike> This fixes a reference counting problem with MDI. (tested with Mike> Koala term) Hallo, aren't there more problems of that kind, e.g. in windows/mdi.c MDIClientWndProc_common in the WM_CREATE path? 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

Dinput mouse handling
by Alexandre Julliard 17 Oct '01

17 Oct '01

This patch changes the dinput mouse handling to use the WH_MOUSE_LL hook instead of referencing mouse driver internals. Since I'm not using dinput, could someone please give this a try? Index: dlls/dinput/mouse/main.c =================================================================== RCS file: /opt/cvs-commit/wine/dlls/dinput/mouse/main.c,v retrieving revision 1.9 diff -u -r1.9 main.c --- dlls/dinput/mouse/main.c 2001/10/02 18:45:46 1.9 +++ dlls/dinput/mouse/main.c 2001/10/17 19:49:59 @@ -17,7 +17,6 @@ #include "wingdi.h" #include "winerror.h" #include "windef.h" -#include "mouse.h" #include "winuser.h" #include "dinput.h" @@ -105,7 +104,7 @@ BYTE absolute; /* Previous position for relative moves */ LONG prevX, prevY; - LPMOUSE_EVENT_PROC prev_handler; + HHOOK hook; HWND win; DWORD dwCoopLevel; POINT mapped_center; @@ -226,10 +225,7 @@ if (This->data_queue != NULL) HeapFree(GetProcessHeap(),0,This->data_queue); - /* Install the previous event handler (in case of releasing an acquired - mouse device) */ - if (This->prev_handler != NULL) - MOUSE_Enable(This->prev_handler); + if (This->hook) UnhookWindowsHookEx( This->hook ); DeleteCriticalSection(&(This->crit)); /* Free the DataFormat */ @@ -318,40 +314,30 @@ return 0; } -/* Our private mouse event handler */ -static void WINAPI dinput_mouse_event( DWORD dwFlags, DWORD dx, DWORD dy, - DWORD cButtons, DWORD dwExtraInfo ) +/* low-level mouse hook */ +static LRESULT CALLBACK dinput_mouse_hook( int code, WPARAM wparam, LPARAM lparam ) { - long posX = -1, posY = -1; - DWORD keyState, xtime, extra; - SysMouseAImpl* This = (SysMouseAImpl*) current_lock; - - EnterCriticalSection(&(This->crit)); - /* Mouse moved -> send event if asked */ - if (This->hEvent) - SetEvent(This->hEvent); - - if ( !IsBadReadPtr( (LPVOID)dwExtraInfo, sizeof(WINE_MOUSEEVENT) ) - && ((WINE_MOUSEEVENT *)dwExtraInfo)->magic == WINE_MOUSEEVENT_MAGIC ) { - WINE_MOUSEEVENT *wme = (WINE_MOUSEEVENT *)dwExtraInfo; - keyState = wme->keyState; - xtime = wme->time; - extra = (DWORD)wme->hWnd; - - if (dwFlags & MOUSEEVENTF_MOVE) { - if (dwFlags & MOUSEEVENTF_ABSOLUTE) { - posX = (dx * GetSystemMetrics(SM_CXSCREEN)) >> 16; - posY = (dy * GetSystemMetrics(SM_CYSCREEN)) >> 16; + LRESULT ret; + MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; + SysMouseAImpl* This = (SysMouseAImpl*) current_lock; + + if (code != HC_ACTION) return CallNextHookEx( This->hook, code, wparam, lparam ); + + EnterCriticalSection(&(This->crit)); + /* Mouse moved -> send event if asked */ + if (This->hEvent) + SetEvent(This->hEvent); + if (wparam == WM_MOUSEMOVE) { if (This->absolute) { - if (posX != This->prevX) - GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], posX, xtime, 0); - if (posY != This->prevY) - GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], posY, xtime, 0); + if (hook->pt.x != This->prevX) + GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], hook->pt.x, hook->time, 0); + if (hook->pt.y != This->prevY) + GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], hook->pt.y, hook->time, 0); } else { /* Now, warp handling */ if ((This->need_warp == WARP_STARTED) && - (posX == This->mapped_center.x) && (posY == This->mapped_center.y)) { + (hook->pt.x == This->mapped_center.x) && (hook->pt.y == This->mapped_center.y)) { /* Warp has been done... */ This->need_warp = WARP_DONE; goto end; @@ -360,122 +346,73 @@ /* Relative mouse input with absolute mouse event : the real fun starts here... */ if ((This->need_warp == WARP_NEEDED) || (This->need_warp == WARP_STARTED)) { - if (posX != This->prevX) - GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], posX - This->prevX, xtime, (This->dinput->evsequence)++); - if (posY != This->prevY) - GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], posY - This->prevY, xtime, (This->dinput->evsequence)++); + if (hook->pt.x != This->prevX) + GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], hook->pt.x - This->prevX, hook->time, (This->dinput->evsequence)++); + if (hook->pt.y != This->prevY) + GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], hook->pt.y - This->prevY, hook->time, (This->dinput->evsequence)++); } else { /* This is the first time the event handler has been called after a GetData of GetState. */ - if (posX != This->mapped_center.x) { - GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], posX - This->mapped_center.x, xtime, (This->dinput->evsequence)++); + if (hook->pt.x != This->mapped_center.x) { + GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], hook->pt.x - This->mapped_center.x, hook->time, (This->dinput->evsequence)++); This->need_warp = WARP_NEEDED; } - if (posY != This->mapped_center.y) { - GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], posY - This->mapped_center.y, xtime, (This->dinput->evsequence)++); + if (hook->pt.y != This->mapped_center.y) { + GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], hook->pt.y - This->mapped_center.y, hook->time, (This->dinput->evsequence)++); This->need_warp = WARP_NEEDED; } } } - This->prevX = posX; - This->prevY = posY; + This->prevX = hook->pt.x; + This->prevY = hook->pt.y; - if (This->absolute) { - This->m_state.lX = posX; - This->m_state.lY = posY; - } else { - This->m_state.lX = posX - This->mapped_center.x; - This->m_state.lY = posY - This->mapped_center.y; - } - } else { - /* Mouse reporting is in relative mode */ - posX = (long) dx; - posY = (long) dy; - if (This->absolute) { - long aposX, aposY; - - aposX = This->m_state.lX + posX; - if (aposX < 0) - aposX = 0; - if (aposX >= GetSystemMetrics(SM_CXSCREEN)) - aposX = GetSystemMetrics(SM_CXSCREEN); - - aposY = This->m_state.lY + posY; - if (aposY < 0) - aposY = 0; - if (aposY >= GetSystemMetrics(SM_CYSCREEN)) - aposY = GetSystemMetrics(SM_CYSCREEN); - - if (posX != 0) - GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], aposX, xtime, (This->dinput->evsequence)++); - if (posY != 0) - GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], aposY, xtime, (This->dinput->evsequence)++); - - This->m_state.lX = aposX; - This->m_state.lY = aposY; + This->m_state.lX = hook->pt.x; + This->m_state.lY = hook->pt.y; } else { - if (posX != 0) - GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], posX, xtime, (This->dinput->evsequence)++); - if (posY != 0) - GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], posY, xtime, (This->dinput->evsequence)++); - - This->m_state.lX = posX; - This->m_state.lY = posY; + This->m_state.lX = hook->pt.x - This->mapped_center.x; + This->m_state.lY = hook->pt.y - This->mapped_center.y; } - } } - } else { - ERR("Mouse event not supported...\n"); - goto end; - } - - if (TRACE_ON(dinput)) { - if (dwFlags & MOUSEEVENTF_MOVE) - TRACE(" %ld %ld (%s)", posX, posY, - (dwFlags & MOUSEEVENTF_ABSOLUTE ? "abs" : "rel")); - - if ( dwFlags & MOUSEEVENTF_LEFTDOWN ) DPRINTF(" LD "); - if ( dwFlags & MOUSEEVENTF_LEFTUP ) DPRINTF(" LU "); - if ( dwFlags & MOUSEEVENTF_RIGHTDOWN ) DPRINTF(" RD "); - if ( dwFlags & MOUSEEVENTF_RIGHTUP ) DPRINTF(" RU "); - - if ( dwFlags & MOUSEEVENTF_MIDDLEDOWN ) DPRINTF(" MD "); - if ( dwFlags & MOUSEEVENTF_MIDDLEUP ) DPRINTF(" MU "); - - if (!(This->absolute)) DPRINTF(" W=%d ", This->need_warp); - - DPRINTF("\n"); - } + TRACE(" msg %x pt %ld %ld (W=%d)", + wparam, hook->pt.x, hook->pt.y, This->absolute && This->need_warp ); - - if ( dwFlags & MOUSEEVENTF_LEFTDOWN ) { - GEN_EVENT(This->offset_array[WINE_MOUSE_L_POSITION], 0xFF, xtime, (This->dinput->evsequence)++); - This->m_state.rgbButtons[0] = 0xFF; - } - if ( dwFlags & MOUSEEVENTF_LEFTUP ) { - GEN_EVENT(This->offset_array[WINE_MOUSE_L_POSITION], 0x00, xtime, (This->dinput->evsequence)++); - This->m_state.rgbButtons[0] = 0x00; - } - if ( dwFlags & MOUSEEVENTF_RIGHTDOWN ) { - GEN_EVENT(This->offset_array[WINE_MOUSE_R_POSITION], 0xFF, xtime, (This->dinput->evsequence)++); - This->m_state.rgbButtons[1] = 0xFF; - } - if ( dwFlags & MOUSEEVENTF_RIGHTUP ) { - GEN_EVENT(This->offset_array[WINE_MOUSE_R_POSITION], 0x00, xtime, (This->dinput->evsequence)++); - This->m_state.rgbButtons[1] = 0x00; - } - if ( dwFlags & MOUSEEVENTF_MIDDLEDOWN ) { - GEN_EVENT(This->offset_array[WINE_MOUSE_M_POSITION], 0xFF, xtime, (This->dinput->evsequence)++); - This->m_state.rgbButtons[2] = 0xFF; - } - if ( dwFlags & MOUSEEVENTF_MIDDLEUP ) { - GEN_EVENT(This->offset_array[WINE_MOUSE_M_POSITION], 0x00, xtime, (This->dinput->evsequence)++); - This->m_state.rgbButtons[2] = 0x00; - } + switch(wparam) + { + case WM_LBUTTONDOWN: + GEN_EVENT(This->offset_array[WINE_MOUSE_L_POSITION], 0xFF, + hook->time, This->dinput->evsequence++); + This->m_state.rgbButtons[0] = 0xFF; + break; + case WM_LBUTTONUP: + GEN_EVENT(This->offset_array[WINE_MOUSE_L_POSITION], 0x00, + hook->time, This->dinput->evsequence++); + This->m_state.rgbButtons[0] = 0x00; + break; + case WM_RBUTTONDOWN: + GEN_EVENT(This->offset_array[WINE_MOUSE_R_POSITION], 0xFF, + hook->time, This->dinput->evsequence++); + This->m_state.rgbButtons[1] = 0xFF; + break; + case WM_RBUTTONUP: + GEN_EVENT(This->offset_array[WINE_MOUSE_R_POSITION], 0x00, + hook->time, This->dinput->evsequence++); + This->m_state.rgbButtons[1] = 0x00; + break; + case WM_MBUTTONDOWN: + GEN_EVENT(This->offset_array[WINE_MOUSE_M_POSITION], 0xFF, + hook->time, This->dinput->evsequence++); + This->m_state.rgbButtons[2] = 0xFF; + break; + case WM_MBUTTONUP: + GEN_EVENT(This->offset_array[WINE_MOUSE_M_POSITION], 0x00, + hook->time, This->dinput->evsequence++); + This->m_state.rgbButtons[2] = 0x00; + break; + } TRACE("(X: %ld - Y: %ld L: %02x M: %02x R: %02x)\n", This->m_state.lX, This->m_state.lY, @@ -484,10 +421,11 @@ end: if (This->dwCoopLevel & DISCL_NONEXCLUSIVE) { /* pass the events down to previous handlers (e.g. win32 input) */ - if (This->prev_handler) - This->prev_handler(dwFlags, dx, dy, cButtons, dwExtraInfo); + ret = CallNextHookEx( This->hook, code, wparam, lparam ); } + else ret = 1; /* ignore message */ LeaveCriticalSection(&(This->crit)); + return ret; } @@ -503,10 +441,7 @@ if (This->acquired == 0) { POINT point; - - /* This stores the current mouse handler. */ - This->prev_handler = mouse_event; - + /* Store (in a global variable) the current lock */ current_lock = (IDirectInputDevice2A*)This; @@ -525,9 +460,9 @@ This->m_state.rgbButtons[1] = (GetKeyState(VK_MBUTTON) ? 0xFF : 0x00); This->m_state.rgbButtons[2] = (GetKeyState(VK_RBUTTON) ? 0xFF : 0x00); - /* Install our own mouse event handler */ - MOUSE_Enable(dinput_mouse_event); - + /* Install our mouse hook */ + This->hook = SetWindowsHookExW( WH_MOUSE_LL, dinput_mouse_hook, 0, 0 ); + /* Get the window dimension and find the center */ GetWindowRect(This->win, &rect); This->win_centerX = (rect.right - rect.left) / 2; @@ -564,9 +499,9 @@ if (This->acquired) { /* Reinstall previous mouse event handler */ - MOUSE_Enable(This->prev_handler); - This->prev_handler = NULL; - + if (This->hook) UnhookWindowsHookEx( This->hook ); + This->hook = 0; + /* No more locks */ current_lock = NULL; -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: fixed PROPSHEET_CreatePage if called with PSP_DLGINDIRECT
by Alexandre Julliard 17 Oct '01

17 Oct '01

Kai Morich <mail(a)kai-morich.de> writes: > is it realy neccessary to clone a writable dialog template only for > changing the dialog style ? wouldn't it be simpler to somehow pass > the information that the dialog is part of a property sheet to > DIALOG_CreateIndirect, e.g. by setting some wine specific > information on the dialog owner hwnd ? Yes, we clearly need to avoid copying the template. It should be possible to either set the style after the window is created, or trap the WM_CREATE or WM_INITDIALOG message and change the style there. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: SystemParametersInfo / GetSystemMetrics
by Alexandre Julliard 17 Oct '01

17 Oct '01

Andriy Palamarchuk <apa3a(a)yahoo.com> writes: > Submitting the same patch in more digestable form - > put all the changes in one diff file. Thanks, it's *much* better this way. Splitting patches into different files makes them a pain to deal with. > Created new infrastructure for GetSystemMetrics and > SystemParametersInfo functions. Used it toto implement > processing for SPI_GET/SETBEEP, SPI_GET/SETSHOWSOUNDS > system parameters. Created unit test. I'm not sure the infrastructure for sysmetrics is really necessary. I'd prefer that all the registry handling remain in the sysparams handling, and have SYSMETRICS_Init call SystemParametersInfo to initialize the few metrics that need it. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: BUG: mouse_event does not move pointer for relative coordinates
by Andriy Palamarchuk 17 Oct '01

17 Oct '01

Andriy P wrote: > The attached test program moves pointer under Windows > NT. > > Under Wine the pointer changes position on move > request in absolute coordinates and does not move for > relative coordinates. <skipped> I tracked down the bug. The issue - in mouse_event the cursor position change occured _before_ the new position was calculated. Old coordinates were used and the latest change in the pointer position did not become effective. I'll submit a patch. Andriy Palamarchuk __________________________________________________ Do You Yahoo!? Make a great connection at Yahoo! Personals. http://personals.yahoo.com

1 0

Jump to page:

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