wine-devel October 2006

wine-devel@winehq.org

142 participants
266 discussions

re: Add IRunnableObject stub implementation
by Dan Kegel 11 Oct '06

11 Oct '06

> On 10/10/06, Huw Davies <huw at codeweavers.com> wrote: > > On Tue, Oct 10, 2006 at 04:45:40PM -0400, Vijay Kiran Kamuju wrote: > > > Add IRunnableObject stub implementation, > > > > It's not at all clear to me what this interface should do in this > > context. Could you at least add a test that shows that the domdoc > > object should expose IRunnableObject? > > Check the bug# 6341 [http://bugs.winehq.org/show_bug.cgi?id=6341 ] > previously I sent a patch > http://www.winehq.org/pipermail/wine-patches/2006-September/030659.html > No response, so I thought its noway getting into the main tree, so no tests. > Well I sent this one to the list so that it does not get lost. Vijay, tests are exactly what you need to get things into the tree! And adding the test Huw suggests is very easy, go ahead and do that, and repost your patch with the test added (after verifying that the test passes on real windows). Thanks for working on some of these msxml problems! - Dan

3 4

wine segfaulting
by Pavel Troller 11 Oct '06

11 Oct '06

Hi! I have a problem running wine on one of my machines. It's the same binary copy which I've compiled and which successfully runs on another ones. The problem is that many apps, which run on other machines, cause wine to segfault here. The first one doing so is "rundll.exe setupapi.dll...", invoked during wineprefixcreate process, so there is even a problem creating a fresh .wine directory. Simple apps, like winecfg and notepad, run well. Other ones don't. For some of them, wine dumps a lot of warnings before the segfault, but exactly the same warnings are emitted on another machines, where the app runs well. When the app fails, it even doesn't start to render its window. However, when a virtual desktop is to be used, it appears but it's still empty in the moment of the fault. I was trying to get a backtrace by generating a core file and then examining it with gdb. However, it always complains about the fact that the core was created by another binary being run, and reports the name of the windows executable, not anything like wine-*thread, which run the app. An attempt of dumping the bt ends up with many hundreds of illegal entries, mostly zeroes, some 0xFFFFFFFFs and other junk, and the bt is ended by an inaccessible memory somewhere at 0x7FFExxxx. Basic software (kernel, glibc, X11...) is very similar on all of the machines, and of recent dates. I've also used strace and examined it. It looks that the segfault comes to 2 threads simultaneously. Immediately before there are some mprotect() calls and mmap2(), which is successfull. The fault appears somewhere at 61k'th line, so the app did a bunch of things before the crash: Now I'm lost. Can anybody help me, what to try next to find the cause and solve the problem ? Many thanks in advance! With regards, Pavel Troller [pid 4583] <... gettimeofday resumed> {1160539521, 267044}, NULL) = 0 [pid 4583] read(21, "\221\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0 \0\1\0\0\0\0\0\0\0\0"..., 64) = 64 [pid 4583] write(22, "\0\0\0\0\0\0\0\0\0\0\0\226\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 64 <unfinished ...> [pid 4580] <... read resumed> "\0\0\0\0\0\0\0\0\0\0\0\226\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 64) = 64 [pid 4583] <... write resumed> ) = 64 [pid 4580] rt_sigprocmask(SIG_SETMASK, [], <unfinished ...> [pid 4583] epoll_wait(0x6, 0xbfb1b5dc, 0x80, 0x6c8f <unfinished ...> [pid 4580] <... rt_sigprocmask resumed> NULL, 8) = 0 [pid 4580] write(6, ";\3\5\0\205\0@\2\0\0\0\0\0\0\0\0\1\0\1\0<\0\2\0\205\0@"..., 80) = 80 [pid 4580] mmap2(0x390000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x390000 [pid 4580] shmget(IPC_PRIVATE, 3152, IPC_CREAT|0700) = 7143430 [pid 4580] shmat(7143430, 0, 0) = 0xb7f45000 [pid 4580] write(6, ";\3\5\0\206\0@\2\0\0\0\0\0\0\0\0\1\0\1\0005\30\4\0\207"..., 56) = 56 [pid 4580] read(6, "\1\1\10\3\0\0\0\0\5\0\240\1\0\0\0\0\0\0\0\0\0\0\0\0\10"..., 32) = 32 [pid 4580] shmctl(7143430, IPC_64|IPC_RMID, 0) = 0 [pid 4580] mprotect(0x390000, 4096, PROT_READ|PROT_WRITE) = 0 [pid 4580] write(6, "<\3\2\0\206\0@\0027\0\4\0\211\0@\2\207\0@\2\0\0\0\0", 24) = 24 [pid 4580] mprotect(0x390000, 4096, PROT_READ) = 0 [pid 4580] write(6, ";\3\5\0\211\0@\2\0\0\0\0\0\0\0\0\212\1\2\0\224\3\n\0\207"..., 64) = 64 [pid 4580] read(6, "\1\1\r\3\0\0\0\0\5\0\240\1\0\0\0\0\0\0\0\0\0\0\0\0\10L"..., 32) = 32 [pid 4580] mprotect(0x390000, 4096, PROT_NONE) = 0 [pid 4580] write(6, "8\3\6\0\211\0@\2\1\200\1\0\17\0\0\0\1\0\0\0\0\0\0\0F\0"..., 60) = 60 [pid 4580] write(6, ";\3\5\0\212\0@\2\0\0\0\0\0\0\0\0\1\0\1\0<\0\2\0\212\0@"..., 44) = 44 [pid 4580] write(6, ";\3\5\0\213\0@\2\0\0\0\0\0\0\0\0\212\1\1\0008\0\4\0\211"..., 88) = 88 [pid 4580] write(6, ";\3\5\0\214\0@\2\0\0\0\0\0\0\0\0\1\0\1\0<\0\2\0\214\0@"..., 52) = 52 [pid 4580] shmdt(0xb7f43000) = 0 [pid 4580] mmap2(0x3a0000, 4096, PROT_NONE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_NORESERVE, -1, 0) = 0x3a0000 [pid 4580] --- SIGSEGV (Segmentation fault) @ 0 (0) --- [pid 4580] --- SIGSEGV (Segmentation fault) @ 0 (0) --- [pid 4587] <... read resumed> 0x6cd9c6a4, 8) = ? ERESTARTSYS (To be restarted) [pid 4588] <... read resumed> 0x6151d4c4, 8) = ? ERESTARTSYS (To be restarted) [pid 4583] <... epoll_wait resumed> ) = 1 [pid 4587] +++ killed by SIGSEGV +++ PANIC: handle_group_exit: 4587 leader 4580 Process 4588 attached (waiting for parent) [pid 4580] +++ killed by SIGSEGV +++ [pid 4583] gettimeofday({1160539521, 270820}, NULL) = 0 [pid 4583] epoll_ctl(0x6, 0x2, 0x15, 0xbfb1b53c) = 0 [pid 4583] close(21) = 0 [pid 4583] close(22) = 0 [pid 4583] close(23) = 0 [pid 4583] epoll_wait(0x6, 0xbfb1b5dc, 0x80, 0x6c8b) = 3 [pid 4583] gettimeofday({1160539521, 271022}, NULL) = 0 [pid 4583] write(38, "\0\0\0\0\3\1\0\0", 8) = -1 EPIPE (Broken pipe) [pid 4583] --- SIGPIPE (Broken pipe) @ 0 (0) --- [pid 4583] epoll_ctl(0x6, 0x2, 0x24, 0xbfb1b53c) = 0 [pid 4583] close(36) = 0 [pid 4583] close(37) = 0 [pid 4583] close(38) = 0 [pid 4583] write(35, "\0\0\0\0\3\1\0\0", 8) = -1 EPIPE (Broken pipe) [pid 4583] --- SIGPIPE (Broken pipe) @ 0 (0) ---

