wine-commits March 2009

wine-commits@winehq.org

2 participants
834 discussions

Ricardo Filipe : comdlg32: Send CDN_INCLUDEITEM notification for each object in an Open/Save dialog.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 13f1988720ac4829574ec6847257f71808589c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f1988720ac4829574ec6847… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Fri Mar 13 00:58:35 2009 +0000 comdlg32: Send CDN_INCLUDEITEM notification for each object in an Open/Save dialog. --- dlls/comdlg32/filedlg.c | 5 +-- dlls/comdlg32/filedlgbrowser.c | 46 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index a2826c8..4c2164d 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -37,7 +37,7 @@ * FIXME: add to recent docs * * FIXME: flags not implemented: OFN_DONTADDTORECENT, - * OFN_ENABLEINCLUDENOTIFY, OFN_ENABLESIZING, + * OFN_ENABLESIZING, * OFN_NODEREFERENCELINKS, OFN_NOREADONLYRETURN, * OFN_NOTESTFILECREATE, OFN_USEMONIKERS * @@ -82,8 +82,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #define UNIMPLEMENTED_FLAGS \ -(OFN_DONTADDTORECENT |\ -OFN_ENABLEINCLUDENOTIFY | OFN_ENABLESIZING |\ +(OFN_DONTADDTORECENT | OFN_ENABLESIZING |\ OFN_NODEREFERENCELINKS | OFN_NOREADONLYRETURN |\ OFN_NOTESTFILECREATE /*| OFN_USEMONIKERS*/) diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 704fb98..f630f14 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -846,6 +846,47 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnStateChange(ICommDlgBr return NOERROR; } +/* send_includeitem_notification + * + * Sends a CDN_INCLUDEITEM notification for "pidl" to hwndParentDlg + */ +static LRESULT send_includeitem_notification(HWND hwndParentDlg, LPCITEMIDLIST pidl) +{ + LRESULT hook_result = 0; + FileOpenDlgInfos *fodInfos = GetPropA(hwndParentDlg, FileOpenDlgInfosStr); + + if(!fodInfos) return 0; + + if(fodInfos->DlgInfos.hwndCustomDlg) + { + TRACE("call notify CDN_INCLUDEITEM for pidl=%p\n", pidl); + if(fodInfos->unicode) + { + OFNOTIFYEXW ofnNotify; + ofnNotify.psf = fodInfos->Shell.FOIShellFolder; + ofnNotify.pidl = (LPITEMIDLIST)pidl; + ofnNotify.hdr.hwndFrom = hwndParentDlg; + ofnNotify.hdr.idFrom = 0; + ofnNotify.hdr.code = CDN_INCLUDEITEM; + ofnNotify.lpOFN = fodInfos->ofnInfos; + hook_result = SendMessageW(fodInfos->DlgInfos.hwndCustomDlg, WM_NOTIFY, 0, (LPARAM)&ofnNotify); + } + else + { + OFNOTIFYEXA ofnNotify; + ofnNotify.psf = fodInfos->Shell.FOIShellFolder; + ofnNotify.pidl = (LPITEMIDLIST)pidl; + ofnNotify.hdr.hwndFrom = hwndParentDlg; + ofnNotify.hdr.idFrom = 0; + ofnNotify.hdr.code = CDN_INCLUDEITEM; + ofnNotify.lpOFN = (LPOPENFILENAMEA)fodInfos->ofnInfos; + hook_result = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg, WM_NOTIFY, 0, (LPARAM)&ofnNotify); + } + } + TRACE("Retval: 0x%08lx\n", hook_result); + return hook_result; +} + /************************************************************************** * IShellBrowserImpl_ICommDlgBrowser_IncludeObject */ @@ -875,6 +916,11 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBr if(ulAttr & (SFGAO_FOLDER | SFGAO_LINK)) return S_OK; + /* if the application takes care of including the item we are done */ + if(fodInfos->ofnInfos->Flags & OFN_ENABLEINCLUDENOTIFY && + send_includeitem_notification(This->hwndOwner, pidl)) + return S_OK; + /* Check if there is a mask to apply if not */ if(!fodInfos->ShellInfos.lpstrCurrentFilter || !lstrlenW(fodInfos->ShellInfos.lpstrCurrentFilter)) return S_OK;

