Force a Display/Input-Driver? (Re: [PATCH 2/5] dinput: Use x11_[acquire|unacquire]_mouse to stop mouse from escaping in exclusive mode.)
On Do, 2006-10-05 at 08:09 -0600, Vitaliy Margolen wrote:
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
if ((mod = GetModuleHandleA( "winex11.drv" )))
When we force wine to use a specific Display/Input-Driver, the driver-selection by reading the Registry is unneeded and should be removed.
IMHO, the clean way is to use the dynamic Driver Name, build from the Registry (preferable by a common used wine specific Function in a dll).
- = (void*) GetProcAddress(mod, "wine_tsx11_acquire_mouse");
The exported name is also not generic.
And we have both issues already:
$ grep -i --line-number "winex11.drv" dlls/*/* dlls/imm32/imm.c:143: x11drv = GetModuleHandleA("winex11.drv");
dlls/opengl32/wgl.c:637: HMODULE mod = GetModuleHandleA( "winex11.drv" );
dlls/wined3d/wined3d_main.c:113: mod = GetModuleHandleA( "winex11.drv" );
dlls/wintab32/wintab32.c:77: hx11drv = GetModuleHandleA("winex11.drv");
Exported Name: dlls/wined3d/wined3d_main.c:116: ... = (void *)GetProcAddress( mod, "wine_tsx11_lock" );
Detlef Riekenberg wrote:
On Do, 2006-10-05 at 08:09 -0600, Vitaliy Margolen wrote:
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
if ((mod = GetModuleHandleA( "winex11.drv" )))When we force wine to use a specific Display/Input-Driver, the driver-selection by reading the Registry is unneeded and should be removed.
I don't understand what are you talking about? This is not "LoadModule" this is GetModuleHandle - it will return valid handle only if we already have loaded winex11.drv. And as you seen, every place that uses exported functions, check if they were assigned.
IMHO, the clean way is to use the dynamic Driver Name, build from the Registry (preferable by a common used wine specific Function in a dll).
This functions are driver specific. And I don't see any other driver that we have. NULL driver doesn't count - it will not work for games or anything that might use mouse.
- = (void*) GetProcAddress(mod, "wine_tsx11_acquire_mouse");
The exported name is also not generic.
What do you mean? It is specific Wine export and has no analogy with anything else, let alone native.
As I explained, what we have to deal with is totally different from native. And we have to do it totally different from native. Also, existing moue grab code doesn't work for anything but some really old ddraw programs. Out of 20 games I've tested here, none were able to grab the mouse.
Vitaliy.
On Do, 2006-10-05 at 18:11 -0600, Vitaliy Margolen wrote:
When we force wine to use a specific Display/Input-Driver, the driver-selection by reading the Registry is unneeded and should be removed.
This is not "LoadModule"this is GetModuleHandle -
I wanted to learn from your code and fall over the Fixed name, but missed this important Part. I'm going back to the area of code where I'm working and say sorry for the noise.
-
Detlef Riekenberg -
Vitaliy Margolen