February 2006 - Wine-Commits

Kevin Koltzau : riched20: Call GetClipboardData callback on cut/copy.
by Alexandre Julliard Feb. 23, 2006

Feb. 23, 2006

Module: wine Branch: refs/heads/master Commit: 53b74b0d56659210c960ae0662c0af397b407ec4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=53b74b0d56659210c960ae0… Author: Kevin Koltzau <kevin(a)plop.org> Date: Wed Feb 22 23:09:59 2006 -0500 riched20: Call GetClipboardData callback on cut/copy. --- dlls/riched20/editor.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 5eb9d77..cf6080a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1767,11 +1767,14 @@ LRESULT WINAPI RichEditANSIWndProc(HWND case WM_CUT: case WM_COPY: { - LPDATAOBJECT dataObj; + LPDATAOBJECT dataObj = NULL; CHARRANGE range; - HRESULT hr; + HRESULT hr = S_OK; ME_GetSelection(editor, (int*)&range.cpMin, (int*)&range.cpMax); - hr = ME_GetDataObject(editor, &range, &dataObj); + if(editor->lpOleCallback) + hr = IRichEditOleCallback_GetClipboardData(editor->lpOleCallback, &range, RECO_COPY, &dataObj); + if(FAILED(hr) || !dataObj) + hr = ME_GetDataObject(editor, &range, &dataObj); if(SUCCEEDED(hr)) { hr = OleSetClipboard(dataObj); IDataObject_Release(dataObj);

1 0

Kevin Koltzau : riched20: Enable retrieving data through the ole interface.
by Alexandre Julliard Feb. 23, 2006

Feb. 23, 2006

Module: wine Branch: refs/heads/master Commit: 33af76f991e08ff98499f55d2e9578471007e9ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=33af76f991e08ff98499f55… Author: Kevin Koltzau <kevin(a)plop.org> Date: Wed Feb 22 23:09:11 2006 -0500 riched20: Enable retrieving data through the ole interface. --- dlls/riched20/richole.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index db294e0..68492c9 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -138,8 +138,16 @@ IRichEditOle_fnGetClipboardData(IRichEdi DWORD reco, LPDATAOBJECT *lplpdataobj) { IRichEditOleImpl *This = (IRichEditOleImpl *)me; - FIXME("stub %p\n",This); - return E_NOTIMPL; + CHARRANGE tmpchrg; + + TRACE("(%p,%p,%ld)\n",This, lpchrg, reco); + if(!lplpdataobj) + return E_INVALIDARG; + if(!lpchrg) { + ME_GetSelection(This->editor, (int*)&tmpchrg.cpMin, (int*)&tmpchrg.cpMax); + lpchrg = &tmpchrg; + } + return ME_GetDataObject(This->editor, lpchrg, lplpdataobj); } static LONG WINAPI IRichEditOle_fnGetLinkCount(IRichEditOle *me)

1 0

Kevin Koltzau : riched20: Ensure copied text is terminated with a null.
by Alexandre Julliard Feb. 23, 2006

Feb. 23, 2006

Module: wine Branch: refs/heads/master Commit: d52ae24b5e41f63e73baf6f7d3c8e37728a230a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d52ae24b5e41f63e73baf6f… Author: Kevin Koltzau <kevin(a)plop.org> Date: Wed Feb 22 23:05:50 2006 -0500 riched20: Ensure copied text is terminated with a null. --- dlls/riched20/clipboard.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index 0b35cb9..eb2824a 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -335,7 +335,8 @@ static HGLOBAL get_unicode_text(ME_TextE len = lpchrg->cpMax-lpchrg->cpMin; ret = GlobalAlloc(GMEM_MOVEABLE, sizeof(WCHAR)*(len+pars+1)); data = (WCHAR *)GlobalLock(ret); - ME_GetTextW(editor, data, lpchrg->cpMin, len, TRUE); + len = ME_GetTextW(editor, data, lpchrg->cpMin, len, TRUE); + data[len] = 0; GlobalUnlock(ret); return ret; }

1 0

Kevin Koltzau : riched20: EM_GETOLEINTERFACE is not a stub.
by Alexandre Julliard Feb. 23, 2006

Feb. 23, 2006

Module: wine Branch: refs/heads/master Commit: 27e2dcff1d66926bdde48836f2cfbc2e8af95954 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=27e2dcff1d66926bdde4883… Author: Kevin Koltzau <kevin(a)plop.org> Date: Wed Feb 22 23:05:20 2006 -0500 riched20: EM_GETOLEINTERFACE is not a stub. --- dlls/riched20/editor.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 705cae6..5eb9d77 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2235,7 +2235,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND case EM_GETOLEINTERFACE: { LPVOID *ppvObj = (LPVOID*) lParam; - FIXME("EM_GETOLEINTERFACE %p: stub\n", ppvObj); return CreateIRichEditOle(editor, ppvObj); } case EM_SETOLECALLBACK:

1 0

Kevin Koltzau : riched20: Store reference to editor in ole interface.
by Alexandre Julliard Feb. 23, 2006

Feb. 23, 2006

Module: wine Branch: refs/heads/master Commit: 58b299531130d6e3be8c8a7de162f985452ecd47 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=58b299531130d6e3be8c8a7… Author: Kevin Koltzau <kevin(a)plop.org> Date: Wed Feb 22 23:05:11 2006 -0500 riched20: Store reference to editor in ole interface. --- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b846568..705cae6 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2236,7 +2236,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND { LPVOID *ppvObj = (LPVOID*) lParam; FIXME("EM_GETOLEINTERFACE %p: stub\n", ppvObj); - return CreateIRichEditOle(ppvObj); + return CreateIRichEditOle(editor, ppvObj); } case EM_SETOLECALLBACK: if(editor->lpOleCallback) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 9043f42..7376e28 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -233,7 +233,7 @@ void ME_QueueInvalidateFromCursor(ME_Tex BOOL ME_SetZoom(ME_TextEditor *editor, int numerator, int denominator); /* richole.c */ -extern LRESULT CreateIRichEditOle(LPVOID *); +extern LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *); /* wintest.c */ diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index d457414..db294e0 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -31,6 +31,7 @@ #include "winuser.h" #include "ole2.h" #include "richole.h" +#include "editor.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); @@ -38,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); typedef struct IRichEditOleImpl { const IRichEditOleVtbl *lpVtbl; LONG ref; + + ME_TextEditor *editor; } IRichEditOleImpl; /* there is no way to be consistent across different sets of headers - mingw, Wine, Win32 SDK*/ @@ -250,7 +253,7 @@ static const IRichEditOleVtbl revt = { IRichEditOle_fnImportDataObject }; -LRESULT CreateIRichEditOle(LPVOID *ppObj) +LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj) { IRichEditOleImpl *reo; @@ -260,6 +263,7 @@ LRESULT CreateIRichEditOle(LPVOID *ppObj reo->lpVtbl = &revt; reo->ref = 1; + reo->editor = editor; TRACE("Created %p\n",reo); *ppObj = (LPVOID) reo;

1 0

Kevin Koltzau : riched20: Allocate proper amount of memory for formatetc array.
by Alexandre Julliard Feb. 23, 2006

Feb. 23, 2006

Module: wine Branch: refs/heads/master Commit: c0cd38fbab0a67aebbd0257abaa69f94d8a65762 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0cd38fbab0a67aebbd0257… Author: Kevin Koltzau <kevin(a)plop.org> Date: Wed Feb 22 23:04:56 2006 -0500 riched20: Allocate proper amount of memory for formatetc array. --- dlls/riched20/clipboard.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index 50056cc..0b35cb9 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -397,10 +397,11 @@ HRESULT ME_GetDataObject(ME_TextEditor * obj->rtf = NULL; obj->fmtetc_cnt = 1; + if(editor->mode & TM_RICHTEXT) + obj->fmtetc_cnt++; obj->fmtetc = HeapAlloc(GetProcessHeap(), 0, obj->fmtetc_cnt*sizeof(FORMATETC)); InitFormatEtc(obj->fmtetc[0], CF_UNICODETEXT, TYMED_HGLOBAL); if(editor->mode & TM_RICHTEXT) { - obj->fmtetc_cnt++; obj->rtf = get_rtf_text(editor, lpchrg); InitFormatEtc(obj->fmtetc[1], cfRTF, TYMED_HGLOBAL); }

1 0

Juan Lang : crypt32: Move OIDToAlgID and AlgIDToOID to oid.c.
by Alexandre Julliard Feb. 23, 2006

Feb. 23, 2006

Module: wine Branch: refs/heads/master Commit: 6da92ded75b266d3136533c84b85c933031a5091 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6da92ded75b266d3136533c… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Feb 22 16:26:52 2006 -0800 crypt32: Move OIDToAlgID and AlgIDToOID to oid.c. --- dlls/crypt32/main.c | 90 --------------------------------------- dlls/crypt32/oid.c | 90 +++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/main.c | 103 --------------------------------------------- dlls/crypt32/tests/oid.c | 103 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 193 insertions(+), 193 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6da92ded75b266d3136…

1 0

Juan Lang : crypt32: Implement CertFindCertificateInStore, with tests.
by Alexandre Julliard Feb. 23, 2006

Feb. 23, 2006

Module: wine Branch: refs/heads/master Commit: aa6dc003a42f5ef1e1876b4621687e85eb010a31 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aa6dc003a42f5ef1e1876b4… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Feb 22 13:44:56 2006 -0800 crypt32: Implement CertFindCertificateInStore, with tests. --- dlls/crypt32/store.c | 138 ++++++++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/store.c | 150 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 269 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=aa6dc003a42f5ef1e18…

1 0

Stefan Leichter : Added msftedit.dll.
by Alexandre Julliard Feb. 22, 2006

Feb. 22, 2006

Module: wine Branch: refs/heads/master Commit: 3600b04877a5e6744746f8135da9d182c5fa470d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3600b04877a5e6744746f81… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Wed Feb 22 19:17:48 2006 +0100 Added msftedit.dll. --- configure | 3 ++- configure.ac | 1 + dlls/Makefile.in | 6 ++++++ dlls/msftedit/.gitignore | 2 ++ dlls/msftedit/Makefile.in | 11 +++++++++++ dlls/msftedit/msftedit.spec | 14 ++++++++++++++ 6 files changed, 36 insertions(+), 1 deletions(-) create mode 100644 dlls/msftedit/.gitignore create mode 100644 dlls/msftedit/Makefile.in create mode 100644 dlls/msftedit/msftedit.spec Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3600b04877a5e674474…

1 0

Kevin Koltzau : riched20: Add IDataObject implementation and use it for cut /copy.
by Alexandre Julliard Feb. 22, 2006

Feb. 22, 2006

Module: wine Branch: refs/heads/master Commit: a13245847fcc4e7fd80a89d445e91b76b62f122b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a13245847fcc4e7fd80a89d… Author: Kevin Koltzau <kevin(a)plop.org> Date: Wed Feb 22 13:56:11 2006 -0500 riched20: Add IDataObject implementation and use it for cut/copy. --- dlls/riched20/Makefile.in | 1 dlls/riched20/clipboard.c | 410 +++++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/editor.c | 63 +------ dlls/riched20/editor.h | 12 + dlls/riched20/editstr.h | 5 - 5 files changed, 437 insertions(+), 54 deletions(-) create mode 100644 dlls/riched20/clipboard.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a13245847fcc4e7fd80…

1 0