1 0

Kusanagi Kouichi : winex11.drv: Make import/export functions static.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: bcdf8f6edd82bc41e70eca32cdd9e2064ec7f12a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcdf8f6edd82bc41e70eca32c… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Fri Mar 13 22:03:18 2009 +0900 winex11.drv: Make import/export functions static. --- dlls/winex11.drv/clipboard.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 7cea221..0b27a87 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1124,7 +1124,7 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedBitmap(Display *display) * * Import XA_STRING, converting the string to CF_TEXT. */ -HANDLE X11DRV_CLIPBOARD_ImportXAString(Display *display, Window w, Atom prop) +static HANDLE X11DRV_CLIPBOARD_ImportXAString(Display *display, Window w, Atom prop) { LPBYTE lpdata; unsigned long cbytes; @@ -1168,7 +1168,7 @@ HANDLE X11DRV_CLIPBOARD_ImportXAString(Display *display, Window w, Atom prop) * * Import XA_STRING, converting the string to CF_UNICODE. */ -HANDLE X11DRV_CLIPBOARD_ImportUTF8(Display *display, Window w, Atom prop) +static HANDLE X11DRV_CLIPBOARD_ImportUTF8(Display *display, Window w, Atom prop) { LPBYTE lpdata; unsigned long cbytes; @@ -1290,7 +1290,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportCompoundText(Display *display, Window w, At * * Import XA_PIXMAP, converting the image to CF_DIB. */ -HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *display, Window w, Atom prop) +static HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *display, Window w, Atom prop) { HWND hwnd; HDC hdc; @@ -1322,7 +1322,7 @@ HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *display, Window w, Atom prop) * * Import MetaFilePict. */ -HANDLE X11DRV_CLIPBOARD_ImportMetaFilePict(Display *display, Window w, Atom prop) +static HANDLE X11DRV_CLIPBOARD_ImportMetaFilePict(Display *display, Window w, Atom prop) { LPBYTE lpdata; unsigned long cbytes; @@ -1346,7 +1346,7 @@ HANDLE X11DRV_CLIPBOARD_ImportMetaFilePict(Display *display, Window w, Atom prop * * Import EnhMetaFile. */ -HANDLE X11DRV_CLIPBOARD_ImportEnhMetaFile(Display *display, Window w, Atom prop) +static HANDLE X11DRV_CLIPBOARD_ImportEnhMetaFile(Display *display, Window w, Atom prop) { LPBYTE lpdata; unsigned long cbytes; @@ -1370,7 +1370,7 @@ HANDLE X11DRV_CLIPBOARD_ImportEnhMetaFile(Display *display, Window w, Atom prop) * * Generic import clipboard data routine. */ -HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *display, Window w, Atom prop) +static HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *display, Window w, Atom prop) { LPVOID lpClipData; LPBYTE lpdata; @@ -1411,7 +1411,7 @@ HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *display, Window w, Atom pro * * Generic export clipboard data routine. */ -HANDLE X11DRV_CLIPBOARD_ExportClipboardData(Display *display, Window requestor, Atom aTarget, +static HANDLE X11DRV_CLIPBOARD_ExportClipboardData(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpData, LPDWORD lpBytes) { LPVOID lpClipData; @@ -1596,7 +1596,7 @@ static HANDLE X11DRV_CLIPBOARD_ExportCompoundText(Display *display, Window reque * * Export string */ -HANDLE X11DRV_CLIPBOARD_ExportString(Display *display, Window requestor, Atom aTarget, Atom rprop, +static HANDLE X11DRV_CLIPBOARD_ExportString(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpData, LPDWORD lpBytes) { if (X11DRV_CLIPBOARD_RenderFormat(display, lpData)) @@ -1624,7 +1624,7 @@ HANDLE X11DRV_CLIPBOARD_ExportString(Display *display, Window requestor, Atom aT * * Export CF_DIB to XA_PIXMAP. */ -HANDLE X11DRV_CLIPBOARD_ExportXAPIXMAP(Display *display, Window requestor, Atom aTarget, Atom rprop, +static HANDLE X11DRV_CLIPBOARD_ExportXAPIXMAP(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes) { HDC hdc; @@ -1662,7 +1662,7 @@ HANDLE X11DRV_CLIPBOARD_ExportXAPIXMAP(Display *display, Window requestor, Atom * * Export MetaFilePict. */ -HANDLE X11DRV_CLIPBOARD_ExportMetaFilePict(Display *display, Window requestor, Atom aTarget, Atom rprop, +static HANDLE X11DRV_CLIPBOARD_ExportMetaFilePict(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes) { if (!X11DRV_CLIPBOARD_RenderFormat(display, lpdata)) @@ -1680,7 +1680,7 @@ HANDLE X11DRV_CLIPBOARD_ExportMetaFilePict(Display *display, Window requestor, A * * Export EnhMetaFile. */ -HANDLE X11DRV_CLIPBOARD_ExportEnhMetaFile(Display *display, Window requestor, Atom aTarget, Atom rprop, +static HANDLE X11DRV_CLIPBOARD_ExportEnhMetaFile(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes) { if (!X11DRV_CLIPBOARD_RenderFormat(display, lpdata))

1 0

Ken Thomases : dbghelp: Include Mach-O modules in minidumps.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 31fd8dd763519cfcfd84bb09c4974668e85e20b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31fd8dd763519cfcfd84bb09c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Mar 13 11:48:27 2009 -0500 dbghelp: Include Mach-O modules in minidumps. --- dlls/dbghelp/minidump.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index da0632a..78e754f 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -316,6 +316,27 @@ static BOOL fetch_elf_module_info_cb(const WCHAR* name, unsigned long base, return TRUE; } +/****************************************************************** + * fetch_macho_module_info_cb + * + * Callback for accumulating in dump_context a Mach-O modules set + */ +static BOOL fetch_macho_module_info_cb(const WCHAR* name, unsigned long base, + void* user) +{ + struct dump_context* dc = (struct dump_context*)user; + DWORD rbase, size, checksum; + + /* FIXME: there's no relevant timestamp on Mach-O modules */ + /* NB: if we have a non-null base from the live-target use it. If we have + * a null base, then grab its base address from Mach-O file. + */ + if (!macho_fetch_file_info(name, &rbase, &size, &checksum)) + size = checksum = 0; + add_module(dc, name, base ? base : rbase, size, 0 /* FIXME */, checksum, TRUE); + return TRUE; +} + static void fetch_modules_info(struct dump_context* dc) { EnumerateLoadedModulesW64(dc->hProcess, fetch_pe_module_info_cb, dc); @@ -325,6 +346,7 @@ static void fetch_modules_info(struct dump_context* dc) * a given application in a post mortem debugging condition. */ elf_enum_modules(dc->hProcess, fetch_elf_module_info_cb, dc); + macho_enum_modules(dc->hProcess, fetch_macho_module_info_cb, dc); } static void fetch_module_versioninfo(LPCWSTR filename, VS_FIXEDFILEINFO* ffi)

1 0

Ken Thomases : dbghelp/stabs: For Mach-O, line numbers use absolute address , not offset.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 3a96219d5784d7a924b2dab8f7eac842ad3a120f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a96219d5784d7a924b2dab8f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Mar 13 11:48:21 2009 -0500 dbghelp/stabs: For Mach-O, line numbers use absolute address, not offset. So, compute the offset by subtracting the function address. --- dlls/dbghelp/stabs.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index fd88722..b2df46a 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1202,6 +1202,8 @@ static void pending_flush(struct pending_list* pending, struct module* module, block, pending->objs[i].u.var.type, pending->objs[i].u.var.name); break; case PENDING_LINE: + if (module->type == DMT_MACHO) + pending->objs[i].u.line.offset -= func->address; symt_add_func_line(module, func, pending->objs[i].u.line.source_idx, pending->objs[i].u.line.line_num, pending->objs[i].u.line.offset); break; @@ -1485,8 +1487,11 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, assert(source_idx >= 0); if (curr_func != NULL) { + unsigned long offset = stab_ptr->n_value; + if (module->type == DMT_MACHO) + offset -= curr_func->address; symt_add_func_line(module, curr_func, source_idx, - stab_ptr->n_desc, stab_ptr->n_value); + stab_ptr->n_desc, offset); } else pending_add_line(&pending_func, source_idx, stab_ptr->n_desc, stab_ptr->n_value);

1 0

Ken Thomases : dbghelp: Recognize .dylib files as Mach-O modules.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: feedbb1630ad5136eccd37487603f169dd89e4ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=feedbb1630ad5136eccd37487… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Mar 13 11:48:07 2009 -0500 dbghelp: Recognize .dylib files as Mach-O modules. --- dlls/dbghelp/module.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 3e32a82..1a3d94e 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); const WCHAR S_ElfW[] = {'<','e','l','f','>','\0'}; const WCHAR S_WineLoaderW[] = {'<','w','i','n','e','-','l','o','a','d','e','r','>','\0'}; static const WCHAR S_DotSoW[] = {'.','s','o','\0'}; +static const WCHAR S_DotDylibW[] = {'.','d','y','l','i','b','\0'}; static const WCHAR S_DotPdbW[] = {'.','p','d','b','\0'}; static const WCHAR S_DotDbgW[] = {'.','d','b','g','\0'}; const WCHAR S_WineW[] = {'w','i','n','e',0}; @@ -430,6 +431,9 @@ enum module_type module_get_type_by_name(const WCHAR* name) return DMT_ELF; #endif + if (len > 6 && !strncmpiW(name + len - 6, S_DotDylibW, 6)) + return DMT_MACHO; + if (len > 4 && !strncmpiW(name + len - 4, S_DotPdbW, 4)) return DMT_PDB;

1 0

Ken Thomases : dbghelp: Add support for debugging Mach-O modules.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: d7466e0c4e8202d1713d7f50c8029ff4f6d74fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7466e0c4e8202d1713d7f50c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Mar 13 11:48:00 2009 -0500 dbghelp: Add support for debugging Mach-O modules. --- dlls/dbghelp/Makefile.in | 1 + dlls/dbghelp/dbghelp.c | 4 +- dlls/dbghelp/dbghelp_private.h | 16 +- dlls/dbghelp/macho_module.c | 1438 ++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/module.c | 51 ++- dlls/dbghelp/path.c | 15 + dlls/dbghelp/symbol.c | 5 +- 7 files changed, 1515 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7466e0c4e8202d1713d7…

1 0

Aric Stewart : msctf: Hook up the DocumentMgr to be able to forward ITfThreadMgrEventSink events to sinks advised to the ThreadMgr .
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: db37679b4e8e3e25729ec2364027d78cd8de60f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db37679b4e8e3e25729ec2364… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 24 08:21:47 2009 -0500 msctf: Hook up the DocumentMgr to be able to forward ITfThreadMgrEventSink events to sinks advised to the ThreadMgr. --- dlls/msctf/documentmgr.c | 20 ++++++- dlls/msctf/msctf_internal.h | 2 +- dlls/msctf/threadmgr.c | 134 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 153 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index c875145..ab250cb 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -46,6 +46,7 @@ typedef struct tagDocumentMgr { LONG refCount; ITfContext* contextStack[2]; /* limit of 2 contexts */ + ITfThreadMgrEventSink* ThreadMgrSink; } DocumentMgr; static inline DocumentMgr *impl_from_ITfSourceVtbl(ITfSource *iface) @@ -130,9 +131,14 @@ static HRESULT WINAPI DocumentMgr_Push(ITfDocumentMgr *iface, ITfContext *pic) if (!pic || FAILED(IUnknown_QueryInterface(pic,&IID_ITfContext,(LPVOID*) &check))) return E_INVALIDARG; + if (This->contextStack[0] == NULL) + ITfThreadMgrEventSink_OnInitDocumentMgr(This->ThreadMgrSink,iface); + This->contextStack[1] = This->contextStack[0]; This->contextStack[0] = check; + ITfThreadMgrEventSink_OnPushContext(This->ThreadMgrSink,check); + return S_OK; } @@ -144,10 +150,17 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) if (dwFlags == TF_POPF_ALL) { if (This->contextStack[0]) + { + ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[0]); ITfContext_Release(This->contextStack[0]); + } if (This->contextStack[1]) + { + ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[1]); ITfContext_Release(This->contextStack[1]); + } This->contextStack[0] = This->contextStack[1] = NULL; + ITfThreadMgrEventSink_OnUninitDocumentMgr(This->ThreadMgrSink, iface); return S_OK; } @@ -157,10 +170,14 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) if (This->contextStack[0] == NULL) /* Cannot pop last context */ return E_FAIL; + ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[0]); ITfContext_Release(This->contextStack[0]); This->contextStack[0] = This->contextStack[1]; This->contextStack[1] = NULL; + if (This->contextStack[0] == NULL) + ITfThreadMgrEventSink_OnUninitDocumentMgr(This->ThreadMgrSink, iface); + return S_OK; } @@ -262,7 +279,7 @@ static const ITfSourceVtbl DocumentMgr_SourceVtbl = DocumentMgrSource_UnadviseSink, }; -HRESULT DocumentMgr_Constructor(ITfDocumentMgr **ppOut) +HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumentMgr **ppOut) { DocumentMgr *This; @@ -273,6 +290,7 @@ HRESULT DocumentMgr_Constructor(ITfDocumentMgr **ppOut) This->DocumentMgrVtbl= &DocumentMgr_DocumentMgrVtbl; This->SourceVtbl = &DocumentMgr_SourceVtbl; This->refCount = 1; + This->ThreadMgrSink = ThreadMgrSink; TRACE("returning %p\n", This); *ppOut = (ITfDocumentMgr*)This; diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 4d83aa3..7a05b7b 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -23,7 +23,7 @@ extern DWORD tlsIndex; extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); -extern HRESULT DocumentMgr_Constructor(ITfDocumentMgr **ppOut); +extern HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink*, ITfDocumentMgr **ppOut); extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **ppOut, TfEditCookie *pecTextStore); extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 080c023..b2ec069 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -61,6 +61,8 @@ typedef struct tagACLMulti { const ITfSourceVtbl *SourceVtbl; LONG refCount; + const ITfThreadMgrEventSinkVtbl *ThreadMgrEventSinkVtbl; /* internal */ + ITfDocumentMgr *focus; /* kept as separate lists to reduce unnecessary iterations */ @@ -77,6 +79,11 @@ static inline ThreadMgr *impl_from_ITfSourceVtbl(ITfSource *iface) return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,SourceVtbl)); } +static inline ThreadMgr *impl_from_ITfThreadMgrEventSink(ITfThreadMgrEventSink *iface) +{ + return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,ThreadMgrEventSinkVtbl)); +} + static void free_sink(ThreadMgrSink *sink) { IUnknown_Release(sink->interfaces.pIUnknown); @@ -195,8 +202,9 @@ static HRESULT WINAPI ThreadMgr_fnDeactivate( ITfThreadMgr* iface) static HRESULT WINAPI ThreadMgr_CreateDocumentMgr( ITfThreadMgr* iface, ITfDocumentMgr **ppdim) { + ThreadMgr *This = (ThreadMgr *)iface; TRACE("(%p)\n",iface); - return DocumentMgr_Constructor(ppdim); + return DocumentMgr_Constructor((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, ppdim); } static HRESULT WINAPI ThreadMgr_EnumDocumentMgrs( ITfThreadMgr* iface, IEnumTfDocumentMgrs @@ -238,6 +246,8 @@ static HRESULT WINAPI ThreadMgr_SetFocus( ITfThreadMgr* iface, ITfDocumentMgr *p if (!pdimFocus || FAILED(IUnknown_QueryInterface(pdimFocus,&IID_ITfDocumentMgr,(LPVOID*) &check))) return E_INVALIDARG; + ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, This->focus, check); + if (This->focus) ITfDocumentMgr_Release(This->focus); @@ -377,6 +387,127 @@ static const ITfSourceVtbl ThreadMgr_SourceVtbl = ThreadMgrSource_UnadviseSink, }; +/***************************************************** + * ITfThreadMgrEventSink functions (internal) + *****************************************************/ +static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *iface, REFIID iid, LPVOID *ppvOut) +{ + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut); +} + +static ULONG WINAPI ThreadMgrEventSink_AddRef(ITfThreadMgrEventSink *iface) +{ + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + return ThreadMgr_AddRef((ITfThreadMgr*)This); +} + +static ULONG WINAPI ThreadMgrEventSink_Release(ITfThreadMgrEventSink *iface) +{ + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + return ThreadMgr_Release((ITfThreadMgr *)This); +} + + +static WINAPI HRESULT ThreadMgrEventSink_OnInitDocumentMgr( + ITfThreadMgrEventSink *iface,ITfDocumentMgr *pdim) +{ + struct list *cursor; + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + + TRACE("(%p) %p\n",This,pdim); + + LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + ITfThreadMgrEventSink_OnInitDocumentMgr(sink->interfaces.pITfThreadMgrEventSink,pdim); + } + + return S_OK; +} + +static WINAPI HRESULT ThreadMgrEventSink_OnUninitDocumentMgr( + ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdim) +{ + struct list *cursor; + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + + TRACE("(%p) %p\n",This,pdim); + + LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + ITfThreadMgrEventSink_OnUninitDocumentMgr(sink->interfaces.pITfThreadMgrEventSink,pdim); + } + + return S_OK; +} + +static WINAPI HRESULT ThreadMgrEventSink_OnSetFocus( + ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdimFocus, + ITfDocumentMgr *pdimPrevFocus) +{ + struct list *cursor; + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + + TRACE("(%p) %p %p\n",This,pdimFocus, pdimPrevFocus); + + LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + ITfThreadMgrEventSink_OnSetFocus(sink->interfaces.pITfThreadMgrEventSink, pdimFocus, pdimPrevFocus); + } + + return S_OK; +} + +static WINAPI HRESULT ThreadMgrEventSink_OnPushContext( + ITfThreadMgrEventSink *iface, ITfContext *pic) +{ + struct list *cursor; + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + + TRACE("(%p) %p\n",This,pic); + + LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + ITfThreadMgrEventSink_OnPushContext(sink->interfaces.pITfThreadMgrEventSink,pic); + } + + return S_OK; +} + +static WINAPI HRESULT ThreadMgrEventSink_OnPopContext( + ITfThreadMgrEventSink *iface, ITfContext *pic) +{ + struct list *cursor; + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + + TRACE("(%p) %p\n",This,pic); + + LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + ITfThreadMgrEventSink_OnPopContext(sink->interfaces.pITfThreadMgrEventSink,pic); + } + + return S_OK; +} + +static const ITfThreadMgrEventSinkVtbl ThreadMgr_ThreadMgrEventSinkVtbl = +{ + ThreadMgrEventSink_QueryInterface, + ThreadMgrEventSink_AddRef, + ThreadMgrEventSink_Release, + + ThreadMgrEventSink_OnInitDocumentMgr, + ThreadMgrEventSink_OnUninitDocumentMgr, + ThreadMgrEventSink_OnSetFocus, + ThreadMgrEventSink_OnPushContext, + ThreadMgrEventSink_OnPopContext +}; + HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ThreadMgr *This; @@ -398,6 +529,7 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->ThreadMgrVtbl= &ThreadMgr_ThreadMgrVtbl; This->SourceVtbl = &ThreadMgr_SourceVtbl; + This->ThreadMgrEventSinkVtbl = &ThreadMgr_ThreadMgrEventSinkVtbl; This->refCount = 1; TlsSetValue(tlsIndex,This);

