October 2006 - Wine-commits

Huw Davies : oledlg: Use the clipboard if the user doesn' t pass an IDataObject.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 7a17e824ab6906fa78ff17fd778793e158b87940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a17e824ab6906fa78ff17fd7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 21:06:21 2006 +0100 oledlg: Use the clipboard if the user doesn't pass an IDataObject. --- dlls/oledlg/pastespl.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index bd9aa21..4eeceff 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -243,6 +243,9 @@ UINT WINAPI OleUIPasteSpecialW(LPOLEUIPA if(TRACE_ON(ole)) dump_pastespecial(ps); + if(!ps->lpSrcDataObj) + OleGetClipboard(&ps->lpSrcDataObj); + if(ps->hInstance || !ps->hResource) { HINSTANCE hInst = ps->hInstance ? ps->hInstance : OLEDLG_hInstance;

1 0

Huw Davies : oledlg: Set the user supplied caption.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 284f07e412d5a5617109933550909c3509784c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=284f07e412d5a561710993355… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 21:08:43 2006 +0100 oledlg: Set the user supplied caption. --- dlls/oledlg/pastespl.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 4eeceff..c2c0022 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -154,6 +154,9 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND SetPropW(hdlg, prop_name, ps_struct); + if(ps_struct->ps->lpszCaption) + SetWindowTextW(hdlg, ps_struct->ps->lpszCaption); + return TRUE; /* use default focus */ } case WM_COMMAND:

1 0

Huw Davies : oledlg: Initial management of private structure for dialog box control.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 65e112a155ee725b2ba6c1897884e8ac284e03af URL: http://source.winehq.org/git/wine.git/?a=commit;h=65e112a155ee725b2ba6c1897… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 20:32:34 2006 +0100 oledlg: Initial management of private structure for dialog box control. --- dlls/oledlg/pastespl.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 56bcbb1..bd9aa21 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -35,6 +35,12 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); +typedef struct +{ + OLEUIPASTESPECIALW *ps; + DWORD flags; +} ps_struct_t; + static const struct ps_flag { DWORD flag; @@ -110,21 +116,55 @@ static inline WCHAR *strdupAtoW(const ch return ret; } +static void update_structure(HWND hdlg, ps_struct_t *ps_struct) +{ + ps_struct->ps->dwFlags = ps_struct->flags; + ps_struct->ps->fLink = (ps_struct->flags & PSF_SELECTPASTELINK) ? TRUE : FALSE; +} + +static void free_structure(ps_struct_t *ps_struct) +{ + HeapFree(GetProcessHeap(), 0, ps_struct); +} + static INT_PTR CALLBACK ps_dlg_proc(HWND hdlg, UINT msg, WPARAM wp, LPARAM lp) { + /* native uses prop name "Structure", but we're not compatible + with that so we'll prepend "Wine_". */ + static const WCHAR prop_name[] = {'W','i','n','e','_','S','t','r','u','c','t','u','r','e',0}; + ps_struct_t *ps_struct; + TRACE("(%p, %04x, %08x, %08lx)\n", hdlg, msg, wp, lp); + + ps_struct = GetPropW(hdlg, prop_name); + + if(msg != WM_INITDIALOG) + { + if(!ps_struct) + return 0; + } + switch(msg) { case WM_INITDIALOG: + { + ps_struct = HeapAlloc(GetProcessHeap(), 0, sizeof(*ps_struct)); + ps_struct->ps = (OLEUIPASTESPECIALW*)lp; + ps_struct->flags = ps_struct->ps->dwFlags; - return TRUE; /* use default focus */ + SetPropW(hdlg, prop_name, ps_struct); + return TRUE; /* use default focus */ + } case WM_COMMAND: switch(LOWORD(wp)) { case IDOK: case IDCANCEL: + if(wp == IDOK) + update_structure(hdlg, ps_struct); EndDialog(hdlg, wp); + free_structure(ps_struct); return TRUE; } return FALSE;

1 0

Huw Davies : oledlg: Load the correct dialog template and add a skeleton dialog proc.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 3d6d9b210a25fbe05ecfca446a84aeeafc4efe0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6d9b210a25fbe05ecfca446… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 17:42:54 2006 +0100 oledlg: Load the correct dialog template and add a skeleton dialog proc. --- dlls/oledlg/oledlg_private.h | 2 + dlls/oledlg/pastespl.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/oledlg_private.h b/dlls/oledlg/oledlg_private.h index 671eb3e..c0b16e5 100644 --- a/dlls/oledlg/oledlg_private.h +++ b/dlls/oledlg/oledlg_private.h @@ -21,6 +21,8 @@ #ifndef __OLEDLG_PRIVATE_H__ #define __OLEDLG_PRIVATE_H__ +extern HINSTANCE OLEDLG_hInstance; + extern UINT cf_embed_source; extern UINT cf_embedded_object; extern UINT cf_link_source; diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index f255486..56bcbb1 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -28,6 +28,9 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" #include "oledlg.h" + +#include "oledlg_private.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -107,6 +110,30 @@ static inline WCHAR *strdupAtoW(const ch return ret; } +static INT_PTR CALLBACK ps_dlg_proc(HWND hdlg, UINT msg, WPARAM wp, LPARAM lp) +{ + TRACE("(%p, %04x, %08x, %08lx)\n", hdlg, msg, wp, lp); + switch(msg) + { + case WM_INITDIALOG: + + return TRUE; /* use default focus */ + + case WM_COMMAND: + switch(LOWORD(wp)) + { + case IDOK: + case IDCANCEL: + EndDialog(hdlg, wp); + return TRUE; + } + return FALSE; + default: + return FALSE; + } + +} + /*********************************************************************** * OleUIPasteSpecialA (OLEDLG.4) */ @@ -170,10 +197,27 @@ UINT WINAPI OleUIPasteSpecialA(LPOLEUIPA */ UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW ps) { + LPCDLGTEMPLATEW dlg_templ = (LPCDLGTEMPLATEW)ps->hResource; + TRACE("(%p)\n", ps); if(TRACE_ON(ole)) dump_pastespecial(ps); + if(ps->hInstance || !ps->hResource) + { + HINSTANCE hInst = ps->hInstance ? ps->hInstance : OLEDLG_hInstance; + const WCHAR *name = ps->hInstance ? ps->lpszTemplate : MAKEINTRESOURCEW(IDD_PASTESPECIAL4); + HRSRC hrsrc; + + if(name == NULL) return OLEUI_ERR_LPSZTEMPLATEINVALID; + hrsrc = FindResourceW(hInst, name, MAKEINTRESOURCEW(RT_DIALOG)); + if(!hrsrc) return OLEUI_ERR_FINDTEMPLATEFAILURE; + dlg_templ = LoadResource(hInst, hrsrc); + if(!dlg_templ) return OLEUI_ERR_LOADTEMPLATEFAILURE; + } + + DialogBoxIndirectParamW(OLEDLG_hInstance, dlg_templ, ps->hWndOwner, ps_dlg_proc, (LPARAM)ps); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return OLEUI_FALSE; }

1 0

Huw Davies : oledlg: Paste special dialog resource.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 3c2c4a030ca6f72af4278d3408c7393d78938af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c2c4a030ca6f72af4278d340… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 17:21:11 2006 +0100 oledlg: Paste special dialog resource. --- dlls/oledlg/oledlg_En.rc | 26 ++++++++++++++++++++++++++ dlls/oledlg/rsrc.rc | 2 ++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/oledlg_En.rc b/dlls/oledlg/oledlg_En.rc index 9d746f6..c1faa58 100644 --- a/dlls/oledlg/oledlg_En.rc +++ b/dlls/oledlg/oledlg_En.rc @@ -53,3 +53,29 @@ STRINGTABLE DISCARDABLE IDS_NOTOLEMOD "File does not appear to be a valid OLE module. Unable to register OLE control." IDS_NOTOLEMODCAPTION "Add Control" } + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Paste Special" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Source:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "&Paste", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Paste &Link", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&As:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Cancel", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "&Help", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&Display As Icon", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "Change &Icon...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< result text goes here >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + 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 diff --git a/dlls/oledlg/rsrc.rc b/dlls/oledlg/rsrc.rc index 0754828..0aaaadc 100644 --- a/dlls/oledlg/rsrc.rc +++ b/dlls/oledlg/rsrc.rc @@ -22,6 +22,8 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" #include "winnls.h" +#include "oledlg.h" + #include "resource.h" /*

