July 2009 - Wine-Commits - list.winehq.org

Michael Stefaniuc : hhctrl.ocx: Fix a memory leak on an error path (Smatch) .
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: d6eb5eb7c6f828474da2436023f422725016b119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6eb5eb7c6f828474da243602… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:32:31 2009 +0200 hhctrl.ocx: Fix a memory leak on an error path (Smatch). --- dlls/hhctrl.ocx/chm.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index c3a7499..b7df8e7 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -370,8 +370,10 @@ CHMInfo *OpenCHM(LPCWSTR szFile) if (!(ret = heap_alloc_zero(sizeof(CHMInfo)))) return NULL; - if (!(ret->szFile = strdupW(szFile))) + if (!(ret->szFile = strdupW(szFile))) { + heap_free(ret); return NULL; + } hres = CoCreateInstance(&CLSID_ITStorage, NULL, CLSCTX_INPROC_SERVER, &IID_IITStorage, (void **) &ret->pITStorage) ;

1 0

Frédéric Delanoy : comdlg32: Improve French translation.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: a9f3bd06fde361de3682446df1e9933cc2103894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f3bd06fde361de3682446df… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 1 19:05:18 2009 +0200 comdlg32: Improve French translation. --- dlls/comdlg32/cdlg_Fr.rc | 110 +++++++++++++++++++++++----------------------- 1 files changed, 55 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9f3bd06fde361de36824…

1 0

Hans Leidekker : mlang: Add a test for IMultiLanguage2_IsCodePageInstallable.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 48efa30050df799f299c4c8369306e17c15a95db URL: http://source.winehq.org/git/wine.git/?a=commit;h=48efa30050df799f299c4c836… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 1 16:30:26 2009 +0200 mlang: Add a test for IMultiLanguage2_IsCodePageInstallable. --- dlls/mlang/tests/mlang.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index bd4fd6c..7a1290d 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1957,6 +1957,23 @@ static void test_GetFontUnicodeRanges(IMLangFontLink2 *font_link) DeleteDC(hdc); } +static void test_IsCodePageInstallable(IMultiLanguage2 *ml2) +{ + UINT i; + HRESULT hr; + + for (i = 0; i < 0xffff; i++) + { + hr = IMultiLanguage2_IsCodePageInstallable(ml2, i); + + /* it would be better to use IMultiLanguage2_ValidateCodePageEx here but that brings + * up an installation dialog on some platforms, even when specifying CPIOD_PEEK. + */ + if (IsValidCodePage(i)) + ok(hr == S_OK, "code page %u is valid but not installable 0x%08x\n", i, hr); + } +} + START_TEST(mlang) { IMultiLanguage *iML = NULL; @@ -2016,6 +2033,7 @@ START_TEST(mlang) test_multibyte_to_unicode_translations(iML2); test_IMultiLanguage2_ConvertStringFromUnicode(iML2); + test_IsCodePageInstallable(iML2); IMultiLanguage2_Release(iML2);

1 0

