Changeset 2228 for trunk/src

Timestamp:

Dec 28, 1999, 6:04:24 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

Location:

trunk/src/user32

Files:

• button.cpp (modified) (9 diffs)
• edit.cpp (modified) (25 diffs)
• oslibgdi.cpp (modified) (3 diffs)
• scroll.cpp (modified) (19 diffs)
• static.cpp (modified) (5 diffs)
• text.cpp (modified) (11 diffs)

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.26 1999-12-27 22:53:51 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.27 1999-12-28 17:04:22 cbratschi Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -125 +125 @@
   DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
 
-  if (dwStyle & BS_NOTIFY && !wParam) BUTTON_SendNotify(hwnd,BN_DISABLE);
+  if ((dwStyle & BS_NOTIFY) && !wParam) BUTTON_SendNotify(hwnd,BN_DISABLE);
 
   //PAINT_BUTTON(hwnd,dwStyle & 0x0f,ODA_DRAWENTIRE);
@@ -151 +151 @@
     } else checkBoxWidth = checkBoxHeight = 0;
   }
-  if (style < 0L || style >= MAX_BTN_TYPE) return -1; /* abort */
+  if ((style < 0L) || (style >= MAX_BTN_TYPE)) return -1; /* abort */
 
   infoPtr = (BUTTONINFO*)malloc(sizeof(BUTTONINFO));
@@ -409 +409 @@
   if (dwStyle & BS_NOTIFY) BUTTON_SendNotify(hwnd,BN_SETFOCUS);
 