1 0

Huw Davies : oledlg: Forward OleUIPasteSpecialA -> OleUIPasteSpecialW.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: a94bc4c0b6031d2a1c94fa7716c7ec6cfea351a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a94bc4c0b6031d2a1c94fa771… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 17:07:47 2006 +0100 oledlg: Forward OleUIPasteSpecialA -> OleUIPasteSpecialW. --- dlls/oledlg/pastespl.c | 68 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 64 insertions(+), 4 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 94547dd..f255486 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "winerror.h" #include "wingdi.h" #include "winuser.h" +#include "winnls.h" #include "oledlg.h" #include "wine/debug.h" @@ -95,14 +96,73 @@ static void dump_pastespecial(LPOLEUIPAS } +static inline WCHAR *strdupAtoW(const char *str) +{ + DWORD len; + WCHAR *ret; + if(!str) return NULL; + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + /*********************************************************************** * OleUIPasteSpecialA (OLEDLG.4) */ -UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA lpOleUIPasteSpecial) +UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA psA) { - FIXME("(%p): stub\n", lpOleUIPasteSpecial); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return OLEUI_FALSE; + OLEUIPASTESPECIALW ps; + UINT ret; + TRACE("(%p)\n", psA); + + memcpy(&ps, psA, psA->cbStruct); + + ps.lpszCaption = strdupAtoW(psA->lpszCaption); + if(!IS_INTRESOURCE(ps.lpszTemplate)) + ps.lpszTemplate = strdupAtoW(psA->lpszTemplate); + + if(psA->cPasteEntries > 0) + { + DWORD size = psA->cPasteEntries * sizeof(ps.arrPasteEntries[0]); + UINT i; + + ps.arrPasteEntries = HeapAlloc(GetProcessHeap(), 0, size); + memcpy(ps.arrPasteEntries, psA->arrPasteEntries, size); + for(i = 0; i < psA->cPasteEntries; i++) + { + ps.arrPasteEntries[i].lpstrFormatName = + strdupAtoW(psA->arrPasteEntries[i].lpstrFormatName); + ps.arrPasteEntries[i].lpstrResultText = + strdupAtoW(psA->arrPasteEntries[i].lpstrResultText); + } + } + + ret = OleUIPasteSpecialW(&ps); + + if(psA->cPasteEntries > 0) + { + UINT i; + for(i = 0; i < psA->cPasteEntries; i++) + { + HeapFree(GetProcessHeap(), 0, (WCHAR*)ps.arrPasteEntries[i].lpstrFormatName); + HeapFree(GetProcessHeap(), 0, (WCHAR*)ps.arrPasteEntries[i].lpstrResultText); + } + HeapFree(GetProcessHeap(), 0, ps.arrPasteEntries); + } + if(!IS_INTRESOURCE(ps.lpszTemplate)) + HeapFree(GetProcessHeap(), 0, (WCHAR*)ps.lpszTemplate); + HeapFree(GetProcessHeap(), 0, (WCHAR*)ps.lpszCaption); + + /* Copy back the output fields */ + psA->dwFlags = ps.dwFlags; + psA->lpSrcDataObj = ps.lpSrcDataObj; + psA->nSelectedIndex = ps.nSelectedIndex; + psA->fLink = ps.fLink; + psA->hMetaPict = ps.hMetaPict; + psA->sizel = ps.sizel; + + return ret; } /***********************************************************************

