commit 6d77d3a1df2f707ed7543febf9364152cfcde9c7
author Francois Gouget <fgouget@psn.net> Sat Mar 25 21:44:35 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Mar 25 21:44:35 2000 +0000
tree 17dbd46ac127d5268fecf2f15fa3eecaac0c9af9
parent 77c30552aae7d4afa9b8a69b839b13efaabbf7e6

Use min/max instead of MIN/MAX.

programs/winhelp/hlpfile.c

diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c
index 9948441..e15c0ae 100644
--- a/programs/winhelp/hlpfile.c
+++ b/programs/winhelp/hlpfile.c
@@ -229,7 +229,7 @@
   buf = topic.map[0] + 0xc;
   while(buf + 0xc < topic.end)
     {
-      BYTE *end = MIN(buf + GET_UINT(buf, 0), topic.end);
+      BYTE *end = min(buf + GET_UINT(buf, 0), topic.end);
       UINT next, index, offset;
 
       switch (buf[0x14])
@@ -772,7 +772,7 @@
       /* I don't know why, it's necessary for printman.hlp */
       if (ptr + 0x44 > end) ptr = end - 0x44;
 
-      newsize += HLPFILE_Uncompressed1_Size(ptr + 0xc, MIN(end, ptr + 0x1000));
+      newsize += HLPFILE_Uncompressed1_Size(ptr + 0xc, min(end, ptr + 0x1000));
     }
 
   topic.hMap    = GlobalAlloc(GMEM_FIXED, topic.wMapLen * sizeof(topic.map[0]));
@@ -788,7 +788,7 @@
       if (ptr + 0x44 > end) ptr = end - 0x44;
 
       topic.map[i] = newptr - 0xc;
-      newptr = HLPFILE_Uncompress1(ptr + 0xc, MIN(end, ptr + 0x1000), newptr);
+      newptr = HLPFILE_Uncompress1(ptr + 0xc, min(end, ptr + 0x1000), newptr);
     }
 
   return TRUE;

programs/winhelp/macro.c

diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c
index 82fd5a2..a7f6e26 100644
--- a/programs/winhelp/macro.c
+++ b/programs/winhelp/macro.c
@@ -161,7 +161,7 @@
 
   button->wParam = WH_FIRST_BUTTON;
   for (b = &win->first_button; *b; b = &(*b)->next)
-    button->wParam = MAX(button->wParam, (*b)->wParam + 1);
+    button->wParam = max(button->wParam, (*b)->wParam + 1);
   *b = button;
 
   SendMessage(win->hMainWnd, WM_USER, 0, 0);

programs/winhelp/winhelp.c

diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c
index 590deaf..d083c57 100644
--- a/programs/winhelp/winhelp.c
+++ b/programs/winhelp/winhelp.c
@@ -225,8 +225,8 @@
       origin = *mouse;
       ClientToScreen(hParentWnd, &origin);
       origin.x -= size.cx / 2;
-      origin.x  = MIN(origin.x, GetSystemMetrics(SM_CXSCREEN) - size.cx);
-      origin.x  = MAX(origin.x, 0);
+      origin.x  = min(origin.x, GetSystemMetrics(SM_CXSCREEN) - size.cx);
+      origin.x  = max(origin.x, 0);
     }
 
   /* Initialize WINHELP_WINDOW struct */
@@ -466,8 +466,8 @@
 			     lstrlen(button->lpszName), &textsize);
 	  ReleaseDC(button->hWnd, hDc);
 
-	  button_size.cx = MAX(button_size.cx, textsize.cx + BUTTON_CX);
-	  button_size.cy = MAX(button_size.cy, textsize.cy + BUTTON_CY);
+	  button_size.cx = max(button_size.cx, textsize.cx + BUTTON_CX);
+	  button_size.cy = max(button_size.cy, textsize.cy + BUTTON_CY);
 	}
 
       x = 0;
@@ -787,13 +787,13 @@
 	      textlen = low;
 	      while (textlen && text[textlen] && text[textlen] != ' ') textlen--;
 	    }
-	  if (!part && !textlen) textlen = MAX(low, 1);
+	  if (!part && !textlen) textlen = max(low, 1);
 
 	  if (free_width <= 0 || !textlen)
 	    {
 	      part = 0;
 	      space.cx = rect.left + indent;
-	      space.cx = MIN(space.cx, rect.right - rect.left - 1);
+	      space.cx = min(space.cx, rect.right - rect.left - 1);
 	      continue;
 	    }
 
@@ -807,7 +807,7 @@
 	    }
 
 	  if (newsize)
-	    newsize->cx = MAX(newsize->cx, (*line)->rect.right + INTERNAL_BORDER_WIDTH);
+	    newsize->cx = max(newsize->cx, (*line)->rect.right + INTERNAL_BORDER_WIDTH);
 
 	  len -= textlen;
 	  text += textlen;
@@ -892,7 +892,7 @@
   part->rect.top      =
     ((*partp) ? line->rect.top : line->rect.bottom) + *line_ascent - ascent;
   part->rect.bottom   = part->rect.top + textsize->cy;
-  line->rect.bottom   = MAX(line->rect.bottom, part->rect.bottom);
+  line->rect.bottom   = max(line->rect.bottom, part->rect.bottom);
   part->hSelf         = handle;
   part->lpsText       = ptr;
   part->wTextLen      = textlen;