Changeset 9524 for trunk/src

Timestamp:

Dec 18, 2002, 2:10:08 PM (23 years ago)

Author:

sandervl

Message:

Merged our changes/fixes

Location:

trunk/src/user32

Files:

• combo.c (modified) (2 diffs)
• edit.c (modified) (3 diffs)
• listbox.c (modified) (2 diffs)

trunk/src/user32/combo.c

@@ -1252 +1252 @@
        }
    }
+#ifdef __WIN32OS2__
+   //@PF Of course when we rollup box it is time to sync it with listview.
+   //Obvious Wine bug and even not fixed in latest versions.
+   if( CB_GETTYPE(lphc) == CBS_DROPDOWN )
+   {
+       lphc->droppedIndex = CBUpdateLBox( lphc,TRUE );
+   }
+   else
+   {
+       lphc->droppedIndex = SendMessageA( lphc->hWndLBox, LB_GETCURSEL, 0, 0 );
+
+       if( lphc->droppedIndex == LB_ERR )
+         lphc->droppedIndex = 0;
+   }
+#endif
 }
 
@@ -1270 +1285 @@
    return TRUE;
 }
+
+#ifdef __WIN32OS2__
+/***********************************************************************
+ *           COMBO_RollupListbox
+ *
+ * @@PF Odin specific function. 
+ */
+BOOL COMBO_RollupListbox( LPHEADCOMBO lphc)
+{
+   if(lphc->wState & CBF_DROPPED)
+   {
+       CBRollUp( lphc, FALSE, FALSE);
+       return TRUE;
+   }
+   return FALSE;
+}
+#endif
 
 /***********************************************************************

trunk/src/user32/edit.c

@@ -36 +36 @@
 #ifndef __WIN32OS2__
 DECLARE_DEBUG_CHANNEL(relay);
-#endif
-
+
+#define BUFLIMIT_MULTI          0x7FFFFFF       /* maximum buffer size (not including '\0')
+#define BUFLIMIT_SINGLE         0x7FFFFFF       /* maximum buffer size (not including '\0') */
+#else
 #define BUFLIMIT_MULTI          65534   /* maximum buffer size (not including '\0')
                                            FIXME: BTW, new specs say 65535 (do you dare ???) */
 #define BUFLIMIT_SINGLE         32766   /* maximum buffer size (not including '\0') */
+#endif
+
 #define GROWLENGTH              32      /* buffers granularity in bytes: must be power of 2 */
 #define ROUND_TO_GROW(size)     (((size) + (GROWLENGTH - 1)) & ~(GROWLENGTH - 1))
@@ -1840 +1844 @@
         if (size <= es->buffer_size)
                 return TRUE;
+#ifndef __WIN32OS2__
+//SvL: EM_SETTEXTLIMIT has no effect in 
+//     NT4, SP6 (EM_GETTEXTLIMIT only returns that value).
+//     Limits are simply ignored, no EN_MAXTEXT notification is ever sent.
+//     (fixes license edit control in Microsoft Visual C++ 4.2 install)
+
         if (size > es->buffer_limit) {
                 EDIT_NOTIFY_PARENT(hwnd, es, EN_MAXTEXT, "EN_MAXTEXT");
@@ -1846 +1856 @@
         if (size > es->buffer_limit)
                 size = es->buffer_limit;
+#endif
 
         TRACE("trying to ReAlloc to %d+1 characters\n", size);

trunk/src/user32/listbox.c

@@ -1743 +1743 @@
                 else  /* not a directory */
                 {
+#ifdef __WIN32OS2__
+//SvL: Must check for FILE_ATTRIBUTE_NORMAL or else files are removed from 
+//     the directory listing in common file dialogs
+#define ATTRIBS (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \
+                 FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE | FILE_ATTRIBUTE_NORMAL)
+#else
 #define ATTRIBS (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \
                  FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE)
+#endif
 
                     if ((attrib & DDL_EXCLUSIVE) &&
@@ -2057 +2064 @@
             LISTBOX_SetCaretIndex( hwnd, pDescr, pDescr->lphc->droppedIndex, FALSE );
             LISTBOX_SetSelection( hwnd, pDescr, pDescr->lphc->droppedIndex, FALSE, FALSE );
+#ifdef __WIN32OS2__
+            COMBO_RollupListbox(pDescr->lphc);
+ 
+             /* @@PF Previous code is all wrong here. Here we are supposed to close
+                and only close dropdown, instead flip, flips it. This happens because
+                previous code did not pay attention to the fact that combobox can be
+                closed with SendMessage by application, as MFC apps do     
+                COMBO_FlipListbox( pDescr->lphc, FALSE, FALSE ); */
+#else
             COMBO_FlipListbox( pDescr->lphc, FALSE, FALSE );
+#endif
             return 0;
         }