Changeset 10102 for trunk/src

Timestamp:

May 16, 2003, 11:21:00 AM (22 years ago)

Author:

sandervl

Message:

PF: Eat first WM_MOUSEMOVE while menu tracking like windows does; SvL: Use our fast critical sections instead of OS/2 mutex semaphores in the timer code

Location:

trunk/src/user32

Files:

• menu.c (modified) (2 diffs)
• timer.cpp (modified) (3 diffs)

trunk/src/user32/menu.c

@@ -2732 +2732 @@
     BOOL enterIdleSent = FALSE;
 #ifdef __WIN32OS2__
-    BOOL bSysMenu = FALSE;
+    BOOL bSysMenu = FALSE, bFirstMouseMove = TRUE;
 #endif
 
@@ -2922 +2922 @@
 
 #ifdef __WIN32OS2__
-                    if ( !fOS2Look ||
+                    //PF Win32 eats first mousemove to prevent auto-select of item
+                    //on TrackMenuPopup pressed button - verified in Win2k
+                    if (bFirstMouseMove) 
+                    { 
+                        bFirstMouseMove = FALSE; 
+                        break;
+                    }
+
+                    if (!fOS2Look ||
 #else
                     if ( (TWEAK_WineLook > WIN31_LOOK) ||

trunk/src/user32/timer.cpp

@@ -1 @@
-/* $Id: timer.cpp,v 1.14 2001-07-09 18:09:13 sandervl Exp $ */
+/* $Id: timer.cpp,v 1.15 2003-05-16 09:21:00 sandervl Exp $ */
 
 /*
@@ -23 +23 @@
 #include "oslibutil.h"
 #include "timer.h"
+#include <odincrt.h>
 
 #define DBG_LOCALLOG    DBG_timer
@@ -52 +53 @@
 static TIMER TimersArray[NB_TIMERS];
 
-HMTX hSemTimer;
+static CRITICAL_SECTION_OS2 timercritsect = {0};
 
 inline void EnterCriticalSection (void)
 {
-   if (hSemTimer == NULLHANDLE)
-      DosCreateMutexSem (NULL, &hSemTimer, 0L, 1);
-   else
-      DosRequestMutexSem (hSemTimer, SEM_INDEFINITE_WAIT);
+   if (timercritsect.hmtxLock == 0)
+      DosInitializeCriticalSection(&timercritsect, NULL);
+
+   DosEnterCriticalSection(&timercritsect);
 }
 
 inline void LeaveCriticalSection (void)
 {
-   DosReleaseMutexSem (hSemTimer);
+   DosLeaveCriticalSection(&timercritsect);
 }