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

Nikolay Sivov : comctl32/listview: Fix some hittest problems on LVS_EX_FULLROWSELECT.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 89f0bdff6e96a82adfa06c8b57c4abcea7ba327a URL: http://source.winehq.org/git/wine.git/?a=commit;h=89f0bdff6e96a82adfa06c8b5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 14 20:40:42 2009 +0400 comctl32/listview: Fix some hittest problems on LVS_EX_FULLROWSELECT. --- dlls/comctl32/listview.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2599abd..835f251 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6643,6 +6643,8 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, /* 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; for (j = 0; j < DPA_GetPtrCount(infoPtr->hdpaColumns); j++) { @@ -6650,7 +6652,7 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, bounds.left = pRect->left; bounds.right = pRect->right; - if (PtInRect(&bounds, lpht->pt)) + if (PtInRect(&bounds, opt)) { lpht->iSubItem = j; break; @@ -6676,7 +6678,11 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, opt.y = lpht->pt.y - Position.y - Origin.y; if (infoPtr->uView == LV_VIEW_DETAILS) + { rcBounds = rcBox; + if (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) + opt.x = lpht->pt.x - Origin.x; + } else { UnionRect(&rcBounds, &rcIcon, &rcLabel);

1 0

Nikolay Sivov : comctl32/listview: Get rid of Header_* macros.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 47bc142dad244d6013be7b5236a4a2234e467404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47bc142dad244d6013be7b523… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 14 22:29:46 2009 +0400 comctl32/listview: Get rid of Header_* macros. --- dlls/comctl32/listview.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6fd3b71..60d5d63 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7194,7 +7194,7 @@ static BOOL LISTVIEW_SetColumnT(const LISTVIEW_INFO *infoPtr, INT nColumn, { hdi.mask |= HDI_FORMAT; hdiget.mask = HDI_FORMAT; - if (Header_GetItemW(infoPtr->hwndHeader, nColumn, &hdiget)) + if (SendMessageW(infoPtr->hwndHeader, HDM_GETITEMW, nColumn, (LPARAM)&hdiget)) hdi.fmt = hdiget.fmt & HDF_STRING; } column_fill_hditem(infoPtr, &hdi, nColumn, lpColumn, isW); @@ -7330,7 +7330,7 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) hdi.mask = HDI_TEXT; hdi.cchTextMax = DISP_TEXT_SIZE; hdi.pszText = szDispText; - if (Header_GetItemW(infoPtr->hwndHeader, nColumn, &hdi)) + if (SendMessageW(infoPtr->hwndHeader, HDM_GETITEMW, nColumn, (LPARAM)&hdi)) { HDC hdc = GetDC(infoPtr->hwndSelf); HFONT old_font = SelectObject(hdc, (HFONT)SendMessageW(infoPtr->hwndHeader, WM_GETFONT, 0, 0)); @@ -7352,7 +7352,7 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) hdi.mask = HDI_WIDTH; hdi.cxy = cx; TRACE("hdi.cxy=%d\n", hdi.cxy); - return Header_SetItemW(infoPtr->hwndHeader, nColumn, &hdi); + return SendMessageW(infoPtr->hwndHeader, HDM_SETITEMW, nColumn, (LPARAM)&hdi); } /*** @@ -9258,7 +9258,7 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADE HDITEMW hdi; hdi.mask = HDI_WIDTH; - if (!Header_GetItemW(infoPtr->hwndHeader, lpnmh->iItem, &hdi)) return 0; + if (!SendMessageW(infoPtr->hwndHeader, HDM_GETITEMW, lpnmh->iItem, (LPARAM)&hdi)) return 0; cxy = hdi.cxy; } else

1 0

Nikolay Sivov : comctl32/listview: Don't offset subitems on painting.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: caa91dcbc7d6e226d0bdd03541827295fff675cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa91dcbc7d6e226d0bdd0354… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 14 22:06:48 2009 +0400 comctl32/listview: Don't offset subitems on painting. --- dlls/comctl32/listview.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 835f251..6fd3b71 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4151,15 +4151,16 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, while(iterator_next(i)) { LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position); - Position.x += Origin.x; Position.y += Origin.y; /* iterate through the invalidated columns */ while(iterator_next(&j)) { + LISTVIEW_GetHeaderRect(infoPtr, j.nItem, &rcItem); + Position.x = (j.nItem == 0) ? rcItem.left + Origin.x : Origin.x; + if (rgntype == COMPLEXREGION && !((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) && j.nItem == 0)) { - LISTVIEW_GetHeaderRect(infoPtr, j.nItem, &rcItem); rcItem.top = 0; rcItem.bottom = infoPtr->nItemHeight; OffsetRect(&rcItem, Position.x, Position.y);

1 0

Nikolay Sivov : comctl32/listview: Don' t offset item box to item position on LVS_EX_FULLROWSELECT if item isn' t in leftmost column.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 8372d1832ddbed597804ffb60d696dfd776fd4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8372d1832ddbed597804ffb60… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 14 20:08:54 2009 +0400 comctl32/listview: Don't offset item box to item position on LVS_EX_FULLROWSELECT if item isn't in leftmost column. --- dlls/comctl32/listview.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8ef516a..2599abd 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2249,7 +2249,13 @@ static void LISTVIEW_GetItemBox(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT } LISTVIEW_GetItemMetrics(infoPtr, &lvItem, lprcBox, 0, 0, 0, 0); - OffsetRect(lprcBox, Position.x + Origin.x, Position.y + Origin.y); + if (infoPtr->uView == LV_VIEW_DETAILS && infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT && + SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, 0, 0)) + { + OffsetRect(lprcBox, Origin.x, Position.y + Origin.y); + } + else + OffsetRect(lprcBox, Position.x + Origin.x, Position.y + Origin.y); }