-  if ((style == BS_AUTORADIOBUTTON || style == BS_RADIOBUTTON) &&
+  if (((style == BS_AUTORADIOBUTTON) || (style == BS_RADIOBUTTON)) &&
       (GetCapture() != hwnd) && !(SendMessageA(hwnd,BM_GETCHECK,0,0) & BST_CHECKED))
   {
@@ -484 +484 @@
   HANDLE oldHbitmap = infoPtr->hImage;
 
-  if (dwStyle & BS_BITMAP || dwStyle & BS_ICON) infoPtr->hImage = (HANDLE)lParam;
+  if ((dwStyle & BS_BITMAP) || (dwStyle & BS_ICON)) infoPtr->hImage = (HANDLE)lParam;
 
   return oldHbitmap;
@@ -529 +529 @@
         dwStyle &= ~WS_TABSTOP;
 
-      //if (oldStyle != dwStyle) SetWindowLongA(hwnd,GWL_STYLE,dwStyle);
+      if (oldStyle != dwStyle) SetWindowLongA(hwnd,GWL_STYLE,dwStyle);
     }
     infoPtr->state = (infoPtr->state & ~3) | wParam;
@@ -775 +775 @@
      */
     textLen = GetWindowTextLengthA(hwnd);
-    if (textLen > 0 && (!(dwStyle & (BS_ICON|BS_BITMAP))))
+    if ((textLen > 0) && (!(dwStyle & (BS_ICON|BS_BITMAP))))
     {
         INT format = BUTTON_GetTextFormat(dwStyle,DT_CENTER,DT_VCENTER);
@@ -885 +885 @@
     SelectObject( hDC, hOldBrush );
 
-    if (infoPtr->state & BUTTON_HASFOCUS && IsWindowEnabled(hwnd))
+    if ((infoPtr->state & BUTTON_HASFOCUS) && IsWindowEnabled(hwnd))
     {
         InflateRect( &focus_rect, -1, -1 );
@@ -980 +980 @@
       GetWindowTextA(hwnd,text,textLen);
     }
-    if (action == ODA_DRAWENTIRE || action == ODA_SELECT)
+    if ((action == ODA_DRAWENTIRE) || (action == ODA_SELECT))
     {
         UINT state;

trunk/src/user32/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.27 1999-12-27 22:53:52 cbratschi Exp $ */
+/* $Id: edit.cpp,v 1.28 1999-12-28 17:04:22 cbratschi Exp $ */
 /*
  *      Edit control
@@ -20 +20 @@
     new in Win98, Win2k: for single line too
   - WinNT/Win2k: higher size limits (single: 0x7FFFFFFE, multi: none)
+  - too many GetDC/ReleaseDC calls -> GetDC is very slow!
+    EM_REPLACESEL: calls more than 10 times GetDC/ReleaseDC!
+    add HDC parameter
 */
 
@@ -182 +185 @@
 static INT      EDIT_WordBreakProc(LPSTR s, INT index, INT count, INT action);
 static VOID     EDIT_Draw(HWND hwnd,EDITSTATE *es,HDC hdc);
-static VOID     EDIT_Refresh(HWND hwnd,EDITSTATE *es);
+static VOID     EDIT_Refresh(HWND hwnd,EDITSTATE *es,BOOL useCache);
 
 /*
@@ -623 +626 @@
                 //DPRINTF_EDIT_MSG32("WM_ENABLE");
                 es->bEnableState = (BOOL)wParam;
-                EDIT_Refresh(hwnd,es);
+                EDIT_Refresh(hwnd,es,FALSE);
                 break;
 
@@ -767 +770 @@
 static void EDIT_BuildLineDefs_ML(HWND hwnd, EDITSTATE *es)
 {
-        HDC dc;
+        HDC dc = 0;
         HFONT old_font = 0;
         LPSTR start, cp;
@@ -782 +785 @@
         es->line_count = 0;
         es->text_width = 0;
-
-        dc = GetDC(hwnd);
-        if (es->font)
-                old_font = SelectObject(dc, es->font);
 
         fw = es->format_rect.right - es->format_rect.left;
@@ -809 +808 @@
                         current_def->net_length = cp - start;
                 }
+
+                if (!dc)
+                {
+                  dc = GetDC(hwnd);
+                  if (es->font)
+                    old_font = SelectObject(dc, es->font);
+                }
+
                 current_def->width = (INT)LOWORD(GetTabbedTextExtentA(dc,
                                         start, current_def->net_length,
@@ -857 +864 @@
                 es->line_count++;
         } while (current_def->ending != END_0);
-        if (es->font)
-                SelectObject(dc, old_font);
-        ReleaseDC(hwnd, dc);
+        if (dc)
+        {
+          if (es->font)
+                  SelectObject(dc, old_font);
+          ReleaseDC(hwnd, dc);
+        }
         EDIT_UpdateScrollBars(hwnd,es,TRUE,TRUE);
 }
@@ -905 +915 @@
 {
         INT index;
-        HDC dc;
+        HDC dc = 0;
         HFONT old_font = 0;
 
@@ -929 +939 @@
                         return line_index;
                 }
-                dc = GetDC(hwnd);
-                if (es->font)
-                        old_font = SelectObject(dc, es->font);
-                    low = line_index + 1;
-                    high = line_index + line_def->net_length + 1;
-                    while (low < high - 1)
-                    {
-                        INT mid = (low + high) / 2;
-                        if (LOWORD(GetTabbedTextExtentA(dc, es->text + line_index,mid - line_index, es->tabs_count, es->tabs)) > x) high = mid;
-                        else low = mid;
-                    }
-                    index = low;
+                low = line_index + 1;
+                high = line_index + line_def->net_length + 1;
+                if (low < high-1)
+                {
+                  if (!dc)
+                  {
+                    dc = GetDC(hwnd);
+                    if (es->font)
+                      old_font = SelectObject(dc, es->font);
+                  }
+
+                  while (low < high-1)
+                  {
+                    INT mid = (low + high) / 2;
+                    if (LOWORD(GetTabbedTextExtentA(dc, es->text + line_index,mid - line_index, es->tabs_count, es->tabs)) > x) high = mid;
+                    else low = mid;
+                  }
+                }
+                index = low;
 
                 if (after_wrap)
@@ -954 +971 @@
                         return es->x_offset;
                 text = EDIT_GetPasswordPointer_SL(hwnd, es);
-                dc = GetDC(hwnd);
-                if (es->font)
-                        old_font = SelectObject(dc, es->font);
                 if (x < 0)
                 {
-                    INT low = 0;
-                    INT high = es->x_offset;
-                    while (low < high - 1)
+                  INT low = 0;
+                  INT high = es->x_offset;
+
+                  if (low < high-1)
+                  {
+                    if (!dc)
                     {
-                        INT mid = (low + high) / 2;
-                        GetTextExtentPoint32A( dc, text + mid,
-                                               es->x_offset - mid, &size );
-                        if (size.cx > -x) low = mid;
-                        else high = mid;
+                      dc = GetDC(hwnd);
+                      if (es->font)
+                        old_font = SelectObject(dc, es->font);
                     }
-                    index = low;
-                }
-                else
+
+                    while (low < high-1)
+                    {
+                      INT mid = (low + high) / 2;
+
+                      GetTextExtentPoint32A( dc, text + mid,
+                                             es->x_offset - mid, &size );
+                      if (size.cx > -x) low = mid;
+                      else high = mid;
+                    }
+                  }
+                  index = low;
+                } else
                 {
-                    INT low = es->x_offset;
-                    INT high = lstrlenA(es->text) + 1;
-                    while (low < high - 1)
+                  INT low = es->x_offset;
+                  INT high = lstrlenA(es->text) + 1;
+
+                  if (low < high-1)
+                  {
+                    if (!dc)
                     {
-                        INT mid = (low + high) / 2;
-                        GetTextExtentPoint32A( dc, text + es->x_offset,
-                                               mid - es->x_offset, &size );
-                        if (size.cx > x) high = mid;
-                        else low = mid;
+                      dc = GetDC(hwnd);
+                      if (es->font)
+                        old_font = SelectObject(dc, es->font);
                     }
-                    index = low;
+
+                    while (low < high-1)
+                    {
+                      INT mid = (low + high) / 2;
+
+                      GetTextExtentPoint32A( dc, text + es->x_offset,
+                                             mid - es->x_offset, &size );
+                      if (size.cx > x) high = mid;
+                      else low = mid;
+                    }
+                  }
+                  index = low;
                 }
                 if (es->style & ES_PASSWORD)
                         HeapFree(es->heap, 0 ,text);
         }
-        if (es->font)
-                SelectObject(dc, old_font);
-        ReleaseDC(hwnd, dc);
+        if (dc)
+        {
+          if (es->font)
+            SelectObject(dc, old_font);
+          ReleaseDC(hwnd, dc);
+        }
         return index;
 }
@@ -1099 +1139 @@
         {
           HideCaret(hwnd);
-          InvalidateRect(hwnd, &rc, FALSE);
+          InvalidateRect(hwnd, &rc, TRUE);
           ShowCaret(hwnd);
         }
@@ -2209 +2249 @@
         INT x;
         INT y = 0;
-        HDC dc;
+        HDC dc = 0;
         HFONT old_font = 0;
         SIZE size;
 
         index = MIN(index, len);
-        dc = GetDC(hwnd);
-        if (es->font)
-                old_font = SelectObject(dc, es->font);
+        if (!dc)
+        {
+          dc = GetDC(hwnd);
+          if (es->font)
+            old_font = SelectObject(dc, es->font);
+        }
         if (es->style & ES_MULTILINE) {
                 l = EDIT_EM_LineFromChar(hwnd, es, index);
@@ -2384 +2427 @@
 
         EDIT_EM_SetSel(hwnd, es, s, s, FALSE);
+
         es->flags |= EF_MODIFIED;
         es->flags |= EF_UPDATE;
         EDIT_EM_ScrollCaret(hwnd, es);
-
         EDIT_NOTIFY_PARENT(hwnd,EN_UPDATE);
         /* FIXME: really inefficient */
-        EDIT_Refresh(hwnd,es);
+        EDIT_Refresh(hwnd,es,TRUE);
 }
 
@@ -2486 +2529 @@
                         } while ((x < goal) && es->x_offset);
                         /* FIXME: use ScrollWindow() somehow to improve performance */
-                        EDIT_Refresh(hwnd,es);
+                        EDIT_Refresh(hwnd,es,TRUE);
                         EDIT_UpdateScrollBars(hwnd,es,TRUE,FALSE);
                 } else if (x > es->format_rect.right)