1 0

Aric Stewart : msctf: Add ITfThreadMgrEventSink to ThreadMgr.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 1f21795f93131a8b06004fffff44bd937f5ec59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f21795f93131a8b06004ffff… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 24 08:21:39 2009 -0500 msctf: Add ITfThreadMgrEventSink to ThreadMgr. --- dlls/msctf/threadmgr.c | 34 +++++++++++++++++++++++++++++++--- include/msctf.idl | 24 ++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index eb5918e..080c023 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -32,6 +32,7 @@ #include "shlwapi.h" #include "winerror.h" #include "objbase.h" +#include "olectl.h" #include "wine/unicode.h" #include "wine/list.h" @@ -51,7 +52,7 @@ typedef struct tagThreadMgrSink { /* ITfKeyTraceEventSink *pITfKeyTraceEventSink; */ /* ITfPreservedKeyNotifySink *pITfPreservedKeyNotifySink; */ /* ITfThreadFocusSink *pITfThreadFocusSink; */ - /* ITfThreadMgrEventSink *pITfThreadMgrEventSink; */ + ITfThreadMgrEventSink *pITfThreadMgrEventSink; } interfaces; } ThreadMgrSink; @@ -327,9 +328,36 @@ static ULONG WINAPI Source_Release(ITfSource *iface) static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { + ThreadMgrSink *tms; ThreadMgr *This = impl_from_ITfSourceVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie); + + if (!riid || !punk || !pdwCookie) + return E_INVALIDARG; + + if (IsEqualIID(riid, &IID_ITfThreadMgrEventSink)) + { + tms = HeapAlloc(GetProcessHeap(),0,sizeof(ThreadMgrSink)); + if (!tms) + return E_OUTOFMEMORY; + if (!SUCCEEDED(IUnknown_QueryInterface(punk, riid, (LPVOID*)&tms->interfaces.pITfThreadMgrEventSink))) + { + HeapFree(GetProcessHeap(),0,tms); + return CONNECT_E_CANNOTCONNECT; + } + list_add_head(&This->ThreadMgrEventSink,&tms->entry); + *pdwCookie = (DWORD)tms; + } + else + { + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); + return E_NOTIMPL; + } + + TRACE("cookie %x\n",*pdwCookie); + + return S_OK; } static WINAPI HRESULT ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) diff --git a/include/msctf.idl b/include/msctf.idl index d9c9710..c81c0da 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -486,3 +486,27 @@ interface ITfTextInputProcessor : IUnknown HRESULT Deactivate(); }; + +[ + object, + uuid(aa80e80e-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface ITfThreadMgrEventSink : IUnknown +{ + HRESULT OnInitDocumentMgr( + [in] ITfDocumentMgr *pdim); + + HRESULT OnUninitDocumentMgr( + [in] ITfDocumentMgr *pdim); + + HRESULT OnSetFocus( + [in] ITfDocumentMgr *pdimFocus, + [in] ITfDocumentMgr *pdimPrevFocus); + + HRESULT OnPushContext( + [in] ITfContext *pic); + + HRESULT OnPopContext( + [in] ITfContext *pic); +};

