October 2006 - Wine-commits

Huw Davies : oledlg: Minimal 'As Icon' handling. Just disable for now.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: aa9fdd06e4610f121293815819898c85cbbca120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa9fdd06e4610f12129381581… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 19 11:17:04 2006 +0100 oledlg: Minimal 'As Icon' handling. Just disable for now. --- dlls/oledlg/pastespl.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 86997e4..26f91e8 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -290,6 +290,23 @@ static void init_lists(HWND hdlg, ps_str EnableWindow(GetDlgItem(hdlg, IDOK), 0); } +static void update_as_icon(HWND hdlg, ps_struct_t *ps_struct) +{ + HWND icon_display = GetDlgItem(hdlg, IDC_PS_ICONDISPLAY); + HWND display_as_icon = GetDlgItem(hdlg, IDC_PS_DISPLAYASICON); + HWND change_icon = GetDlgItem(hdlg, IDC_PS_CHANGEICON); + + /* FIXME. No as icon handling */ + ps_struct->flags &= ~PSF_CHECKDISPLAYASICON; + + CheckDlgButton(hdlg, IDC_PS_DISPLAYASICON, ps_struct->flags & PSF_CHECKDISPLAYASICON); + EnableWindow(display_as_icon, 0); + ShowWindow(icon_display, SW_HIDE); + EnableWindow(icon_display, 0); + ShowWindow(change_icon, SW_HIDE); + EnableWindow(change_icon, 0); +} + static void update_result_text(HWND hdlg, ps_struct_t *ps_struct) { WCHAR resource_txt[200]; @@ -341,6 +358,7 @@ static void update_result_text(HWND hdlg static void selection_change(HWND hdlg, ps_struct_t *ps_struct) { + update_as_icon(hdlg, ps_struct); update_result_text(hdlg, ps_struct); }

1 0

Huw Davies : oledlg: Update the result text.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 15768f85721ab6734156ac3409479c8e450aea27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15768f85721ab6734156ac340… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 19 11:13:21 2006 +0100 oledlg: Update the result text. --- dlls/oledlg/pastespl.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 68 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 23c9985..86997e4 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -32,8 +32,10 @@ #include "winnls.h" #include "oledlg.h" #include "oledlg_private.h" +#include "resource.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -288,6 +290,60 @@ static void init_lists(HWND hdlg, ps_str EnableWindow(GetDlgItem(hdlg, IDOK), 0); } +static void update_result_text(HWND hdlg, ps_struct_t *ps_struct) +{ + WCHAR resource_txt[200]; + UINT res_id; + OLEUIPASTEENTRYW *pent; + LONG cur_sel; + static const WCHAR percent_s[] = {'%','s',0}; + WCHAR *result_txt, *ptr; + + cur_sel = SendMessageW(GetDlgItem(hdlg, IDC_PS_DISPLAYLIST), LB_GETCURSEL, 0, 0); + if(cur_sel == -1) return; + pent = (OLEUIPASTEENTRYW*)SendMessageW(GetDlgItem(hdlg, IDC_PS_DISPLAYLIST), LB_GETITEMDATA, cur_sel, 0); + + if(ps_struct->flags & PSF_SELECTPASTE) + { + if(ps_struct->flags & PSF_CHECKDISPLAYASICON) + res_id = IDS_PS_PASTE_OBJECT_AS_ICON; + else + res_id = IDS_PS_PASTE_DATA; + } + else + { + if(ps_struct->flags & PSF_CHECKDISPLAYASICON) + res_id = IDS_PS_PASTE_LINK_OBJECT_AS_ICON; + else + res_id = IDS_PS_PASTE_LINK_DATA; + } + + LoadStringW(OLEDLG_hInstance, res_id, resource_txt, sizeof(resource_txt)/sizeof(WCHAR)); + if((ptr = strstrW(resource_txt, percent_s))) + { + /* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}. Else sub appropiate type name */ + size_t result_txt_len = strlenW(pent->lpstrResultText); + ptrdiff_t offs = (char*)ptr - (char*)resource_txt; + result_txt = HeapAlloc(GetProcessHeap(), 0, (strlenW(resource_txt) + result_txt_len - 1) * sizeof(WCHAR)); + memcpy(result_txt, resource_txt, offs); + memcpy((char*)result_txt + offs, pent->lpstrResultText, result_txt_len * sizeof(WCHAR)); + memcpy((char*)result_txt + offs + result_txt_len * sizeof(WCHAR), ptr + 2, (strlenW(ptr + 2) + 1) * sizeof(WCHAR)); + } + else + result_txt = resource_txt; + + SetDlgItemTextW(hdlg, IDC_PS_RESULTTEXT, result_txt); + + if(result_txt != resource_txt) + HeapFree(GetProcessHeap(), 0, result_txt); + +} + +static void selection_change(HWND hdlg, ps_struct_t *ps_struct) +{ + update_result_text(hdlg, ps_struct); +} + static void post_help_msg(HWND hdlg, ps_struct_t *ps_struct) { PostMessageW(ps_struct->ps->hWndOwner, oleui_msg_help, (WPARAM)hdlg, IDD_PASTESPECIAL); @@ -342,16 +398,27 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND EnableWindow(GetDlgItem(hdlg, IDC_OLEUIHELP), 0); } - if(ps_struct->ps->lpszCaption) + if(ps_struct->ps->lpszCaption) SetWindowTextW(hdlg, ps_struct->ps->lpszCaption); init_lists(hdlg, ps_struct); + selection_change(hdlg, ps_struct); + return TRUE; /* use default focus */ } case WM_COMMAND: switch(LOWORD(wp)) { + case IDC_PS_DISPLAYLIST: + switch(HIWORD(wp)) + { + case LBN_SELCHANGE: + selection_change(hdlg, ps_struct); + return FALSE; + default: + return FALSE; + } case IDC_OLEUIHELP: switch(HIWORD(wp)) {

1 0

Huw Davies : oledlg: Add paste special string resources.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 0019f3bba99e5d146943b3d729bf81a354d52bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0019f3bba99e5d146943b3d72… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 19 10:37:48 2006 +0100 oledlg: Add paste special string resources. --- dlls/oledlg/oledlg_En.rc | 14 ++++++++++++++ dlls/oledlg/resource.h | 12 ++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/oledlg_En.rc b/dlls/oledlg/oledlg_En.rc index c1faa58..5b89a25 100644 --- a/dlls/oledlg/oledlg_En.rc +++ b/dlls/oledlg/oledlg_En.rc @@ -79,3 +79,17 @@ BEGIN CONTROL "Result", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Inserts the contents of the clipboard into your document as %s." + IDS_PS_PASTE_OBJECT "Inserts the contents of the clipboard into your document so that you can activate it using %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Inserts the contents of the clipboard into your document so that you can activate it using %s. It will be displayed as an icon." + IDS_PS_PASTE_LINK_DATA "Inserts the contents of the clipboard into your document as %s. The data is linked to the source file so that changes to the file will be reflected in your document." + IDS_PS_PASTE_LINK_OBJECT "Inserts a picture of the clipboard contents into your document. The picture is linked to the source file so that changes to the file will be reflected in your document." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Inserts a shortcut which points to the location of the clipboard contents. The shortcut is linked to the source file so that changes to the file will be reflected in your document." + IDS_PS_NON_OLE "Inserts the contents of the clipboard into your document." + IDS_PS_UNKNOWN_TYPE "Unknown Type" + IDS_PS_UNKNOWN_SRC "Unknown Source" + IDS_PS_UNKNOWN_APP "the program which created it" +} diff --git a/dlls/oledlg/resource.h b/dlls/oledlg/resource.h index b0f5932..518f7ba 100644 --- a/dlls/oledlg/resource.h +++ b/dlls/oledlg/resource.h @@ -38,3 +38,15 @@ #define IDC_ASICON #define IDC_BROWSE 1009 #define IDC_FILELBL 1010 #define IDC_FILE 1011 + +/* String ids for Paste Special */ +#define IDS_PS_PASTE_DATA 0x190 +#define IDS_PS_PASTE_OBJECT 0x191 +#define IDS_PS_PASTE_OBJECT_AS_ICON 0x192 +#define IDS_PS_PASTE_LINK_DATA 0x193 +#define IDS_PS_PASTE_LINK_OBJECT 0x194 +#define IDS_PS_PASTE_LINK_OBJECT_AS_ICON 0x195 +#define IDS_PS_NON_OLE 0x196 +#define IDS_PS_UNKNOWN_TYPE 0x197 +#define IDS_PS_UNKNOWN_SRC 0x198 +#define IDS_PS_UNKNOWN_APP 0x199

1 0

Huw Davies : oledlg: Post OLEUI_MSG_HELP when the Help button is pressed and hide the Help button if the app doesn 't want it.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 45a3b1738fc7ff737d9fbceb95ca8c815ff9f2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a3b1738fc7ff737d9fbceb9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 22:08:10 2006 +0100 oledlg: Post OLEUI_MSG_HELP when the Help button is pressed and hide the Help button if the app doesn't want it. --- dlls/oledlg/pastespl.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index c34a97c..23c9985 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -288,6 +288,11 @@ static void init_lists(HWND hdlg, ps_str EnableWindow(GetDlgItem(hdlg, IDOK), 0); } +static void post_help_msg(HWND hdlg, ps_struct_t *ps_struct) +{ + PostMessageW(ps_struct->ps->hWndOwner, oleui_msg_help, (WPARAM)hdlg, IDD_PASTESPECIAL); +} + static void send_end_dialog_msg(HWND hdlg, ps_struct_t *ps_struct, UINT id) { SendMessageW(hdlg, oleui_msg_enddialog, id, 0); @@ -331,7 +336,13 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND SetPropW(hdlg, prop_name, ps_struct); - if(ps_struct->ps->lpszCaption) + if(!(ps_struct->ps->dwFlags & PSF_SHOWHELP)) + { + ShowWindow(GetDlgItem(hdlg, IDC_OLEUIHELP), SW_HIDE); + EnableWindow(GetDlgItem(hdlg, IDC_OLEUIHELP), 0); + } + + if(ps_struct->ps->lpszCaption) SetWindowTextW(hdlg, ps_struct->ps->lpszCaption); init_lists(hdlg, ps_struct); @@ -341,6 +352,15 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND case WM_COMMAND: switch(LOWORD(wp)) { + case IDC_OLEUIHELP: + switch(HIWORD(wp)) + { + case BN_CLICKED: + post_help_msg(hdlg, ps_struct); + return FALSE; + default: + return FALSE; + } case IDOK: case IDCANCEL: send_end_dialog_msg(hdlg, ps_struct, LOWORD(wp));

1 0

Huw Davies : oledlg: Register a couple of messages.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: bda36798ade3048666b17011b7a7357fa3401e95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda36798ade3048666b17011b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 21:55:43 2006 +0100 oledlg: Register a couple of messages. --- dlls/oledlg/oledlg_main.c | 10 ++++++++++ dlls/oledlg/oledlg_private.h | 3 +++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index 6ee2de9..b9a4d65 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -45,6 +45,9 @@ UINT cf_ownerlink; UINT cf_filename; UINT cf_filenamew; +UINT oleui_msg_help; +UINT oleui_msg_enddialog; + static void register_clipboard_formats(void) { /* These used to be declared in olestd.h, but that seems to have been removed from the api */ @@ -68,6 +71,12 @@ static void register_clipboard_formats(v cf_filenamew = RegisterClipboardFormatW(CF_FILENAMEWW); } +static void register_messages(void) +{ + oleui_msg_help = RegisterWindowMessageW(SZOLEUI_MSG_HELPW); + oleui_msg_enddialog = RegisterWindowMessageW(SZOLEUI_MSG_ENDDIALOGW); +} + /*********************************************************************** * DllMain */ @@ -80,6 +89,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DisableThreadLibraryCalls(hinstDLL); OLEDLG_hInstance = hinstDLL; register_clipboard_formats(); + register_messages(); break; case DLL_PROCESS_DETACH: diff --git a/dlls/oledlg/oledlg_private.h b/dlls/oledlg/oledlg_private.h index c0b16e5..4ff3bb6 100644 --- a/dlls/oledlg/oledlg_private.h +++ b/dlls/oledlg/oledlg_private.h @@ -32,4 +32,7 @@ extern UINT cf_ownerlink; extern UINT cf_filename; extern UINT cf_filenamew; +extern UINT oleui_msg_help; +extern UINT oleui_msg_enddialog; + #endif /* __OLEDLG_PRIVATE_H__ */

1 0

Huw Davies : oledlg: Send the OLEUI_MSG_ENDDIALOG messsage when closing the dialog.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: b7ad8fbbd9483bceb88705862480f8d24ecb0286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7ad8fbbd9483bceb88705862… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 22:01:37 2006 +0100 oledlg: Send the OLEUI_MSG_ENDDIALOG messsage when closing the dialog. --- dlls/oledlg/pastespl.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index f62e4f4..c34a97c 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -288,6 +288,11 @@ static void init_lists(HWND hdlg, ps_str EnableWindow(GetDlgItem(hdlg, IDOK), 0); } +static void send_end_dialog_msg(HWND hdlg, ps_struct_t *ps_struct, UINT id) +{ + SendMessageW(hdlg, oleui_msg_enddialog, id, 0); +} + static void update_structure(HWND hdlg, ps_struct_t *ps_struct) { ps_struct->ps->dwFlags = ps_struct->flags; @@ -338,6 +343,13 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND { case IDOK: case IDCANCEL: + send_end_dialog_msg(hdlg, ps_struct, LOWORD(wp)); + return FALSE; + } + return FALSE; + default: + if(msg == oleui_msg_enddialog) + { if(wp == IDOK) update_structure(hdlg, ps_struct); EndDialog(hdlg, wp); @@ -345,8 +357,6 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND return TRUE; } return FALSE; - default: - return FALSE; } }

1 0

Huw Davies : oledlg: Logic for initial selection of paste/ pastelink radio buttons.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: a67ad872e3f08090e76f21760cd705bfdfa986f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a67ad872e3f08090e76f21760… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 21:42:33 2006 +0100 oledlg: Logic for initial selection of paste/pastelink radio buttons. --- dlls/oledlg/pastespl.c | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index cbfd764..47145b2 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -218,8 +218,40 @@ static DWORD init_linklist(HWND hdlg, OL static void init_lists(HWND hdlg, ps_struct_t *ps_struct) { - init_pastelist(hdlg, ps_struct->ps); - init_linklist(hdlg, ps_struct->ps); + DWORD pastes_added = init_pastelist(hdlg, ps_struct->ps); + DWORD links_added = init_linklist(hdlg, ps_struct->ps); + UINT check_id, list_id; + + if((ps_struct->flags & (PSF_SELECTPASTE | PSF_SELECTPASTELINK)) == 0) + ps_struct->flags |= PSF_SELECTPASTE; + + if(!pastes_added && !links_added) + ps_struct->flags &= ~(PSF_SELECTPASTE | PSF_SELECTPASTELINK); + else if(!pastes_added && (ps_struct->flags & PSF_SELECTPASTE)) + { + ps_struct->flags &= ~PSF_SELECTPASTE; + ps_struct->flags |= PSF_SELECTPASTELINK; + } + else if(!links_added && (ps_struct->flags & PSF_SELECTPASTELINK)) + { + ps_struct->flags &= ~PSF_SELECTPASTELINK; + ps_struct->flags |= PSF_SELECTPASTE; + } + + check_id = 0; + list_id = 0; + if(ps_struct->flags & PSF_SELECTPASTE) + { + check_id = IDC_PS_PASTE; + list_id = IDC_PS_PASTELIST; + } + else if(ps_struct->flags & PSF_SELECTPASTELINK) + { + check_id = IDC_PS_PASTELINK; + list_id = IDC_PS_PASTELINKLIST; + } + + CheckRadioButton(hdlg, IDC_PS_PASTE, IDC_PS_PASTELINK, check_id); } static void update_structure(HWND hdlg, ps_struct_t *ps_struct)

1 0

Huw Davies : oledlg: Copy the appropiate list to the display list.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: f07bbbd43403a718eae0a13c6dd8df385aef2b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f07bbbd43403a718eae0a13c6… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 21:50:04 2006 +0100 oledlg: Copy the appropiate list to the display list. --- dlls/oledlg/pastespl.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 47145b2..f62e4f4 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -216,6 +216,35 @@ static DWORD init_linklist(HWND hdlg, OL return items_added; } +/* copies src_list_id into the display list */ +static void update_display_list(HWND hdlg, UINT src_list_id) +{ + LONG count, i, old_pos; + WCHAR txt[256]; + LONG item_data; + HWND display_list = GetDlgItem(hdlg, IDC_PS_DISPLAYLIST); + HWND list = GetDlgItem(hdlg, src_list_id); + + old_pos = SendMessageW(display_list, LB_GETCURSEL, 0, 0); + if(old_pos == -1) old_pos = 0; + + SendMessageW(display_list, WM_SETREDRAW, 0, 0); + SendMessageW(display_list, LB_RESETCONTENT, 0, 0); + count = SendMessageW(list, LB_GETCOUNT, 0, 0); + for(i = 0; i < count; i++) + { + SendMessageW(list, LB_GETTEXT, i, (LPARAM)txt); + item_data = SendMessageW(list, LB_GETITEMDATA, i, 0); + SendMessageW(display_list, LB_INSERTSTRING, i, (LPARAM)txt); + SendMessageW(display_list, LB_SETITEMDATA, i, item_data); + } + old_pos = max(old_pos, count); + SendMessageW(display_list, LB_SETCURSEL, 0, 0); + SendMessageW(display_list, WM_SETREDRAW, 1, 0); + if(GetForegroundWindow() == hdlg) + SetFocus(display_list); +} + static void init_lists(HWND hdlg, ps_struct_t *ps_struct) { DWORD pastes_added = init_pastelist(hdlg, ps_struct->ps); @@ -252,6 +281,11 @@ static void init_lists(HWND hdlg, ps_str } CheckRadioButton(hdlg, IDC_PS_PASTE, IDC_PS_PASTELINK, check_id); + + if(list_id) + update_display_list(hdlg, list_id); + else + EnableWindow(GetDlgItem(hdlg, IDOK), 0); } static void update_structure(HWND hdlg, ps_struct_t *ps_struct)

1 0

Huw Davies : oledlg: Initialize the paste list.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 905b598bb374aa5a293500214e3e0b8a837a6c72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905b598bb374aa5a293500214… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 21:34:08 2006 +0100 oledlg: Initialize the paste list. --- dlls/oledlg/pastespl.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index c2c0022..8073c34 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -19,6 +19,8 @@ */ #define COM_NO_WINDOWS_H +#define COBJMACROS + #include <stdarg.h> #include "windef.h" @@ -116,6 +118,74 @@ static inline WCHAR *strdupAtoW(const ch return ret; } +static BOOL add_entry_to_lb(HWND hdlg, UINT id, OLEUIPASTEENTRYW *pe) +{ + HWND hwnd = GetDlgItem(hdlg, id); + BOOL ret = FALSE; + + /* FIXME %s handling */ + + /* Note that this suffers from the same bug as native, in that if a new string + is a substring of an already added string, then the FINDSTRING will succeed + this is probably not what we want */ + if(SendMessageW(hwnd, LB_FINDSTRING, 0, (LPARAM)pe->lpstrFormatName) == -1) + { + LRESULT pos = SendMessageW(hwnd, LB_ADDSTRING, 0, (LPARAM)pe->lpstrFormatName); + SendMessageW(hwnd, LB_SETITEMDATA, pos, (LPARAM)pe); + ret = TRUE; + } + return ret; +} + +static DWORD init_pastelist(HWND hdlg, OLEUIPASTESPECIALW *ps) +{ + IEnumFORMATETC *penum; + HRESULT hr; + FORMATETC fmts[20]; + DWORD fetched, items_added = 0; + + hr = IDataObject_EnumFormatEtc(ps->lpSrcDataObj, DATADIR_GET, &penum); + if(FAILED(hr)) + { + WARN("Unable to create IEnumFORMATETC\n"); + return 0; + } + + /* The native version grabs only the first 20 fmts and we do the same */ + hr = IEnumFORMATETC_Next(penum, sizeof(fmts)/sizeof(fmts[0]), fmts, &fetched); + TRACE("got %d formats hr %08x\n", fetched, hr); + + if(SUCCEEDED(hr)) + { + DWORD src_fmt, req_fmt; + for(req_fmt = 0; req_fmt < ps->cPasteEntries; req_fmt++) + { + /* This is used by update_struct() to set nSelectedIndex on exit */ + ps->arrPasteEntries[req_fmt].dwScratchSpace = req_fmt; + TRACE("req_fmt %x\n", ps->arrPasteEntries[req_fmt].fmtetc.cfFormat); + for(src_fmt = 0; src_fmt < fetched; src_fmt++) + { + TRACE("\tenum'ed fmt %x\n", fmts[src_fmt].cfFormat); + if(ps->arrPasteEntries[req_fmt].fmtetc.cfFormat == fmts[src_fmt].cfFormat) + { + add_entry_to_lb(hdlg, IDC_PS_PASTELIST, ps->arrPasteEntries + req_fmt); + items_added++; + break; + } + } + } + } + + IEnumFORMATETC_Release(penum); + EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTE), items_added ? TRUE : FALSE); + return items_added; +} + +static void init_lists(HWND hdlg, ps_struct_t *ps_struct) +{ + init_pastelist(hdlg, ps_struct->ps); +} + static void update_structure(HWND hdlg, ps_struct_t *ps_struct) { ps_struct->ps->dwFlags = ps_struct->flags; @@ -157,6 +227,8 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND if(ps_struct->ps->lpszCaption) SetWindowTextW(hdlg, ps_struct->ps->lpszCaption); + init_lists(hdlg, ps_struct); + return TRUE; /* use default focus */ } case WM_COMMAND:

1 0

Huw Davies : oledlg: Initialize the pastelink list.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: f7d5f198b433dd85e69d81e8bc3f89e919494ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7d5f198b433dd85e69d81e8b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 21:38:10 2006 +0100 oledlg: Initialize the pastelink list. --- dlls/oledlg/pastespl.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 8073c34..cbfd764 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -181,9 +181,45 @@ static DWORD init_pastelist(HWND hdlg, O return items_added; } +static DWORD init_linklist(HWND hdlg, OLEUIPASTESPECIALW *ps) +{ + HRESULT hr; + DWORD supported_mask = 0; + DWORD items_added = 0; + int link, req_fmt; + FORMATETC fmt = {0, NULL, DVASPECT_CONTENT, -1, -1}; + + for(link = 0; link < ps->cLinkTypes && link < PS_MAXLINKTYPES; link++) + { + fmt.cfFormat = ps->arrLinkTypes[link]; + hr = IDataObject_QueryGetData(ps->lpSrcDataObj, &fmt); + if(hr == S_OK) + supported_mask |= 1 << link; + } + TRACE("supported_mask %02x\n", supported_mask); + for(req_fmt = 0; req_fmt < ps->cPasteEntries; req_fmt++) + { + DWORD linktypes; + if(ps->arrPasteEntries[req_fmt].dwFlags & OLEUIPASTE_LINKANYTYPE) + linktypes = 0xff; + else + linktypes = ps->arrPasteEntries[req_fmt].dwFlags & 0xff; + + if(linktypes & supported_mask) + { + add_entry_to_lb(hdlg, IDC_PS_PASTELINKLIST, ps->arrPasteEntries + req_fmt); + items_added++; + } + } + + EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTELINK), items_added ? TRUE : FALSE); + return items_added; +} + static void init_lists(HWND hdlg, ps_struct_t *ps_struct) { init_pastelist(hdlg, ps_struct->ps); + init_linklist(hdlg, ps_struct->ps); } static void update_structure(HWND hdlg, ps_struct_t *ps_struct)

1 0