Changeset 4408 for trunk/src

Timestamp:

Oct 3, 2000, 7:29:22 PM (25 years ago)

Author:

sandervl

Message:

EnumDisplaySettingsA fix + edit fix (numeric keys)

Location:

trunk/src/user32

Files:

• display.cpp (modified) (4 diffs)
• edit.cpp (modified) (2 diffs)

trunk/src/user32/display.cpp

@@ -1 @@
-/* $Id: display.cpp,v 1.7 2000-08-02 17:32:27 bird Exp $ */
+/* $Id: display.cpp,v 1.8 2000-10-03 17:29:20 sandervl Exp $ */
 /*
  * Display/Monitor Win32 apis
@@ -16 +16 @@
 #include <os2win.h>
 #include <misc.h>
+#include <string.h>
 #include <heapstring.h>
 #include "pmwindow.h"
@@ -280 +281 @@
         LPCSTR name,            /* [in] huh? */
         DWORD n,                /* [in] nth entry in display settings list*/
-        LPDEVMODEA devmode      /* [out] devmode for that setting */
-)
-{
-        dprintf(("USER32:  EnumDisplaySettingsA %d", n));
-        if (n==0) {
+        LPDEVMODEA devmode)     /* [out] devmode for that setting */
+{
+        dprintf(("USER32: EnumDisplaySettingsA %s %d %x", name, n, devmode));
+        if(devmode == NULL) {
+                SetLastError(ERROR_INVALID_PARAMETER);
+                return FALSE;
+        }
+        //SvL: VMWare calls this with -1; valid in NT4, SP6
+        //     Other negative numbers too. Don't know what they mean.
+        if(n == 0xFFFFFFFF) {
+                n = 0;
+        }
+        memset(devmode, 0, sizeof(*devmode));
+        devmode->dmSize = sizeof(*devmode);
+        if(n==0) {
                 devmode->dmBitsPerPel = ScreenBitsPerPel;
                 devmode->dmPelsHeight = ScreenHeight;
@@ -296 +307 @@
                 return TRUE;
         }
+        SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
 }

trunk/src/user32/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.40 2000-09-29 22:28:10 sandervl Exp $ */
+/* $Id: edit.cpp,v 1.41 2000-10-03 17:29:22 sandervl Exp $ */
 /*
  *      Edit control
@@ -3011 +3011 @@
                   if (es->style & ES_NUMBER)
                   {
-                    if (((BYTE)c < '0') || ((BYTE)c > '9')) MessageBeep(MB_ICONEXCLAMATION);
-                    return;
+                        if (((BYTE)c < '0') || ((BYTE)c > '9')) {
+                                MessageBeep(MB_ICONEXCLAMATION);
+                                return;
+                        }
                   }
                   str[0] = c;