@@ -2499 +2542 @@
                         } while ((x > goal) && (x_last > es->format_rect.right));
                         /* FIXME: use ScrollWindow() somehow to improve performance */
-                        EDIT_Refresh(hwnd,es);
+                        EDIT_Refresh(hwnd,es,TRUE);
                         EDIT_UpdateScrollBars(hwnd,es,TRUE,FALSE);
                 }
@@ -2564 +2607 @@
         es->flags &= ~EF_UPDATE;
         EDIT_BuildLineDefs_ML(hwnd, es);
-        EDIT_Refresh(hwnd,es);
+        EDIT_Refresh(hwnd,es,FALSE);
         EDIT_EM_ScrollCaret(hwnd, es);
         EDIT_UpdateScrollBars(hwnd,es,TRUE,TRUE);
@@ -2630 +2673 @@
                   EDIT_BuildLineDefs_ML(hwnd, es);
 
-          EDIT_Refresh(hwnd,es);
+          EDIT_Refresh(hwnd,es,FALSE);
           if (es->flags & EF_FOCUSED) {
                   DestroyCaret();
@@ -2670 +2713 @@
                 es->style &= ~ES_PASSWORD;
         }
-        EDIT_Refresh(hwnd,es);
+        EDIT_Refresh(hwnd,es,FALSE);
 }
 
