January 2010 - Wine-commits

Juan Lang : wintrust: Return error directly from SOFTPUB_LoadCertMessage.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: dce2a4590d1bad68797a31f911a9d16882867c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dce2a4590d1bad68797a31f91… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 10:42:34 2010 -0800 wintrust: Return error directly from SOFTPUB_LoadCertMessage. --- dlls/wintrust/softpub.c | 34 +++++++++++++--------------------- 1 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 2524df3..bf866c3 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -282,9 +282,9 @@ error: return err; } -static BOOL SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) +static DWORD SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) { - BOOL ret; + DWORD err; if (data->pWintrustData->u.pCert && WVT_IS_CBSTRUCT_GT_MEMBEROFFSET(WINTRUST_CERT_INFO, @@ -294,6 +294,7 @@ static BOOL SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) { CRYPT_PROVIDER_SGNR signer = { sizeof(signer), { 0 } }; DWORD i; + BOOL ret; /* Add a signer with nothing but the time to verify, so we can * add a cert to it @@ -321,19 +322,18 @@ static BOOL SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) ret = data->psPfns->pfnAddStore2Chain(data, data->pWintrustData->u.pCert->pahStores[i]); } + if (!ret) + err = GetLastError(); } else { /* Do nothing!? See the tests */ - ret = TRUE; + err = ERROR_SUCCESS; } } else - { - SetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; - } - return ret; + err = ERROR_INVALID_PARAMETER; + return err; } static DWORD SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) @@ -408,7 +408,6 @@ error: HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) { - BOOL ret = TRUE; DWORD err = ERROR_SUCCESS; TRACE("(%p)\n", data); @@ -419,7 +418,7 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) switch (data->pWintrustData->dwUnionChoice) { case WTD_CHOICE_CERT: - ret = SOFTPUB_LoadCertMessage(data); + err = SOFTPUB_LoadCertMessage(data); break; case WTD_CHOICE_FILE: err = SOFTPUB_LoadFileMessage(data); @@ -429,21 +428,14 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) break; default: FIXME("unimplemented for %d\n", data->pWintrustData->dwUnionChoice); - SetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; + err = ERROR_INVALID_PARAMETER; } - if (!ret) - data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] = - GetLastError(); - else if (err) - { + if (err) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] = err; - ret = FALSE; - } - TRACE("returning %d (%08x)\n", ret ? S_OK : S_FALSE, + TRACE("returning %d (%08x)\n", !err ? S_OK : S_FALSE, data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); - return ret ? S_OK : S_FALSE; + return !err ? S_OK : S_FALSE; } static CMSG_SIGNER_INFO *WINTRUST_GetSigner(CRYPT_PROVIDER_DATA *data,

1 0

Juan Lang : wintrust: Close file handle on error loading a message from it.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 4c1e554d191d7e75b3f9f12e0531e24bf231ef0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c1e554d191d7e75b3f9f12e0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 11:01:21 2010 -0800 wintrust: Close file handle on error loading a message from it. --- dlls/wintrust/softpub.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index bf866c3..8d017d2 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -364,6 +364,14 @@ static DWORD SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) err = SOFTPUB_DecodeInnerContent(data); error: + if (err && data->fOpenedFile && data->pWintrustData->u.pFile) + { + /* The caller won't expect the file to be open on failure, so close it. + */ + CloseHandle(data->pWintrustData->u.pFile->hFile); + data->pWintrustData->u.pFile->hFile = INVALID_HANDLE_VALUE; + data->fOpenedFile = FALSE; + } return err; }

1 0

Igor Paliychuk : crypt32: Add Ukrainian translations.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 17f674c2e78aff8cb421bab37c1caabd52cb04b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17f674c2e78aff8cb421bab37… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Sun Jan 24 21:48:44 2010 +0200 crypt32: Add Ukrainian translations. --- dlls/crypt32/Makefile.in | 1 + dlls/crypt32/crypt32_Uk.rc | 247 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 248 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17f674c2e78aff8cb421b…

1 0

