commit eb13dd42917b6418539b23ea611e575b05580024
author Francis Beaudet <francis@macadamian.com> Fri Sep 03 15:14:27 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Sep 03 15:14:27 1999 +0000
tree 13ea16b067d1ee51cd02f763c15fcc884a3a431a
parent c684d8ef6f34780b8c47c26018256937bf02bd9d

Removed truncating errors that happen when converting fom dialog units
to pixels.

windows/dialog.c

diff --git a/windows/dialog.c b/windows/dialog.c
index 58f195b..0a908ce 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -387,10 +387,10 @@
             hwndCtrl = CreateWindowEx16( info.exStyle | WS_EX_NOPARENTNOTIFY,
                                          info.className, info.windowName,
                                          info.style | WS_CHILD,
-                                         info.x * dlgInfo->xBaseUnit / 4,
-                                         info.y * dlgInfo->yBaseUnit / 8,
-                                         info.cx * dlgInfo->xBaseUnit / 4,
-                                         info.cy * dlgInfo->yBaseUnit / 8,
+                                         MulDiv(info.x, dlgInfo->xBaseUnit, 4),
+                                         MulDiv(info.y, dlgInfo->yBaseUnit, 8),
+                                         MulDiv(info.cx, dlgInfo->xBaseUnit, 4),
+                                         MulDiv(info.cy, dlgInfo->yBaseUnit, 8),
                                          pWnd->hwndSelf, (HMENU16)info.id,
                                          instance, info.data );
         }
@@ -402,10 +402,10 @@
                                           (LPCWSTR)info.className,
                                           (LPCWSTR)info.windowName,
                                           info.style | WS_CHILD,
-                                          info.x * dlgInfo->xBaseUnit / 4,
-                                          info.y * dlgInfo->yBaseUnit / 8,
-                                          info.cx * dlgInfo->xBaseUnit / 4,
-                                          info.cy * dlgInfo->yBaseUnit / 8,
+                                          MulDiv(info.x, dlgInfo->xBaseUnit, 4),
+                                          MulDiv(info.y, dlgInfo->yBaseUnit, 8),
+                                          MulDiv(info.cx, dlgInfo->xBaseUnit, 4),
+                                          MulDiv(info.cy, dlgInfo->yBaseUnit, 8),
                                           pWnd->hwndSelf, (HMENU)info.id,
                                           hInst, info.data );
         }
@@ -677,8 +677,8 @@
     /* Create dialog main window */
 
     rect.left = rect.top = 0;
-    rect.right = template.cx * xUnit / 4;
-    rect.bottom = template.cy * yUnit / 8;
+    rect.right = MulDiv(template.cx, xUnit, 4);
+    rect.bottom =  MulDiv(template.cy, yUnit, 8);
     if (template.style & DS_MODALFRAME)
         template.exStyle |= WS_EX_DLGMODALFRAME;
     AdjustWindowRectEx( &rect, template.style, 
@@ -699,8 +699,8 @@
         }
         else
         {
-            rect.left += template.x * xUnit / 4;
-            rect.top += template.y * yUnit / 8;
+            rect.left += MulDiv(template.x, xUnit, 4);
+            rect.top += MulDiv(template.y, yUnit, 8);
         }
         if ( !(template.style & WS_CHILD) )
 	{
@@ -1740,10 +1740,10 @@
     WND * wndPtr = WIN_FindWndPtr( hwnd );
     if (!wndPtr) return;
     dlgInfo = (DIALOGINFO *)wndPtr->wExtra;
-    rect->left   = (rect->left * dlgInfo->xBaseUnit) / 4;
-    rect->right  = (rect->right * dlgInfo->xBaseUnit) / 4;
-    rect->top    = (rect->top * dlgInfo->yBaseUnit) / 8;
-    rect->bottom = (rect->bottom * dlgInfo->yBaseUnit) / 8;
+    rect->left   = MulDiv(rect->left, dlgInfo->xBaseUnit, 4);
+    rect->right  = MulDiv(rect->right, dlgInfo->xBaseUnit, 4);
+    rect->top    = MulDiv(rect->top, dlgInfo->yBaseUnit, 8);
+    rect->bottom = MulDiv(rect->bottom, dlgInfo->yBaseUnit, 8);
     WIN_ReleaseWndPtr(wndPtr);
 }
 
@@ -1757,10 +1757,10 @@
     WND * wndPtr = WIN_FindWndPtr( hwnd );
     if (!wndPtr) return FALSE;
     dlgInfo = (DIALOGINFO *)wndPtr->wExtra;
-    rect->left   = (rect->left * dlgInfo->xBaseUnit) / 4;
-    rect->right  = (rect->right * dlgInfo->xBaseUnit) / 4;
-    rect->top    = (rect->top * dlgInfo->yBaseUnit) / 8;
-    rect->bottom = (rect->bottom * dlgInfo->yBaseUnit) / 8;
+    rect->left   = MulDiv(rect->left, dlgInfo->xBaseUnit, 4);
+    rect->right  = MulDiv(rect->right, dlgInfo->xBaseUnit, 4);
+    rect->top    = MulDiv(rect->top, dlgInfo->yBaseUnit, 8);
+    rect->bottom = MulDiv(rect->bottom, dlgInfo->yBaseUnit, 8);
     WIN_ReleaseWndPtr(wndPtr);
     return TRUE;
 }