wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Nicolas Le Cam : ddraw/tests: Get rid of a carriage return in a trace.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: bf64bbd1fb3c3a6664f89d83abcbcb3a31a6f9c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf64bbd1fb3c3a6664f89d83a… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Dec 5 14:54:06 2009 +0100 ddraw/tests: Get rid of a carriage return in a trace. --- dlls/ddraw/tests/ddrawmodes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index e44c6bc..c584684 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -345,7 +345,7 @@ static void flushdisplaymodes(void) static HRESULT WINAPI enummodescallback(LPDDSURFACEDESC lpddsd, LPVOID lpContext) { - trace("Width = %i, Height = %i, Refresh Rate = %i, Pitch = %i, flags =%02X\r\n", + trace("Width = %i, Height = %i, Refresh Rate = %i, Pitch = %i, flags =%02X\n", lpddsd->dwWidth, lpddsd->dwHeight, U2(*lpddsd).dwRefreshRate, U1(*lpddsd).lPitch, lpddsd->dwFlags);

1 0

Jacek Caban : mshtml: Added IHTMLStyle2::right implementation.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: ba394d68be30193e8adcb641b048dd149d862e74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba394d68be30193e8adcb641b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 14 01:03:39 2009 +0100 mshtml: Added IHTMLStyle2::right implementation. --- dlls/mshtml/htmlstyle2.c | 12 ++++++++---- dlls/mshtml/tests/dom.c | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c index ff5fff0..aa9531c 100644 --- a/dlls/mshtml/htmlstyle2.c +++ b/dlls/mshtml/htmlstyle2.c @@ -212,15 +212,19 @@ static HRESULT WINAPI HTMLStyle2_get_bottom(IHTMLStyle2 *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle2_put_right(IHTMLStyle2 *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE2_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_RIGHT, &v, 0); } static HRESULT WINAPI HTMLStyle2_get_right(IHTMLStyle2 *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_RIGHT, p, 0); } static HRESULT WINAPI HTMLStyle2_put_pixelBottom(IHTMLStyle2 *iface, LONG v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9dce419..6f1a064 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3390,6 +3390,7 @@ static void test_current_style(IHTMLCurrentStyle *current_style) static void test_style2(IHTMLStyle2 *style2) { + VARIANT v; BSTR str; HRESULT hres; @@ -3408,6 +3409,27 @@ static void test_style2(IHTMLStyle2 *style2) ok(hres == S_OK, "get_position failed: %08x\n", hres); ok(!strcmp_wa(str, "absolute"), "get_position returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + /* Test right */ + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle2_get_right(style2, &v); + ok(hres == S_OK, "get_top failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(right)=%d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(right) != NULL\n"); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("3px"); + hres = IHTMLStyle2_put_right(style2, v); + ok(hres == S_OK, "put_right failed: %08x\n", hres); + VariantClear(&v); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle2_get_right(style2, &v); + ok(hres == S_OK, "get_right failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "3px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); } static void test_style3(IHTMLStyle3 *style3)

1 0

Jacek Caban : mshtml: Added IHTMLStyle::marginTop implementation.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 0f940bccd4156e3a56d1c81704a1714cbe15b9dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f940bccd4156e3a56d1c8170… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 14 01:03:15 2009 +0100 mshtml: Added IHTMLStyle::marginTop implementation. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/tests/dom.c | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7a43701..467464a 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1219,15 +1219,19 @@ static HRESULT WINAPI HTMLStyle_get_lineHeight(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_marginTop(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_TOP, &v, 0); } static HRESULT WINAPI HTMLStyle_get_marginTop(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_TOP, p, 0); } static HRESULT WINAPI HTMLStyle_put_marginRight(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e32e2fd..9dce419 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3802,6 +3802,24 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_margin(style, NULL); ok(hres == S_OK, "put_margin failed: %08x\n", hres); + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_marginTop(style, &v); + ok(hres == S_OK, "get_marginTop failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(marginTop) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(marginTop) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("6px"); + hres = IHTMLStyle_put_marginTop(style, v); + SysFreeString(V_BSTR(&v)); + ok(hres == S_OK, "put_marginTop failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_marginTop(style, &v); + ok(hres == S_OK, "get_marginTop failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(marginTop) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginTop) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + str = NULL; hres = IHTMLStyle_get_border(style, &str); ok(hres == S_OK, "get_border failed: %08x\n", hres);

1 0

Alexander Nicolaysen Sørnes : oleacc: Add Norwegian Bokmål translation.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 9178a948687a096aea1664c98e8b6aa6baf4dad6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9178a948687a096aea1664c98… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Dec 13 23:02:57 2009 +0100 oleacc: Add Norwegian Bokmål translation. --- dlls/oleacc/Makefile.in | 1 + dlls/oleacc/oleacc_No.rc | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index 4fc8d51..1aca0cf 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -16,6 +16,7 @@ RC_SRCS = \ oleacc_Ko.rc \ oleacc_Lt.rc \ oleacc_Nl.rc \ + oleacc_No.rc \ oleacc_Pl.rc \ oleacc_Pt.rc \ oleacc_Ro.rc diff --git a/dlls/oleacc/oleacc_No.rc b/dlls/oleacc/oleacc_No.rc new file mode 100644 index 0000000..1bbadf0 --- /dev/null +++ b/dlls/oleacc/oleacc_No.rc @@ -0,0 +1,95 @@ +/* + * Norwegian Bokmål resources for oleacc + * + * Copyright 2009 Alexander N. Sørnes <alex(a)thehandofagony.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 + */ + +#include "oleacc.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE DISCARDABLE +{ + 0 "unknown object" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "tittellinje" + ROLE_SYSTEM_MENUBAR "menylinje" + ROLE_SYSTEM_SCROLLBAR "rullefelt" + ROLE_SYSTEM_GRIP "grip" + ROLE_SYSTEM_SOUND "lyd" + ROLE_SYSTEM_CURSOR "peker" + ROLE_SYSTEM_CARET "markør" + ROLE_SYSTEM_ALERT "varsel" + ROLE_SYSTEM_WINDOW "vindu" + ROLE_SYSTEM_CLIENT "klient" + ROLE_SYSTEM_MENUPOPUP "sprettoppmeny" + ROLE_SYSTEM_MENUITEM "menyelement" + ROLE_SYSTEM_TOOLTIP "verktøytips" + ROLE_SYSTEM_APPLICATION "program" + ROLE_SYSTEM_DOCUMENT "dokument" + ROLE_SYSTEM_PANE "panel" + ROLE_SYSTEM_CHART "diagram" + ROLE_SYSTEM_DIALOG "meldingsvindu" + ROLE_SYSTEM_BORDER "kant" + ROLE_SYSTEM_GROUPING "gruppering" + ROLE_SYSTEM_SEPARATOR "skille" + ROLE_SYSTEM_TOOLBAR "verktøylinje" + ROLE_SYSTEM_STATUSBAR "status bar" + ROLE_SYSTEM_TABLE "tabell" + ROLE_SYSTEM_COLUMNHEADER "kolonneoverskrift" + ROLE_SYSTEM_ROWHEADER "radoverskrift" + ROLE_SYSTEM_COLUMN "kolonne" + ROLE_SYSTEM_ROW "rad" + ROLE_SYSTEM_CELL "celle" + ROLE_SYSTEM_LINK "kobling" + ROLE_SYSTEM_HELPBALLOON "hjelpetekst" + ROLE_SYSTEM_CHARACTER "tegn" + ROLE_SYSTEM_LIST "liste" + ROLE_SYSTEM_LISTITEM "listeelement" + ROLE_SYSTEM_OUTLINE "utheving" + ROLE_SYSTEM_OUTLINEITEM "uthevet element" + ROLE_SYSTEM_PAGETAB "sidefane" + ROLE_SYSTEM_PROPERTYPAGE "fane" + ROLE_SYSTEM_INDICATOR "indikator" + ROLE_SYSTEM_GRAPHIC "grafikk" + ROLE_SYSTEM_STATICTEXT "statisk tekst" + ROLE_SYSTEM_TEXT "tekst" + ROLE_SYSTEM_PUSHBUTTON "knapp" + ROLE_SYSTEM_CHECKBUTTON "avkrysningsboks" + ROLE_SYSTEM_RADIOBUTTON "radioknapp" + ROLE_SYSTEM_COMBOBOX "komboboks" + ROLE_SYSTEM_DROPLIST "rullemeny" + ROLE_SYSTEM_PROGRESSBAR "framgangsindikator" + ROLE_SYSTEM_DIAL "hjul" + ROLE_SYSTEM_HOTKEYFIELD "felt for hurtigtaster" + ROLE_SYSTEM_SLIDER "rullefelt" + ROLE_SYSTEM_SPINBUTTON "rullemeny" + ROLE_SYSTEM_DIAGRAM "diagram" + ROLE_SYSTEM_ANIMATION "animasjon" + ROLE_SYSTEM_EQUATION "likning" + ROLE_SYSTEM_BUTTONDROPDOWN "knapp for rullemeny" + ROLE_SYSTEM_BUTTONMENU "menyknapp" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "felt for rullemeny-knapp" + ROLE_SYSTEM_WHITESPACE "mellomrom" + ROLE_SYSTEM_PAGETABLIST "faneliste" + ROLE_SYSTEM_CLOCK "klokke" + ROLE_SYSTEM_SPLITBUTTON "oppdelt knapp" + ROLE_SYSTEM_IPADDRESS "IP-adresse" + ROLE_SYSTEM_OUTLINEBUTTON "utheving for knapp" +}

1 0

Alexander Nicolaysen Sørnes : winecfg: Update Norwegian Bokmål translation.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 9e76a701d7623f1ea0b0a981bc38381430321686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e76a701d7623f1ea0b0a981b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Dec 13 22:41:53 2009 +0100 winecfg: Update Norwegian Bokmål translation. --- programs/winecfg/No.rc | 89 +++++++++++++++++++++++++++-------------------- 1 files changed, 51 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e76a701d7623f1ea0b0a…

1 0

Alexander Nicolaysen Sørnes : appwiz.cpl :=?UTF-8?Q?=20Update=20Norwegian=20Bok?==?UTF-8?Q?m=C3=A5l=20translation?=.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: e71f69a65dadb34ccd0cb65722a7a8ee6a825340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71f69a65dadb34ccd0cb6572… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Dec 13 22:28:45 2009 +0100 appwiz.cpl: Update Norwegian Bokmål translation. --- dlls/appwiz.cpl/No.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/No.rc b/dlls/appwiz.cpl/No.rc index a6106a4..1abc0cb 100644 --- a/dlls/appwiz.cpl/No.rc +++ b/dlls/appwiz.cpl/No.rc @@ -41,7 +41,7 @@ STRINGTABLE IDS_INSTALL_FILTER, "Installasjonsprogrammer\0*instal*.exe;*setup*.exe;*.msi\0Programmer (*.exe)\0*.exe\0Alle filer (*.*)\0*.*\0\0" IDS_REMOVE, "Fje&rn..." - IDS_MODIFY_REMOVE, "&Modify/Remove..." + IDS_MODIFY_REMOVE, "&Endre/Fjern ..." } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -53,10 +53,10 @@ FONT 8, "MS Shell Dlg" CONTROL "&Installer...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "Følgende programmer kan fjernes automatisk. Merk et program og trykk «Legg til/Fjern» for å fjerne det eller endre installerte komponenter", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "Følgende programmer kan fjernes automatisk. Merk et program og trykk Endre/Fjern for å fjerne det eller endre installerte komponenter", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "&Støtteinformasjon...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 98, 198, 70, 14 - CONTROL "&Modify...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "&Endre...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 CONTROL "Fje&rn...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 }

1 0

Nikolay Sivov : comctl32/treeview: Implement NM_SETCURSOR notification.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: e81f2642f16d108cfdf086eb8d5196c95f399c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e81f2642f16d108cfdf086eb8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 12 12:34:23 2009 +0300 comctl32/treeview: Implement NM_SETCURSOR notification. --- dlls/comctl32/treeview.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 4a8ced3..51af5aa 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -28,7 +28,7 @@ * We use callbackMask to keep track of fields to be updated. * * TODO: - * missing notifications: NM_SETCURSOR, TVN_GETINFOTIP, TVN_KEYDOWN, + * missing notifications: TVN_GETINFOTIP, TVN_KEYDOWN, * TVN_SETDISPINFO, TVN_SINGLEEXPAND * * missing styles: TVS_FULLROWSELECT, TVS_INFOTIP, TVS_RTLREADING, @@ -5449,13 +5449,27 @@ TREEVIEW_SetCursor(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { POINT pt; TREEVIEW_ITEM * item; + NMMOUSE nmmouse; GetCursorPos(&pt); ScreenToClient(infoPtr->hwnd, &pt); item = TREEVIEW_HitTestPoint(infoPtr, pt); - /* FIXME: send NM_SETCURSOR */ + memset(&nmmouse, 0, sizeof(nmmouse)); + nmmouse.hdr.hwndFrom = infoPtr->hwnd; + nmmouse.hdr.idFrom = GetWindowLongPtrW(infoPtr->hwnd, GWLP_ID); + nmmouse.hdr.code = NM_SETCURSOR; + if (item) + { + nmmouse.dwItemSpec = (DWORD_PTR)item; + nmmouse.dwItemData = item->lParam; + } + nmmouse.pt.x = 0; + nmmouse.pt.y = 0; + nmmouse.dwHitInfo = lParam; + if (TREEVIEW_SendRealNotify(infoPtr, nmmouse.hdr.idFrom, (LPARAM)&nmmouse)) + return 0; if (item && (infoPtr->dwStyle & TVS_TRACKSELECT)) {

1 0

Nikolay Sivov : comctl32/treeview: Draw +/- signs with text color, not the lines' one.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 49dabfe31d068bc8a87ef1e551be750dd639d002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49dabfe31d068bc8a87ef1e55… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 12 12:32:54 2009 +0300 comctl32/treeview: Draw +/- signs with text color, not the lines' one. +/- aren't affected by customdraw settings, only per control set colors used. --- dlls/comctl32/treeview.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index c8524ca..4a8ced3 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2333,7 +2333,7 @@ TREEVIEW_DrawItemLines(const TREEVIEW_INFO *infoPtr, HDC hdc, const TREEVIEW_ITE hbr = CreateSolidBrush(clrBk); hbrOld = SelectObject(hdc, hbr); - + centerx = (item->linesOffset + item->stateOffset) / 2; centery = (item->rect.top + item->rect.bottom) / 2; @@ -2414,16 +2414,20 @@ TREEVIEW_DrawItemLines(const TREEVIEW_INFO *infoPtr, HDC hdc, const TREEVIEW_ITE LONG rectsize = min(height, width) / 4; /* plussize = ceil(rectsize * 3/4) */ LONG plussize = (rectsize + 1) * 3 / 4; - - HPEN hNewPen = CreatePen(PS_SOLID, 0, GETLINECOLOR(infoPtr->clrLine)); - HPEN hOldPen = SelectObject(hdc, hNewPen); - + + HPEN new_pen = CreatePen(PS_SOLID, 0, GETLINECOLOR(infoPtr->clrLine)); + HPEN old_pen = SelectObject(hdc, new_pen); + Rectangle(hdc, centerx - rectsize - 1, centery - rectsize - 1, centerx + rectsize + 2, centery + rectsize + 2); - - SelectObject(hdc, hOldPen); - DeleteObject(hNewPen); - + + SelectObject(hdc, old_pen); + DeleteObject(new_pen); + + /* draw +/- signs with current text color */ + new_pen = CreatePen(PS_SOLID, 0, GETTXTCOLOR(infoPtr->clrText)); + old_pen = SelectObject(hdc, new_pen); + if (height < 18 || width < 18) { MoveToEx(hdc, centerx - plussize + 1, centery, NULL); @@ -2448,6 +2452,9 @@ TREEVIEW_DrawItemLines(const TREEVIEW_INFO *infoPtr, HDC hdc, const TREEVIEW_ITE SetPixel(hdc, centerx + 1, centery, clrBk); } } + + SelectObject(hdc, old_pen); + DeleteObject(new_pen); } } }

1 0

Nikolay Sivov : comctl32/treeview: Fix default colors set on creation.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: b65a7a005259512e07265c9a3a9cecbfd55d8e35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b65a7a005259512e07265c9a3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Dec 11 22:57:27 2009 +0300 comctl32/treeview: Fix default colors set on creation. --- dlls/comctl32/tests/treeview.c | 36 +++++++++++++++++++++++++++++++++--- dlls/comctl32/treeview.c | 37 +++++++++++++++++-------------------- 2 files changed, 50 insertions(+), 23 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index be89b8f..f99da88 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -160,9 +160,9 @@ static const struct message test_get_set_textcolor_seq[] = { { TVM_GETTEXTCOLOR, sent|wparam|lparam, 0, 0 }, { TVM_SETTEXTCOLOR, sent|wparam|lparam, 0, 0 }, { TVM_GETTEXTCOLOR, sent|wparam|lparam, 0, 0 }, - { TVM_SETTEXTCOLOR, sent|wparam|lparam, 0, 0x00ffffff }, + { TVM_SETTEXTCOLOR, sent|wparam|lparam, 0, RGB(255, 255, 255) }, { TVM_GETTEXTCOLOR, sent|wparam|lparam, 0, 0 }, - { TVM_SETTEXTCOLOR, sent|wparam|lparam, 0, -1 }, + { TVM_SETTEXTCOLOR, sent|wparam|lparam, 0, CLR_NONE }, { 0 } }; @@ -728,7 +728,7 @@ static void test_get_set_textcolor(void) ok(crColor == RGB(255,255,255), "White text color reported as 0x%.8x\n", crColor); /* Reset the default text color */ - SendMessage( hTree, TVM_SETTEXTCOLOR, 0, -1 ); + SendMessage( hTree, TVM_SETTEXTCOLOR, 0, CLR_NONE ); ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, test_get_set_textcolor_seq, "test get set text color", FALSE); @@ -990,6 +990,34 @@ static void test_treeview_classinfo(void) expect(0, cls.cbClsExtra); } +static void test_get_linecolor(void) +{ + COLORREF clr; + HWND hTree; + + hTree = create_treeview_control(); + + /* newly created control has default color */ + clr = (COLORREF)SendMessage(hTree, TVM_GETLINECOLOR, 0, 0); + expect(CLR_DEFAULT, clr); + + DestroyWindow(hTree); +} + +static void test_get_insertmarkcolor(void) +{ + COLORREF clr; + HWND hTree; + + hTree = create_treeview_control(); + + /* newly created control has default color */ + clr = (COLORREF)SendMessage(hTree, TVM_GETINSERTMARKCOLOR, 0, 0); + expect(CLR_DEFAULT, clr); + + DestroyWindow(hTree); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -1041,6 +1069,8 @@ START_TEST(treeview) test_get_set_itemheight(); test_get_set_scrolltime(); test_get_set_textcolor(); + test_get_linecolor(); + test_get_insertmarkcolor(); test_get_set_tooltips(); test_get_set_unicodeformat(); test_callback(); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index ec1fdbe..c8524ca 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -191,6 +191,10 @@ typedef struct tagTREEVIEW_INFO #define OVERLAYIMAGEINDEX(x) (((x) >> 8) & 0x0f) #define ISVISIBLE(x) ((x)->visibleOrder >= 0) +#define GETLINECOLOR(x) ((x) == CLR_DEFAULT ? comctl32_color.clrGrayText : (x)) +#define GETBKCOLOR(x) ((x) == CLR_NONE ? comctl32_color.clrWindow : (x)) +#define GETTXTCOLOR(x) ((x) == CLR_NONE ? comctl32_color.clrWindowText : (x)) +#define GETINSCOLOR(x) ((x) == CLR_DEFAULT ? comctl32_color.clrBtnText : (x)) static const WCHAR themeClass[] = { 'T','r','e','e','v','i','e','w',0 }; @@ -2322,8 +2326,7 @@ TREEVIEW_DrawItemLines(const TREEVIEW_INFO *infoPtr, HDC hdc, const TREEVIEW_ITE & (TVS_LINESATROOT|TVS_HASLINES|TVS_HASBUTTONS)) > TVS_LINESATROOT); HBRUSH hbr, hbrOld; - COLORREF clrBk = infoPtr->clrBk == -1 ? comctl32_color.clrWindow: - infoPtr->clrBk; + COLORREF clrBk = GETBKCOLOR(infoPtr->clrBk); if (!lar && item->iLevel == 0) return; @@ -2342,7 +2345,7 @@ TREEVIEW_DrawItemLines(const TREEVIEW_INFO *infoPtr, HDC hdc, const TREEVIEW_ITE /* Get a dotted grey pen */ lb.lbStyle = BS_SOLID; - lb.lbColor = infoPtr->clrLine; + lb.lbColor = GETLINECOLOR(infoPtr->clrLine); hNewPen = ExtCreatePen(PS_COSMETIC|PS_ALTERNATE, 1, &lb, 0, NULL); hOldPen = SelectObject(hdc, hNewPen); @@ -2412,7 +2415,7 @@ TREEVIEW_DrawItemLines(const TREEVIEW_INFO *infoPtr, HDC hdc, const TREEVIEW_ITE /* plussize = ceil(rectsize * 3/4) */ LONG plussize = (rectsize + 1) * 3 / 4; - HPEN hNewPen = CreatePen(PS_SOLID, 0, infoPtr->clrLine); + HPEN hNewPen = CreatePen(PS_SOLID, 0, GETLINECOLOR(infoPtr->clrLine)); HPEN hOldPen = SelectObject(hdc, hNewPen); Rectangle(hdc, centerx - rectsize - 1, centery - rectsize - 1, @@ -2482,22 +2485,16 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *wineItem else { nmcdhdr.clrTextBk = comctl32_color.clrBtnFace; - if (infoPtr->clrText == -1) - nmcdhdr.clrText = comctl32_color.clrWindowText; - else - nmcdhdr.clrText = infoPtr->clrText; + nmcdhdr.clrText = GETTXTCOLOR(infoPtr->clrText); } } else { - nmcdhdr.clrTextBk = infoPtr->clrBk == -1 ? comctl32_color.clrWindow: - infoPtr->clrBk; + nmcdhdr.clrTextBk = GETBKCOLOR(infoPtr->clrBk); if ((infoPtr->dwStyle & TVS_TRACKSELECT) && (wineItem == infoPtr->hotItem)) nmcdhdr.clrText = comctl32_color.clrHighlight; - else if (infoPtr->clrText == -1) - nmcdhdr.clrText = comctl32_color.clrWindowText; else - nmcdhdr.clrText = infoPtr->clrText; + nmcdhdr.clrText = GETTXTCOLOR(infoPtr->clrText); } hOldFont = SelectObject(hdc, TREEVIEW_FontForItem(infoPtr, wineItem)); @@ -2629,7 +2626,7 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *wineItem int offset; int left, right; - hNewPen = CreatePen(PS_SOLID, 2, infoPtr->clrInsertMark); + hNewPen = CreatePen(PS_SOLID, 2, GETINSCOLOR(infoPtr->clrInsertMark)); hOldPen = SelectObject(hdc, hNewPen); if (infoPtr->insertBeforeorAfter) @@ -2801,8 +2798,8 @@ static void TREEVIEW_FillBkgnd(const TREEVIEW_INFO *infoPtr, HDC hdc, const RECT *rc) { HBRUSH hBrush; - COLORREF clrBk = infoPtr->clrBk == -1 ? comctl32_color.clrWindow: - infoPtr->clrBk; + COLORREF clrBk = GETBKCOLOR(infoPtr->clrBk); + hBrush = CreateSolidBrush(clrBk); FillRect(hdc, rc, hBrush); DeleteObject(hBrush); @@ -4998,10 +4995,10 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->scrollX = 0; - infoPtr->clrBk = -1; /* use system color */ - infoPtr->clrText = -1; /* use system color */ - infoPtr->clrLine = RGB(128, 128, 128); - infoPtr->clrInsertMark = comctl32_color.clrBtnText; + infoPtr->clrBk = CLR_NONE; /* use system color */ + infoPtr->clrText = CLR_NONE; /* use system color */ + infoPtr->clrLine = CLR_DEFAULT; + infoPtr->clrInsertMark = CLR_DEFAULT; /* hwndToolTip */

1 0

Nikolay Sivov : comctl32/treeview: Fix mouse tracking request code.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 28d5410596456d8307dfee699c7be7e73eaf5689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d5410596456d8307dfee699… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Dec 11 21:11:48 2009 +0300 comctl32/treeview: Fix mouse tracking request code. After query current tracking state passed parameters could be overwritten, similar fix for Listview was recently committed. --- dlls/comctl32/treeview.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 30699c5..ec1fdbe 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5280,7 +5280,6 @@ TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) trackinfo.cbSize = sizeof(TRACKMOUSEEVENT); trackinfo.dwFlags = TME_QUERY; trackinfo.hwndTrack = infoPtr->hwnd; - trackinfo.dwHoverTime = HOVER_DEFAULT; /* call _TrackMouseEvent to see if we are currently tracking for this hwnd */ _TrackMouseEvent(&trackinfo); @@ -5289,6 +5288,9 @@ TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) if(!(trackinfo.dwFlags & TME_LEAVE)) { trackinfo.dwFlags = TME_LEAVE; /* notify upon leaving */ + trackinfo.hwndTrack = infoPtr->hwnd; + /* do it as fast as possible, minimal systimer latency will be used */ + trackinfo.dwHoverTime = 1; /* call TRACKMOUSEEVENT so we receive a WM_MOUSELEAVE message */ /* and can properly deactivate the hot item */

1 0

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 December 2009