@@ -2693 +2736 @@
   {
     EDIT_SetRectNP(hwnd,es,lprc);
-    EDIT_Refresh(hwnd,es);
+    EDIT_Refresh(hwnd,es,FALSE);
   }
 }
@@ -2798 +2841 @@
         if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) {
                 EDIT_BuildLineDefs_ML(hwnd, es);
-                EDIT_Refresh(hwnd,es);
+                EDIT_Refresh(hwnd,es,FALSE);
         }
 }
@@ -3719 +3762 @@
 }
 
-static VOID EDIT_Refresh(HWND hwnd,EDITSTATE *es)
+static VOID EDIT_Refresh(HWND hwnd,EDITSTATE *es,BOOL useCache)
 {
   HDC hdc,hdcCompatible;
@@ -3726 +3769 @@
 
   if (!IsWindowVisible(hwnd)) return;
+
+  if (!useCache)
+  {
+    InvalidateRect(hwnd,NULL,TRUE);
+    return;
+  }
 
   //CB: original controls redraws many times, cache drawing
@@ -3844 +3893 @@
 
         if (redraw)
-                EDIT_Refresh(hwnd,es);
+                EDIT_Refresh(hwnd,es,FALSE);
         if (es->flags & EF_FOCUSED) {
                 DestroyCaret();
@@ -3902 +3951 @@
                 SetRect(&rc, 0, 0, width, height);
                 EDIT_SetRectNP(hwnd, es, &rc);
-                EDIT_Refresh(hwnd,es);
+                EDIT_Refresh(hwnd,es,FALSE);
         }
 }

trunk/src/user32/oslibgdi.cpp

@@ -1 @@
-/* $Id: oslibgdi.cpp,v 1.5 1999-12-27 22:53:52 cbratschi Exp $ */
+/* $Id: oslibgdi.cpp,v 1.6 1999-12-28 17:04:23 cbratschi Exp $ */
 /*
  * Window GDI wrapper functions for OS/2
@@ -19 +19 @@
 #include <oslibgdi.h>
 #include <oslibwin.h>
+#include "win32wbase.h"
 
 //CB: new mapping infrastructure to avoid transformation bugs -> available soon
 
 /*
-All functions can be used to transform from Win32 to OS/2 and vice versa
+All mapScreen/Window can be used to transform from Win32 to OS/2 and vice versa
 First letter is lower case to avoid conflicts with Win32 API names
 
 Single y mapping:
  mapScreenY()
- mapWindowY()
+ mapClientY()
+ mapChildY()
 
 Single point mapping:
  mapScreenPoint()
- mapWindowPoint()
+ mapClientPoint()
+ mapChildPoint()
 
 Single rect mapping:
  mapScreenRect()
- mapWindowRect()
+ mapClientRect()
 
 Rect transformation:
@@ -43 +46 @@
 */
 