1 0

Huw Davies : oledlg: Debugging code to dump the OLEUIPASTESPECIAL structure .
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: f08c5c2ccf572af0083557e0736873972a219c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08c5c2ccf572af0083557e07… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 16:59:35 2006 +0100 oledlg: Debugging code to dump the OLEUIPASTESPECIAL structure. --- dlls/oledlg/pastespl.c | 75 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 71 insertions(+), 4 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index b146983..94547dd 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -31,6 +31,70 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); +static const struct ps_flag +{ + DWORD flag; + const char *name; +} ps_flags[] = { +#define PS_FLAG_ENTRY(p) {p, #p} + PS_FLAG_ENTRY(PSF_SHOWHELP), + PS_FLAG_ENTRY(PSF_SELECTPASTE), + PS_FLAG_ENTRY(PSF_SELECTPASTELINK), + PS_FLAG_ENTRY(PSF_CHECKDISPLAYASICON), + PS_FLAG_ENTRY(PSF_DISABLEDISPLAYASICON), + PS_FLAG_ENTRY(PSF_HIDECHANGEICON), + PS_FLAG_ENTRY(PSF_STAYONCLIPBOARDCHANGE), + PS_FLAG_ENTRY(PSF_NOREFRESHDATAOBJECT), + {-1, NULL} +#undef PS_FLAG_ENTRY +}; + +static void dump_ps_flags(DWORD flags) +{ + char flagstr[1000] = ""; + + const struct ps_flag *flag = ps_flags; + for( ; flag->name; flag++) { + if(flags & flag->flag) { + strcat(flagstr, flag->name); + strcat(flagstr, "|"); + } + } + TRACE("flags %08x %s\n", flags, flagstr); +} + +static void dump_pastespecial(LPOLEUIPASTESPECIALW ps) +{ + UINT i; + dump_ps_flags(ps->dwFlags); + TRACE("hwnd %p caption %s hook %p custdata %lx\n", + ps->hWndOwner, debugstr_w(ps->lpszCaption), ps->lpfnHook, ps->lCustData); + if(IS_INTRESOURCE(ps->lpszTemplate)) + TRACE("hinst %p template %04x hresource %p\n", ps->hInstance, (WORD)(ULONG_PTR)ps->lpszTemplate, ps->hResource); + else + TRACE("hinst %p template %s hresource %p\n", ps->hInstance, debugstr_w(ps->lpszTemplate), ps->hResource); + TRACE("dataobj %p arrpasteent %p cpasteent %d arrlinktype %p clinktype %d\n", + ps->lpSrcDataObj, ps->arrPasteEntries, ps->cPasteEntries, + ps->arrLinkTypes, ps->cLinkTypes); + TRACE("cclsidex %d lpclsidex %p nselect %d flink %d hmetapict %p size(%d,%d)\n", + ps->cClsidExclude, ps->lpClsidExclude, ps->nSelectedIndex, ps->fLink, + ps->hMetaPict, ps->sizel.cx, ps->sizel.cy); + for(i = 0; i < ps->cPasteEntries; i++) + { + TRACE("arrPasteEntries[%d]: cFormat %08x pTargetDevice %p dwAspect %d lindex %d tymed %d\n", + i, ps->arrPasteEntries[i].fmtetc.cfFormat, ps->arrPasteEntries[i].fmtetc.ptd, + ps->arrPasteEntries[i].fmtetc.dwAspect, ps->arrPasteEntries[i].fmtetc.lindex, + ps->arrPasteEntries[i].fmtetc.tymed); + TRACE("\tformat name %s result text %s flags %04x\n", debugstr_w(ps->arrPasteEntries[i].lpstrFormatName), + debugstr_w(ps->arrPasteEntries[i].lpstrResultText), ps->arrPasteEntries[i].dwFlags); + } + for(i = 0; i < ps->cLinkTypes; i++) + TRACE("arrLinkTypes[%d] %08x\n", i, ps->arrLinkTypes[i]); + for(i = 0; i < ps->cClsidExclude; i++) + TRACE("lpClsidExclude[%d] %s\n", i, debugstr_guid(&ps->lpClsidExclude[i])); + +} + /*********************************************************************** * OleUIPasteSpecialA (OLEDLG.4) */ @@ -44,9 +108,12 @@ UINT WINAPI OleUIPasteSpecialA(LPOLEUIPA /*********************************************************************** * OleUIPasteSpecialW (OLEDLG.22) */ -UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW lpOleUIPasteSpecial) +UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW ps) { - FIXME("(%p): stub\n", lpOleUIPasteSpecial); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return OLEUI_FALSE; + TRACE("(%p)\n", ps); + + if(TRACE_ON(ole)) dump_pastespecial(ps); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return OLEUI_FALSE; }

1 0

Huw Davies : oledlg: Add the registered message name strings.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: e85b646430442905fbf3e16887016566da2f7837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e85b646430442905fbf3e1688… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 15:42:10 2006 +0100 oledlg: Add the registered message name strings. --- include/oledlg.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/include/oledlg.h b/include/oledlg.h index 6d7ad57..9cc00f7 100644 --- a/include/oledlg.h +++ b/include/oledlg.h @@ -76,6 +76,60 @@ #define OLEUI_ERR_STANDARDMAX typedef UINT (CALLBACK *LPFNOLEUIHOOK)(HWND, UINT, WPARAM, LPARAM); /***************************************************************************** + * Registered Message Names + */ +#define SZOLEUI_MSG_HELPA "OLEUI_MSG_HELP" +#define SZOLEUI_MSG_ENDDIALOGA "OLEUI_MSG_ENDDIALOG" +#define SZOLEUI_MSG_BROWSEA "OLEUI_MSG_BROWSE" +#define SZOLEUI_MSG_CHANGEICONA "OLEUI_MSG_CHANGEICON" +#define SZOLEUI_MSG_CLOSEBUSYDIALOGA "OLEUI_MSG_CLOSEBUSYDIALOG" +#define SZOLEUI_MSG_CONVERTA "OLEUI_MSG_CONVERT" +#define SZOLEUI_MSG_CHANGESOURCEA "OLEUI_MSG_CHANGESOURCE" +#define SZOLEUI_MSG_ADDCONTROLA "OLEUI_MSG_ADDCONTROL" +#define SZOLEUI_MSG_BROWSE_OFNA "OLEUI_MSG_BROWSE_OFN" +#if defined(__GNUC__) +# define SZOLEUI_MSG_HELPW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','H','E','L','P',0 } +# define SZOLEUI_MSG_ENDDIALOGW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','E','N','D','D','I','A','L','O','G',0 } +# define SZOLEUI_MSG_BROWSEW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','B','R','O','W','S','E',0 } +# define SZOLEUI_MSG_CHANGEICONW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','C','H','A','N','G','E','I','C','O','N',0 } +# define SZOLEUI_MSG_CLOSEBUSYDIALOGW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','C','L','O','S','E','B','U','S','Y','D','I','A','L','O','G',0 } +# define SZOLEUI_MSG_CONVERTW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','C','O','N','V','E','R','T',0 } +# define SZOLEUI_MSG_CHANGESOURCEW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','C','H','A','N','G','E','S','O','U','R','C','E',0 } +# define SZOLEUI_MSG_ADDCONTROLW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','A','D','D','C','O','N','T','R','O','L',0 } +# define SZOLEUI_MSG_BROWSE_OFNW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','B','R','O','W','S','E','_','O','F','N',0 } +#elif defined(_MSC_VER) +# define SZOLEUI_MSG_HELPW L"OLEUI_MSG_HELP" +# define SZOLEUI_MSG_ENDDIALOGW L"OLEUI_MSG_ENDDIALOG" +# define SZOLEUI_MSG_BROWSEW L"OLEUI_MSG_BROWSE" +# define SZOLEUI_MSG_CHANGEICONW L"OLEUI_MSG_CHANGEICON" +# define SZOLEUI_MSG_CLOSEBUSYDIALOGW L"OLEUI_MSG_CLOSEBUSYDIALOG" +# define SZOLEUI_MSG_CONVERTW L"OLEUI_MSG_CONVERT" +# define SZOLEUI_MSG_CHANGESOURCEW L"OLEUI_MSG_CHANGESOURCE" +# define SZOLEUI_MSG_ADDCONTROLW L"OLEUI_MSG_ADDCONTROL" +# define SZOLEUI_MSG_BROWSE_OFNW L"OLEUI_MSG_BROWSE_OFN" +#else +static const WCHAR SZOLEUI_MSG_HELPW[] = { 'O','L','E','U','I','_','M','S','G','_','H','E','L','P',0 }; +static const WCHAR SZOLEUI_MSG_ENDDIALOGW[] = { 'O','L','E','U','I','_','M','S','G','_','E','N','D','D','I','A','L','O','G',0 }; +static const WCHAR SZOLEUI_MSG_BROWSEW[] = { 'O','L','E','U','I','_','M','S','G','_','B','R','O','W','S','E',0 }; +static const WCHAR SZOLEUI_MSG_CHANGEICONW[] = { 'O','L','E','U','I','_','M','S','G','_','C','H','A','N','G','E','I','C','O','N',0 }; +static const WCHAR SZOLEUI_MSG_CLOSEBUSYDIALOGW[] = { 'O','L','E','U','I','_','M','S','G','_','C','L','O','S','E','B','U','S','Y','D','I','A','L','O','G',0 }; +static const WCHAR SZOLEUI_MSG_CONVERTW[] = { 'O','L','E','U','I','_','M','S','G','_','C','O','N','V','E','R','T',0 }; +static const WCHAR SZOLEUI_MSG_CHANGESOURCEW[] = { 'O','L','E','U','I','_','M','S','G','_','C','H','A','N','G','E','S','O','U','R','C','E',0 }; +static const WCHAR SZOLEUI_MSG_ADDCONTROLW[] = { 'O','L','E','U','I','_','M','S','G','_','A','D','D','C','O','N','T','R','O','L',0 }; +static const WCHAR SZOLEUI_MSG_BROWSE_OFNW[] = { 'O','L','E','U','I','_','M','S','G','_','B','R','O','W','S','E','_','O','F','N',0 }; +#endif +#define SZOLEUI_MSG_HELP WINELIB_NAME_AW(SZOLEUI_MSG_HELP) +#define SZOLEUI_MSG_ENDDIALOG WINELIB_NAME_AW(SZOLEUI_MSG_ENDDIALOG) +#define SZOLEUI_MSG_BROWSE WINELIB_NAME_AW(SZOLEUI_MSG_BROWSE) +#define SZOLEUI_MSG_CHANGEICON WINELIB_NAME_AW(SZOLEUI_MSG_CHANGEICON) +#define SZOLEUI_MSG_CLOSEBUSYDIALOG WINELIB_NAME_AW(SZOLEUI_MSG_CLOSEBUSYDIALOG) +#define SZOLEUI_MSG_CONVERT WINELIB_NAME_AW(SZOLEUI_MSG_CONVERT) +#define SZOLEUI_MSG_CHANGESOURCE WINELIB_NAME_AW(SZOLEUI_MSG_CHANGESOURCE) +#define SZOLEUI_MSG_ADDCONTROL WINELIB_NAME_AW(SZOLEUI_MSG_ADDCONTROL) +#define SZOLEUI_MSG_BROWSE_OFN WINELIB_NAME_AW(SZOLEUI_MSG_BROWSE_OFN) + + +/***************************************************************************** * INSERT OBJECT DIALOG */ typedef struct tagOLEUIINSERTOBJECTA

1 0

Huw Davies : oledlg: Move paste special dialog stubs to their own file.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 9ce684b98740af940051182b244584314e7fb191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce684b98740af940051182b2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 16:28:49 2006 +0100 oledlg: Move paste special dialog stubs to their own file. --- dlls/oledlg/Makefile.in | 3 +- dlls/oledlg/oledlg_main.c | 20 ----------------- dlls/oledlg/pastespl.c | 52 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 21 deletions(-) diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in index f6525fb..ed51a94 100644 --- a/dlls/oledlg/Makefile.in +++ b/dlls/oledlg/Makefile.in @@ -8,7 +8,8 @@ IMPORTS = ole32 comdlg32 user32 advapi C_SRCS = \ insobjdlg.c \ - oledlg_main.c + oledlg_main.c \ + pastespl.c RC_SRCS = rsrc.rc diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index 4bf0595..4ff4cfb 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -113,26 +113,6 @@ UINT WINAPI OleUIInsertObjectW(LPOLEUIIN } /*********************************************************************** - * OleUIPasteSpecialA (OLEDLG.4) - */ -UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA lpOleUIPasteSpecial) -{ - FIXME("(%p): stub\n", lpOleUIPasteSpecial); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return OLEUI_FALSE; -} - -/*********************************************************************** - * OleUIPasteSpecialW (OLEDLG.22) - */ -UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW lpOleUIPasteSpecial) -{ - FIXME("(%p): stub\n", lpOleUIPasteSpecial); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return OLEUI_FALSE; -} - -/*********************************************************************** * OleUIEditLinksA (OLEDLG.5) */ UINT WINAPI OleUIEditLinksA(LPOLEUIEDITLINKSA lpOleUIEditLinks) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c new file mode 100644 index 0000000..b146983 --- /dev/null +++ b/dlls/oledlg/pastespl.c @@ -0,0 +1,52 @@ +/* + * OleUIPasteSpecial implementation + * + * Copyright 2006 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COM_NO_WINDOWS_H +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wingdi.h" +#include "winuser.h" +#include "oledlg.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +/*********************************************************************** + * OleUIPasteSpecialA (OLEDLG.4) + */ +UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA lpOleUIPasteSpecial) +{ + FIXME("(%p): stub\n", lpOleUIPasteSpecial); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return OLEUI_FALSE; +} + +/*********************************************************************** + * OleUIPasteSpecialW (OLEDLG.22) + */ +UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW lpOleUIPasteSpecial) +{ + FIXME("(%p): stub\n", lpOleUIPasteSpecial); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return OLEUI_FALSE; +}