Aurimas Fišeras : oleview: Add Lithuanian translation.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 88aff8da884df48d2d7feda21e9a9f43964bad27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88aff8da884df48d2d7feda21… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Jun 30 23:53:55 2009 +0300 oleview: Add Lithuanian translation. --- programs/oleview/Lt.rc | 218 ++++++++++++++++++++++++++++++++++++++++++++++ programs/oleview/rsrc.rc | 1 + 2 files changed, 219 insertions(+), 0 deletions(-) diff --git a/programs/oleview/Lt.rc b/programs/oleview/Lt.rc new file mode 100644 index 0000000..ab887c2 --- /dev/null +++ b/programs/oleview/Lt.rc @@ -0,0 +1,218 @@ +/* + * OLE žiuryklė + * Lithuanian Language Support + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDM_MENU MENU +{ + POPUP "&Failas" + { + MENUITEM "Susieti su &failu...", IDM_BIND + MENUITEM "&Peržiūrėti TypeLib...", IDM_TYPELIB + MENUITEM SEPARATOR + MENUITEM "&Sistemos konfigūracija...", IDM_SYSCONF + MENUITEM "Paleisti &registro tvarkytuvę", IDM_REGEDIT + MENUITEM SEPARATOR + MENUITEM "Iš&eiti", IDM_EXIT + } + POPUP "&Objektas" + { + POPUP "&CoCreateInstance žymos bitai" + { + MENUITEM "CLSCTX_&INPROC_SERVER", IDM_FLAG_INSERV,CHECKED + MENUITEM "CLSCTX_INPROC_&HANDLER", IDM_FLAG_INHANDL + MENUITEM "CLSCTX_&LOCAL_SERVER", IDM_FLAG_LOCSERV,CHECKED + MENUITEM "CLSCTX_&REMOTE_SERVER", IDM_FLAG_REMSERV + } + MENUITEM SEPARATOR + MENUITEM "Peržiūrėti &tipų informaciją", IDM_TYPEINFO, GRAYED + MENUITEM SEPARATOR + MENUITEM "Sukurti &egzempliorių", IDM_CREATEINST, GRAYED + MENUITEM "Sukurti egzempliorių &kompiuteryje...", IDM_CREATEINSTON, GRAYED + MENUITEM "&Naikinti egzempliorių", IDM_RELEASEINST, GRAYED + MENUITEM SEPARATOR + MENUITEM "Kopijuoti C&LSID į iškarpinę", IDM_COPYCLSID, GRAYED + MENUITEM "Kopijuoti &HTML objekto gairę į iškarpinę", IDM_HTMLTAG, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Peržiūrėti...", IDM_VIEW, GRAYED + } + POPUP "&Rodinys" + { + MENUITEM "&Eksperto režimas", IDM_EXPERT,CHECKED + MENUITEM SEPARATOR + MENUITEM "&Paslėptų komponentų kategorijos", IDM_HIDDEN, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Įrankių juosta", IDM_TOOLBAR,CHECKED + MENUITEM "&Būsenos juosta", IDM_STATUSBAR,CHECKED + MENUITEM SEPARATOR + MENUITEM "&Atnaujinti\tF5", IDM_REFRESH + } + POPUP "&Žinynas" + { + MENUITEM "&Apie OLE žiurykę", IDM_ABOUT + } +} + +IDM_TYPELIB MENU +{ + POPUP "&Failas" + { + MENUITEM "Išsaugoti &kaip...", IDM_SAVEAS + MENUITEM "&Užverti", IDM_CLOSE + } + POPUP "&Rodinys" + { + MENUITEM "&Grupuoti pagal rūšį", IDM_GROUP + MENUITEM SEPARATOR + MENUITEM "&Įrankių juosta", IDM_TOOLBAR + MENUITEM "&Būsenos juosta", IDM_STATUSBAR,CHECKED + } +} + +STRINGTABLE +{ + IDS_APPNAME "OLE žiuryklė" + IDS_APPTITLE "OLE žiuryklė" + IDS_READY "Parengta" + IDS_ABOUT "OLE žiuryklė - OLE/COM objektų žiūryklė" + IDS_ABOUTVER "versija 1.0" + IDS_TYPELIBTITLE "ITypeLib žiūryklė" + IDS_OPEN "Atverti" + IDS_OPEN_TYPELIB_FILTER "TypeLib failai (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0Visi failai (*.*)\0*.*\0\0" + + IDM_BIND, "Susieti su failu per failo vardą" + IDM_TYPELIB, "Atverti TypeLib failą ir peržiūrėti jo turinį" + IDM_SYSCONF, "Keisti paskirstytojo COM kompiuterio nustatymus" + IDM_REGEDIT, "Paleisti Wine registro tvarkytuvę" + IDM_EXIT, "Išeiti iš programos. Paragina išsaugoti pakeitimus" + IDM_CREATEINST, "Sukurti pažymėto objekto egzempliorių" + IDM_CREATEINSTON, "Sukurti pažymėto objekto egzempliorių nurodytame kompiuteryje" + IDM_RELEASEINST, "Naikinti pažymėto objekto egzempliorių" + IDM_COPYCLSID, "Kopijuoti pažymėto elemento GUID į iškarpinę" + IDM_VIEW, "Rodyti žiūryklę pasirinktam elementui" + IDM_FLAG_INSERV, "Naudoti CLSCTX_INPROC_SERVER iškviečiant CoGetClassObject" + IDM_FLAG_INHANDL, "Naudoti CLSCTX_INPROC_HANDLER iškviečiant CoGetClassObject" + IDM_FLAG_LOCSERV, "Naudoti CLSCTX_LOCAL_SERVER iškviečiant CoGetClassObject" + IDM_FLAG_REMSERV, "Naudoti CLSCTX_REMOTE_SERVER iškviečiant CoGetClassObject" + IDM_EXPERT, "Perjungti tarp eksperto ir naujoko rodymo režimų" + IDM_HIDDEN, "Perjungti komponentų kategorijų, kurios turėjo būti nematomos, rodymą" + IDM_TOOLBAR, "Rodyti ar slėpti įrankių juostą" + IDM_STATUSBAR, "Rodyti ar slėpti būsenos juostą" + IDM_REFRESH, "Atnaujinti visus sąrašus" + IDM_ABOUT, "Parodo programos informaciją, versijos numerį ir autoriaus teises" + + IDM_SAVEAS, "Išsaugoti kaip .IDL ar .H failą" + IDM_CLOSE, "Užverti langą" + IDM_GROUP, "Grupuoti tipų informaciją pagal rūšį" + + IDS_TREE_OC, "Objektų klasės" + IDS_TREE_GBCC, "Sugrupuotos pagal komponento kategoriją" + IDS_TREE_O1O, "OLE 1.0 objektai" + IDS_TREE_CLO, "COM bibliotekos objektai" + IDS_TREE_AO, "Visi objektai" + IDS_TREE_AID, "Programų identifikatoriai" + IDS_TREE_TL, "Tipų bibliotekos" + IDS_TL_VER, "ver." + IDS_TREE_I, "Sąsajos" + + IDS_TAB_REG, "Registras" + IDS_TAB_IMPL, "Realizacija" + IDS_TAB_ACTIV, "Aktyvinimas" + + IDS_CGCOFAIL, "CoGetClassObject nepavyko." + IDS_ERROR_UNKN, "Nežinoma klaida" + IDS_TRUE, "Tiesa" + IDS_FALSE, "Netiesa" + IDS_BYTES, "baitai" + + IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) nepavyko ($%x)" + IDS_INHERITINTERFACES, "Paveldėtos sąsajos" +} + +DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Jungtis prie kito kompiuterio" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Kompiuterio vardas:", -1, 5, 6, 190, 8 + EDITTEXT IDC_MACHINE, 5, 16, 190, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "&Gerai", IDOK, 200, 5, 45, 14 + PUSHBUTTON "&Atsisakyti", IDCANCEL, 200, 22, 45, 14 +} + +DLG_SYSCONF DIALOG DISCARDABLE 0, 0, 170, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Sistemos konfigūracija" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Sistemos nuostatos", -1, 5, 6, 160, 8 + CHECKBOX "Įjungti &paskirstytąjį COM", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "Įjungti &nuotolinį prisijungimą (tik Win95)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + LTEXT "Šios nuostatos keičia tik registro reikšmes.\nTai neturi jokios įtakos Wine našumui.", -1, 5, 50, 160, 40 + DEFPUSHBUTTON "&Gerai", IDOK, 70, 80, 45, 14 + PUSHBUTTON "&Atsisakyti", IDCANCEL, 120, 80, 45, 14 +} + +DLG_DEFAULT_IV DIALOG DISCARDABLE 0, 0, 280, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Numatytosios sąsajos žiūryklė" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Sąsaja", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "IID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Užverti", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&Peržiūrėti tipų informaciją", IDC_VIEWTYPEINFO, 6, 31, 90, 14, WS_DISABLED +} + +DLG_IPERSIST_IV DIALOG DISCARDABLE 0, 0, 280, 29 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersist sąsajos žiūryklė" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Klasės vardas:", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Užverti", IDCANCEL, 230, 6, 45, 14 +} + +DLG_IPERSISTSTREAM_IV DIALOG DISCARDABLE 0, 0, 280, 68 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersistStream sąsajos žiūryklė" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Klasės vardas:", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Užverti", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&IsDirty()", IDC_ISDIRTY_BUTTON, 6, 31, 50, 14 + LTEXT "???", IDC_ISDIRTY, 60, 34, 145, 8 + PUSHBUTTON "&GetSizeMax()", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 + LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 +} + +#pragma code_page(default) diff --git a/programs/oleview/rsrc.rc b/programs/oleview/rsrc.rc index 3f36889..14122b7 100644 --- a/programs/oleview/rsrc.rc +++ b/programs/oleview/rsrc.rc @@ -29,6 +29,7 @@ #include "Fr.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0

Hans Leidekker : mlang: Implement IMultiLanguage2_IsCodePageInstallable.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: c2eee9f5fcff0307f5453e176f9a71b941aae4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2eee9f5fcff0307f5453e176… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 1 16:30:00 2009 +0200 mlang: Implement IMultiLanguage2_IsCodePageInstallable. --- dlls/mlang/mlang.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 180e1ad..c28e695 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3125,8 +3125,10 @@ static HRESULT WINAPI fnIMultiLanguage2_IsCodePageInstallable( IMultiLanguage3* iface, UINT uiCodePage) { - FIXME("%u\n", uiCodePage); - return E_NOTIMPL; + TRACE("%u\n", uiCodePage); + + /* FIXME: the installable set is usually larger than the set of valid codepages */ + return IMultiLanguage2_ValidateCodePageEx(iface, uiCodePage, NULL, CPIOD_PEEK); } static HRESULT WINAPI fnIMultiLanguage2_SetMimeDBSource(

1 0

Alexandre Julliard : preloader: Reserve addresses only up to 0x68000000, that should be enough for ole32.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 4d35f3f2704fe2cda261af0e2d112bfde32fc60b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d35f3f2704fe2cda261af0e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 16:02:55 2009 +0200 preloader: Reserve addresses only up to 0x68000000, that should be enough for ole32. --- loader/preloader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index e7ac0c1..087d04b 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -110,7 +110,7 @@ static struct wine_preload_info preload_info[] = { { (void *)0x00000000, 0x00010000 }, /* low 64k */ { (void *)0x00010000, 0x00100000 }, /* DOS area */ - { (void *)0x00110000, 0x6fef0000 }, /* low memory area */ + { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared heap + virtual heap */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */

1 0

Aric Stewart : notepad: Update Japanese resource.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 1c09598c283f5e6fccebdf9efe7e9f3ea1626373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c09598c283f5e6fccebdf9ef… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jul 1 08:30:14 2009 -0500 notepad: Update Japanese resource. --- programs/notepad/Ja.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Ja.rc b/programs/notepad/Ja.rc index 5513932..1ad4062 100644 --- a/programs/notepad/Ja.rc +++ b/programs/notepad/Ja.rc @@ -56,6 +56,7 @@ POPUP "編集(&E)" { POPUP "検索(&S)" { MENUITEM "検索(&S)...\tCtrl+F", CMD_SEARCH MENUITEM "次を検索(&S)\tF3", CMD_SEARCH_NEXT + MENUITEM "置き換える(&R)...\tCtrl+H", CMD_REPLACE } POPUP "ヘルプ(&H)" { MENUITEM "目次(&C)", CMD_HELP_CONTENTS

1 0

Aric Stewart : wordpad: Update Japanese resource.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: f30387197ca28fe7eba2e5bc0f1e1308e6393018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f30387197ca28fe7eba2e5bc0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jul 1 08:25:18 2009 -0500 wordpad: Update Japanese resource. --- programs/wordpad/Ja.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/Ja.rc b/programs/wordpad/Ja.rc index 09e48aa..3049d8b 100644 --- a/programs/wordpad/Ja.rc +++ b/programs/wordpad/Ja.rc @@ -242,6 +242,8 @@ BEGIN STRING_WRITE_ACCESS_DENIED, "ファイルに保存する権限がありません。" STRING_OPEN_FAILED, "ファイルを開けません。" STRING_OPEN_ACCESS_DENIED, "ファイルを開く権限がありません。" + STRING_PRINTING_NOT_IMPLEMENTED, "プリントが実装されていません。" + STRING_MAX_TAB_STOPS, "32以上なタブを追加できません。" END #pragma code_page(default)

1 0

Nikolay Sivov : comctl32/listview: Improve hittesting a bit.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 84f14a37164f5dd7e8ed7cb65321ac5aa7f9206d URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f14a37164f5dd7e8ed7cb65… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jul 1 00:40:03 2009 +0400 comctl32/listview: Improve hittesting a bit. --- dlls/comctl32/listview.c | 72 +++++++++++++++++++++------------------ dlls/comctl32/tests/listview.c | 18 +++++++++- 2 files changed, 55 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7099227..d7a5f97 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6798,55 +6798,42 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, lpht->iItem = -1; if (subitem) lpht->iSubItem = 0; - if (infoPtr->rcList.left > lpht->pt.x) - lpht->flags |= LVHT_TOLEFT; - else if (infoPtr->rcList.right < lpht->pt.x) - lpht->flags |= LVHT_TORIGHT; + LISTVIEW_GetOrigin(infoPtr, &Origin); + + /* set whole list relation flags */ + if (subitem && infoPtr->uView == LV_VIEW_DETAILS) + { + /* LVM_SUBITEMHITTEST checks left bound of possible client area */ + if (infoPtr->rcList.left > lpht->pt.x && Origin.x < lpht->pt.x) + lpht->flags |= LVHT_TOLEFT; + } + else + { + if (infoPtr->rcList.left > lpht->pt.x) + lpht->flags |= LVHT_TOLEFT; + else if (infoPtr->rcList.right < lpht->pt.x) + lpht->flags |= LVHT_TORIGHT; + } if (infoPtr->rcList.top > lpht->pt.y) lpht->flags |= LVHT_ABOVE; else if (infoPtr->rcList.bottom < lpht->pt.y) lpht->flags |= LVHT_BELOW; - TRACE("lpht->flags=0x%x\n", lpht->flags); - if (lpht->flags) return -1; - - lpht->flags |= LVHT_NOWHERE; - - LISTVIEW_GetOrigin(infoPtr, &Origin); - - /* first deal with the large items */ - rcSearch.left = lpht->pt.x; - rcSearch.top = lpht->pt.y; - rcSearch.right = rcSearch.left + 1; - rcSearch.bottom = rcSearch.top + 1; - - iterator_frameditems(&i, infoPtr, &rcSearch); - iterator_next(&i); /* go to first item in the sequence */ - iItem = i.nItem; - iterator_destroy(&i); - - TRACE("lpht->iItem=%d\n", iItem); - if (iItem == -1) return -1; - + /* even if item is invalid try to find subitem */ if (infoPtr->uView == LV_VIEW_DETAILS && subitem) { - RECT bounds, *pRect; + RECT *pRect; INT j; - /* for top/bottom only */ - bounds.left = LVIR_BOUNDS; - LISTVIEW_GetItemRect(infoPtr, iItem, &bounds); opt.x = lpht->pt.x - Origin.x; - opt.y = lpht->pt.y; + lpht->iSubItem = -1; for (j = 0; j < DPA_GetPtrCount(infoPtr->hdpaColumns); j++) { pRect = &LISTVIEW_GetColumnInfo(infoPtr, j)->rcHeader; - bounds.left = pRect->left; - bounds.right = pRect->right; - if (PtInRect(&bounds, opt)) + if ((opt.x >= pRect->left) && (opt.x < pRect->right)) { lpht->iSubItem = j; break; @@ -6855,6 +6842,25 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, TRACE("lpht->iSubItem=%d\n", lpht->iSubItem); } + TRACE("lpht->flags=0x%x\n", lpht->flags); + if (lpht->flags) return -1; + + lpht->flags |= LVHT_NOWHERE; + + /* first deal with the large items */ + rcSearch.left = lpht->pt.x; + rcSearch.top = lpht->pt.y; + rcSearch.right = rcSearch.left + 1; + rcSearch.bottom = rcSearch.top + 1; + + iterator_frameditems(&i, infoPtr, &rcSearch); + iterator_next(&i); /* go to first item in the sequence */ + iItem = i.nItem; + iterator_destroy(&i); + + TRACE("lpht->iItem=%d\n", iItem); + if (iItem == -1) return -1; + lvItem.mask = LVIF_STATE | LVIF_TEXT; if (infoPtr->uView == LV_VIEW_DETAILS) lvItem.mask |= LVIF_INDENT; lvItem.stateMask = LVIS_STATEIMAGEMASK; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 38155b1..d11d9de 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2684,7 +2684,16 @@ static void test_hittest(void) x = pos.x + 150; /* outside column */ y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, TRUE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + /* outside possible client rectangle (to right) */ + x = pos.x + 500; + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); + /* subitem returned with -1 item too */ + x = pos.x + 150; + y = -10; + test_lvm_subitemhittest(hwnd, x, y, -1, 1, LVHT_NOWHERE, FALSE, FALSE, TRUE, __LINE__); /* parent client area is 100x100 by default */ MoveWindow(hwnd, 0, 0, 300, 100, FALSE); x = pos.x + 150; /* outside column */ @@ -2701,7 +2710,12 @@ static void test_hittest(void) x = pos.x + 150; /* outside column */ y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, TRUE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + /* outside possible client rectangle (to right) */ + x = pos.x + 500; + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); /* try with icons, state icons index is 1 based so at least 2 bitmaps needed */ himl = ImageList_Create(16, 16, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n");

1 0

Damjan Jovanovic : winemenubuilder: Distinguish menu icons from association icons.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: fe8d913358633b4c1b44b335f517b4a5995392df URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe8d913358633b4c1b44b335f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jun 30 21:04:32 2009 +0200 winemenubuilder: Distinguish menu icons from association icons. --- programs/winemenubuilder/winemenubuilder.c | 55 ++++++++++++++++------------ 1 files changed, 31 insertions(+), 24 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 200cd0f..d9d7852 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -739,7 +739,7 @@ static BOOL create_directories(char *directory) } /* extract an icon from an exe or icon file; helper for IPersistFile_fnSave */ -static char *extract_icon( LPCWSTR path, int index, BOOL bWait ) +static char *extract_icon( LPCWSTR path, int index, const char *destFilename, BOOL bWait ) { unsigned short crc; char *iconsdir = NULL, *ico_path = NULL, *ico_name, *xpm_path = NULL; @@ -785,18 +785,35 @@ static char *extract_icon( LPCWSTR path, int index, BOOL bWait ) crc=crc16(ico_path); /* Try to treat the source file as an exe */ - xpm_path=HeapAlloc(GetProcessHeap(), 0, strlen(iconsdir)+1+4+1+strlen(ico_name)+1+12+1+3); - sprintf(xpm_path,"%s/%04x_%s.%d.png",iconsdir,crc,ico_name,index); + if (destFilename) + xpm_path=HeapAlloc(GetProcessHeap(),0,strlen(iconsdir)+1+strlen(destFilename)+1+3); + else + xpm_path=HeapAlloc(GetProcessHeap(), 0, strlen(iconsdir)+1+4+1+strlen(ico_name)+1+12+1+3); + if (xpm_path == NULL) + { + WINE_ERR("could not extract icon %s, out of memory\n", wine_dbgstr_a(ico_name)); + return NULL; + } + if (destFilename) + sprintf(xpm_path,"%s/%s.png",iconsdir,destFilename); + else + sprintf(xpm_path,"%s/%04x_%s.%d.png",iconsdir,crc,ico_name,index); if (ExtractFromEXEDLL( path, index, xpm_path )) goto end; /* Must be something else, ignore the index in that case */ - sprintf(xpm_path,"%s/%04x_%s.png",iconsdir,crc,ico_name); + if (destFilename) + sprintf(xpm_path,"%s/%s.png",iconsdir,destFilename); + else + sprintf(xpm_path,"%s/%04x_%s.png",iconsdir,crc,ico_name); if (ExtractFromICO( path, xpm_path)) goto end; if (!bWait) { - sprintf(xpm_path,"%s/%04x_%s.xpm",iconsdir,crc,ico_name); + if (destFilename) + sprintf(xpm_path,"%s/%s.xpm",iconsdir,destFilename); + else + sprintf(xpm_path,"%s/%04x_%s.xpm",iconsdir,crc,ico_name); if (create_default_icon( xpm_path, ico_path )) goto end; } @@ -1907,17 +1924,6 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package } iconW = assoc_query(ASSOCSTR_DEFAULTICON, extensionW, NULL); - if (iconW) - { - WCHAR *comma = strrchrW(iconW, ','); - int index = 0; - if (comma) - { - *comma = 0; - index = atoiW(comma + 1); - } - iconA = extract_icon(iconW, index, FALSE); - } contentTypeW = assoc_query(ASSOCSTR_CONTENTTYPE, extensionW, NULL); @@ -1936,18 +1942,19 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package /* Gnome seems to ignore the <icon> tag in MIME packages, * and the default name is more intuitive anyway. */ - if (iconA) + if (iconW) { char *flattened_mime = slashes_to_minuses(mimeTypeA); if (flattened_mime) { - char *dstIconPath = heap_printf("%s/icons/%s%s", xdg_data_dir, - flattened_mime, strrchr(iconA, '.')); - if (dstIconPath) + int index = 0; + WCHAR *comma = strrchrW(iconW, ','); + if (comma) { - rename(iconA, dstIconPath); - HeapFree(GetProcessHeap(), 0, dstIconPath); + *comma = 0; + index = atoiW(comma + 1); } + iconA = extract_icon(iconW, index, flattened_mime, FALSE); HeapFree(GetProcessHeap(), 0, flattened_mime); } } @@ -2098,9 +2105,9 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) /* extract the icon */ if( szIconPath[0] ) - icon_name = extract_icon( szIconPath , iIconId, bWait ); + icon_name = extract_icon( szIconPath , iIconId, NULL, bWait ); else - icon_name = extract_icon( szPath, iIconId, bWait ); + icon_name = extract_icon( szPath, iIconId, NULL, bWait ); /* fail - try once again after parent process exit */ if( !icon_name )

1 0