Changeset 1550 for trunk/src

Timestamp:

Nov 2, 1999, 8:13:01 PM (26 years ago)

Author:

sandervl

Message:

FS bugfixes

Location:

trunk/src/user32

Files:

• combo.cpp (modified) (2 diffs)
• dc.cpp (modified) (2 diffs)
• dc.h (modified) (2 diffs)
• edit.cpp (modified) (3 diffs)
• pmwindow.cpp (modified) (2 diffs)

trunk/src/user32/combo.cpp

@@ -1 @@
-/* $Id: combo.cpp,v 1.10 1999-10-24 22:56:01 sandervl Exp $ */
+/* $Id: combo.cpp,v 1.11 1999-11-02 19:12:59 sandervl Exp $ */
 /*
  * Combo controls
@@ -62 +62 @@
     BOOL      bRet = FALSE;
 
-//SvL: Combo bitmap is invalid
-    hComboBmp = LoadBitmapA(0, MAKEINTRESOURCEA(OBM_COMBO));
-//    hComboBmp = LoadBitmapA(hInstanceUser32, MAKEINTRESOURCEA(OBM_COMBO));
+    hComboBmp = LoadBitmapA(hInstanceUser32, MAKEINTRESOURCEA(OBM_COMBO));
     if(hComboBmp)
     {

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.18 1999-10-30 18:40:43 cbratschi Exp $ */
+/* $Id: dc.cpp,v 1.19 1999-11-02 19:13:00 sandervl Exp $ */
 
 /*
@@ -19 +19 @@
 #define INCL_DEV
 #include <os2wrap.h>
-#include <pmddi.h>
+//#include <pmddi.h>
 #include <stdlib.h>
 

trunk/src/user32/dc.h

@@ -1 @@
-/* $Id: dc.h,v 1.6 1999-10-30 18:40:44 cbratschi Exp $ */
+/* $Id: dc.h,v 1.7 1999-11-02 19:13:00 sandervl Exp $ */
 /*
  * public dc functions
@@ -410 +410 @@
 }
 
+
+   // from pmddi.h:
+   /* CopyClipRegion */
+   
+   #define COPYCRGN_ALLINTERSECT        0L
+   #define COPYCRGN_VISRGN              1L
+   #define COPYCRGN_CLIPRGN             2L
+
+   /* SetupDC */
+   
+   #define SETUPDC_VISRGN               0x00000001L
+   #define SETUPDC_ORIGIN               0x00000002L
+   #define SETUPDC_ACCUMBOUNDSON        0x00000004L
+   #define SETUPDC_ACCUMBOUNDSOFF       0x00000008L
+   #define SETUPDC_RECALCCLIP           0x00000010L
+   #define SETUPDC_SETOWNER             0x00000020L
+   #define SETUPDC_CLEANDC              0x00000040L
+
+ULONG APIENTRY Gre32Entry4(ULONG,ULONG,ULONG,ULONG);
+
+inline ULONG APIENTRY _Gre32Entry4 (ULONG a, ULONG b, ULONG c, ULONG d)
+{
+ ULONG yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = Gre32Entry4(a,b,c,d);
+    SetFS(sel);
+
+    return yyrc;
+}
+
+ULONG APIENTRY Gre32Entry5(ULONG,ULONG,ULONG,ULONG,ULONG);
+
+inline ULONG APIENTRY _Gre32Entry5 (ULONG a, ULONG b, ULONG c, ULONG d, ULONG e)
+{
+ ULONG yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = Gre32Entry5(a,b,c,d,e);
+    SetFS(sel);
+
+    return yyrc;
+}
+
+
+ULONG APIENTRY Gre32Entry6(ULONG,ULONG,ULONG,ULONG,ULONG,ULONG);
+
+inline ULONG APIENTRY _Gre32Entry6 (ULONG a, ULONG b, ULONG c, ULONG d, ULONG e, ULONG f)
+{
+ ULONG yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = Gre32Entry6(a,b,c,d,e,f);
+    SetFS(sel);
+
+    return yyrc;
+}
+
+ULONG APIENTRY Gre32Entry7(ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG);
+
+inline ULONG APIENTRY _Gre32Entry7 (ULONG a, ULONG b, ULONG c, ULONG d, ULONG e, ULONG f, ULONG g)
+{
+ ULONG yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = Gre32Entry7(a,b,c,d,e,f,g);
+    SetFS(sel);
+
+    return yyrc;
+}
+
+ULONG APIENTRY Gre32Entry8(ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG);
+
+inline ULONG APIENTRY _Gre32Entry8 (ULONG a, ULONG b, ULONG c, ULONG d, ULONG e, ULONG f, ULONG g, ULONG h)
+{
+ ULONG yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = Gre32Entry8(a,b,c,d,e,f,g,h);
+    SetFS(sel);
+
+    return yyrc;
+}
+
+
+   #define GreSetupDC(a,b,c,d,e,f) (BOOL) _Gre32Entry8((ULONG)(HDC)(a),(ULONG)(HRGN)(b),(ULONG)(LONG)(c),(ULONG)(LONG)(d),(ULONG)(PRECTL)(e),(ULONG)(ULONG)(f),0L,0x00004081L)
+   #define GreCreateRectRegion(a,b,c) (HRGN) _Gre32Entry5((ULONG)(HDC)(a),(ULONG)(PRECTL)(b),(ULONG)(LONG)(c),0L,0x00004062L)
+   #define GreGetPageUnits(a,b) (LONG) _Gre32Entry4((ULONG)(HDC)(a),(ULONG)(PULONG)(b),0L,0x00004083L)
+   #define GreCopyClipRegion(a,b,c,d) (INT) _Gre32Entry6((ULONG)(HDC)(a),(ULONG)(HRGN)(b),(ULONG)(PRECTL)(c),(ULONG)(ULONG)(d),0L,0x00004080L)
+   #define GreCombineRegion(a,b,c,d,e) (INT) _Gre32Entry7((ULONG)(HDC)(a),(ULONG)(HRGN)(b),(ULONG)(HRGN)(c),(ULONG)(HRGN)(d),(ULONG)(ULONG)(e),0L,0x00004065L)
+   #define GreDestroyRegion(a,b) (BOOL) _Gre32Entry4((ULONG)(HDC)(a),(ULONG)(HRGN)(b),0L,0x00004063L)
+
 #endif //INCLUDED_BY_DC
 