1 0

Huw Davies : oledlg: Register a bunch of clipboard formats.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: bed39b45ee38273e034bfc1113d8da26bdde069b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed39b45ee38273e034bfc111… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 16:47:48 2006 +0100 oledlg: Register a bunch of clipboard formats. --- dlls/oledlg/oledlg_main.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/oledlg/oledlg_private.h | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index 4ff4cfb..6ee2de9 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -27,13 +27,47 @@ #include "winerror.h" #include "wingdi.h" #include "winuser.h" #include "oledlg.h" -#include "wine/debug.h" #include "ole2.h" +#include "oledlg_private.h" + +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); HINSTANCE OLEDLG_hInstance = 0; +UINT cf_embed_source; +UINT cf_embedded_object; +UINT cf_link_source; +UINT cf_object_descriptor; +UINT cf_link_src_descriptor; +UINT cf_ownerlink; +UINT cf_filename; +UINT cf_filenamew; + +static void register_clipboard_formats(void) +{ + /* These used to be declared in olestd.h, but that seems to have been removed from the api */ + static const WCHAR CF_EMBEDSOURCEW[] = { 'E','m','b','e','d',' ','S','o','u','r','c','e',0 }; + static const WCHAR CF_EMBEDDEDOBJECTW[] = { 'E','m','b','e','d','d','e','d',' ','O','b','j','e','c','t',0 }; + static const WCHAR CF_LINKSOURCEW[] = { 'L','i','n','k',' ','S','o','u','r','c','e',0 }; + static const WCHAR CF_OBJECTDESCRIPTORW[] = { 'O','b','j','e','c','t',' ','D','e','s','c','r','i','p','t','o','r',0 }; + static const WCHAR CF_LINKSRCDESCRIPTORW[] = { 'L','i','n','k',' ','S','o','u','r','c','e',' ','D','e','s','c','r','i','p','t','o','r',0 }; + static const WCHAR CF_OWNERLINKW[] = { 'O','w','n','e','r','L','i','n','k',0 }; + static const WCHAR CF_FILENAMEW[] = { 'F','i','l','e','N','a','m','e',0 }; + static const WCHAR CF_FILENAMEWW[] = { 'F','i','l','e','N','a','m','e','W',0 }; + + /* Load in the same order as native to make debugging easier */ + cf_object_descriptor = RegisterClipboardFormatW(CF_OBJECTDESCRIPTORW); + cf_link_src_descriptor = RegisterClipboardFormatW(CF_LINKSRCDESCRIPTORW); + cf_embed_source = RegisterClipboardFormatW(CF_EMBEDSOURCEW); + cf_embedded_object = RegisterClipboardFormatW(CF_EMBEDDEDOBJECTW); + cf_link_source = RegisterClipboardFormatW(CF_LINKSOURCEW); + cf_ownerlink = RegisterClipboardFormatW(CF_OWNERLINKW); + cf_filename = RegisterClipboardFormatW(CF_FILENAMEW); + cf_filenamew = RegisterClipboardFormatW(CF_FILENAMEWW); +} + /*********************************************************************** * DllMain */ @@ -45,6 +79,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); OLEDLG_hInstance = hinstDLL; + register_clipboard_formats(); break; case DLL_PROCESS_DETACH: diff --git a/dlls/oledlg/oledlg_private.h b/dlls/oledlg/oledlg_private.h new file mode 100644 index 0000000..671eb3e --- /dev/null +++ b/dlls/oledlg/oledlg_private.h @@ -0,0 +1,33 @@ +/* + * oledlg internal header file + * + * Copyright (C) 2006 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __OLEDLG_PRIVATE_H__ +#define __OLEDLG_PRIVATE_H__ + +extern UINT cf_embed_source; +extern UINT cf_embedded_object; +extern UINT cf_link_source; +extern UINT cf_object_descriptor; +extern UINT cf_link_src_descriptor; +extern UINT cf_ownerlink; +extern UINT cf_filename; +extern UINT cf_filenamew; + +#endif /* __OLEDLG_PRIVATE_H__ */

1 0