Changeset 4800 for trunk/src

Timestamp:

Dec 16, 2000, 4:42:12 PM (25 years ago)

Author:

sandervl

Message:

edit + static control fixes

Location:

trunk/src/user32

Files:

• edit.cpp (modified) (8 diffs)
• static.cpp (modified) (4 diffs)

trunk/src/user32/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.41 2000-10-03 17:29:22 sandervl Exp $ */
+/* $Id: edit.cpp,v 1.42 2000-12-16 15:42:11 sandervl Exp $ */
 /*
  *      Edit control
@@ -21 +21 @@
     new in Win98, Win2k: for single line too
   - WinNT/Win2k: higher size limits (single: 0x7FFFFFFE, multi: none)
+    SvL: Limits removed. EM_SETTEXTLIMIT has no effect in NT4, SP6 (EM_GETTEXTLIMIT
+         only returns that value); limits are simply ignored, no EN_MAXTEXT is ever sent)
   - too many redraws and recalculations!
 */
@@ -41 +43 @@
 #define BUFLIMIT_SINGLE         32766   /* maximum buffer size (not including '\0') */
 
+#ifdef __WIN32OS2__
+#define BUFLIMIT_SINGLE_NT      0x7FFFFFFF
+#endif
 //#define BUFLIMIT_MULTI  0xFFFFFFFE
 //#define BUFLIMIT_SINGLE 0x7FFFFFFF
@@ -1281 +1286 @@
         HLOCAL hNew32;
 
+#ifndef __WIN32OS2__
         if (size > es->buffer_limit) {
                 EDIT_NOTIFY_PARENT(hwnd, EN_MAXTEXT);
                 return FALSE;
         }
+#endif
+
         if (size <= es->buffer_size)
                 return TRUE;
         size = ((size / GROWLENGTH) + 1) * GROWLENGTH;
+
+#ifndef __WIN32OS2__
         if (size > es->buffer_limit)
                 size = es->buffer_limit;
+#endif
 
         //TRACE_(edit)("trying to ReAlloc to %d+1\n", size);
@@ -1297 +1308 @@
                 es->text = (char*)HeapReAlloc(es->heap, 0, es->text, size + 1);
                 if (es->text)
+#ifdef __WIN32OS2__
+                        es->buffer_size = HeapSize(es->heap, 0, es->text) - 1;
+#else
                         es->buffer_size = MIN(HeapSize(es->heap, 0, es->text) - 1, es->buffer_limit);
+#endif
                 else
                         es->buffer_size = 0;
@@ -1305 +1320 @@
                         //TRACE_(edit)("Old 32 bit handle %08x, new handle %08x\n", es->hloc32, hNew32);
                         es->hloc = hNew32;
+#ifdef __WIN32OS2__
+                        es->buffer_size = LocalSize(es->hloc) - 1;
+#else
                         es->buffer_size = MIN(LocalSize(es->hloc) - 1, es->buffer_limit);
+#endif
                 }
         }
@@ -1975 +1994 @@
                 return 0;
         }
+#ifdef __WIN32OS2__
+        newSize = LocalSize(newBuf) - 1;
+#else
         newSize = MIN(LocalSize(newBuf) - 1, es->buffer_limit);
+#endif
         if (!(newText = (char*)LocalLock(newBuf))) {
                 //ERR_(edit)("could not lock new 32 bit buffer\n");
@@ -2669 +2692 @@
         if (es->style & ES_MULTILINE) {
                 if (limit)
+#ifdef __WIN32OS2__
+                        es->buffer_limit = limit;
+#else
                         es->buffer_limit = MIN(limit, BUFLIMIT_MULTI);
+#endif
                 else
                         es->buffer_limit = BUFLIMIT_MULTI;
         } else {
                 if (limit)
+#ifdef __WIN32OS2__
+                        es->buffer_limit = MIN(limit, BUFLIMIT_SINGLE_NT);
+#else
                         es->buffer_limit = MIN(limit, BUFLIMIT_SINGLE);
+#endif
                 else
                         es->buffer_limit = BUFLIMIT_SINGLE;

trunk/src/user32/static.cpp

@@ -1 @@
-/* $Id: static.cpp,v 1.20 2000-10-22 10:01:34 sandervl Exp $ */
+/* $Id: static.cpp,v 1.21 2000-12-16 15:42:12 sandervl Exp $ */
 /*
  * Static control
@@ -9 +9 @@
  * Corel version: 20000317
  * (WINE version: 990923)
+ *
+ * SvL:
+ * SS_REALSIZEIMAGE is supposed to prevent control resizing, but that doesn't
+ * appear to happen in NT (although the SDK docs are very clear about this)
+ * Need to figure out why. (not resizing messes up the bitmap control in
+ * the Microsoft Visual C++ 4.2 install program)
+ * Same thing happens with a very simply test app, so the installer
+ * does nothing special.
+ *
  *
  * Status:  complete
@@ -103 +112 @@
     }
 
+#if 1
+    //SvL: Breaks MS Visual C++ install dialogs with static controls (no resize)
+    if (!(dwStyle & (SS_CENTERIMAGE))) STATIC_ResizeWindow(hwnd,dwStyle,bmp.bmWidth,bmp.bmHeight);
+#else
     if (!(dwStyle & (SS_CENTERIMAGE | SS_REALSIZEIMAGE))) STATIC_ResizeWindow(hwnd,dwStyle,bmp.bmWidth,bmp.bmHeight);
+#endif
 
     if (ii.hbmColor) DeleteObject(ii.hbmColor);
@@ -133 +147 @@
     hOldBitmap = infoPtr->hIcon;
     infoPtr->hIcon = hBitmap;
+#if 1
+    //SvL: Breaks MS Visual C++ install dialogs with static controls (no resize)
+    if (hBitmap && !(dwStyle & (SS_CENTERIMAGE)))
+#else
     if (hBitmap && !(dwStyle & (SS_CENTERIMAGE | SS_REALSIZEIMAGE)))
+#endif
     {
       BITMAP bm;