1 0

Aric Stewart : msctf: Define ITfTextInputProcessor. Implemented by the Text Services.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 3cf4284309809424c6933b4b3cd391bca0e8f3c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf4284309809424c6933b4b3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 24 08:45:06 2009 -0500 msctf: Define ITfTextInputProcessor. Implemented by the Text Services. --- include/msctf.idl | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index 8411e5b..d9c9710 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -471,3 +471,18 @@ interface IEnumTfLanguageProfiles : IUnknown HRESULT Skip( [in] ULONG ulCount); }; + +[ + object, + local, + uuid(aa80e7f7-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface ITfTextInputProcessor : IUnknown +{ + HRESULT Activate( + [in] ITfThreadMgr *ptim, + [in] TfClientId tid); + + HRESULT Deactivate(); +};

1 0

Aric Stewart : msctf: ThreadMgr sink framework.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: f723e4ca0862137d6e4ad8adc22d0ee64d38e904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f723e4ca0862137d6e4ad8adc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 24 08:21:28 2009 -0500 msctf: ThreadMgr sink framework. --- dlls/msctf/threadmgr.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 76c1fd6..eb5918e 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -34,18 +34,41 @@ #include "objbase.h" #include "wine/unicode.h" +#include "wine/list.h" #include "msctf.h" #include "msctf_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(msctf); +typedef struct tagThreadMgrSink { + struct list entry; + union { + /* ThreadMgr Sinks */ + IUnknown *pIUnknown; + /* ITfActiveLanguageProfileNotifySink *pITfActiveLanguageProfileNotifySink; */ + /* ITfDisplayAttributeNotifySink *pITfDisplayAttributeNotifySink; */ + /* ITfKeyTraceEventSink *pITfKeyTraceEventSink; */ + /* ITfPreservedKeyNotifySink *pITfPreservedKeyNotifySink; */ + /* ITfThreadFocusSink *pITfThreadFocusSink; */ + /* ITfThreadMgrEventSink *pITfThreadMgrEventSink; */ + } interfaces; +} ThreadMgrSink; + typedef struct tagACLMulti { const ITfThreadMgrVtbl *ThreadMgrVtbl; const ITfSourceVtbl *SourceVtbl; LONG refCount; ITfDocumentMgr *focus; + + /* kept as separate lists to reduce unnecessary iterations */ + struct list ActiveLanguageProfileNotifySink; + struct list DisplayAttributeNotifySink; + struct list KeyTraceEventSink; + struct list PreservedKeyNotifySink; + struct list ThreadFocusSink; + struct list ThreadMgrEventSink; } ThreadMgr; static inline ThreadMgr *impl_from_ITfSourceVtbl(ITfSource *iface) @@ -53,12 +76,59 @@ static inline ThreadMgr *impl_from_ITfSourceVtbl(ITfSource *iface) return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,SourceVtbl)); } +static void free_sink(ThreadMgrSink *sink) +{ + IUnknown_Release(sink->interfaces.pIUnknown); + HeapFree(GetProcessHeap(),0,sink); +} + static void ThreadMgr_Destructor(ThreadMgr *This) { + struct list *cursor, *cursor2; + TlsSetValue(tlsIndex,NULL); TRACE("destroying %p\n", This); if (This->focus) ITfDocumentMgr_Release(This->focus); + + /* free sinks */ + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ActiveLanguageProfileNotifySink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->DisplayAttributeNotifySink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->KeyTraceEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->PreservedKeyNotifySink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ThreadFocusSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ThreadMgrEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + HeapFree(GetProcessHeap(),0,This); } @@ -303,6 +373,13 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->refCount = 1; TlsSetValue(tlsIndex,This); + list_init(&This->ActiveLanguageProfileNotifySink); + list_init(&This->DisplayAttributeNotifySink); + list_init(&This->KeyTraceEventSink); + list_init(&This->PreservedKeyNotifySink); + list_init(&This->ThreadFocusSink); + list_init(&This->ThreadMgrEventSink); + TRACE("returning %p\n", This); *ppOut = (IUnknown *)This; return S_OK;

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2009