ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ArrangeCtrlPositions() did not cope correctly with a templated dialog 

which has an extra 'preview' control to the right of the 'marker'
control.
FILEDLG95_Handle_GetFilePath() did not return the path - it wasn't
combining the path with the filename.
This commit is contained in:
Adam Gundy 2003-03-07 20:29:31 +00:00 committed by Alexandre Julliard
parent ed89fe7b07
commit 3ff6a487d6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/commdlg/filedlg95.c
View File

@ -550,9 +550,9 @@ void ArrangeCtrlPositions( HWND hwndChildDlg, HWND hwndParentDlg)
SetRect(&rectParent,rectParent.left,rectParent.top,rectParent.left+ptParentClient.x,rectParent.top+ptParentClient.y); SetRect(&rectParent,rectParent.left,rectParent.top,rectParent.left+ptParentClient.x,rectParent.top+ptParentClient.y);
AdjustWindowRectEx( &rectParent,GetWindowLongA(hwndParentDlg,GWL_STYLE),FALSE,GetWindowLongA(hwndParentDlg,GWL_EXSTYLE)); AdjustWindowRectEx( &rectParent,GetWindowLongA(hwndParentDlg,GWL_STYLE),FALSE,GetWindowLongA(hwndParentDlg,GWL_EXSTYLE));
SetWindowPos(hwndChildDlg, 0, 0,0, ptParentClient.x,ptParentClient.y, SWP_NOZORDER ); SetWindowPos(hwndChildDlg, 0, 0,0, ptParentClient.x + ptMoveCtl.x,ptParentClient.y + ptMoveCtl.y, SWP_NOZORDER );
SetWindowPos(hwndParentDlg, 0, rectParent.left,rectParent.top, (rectParent.right- rectParent.left), SetWindowPos(hwndParentDlg, 0, rectParent.left,rectParent.top, (rectParent.right- rectParent.left) + ptMoveCtl.x,
(rectParent.bottom-rectParent.top),SWP_NOMOVE | SWP_NOZORDER); (rectParent.bottom-rectParent.top) + ptMoveCtl.y,SWP_NOMOVE | SWP_NOZORDER);
hwndChild = GetWindow(hwndChildDlg,GW_CHILD); hwndChild = GetWindow(hwndChildDlg,GW_CHILD);
if(hwndStc32) if(hwndStc32)
@ -586,10 +586,12 @@ void ArrangeCtrlPositions( HWND hwndChildDlg, HWND hwndParentDlg)
else if (rectCtrl.left >= rectTemp.right) else if (rectCtrl.left >= rectTemp.right)
{ {
rectCtrl.left += ptMoveCtl.x; rectCtrl.left += ptMoveCtl.x;
rectCtrl.right += ptMoveCtl.x;
} }
else if (rectCtrl.top >= rectTemp.bottom) else if (rectCtrl.top >= rectTemp.bottom)
{ {
rectCtrl.top += ptMoveCtl.y; rectCtrl.top += ptMoveCtl.y;
rectCtrl.bottom += ptMoveCtl.y;
} }
SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top, SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top,
@ -618,7 +620,9 @@ void ArrangeCtrlPositions( HWND hwndChildDlg, HWND hwndParentDlg)
MapWindowPoints( 0, hwndParentDlg,(LPPOINT)&rectCtrl,2); MapWindowPoints( 0, hwndParentDlg,(LPPOINT)&rectCtrl,2);
rectCtrl.left += ptMoveCtl.x; rectCtrl.left += ptMoveCtl.x;
rectCtrl.right += ptMoveCtl.x;
rectCtrl.top += ptMoveCtl.y; rectCtrl.top += ptMoveCtl.y;
rectCtrl.bottom += ptMoveCtl.y;
SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top, SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top,
rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top, rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
@ -809,8 +813,12 @@ HRESULT FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPSTR buffer)
buffer, size, NULL, NULL); buffer, size, NULL, NULL);
if(n<size) if(n<size)
{
/* 'n' includes trailing \0 */
buffer[n-1] = '\\';
WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed, WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed,
&buffer[n], size-n, NULL, NULL); &buffer[n], size-n, NULL, NULL);
}
MemFree(lpstrFileList); MemFree(lpstrFileList);
TRACE("returned -> %s\n",debugstr_a(buffer)); TRACE("returned -> %s\n",debugstr_a(buffer));