3 4

Anybody have a RegDeleteTree[A|W] implementation lying around?
by Paul Vriens 11 Oct '06

11 Oct '06

Hi, I was browsing some code and found that we have several places where we made our own implementation of a recursive delete of registry keys/value. Apparently there is an official one in Vista: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/sysinfo/ba… I don't know if somebody has this already lying around somewhere. If not, I'll have a go (not soon though). Would be a nice code cleanup, or are there any pitfalls? Cheers, Paul.

6 9

location of atlbase.h
by James Hawkins 11 Oct '06

11 Oct '06

Hi, MS Platform SDK has atlbase.h as a public header in include/atl. Shouldn't we follow suit? Right now atlbase.h is in dlls/atl. -- James Hawkins

2 1

Common Controls to-do list
by Dan Kegel 11 Oct '06

11 Oct '06

I've been looking around for a good project for a group of ten students for the spring term. In 2006, I had them work on implementing missing features in richedit. Most of the easy features there have been implemented now, I think, so I looked at msxml3. That's not a great candidate, as a fair number of the problems with it would require knowledge of COM to fix. So at James Hawkin's suggestion, I looked at comctl32. Sure enough, only half the controls seem to have conformance tests, and there's a fair bit of documentation and tools to help newcomers. So I updated http://wiki.winehq.org/Comctl32 a bit, and I'll update it a bit more as time goes on with suggested projects for the students. If you're interested in common controls issues, please visit that page and add any corrections or project ideas that come to mind. Thanks, Dan

1 0

Possible fix idea for NtProtectVirtualMemory
by Segin 11 Oct '06

11 Oct '06

It took some good hydro from Holland and about 6 hours of trying to write a program that could syncronize multiple instances of itself using IPC and signals (so it could run on Minix 3, where pthreads sadly doesn't exist, so it was a threading hack of sorts) to come up with a possible fix for the cross-process problem with NtProtectVirtualMemory. The solution: Use signals. It's really simple to explain (I wouldn't know where to begin with actually coding it, pointers would help). Since the NtProtectVirtualMemory call is only supported by the current process, use wineserver and software signals to allow a bit of a cross-process hack. When the individual Win32 process client recieves a certain signal (ohh, for now, say SIGUSR2), the client would break the Win32 code, call up wineserver for the parameters (and silently ignore if it's a false signal, e.g. lame user trying to use `kill -USR2'), preform the required operations itself, and then resume executing the Win32 process. Does this sound like a good hack or what? -- The real problem with C++ for kernel modules is: the language just sucks. -- Linus Torvalds

2 1

Regression in wine in your patch.
by Konrad Materka 10 Oct '06

10 Oct '06

Hello, I found a regression in wine-0.9.21. Exactly in patch: winex11.drv: Move WGL extension code to winex11.drv 12dbce5c938a060721a70411d579b4e6eec2c4a6 Background: In Poland we have program called "Płatnik". It is very important, because we use this to send taxes and other stupid things. Unfortunately it is only for windows, it uses some weird components like MDAC, MS JET, Internet Explorer (MSXML3, crypto32 etc). Almost everything works (in fact many things doesn't work, but it is still usable). And now what breaks this patch: when I want to print program shows small windows with progress. Printing is working fine, but after this finish his work, window with progress should disappear. But what I get: konrad@server:~/wine/wine-git$ ./wine "c:\platnik\p2.exe" fixme:psdrv:PSDRV_CreateColor Colour is ff000000 err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! err:syslevel:_EnterSysLevel (0x7edc0040, level 2): Holding 0x7ecb7880, level 3. Expect deadlock! X Error of failed request: BadWindow (invalid Window parameter) Major opcode of failed request: 20 (X_GetProperty) Resource id in failed request: 0x40000ac Serial number of failed request: 2134 Current serial number in output stream: 2078 XIO: fatal IO error 0 (Success) on X server ":0.0" after 2182 requests (2181 known processed) with 0 events remaining. konrad@server:~/wine/wine-git$ This "fixme" message is normal, it occurs always when print and is harmless. I've done some investigation (git bisec...) and found that your patch is responsible for this :) If you need some more information, I'll provide some. Oh, i almost forgot, my system: Kubuntu/Ubuntu 6.06 with latest updates X.org - 7.0 without XGL, compiz etc. graphic: nvidia with binary drivers 1.0.8762 kernel 2.6.15-27-k7 gcc version 4.0.3 (Ubuntu 4.0.3-1ubuntu5) I tried both binary DEB and git repository. -- With kindest regards: Konrad Materka

2 1

Please create wine-msxml and wine-setupapi components in bugzilla
by Dan Kegel 10 Oct '06

10 Oct '06

Bugzilla currently lacks categories for several important parts of wine. This is natural - nothing's perfect. Rather than fix this all at one go, let's just add categories as we find we need them. I propose adding categories for msxml and setupapi now. Here are bugzilla queries that find quite a few bugs that are candidates for moving into those categories: http://bugs.winehq.org/buglist.cgi?long_desc_type=substring&long_desc=msxml… http://bugs.winehq.org/buglist.cgi?long_desc_type=substring&long_desc=setup… I think they show enough hits to make the categories worth it. IIRC, James Hawkins has said he thinks we need a setupapi category, so I'm not alone in this. The categories might help shake loose bugs like http://bugs.winehq.org/show_bug.cgi?id=2223 which have patches associated with them but haven't gotten any attention. The MSXML category will help me as I dredge together projects for cs130 to focus on... So, what does it take to create a new category? Can the admin just do it? We can move the appropriate bugs over to the new categories later. Thanks, Dan

4 6

Requesting testing for the hotkey implementation
by Aaron Slunt 10 Oct '06

10 Oct '06

I'm attaching the patch, first started by Robert Reif, then finished off by Vincent Povirk, and cleaned up by myself to apply to the current GIT tree. I'm asking devs/users to please test this patch out. It implements Register/UnregisterHotkey in wine. I have yet to come across any issues with it. The primary concern for this patch would be to see what happens when two separate programs, or two instances of the same program, try to register a hotkey that is already in use. Please let me know how this turns out. It would be really great to finally have this in wine, but testing needs to happen first. Thanks. ---------------------------------------------------------------------- Index: dlls/user/driver.c =================================================================== RCS file: /home/wine/wine/dlls/user/driver.c,v retrieving revision 1.4 diff -u -r1.4 driver.c --- dlls/user/driver.c 3 Apr 2006 19:46:56 -0000 1.4 +++ dlls/user/driver.c 7 May 2006 20:15:34 -0000 @@ -76,6 +76,8 @@ GET_USER_FUNC(ActivateKeyboardLayout); GET_USER_FUNC(Beep); + GET_USER_FUNC(RegisterHotKey); + GET_USER_FUNC(UnregisterHotKey); GET_USER_FUNC(GetAsyncKeyState); GET_USER_FUNC(GetKeyNameText); GET_USER_FUNC(GetKeyboardLayout); @@ -216,6 +218,16 @@ return -1; } +static BOOL nulldrv_RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) +{ + return FALSE; +} + +static BOOL nulldrv_UnregisterHotKey(HWND hwnd,INT id) +{ + return FALSE; +} + static void nulldrv_SetCursor( struct tagCURSORICONINFO *info ) { } @@ -421,6 +433,8 @@ nulldrv_ToUnicodeEx, nulldrv_UnloadKeyboardLayout, nulldrv_VkKeyScanEx, + nulldrv_RegisterHotKey, + nulldrv_UnregisterHotKey, /* mouse functions */ nulldrv_SetCursor, nulldrv_GetCursorPos, @@ -538,6 +552,16 @@ return load_driver()->pVkKeyScanEx( ch, layout ); } +static BOOL loaderdrv_RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) +{ + return load_driver()->pRegisterHotKey( hwnd, id, modifiers, vk ); +} + +static BOOL loaderdrv_UnregisterHotKey(HWND hwnd,INT id) +{ + return load_driver()->pUnregisterHotKey( hwnd, id ); +} + static void loaderdrv_SetCursor( struct tagCURSORICONINFO *info ) { load_driver()->pSetCursor( info ); @@ -737,6 +761,8 @@ loaderdrv_ToUnicodeEx, loaderdrv_UnloadKeyboardLayout, loaderdrv_VkKeyScanEx, + loaderdrv_RegisterHotKey, + loaderdrv_UnregisterHotKey, /* mouse functions */ loaderdrv_SetCursor, loaderdrv_GetCursorPos, Index: dlls/user/input.c =================================================================== RCS file: /home/wine/wine/dlls/user/input.c,v retrieving revision 1.10 diff -u -r1.10 input.c --- dlls/user/input.c 27 Mar 2006 20:51:17 -0000 1.10 +++ dlls/user/input.c 7 May 2006 20:15:35 -0000 @@ -653,8 +653,10 @@ */ BOOL WINAPI RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) { - FIXME_(keyboard)("(%p,%d,0x%08x,%d): stub\n",hwnd,id,modifiers,vk); - return TRUE; + TRACE_(keyboard)("(%p,0x%x,0x%08x,0x%08x)\n",hwnd,id,modifiers,vk); + if (USER_Driver->pRegisterHotKey) + return USER_Driver->pRegisterHotKey( hwnd, id, modifiers, vk ); + return FALSE; } /*********************************************************************** @@ -662,8 +664,10 @@ */ BOOL WINAPI UnregisterHotKey(HWND hwnd,INT id) { - FIXME_(keyboard)("(%p,%d): stub\n",hwnd,id); - return TRUE; + TRACE_(keyboard)("(%p,%d)\n",hwnd,id); + if (USER_Driver->pUnregisterHotKey) + return USER_Driver->pUnregisterHotKey( hwnd, id ); + return FALSE; } /*********************************************************************** Index: dlls/user/user_private.h =================================================================== RCS file: /home/wine/wine/dlls/user/user_private.h,v retrieving revision 1.20 diff -u -r1.20 user_private.h --- dlls/user/user_private.h 10 Aug 2005 09:56:23 -0000 1.20 +++ dlls/user/user_private.h 7 May 2006 20:15:35 -0000 @@ -114,6 +114,8 @@ INT (*pToUnicodeEx)(UINT, UINT, LPBYTE, LPWSTR, int, UINT, HKL); BOOL (*pUnloadKeyboardLayout)(HKL); SHORT (*pVkKeyScanEx)(WCHAR, HKL); + BOOL (*pRegisterHotKey)(HWND, INT, UINT, UINT); + BOOL (*pUnregisterHotKey)(HWND, INT); /* mouse functions */ void (*pSetCursor)(struct tagCURSORICONINFO *); BOOL (*pGetCursorPos)(LPPOINT); Index: dlls/x11drv/keyboard.c =================================================================== RCS file: /home/wine/wine/dlls/x11drv/keyboard.c,v retrieving revision 1.90 diff -u -r1.90 keyboard.c --- dlls/x11drv/keyboard.c 20 Apr 2006 09:41:15 -0000 1.90 +++ dlls/x11drv/keyboard.c 7 May 2006 20:15:38 -0000 @@ -89,7 +89,7 @@ static int min_keycode, max_keycode, keysyms_per_keycode; static WORD keyc2vkey[256], keyc2scan[256]; -static int NumLockMask, AltGrMask; /* mask in the XKeyEvent state */ +static int NumLockMask, ScrollLockMask, AnyLockMask, AltGrMask, MetaMask, SuperMask; /* mask in the XKeyEvent state */ static int kcControl, kcAlt, kcShift, kcNumLock, kcCapsLock; /* keycodes */ static char KEYBOARD_MapDeadKeysym(KeySym keysym); @@ -1075,6 +1075,91 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x153 /* FFF8 */ }; +/*********************************************************************** + * HotKey + */ +typedef struct GRABKEY_INFO { + HWND hWnd; /* windows window to receive hot-key notification */ + INT id; /* windows identifier of hot key */ + UINT fsModifiers; /* windows key-modifier flag */ + UINT vk; /* windows virtual-key code */ + int x_keycode; /* X keycode */ + unsigned int x_modifiers; /* X modifiers */ +} GRABKEY_INFO; + +static GRABKEY_INFO * pKeys = 0; +static int nKeys = 0; +static int nKeysMax = 0; + +static int add_grab(HWND hwnd, INT id, UINT modifiers, UINT vk, unsigned int x_modifiers, int x_keycode) +{ + TRACE("(%p,%x,%x,%x,%x,%x)\n",hwnd,id,modifiers,vk,x_modifiers,x_keycode); + + if ( (pKeys == 0) || (nKeys == nKeysMax) ) { + GRABKEY_INFO * temp; + if (nKeys) + temp = (GRABKEY_INFO *)HeapReAlloc(GetProcessHeap(),0, pKeys, (nKeysMax + 10) * sizeof(GRABKEY_INFO)); + else + temp = (GRABKEY_INFO *)HeapAlloc(GetProcessHeap(),0, 10 * sizeof(GRABKEY_INFO)); + if (temp) { + pKeys = temp; + nKeysMax += 10; + } else + return False; + } + + pKeys[nKeys].hWnd = hwnd; + pKeys[nKeys].id = id; + pKeys[nKeys].fsModifiers = modifiers; + pKeys[nKeys].vk = vk; + pKeys[nKeys].x_keycode = x_keycode; + pKeys[nKeys].x_modifiers = x_modifiers; + nKeys++; + return True; +} + +static GRABKEY_INFO * find_grab(INT id) +{ + int i; + TRACE("(%x)\n", id); + for (i = 0; i < nKeys; i++) { + if (pKeys[i].id == id) + return &pKeys[i]; + } + return 0; +} + +static GRABKEY_INFO * has_grab(XKeyEvent *event) +{ + int i; + int modifiers = event->state & ~AnyLockMask; + TRACE("(%p) event->keycode=%d\n",event,event->keycode); + for (i = 0; i < nKeys; i++) { + if ((pKeys[i].x_keycode == event->keycode) && (pKeys[i].x_modifiers == modifiers)) + return &pKeys[i]; + } + return 0; +} + +static int remove_grab(INT id) +{ + int i,j; + TRACE("(%x)\n", id); + for (i = 0; i < nKeys; i++) { + if (pKeys[i].id == id) { + for (j = i; j < (nKeys - 1); j++) + pKeys[j] = pKeys[j + 1]; + nKeys--; + if (nKeys == 0) { + HeapFree(GetProcessHeap(),0, pKeys); + pKeys = 0; + nKeysMax = 0; + } + return True; + } + } + return False; +} /* Returns the Windows virtual key code associated with the X event <e> */ /* x11 lock must be held */ @@ -1325,6 +1410,15 @@ TRACE_(key)("type %d, window %lx, state 0x%04x, keycode 0x%04x\n", event->type, event->window, event->state, event->keycode); + if (event->type == KeyPress) { + GRABKEY_INFO * hotkey = has_grab(event); + + if (hotkey) { + PostMessageA(hotkey->hWnd, WM_HOTKEY, hotkey->id, MAKEWORD(hotkey->fsModifiers, hotkey->vk)); + return; + } + } + wine_tsx11_lock(); if (xic) ascii_chars = XmbLookupString(xic, event, Str, sizeof(Str), &keysym, &status); @@ -1576,15 +1670,36 @@ { int k; - for (k = 0; k < keysyms_per_keycode; k += 1) - if (XKeycodeToKeysym(display, *kcp, k) == XK_Num_Lock) - { - NumLockMask = 1 << i; + for (k = 0; k < keysyms_per_keycode; k += 1) { + KeySym sym = XKeycodeToKeysym(display, *kcp, k); + switch (sym) { + case XK_Num_Lock: + NumLockMask |= 1 << i; TRACE_(key)("NumLockMask is %x\n", NumLockMask); + break; + + case XK_Scroll_Lock: + ScrollLockMask |= 1 << i; + TRACE_(key)("ScrollLockMask is %x\n", ScrollLockMask); + break; + + case XK_Meta_L: case XK_Meta_R: + MetaMask |= 1 << i; + TRACE_(key)("MetaMask is %x\n", MetaMask); + break; + + case XK_Super_L: case XK_Super_R: + SuperMask |= 1 << i; + TRACE_(key)("SuperMask is %x\n", SuperMask); + break; + + default: break; } + } } } XFreeModifiermap(mmp); + AnyLockMask = LockMask|NumLockMask|ScrollLockMask; /* Detect the keyboard layout */ X11DRV_KEYBOARD_DetectLayout(); @@ -2521,3 +2636,98 @@ XBell(thread_display(), 0); wine_tsx11_unlock(); } + +/*********************************************************************** + * RegisterHotKey (X11DRV.@) + */ +BOOL X11DRV_RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) +{ + Display *display; + Window window; + BOOL ret; + int x_modifiers = 0, grab_mask, ungrab_mask; + int x_keycode = 0; + int err; + int keyc; + + TRACE("(%p,0x%x,0x%08x,0x%08x)\n",hwnd,id,modifiers,vk); + + display = thread_display(); + window = X11DRV_get_whole_window(hwnd); + + if (modifiers & MOD_ALT) + x_modifiers |= MetaMask; + if (modifiers & MOD_CONTROL) + x_modifiers |= ControlMask; + if (modifiers & MOD_SHIFT) + x_modifiers |= ShiftMask; + if (modifiers & MOD_WIN) + x_modifiers |= SuperMask; + + for (keyc=min_keycode; keyc<=max_keycode; keyc++) { + if ((keyc2vkey[keyc] & 0xFF) == vk) { + TRACE("keycode found\n"); + x_keycode = keyc; + break; + } + } + + if (keyc > max_keycode) { + TRACE("keycode not found\n"); + return FALSE; + } + + /* We need to register every combination of the locks to ignore them */ + wine_tsx11_lock(); + grab_mask = AnyLockMask; + do { + err = XGrabKey(display, x_keycode, x_modifiers|grab_mask, DefaultRootWindow(display), False, GrabModeAsync, GrabModeAsync); + if (err == 0) break; + grab_mask = (grab_mask-1) & AnyLockMask; + } while (grab_mask != AnyLockMask); + + if (err == 0) { + FIXME("failed to grab keycode=0x%04x modifiers=0x%04x", x_keycode, x_modifiers); + /* FIXME: set proper error value */ + SetLastError(ERROR_HOTKEY_ALREADY_REGISTERED); + /* unregister anything we succeeded in grabbing */ + ungrab_mask = AnyLockMask; + while (ungrab_mask != grab_mask) { + XUngrabKey(display, x_keycode, x_modifiers|ungrab_mask, DefaultRootWindow(display)); + ungrab_mask = (ungrab_mask-1) & AnyLockMask; + } + ret = FALSE; + } else { + add_grab(hwnd, id, modifiers, vk, x_modifiers, x_keycode); + ret = TRUE; + } + wine_tsx11_unlock(); + + return ret; +} + +/*********************************************************************** + * UnregisterHotKey (X11DRV.@) + */ +BOOL X11DRV_UnregisterHotKey(HWND hwnd,INT id) +{ + Display *display = thread_display(); + Window window = X11DRV_get_whole_window(hwnd); + GRABKEY_INFO * grab = find_grab(id); + int ungrab_mask; + + TRACE("(%lx,%d)\n",(DWORD)hwnd,id); + + if (grab) { + wine_tsx11_lock(); + ungrab_mask = AnyLockMask; + do { + XUngrabKey(display, grab->x_keycode, grab->x_modifiers|ungrab_mask, window); + ungrab_mask = (ungrab_mask-1) & AnyLockMask; + } while (ungrab_mask != AnyLockMask); + wine_tsx11_unlock(); + remove_grab(id); + return TRUE; + } + return FALSE; +} Index: dlls/x11drv/winex11.drv.spec =================================================================== RCS file: /home/wine/wine/dlls/x11drv/winex11.drv.spec,v retrieving revision 1.5 diff -u -r1.5 winex11.drv.spec --- dlls/x11drv/winex11.drv.spec 27 Mar 2006 20:51:24 -0000 1.5 +++ dlls/x11drv/winex11.drv.spec 7 May 2006 20:15:38 -0000 @@ -76,6 +76,8 @@ @ cdecl ToUnicodeEx(long long ptr ptr long long long) X11DRV_ToUnicodeEx @ cdecl UnloadKeyboardLayout(long) X11DRV_UnloadKeyboardLayout @ cdecl VkKeyScanEx(long long) X11DRV_VkKeyScanEx +@ cdecl RegisterHotKey(long long long long) X11DRV_RegisterHotKey +@ cdecl UnregisterHotKey(long long) X11DRV_UnregisterHotKey @ cdecl SetCursor(ptr) X11DRV_SetCursor @ cdecl GetCursorPos(ptr) X11DRV_GetCursorPos @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos Index: include/winbase.h =================================================================== RCS file: /home/wine/wine/include/winbase.h,v retrieving revision 1.253 diff -u -r1.253 winbase.h --- include/winbase.h 16 Mar 2006 20:41:46 -0000 1.253 +++ include/winbase.h 7 May 2006 20:15:40 -0000 @@ -1844,6 +1844,7 @@ HANDLE WINAPI RegisterEventSourceA(LPCSTR,LPCSTR); HANDLE WINAPI RegisterEventSourceW(LPCWSTR,LPCWSTR); #define RegisterEventSource WINELIB_NAME_AW(RegisterEventSource) +BOOL WINAPI RegisterHotKey(HWND,INT,UINT,UINT); BOOL WINAPI RegisterWaitForSingleObject(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,ULONG,ULONG); HANDLE WINAPI RegisterWaitForSingleObjectEx(HANDLE,WAITORTIMERCALLBACK,PVOID,ULONG,ULONG); VOID WINAPI ReleaseActCtx(HANDLE); @@ -1971,6 +1972,7 @@ BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED); #define UnlockSegment(handle) GlobalUnfix((HANDLE)(handle)) BOOL WINAPI UnmapViewOfFile(LPVOID); +BOOL WINAPI UnregisterHotKey(HWND,INT); BOOL WINAPI UnregisterWait(HANDLE); BOOL WINAPI UnregisterWaitEx(HANDLE,HANDLE); BOOL WINAPI UpdateResourceA(HANDLE,LPCSTR,LPCSTR,WORD,LPVOID,DWORD); ? 01-hotkey.diff ? evil-window-size-hack ? hotkeys.patch ? wa-hack ? wa_hack_complete ? dlls/commdlg/800.bmp ? dlls/commdlg/Makefile ? dlls/commdlg/cdrom.ico ? dlls/commdlg/floppy.ico ? dlls/commdlg/folder.ico ? dlls/commdlg/folder2.ico ? dlls/commdlg/fontpics.bmp Index: dlls/user/driver.c =================================================================== RCS file: /home/wine/wine/dlls/user/driver.c,v retrieving revision 1.4 diff -u -r1.4 driver.c --- dlls/user/driver.c 3 Apr 2006 19:46:56 -0000 1.4 +++ dlls/user/driver.c 7 May 2006 20:15:34 -0000 @@ -76,6 +76,8 @@ GET_USER_FUNC(ActivateKeyboardLayout); GET_USER_FUNC(Beep); + GET_USER_FUNC(RegisterHotKey); + GET_USER_FUNC(UnregisterHotKey); GET_USER_FUNC(GetAsyncKeyState); GET_USER_FUNC(GetKeyNameText); GET_USER_FUNC(GetKeyboardLayout); @@ -216,6 +218,16 @@ return -1; } +static BOOL nulldrv_RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) +{ + return FALSE; +} + +static BOOL nulldrv_UnregisterHotKey(HWND hwnd,INT id) +{ + return FALSE; +} + static void nulldrv_SetCursor( struct tagCURSORICONINFO *info ) { } @@ -421,6 +433,8 @@ nulldrv_ToUnicodeEx, nulldrv_UnloadKeyboardLayout, nulldrv_VkKeyScanEx, + nulldrv_RegisterHotKey, + nulldrv_UnregisterHotKey, /* mouse functions */ nulldrv_SetCursor, nulldrv_GetCursorPos, @@ -538,6 +552,16 @@ return load_driver()->pVkKeyScanEx( ch, layout ); } +static BOOL loaderdrv_RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) +{ + return load_driver()->pRegisterHotKey( hwnd, id, modifiers, vk ); +} + +static BOOL loaderdrv_UnregisterHotKey(HWND hwnd,INT id) +{ + return load_driver()->pUnregisterHotKey( hwnd, id ); +} + static void loaderdrv_SetCursor( struct tagCURSORICONINFO *info ) { load_driver()->pSetCursor( info ); @@ -737,6 +761,8 @@ loaderdrv_ToUnicodeEx, loaderdrv_UnloadKeyboardLayout, loaderdrv_VkKeyScanEx, + loaderdrv_RegisterHotKey, + loaderdrv_UnregisterHotKey, /* mouse functions */ loaderdrv_SetCursor, loaderdrv_GetCursorPos, Index: dlls/user/input.c =================================================================== RCS file: /home/wine/wine/dlls/user/input.c,v retrieving revision 1.10 diff -u -r1.10 input.c --- dlls/user/input.c 27 Mar 2006 20:51:17 -0000 1.10 +++ dlls/user/input.c 7 May 2006 20:15:35 -0000 @@ -653,8 +653,10 @@ */ BOOL WINAPI RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) { - FIXME_(keyboard)("(%p,%d,0x%08x,%d): stub\n",hwnd,id,modifiers,vk); - return TRUE; + TRACE_(keyboard)("(%p,0x%x,0x%08x,0x%08x)\n",hwnd,id,modifiers,vk); + if (USER_Driver->pRegisterHotKey) + return USER_Driver->pRegisterHotKey( hwnd, id, modifiers, vk ); + return FALSE; } /*********************************************************************** @@ -662,8 +664,10 @@ */ BOOL WINAPI UnregisterHotKey(HWND hwnd,INT id) { - FIXME_(keyboard)("(%p,%d): stub\n",hwnd,id); - return TRUE; + TRACE_(keyboard)("(%p,%d)\n",hwnd,id); + if (USER_Driver->pUnregisterHotKey) + return USER_Driver->pUnregisterHotKey( hwnd, id ); + return FALSE; } /*********************************************************************** Index: dlls/user/user_private.h =================================================================== RCS file: /home/wine/wine/dlls/user/user_private.h,v retrieving revision 1.20 diff -u -r1.20 user_private.h --- dlls/user/user_private.h 10 Aug 2005 09:56:23 -0000 1.20 +++ dlls/user/user_private.h 7 May 2006 20:15:35 -0000 @@ -114,6 +114,8 @@ INT (*pToUnicodeEx)(UINT, UINT, LPBYTE, LPWSTR, int, UINT, HKL); BOOL (*pUnloadKeyboardLayout)(HKL); SHORT (*pVkKeyScanEx)(WCHAR, HKL); + BOOL (*pRegisterHotKey)(HWND, INT, UINT, UINT); + BOOL (*pUnregisterHotKey)(HWND, INT); /* mouse functions */ void (*pSetCursor)(struct tagCURSORICONINFO *); BOOL (*pGetCursorPos)(LPPOINT); Index: dlls/x11drv/keyboard.c =================================================================== RCS file: /home/wine/wine/dlls/x11drv/keyboard.c,v retrieving revision 1.90 diff -u -r1.90 keyboard.c --- dlls/x11drv/keyboard.c 20 Apr 2006 09:41:15 -0000 1.90 +++ dlls/x11drv/keyboard.c 7 May 2006 20:15:38 -0000 @@ -89,7 +89,7 @@ static int min_keycode, max_keycode, keysyms_per_keycode; static WORD keyc2vkey[256], keyc2scan[256]; -static int NumLockMask, AltGrMask; /* mask in the XKeyEvent state */ +static int NumLockMask, ScrollLockMask, AnyLockMask, AltGrMask, MetaMask, SuperMask; /* mask in the XKeyEvent state */ static int kcControl, kcAlt, kcShift, kcNumLock, kcCapsLock; /* keycodes */ static char KEYBOARD_MapDeadKeysym(KeySym keysym); @@ -1075,6 +1075,91 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x153 /* FFF8 */ }; +/*********************************************************************** + * HotKey + */ +typedef struct GRABKEY_INFO { + HWND hWnd; /* windows window to receive hot-key notification */ + INT id; /* windows identifier of hot key */ + UINT fsModifiers; /* windows key-modifier flag */ + UINT vk; /* windows virtual-key code */ + int x_keycode; /* X keycode */ + unsigned int x_modifiers; /* X modifiers */ +} GRABKEY_INFO; + +static GRABKEY_INFO * pKeys = 0; +static int nKeys = 0; +static int nKeysMax = 0; + +static int add_grab(HWND hwnd, INT id, UINT modifiers, UINT vk, unsigned int x_modifiers, int x_keycode) +{ + TRACE("(%p,%x,%x,%x,%x,%x)\n",hwnd,id,modifiers,vk,x_modifiers,x_keycode); + + if ( (pKeys == 0) || (nKeys == nKeysMax) ) { + GRABKEY_INFO * temp; + if (nKeys) + temp = (GRABKEY_INFO *)HeapReAlloc(GetProcessHeap(),0, pKeys, (nKeysMax + 10) * sizeof(GRABKEY_INFO)); + else + temp = (GRABKEY_INFO *)HeapAlloc(GetProcessHeap(),0, 10 * sizeof(GRABKEY_INFO)); + if (temp) { + pKeys = temp; + nKeysMax += 10; + } else + return False; + } + + pKeys[nKeys].hWnd = hwnd; + pKeys[nKeys].id = id; + pKeys[nKeys].fsModifiers = modifiers; + pKeys[nKeys].vk = vk; + pKeys[nKeys].x_keycode = x_keycode; + pKeys[nKeys].x_modifiers = x_modifiers; + nKeys++; + return True; +} + +static GRABKEY_INFO * find_grab(INT id) +{ + int i; + TRACE("(%x)\n", id); + for (i = 0; i < nKeys; i++) { + if (pKeys[i].id == id) + return &pKeys[i]; + } + return 0; +} + +static GRABKEY_INFO * has_grab(XKeyEvent *event) +{ + int i; + int modifiers = event->state & ~AnyLockMask; + TRACE("(%p) event->keycode=%d\n",event,event->keycode); + for (i = 0; i < nKeys; i++) { + if ((pKeys[i].x_keycode == event->keycode) && (pKeys[i].x_modifiers == modifiers)) + return &pKeys[i]; + } + return 0; +} + +static int remove_grab(INT id) +{ + int i,j; + TRACE("(%x)\n", id); + for (i = 0; i < nKeys; i++) { + if (pKeys[i].id == id) { + for (j = i; j < (nKeys - 1); j++) + pKeys[j] = pKeys[j + 1]; + nKeys--; + if (nKeys == 0) { + HeapFree(GetProcessHeap(),0, pKeys); + pKeys = 0; + nKeysMax = 0; + } + return True; + } + } + return False; +} /* Returns the Windows virtual key code associated with the X event <e> */ /* x11 lock must be held */ @@ -1325,6 +1410,15 @@ TRACE_(key)("type %d, window %lx, state 0x%04x, keycode 0x%04x\n", event->type, event->window, event->state, event->keycode); + if (event->type == KeyPress) { + GRABKEY_INFO * hotkey = has_grab(event); + + if (hotkey) { + PostMessageA(hotkey->hWnd, WM_HOTKEY, hotkey->id, MAKEWORD(hotkey->fsModifiers, hotkey->vk)); + return; + } + } + wine_tsx11_lock(); if (xic) ascii_chars = XmbLookupString(xic, event, Str, sizeof(Str), &keysym, &status); @@ -1576,15 +1670,36 @@ { int k; - for (k = 0; k < keysyms_per_keycode; k += 1) - if (XKeycodeToKeysym(display, *kcp, k) == XK_Num_Lock) - { - NumLockMask = 1 << i; + for (k = 0; k < keysyms_per_keycode; k += 1) { + KeySym sym = XKeycodeToKeysym(display, *kcp, k); + switch (sym) { + case XK_Num_Lock: + NumLockMask |= 1 << i; TRACE_(key)("NumLockMask is %x\n", NumLockMask); + break; + + case XK_Scroll_Lock: + ScrollLockMask |= 1 << i; + TRACE_(key)("ScrollLockMask is %x\n", ScrollLockMask); + break; + + case XK_Meta_L: case XK_Meta_R: + MetaMask |= 1 << i; + TRACE_(key)("MetaMask is %x\n", MetaMask); + break; + + case XK_Super_L: case XK_Super_R: + SuperMask |= 1 << i; + TRACE_(key)("SuperMask is %x\n", SuperMask); + break; + + default: break; } + } } } XFreeModifiermap(mmp); + AnyLockMask = LockMask|NumLockMask|ScrollLockMask; /* Detect the keyboard layout */ X11DRV_KEYBOARD_DetectLayout(); @@ -2521,3 +2636,98 @@ XBell(thread_display(), 0); wine_tsx11_unlock(); } + +/*********************************************************************** + * RegisterHotKey (X11DRV.@) + */ +BOOL X11DRV_RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) +{ + Display *display; + Window window; + BOOL ret; + int x_modifiers = 0, grab_mask, ungrab_mask; + int x_keycode = 0; + int err; + int keyc; + + TRACE("(%p,0x%x,0x%08x,0x%08x)\n",hwnd,id,modifiers,vk); + + display = thread_display(); + window = X11DRV_get_whole_window(hwnd); + + if (modifiers & MOD_ALT) + x_modifiers |= MetaMask; + if (modifiers & MOD_CONTROL) + x_modifiers |= ControlMask; + if (modifiers & MOD_SHIFT) + x_modifiers |= ShiftMask; + if (modifiers & MOD_WIN) + x_modifiers |= SuperMask; + + for (keyc=min_keycode; keyc<=max_keycode; keyc++) { + if ((keyc2vkey[keyc] & 0xFF) == vk) { + TRACE("keycode found\n"); + x_keycode = keyc; + break; + } + } + + if (keyc > max_keycode) { + TRACE("keycode not found\n"); + return FALSE; + } + + /* We need to register every combination of the locks to ignore them */ + wine_tsx11_lock(); + grab_mask = AnyLockMask; + do { + err = XGrabKey(display, x_keycode, x_modifiers|grab_mask, DefaultRootWindow(display), False, GrabModeAsync, GrabModeAsync); + if (err == 0) break; + grab_mask = (grab_mask-1) & AnyLockMask; + } while (grab_mask != AnyLockMask); + + if (err == 0) { + FIXME("failed to grab keycode=0x%04x modifiers=0x%04x", x_keycode, x_modifiers); + /* FIXME: set proper error value */ + SetLastError(ERROR_HOTKEY_ALREADY_REGISTERED); + /* unregister anything we succeeded in grabbing */ + ungrab_mask = AnyLockMask; + while (ungrab_mask != grab_mask) { + XUngrabKey(display, x_keycode, x_modifiers|ungrab_mask, DefaultRootWindow(display)); + ungrab_mask = (ungrab_mask-1) & AnyLockMask; + } + ret = FALSE; + } else { + add_grab(hwnd, id, modifiers, vk, x_modifiers, x_keycode); + ret = TRUE; + } + wine_tsx11_unlock(); + + return ret; +} + +/*********************************************************************** + * UnregisterHotKey (X11DRV.@) + */ +BOOL X11DRV_UnregisterHotKey(HWND hwnd,INT id) +{ + Display *display = thread_display(); + Window window = X11DRV_get_whole_window(hwnd); + GRABKEY_INFO * grab = find_grab(id); + int ungrab_mask; + + TRACE("(%lx,%d)\n",(DWORD)hwnd,id); + + if (grab) { + wine_tsx11_lock(); + ungrab_mask = AnyLockMask; + do { + XUngrabKey(display, grab->x_keycode, grab->x_modifiers|ungrab_mask, window); + ungrab_mask = (ungrab_mask-1) & AnyLockMask; + } while (ungrab_mask != AnyLockMask); + wine_tsx11_unlock(); + remove_grab(id); + return TRUE; + } + return FALSE; +} Index: dlls/x11drv/winex11.drv.spec =================================================================== RCS file: /home/wine/wine/dlls/x11drv/winex11.drv.spec,v retrieving revision 1.5 diff -u -r1.5 winex11.drv.spec --- dlls/x11drv/winex11.drv.spec 27 Mar 2006 20:51:24 -0000 1.5 +++ dlls/x11drv/winex11.drv.spec 7 May 2006 20:15:38 -0000 @@ -76,6 +76,8 @@ @ cdecl ToUnicodeEx(long long ptr ptr long long long) X11DRV_ToUnicodeEx @ cdecl UnloadKeyboardLayout(long) X11DRV_UnloadKeyboardLayout @ cdecl VkKeyScanEx(long long) X11DRV_VkKeyScanEx +@ cdecl RegisterHotKey(long long long long) X11DRV_RegisterHotKey +@ cdecl UnregisterHotKey(long long) X11DRV_UnregisterHotKey @ cdecl SetCursor(ptr) X11DRV_SetCursor @ cdecl GetCursorPos(ptr) X11DRV_GetCursorPos @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos Index: include/winbase.h =================================================================== RCS file: /home/wine/wine/include/winbase.h,v retrieving revision 1.253 diff -u -r1.253 winbase.h --- include/winbase.h 16 Mar 2006 20:41:46 -0000 1.253 +++ include/winbase.h 7 May 2006 20:15:40 -0000 @@ -1844,6 +1844,7 @@ HANDLE WINAPI RegisterEventSourceA(LPCSTR,LPCSTR); HANDLE WINAPI RegisterEventSourceW(LPCWSTR,LPCWSTR); #define RegisterEventSource WINELIB_NAME_AW(RegisterEventSource) +BOOL WINAPI RegisterHotKey(HWND,INT,UINT,UINT); BOOL WINAPI RegisterWaitForSingleObject(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,ULONG,ULONG); HANDLE WINAPI RegisterWaitForSingleObjectEx(HANDLE,WAITORTIMERCALLBACK,PVOID,ULONG,ULONG); VOID WINAPI ReleaseActCtx(HANDLE); @@ -1971,6 +1972,7 @@ BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED); #define UnlockSegment(handle) GlobalUnfix((HANDLE)(handle)) BOOL WINAPI UnmapViewOfFile(LPVOID); +BOOL WINAPI UnregisterHotKey(HWND,INT); BOOL WINAPI UnregisterWait(HANDLE); BOOL WINAPI UnregisterWaitEx(HANDLE,HANDLE); BOOL WINAPI UpdateResourceA(HANDLE,LPCSTR,LPCSTR,WORD,LPVOID,DWORD);

1 0

Re: [PATCH] handle XML_DOCUMENT_NODE like XML_ATTRIBUTE_NODE.
by Huw Davies 10 Oct '06

10 Oct '06

On Mon, Oct 09, 2006 at 07:33:15PM +0000, Marcus Meissner wrote: > --- a/dlls/msxml3/node.c > +++ b/dlls/msxml3/node.c > + case XML_DOCUMENT_NODE: /* FIXME: not sure if node() is correct for document nodes. */ Nor me. Which means we really need a test ;-) Huw.

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
27
Older →

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 October 2006