Ken Thomases : winex11.drv: Move some dead code from inside a loop to just after the loop.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Nov 20 05:52:58 CST 2006


Module: wine
Branch: master
Commit: fac3dc60756b3586e7df20099c21eebea321e4ac
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fac3dc60756b3586e7df20099c21eebea321e4ac

Author: Ken Thomases <ken at codeweavers.com>
Date:   Fri Nov 17 14:46:46 2006 -0600

winex11.drv: Move some dead code from inside a loop to just after the loop.

---

 dlls/winex11.drv/keyboard.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index a542fd5..7256edd 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -1664,6 +1664,15 @@ void X11DRV_InitKeyboard(void)
 		vkey = (*lvkey)[maxval];
 	      }
 	    }
+        }
+        TRACE("keycode %04x => vkey %04x\n", e2.keycode, vkey);
+        keyc2vkey[e2.keycode] = vkey;
+        keyc2scan[e2.keycode] = scan;
+        if ((vkey & 0xff) && vkey_used[(vkey & 0xff)])
+            WARN("vkey %04x is being used by more than one keycode\n", vkey);
+        vkey_used[(vkey & 0xff)] = 1;
+    } /* for */
+
 #if 0 /* this breaks VK_OEM_x VKeys in some layout tables by inserting
        * a VK code into a not appropriate place.
        */
@@ -1729,14 +1738,6 @@ void X11DRV_InitKeyboard(void)
                 }
             }
 #endif
-        }
-        TRACE("keycode %04x => vkey %04x\n", e2.keycode, vkey);
-        keyc2vkey[e2.keycode] = vkey;
-        keyc2scan[e2.keycode] = scan;
-        if ((vkey & 0xff) && vkey_used[(vkey & 0xff)])
-            WARN("vkey %04x is being used by more than one keycode\n", vkey);
-        vkey_used[(vkey & 0xff)] = 1;
-    } /* for */
 
     /* If some keys still lack scancodes, assign some arbitrary ones to them now */
     for (scan = 0x60, keyc = min_keycode; keyc <= max_keycode; keyc++)




More information about the wine-cvs mailing list