-INT mapScreenY(INT y)
-{
-  return WinQuerySysValue(HWND_DESKTOP,SV_CYSCREEN)-1-y;
-}
-//******************************************************************************
-//******************************************************************************
-INT mapScreenY(INT screenH,INT y)
-{
-  return screenH-1-y;
-}
-
+INT mapScreenY(INT screenPosY)
+{
+  return WinQuerySysValue(HWND_DESKTOP,SV_CYSCREEN)-1-screenPosY;
+}
+//******************************************************************************
+//******************************************************************************
+INT mapScreenY(INT screenH,INT screenPosY)
+{
+  return screenH-1-screenPosY;
+}
+//******************************************************************************
+//******************************************************************************
+INT mapClientY(INT clientH,INT clientPosY)
+{
+  return clientH-1-clientPosY;
+}
+//******************************************************************************
+//******************************************************************************
+INT mapClientY(HWND os2Client,INT clientPosY)
+{
+  RECTL rect;
+
+  if (os2Client == OSLIB_HWND_DESKTOP) os2Client = HWND_DESKTOP; //client shouldn't be desktop
+  if (!WinQueryWindowRect(os2Client,&rect)) return 0;
+  return rect.yTop-1-clientPosY;
+}
+//******************************************************************************
+//******************************************************************************
+INT mapClientY(Win32BaseWindow *win32wnd,INT clientPosY)
+{
+  return win32wnd->getWindowHeight()-1-clientPosY;
+}
+//******************************************************************************
+//******************************************************************************
+INT mapChildY(INT parentH,INT childY,INT childPosY)
+{
+  return parentH-1-childY-childPosY;
+}
+//******************************************************************************
+//******************************************************************************
+INT mapChildY(HWND os2Parent,INT childY,INT childPosY)
+{
+  RECTL rect;
+
+  if (os2Parent == OSLIB_HWND_DESKTOP) os2Parent = HWND_DESKTOP;
+  if (!WinQueryWindowRect(os2Parent,&rect)) return 0;
+  return rect.yTop-1-childY-childPosY;
+}
+//******************************************************************************
+//******************************************************************************
+INT mapChildY(HWND os2Parent,HWND os2Child,INT childPosY)
+{
+  RECTL rect;
+  SWP swp;
+
+  if (os2Parent == OSLIB_HWND_DESKTOP) os2Parent = HWND_DESKTOP;
+  if (!WinQueryWindowRect(os2Parent,&rect)) return 0;
+  if (!WinQueryWindowPos(os2Child,&swp)) return 0;
+  return rect.yTop-1-swp.y-childPosY;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL mapScreenPoint(OSLIBPOINT *screenPt)
+{
+  if(!screenPt) return FALSE;
+  screenPt->y = WinQuerySysValue(HWND_DESKTOP,SV_CYSCREEN)-1-screenPt->y;
+  return TRUE;
+}
+//******************************************************************************
+//******************************************************************************
+INT mapScreenY(INT screenH,OSLIBPOINT *screenPt)
+{
+  if (!screenPt) return FALSE;
+  screenPt->y = screenH-1-screenPt->y;
+  return TRUE;
+}
+
+//old mapping functions
 
 //******************************************************************************

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.29 1999-12-26 17:30:17 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.30 1999-12-28 17:04:23 cbratschi Exp $ */
 /*
  * Scrollbar control
@@ -666 +666 @@
   CREATESTRUCTA *lpCreat = (CREATESTRUCTA *)lParam;
 
-  if (!(lpCreat->style & (SBS_SIZEBOX | SBS_SIZEGRIP)) && lpCreat->style & (SBS_LEFTALIGN | SBS_RIGHTALIGN))
+  if (!(lpCreat->style & (SBS_SIZEBOX | SBS_SIZEGRIP)) && (lpCreat->style & (SBS_LEFTALIGN | SBS_RIGHTALIGN)))
   {
     if (lpCreat->style & SBS_VERT)
@@ -793 +793 @@
         SCROLL_Scrolling = TRUE;
         timerRunning = FALSE;
-        if (SCROLL_FocusWin == hwnd && SCROLL_Highlighted)
+        if ((SCROLL_FocusWin == hwnd) && SCROLL_Highlighted)
         {
           hdc = GetDC(hwnd);
@@ -892 +892 @@
 
       case SCROLL_TOP_ARROW:
-        if (msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED)
+        if ((msg == WM_LBUTTONUP) || (msg == WM_CAPTURECHANGED))
           KillSystemTimer(hwnd,SCROLL_TIMER);
-        else if (msg == WM_LBUTTONDOWN || (!timerRunning && msg == WM_SYSTIMER))
+        else if ((msg == WM_LBUTTONDOWN) || (!timerRunning && msg == WM_SYSTIMER))
         {
           SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
@@ -902 +902 @@
         }
 
-        if (msg == WM_LBUTTONDOWN || SCROLL_lastHitTest != hittest)
+        if ((msg == WM_LBUTTONDOWN) || (SCROLL_lastHitTest != hittest))
         {
           SCROLL_DrawTopArrow(hdc,infoPtr,&rect,arrowSize,vertical,(hittest == SCROLL_trackHitTest));
           SCROLL_lastHitTest = hittest;
         }
-        if (hittest == SCROLL_trackHitTest && (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER))
+        if ((hittest == SCROLL_trackHitTest) && ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)))
           SendMessageA(hwndOwner,vertical ? WM_VSCROLL:WM_HSCROLL,SB_LINEUP,hwndCtl);
 
@@ -913 +913 @@
 
       case SCROLL_TOP_RECT:
-        if (msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED)
+        if ((msg == WM_LBUTTONUP) || (msg == WM_CAPTURECHANGED))
           KillSystemTimer(hwnd,SCROLL_TIMER);
-        else if (msg == WM_LBUTTONDOWN || (!timerRunning && msg == WM_SYSTIMER))
+        else if ((msg == WM_LBUTTONDOWN) || (!timerRunning && (msg == WM_SYSTIMER)))
         {
           SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
@@ -923 +923 @@
         }
 
-        if (msg == WM_LBUTTONDOWN || SCROLL_lastHitTest != hittest)
+        if ((msg == WM_LBUTTONDOWN) || (SCROLL_lastHitTest != hittest))
         {
           SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize,
@@ -931 +931 @@
         }
 
-        if (hittest == SCROLL_trackHitTest && (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER))
+        if ((hittest == SCROLL_trackHitTest) && ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)))
           SendMessageA(hwndOwner,vertical ? WM_VSCROLL:WM_HSCROLL,SB_PAGEUP,hwndCtl);
 
@@ -946 +946 @@
             thumbTrackSent = FALSE;
             SCROLL_DrawMovingThumb(hdc, &rect, vertical, arrowSize, thumbSize);
-        } else if (msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED)
+        } else if ((msg == WM_LBUTTONUP) || (msg == WM_CAPTURECHANGED))
         {
           UINT val;
@@ -957 +957 @@
                                     trackThumbPos + lastMousePos - lastClickPos );
 
-          if (val != infoPtr->CurVal || thumbTrackSent)
+          if ((val != infoPtr->CurVal) || thumbTrackSent)
             SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
                           MAKEWPARAM( SB_THUMBPOSITION, val ), hwndCtl );
@@ -1000 +1000 @@
 
       case SCROLL_BOTTOM_RECT:
-        if (msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED)
+        if ((msg == WM_LBUTTONUP) || (msg == WM_CAPTURECHANGED))
           KillSystemTimer(hwnd,SCROLL_TIMER);
-        else if (msg == WM_LBUTTONDOWN || (!timerRunning && msg == WM_SYSTIMER))
+        else if ((msg == WM_LBUTTONDOWN) || (!timerRunning && (msg == WM_SYSTIMER)))
         {
           SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
@@ -1010 +1010 @@
         }
 
-        if (msg == WM_LBUTTONDOWN || SCROLL_lastHitTest != hittest)
+        if ((msg == WM_LBUTTONDOWN) || (SCROLL_lastHitTest != hittest))
         {
           SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize,
@@ -1018 +1018 @@
         }
 
-        if (hittest == SCROLL_trackHitTest && (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER))
+        if ((hittest == SCROLL_trackHitTest) && ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)))
           SendMessageA(hwndOwner,vertical ? WM_VSCROLL:WM_HSCROLL,SB_PAGEDOWN,hwndCtl);
 
@@ -1024 +1024 @@
 
       case SCROLL_BOTTOM_ARROW:
-        if (msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED)
+        if ((msg == WM_LBUTTONUP) || (msg == WM_CAPTURECHANGED))
           KillSystemTimer(hwnd,SCROLL_TIMER);
-        else if (msg == WM_LBUTTONDOWN || (!timerRunning && msg == WM_SYSTIMER))
+        else if ((msg == WM_LBUTTONDOWN) || (!timerRunning && (msg == WM_SYSTIMER)))
         {
           SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
@@ -1034 +1034 @@
         }
 
-        if (msg == WM_LBUTTONDOWN || SCROLL_lastHitTest != hittest)
+        if ((msg == WM_LBUTTONDOWN) || (SCROLL_lastHitTest != hittest))
         {
           SCROLL_DrawBottomArrow(hdc,infoPtr,&rect,arrowSize,vertical,(hittest == SCROLL_trackHitTest));
           SCROLL_lastHitTest = hittest;
         }
-        if (hittest == SCROLL_trackHitTest && (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER))
+        if ((hittest == SCROLL_trackHitTest) && ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)))
           SendMessageA(hwndOwner,vertical ? WM_VSCROLL:WM_HSCROLL,SB_LINEDOWN,hwndCtl);
 
@@ -1045 +1045 @@
     }
 
-    if (msg == WM_LBUTTONUP || msg == WM_CAPTURECHANGED)
+    if ((msg == WM_LBUTTONUP) || (msg == WM_CAPTURECHANGED))
     {
       SCROLL_trackHitTest = SCROLL_NOWHERE;  /* Terminate tracking */
@@ -1669 +1669 @@
       BOOL rc = FALSE;
 
-      if ((nBar == SB_VERT || nBar == SB_BOTH) && window->getStyle() & WS_VSCROLL)
+      if (((nBar == SB_VERT) || (nBar == SB_BOTH)) && (window->getStyle() & WS_VSCROLL))
       {
         HWND hwndScroll =  Win32BaseWindow::OS2ToWin32Handle(window->getVertScrollHandle());
@@ -1685 +1685 @@
         }
       }