trunk/src/user32/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.9 1999-10-25 20:17:17 sandervl Exp $ */
+/* $Id: edit.cpp,v 1.10 1999-11-02 19:13:00 sandervl Exp $ */
 /*
  *      Edit control
@@ -3174 +3174 @@
         BOOL after_wrap;
 
-        //SvL: Set focus
-//        SetFocus(hwnd);
-
         if (!(es->flags & EF_FOCUSED))
                 return 0;
@@ -3462 +3459 @@
                 EDIT_InvalidateText(hwnd, es, es->selection_start, es->selection_end);
         ShowCaret(hwnd);
-//SvL: TEST
-//        EDIT_NOTIFY_PARENT(hwnd, EN_SETFOCUS, "EN_SETFOCUS");
+        EDIT_NOTIFY_PARENT(hwnd, EN_SETFOCUS, "EN_SETFOCUS");
 }
 

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.49 1999-10-31 01:23:15 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.50 1999-11-02 19:13:01 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -877 +877 @@
     // Only send this message if the window is enabled
         if (WinIsWindowEnabled(hwnd))
-    {
+        {
             if(win32wnd->MsgHitTest((*(POINTS *)&mp1).x, MapOS2ToWin32Y(OSLIB_HWND_DESKTOP, hwnd, (*(POINTS *)&mp1).y))) {
                     goto RunDefWndProc;
-        }
+            }
         }
         else    goto RunDefWndProc;