May 2011 - Wine-Commits - list.winehq.org

David Hedberg : comdlg32: Add support for custom control events.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: 2a863985e06761228e403e50abc04f81e78953f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a863985e06761228e403e50a… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri May 27 04:05:55 2011 +0200 comdlg32: Add support for custom control events. --- dlls/comdlg32/itemdlg.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 167 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 78d6608..f8324f9 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -194,6 +194,88 @@ static void events_OnSelectionChange(FileDialogImpl *This) } } +static inline HRESULT get_cctrl_event(IFileDialogEvents *pfde, IFileDialogControlEvents **pfdce) +{ + return IFileDialogEvents_QueryInterface(pfde, &IID_IFileDialogControlEvents, (void**)pfdce); +} + +static HRESULT cctrl_event_OnButtonClicked(FileDialogImpl *This, DWORD ctl_id) +{ + events_client *cursor; + TRACE("%p\n", This); + + LIST_FOR_EACH_ENTRY(cursor, &This->events_clients, events_client, entry) + { + IFileDialogControlEvents *pfdce; + if(SUCCEEDED(get_cctrl_event(cursor->pfde, &pfdce))) + { + TRACE("Notifying %p\n", cursor); + IFileDialogControlEvents_OnButtonClicked(pfdce, &This->IFileDialogCustomize_iface, ctl_id); + IFileDialogControlEvents_Release(pfdce); + } + } + + return S_OK; +} + +static HRESULT cctrl_event_OnItemSelected(FileDialogImpl *This, DWORD ctl_id, DWORD item_id) +{ + events_client *cursor; + TRACE("%p\n", This); + + LIST_FOR_EACH_ENTRY(cursor, &This->events_clients, events_client, entry) + { + IFileDialogControlEvents *pfdce; + if(SUCCEEDED(get_cctrl_event(cursor->pfde, &pfdce))) + { + TRACE("Notifying %p\n", cursor); + IFileDialogControlEvents_OnItemSelected(pfdce, &This->IFileDialogCustomize_iface, ctl_id, item_id); + IFileDialogControlEvents_Release(pfdce); + } + } + + return S_OK; +} + +static HRESULT cctrl_event_OnCheckButtonToggled(FileDialogImpl *This, DWORD ctl_id, BOOL checked) +{ + events_client *cursor; + TRACE("%p\n", This); + + LIST_FOR_EACH_ENTRY(cursor, &This->events_clients, events_client, entry) + { + IFileDialogControlEvents *pfdce; + if(SUCCEEDED(get_cctrl_event(cursor->pfde, &pfdce))) + { + TRACE("Notifying %p\n", cursor); + IFileDialogControlEvents_OnCheckButtonToggled(pfdce, &This->IFileDialogCustomize_iface, ctl_id, checked); + IFileDialogControlEvents_Release(pfdce); + } + } + + return S_OK; +} + +static HRESULT cctrl_event_OnControlActivating(FileDialogImpl *This, + DWORD ctl_id) +{ + events_client *cursor; + TRACE("%p\n", This); + + LIST_FOR_EACH_ENTRY(cursor, &This->events_clients, events_client, entry) + { + IFileDialogControlEvents *pfdce; + if(SUCCEEDED(get_cctrl_event(cursor->pfde, &pfdce))) + { + TRACE("Notifying %p\n", cursor); + IFileDialogControlEvents_OnControlActivating(pfdce, &This->IFileDialogCustomize_iface, ctl_id); + IFileDialogControlEvents_Release(pfdce); + } + } + + return S_OK; +} + /************************************************************************** * Helper functions. */ @@ -568,14 +650,99 @@ static LRESULT notifysink_on_create(HWND hwnd, CREATESTRUCTW *crs) return TRUE; } +static LRESULT notifysink_on_bn_clicked(FileDialogImpl *This, HWND hwnd, WPARAM wparam) +{ + customctrl *ctrl = get_cctrl_from_dlgid(This, LOWORD(wparam)); + + TRACE("%p, %lx\n", This, wparam); + + if(ctrl) + { + if(ctrl->type == IDLG_CCTRL_CHECKBUTTON) + { + BOOL checked = (SendMessageW(ctrl->hwnd, BM_GETCHECK, 0, 0) == BST_CHECKED); + cctrl_event_OnCheckButtonToggled(This, ctrl->id, checked); + } + else + cctrl_event_OnButtonClicked(This, ctrl->id); + } + + return TRUE; +} + +static LRESULT notifysink_on_cbn_selchange(FileDialogImpl *This, HWND hwnd, WPARAM wparam) +{ + customctrl *ctrl = get_cctrl_from_dlgid(This, LOWORD(wparam)); + TRACE("%p, %p (%lx)\n", This, ctrl, wparam); + + if(ctrl) + { + UINT index = SendMessageW(ctrl->hwnd, CB_GETCURSEL, 0, 0); + UINT selid = SendMessageW(ctrl->hwnd, CB_GETITEMDATA, index, 0); + + cctrl_event_OnItemSelected(This, ctrl->id, selid); + } + return TRUE; +} + +static LRESULT notifysink_on_tvn_dropdown(FileDialogImpl *This, LPARAM lparam) +{ + NMTOOLBARW *nmtb = (NMTOOLBARW*)lparam; + customctrl *ctrl = get_cctrl_from_dlgid(This, GetDlgCtrlID(nmtb->hdr.hwndFrom)); + POINT pt = { 0, nmtb->rcButton.bottom }; + TBBUTTON tbb; + UINT idcmd; + + TRACE("%p, %p (%lx)\n", This, ctrl, lparam); + + if(ctrl) + { + cctrl_event_OnControlActivating(This,ctrl->id); + + SendMessageW(ctrl->hwnd, TB_GETBUTTON, 0, (LPARAM)&tbb); + ClientToScreen(ctrl->hwnd, &pt); + idcmd = TrackPopupMenu((HMENU)tbb.dwData, TPM_RETURNCMD, pt.x, pt.y, 0, This->dlg_hwnd, NULL); + if(idcmd) + cctrl_event_OnItemSelected(This, ctrl->id, idcmd); + } + + return TBDDRET_DEFAULT; +} + +static LRESULT notifysink_on_wm_command(FileDialogImpl *This, HWND hwnd, WPARAM wparam, LPARAM lparam) +{ + switch(HIWORD(wparam)) + { + case BN_CLICKED: return notifysink_on_bn_clicked(This, hwnd, wparam); + case CBN_SELCHANGE: return notifysink_on_cbn_selchange(This, hwnd, wparam); + } + + return FALSE; +} + +static LRESULT notifysink_on_wm_notify(FileDialogImpl *This, HWND hwnd, WPARAM wparam, LPARAM lparam) +{ + NMHDR *nmhdr = (NMHDR*)lparam; + + switch(nmhdr->code) + { + case TBN_DROPDOWN: return notifysink_on_tvn_dropdown(This, lparam); + } + + return FALSE; +} + static LRESULT CALLBACK notifysink_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { + FileDialogImpl *This = (FileDialogImpl*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); HWND hwnd_child; RECT rc; switch(message) { case WM_NCCREATE: return notifysink_on_create(hwnd, (CREATESTRUCTW*)lparam); + case WM_COMMAND: return notifysink_on_wm_command(This, hwnd, wparam, lparam); + case WM_NOTIFY: return notifysink_on_wm_notify(This, hwnd, wparam, lparam); case WM_SIZE: hwnd_child = GetPropW(hwnd, notifysink_childW); GetClientRect(hwnd, &rc);

1 0

David Hedberg : comdlg32: Layout the customized controls.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: bb2230f0e8a287a70f56ff582d410b93f44d081b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb2230f0e8a287a70f56ff582… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri May 27 04:05:52 2011 +0200 comdlg32: Layout the customized controls. --- dlls/comdlg32/itemdlg.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 157 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 40e785c..5acf3d2 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -536,6 +536,29 @@ static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width) HeapFree(GetProcessHeap(), 0, text); } +static void customctrl_resize(FileDialogImpl *This, customctrl *ctrl) +{ + RECT rc; + + switch(ctrl->type) + { + case IDLG_CCTRL_PUSHBUTTON: + case IDLG_CCTRL_COMBOBOX: + case IDLG_CCTRL_CHECKBUTTON: + case IDLG_CCTRL_TEXT: + ctrl_resize(ctrl->hwnd, 160, 160); + GetWindowRect(ctrl->hwnd, &rc); + SetWindowPos(ctrl->wrapper_hwnd, NULL, 0, 0, rc.right-rc.left, rc.bottom-rc.top, + SWP_NOZORDER|SWP_NOMOVE|SWP_NOZORDER); + case IDLG_CCTRL_RADIOBUTTONLIST: + case IDLG_CCTRL_EDITBOX: + case IDLG_CCTRL_SEPARATOR: + case IDLG_CCTRL_MENU: + /* Nothing */ + break; + } +} + static LRESULT notifysink_on_create(HWND hwnd, CREATESTRUCTW *crs) { FileDialogImpl *This = crs->lpCreateParams; @@ -613,7 +636,126 @@ static HRESULT cctrl_create_new(FileDialogImpl *This, DWORD id, */ static UINT ctrl_container_resize(FileDialogImpl *This, UINT container_width) { - return 0; + UINT container_height; + UINT column_width; + UINT nr_of_cols; + UINT max_control_height, total_height = 0; + UINT cur_col_pos, cur_row_pos; + customctrl *ctrl; + BOOL fits_height; + static const UINT col_indent = 100; /* The first column is indented 100px */ + static const UINT cspacing = 90; /* Columns are spaced with 90px */ + static const UINT rspacing = 4; /* Rows are spaced with 4 px. */ + + /* Given the new width of the container, this function determines the + * needed height of the container and places the controls according to + * the new layout. Returns the new height. + */ + + TRACE("%p\n", This); + + column_width = This->cctrl_width + cspacing; + nr_of_cols = (container_width - col_indent + cspacing) / column_width; + + /* We don't need to do anything unless the number of visible columns has changed. */ + if(nr_of_cols == This->cctrls_cols) + { + RECT rc; + GetWindowRect(This->cctrls_hwnd, &rc); + return rc.bottom - rc.top; + } + + This->cctrls_cols = nr_of_cols; + + /* Get the size of the tallest control, and the total size of + * all the controls to figure out the number of slots we need. + */ + max_control_height = 0; + LIST_FOR_EACH_ENTRY(ctrl, &This->cctrls, customctrl, entry) + { + if(ctrl->cdcstate & CDCS_VISIBLE) + { + RECT rc; + UINT control_height; + GetWindowRect(ctrl->wrapper_hwnd, &rc); + control_height = rc.bottom - rc.top; + max_control_height = max(max_control_height, control_height); + + total_height += control_height + rspacing; + } + } + + if(!total_height) + return 0; + + container_height = max(total_height / nr_of_cols, max_control_height + rspacing); + TRACE("Guess: container_height: %d\n",container_height); + + /* Incrementally increase container_height until all the controls + * fit. + */ + do { + UINT columns_needed = 1; + cur_row_pos = 0; + + fits_height = TRUE; + LIST_FOR_EACH_ENTRY(ctrl, &This->cctrls, customctrl, entry) + { + if(ctrl->cdcstate & CDCS_VISIBLE) + { + RECT rc; + UINT control_height; + GetWindowRect(ctrl->wrapper_hwnd, &rc); + control_height = rc.bottom - rc.top; + + if(cur_row_pos + control_height > container_height) + { + if(++columns_needed > nr_of_cols) + { + container_height += 1; + fits_height = FALSE; + break; + } + cur_row_pos = 0; + } + + cur_row_pos += control_height + rspacing; + } + } + } while(!fits_height); + + TRACE("Final container height: %d\n", container_height); + + /* Move the controls to their final destination + */ + cur_col_pos = col_indent, cur_row_pos = 0; + LIST_FOR_EACH_ENTRY(ctrl, &This->cctrls, customctrl, entry) + { + if(ctrl->cdcstate & CDCS_VISIBLE) + { + RECT rc; + UINT control_height; + GetWindowRect(ctrl->wrapper_hwnd, &rc); + control_height = rc.bottom - rc.top; + + if(cur_row_pos + control_height > container_height) + { + cur_row_pos = 0; + cur_col_pos += This->cctrl_width + cspacing; + } + + SetWindowPos(ctrl->wrapper_hwnd, NULL, cur_col_pos, cur_row_pos, 0, 0, + SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER); + + cur_row_pos += control_height + rspacing; + } + } + + /* Sanity check */ + if(cur_row_pos + This->cctrl_width > container_width) + ERR("-- Failed to place controls properly.\n"); + + return container_height; } static void ctrl_container_reparent(FileDialogImpl *This, HWND parent) @@ -622,6 +764,9 @@ static void ctrl_container_reparent(FileDialogImpl *This, HWND parent) if(parent) { + customctrl *ctrl; + HFONT font; + wndstyle = GetWindowLongW(This->cctrls_hwnd, GWL_STYLE); wndstyle &= ~(WS_POPUP); wndstyle |= WS_CHILD; @@ -629,6 +774,17 @@ static void ctrl_container_reparent(FileDialogImpl *This, HWND parent) SetParent(This->cctrls_hwnd, parent); ShowWindow(This->cctrls_hwnd, TRUE); + + /* Set the fonts to match the dialog font. */ + font = (HFONT)SendMessageW(parent, WM_GETFONT, 0, 0); + if(!font) + ERR("Failed to get font handle from dialog.\n"); + + LIST_FOR_EACH_ENTRY(ctrl, &This->cctrls, customctrl, entry) + { + if(font) SendMessageW(ctrl->hwnd, WM_SETFONT, (WPARAM)font, TRUE); + customctrl_resize(This, ctrl); + } } else {

1 0

David Hedberg : comdlg32: Implement support for custom control subitems.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: d4f0aa2bb2b856c8cde0d227a1a721af0e4fe27a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4f0aa2bb2b856c8cde0d227a… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri May 27 04:05:54 2011 +0200 comdlg32: Implement support for custom control subitems. --- dlls/comdlg32/itemdlg.c | 141 +++++++++++++++++++- dlls/comdlg32/tests/itemdlg.c | 288 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 422 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4f0aa2bb2b856c8cde0d…

1 0

David Hedberg : comdlg32: Take linebreaks into account when resizing custom controls.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: d5a1014ed53ccdce63e99ea5ea9c2637ef72c84a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a1014ed53ccdce63e99ea5e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri May 27 04:05:56 2011 +0200 comdlg32: Take linebreaks into account when resizing custom controls. --- dlls/comdlg32/itemdlg.c | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index f8324f9..7e9d0a1 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -591,13 +591,15 @@ static inline customctrl *get_cctrl(FileDialogImpl *This, DWORD ctlid) return NULL; } -static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width) +static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width, BOOL multiline) { LPWSTR text; UINT len, final_width; + UINT lines, final_height; SIZE size; RECT rc; HDC hdc; + WCHAR *c; TRACE("\n"); @@ -610,9 +612,22 @@ static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width) GetTextExtentPoint32W(hdc, text, lstrlenW(text), &size); ReleaseDC(hctrl, hdc); - GetWindowRect(hctrl, &rc); + if(len && multiline) + { + /* FIXME: line-wrap */ + for(lines = 1, c = text; *c != '\0'; c++) + if(*c == '\n') lines++; + + final_height = size.cy*lines + 2*4; + } + else + { + GetWindowRect(hctrl, &rc); + final_height = rc.bottom - rc.top; + } + final_width = min(max(size.cx, min_width) + 4, max_width); - SetWindowPos(hctrl, NULL, 0, 0, final_width, rc.bottom - rc.top, + SetWindowPos(hctrl, NULL, 0, 0, final_width, final_height, SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE); HeapFree(GetProcessHeap(), 0, text); @@ -628,7 +643,7 @@ static void customctrl_resize(FileDialogImpl *This, customctrl *ctrl) case IDLG_CCTRL_COMBOBOX: case IDLG_CCTRL_CHECKBUTTON: case IDLG_CCTRL_TEXT: - ctrl_resize(ctrl->hwnd, 160, 160); + ctrl_resize(ctrl->hwnd, 160, 160, TRUE); GetWindowRect(ctrl->hwnd, &rc); SetWindowPos(ctrl->wrapper_hwnd, NULL, 0, 0, rc.right-rc.left, rc.bottom-rc.top, SWP_NOZORDER|SWP_NOMOVE|SWP_NOZORDER); @@ -1349,21 +1364,21 @@ static void update_control_text(FileDialogImpl *This) (hitem = GetDlgItem(This->dlg_hwnd, IDOK))) { SetWindowTextW(hitem, This->custom_okbutton); - ctrl_resize(hitem, 50, 250); + ctrl_resize(hitem, 50, 250, FALSE); } if(This->custom_cancelbutton && (hitem = GetDlgItem(This->dlg_hwnd, IDCANCEL))) { SetWindowTextW(hitem, This->custom_cancelbutton); - ctrl_resize(hitem, 50, 250); + ctrl_resize(hitem, 50, 250, FALSE); } if(This->custom_filenamelabel && (hitem = GetDlgItem(This->dlg_hwnd, IDC_FILENAMESTATIC))) { SetWindowTextW(hitem, This->custom_filenamelabel); - ctrl_resize(hitem, 50, 250); + ctrl_resize(hitem, 50, 250, FALSE); } }