Jacek Caban : mshtml.idl: Remove useless semicolons.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 100b7f580fa2346a600f942cbfbca5ad3cc7424f URL: http://source.winehq.org/git/wine.git/?a=commit;h=100b7f580fa2346a600f942cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 28 02:09:56 2010 +0100 mshtml.idl: Remove useless semicolons. --- include/mshtml.idl | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index a931688..ee01a8c 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -2876,7 +2876,7 @@ interface IHTMLCurrentStyle4 : IDispatch [propget, id(DISPID_IHTMLCURRENTSTYLE4_MAXWIDTH), displaybind, bindable] HRESULT maxWidth([retval, out] VARIANT * p); -}; +} /***************************************************************************** * DispHTMLCurrentStyle dispinterface @@ -5903,7 +5903,7 @@ coclass HTMLStyleSheetPage [default] dispinterface DispHTMLStyleSheetPage; interface IHTMLStyleSheetPage; interface IHTMLDOMConstructor; -}; +} [ odl, @@ -6702,7 +6702,7 @@ methods: [id(DISPID_HTMLFORMELEMENTEVENTS_ONRESET)] VARIANT_BOOL onreset(); -}; +} interface IHTMLEventObj; @@ -6905,7 +6905,7 @@ methods: [id(DISPID_HTMLFORMELEMENTEVENTS2_ONRESET)] VARIANT_BOOL onreset([in] IHTMLEventObj* pEvtObj); -}; +} [ noncreatable, @@ -7365,7 +7365,7 @@ interface IHTMLControlElement : IDispatch [propget, id(DISPID_IHTMLCONTROLELEMENT_CLIENTLEFT), displaybind, bindable] HRESULT clientLeft([retval, out] LONG * p); -}; +} /***************************************************************************** * IHTMLBodyElement interface @@ -7634,7 +7634,7 @@ methods: [propget, id(DISPID_IHTMLBODYELEMENT2_ONAFTERPRINT), displaybind, bindable] VARIANT onafterprint(); -}; +} [ uuid(3050f24a-98b5-11cf-bb82-00aa00bdce0b) @@ -7655,7 +7655,7 @@ coclass HTMLBody interface IHTMLTextContainer; interface IHTMLBodyElement; interface IHTMLBodyElement2; -}; +} /***************************************************************************** * IHTMLAnchorElement interface @@ -10245,7 +10245,7 @@ interface IHTMLWindow4 : IDispatch [propget, id(DISPID_IHTMLWINDOW4_FRAMEELEMENT)] HRESULT frameElement([retval, out] IHTMLFrameBase* * p); -}; +} /***************************************************************************** * IHTMLWindow5 interface @@ -10263,7 +10263,7 @@ interface IHTMLWindow5 : IDispatch [propget, id(DISPID_IHTMLWINDOW5_XMLHTTPREQUEST)] HRESULT XMLHttpRequest([retval, out] VARIANT * p); -}; +} /***************************************************************************** * DispHTMLScreen dispinterface @@ -10902,7 +10902,7 @@ methods: [propget, id(DISPID_IHTMLWINDOW5_XMLHTTPREQUEST)] VARIANT XMLHttpRequest(); -}; +} /***************************************************************************** * HTMLWindowEvents interface @@ -10949,7 +10949,7 @@ methods: [id(DISPID_HTMLWINDOWEVENTS_ONAFTERPRINT)] void onafterprint(); -}; +} /***************************************************************************** * HTMLWindowEvents2 interface @@ -10996,7 +10996,7 @@ methods: [id(DISPID_HTMLWINDOWEVENTS2_ONAFTERPRINT)] void onafterprint([in] IHTMLEventObj* pEvtObj); -}; +} /***************************************************************************** * HTMLWindowProxy class @@ -11013,7 +11013,7 @@ coclass HTMLWindowProxy interface IHTMLWindow3; interface IHTMLWindow4; interface IHTMLWindow5; -}; +} /***************************************************************************** * HTMLDocumentEvents2 interface @@ -11473,7 +11473,7 @@ methods: [id(DISPID_HTMLTEXTCONTAINEREVENTS_ONSELECT)] void onselect(); -}; +} /***************************************************************************** * HTMLTextContainerEvents2 interface @@ -11677,7 +11677,7 @@ methods: [id(DISPID_HTMLTEXTCONTAINEREVENTS2_ONSELECT)] void onselect([in] IHTMLEventObj* pEvtObj); -}; +} /***************************************************************************** * IHTMLDocument interface @@ -13329,7 +13329,8 @@ methods: [id(DISPID_HTMLELEMENTEVENTS2_ONMOUSEWHEEL)] VARIANT_BOOL onmousewheel([in] IHTMLEventObj* pEvtObj); -}; +} + [ hidden, uuid(3050f33c-98b5-11cf-bb82-00aa00bdce0b) @@ -13526,8 +13527,7 @@ methods: [id(DISPID_HTMLELEMENTEVENTS_ONFOCUSOUT)] void onfocusout(); - -}; +} [ noncreatable, @@ -13943,7 +13943,7 @@ methods: [id(DISPID_HTMLELEMENTEVENTS2_ONMOUSEWHEEL)] VARIANT_BOOL onmousewheel([in] IHTMLEventObj* pEvtObj); -}; +} /***************************************************************************** * IHTMLTableCaption interface @@ -14153,7 +14153,7 @@ interface IHTMLTable2 : IDispatch HRESULT moveRow([defaultvalue(-1), in] LONG indexFrom, [defaultvalue(-1), in] LONG indexTo, [retval, out] IDispatch** row); -}; +} [ odl, @@ -14168,7 +14168,7 @@ interface IHTMLTable3 : IDispatch [propget, id(DISPID_IHTMLTABLE3_SUMMARY), displaybind, bindable] HRESULT summary([retval, out] BSTR * p); -}; +} [ noncreatable, @@ -14191,7 +14191,7 @@ coclass HTMLTable interface IHTMLTable; interface IHTMLTable2; interface IHTMLTable3; -}; +} [ odl,

