Cope with potentially moved and resized file view window
Dmitry Timoshkov
dmitry at baikal.ru
Thu Aug 21 04:20:06 CDT 2003
Hello,
Changelog:
Dmitry Timoshkov <dmitry at codeweavers.com>
Cope with potentially moved and resized file view window.
diff -u cvs/hq/wine/dlls/commdlg/filedlg95.c wine/dlls/commdlg/filedlg95.c
--- cvs/hq/wine/dlls/commdlg/filedlg95.c Tue Jul 29 18:07:41 2003
+++ wine/dlls/commdlg/filedlg95.c Thu Aug 21 18:04:30 2003
@@ -1987,10 +1987,6 @@ static HRESULT FILEDLG95_SHELL_Init(HWND
fodInfos->ShellInfos.folderSettings.fFlags |= FWF_AUTOARRANGE | FWF_ALIGNLEFT;
fodInfos->ShellInfos.folderSettings.ViewMode = FVM_LIST;
- GetWindowRect(GetDlgItem(hwnd,IDC_SHELLSTATIC),&fodInfos->ShellInfos.rectView);
- ScreenToClient(hwnd,(LPPOINT)&fodInfos->ShellInfos.rectView.left);
- ScreenToClient(hwnd,(LPPOINT)&fodInfos->ShellInfos.rectView.right);
-
/* Construct the IShellBrowser interface */
fodInfos->Shell.FOIShellBrowser = IShellBrowserImpl_Construct(hwnd);
diff -u cvs/hq/wine/dlls/commdlg/filedlgbrowser.c wine/dlls/commdlg/filedlgbrowser.c
--- cvs/hq/wine/dlls/commdlg/filedlgbrowser.c Tue Jul 22 12:23:06 2003
+++ wine/dlls/commdlg/filedlgbrowser.c Thu Aug 21 18:04:30 2003
@@ -305,6 +305,7 @@ HRESULT WINAPI IShellBrowserImpl_BrowseO
HWND hwndView;
HWND hDlgWnd;
BOOL bViewHasFocus;
+ RECT rectView;
ICOM_THIS(IShellBrowserImpl, iface);
@@ -400,11 +401,14 @@ HRESULT WINAPI IShellBrowserImpl_BrowseO
COMDLG32_UpdateCurrentDir(fodInfos);
+ GetWindowRect(GetDlgItem(This->hwndOwner, IDC_SHELLSTATIC), &rectView);
+ MapWindowPoints(0, This->hwndOwner, (LPPOINT)&rectView, 2);
+
/* Create the window */
TRACE("create view window\n");
if(FAILED(hRes = IShellView_CreateViewWindow(psvTmp, NULL,
&fodInfos->ShellInfos.folderSettings, fodInfos->Shell.FOIShellBrowser,
- &fodInfos->ShellInfos.rectView, &hwndView))) goto error;
+ &rectView, &hwndView))) goto error;
fodInfos->ShellInfos.hwndView = hwndView;
diff -u cvs/hq/wine/dlls/commdlg/filedlgbrowser.h wine/dlls/commdlg/filedlgbrowser.h
--- cvs/hq/wine/dlls/commdlg/filedlgbrowser.h Tue Jul 29 18:07:41 2003
+++ wine/dlls/commdlg/filedlgbrowser.h Thu Aug 21 18:04:30 2003
@@ -68,7 +68,6 @@ typedef struct
struct {
HWND hwndOwner;
HWND hwndView;
- RECT rectView;
FOLDERSETTINGS folderSettings;
LPITEMIDLIST pidlAbsCurrent;
LPWSTR lpstrCurrentFilter;
More information about the wine-patches
mailing list