1 0

David Hedberg : comdlg32: Implement some functions for modifying custom controls.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: 23571b6a0a9928a029d34e42227543d7ff3ee426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23571b6a0a9928a029d34e422… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri May 27 04:05:53 2011 +0200 comdlg32: Implement some functions for modifying custom controls. --- dlls/comdlg32/itemdlg.c | 99 +++++++++++-- dlls/comdlg32/tests/itemdlg.c | 308 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 388 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23571b6a0a9928a029d34…

1 0

David Hedberg : comdlg32: Add a container for custom controls.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: 44e7cda419899d42ae808ad4e3b613980c46e88b URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e7cda419899d42ae808ad4e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri May 27 04:05:50 2011 +0200 comdlg32: Add a container for custom controls. --- dlls/comdlg32/itemdlg.c | 131 ++++++++++++++++++++++++++++++++++++++++- dlls/comdlg32/tests/itemdlg.c | 33 ++++++++++ 2 files changed, 161 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index a1d61e8..920353b 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -98,6 +98,8 @@ typedef struct FileDialogImpl { LPWSTR custom_okbutton; LPWSTR custom_cancelbutton; LPWSTR custom_filenamelabel; + + HWND cctrls_hwnd; } FileDialogImpl; /************************************************************************** @@ -486,6 +488,104 @@ static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width) } /************************************************************************** + * Container functions. + */ +static UINT ctrl_container_resize(FileDialogImpl *This, UINT container_width) +{ + return 0; +} + +static void ctrl_container_reparent(FileDialogImpl *This, HWND parent) +{ + LONG wndstyle; + + if(parent) + { + wndstyle = GetWindowLongW(This->cctrls_hwnd, GWL_STYLE); + wndstyle &= ~(WS_POPUP); + wndstyle |= WS_CHILD; + SetWindowLongW(This->cctrls_hwnd, GWL_STYLE, wndstyle); + + SetParent(This->cctrls_hwnd, parent); + ShowWindow(This->cctrls_hwnd, TRUE); + } + else + { + ShowWindow(This->cctrls_hwnd, FALSE); + + wndstyle = GetWindowLongW(This->cctrls_hwnd, GWL_STYLE); + wndstyle &= ~(WS_CHILD); + wndstyle |= WS_POPUP; + SetWindowLongW(This->cctrls_hwnd, GWL_STYLE, wndstyle); + + SetParent(This->cctrls_hwnd, NULL); + } +} + +static LRESULT ctrl_container_on_create(HWND hwnd, CREATESTRUCTW *crs) +{ + FileDialogImpl *This = crs->lpCreateParams; + TRACE("%p\n", This); + + SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LPARAM)This); + return TRUE; +} + +static LRESULT ctrl_container_on_wm_destroy(FileDialogImpl *This) +{ + TRACE("%p", This); + return TRUE; +} + +static LRESULT CALLBACK ctrl_container_wndproc(HWND hwnd, UINT umessage, WPARAM wparam, LPARAM lparam) +{ + FileDialogImpl *This = (FileDialogImpl*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + + switch(umessage) + { + case WM_NCCREATE: return ctrl_container_on_create(hwnd, (CREATESTRUCTW*)lparam); + case WM_DESTROY: return ctrl_container_on_wm_destroy(This); + default: return DefWindowProcW(hwnd, umessage, wparam, lparam); + } + + return FALSE; +} + +static HRESULT init_custom_controls(FileDialogImpl *This) +{ + WNDCLASSW wc; + static const WCHAR ctrl_container_classname[] = + {'i','d','l','g','_','c','o','n','t','a','i','n','e','r','_','p','a','n','e',0}; + + if( !GetClassInfoW(COMDLG32_hInstance, ctrl_container_classname, &wc) ) + { + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = ctrl_container_wndproc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = COMDLG32_hInstance; + wc.hIcon = 0; + wc.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wc.lpszMenuName = NULL; + wc.lpszClassName = ctrl_container_classname; + + if(!RegisterClassW(&wc)) return E_FAIL; + } + + This->cctrls_hwnd = CreateWindowExW(0, ctrl_container_classname, NULL, + WS_CLIPSIBLINGS | WS_CLIPCHILDREN, + 0, 0, 0, 0, NULL, 0, + COMDLG32_hInstance, (void*)This); + if(!This->cctrls_hwnd) + return E_FAIL; + + SetWindowLongW(This->cctrls_hwnd, GWL_STYLE, WS_TABSTOP); + + return S_OK; +} + +/************************************************************************** * Window related functions. */ static SIZE update_layout(FileDialogImpl *This) @@ -495,7 +595,7 @@ static SIZE update_layout(FileDialogImpl *This) RECT dialog_rc; RECT cancel_rc, open_rc; RECT filetype_rc, filename_rc, filenamelabel_rc; - RECT toolbar_rc, ebrowser_rc; + RECT toolbar_rc, ebrowser_rc, customctrls_rc; int missing_width, missing_height; static const UINT vspacing = 4, hspacing = 4; SIZE ret; @@ -606,22 +706,35 @@ static SIZE update_layout(FileDialogImpl *This) MapWindowPoints(NULL, This->dlg_hwnd, (POINT*)&toolbar_rc, 2); } + /* The custom controls */ + customctrls_rc.left = dialog_rc.left + vspacing; + customctrls_rc.right = dialog_rc.right - vspacing; + customctrls_rc.bottom = filename_rc.top - hspacing; + customctrls_rc.top = customctrls_rc.bottom - + ctrl_container_resize(This, customctrls_rc.right - customctrls_rc.left); + /* The ExplorerBrowser control. */ ebrowser_rc.left = dialog_rc.left + vspacing; ebrowser_rc.top = toolbar_rc.bottom + vspacing; ebrowser_rc.right = dialog_rc.right - hspacing; - ebrowser_rc.bottom = filename_rc.top - hspacing; + ebrowser_rc.bottom = customctrls_rc.top - hspacing; /**** * Move everything to the right place. */ /* FIXME: The Save Dialog uses a slightly different layout. */ - hdwp = BeginDeferWindowPos(6); + hdwp = BeginDeferWindowPos(7); if(hdwp && This->peb) IExplorerBrowser_SetRect(This->peb, &hdwp, ebrowser_rc); + if(hdwp && This->cctrls_hwnd) + DeferWindowPos(hdwp, This->cctrls_hwnd, NULL, + customctrls_rc.left, customctrls_rc.top, + customctrls_rc.right - customctrls_rc.left, customctrls_rc.bottom - customctrls_rc.top, + SWP_NOZORDER | SWP_NOACTIVATE); + /* The default controls */ if(hdwp && (hwnd = GetDlgItem(This->dlg_hwnd, IDC_FILETYPE)) ) DeferWindowPos(hdwp, hwnd, NULL, filetype_rc.left, filetype_rc.top, 0, 0, @@ -797,6 +910,7 @@ static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) (hitem = GetDlgItem(This->dlg_hwnd, IDC_FILENAME)) ) SendMessageW(hitem, WM_SETTEXT, 0, (LPARAM)This->set_filename); + ctrl_container_reparent(This, This->dlg_hwnd); init_explorerbrowser(This); init_toolbar(This, hwnd); update_control_text(This); @@ -834,6 +948,7 @@ static LRESULT on_wm_destroy(FileDialogImpl *This) This->peb = NULL; } + ctrl_container_reparent(This, NULL); This->dlg_hwnd = NULL; return TRUE; @@ -1055,6 +1170,8 @@ static ULONG WINAPI IFileDialog2_fnRelease(IFileDialog2 *iface) } HeapFree(GetProcessHeap(), 0, This->filterspecs); + DestroyWindow(This->cctrls_hwnd); + if(This->psi_defaultfolder) IShellItem_Release(This->psi_defaultfolder); if(This->psi_setfolder) IShellItem_Release(This->psi_setfolder); if(This->psi_folder) IShellItem_Release(This->psi_folder); @@ -2736,6 +2853,14 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p SHGetItemFromObject((IUnknown*)psf, &IID_IShellItem, (void**)&fdimpl->psi_defaultfolder); IShellFolder_Release(psf); + hr = init_custom_controls(fdimpl); + if(FAILED(hr)) + { + ERR("Failed to initialize custom controls (0x%08x).\n", hr); + IUnknown_Release((IUnknown*)fdimpl); + return E_FAIL; + } + hr = IUnknown_QueryInterface((IUnknown*)fdimpl, riid, ppv); IUnknown_Release((IUnknown*)fdimpl); return hr; diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 4c4e1ce..9e4d571 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -1200,6 +1200,38 @@ static void test_filename(void) DeleteFileW(filename_ext2W); } +static void test_customize(void) +{ + IFileDialog *pfod; + IFileDialogCustomize *pfdc; + IOleWindow *pow; + LONG ref; + HWND dlg_hwnd; + HRESULT hr; + hr = CoCreateInstance(&CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&pfod); + ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IFileOpenDialog_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&pfdc); + ok(hr == S_OK, "got 0x%08x.\n", hr); + if(FAILED(hr)) + { + skip("Skipping IFileDialogCustomize tests.\n"); + return; + } + + hr = IFileDialog_QueryInterface(pfod, &IID_IOleWindow, (void**)&pow); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = IOleWindow_GetWindow(pow, &dlg_hwnd); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(dlg_hwnd == NULL, "NULL\n"); + IOleWindow_Release(pow); + + IFileDialogCustomize_Release(pfdc); + ref = IFileOpenDialog_Release(pfod); + ok(!ref, "Refcount not zero (%d).\n", ref); +} + START_TEST(itemdlg) { OleInitialize(NULL); @@ -1210,6 +1242,7 @@ START_TEST(itemdlg) test_basics(); test_advise(); test_filename(); + test_customize(); } else skip("Skipping all Item Dialog tests.\n");

