October 2001 - Wine-Devel - list.winehq.org

Re: MDI FindWndPtr fix
by Uwe Bonnes Oct. 18, 2001

Oct. 18, 2001

>>>>> "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 Oct. 17, 2001

Oct. 17, 2001

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 Oct. 17, 2001

Oct. 17, 2001

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 Oct. 17, 2001

Oct. 17, 2001

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 Oct. 17, 2001

Oct. 17, 2001

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

Windows-format metafiles
by Aric Stewart Oct. 17, 2001

Oct. 17, 2001

Hello all, I am doing so work trying to flesh out he implementation of SetWinMetaFileBits and as such need documentation on Windows-format metafiles (not enhanced metafiles i have that) There must exist specs and documentation from old 3.1 days, but I am having no luck finding it. Does anyone have pointers as to where i could find a spec for the windows format metafiles to help me out? thanks -aric

3 2

Re: PATCH: wine_dbgstr_an()
by Andreas Mohr Oct. 17, 2001

Oct. 17, 2001

On Tue, Oct 16, 2001 at 10:58:01PM +0200, Johan Gill wrote: > Relay tracing would crash if it came upon a function call with an invalid > pointer as a parameter. > + return "(invalid)"; Hmm, is there any reason why you just return "(invalid)" ? IMHO this can be very misleading, as some programs use strings such as "invalid", "NOT_VALID" or whatever to have something to compare against to check for a valid return. Furthermore it doesn't indicate at all that this string content originates from within wine due to an invalid function argument. I'd use something like: "WINE RELAY: invalid string pointer !" or so. And, even better, sprintf() the string pointer value into a static buffer to be used as a replacement, so that the output of this buffer looks like: "WINE RELAY: invalid string pointer 0x00045213 !". -- Andreas Mohr Stauferstr. 6, D-71272 Renningen, Germany Tel. +49 7159 800604 http://home.nexgo.de/andi.mohr/

1 0

Re:Pajama Sam 2 and other games
by Eric Pouech Oct. 16, 2001

Oct. 16, 2001

regarding the sound issues, there still may be some races in the buffer playback. however, there's no specification of sound latency under windows (how many buffers shall be queued in advance to ensure proper playback...). So, there's no guarantee on Wine right now of the latency to expect (in fact, I assume that wine's latency may be higher that Windows one, however I didn't check it). Which means that some program may run fine under windows and have some "holes" in their playback under wine. However, what's less understandable is that the program hangs (or at least doesn't provide any new sound) could run the program with -debugmsg +wave,+mmsys and send me the compreseed output. (BTW, if you want to look at the code, it's in dlls/winmm/wineoss/audio.c) A+ --------------- Eric Pouech (http://perso.wanadoo.fr/eric.pouech/) The future will be better tomorrow, Vice President Dan Quayle __________________________________________________________ Faites un voeu et puis Voila ! www.voila.fr Pendant tout l'été, gagnez une Ford Ka sur Voila Gratter ! http://cybergrattage.voila.fr/voila

1 0

Pajama Sam 2 and other games
by Ori Pessach Oct. 16, 2001

Oct. 16, 2001

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello, I've been trying to run several games from Humongous Entertainment under wine 20011007, installed from an RPM. They run, except for a couple of problems: The first problem is that the sound pauses sometimes. While the sound is paused, the animation animation still plays. It seems like the introduction of a new sound into the mix makes it more likely for the sound to pause. Eventually, the sound will die completely, with the message: err:wave:wodPlayer_Message buffer overflow !? written to stdout. The game will halt at that point, hanging wine. At that point I can do a 'killall wine', and rerun it. The second problem is with the cursor: When you pick up an object, the games modify the cursor to a picture of the object. This doesn't work under wine, and the cursor just disappears. It reappears when you drop the object. The games seem to use the WaveOut API's to play sounds, and the background music is a PCM, not MIDI. From my days writing similar games, I remember that the only way to have low-latency sound mixing using WaveOut was to stop and restart the device, feeding it fresh buffers with the new sounds mixed in. If none of this rings a bell with anybody, I don't mind taking a look at the sound code, to try to figure out what's broken. The cursor problem probably has something to do with trying to create a cursor object from a color bitmap, but I'm just guessing. I'm not even sure what the cursor is supposed to look like, as I've never ran the games under Windows... Any ideas? Thanks, Ori Pessach -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (GNU/Linux) Comment: For info see http://www.gnupg.org iD8DBQE7zG/wRWZDICaLP5ERAktsAKDLW/1hnRwJVfAExvOj24tMtvULogCg+RsA UcS6RDI6knfCr/yKeVYZVas= =zg/k -----END PGP SIGNATURE----- _________________________________________________________ Do You Yahoo!? Get your free @yahoo.com address at http://mail.yahoo.com

1 0

Re: wine/port.h #include fixes
by Roger Fujii Oct. 15, 2001

Oct. 15, 2001

fgouget(a)codeweavers.com wrote: > Doing this (except for port.h) I have a tree that builds on Solaris > with no _FILE_OFFSET_BITS warning. So if the above sounds good, I have > patches that are almost ready. > does this build run on solaris? I've been trying for the last couple of days to get the beast to run (compiles ok), but it segfaults in various places (currently in NtCurrentTeb()). This in on a solaris 8 dual CPU unit. This is using gas/gld (results were worse with as/ld). Any pointers on debugging this thing? Thanks. -r -- Roger Fujii <rmf(a)lookhere.com> Underemployed, and trying to keep it that way....

2 2