comctl32: Use the module instance instead of that of the owner window for the toolbar configuration dialog.

This commit is contained in:
Alexandre Julliard 2009-12-21 11:20:19 +01:00
parent 29c0ecfd1c
commit 6fd93a6c7e
1 changed files with 2 additions and 13 deletions

View File

@ -3156,8 +3156,6 @@ TOOLBAR_Customize (TOOLBAR_INFO *infoPtr)
{
CUSTDLG_INFO custInfo;
LRESULT ret;
LPCVOID template;
HRSRC hRes;
NMHDR nmhdr;
custInfo.tbInfo = infoPtr;
@ -3166,17 +3164,8 @@ TOOLBAR_Customize (TOOLBAR_INFO *infoPtr)
/* send TBN_BEGINADJUST notification */
TOOLBAR_SendNotify (&nmhdr, infoPtr, TBN_BEGINADJUST);
if (!(hRes = FindResourceW (COMCTL32_hModule,
MAKEINTRESOURCEW(IDD_TBCUSTOMIZE),
(LPWSTR)RT_DIALOG)))
return FALSE;
if(!(template = LoadResource (COMCTL32_hModule, hRes)))
return FALSE;
ret = DialogBoxIndirectParamW ((HINSTANCE)GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_HINSTANCE),
template, infoPtr->hwndSelf, TOOLBAR_CustomizeDialogProc,
(LPARAM)&custInfo);
ret = DialogBoxParamW (COMCTL32_hModule, MAKEINTRESOURCEW(IDD_TBCUSTOMIZE),
infoPtr->hwndSelf, TOOLBAR_CustomizeDialogProc, (LPARAM)&custInfo);
/* send TBN_ENDADJUST notification */
TOOLBAR_SendNotify (&nmhdr, infoPtr, TBN_ENDADJUST);