1 0

Dylan Smith : d3dxof: COM cleanup in d3dxof.c.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: ac65f31ae663d1dd630974686c4d3755e5d81151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac65f31ae663d1dd630974686… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu May 26 21:21:01 2011 -0400 d3dxof: COM cleanup in d3dxof.c. --- dlls/d3dxof/d3dxof.c | 164 +++++++++++++++++++++++++----------------- dlls/d3dxof/d3dxof_private.h | 14 ++-- 2 files changed, 106 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac65f31ae663d1dd63097…

1 0

Dylan Smith : d3dxof: COM cleanup in main.c.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: 7a1d910566eb35f6f09cd567b0887345f85daa6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1d910566eb35f6f09cd567b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu May 26 21:20:55 2011 -0400 d3dxof: COM cleanup in main.c. --- dlls/d3dxof/main.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/d3dxof/main.c b/dlls/d3dxof/main.c index 8eb1489..3b43ec8 100644 --- a/dlls/d3dxof/main.c +++ b/dlls/d3dxof/main.c @@ -64,12 +64,17 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) * DirectX File ClassFactory */ typedef struct { - IClassFactory ITF_IClassFactory; + IClassFactory IClassFactory_iface; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + struct object_creation_info { const CLSID *clsid; @@ -83,13 +88,13 @@ static const struct object_creation_info object_creation[] = static HRESULT WINAPI XFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = This; + *ppobj = &This->IClassFactory_iface; return S_OK; } @@ -99,13 +104,13 @@ static HRESULT WINAPI XFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, LPVO static ULONG WINAPI XFCF_AddRef(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI XFCF_Release(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -117,7 +122,7 @@ static ULONG WINAPI XFCF_Release(LPCLASSFACTORY iface) static HRESULT WINAPI XFCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; @@ -134,7 +139,7 @@ static HRESULT WINAPI XFCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter static HRESULT WINAPI XFCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%d),stub!\n",This,dolock); return S_OK; } @@ -211,12 +216,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; - factory->ITF_IClassFactory.lpVtbl = &XFCF_Vtbl; + factory->IClassFactory_iface.lpVtbl = &XFCF_Vtbl; factory->ref = 1; factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - *ppv = &(factory->ITF_IClassFactory); + *ppv = &(factory->IClassFactory_iface); return S_OK; }

1 0

David Hedberg : comdlg32: Support adding custom controls to the item dialog .
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: ca136d75f9c00e74028f898013b421785310bd29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca136d75f9c00e74028f89801… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri May 27 04:05:51 2011 +0200 comdlg32: Support adding custom controls to the item dialog. --- dlls/comdlg32/itemdlg.c | 268 ++++++++++++++++++++++++++++++++++++++-- dlls/comdlg32/tests/itemdlg.c | 71 +++++++++++ 2 files changed, 325 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca136d75f9c00e74028f8…

1 0

André Hentschel : cfgmgr32: Update specfile.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: 64894672ba14de9f7d5b36a4f1a9780a7e6e4bd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64894672ba14de9f7d5b36a4f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 26 19:24:10 2011 +0200 cfgmgr32: Update specfile. --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 21029fe..44097ef 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -64,7 +64,7 @@ @ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW @ stub CM_Get_Device_ID_ExA @ stdcall CM_Get_Device_ID_ExW(ptr ptr long long ptr) setupapi.CM_Get_Device_ID_ExW -@ stdcall CM_Get_Device_ID_ListA(ptr ptr long long) setupapi.CM_Get_Device_ID_ListA +@ stdcall CM_Get_Device_ID_ListA(str ptr long long) setupapi.CM_Get_Device_ID_ListA @ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) setupapi.CM_Get_Device_ID_ListW @ stub CM_Get_Device_ID_List_ExA @ stub CM_Get_Device_ID_List_ExW

1 0