1 0

Andrew Talbot : crypt32: Constify some variables.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 465a583f273668fe3e818d351bb105b606267d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=465a583f273668fe3e818d351… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jun 12 18:27:56 2009 +0100 crypt32: Constify some variables. --- dlls/crypt32/context.c | 4 ++-- dlls/crypt32/crypt32_private.h | 2 +- dlls/crypt32/encode.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index f7ebebb..bb87799 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -201,7 +201,7 @@ struct ContextList *ContextList_Create( return list; } -static inline struct list *ContextList_ContextToEntry(struct ContextList *list, +static inline struct list *ContextList_ContextToEntry(const struct ContextList *list, const void *context) { struct list *ret; @@ -213,7 +213,7 @@ static inline struct list *ContextList_ContextToEntry(struct ContextList *list, return ret; } -static inline void *ContextList_EntryToContext(struct ContextList *list, +static inline void *ContextList_EntryToContext(const struct ContextList *list, struct list *entry) { return (LPBYTE)entry - sizeof(LINK_CONTEXT) - list->contextSize; diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 46d4797..07c6382 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -79,7 +79,7 @@ typedef struct _CRYPT_DIGESTED_DATA CRYPT_HASH_BLOB hash; } CRYPT_DIGESTED_DATA; -BOOL CRYPT_AsnEncodePKCSDigestedData(CRYPT_DIGESTED_DATA *digestedData, +BOOL CRYPT_AsnEncodePKCSDigestedData(const CRYPT_DIGESTED_DATA *digestedData, void *pvData, DWORD *pcbData); typedef struct _CRYPT_SIGNED_INFO diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 14d193f..67a0155 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1078,7 +1078,7 @@ static BOOL WINAPI CRYPT_AsnEncodeNameValue(DWORD dwCertEncodingType, } static BOOL CRYPT_AsnEncodeRdnAttr(DWORD dwCertEncodingType, - CERT_RDN_ATTR *attr, CryptEncodeObjectExFunc nameValueEncodeFunc, + const CERT_RDN_ATTR *attr, CryptEncodeObjectExFunc nameValueEncodeFunc, BYTE *pbEncoded, DWORD *pcbEncoded) { DWORD bytesNeeded = 0, lenBytes, size; @@ -1268,7 +1268,7 @@ static BOOL WINAPI CRYPT_DEREncodeItemsAsSet(DWORD dwCertEncodingType, return ret; } -static BOOL CRYPT_AsnEncodeRdn(DWORD dwCertEncodingType, CERT_RDN *rdn, +static BOOL CRYPT_AsnEncodeRdn(DWORD dwCertEncodingType, const CERT_RDN *rdn, CryptEncodeObjectExFunc nameValueEncodeFunc, BYTE *pbEncoded, DWORD *pcbEncoded) { @@ -1881,7 +1881,7 @@ static BOOL WINAPI CRYPT_AsnEncodePKCSContentInfoInternal( cItem, dwFlags, pEncodePara, pbEncoded, pcbEncoded); } -BOOL CRYPT_AsnEncodePKCSDigestedData(CRYPT_DIGESTED_DATA *digestedData, +BOOL CRYPT_AsnEncodePKCSDigestedData(const CRYPT_DIGESTED_DATA *digestedData, void *pvData, DWORD *pcbData) { struct AsnEncodeSequenceItem items[] = {

1 0

Marcus Meissner : ddraw: Use correct union member.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 882716e78b7202c0fdf6f999277ec4856231581e URL: http://source.winehq.org/git/wine.git/?a=commit;h=882716e78b7202c0fdf6f9992… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 14 14:32:11 2009 +0200 ddraw: Use correct union member. --- dlls/ddraw/executebuffer.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 3ff794d..73e0657 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -227,14 +227,14 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, } else if(lpDevice->Handles[ci->u2.dwArg[0] - 1].type != DDrawHandle_Matrix) { ERR("Handle %d is not a matrix handle\n", ci->u2.dwArg[0]); } else { - if(ci->u1.drstRenderStateType == D3DTRANSFORMSTATE_WORLD) + if(ci->u1.dtstTransformStateType == D3DTRANSFORMSTATE_WORLD) lpDevice->world = ci->u2.dwArg[0]; - if(ci->u1.drstRenderStateType == D3DTRANSFORMSTATE_VIEW) + if(ci->u1.dtstTransformStateType == D3DTRANSFORMSTATE_VIEW) lpDevice->view = ci->u2.dwArg[0]; - if(ci->u1.drstRenderStateType == D3DTRANSFORMSTATE_PROJECTION) + if(ci->u1.dtstTransformStateType == D3DTRANSFORMSTATE_PROJECTION) lpDevice->proj = ci->u2.dwArg[0]; IDirect3DDevice7_SetTransform((IDirect3DDevice7 *)lpDevice, - ci->u1.drstRenderStateType, (LPD3DMATRIX)lpDevice->Handles[ci->u2.dwArg[0] - 1].ptr); + ci->u1.dtstTransformStateType, (LPD3DMATRIX)lpDevice->Handles[ci->u2.dwArg[0] - 1].ptr); } instr += size; }

1 0

Detlef Riekenberg : urlmon/tests: Move SecurityManager and ZoneManager tests to a separate file.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 387f24f467888a1c808c4b43edda7546959d567b URL: http://source.winehq.org/git/wine.git/?a=commit;h=387f24f467888a1c808c4b43e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jun 13 15:20:00 2009 +0200 urlmon/tests: Move SecurityManager and ZoneManager tests to a separate file. --- dlls/mshtml/tests/dom.c | 2 +- dlls/mshtml/tests/script.c | 2 +- dlls/urlmon/tests/Makefile.in | 1 + dlls/urlmon/tests/misc.c | 271 --------------------------------- dlls/urlmon/tests/sec_mgr.c | 335 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 338 insertions(+), 273 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=387f24f467888a1c808c4…

1 0

Frédéric Delanoy : documentation: Keep README. fr in sync.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 9c02be0ccbcb582dad3c6eb8f98b127ce3ef676c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c02be0ccbcb582dad3c6eb8f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jun 14 22:43:24 2009 +0200 documentation: Keep README.fr in sync. --- documentation/README.fr | 233 ++++++++++++++++++++++------------------------- 1 files changed, 108 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c02be0ccbcb582dad3c6…

1 0

Austin English : configure: Add a note about missing dbus if libhal is missing.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 41ca554d1a837b6bfd8c8b7bb70f80a32965a9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41ca554d1a837b6bfd8c8b7bb… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jun 12 13:03:56 2009 -0500 configure: Add a note about missing dbus if libhal is missing. --- configure | 6 +++--- configure.ac | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 73ced57..7d18ad5 100755 --- a/configure +++ b/configure @@ -13028,11 +13028,11 @@ fi fi if test "x$ac_cv_lib_soname_hal" = "x"; then case "x$with_hal" in - x) wine_notices="$wine_notices|libhal ${notice_platform}development files not found, no dynamic device support." ;; + x) wine_notices="$wine_notices|libhal/libdbus ${notice_platform}development files not found, no dynamic device support." ;; xno) ;; - *) { { $as_echo "$as_me:$LINENO: error: libhal ${notice_platform}development files not found, no dynamic device support. + *) { { $as_echo "$as_me:$LINENO: error: libhal/libdbus ${notice_platform}development files not found, no dynamic device support. This is an error since --with-hal was requested." >&5 -$as_echo "$as_me: error: libhal ${notice_platform}development files not found, no dynamic device support. +$as_echo "$as_me: error: libhal/libdbus ${notice_platform}development files not found, no dynamic device support. This is an error since --with-hal was requested." >&2;} { (exit 1); exit 1; }; } ;; esac diff --git a/configure.ac b/configure.ac index 258a864..bef311e 100644 --- a/configure.ac +++ b/configure.ac @@ -1006,7 +1006,7 @@ then CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(hal,[test "x$ac_cv_lib_soname_hal" = "x"], - [libhal ${notice_platform}development files not found, no dynamic device support.]) + [libhal/libdbus ${notice_platform}development files not found, no dynamic device support.]) dnl **** Check for libgnutls **** if test "x$with_gnutls" != "xno"

1 0

Francois Gouget : winapi/c_parser: Remove some dead code.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: dcfd048e2c8310efbca39467427bfce8382ff8e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcfd048e2c8310efbca394674… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 15 11:03:04 2009 +0200 winapi/c_parser: Remove some dead code. --- tools/winapi/c_parser.pm | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index b93e461..17d74d7 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -242,11 +242,6 @@ sub _parse_c_warning($$$$$$) { $current .= $lines[1] . "\n" if $lines[1]; } - if (0) { - (my $package, my $filename, my $line) = caller(0); - $output->write("*** caller ***: $filename:$line\n"); - } - if($current) { $output->write("$$file:$line." . ($column + 1) . ": $context: $message: \\\n$current"); } else { @@ -854,8 +849,6 @@ sub parse_c_file($$$$) { if($line != $previous_line) { &$$found_line($line); - } elsif(0 && $column == $previous_column) { - $self->_parse_c_error($_, $line, $column, "file", "no progress"); } else { # &$$found_line("$line.$column"); } @@ -1098,14 +1091,7 @@ sub parse_c_file($$$$) { } } elsif(s/^;//) { $declaration .= $&; - if(0 && $blevel == 1 && - $declaration !~ /^typedef/ && - $declaration !~ /^(?:const\s+|extern\s+|static\s+|volatile\s+)?(?:interface|struct|union)(?:\s+\w+)?\s*\{/s && - $declaration =~ /^(?:\w+(?:\s*\*)*\s+)*(\w+)\s*$\s*(?:(?:\w+\s*,\s*)*(\w+))?\s*$\s*(.*?);$/s && - $1 ne "ICOM_VTABLE" && defined($2) && $2 ne "void" && $3) # K&R - { - $self->_parse_c_warning("", $line, $column, "file", "function $1: warning: function has K&R format"); - } elsif($plevel == 1 && $blevel == 1) { + if($plevel == 1 && $blevel == 1) { $declaration =~ s/\s*;$//; if($declaration && !$self->parse_c_declaration(\$declaration, \$declaration_line, \$declaration_column)) { return 0;

1 0