1 0

Jacek Caban : mshtml: Added script element IDispatchEx support.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 7bf41fac63332a916a46440983bfb68df85607be URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf41fac63332a916a4644098… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 28 02:10:24 2010 +0100 mshtml: Added script element IDispatchEx support. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmlscript.c | 15 ++++++++++++++- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index ca09313..d7220d7 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -100,6 +100,7 @@ static REFIID tid_ids[] = { &DIID_DispHTMLNavigator, &DIID_DispHTMLOptionElement, &DIID_DispHTMLScreen, + &DIID_DispHTMLScriptElement, &DIID_DispHTMLSelectElement, &DIID_DispHTMLStyle, &DIID_DispHTMLTable, @@ -142,6 +143,7 @@ static REFIID tid_ids[] = { &IID_IHTMLLocation, &IID_IHTMLOptionElement, &IID_IHTMLScreen, + &IID_IHTMLScriptElement, &IID_IHTMLSelectElement, &IID_IHTMLStyle, &IID_IHTMLStyle2, diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index d86f398..2427309 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -319,6 +319,19 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { HTMLScriptElement_get_readystate }; +static const tid_t HTMLScriptElement_iface_tids[] = { + HTMLELEMENT_TIDS, + IHTMLScriptElement_tid, + 0 +}; + +static dispex_static_data_t HTMLScriptElement_dispex = { + NULL, + DispHTMLScriptElement_tid, + NULL, + HTMLScriptElement_iface_tids +}; + HTMLElement *HTMLScriptElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) { HTMLScriptElement *ret = heap_alloc_zero(sizeof(HTMLScriptElement)); @@ -327,7 +340,7 @@ HTMLElement *HTMLScriptElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement * ret->lpHTMLScriptElementVtbl = &HTMLScriptElementVtbl; ret->element.node.vtbl = &HTMLScriptElementImplVtbl; - HTMLElement_Init(&ret->element, doc, nselem, NULL); + HTMLElement_Init(&ret->element, doc, nselem, &HTMLScriptElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLScriptElement, (void**)&ret->nsscript); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 30b47e8..8a1ff01 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -76,6 +76,7 @@ typedef enum { DispHTMLNavigator_tid, DispHTMLOptionElement_tid, DispHTMLScreen_tid, + DispHTMLScriptElement_tid, DispHTMLSelectElement_tid, DispHTMLStyle_tid, DispHTMLTable_tid, @@ -118,6 +119,7 @@ typedef enum { IHTMLLocation_tid, IHTMLOptionElement_tid, IHTMLScreen_tid, + IHTMLScriptElement_tid, IHTMLSelectElement_tid, IHTMLStyle_tid, IHTMLStyle2_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c818a1d..581d9d4 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -412,7 +412,7 @@ static const elem_type_info_t elem_type_infos[] = { {"BR", elem_iids, NULL}, {"TABLE", table_iids, &DIID_DispHTMLTable}, {"TBODY", elem_iids, NULL}, - {"SCRIPT", script_iids, NULL}, + {"SCRIPT", script_iids, &DIID_DispHTMLScriptElement}, {"TEST", elem_iids, &DIID_DispHTMLUnknownElement}, {"TEST", generic_iids, &DIID_DispHTMLGenericElement}, {"!", comment_iids, &DIID_DispHTMLCommentElement},

1 0

Jörg Höhle : winmm: Fix MIDI resource leaks.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 9fac9d8ffdc2d935d69bc11fc36ec714e8befa94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fac9d8ffdc2d935d69bc11fc… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 27 18:16:55 2010 +0100 winmm: Fix MIDI resource leaks. --- dlls/winmm/winmm.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index b2caa48..1a1fdad 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1772,6 +1772,10 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, /* FIXME: the correct value is not allocated yet for MAPPER */ mosm.wDeviceID = *lpuDeviceID; lpwm = MIDI_OutAlloc(&hMidiOut, &dwCallback, &dwInstance, &fdwOpen, 1, &mosm); + if (!lpwm) { + HeapFree(GetProcessHeap(), 0, lpMidiStrm); + return MMSYSERR_NOMEM; + } lpMidiStrm->hDevice = hMidiOut; if (lphMidiStrm) *lphMidiStrm = (HMIDISTRM)hMidiOut; @@ -1779,6 +1783,12 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, lpwm->mld.uDeviceID = *lpuDeviceID; ret = MMDRV_Open(&lpwm->mld, MODM_OPEN, (DWORD_PTR)&lpwm->mod, fdwOpen); + if (ret != MMSYSERR_NOERROR) { + MMDRV_Free(hMidiOut, &lpwm->mld); + HeapFree(GetProcessHeap(), 0, lpMidiStrm); + return ret; + } + lpMidiStrm->hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); lpMidiStrm->wFlags = HIWORD(fdwOpen);

1 0

Jörg Höhle : midimap: Refuse to open when asked for yet unimplemented callbacks.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 8894da4a6e3d6a0f5d15d5770ef8102162f6facc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8894da4a6e3d6a0f5d15d5770… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 27 17:18:14 2010 +0100 midimap: Refuse to open when asked for yet unimplemented callbacks. --- dlls/midimap/midimap.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 120a054..f429497 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -266,6 +266,12 @@ static DWORD modOpen(DWORD_PTR *lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) if (!mom) return MMSYSERR_NOMEM; + if (HIWORD(dwFlags & CALLBACK_TYPEMASK)) { + FIXME("NIY callback flags %08x\n", dwFlags); + HeapFree(GetProcessHeap(), 0, mom); + return MMSYSERR_INVALFLAG; + } + if (MIDIMAP_LoadSettings(mom)) { *lpdwUser = (DWORD_PTR)mom;

1 0

Erich Hoover : hhctrl.ocx: Separate the HTML Help stream reader code from the Contents tab.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 5912b0c92fc40ed748e41964d0dc32755b65abbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5912b0c92fc40ed748e41964d… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Jan 27 19:12:21 2010 -0700 hhctrl.ocx: Separate the HTML Help stream reader code from the Contents tab. --- dlls/hhctrl.ocx/Makefile.in | 1 + dlls/hhctrl.ocx/content.c | 159 +---------------------------------------- dlls/hhctrl.ocx/stream.c | 167 +++++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/stream.h | 47 ++++++++++++ 4 files changed, 216 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5912b0c92fc40ed748e41…

1 0

Erich Hoover : hhctrl.ocx: Make the Index tab functional.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 50f67cbab1a3fe8c988ff2ea3793a4f782673ebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=50f67cbab1a3fe8c988ff2ea3… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Jan 27 01:12:25 2010 -0700 hhctrl.ocx: Make the Index tab functional. --- dlls/hhctrl.ocx/Makefile.in | 1 + dlls/hhctrl.ocx/help.c | 57 +++++++-- dlls/hhctrl.ocx/hhctrl.h | 21 ++++ dlls/hhctrl.ocx/index.c | 271 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 337 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50f67cbab1a3fe8c988ff…

1 0

Erich Hoover : hhctrl.ocx: Handle Index tab sub-topics.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 6ae7fe659e4171e98ec011c544fd0d60a45a41d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae7fe659e4171e98ec011c54… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Jan 27 01:12:32 2010 -0700 hhctrl.ocx: Handle Index tab sub-topics. --- dlls/hhctrl.ocx/help.c | 193 +++++++++++++++++++++++++++++++++++++++++++++- dlls/hhctrl.ocx/hhctrl.h | 7 ++ 2 files changed, 199 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 64f7b24..60614c2 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -429,7 +429,25 @@ static LRESULT OnTopicChange(HWND hwnd, void *user_data) return 0; } if(iiter->nItems > 1) { - FIXME("Support for sub-topics not implemented.\n"); + int i = 0; + LVITEMW lvi; + + SendMessageW(info->popup.hwndList, LVM_DELETEALLITEMS, 0, 0); + for(i=0;i<iiter->nItems;i++) { + IndexSubItem *item = &iiter->items[i]; + WCHAR *name = iiter->keyword; + + if(item->name) + name = item->name; + memset(&lvi, 0, sizeof(lvi)); + lvi.iItem = i; + lvi.mask = LVIF_TEXT|LVIF_PARAM; + lvi.cchTextMax = strlenW(name)+1; + lvi.pszText = name; + lvi.lParam = (LPARAM) item; + SendMessageW(info->popup.hwndList, LVM_INSERTITEMW, 0, (LPARAM)&lvi); + } + ShowWindow(info->popup.hwndPopup, SW_SHOW); return 0; } name = iiter->items[0].name; @@ -825,6 +843,176 @@ static BOOL AddIndexTab(HHInfo *info) return TRUE; } +/* The Index tab's sub-topic popup */ + +static void ResizePopupChild(HHInfo *info) +{ + int scroll_width = GetSystemMetrics(SM_CXVSCROLL); + int border_width = GetSystemMetrics(SM_CXBORDER); + int edge_width = GetSystemMetrics(SM_CXEDGE); + INT width, height; + RECT rect; + + if(!info) + return; + + GetClientRect(info->popup.hwndPopup, &rect); + SetWindowPos(info->popup.hwndCallback, HWND_TOP, 0, 0, + rect.right, rect.bottom, SWP_NOMOVE); + + rect.left = TAB_MARGIN; + rect.top = TAB_TOP_PADDING + TAB_MARGIN; + rect.right -= TAB_RIGHT_PADDING + TAB_MARGIN; + rect.bottom -= TAB_MARGIN; + width = rect.right-rect.left; + height = rect.bottom-rect.top; + + SetWindowPos(info->popup.hwndList, NULL, rect.left, rect.top, width, height, + SWP_NOZORDER | SWP_NOACTIVATE); + + SendMessageW(info->popup.hwndList, LVM_SETCOLUMNWIDTH, 0, + width-scroll_width-2*border_width-2*edge_width); +} + +static LRESULT CALLBACK HelpPopup_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + HHInfo *info = (HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + + switch (message) + { + case WM_SIZE: + ResizePopupChild(info); + return 0; + case WM_DESTROY: + DestroyWindow(hWnd); + return 0; + case WM_CLOSE: + ShowWindow(hWnd, SW_HIDE); + return 0; + + default: + return DefWindowProcW(hWnd, message, wParam, lParam); + } + + return 0; +} + +static LRESULT CALLBACK PopupChild_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_NOTIFY: { + NMHDR *nmhdr = (NMHDR*)lParam; + if(nmhdr->code == NM_DBLCLK) { + HHInfo *info = (HHInfo*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + IndexSubItem *iter; + + if(info == 0 || lParam == 0) + return 0; + iter = (IndexSubItem*) ((NMITEMACTIVATE *)lParam)->lParam; + if(iter == 0) + return 0; + NavigateToChm(info, info->index->merge.chm_file, iter->local); + ShowWindow(info->popup.hwndPopup, SW_HIDE); + return 0; + } + break; + } + default: + return DefWindowProcW(hWnd, message, wParam, lParam); + } + + return 0; +} + +static BOOL AddIndexPopup(HHInfo *info) +{ + static const WCHAR szPopupChildClass[] = {'H','H',' ','P','o','p','u','p',' ','C','h','i','l','d',0}; + static const WCHAR windowCaptionW[] = {'S','e','l','e','c','t',' ','T','o','p','i','c',':',0}; + static const WCHAR windowClassW[] = {'H','H',' ','P','o','p','u','p',0}; + HWND hwndList, hwndPopup, hwndCallback; + char hidden_column[] = "Column"; + WNDCLASSEXW wcex; + LVCOLUMNA lvc; + + if(info->tabs[TAB_INDEX].id == -1) + return TRUE; /* No "Index" tab */ + + wcex.cbSize = sizeof(WNDCLASSEXW); + wcex.style = CS_HREDRAW | CS_VREDRAW; + wcex.lpfnWndProc = HelpPopup_WndProc; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = hhctrl_hinstance; + wcex.hIcon = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); + wcex.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); + wcex.hbrBackground = (HBRUSH)(COLOR_MENU + 1); + wcex.lpszMenuName = NULL; + wcex.lpszClassName = windowClassW; + wcex.hIconSm = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); + RegisterClassExW(&wcex); + + wcex.cbSize = sizeof(WNDCLASSEXW); + wcex.style = 0; + wcex.lpfnWndProc = PopupChild_WndProc; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = hhctrl_hinstance; + wcex.hIcon = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); + wcex.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); + wcex.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wcex.lpszMenuName = NULL; + wcex.lpszClassName = szPopupChildClass; + wcex.hIconSm = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); + RegisterClassExW(&wcex); + + hwndPopup = CreateWindowExW(WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_APPWINDOW + | WS_EX_WINDOWEDGE | WS_EX_RIGHTSCROLLBAR, + windowClassW, windowCaptionW, WS_POPUPWINDOW + | WS_OVERLAPPEDWINDOW | WS_VISIBLE + | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, CW_USEDEFAULT, + CW_USEDEFAULT, 300, 200, info->WinType.hwndHelp, + NULL, hhctrl_hinstance, NULL); + if (!hwndPopup) + return FALSE; + + hwndCallback = CreateWindowExW(WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR, + szPopupChildClass, szEmpty, WS_CHILDWINDOW | WS_VISIBLE, + 0, 0, 0, 0, + hwndPopup, NULL, hhctrl_hinstance, NULL); + if (!hwndCallback) + return FALSE; + + ShowWindow(hwndPopup, SW_HIDE); + hwndList = CreateWindowExW(WS_EX_CLIENTEDGE, WC_LISTVIEWW, szEmpty, + WS_CHILD | WS_BORDER | LVS_SINGLESEL | LVS_REPORT + | LVS_NOCOLUMNHEADER, 50, 50, 100, 100, + hwndCallback, NULL, hhctrl_hinstance, NULL); + if(!hwndList) { + ERR("Could not create popup ListView control\n"); + return FALSE; + } + memset(&lvc, 0, sizeof(lvc)); + lvc.mask = LVCF_TEXT; + lvc.pszText = hidden_column; + if(SendMessageW(hwndList, LVM_INSERTCOLUMNA, 0, (LPARAM) &lvc) == -1) + { + ERR("Could not create popup ListView column\n"); + return FALSE; + } + + info->popup.hwndCallback = hwndCallback; + info->popup.hwndPopup = hwndPopup; + info->popup.hwndList = hwndList; + SetWindowLongPtrW(hwndPopup, GWLP_USERDATA, (LONG_PTR)info); + SetWindowLongPtrW(hwndCallback, GWLP_USERDATA, (LONG_PTR)info); + + ResizePopupChild(info); + ShowWindow(hwndList, SW_SHOW); + + return TRUE; +} + /* Viewer Window */ static LRESULT Help_OnSize(HWND hWnd) @@ -1003,6 +1191,9 @@ static BOOL CreateViewer(HHInfo *pHHInfo) if (!AddIndexTab(pHHInfo)) return FALSE; + if (!AddIndexPopup(pHHInfo)) + return FALSE; + InitContent(pHHInfo); InitIndex(pHHInfo); diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 8a3329e..d0c1545 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -108,6 +108,12 @@ typedef struct { } HHTab; typedef struct { + HWND hwndList; + HWND hwndPopup; + HWND hwndCallback; +} IndexPopup; + +typedef struct { IOleClientSite *client_site; IWebBrowser2 *web_browser; IOleObject *wb_object; @@ -129,6 +135,7 @@ typedef struct { CHMInfo *pCHMInfo; ContentItem *content; IndexItem *index; + IndexPopup popup; HWND hwndTabCtrl; HWND hwndSizeBar; HFONT hFont;

1 0