mirror of
https://github.com/reactos/reactos.git
synced 2024-09-18 08:42:34 +00:00
527f2f9057
* Create a branch for some evul shell experiments. svn path=/branches/shell-experiments/; revision=61927
72 lines
2.4 KiB
Diff
72 lines
2.4 KiB
Diff
Index: filedlg.c
|
|
===================================================================
|
|
--- filedlg.c (Revision 56893)
|
|
+++ filedlg.c (Arbeitskopie)
|
|
@@ -260,6 +260,8 @@
|
|
HRSRC hRes;
|
|
HANDLE hDlgTmpl = 0;
|
|
HRESULT hr;
|
|
+ DWORD dwSize;
|
|
+ LPDLGTEMPLATE hDialogTemplate;
|
|
|
|
/* test for missing functionality */
|
|
if (fodInfos->ofnInfos->Flags & UNIMPLEMENTED_FLAGS)
|
|
@@ -276,12 +278,17 @@
|
|
return FALSE;
|
|
}
|
|
if (!(hDlgTmpl = LoadResource(COMDLG32_hInstance, hRes )) ||
|
|
+ !(dwSize = SizeofResource(COMDLG32_hInstance, hRes )) ||
|
|
+ !(hDialogTemplate = malloc(dwSize)) ||
|
|
!(template = LockResource( hDlgTmpl )))
|
|
{
|
|
COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
|
|
return FALSE;
|
|
}
|
|
|
|
+ /* Copy the read only resource */
|
|
+ memcpy(hDialogTemplate, template, dwSize);
|
|
+
|
|
/* msdn: explorer style dialogs permit sizing by default.
|
|
* The OFN_ENABLESIZING flag is only needed when a hook or
|
|
* custom tmeplate is provided */
|
|
@@ -291,12 +298,12 @@
|
|
|
|
if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING)
|
|
{
|
|
- ((LPDLGTEMPLATEW)template)->style |= WS_SIZEBOX;
|
|
+ hDialogTemplate->style |= WS_SIZEBOX;
|
|
fodInfos->sizedlg.cx = fodInfos->sizedlg.cy = 0;
|
|
fodInfos->initial_size.x = fodInfos->initial_size.y = 0;
|
|
}
|
|
else
|
|
- ((LPDLGTEMPLATEW)template)->style &= ~WS_SIZEBOX;
|
|
+ hDialogTemplate->style &= ~WS_SIZEBOX;
|
|
|
|
|
|
/* old style hook messages */
|
|
@@ -313,19 +320,21 @@
|
|
|
|
if (fodInfos->unicode)
|
|
lRes = DialogBoxIndirectParamW(COMDLG32_hInstance,
|
|
- template,
|
|
+ hDialogTemplate,
|
|
fodInfos->ofnInfos->hwndOwner,
|
|
FileOpenDlgProc95,
|
|
(LPARAM) fodInfos);
|
|
else
|
|
lRes = DialogBoxIndirectParamA(COMDLG32_hInstance,
|
|
- template,
|
|
+ hDialogTemplate,
|
|
fodInfos->ofnInfos->hwndOwner,
|
|
FileOpenDlgProc95,
|
|
(LPARAM) fodInfos);
|
|
- if (SUCCEEDED(hr))
|
|
+ if (SUCCEEDED(hr))
|
|
OleUninitialize();
|
|
|
|
+ free(hDialogTemplate);
|
|
+
|
|
/* Unable to create the dialog */
|
|
if( lRes == -1)
|
|
return FALSE;
|