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

comdlg32: Partially implement IFileDialogCustomize::EnableOpenDropDown. 

This builds a menu but cannot display it yet.
This commit is contained in:
Vincent Povirk 2015-08-18 15:40:42 -05:00 committed by Alexandre Julliard
parent 8d8e75849f
commit d3163241af
2 changed files with 91 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
dlls/comdlg32/itemdlg.c
View File

@ -65,6 +65,7 @@ enum ITEMDLG_CCTRL_TYPE {
IDLG_CCTRL_EDITBOX, IDLG_CCTRL_EDITBOX,
IDLG_CCTRL_SEPARATOR, IDLG_CCTRL_SEPARATOR,
IDLG_CCTRL_TEXT, IDLG_CCTRL_TEXT,
IDLG_CCTRL_OPENDROPDOWN,
IDLG_CCTRL_VISUALGROUP IDLG_CCTRL_VISUALGROUP
}; };
@ -139,6 +140,9 @@ typedef struct FileDialogImpl {
UINT_PTR cctrl_next_dlgid; UINT_PTR cctrl_next_dlgid;
customctrl *cctrl_active_vg; customctrl *cctrl_active_vg;
HMENU hmenu_opendropdown;
customctrl cctrl_opendropdown;
GUID client_guid; GUID client_guid;
} FileDialogImpl; } FileDialogImpl;
@ -793,6 +797,8 @@ static inline customctrl *get_cctrl(FileDialogImpl *This, DWORD ctlid)
return sub_ctrl; return sub_ctrl;
} }
if (This->hmenu_opendropdown && This->cctrl_opendropdown.id == ctlid)
return &This->cctrl_opendropdown;
TRACE("No existing control with control id %d\n", ctlid); TRACE("No existing control with control id %d\n", ctlid);
return NULL; return NULL;
@ -924,6 +930,7 @@ static void customctrl_resize(FileDialogImpl *This, customctrl *ctrl)
case IDLG_CCTRL_EDITBOX: case IDLG_CCTRL_EDITBOX:
case IDLG_CCTRL_SEPARATOR: case IDLG_CCTRL_SEPARATOR:
case IDLG_CCTRL_MENU: case IDLG_CCTRL_MENU:
case IDLG_CCTRL_OPENDROPDOWN:
/* Nothing */ /* Nothing */
break; break;
} }
@ -2013,6 +2020,8 @@ static ULONG WINAPI IFileDialog2_fnRelease(IFileDialog2 *iface)
LocalFree(This->custom_cancelbutton); LocalFree(This->custom_cancelbutton);
LocalFree(This->custom_filenamelabel); LocalFree(This->custom_filenamelabel);
DestroyMenu(This->hmenu_opendropdown);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
} }
@ -3360,8 +3369,26 @@ static HRESULT WINAPI IFileDialogCustomize_fnEnableOpenDropDown(IFileDialogCusto
DWORD dwIDCtl) DWORD dwIDCtl)
{ {
FileDialogImpl *This = impl_from_IFileDialogCustomize(iface); FileDialogImpl *This = impl_from_IFileDialogCustomize(iface);
FIXME("stub - %p (%d)\n", This, dwIDCtl); FIXME("semi-stub - %p (%d)\n", This, dwIDCtl);
return E_NOTIMPL;
if (This->hmenu_opendropdown || get_cctrl(This, dwIDCtl))
return E_UNEXPECTED;
This->hmenu_opendropdown = CreatePopupMenu();
if (!This->hmenu_opendropdown)
return E_OUTOFMEMORY;
This->cctrl_opendropdown.hwnd = NULL;
This->cctrl_opendropdown.wrapper_hwnd = NULL;
This->cctrl_opendropdown.id = dwIDCtl;
This->cctrl_opendropdown.dlgid = 0;
This->cctrl_opendropdown.type = IDLG_CCTRL_OPENDROPDOWN;
This->cctrl_opendropdown.cdcstate = CDCS_ENABLED | CDCS_VISIBLE;
list_init(&This->cctrl_opendropdown.sub_cctrls);
list_init(&This->cctrl_opendropdown.sub_items);
return S_OK;
} }
static HRESULT WINAPI IFileDialogCustomize_fnAddMenu(IFileDialogCustomize *iface, static HRESULT WINAPI IFileDialogCustomize_fnAddMenu(IFileDialogCustomize *iface,
@ -3527,6 +3554,8 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlLabel(IFileDialogCustomiz
case IDLG_CCTRL_VISUALGROUP: case IDLG_CCTRL_VISUALGROUP:
SendMessageW(ctrl->hwnd, WM_SETTEXT, 0, (LPARAM)pszLabel); SendMessageW(ctrl->hwnd, WM_SETTEXT, 0, (LPARAM)pszLabel);
break; break;
case IDLG_CCTRL_OPENDROPDOWN:
return E_NOTIMPL;
default: default:
break; break;
} }
@ -3542,7 +3571,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnGetControlState(IFileDialogCustomiz
customctrl *ctrl = get_cctrl(This, dwIDCtl); customctrl *ctrl = get_cctrl(This, dwIDCtl);
TRACE("%p (%d, %p)\n", This, dwIDCtl, pdwState); TRACE("%p (%d, %p)\n", This, dwIDCtl, pdwState);
if(!ctrl) return E_NOTIMPL; if(!ctrl || ctrl->type == IDLG_CCTRL_OPENDROPDOWN) return E_NOTIMPL;
*pdwState = ctrl->cdcstate; *pdwState = ctrl->cdcstate;
return S_OK; return S_OK;
@ -3556,7 +3585,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlState(IFileDialogCustomiz
customctrl *ctrl = get_cctrl(This,dwIDCtl); customctrl *ctrl = get_cctrl(This,dwIDCtl);
TRACE("%p (%d, %x)\n", This, dwIDCtl, dwState); TRACE("%p (%d, %x)\n", This, dwIDCtl, dwState);
if(ctrl) if(ctrl && ctrl->hwnd)
{ {
LONG wndstyle = GetWindowLongW(ctrl->hwnd, GWL_STYLE); LONG wndstyle = GetWindowLongW(ctrl->hwnd, GWL_STYLE);
@ -3589,7 +3618,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnGetEditBoxText(IFileDialogCustomize
WCHAR len, *text; WCHAR len, *text;
TRACE("%p (%d, %p)\n", This, dwIDCtl, ppszText); TRACE("%p (%d, %p)\n", This, dwIDCtl, ppszText);
if(!ctrl || !(len = SendMessageW(ctrl->hwnd, WM_GETTEXTLENGTH, 0, 0))) if(!ctrl || !ctrl->hwnd || !(len = SendMessageW(ctrl->hwnd, WM_GETTEXTLENGTH, 0, 0)))
return E_FAIL; return E_FAIL;
text = CoTaskMemAlloc(sizeof(WCHAR)*(len+1)); text = CoTaskMemAlloc(sizeof(WCHAR)*(len+1));
@ -3623,7 +3652,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnGetCheckButtonState(IFileDialogCust
customctrl *ctrl = get_cctrl(This, dwIDCtl); customctrl *ctrl = get_cctrl(This, dwIDCtl);
TRACE("%p (%d, %p)\n", This, dwIDCtl, pbChecked); TRACE("%p (%d, %p)\n", This, dwIDCtl, pbChecked);
if(ctrl) if(ctrl && ctrl->hwnd)
*pbChecked = (SendMessageW(ctrl->hwnd, BM_GETCHECK, 0, 0) == BST_CHECKED); *pbChecked = (SendMessageW(ctrl->hwnd, BM_GETCHECK, 0, 0) == BST_CHECKED);
return S_OK; return S_OK;
@ -3637,7 +3666,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetCheckButtonState(IFileDialogCust
customctrl *ctrl = get_cctrl(This, dwIDCtl); customctrl *ctrl = get_cctrl(This, dwIDCtl);
TRACE("%p (%d, %d)\n", This, dwIDCtl, bChecked); TRACE("%p (%d, %d)\n", This, dwIDCtl, bChecked);
if(ctrl) if(ctrl && ctrl->hwnd)
SendMessageW(ctrl->hwnd, BM_SETCHECK, bChecked ? BST_CHECKED:BST_UNCHECKED, 0); SendMessageW(ctrl->hwnd, BM_SETCHECK, bChecked ? BST_CHECKED:BST_UNCHECKED, 0);
return S_OK; return S_OK;
@ -3687,17 +3716,25 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddControlItem(IFileDialogCustomize
return S_OK; return S_OK;
} }
case IDLG_CCTRL_MENU: case IDLG_CCTRL_MENU:
case IDLG_CCTRL_OPENDROPDOWN:
{ {
TBBUTTON tbb;
cctrl_item* item; cctrl_item* item;
HMENU hmenu;
hr = add_item(ctrl, dwIDItem, pszLabel, &item); hr = add_item(ctrl, dwIDItem, pszLabel, &item);
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
SendMessageW(ctrl->hwnd, TB_GETBUTTON, 0, (LPARAM)&tbb); if (ctrl->type == IDLG_CCTRL_MENU)
{
TBBUTTON tbb;
SendMessageW(ctrl->hwnd, TB_GETBUTTON, 0, (LPARAM)&tbb);
hmenu = (HMENU)tbb.dwData;
}
else /* ctrl->type == IDLG_CCTRL_OPENDROPDOWN */
hmenu = This->hmenu_opendropdown;
AppendMenuW((HMENU)tbb.dwData, MF_STRING, dwIDItem, pszLabel); AppendMenuW(hmenu, MF_STRING, dwIDItem, pszLabel);
return S_OK; return S_OK;
} }
default: default:
@ -3738,8 +3775,8 @@ static HRESULT WINAPI IFileDialogCustomize_fnRemoveControlItem(IFileDialogCustom
return S_OK; return S_OK;
} }
case IDLG_CCTRL_MENU: case IDLG_CCTRL_MENU:
case IDLG_CCTRL_OPENDROPDOWN:
{ {
TBBUTTON tbb;
HMENU hmenu; HMENU hmenu;
cctrl_item* item; cctrl_item* item;
@ -3750,8 +3787,14 @@ static HRESULT WINAPI IFileDialogCustomize_fnRemoveControlItem(IFileDialogCustom
if (item->cdcstate & CDCS_VISIBLE) if (item->cdcstate & CDCS_VISIBLE)
{ {
SendMessageW(ctrl->hwnd, TB_GETBUTTON, 0, (LPARAM)&tbb); if (ctrl->type == IDLG_CCTRL_MENU)
hmenu = (HMENU)tbb.dwData; {
TBBUTTON tbb;
SendMessageW(ctrl->hwnd, TB_GETBUTTON, 0, (LPARAM)&tbb);
hmenu = (HMENU)tbb.dwData;
}
else /* ctrl->type == IDLG_CCTRL_OPENDROPDOWN */
hmenu = This->hmenu_opendropdown;
if(!hmenu || !DeleteMenu(hmenu, dwIDItem, MF_BYCOMMAND)) if(!hmenu || !DeleteMenu(hmenu, dwIDItem, MF_BYCOMMAND))
return E_UNEXPECTED; return E_UNEXPECTED;
@ -3794,6 +3837,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnGetControlItemState(IFileDialogCust
{ {
case IDLG_CCTRL_COMBOBOX: case IDLG_CCTRL_COMBOBOX:
case IDLG_CCTRL_MENU: case IDLG_CCTRL_MENU:
case IDLG_CCTRL_OPENDROPDOWN:
{ {
cctrl_item* item; cctrl_item* item;
@ -3855,8 +3899,8 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlItemState(IFileDialogCust
return S_OK; return S_OK;
} }
case IDLG_CCTRL_MENU: case IDLG_CCTRL_MENU:
case IDLG_CCTRL_OPENDROPDOWN:
{ {
TBBUTTON tbb;
HMENU hmenu; HMENU hmenu;
cctrl_item* item; cctrl_item* item;
CDCONTROLSTATEF prev_state; CDCONTROLSTATEF prev_state;
@ -3869,8 +3913,14 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlItemState(IFileDialogCust
prev_state = item->cdcstate; prev_state = item->cdcstate;
SendMessageW(ctrl->hwnd, TB_GETBUTTON, 0, (LPARAM)&tbb); if (ctrl->type == IDLG_CCTRL_MENU)
hmenu = (HMENU)tbb.dwData; {
TBBUTTON tbb;
SendMessageW(ctrl->hwnd, TB_GETBUTTON, 0, (LPARAM)&tbb);
hmenu = (HMENU)tbb.dwData;
}
else /* ctrl->type == IDLG_CCTRL_OPENDROPDOWN */
hmenu = This->hmenu_opendropdown;
if (dwState & CDCS_VISIBLE) if (dwState & CDCS_VISIBLE)
{ {
@ -4116,6 +4166,8 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p
fdimpl->client_guid = GUID_NULL; fdimpl->client_guid = GUID_NULL;
fdimpl->hmenu_opendropdown = NULL;
/* FIXME: The default folder setting should be restored for the /* FIXME: The default folder setting should be restored for the
* application if it was previously set. */ * application if it was previously set. */
SHGetDesktopFolder(&psf); SHGetDesktopFolder(&psf);

41
dlls/comdlg32/tests/itemdlg.c
View File

@ -1642,9 +1642,14 @@ static void test_customize(void)
ok(hr == S_OK, "got 0x%08x (control: %d).\n", hr, i); ok(hr == S_OK, "got 0x%08x (control: %d).\n", hr, i);
hr = IFileDialogCustomize_EnableOpenDropDown(pfdc, i); hr = IFileDialogCustomize_EnableOpenDropDown(pfdc, i);
todo_wine ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr);
hr = IFileDialogCustomize_EnableOpenDropDown(pfdc, ++i); hr = IFileDialogCustomize_EnableOpenDropDown(pfdc, ++i);
todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); ok(hr == S_OK, "got 0x%08x.\n", hr);
hr = IFileDialogCustomize_EnableOpenDropDown(pfdc, i);
ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr);
hr = IFileDialogCustomize_EnableOpenDropDown(pfdc, i+1);
ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr);
cdstate = 0xdeadbeef; cdstate = 0xdeadbeef;
hr = IFileDialogCustomize_GetControlState(pfdc, i, &cdstate); hr = IFileDialogCustomize_GetControlState(pfdc, i, &cdstate);
@ -1652,32 +1657,32 @@ static void test_customize(void)
ok(cdstate == 0xdeadbeef, "got 0x%08x.\n", cdstate); ok(cdstate == 0xdeadbeef, "got 0x%08x.\n", cdstate);
hr = IFileDialogCustomize_AddControlItem(pfdc, i, 0, label); hr = IFileDialogCustomize_AddControlItem(pfdc, i, 0, label);
todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); ok(hr == S_OK, "got 0x%08x.\n", hr);
hr = IFileDialogCustomize_AddControlItem(pfdc, i, 0, label); hr = IFileDialogCustomize_AddControlItem(pfdc, i, 0, label);
todo_wine ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr);
cdstate = 0xdeadbeef; cdstate = 0xdeadbeef;
hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate);
todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); ok(hr == S_OK, "got 0x%08x.\n", hr);
todo_wine ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate);
hr = IFileDialogCustomize_SetControlItemState(pfdc, i, 0, 0); hr = IFileDialogCustomize_SetControlItemState(pfdc, i, 0, 0);
todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); ok(hr == S_OK, "got 0x%08x.\n", hr);
cdstate = 0xdeadbeef; cdstate = 0xdeadbeef;
hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate);
todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); ok(hr == S_OK, "got 0x%08x.\n", hr);
todo_wine ok(!cdstate, "got 0x%08x.\n", cdstate); ok(!cdstate, "got 0x%08x.\n", cdstate);
hr = IFileDialogCustomize_SetControlItemState(pfdc, i, 0, CDCS_ENABLEDVISIBLE); hr = IFileDialogCustomize_SetControlItemState(pfdc, i, 0, CDCS_ENABLEDVISIBLE);
todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); ok(hr == S_OK, "got 0x%08x.\n", hr);
cdstate = 0xdeadbeef; cdstate = 0xdeadbeef;
hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate);
todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); ok(hr == S_OK, "got 0x%08x.\n", hr);
todo_wine ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate);
hr = IFileDialogCustomize_SetControlLabel(pfdc, i, label2); hr = IFileDialogCustomize_SetControlLabel(pfdc, i, label2);
todo_wine ok(hr == E_NOTIMPL, "got 0x%08x (control: %d).\n", hr, i); ok(hr == E_NOTIMPL, "got 0x%08x (control: %d).\n", hr, i);
hr = IFileDialogCustomize_AddMenu(pfdc, i, menuW); hr = IFileDialogCustomize_AddMenu(pfdc, i, menuW);
todo_wine ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr);
hr = IFileDialogCustomize_AddMenu(pfdc, ++i, label); hr = IFileDialogCustomize_AddMenu(pfdc, ++i, label);
ok(hr == S_OK, "got 0x%08x.\n", hr); ok(hr == S_OK, "got 0x%08x.\n", hr);
@ -2067,7 +2072,7 @@ static void test_customize(void)
} }
} }
hr = IFileDialogCustomize_EnableOpenDropDown(pfdc, ++i); hr = IFileDialogCustomize_EnableOpenDropDown(pfdc, ++i);
todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); ok(hr == S_OK, "got 0x%08x.\n", hr);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ {
DWORD selected = -1; DWORD selected = -1;
@ -2080,8 +2085,8 @@ static void test_customize(void)
} }
hr = IFileDialogCustomize_GetSelectedControlItem(pfdc, i, &selected); hr = IFileDialogCustomize_GetSelectedControlItem(pfdc, i, &selected);
ok(hr == S_OK, "got 0x%08x.\n", hr); todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr);
ok(selected == 0, "got %d.\n", selected); todo_wine ok(selected == 0, "got %d.\n", selected);
cdstate = 0xdeadbeef; cdstate = 0xdeadbeef;
hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate);
@ -2100,7 +2105,7 @@ static void test_customize(void)
ok(hr == S_OK, "got 0x%08x.\n", hr); ok(hr == S_OK, "got 0x%08x.\n", hr);
ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate);
hr = IFileDialogCustomize_SetSelectedControlItem(pfdc, i, 0); hr = IFileDialogCustomize_SetSelectedControlItem(pfdc, i, 0);
ok(hr == E_NOTIMPL, "got 0x%08x.\n", hr); todo_wine ok(hr == E_NOTIMPL, "got 0x%08x.\n", hr);
hr = IFileDialogCustomize_RemoveAllControlItems(pfdc, i); hr = IFileDialogCustomize_RemoveAllControlItems(pfdc, i);
ok(hr == E_NOTIMPL, "got 0x%08x.\n", hr); ok(hr == E_NOTIMPL, "got 0x%08x.\n", hr);