-      if ((nBar == SB_HORZ || (rc && nBar == SB_BOTH)) && window->getStyle() & WS_HSCROLL)
+      if (((nBar == SB_HORZ) || (rc && (nBar == SB_BOTH))) && (window->getStyle() & WS_HSCROLL))
       {
         HWND hwndScroll =  Win32BaseWindow::OS2ToWin32Handle(window->getHorzScrollHandle());
@@ -1713 +1713 @@
 BOOL WINAPI GetScrollBarInfo(HWND hwnd,LONG idObject,PSCROLLBARINFO psbi)
 {
-  if (!psbi || psbi->cbSize != sizeof(SCROLLBARINFO))
+  if (!psbi || (psbi->cbSize != sizeof(SCROLLBARINFO)))
   {
     SetLastError(ERROR_INVALID_PARAMETER);

trunk/src/user32/static.cpp

@@ -1 @@
-/* $Id: static.cpp,v 1.13 1999-12-20 16:45:16 cbratschi Exp $ */
+/* $Id: static.cpp,v 1.14 1999-12-28 17:04:24 cbratschi Exp $ */
 /*
  * Static control
@@ -123 +123 @@
     if ((dwStyle & SS_TYPEMASK) != SS_BITMAP) return 0;
 
-    if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) {
+    if (hBitmap && (GetObjectType(hBitmap) != OBJ_BITMAP)) {
         //ERR("huh? hBitmap!=0, but not bitmap\n");
         return 0;
@@ -249 +249 @@
   DWORD style = GetWindowLongA(hwnd,GWL_STYLE) & SS_TYPEMASK;
 
-  if (style < 0L || style > SS_TYPEMASK)
+  if ((style < 0L) || (style > SS_TYPEMASK))
   {
     //Unknown style
@@ -268 +268 @@
   DWORD style = GetWindowLongA(hwnd,GWL_STYLE) & SS_TYPEMASK;
 
-  if (style == SS_ICON && infoPtr->hIcon)
+  if ((style == SS_ICON) && infoPtr->hIcon)
   {
     DestroyIcon(infoPtr->hIcon);
-  } else if (style == SS_BITMAP && infoPtr->hIcon)
+  } else if ((style == SS_BITMAP) && infoPtr->hIcon)
   {
     DeleteObject(infoPtr->hIcon);
-  } else if (style == SS_ENHMETAFILE && infoPtr->hIcon)
+  } else if ((style == SS_ENHMETAFILE) && infoPtr->hIcon)
   {
     DeleteEnhMetaFile((HENHMETAFILE)infoPtr->hIcon);
@@ -345 +345 @@
     STATICINFO* infoPtr = (STATICINFO*)GetInfoPtr(hwnd);
 
-    if (wParam < 4 || !lParam) return 0;
+    if ((wParam < 4) || !lParam) return 0;
     memcpy((VOID*)lParam,&infoPtr->hIcon,4);
 

trunk/src/user32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.2 1999-12-17 17:49:53 cbratschi Exp $ */
+/* $Id: text.cpp,v 1.3 1999-12-28 17:04:24 cbratschi Exp $ */
 
 /*
@@ -48 +48 @@
 INT WIN32API DrawTextA(HDC hDC,LPCSTR lpString,INT nCount,PRECT lpRect,UINT nFormat)
 {
-  dprintf2(("USER32: DrawTextA %x",hDC));
+  dprintf(("USER32: DrawTextA %x",hDC));
 
   return InternalDrawTextExA(hDC,lpString,nCount,lpRect,nFormat,NULL,FALSE);
@@ -56 +56 @@
 INT WIN32API DrawTextW(HDC hDC,LPCWSTR lpString,INT nCount,PRECT lpRect,UINT nFormat)
 {
-  dprintf2(("USER32: DrawTextW %x",hDC));
+  dprintf(("USER32: DrawTextW %x",hDC));
 
   return InternalDrawTextExW(hDC,lpString,nCount,lpRect,nFormat,NULL,FALSE);
@@ -64 +64 @@
 INT WIN32API DrawTextExA(HDC hdc,LPCSTR lpchText,INT cchText,LPRECT lprc,UINT dwDTFormat,LPDRAWTEXTPARAMS lpDTParams)
 {
-  dprintf2(("USER32:DrawTextExA %x\n",hdc));
+  dprintf(("USER32:DrawTextExA %x\n",hdc));
 
   return InternalDrawTextExA(hdc,lpchText,cchText,lprc,dwDTFormat,lpDTParams,TRUE);
@@ -72 +72 @@
 int WIN32API DrawTextExW(HDC hdc,LPWSTR lpchText,INT cchText,LPRECT lprc,UINT dwDTFormat,LPDRAWTEXTPARAMS lpDTParams)
 {
-  dprintf2(("USER32: DrawTextExW %x",hDC));
+  dprintf(("USER32: DrawTextExW %x",hdc));
 
   return InternalDrawTextExW(hdc,lpchText,cchText,lprc,dwDTFormat,lpDTParams,TRUE);
@@ -80 +80 @@
 DWORD WIN32API GetTabbedTextExtentA( HDC hDC, LPCSTR lpString, int nCount, int nTabPositions, LPINT lpnTabStopPositions)
 {
-  dprintf2(("USER32: GetTabbedTextExtentA %x",hDC));
+  dprintf(("USER32: GetTabbedTextExtentA %x",hDC));
 
   return InternalGetTabbedTextExtentA(hDC,lpString,nCount,nTabPositions,lpnTabStopPositions);
@@ -88 +88 @@
 DWORD WIN32API GetTabbedTextExtentW(HDC hDC,LPCWSTR lpString,INT nCount,INT nTabPositions,LPINT lpnTabStopPositions)
 {
-  dprintf2(("USER32: GetTabbedTextExtentW %x",hDC));
+  dprintf(("USER32: GetTabbedTextExtentW %x",hDC));
 
   return InternalGetTabbedTextExtentW(hDC,lpString,nCount,nTabPositions,lpnTabStopPositions);
@@ -96 +96 @@
 LONG WIN32API TabbedTextOutA(HDC hdc,INT x,INT y,LPCSTR lpString,INT nCount,INT nTabPositions, LPINT lpnTabStopPositions,INT nTabOrigin)
 {
-  dprintf2(("USER32: TabbedTextOutA %x",hDC));
+  dprintf(("USER32: TabbedTextOutA %x",hdc));
 
   return InternalTabbedTextOutA(hdc,x,y,lpString,nCount,nTabPositions,lpnTabStopPositions,nTabOrigin);
@@ -104 +104 @@
 LONG WIN32API TabbedTextOutW( HDC hdc, int x, int y, LPCWSTR lpString, int nCount, int nTabPositions, LPINT lpnTabStopPositions, int  nTabOrigin)
 {
-  dprintf2(("USER32: TabbedTextOutW %x",hDC));
+  dprintf(("USER32: TabbedTextOutW %x",hdc));
 
   return InternalTabbedTextOutW(hdc,x,y,lpString,nCount,nTabPositions,lpnTabStopPositions,nTabOrigin);
@@ -190 +190 @@
 BOOL WIN32API GrayStringA(HDC hdc,HBRUSH hBrush,GRAYSTRINGPROC lpOutputFunc,LPARAM lpData,int nCount,int X,int Y,int nWidth,int nHeight)
 {
-  dprintf2(("USER32: GrayStringA %x",hDC));
+  dprintf(("USER32: GrayStringA %x",hdc));
 
   return InternalGrayString(hdc,hBrush,lpOutputFunc,lpData,nCount,X,Y,nWidth,nHeight,FALSE);
@@ -198 +198 @@
 BOOL WIN32API GrayStringW(HDC hdc,HBRUSH hBrush,GRAYSTRINGPROC lpOutputFunc,LPARAM lpData,int nCount,int X,int Y,int nWidth,int nHeight)
 {
-  dprintf2(("USER32: GrayStringW %x",hDC));
+  dprintf(("USER32: GrayStringW %x",hdc));
 
   return InternalGrayString(hdc,hBrush,lpOutputFunc,lpData,nCount,X,Y,nWidth,nHeight,TRUE);