Skip to content

W
wine-winehq
Commit eb13dd42 authored by Francis Beaudet's avatar Francis Beaudet Committed by Alexandre Julliard
Browse files
Options

Removed truncating errors that happen when converting fom dialog units

to pixels.
parent c684d8ef
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
windows/dialog.c
View file @ eb13dd42
...@@ -387,10 +387,10 @@ static BOOL DIALOG_CreateControls( WND *pWnd, LPCSTR template, ...@@ -387,10 +387,10 @@ static BOOL DIALOG_CreateControls( WND *pWnd, LPCSTR template,
hwndCtrl = CreateWindowEx16( info.exStyle | WS_EX_NOPARENTNOTIFY, hwndCtrl = CreateWindowEx16( info.exStyle | WS_EX_NOPARENTNOTIFY,
info.className, info.windowName, info.className, info.windowName,
info.style | WS_CHILD, info.style | WS_CHILD,
info.x * dlgInfo->xBaseUnit / 4, MulDiv(info.x, dlgInfo->xBaseUnit, 4),
info.y * dlgInfo->yBaseUnit / 8, MulDiv(info.y, dlgInfo->yBaseUnit, 8),
info.cx * dlgInfo->xBaseUnit / 4, MulDiv(info.cx, dlgInfo->xBaseUnit, 4),
info.cy * dlgInfo->yBaseUnit / 8, MulDiv(info.cy, dlgInfo->yBaseUnit, 8),
pWnd->hwndSelf, (HMENU16)info.id, pWnd->hwndSelf, (HMENU16)info.id,
instance, info.data ); instance, info.data );
} }
...@@ -402,10 +402,10 @@ static BOOL DIALOG_CreateControls( WND *pWnd, LPCSTR template, ...@@ -402,10 +402,10 @@ static BOOL DIALOG_CreateControls( WND *pWnd, LPCSTR template,
(LPCWSTR)info.className, (LPCWSTR)info.className,
(LPCWSTR)info.windowName, (LPCWSTR)info.windowName,
info.style | WS_CHILD, info.style | WS_CHILD,
info.x * dlgInfo->xBaseUnit / 4, MulDiv(info.x, dlgInfo->xBaseUnit, 4),
info.y * dlgInfo->yBaseUnit / 8, MulDiv(info.y, dlgInfo->yBaseUnit, 8),
info.cx * dlgInfo->xBaseUnit / 4, MulDiv(info.cx, dlgInfo->xBaseUnit, 4),
info.cy * dlgInfo->yBaseUnit / 8, MulDiv(info.cy, dlgInfo->yBaseUnit, 8),
pWnd->hwndSelf, (HMENU)info.id, pWnd->hwndSelf, (HMENU)info.id,
hInst, info.data ); hInst, info.data );
} }
...@@ -677,8 +677,8 @@ HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCSTR dlgTemplate, ...@@ -677,8 +677,8 @@ HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCSTR dlgTemplate,
/* Create dialog main window */ /* Create dialog main window */
rect.left = rect.top = 0; rect.left = rect.top = 0;
rect.right = template.cx * xUnit / 4; rect.right = MulDiv(template.cx, xUnit, 4);
rect.bottom = template.cy * yUnit / 8; rect.bottom = MulDiv(template.cy, yUnit, 8);
if (template.style & DS_MODALFRAME) if (template.style & DS_MODALFRAME)
template.exStyle |= WS_EX_DLGMODALFRAME; template.exStyle |= WS_EX_DLGMODALFRAME;
AdjustWindowRectEx( &rect, template.style, AdjustWindowRectEx( &rect, template.style,
...@@ -699,8 +699,8 @@ HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCSTR dlgTemplate, ...@@ -699,8 +699,8 @@ HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCSTR dlgTemplate,
} }
else else
{ {
rect.left += template.x * xUnit / 4; rect.left += MulDiv(template.x, xUnit, 4);
rect.top += template.y * yUnit / 8; rect.top += MulDiv(template.y, yUnit, 8);
} }
if ( !(template.style & WS_CHILD) ) if ( !(template.style & WS_CHILD) )
{ {
...@@ -1740,10 +1740,10 @@ void WINAPI MapDialogRect16( HWND16 hwnd, LPRECT16 rect ) ...@@ -1740,10 +1740,10 @@ void WINAPI MapDialogRect16( HWND16 hwnd, LPRECT16 rect )
WND * wndPtr = WIN_FindWndPtr( hwnd ); WND * wndPtr = WIN_FindWndPtr( hwnd );
if (!wndPtr) return; if (!wndPtr) return;
dlgInfo = (DIALOGINFO *)wndPtr->wExtra; dlgInfo = (DIALOGINFO *)wndPtr->wExtra;
rect->left = (rect->left * dlgInfo->xBaseUnit) / 4; rect->left = MulDiv(rect->left, dlgInfo->xBaseUnit, 4);
rect->right = (rect->right * dlgInfo->xBaseUnit) / 4; rect->right = MulDiv(rect->right, dlgInfo->xBaseUnit, 4);
rect->top = (rect->top * dlgInfo->yBaseUnit) / 8; rect->top = MulDiv(rect->top, dlgInfo->yBaseUnit, 8);
rect->bottom = (rect->bottom * dlgInfo->yBaseUnit) / 8; rect->bottom = MulDiv(rect->bottom, dlgInfo->yBaseUnit, 8);
WIN_ReleaseWndPtr(wndPtr); WIN_ReleaseWndPtr(wndPtr);
} }
...@@ -1757,10 +1757,10 @@ BOOL WINAPI MapDialogRect( HWND hwnd, LPRECT rect ) ...@@ -1757,10 +1757,10 @@ BOOL WINAPI MapDialogRect( HWND hwnd, LPRECT rect )
WND * wndPtr = WIN_FindWndPtr( hwnd ); WND * wndPtr = WIN_FindWndPtr( hwnd );
if (!wndPtr) return FALSE; if (!wndPtr) return FALSE;
dlgInfo = (DIALOGINFO *)wndPtr->wExtra; dlgInfo = (DIALOGINFO *)wndPtr->wExtra;
rect->left = (rect->left * dlgInfo->xBaseUnit) / 4; rect->left = MulDiv(rect->left, dlgInfo->xBaseUnit, 4);
rect->right = (rect->right * dlgInfo->xBaseUnit) / 4; rect->right = MulDiv(rect->right, dlgInfo->xBaseUnit, 4);
rect->top = (rect->top * dlgInfo->yBaseUnit) / 8; rect->top = MulDiv(rect->top, dlgInfo->yBaseUnit, 8);
rect->bottom = (rect->bottom * dlgInfo->yBaseUnit) / 8; rect->bottom = MulDiv(rect->bottom, dlgInfo->yBaseUnit, 8);
WIN_ReleaseWndPtr(wndPtr); WIN_ReleaseWndPtr(wndPtr);
return TRUE; return TRUE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment