November 2009 - Wine-commits

Maarten Lankhorst : dsound: Fix destruction in duplex.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 9aa5aa3364cc78429f5c260592d5f9b1117afe5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa5aa3364cc78429f5c26059… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 24 14:12:58 2009 +0100 dsound: Fix destruction in duplex. --- dlls/dsound/duplex.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 8fbf1d6..7ef83f9 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -109,7 +109,7 @@ static ULONG WINAPI IDirectSoundFullDuplex_IUnknown_Release( ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { - IDirectSound_Release(This->pdsfd->pUnknown); + This->pdsfd->pUnknown = NULL; HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); } @@ -185,7 +185,7 @@ static ULONG WINAPI IDirectSoundFullDuplex_IDirectSound_Release( ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { - IDirectSound_Release(This->pdsfd->pDS); + This->pdsfd->pDS = NULL; HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); } @@ -350,7 +350,7 @@ static ULONG WINAPI IDirectSoundFullDuplex_IDirectSound8_Release( ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { - IDirectSound_Release(This->pdsfd->pDS8); + This->pdsfd->pDS8 = NULL; HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); } @@ -515,7 +515,7 @@ static ULONG WINAPI IDirectSoundFullDuplex_IDirectSoundCapture_Release( ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { - IDirectSoundCapture_Release(This->pdsfd->pDSC); + This->pdsfd->pDSC = NULL; HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); }

1 0

Maarten Lankhorst : dsound: Remove directsound interface in duplex.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: c9b70ddf7e08d5feb70663b5061b9cf50082779e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b70ddf7e08d5feb70663b50… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 24 14:10:52 2009 +0100 dsound: Remove directsound interface in duplex. --- dlls/dsound/dsound.c | 4 +- dlls/dsound/dsound_private.h | 2 + dlls/dsound/duplex.c | 199 +++--------------------------------------- 3 files changed, 16 insertions(+), 189 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9b70ddf7e08d5feb7066…

1 0

Nikolay Sivov : comctl32/listview: Get rid of duplicated helper in tests.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 1e1c1310f5cbef72ef5ea7ade6041814f872dc22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e1c1310f5cbef72ef5ea7ade… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Nov 28 12:04:58 2009 +0300 comctl32/listview: Get rid of duplicated helper in tests. --- dlls/comctl32/tests/listview.c | 162 +++++++++++++++++----------------------- 1 files changed, 70 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e1c1310f5cbef72ef5ea…

1 0

Nikolay Sivov : comctl32/header: Avoid uninitialized memory passed to HDM_INSERTITEM, some fields are always copied.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: d2e169fadd90e345fb8b6c1aeed7cda8fb095fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e169fadd90e345fb8b6c1ae… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Nov 28 17:31:52 2009 +0300 comctl32/header: Avoid uninitialized memory passed to HDM_INSERTITEM, some fields are always copied. --- dlls/comctl32/tests/header.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index b7fe8e5..8d6ad1f 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1267,6 +1267,7 @@ static void test_hds_nosizing(HWND hParent) hChild = create_custom_header_control(hParent, FALSE); + memset(&hdItem, 0, sizeof(hdItem)); hdItem.mask = HDI_WIDTH; hdItem.cxy = 80;

1 0

Nikolay Sivov : riched20/tests: Don't leak string in test.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: c6ff530ad60b8df4561e44999a691fbfbd064062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ff530ad60b8df4561e44999… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Nov 28 21:43:14 2009 +0300 riched20/tests: Don't leak string in test. --- dlls/riched20/tests/txtsrv.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index da28945..8da111d 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -667,6 +667,7 @@ static void test_TxSetText(void) ok(memcmp(rettext,settext,SysStringByteLen(rettext)) == 0, "String returned differs\n"); + SysFreeString(rettext); IUnknown_Release(txtserv); CoTaskMemFree(dummyTextHost); }

1 0

Nikolay Sivov : user32/tests: Free memory after use.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 916e38f969bb5478c2053c812daaa2b782e04a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=916e38f969bb5478c2053c812… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Nov 29 02:18:59 2009 +0300 user32/tests: Free memory after use. --- dlls/user32/tests/dde.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 202bb41..afeef4d 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2067,6 +2067,8 @@ static void test_UnpackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ok(lo == 0, "Expected 0, got %08lx\n", lo); ok(hi == 0xcafebabe, "Expected 0xcafebabe, got %08lx\n", hi); + + GlobalFree(hglobal); } static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV hconv,

1 0

Juan Lang : crypt32: Don' t copy past end of buffer when removing a string from a multi string.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: f2040b772544ebc434fa82a27713aa3a248c1b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2040b772544ebc434fa82a27… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Nov 29 11:42:57 2009 -0800 crypt32: Don't copy past end of buffer when removing a string from a multi string. --- dlls/crypt32/oid.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 0a3889d..68a4852 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -881,9 +881,11 @@ static BOOL CRYPT_RemoveStringFromMultiString(LPWSTR multi, LPCWSTR toRemove) } else { + LPCWSTR nextStr = spotToRemove + lstrlenW(toRemove) + 1; + /* Copy remainder of string "left" */ - memmove(spotToRemove, spotToRemove + lstrlenW(toRemove) + 1, - (len - (spotToRemove - multi)) * sizeof(WCHAR)); + memmove(spotToRemove, nextStr, + (len - (nextStr - multi)) * sizeof(WCHAR)); } ret = TRUE; }

1 0

Juan Lang : crypt32: Revert 8ed5a777de6c9797a285829e07d7a27b3ed01257.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 90c160c3d823621749c968e49b63ca9a60e86d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90c160c3d823621749c968e49… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Nov 29 15:14:06 2009 -0800 crypt32: Revert 8ed5a777de6c9797a285829e07d7a27b3ed01257. Ordinarily removing tests seems like a bad idea, but in this case it seems the only rational response to the test failures the tests produce. The tests check the state of three bits with a variety of certificate and CRL combinations. One of these bits is apparently not set by any version of Windows for any of the tests. Testing its absence doesn't seem correct, and I'll explain why in more detail in a second. Every permutation of the remaining two bits appears on at least one Windows version, and no Windows version is obviously more correct than the rest, so testing them doesn't seem worthwhile. The one bit that doesn't appear to be set is the bit saying that a certificate is revoked. I created CRLs that do in fact revoke some of the tested certificates, so it appears to me that the bit should be set. It's possible that Windows doesn't bother checking the revocation status of a certificate whose anchor isn't trusted, but it's impossible to test this in an automated regression test suite, because adding a trusted certificate requires clicking OK (or its equivalent) in a dialog. The dialog is invoked by the system process, so I can't use a dialog hook to suppress it. I can test this hypothesis manually, but it isn't possible to do so in an automated way. --- dlls/crypt32/tests/chain.c | 344 -------------------------------------------- 1 files changed, 0 insertions(+), 344 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90c160c3d823621749c96…

1 0

Paul Vriens : include: Add some system parameters.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 50cec6e9892f9cfb22e941ad9c25c6ec57a4f748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50cec6e9892f9cfb22e941ad9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 30 12:30:09 2009 +0100 include: Add some system parameters. --- dlls/user32/sysparams.c | 10 ++++++++++ include/winuser.h | 8 ++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 8d81404..4092221 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2353,6 +2353,16 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, ret = set_user_pref_param( 3, 0x80, PtrToUlong(pvParam), fWinIni ); break; + /* _WIN32_WINNT >= 0x600 */ + WINE_SPI_FIXME(SPI_GETDISABLEOVERLAPPEDCONTENT); + WINE_SPI_FIXME(SPI_SETDISABLEOVERLAPPEDCONTENT); + WINE_SPI_FIXME(SPI_GETCLIENTAREAANIMATION); + WINE_SPI_FIXME(SPI_SETCLIENTAREAANIMATION); + WINE_SPI_FIXME(SPI_GETCLEARTYPE); + WINE_SPI_FIXME(SPI_SETCLEARTYPE); + WINE_SPI_FIXME(SPI_GETSPEECHRECOGNITION); + WINE_SPI_FIXME(SPI_SETSPEECHRECOGNITION); + case SPI_GETFOREGROUNDLOCKTIMEOUT: /* 0x2000 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ ret = get_uint_param( SPI_SETFOREGROUNDLOCKTIMEOUT_IDX, SPI_SETFOREGROUNDLOCKTIMEOUT_REGKEY, diff --git a/include/winuser.h b/include/winuser.h index 9707b2c..e6b4741 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3046,6 +3046,14 @@ typedef struct tagCBTACTIVATESTRUCT #define SPI_SETBLOCKSENDINPUTRESETS 0x1027 #define SPI_GETUIEFFECTS 0x103E #define SPI_SETUIEFFECTS 0x103F +#define SPI_GETDISABLEOVERLAPPEDCONTENT 0x1040 +#define SPI_SETDISABLEOVERLAPPEDCONTENT 0x1041 +#define SPI_GETCLIENTAREAANIMATION 0x1042 +#define SPI_SETCLIENTAREAANIMATION 0x1043 +#define SPI_GETCLEARTYPE 0x1048 +#define SPI_SETCLEARTYPE 0x1049 +#define SPI_GETSPEECHRECOGNITION 0x104A +#define SPI_SETSPEECHRECOGNITION 0x104B #define SPI_GETFOREGROUNDLOCKTIMEOUT 0x2000 #define SPI_SETFOREGROUNDLOCKTIMEOUT 0x2001 #define SPI_GETACTIVEWNDTRKTIMEOUT 0x2002

1 0

Nikolay Sivov : comctl32/listview: Implement LVS_EX_HEADERINALLVIEWS.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 999810566b5459be83fe3f8fc28540f60097a1f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=999810566b5459be83fe3f8fc… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Nov 27 15:38:05 2009 +0300 comctl32/listview: Implement LVS_EX_HEADERINALLVIEWS. --- dlls/comctl32/listview.c | 96 ++++++++++++++++++++++++++++----------- dlls/comctl32/tests/listview.c | 65 +++++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c95ba67..df48272 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1588,6 +1588,13 @@ static inline void LISTVIEW_GetHeaderRect(const LISTVIEW_INFO *infoPtr, INT nSub { *lprc = LISTVIEW_GetColumnInfo(infoPtr, nSubItem)->rcHeader; } + +static inline BOOL LISTVIEW_IsHeaderEnabled(const LISTVIEW_INFO *infoPtr) +{ + return (infoPtr->uView == LV_VIEW_DETAILS || + infoPtr->dwLvExStyle & LVS_EX_HEADERINALLVIEWS) && + !(infoPtr->dwStyle & LVS_NOCOLUMNHEADER); +} static inline BOOL LISTVIEW_GetItemW(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem) { @@ -1926,7 +1933,23 @@ static void LISTVIEW_UpdateScroll(const LISTVIEW_INFO *infoPtr) if (LISTVIEW_GetViewRect(infoPtr, &rcView)) horzInfo.nMax = rcView.right - rcView.left; } - + + if (LISTVIEW_IsHeaderEnabled(infoPtr)) + { + if (DPA_GetPtrCount(infoPtr->hdpaColumns)) + { + RECT rcHeader; + INT index; + + index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, + DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, 0); + + LISTVIEW_GetHeaderRect(infoPtr, index, &rcHeader); + horzInfo.nMax = rcHeader.right; + TRACE("horzInfo.nMax=%d\n", horzInfo.nMax); + } + } + horzInfo.fMask = SIF_RANGE | SIF_PAGE; horzInfo.nMax = max(horzInfo.nMax - 1, 0); dx = GetScrollPos(infoPtr->hwndSelf, SB_HORZ); @@ -1976,7 +1999,7 @@ static void LISTVIEW_UpdateScroll(const LISTVIEW_INFO *infoPtr) } /* Update the Header Control */ - if (infoPtr->uView == LV_VIEW_DETAILS) + if (infoPtr->hwndHeader) { horzInfo.fMask = SIF_POS; GetScrollInfo(infoPtr->hwndSelf, SB_HORZ, &horzInfo); @@ -8171,6 +8194,16 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwM LISTVIEW_SetBkColor(infoPtr, CLR_NONE); } + if((infoPtr->dwLvExStyle ^ dwOldExStyle) & LVS_EX_HEADERINALLVIEWS) + { + if (infoPtr->dwLvExStyle & LVS_EX_HEADERINALLVIEWS) + LISTVIEW_CreateHeader(infoPtr); + else + ShowWindow(infoPtr->hwndHeader, SW_HIDE); + LISTVIEW_UpdateSize(infoPtr); + LISTVIEW_UpdateScroll(infoPtr); + } + LISTVIEW_InvalidateList(infoPtr); return dwOldExStyle; } @@ -9412,21 +9445,20 @@ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode, scrollInfo.fMask = SIF_POS; scrollInfo.nPos = nNewScrollPos; nNewScrollPos = SetScrollInfo(infoPtr->hwndSelf, SB_HORZ, &scrollInfo, TRUE); - + /* carry on only if it really changed */ if (nNewScrollPos == nOldScrollPos) return 0; - - if (infoPtr->uView == LV_VIEW_DETAILS) - LISTVIEW_UpdateHeaderSize(infoPtr, nNewScrollPos); - + + if (infoPtr->hwndHeader) LISTVIEW_UpdateHeaderSize(infoPtr, nNewScrollPos); + /* now adjust to client coordinates */ nScrollDiff = nOldScrollPos - nNewScrollPos; if (infoPtr->uView == LV_VIEW_LIST) nScrollDiff *= infoPtr->nItemWidth; - + /* and scroll the window */ scroll_list(infoPtr, nScrollDiff, 0); - return 0; + return 0; } static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) @@ -10077,6 +10109,9 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADE case HDN_DIVIDERDBLCLICKW: case HDN_DIVIDERDBLCLICKA: + /* FIXME: for LVS_EX_HEADERINALLVIEWS and not LV_VIEW_DETAILS + we should use LVSCW_AUTOSIZE_USEHEADER, helper rework or + split needed for that */ LISTVIEW_SetColumnWidth(infoPtr, lpnmh->iItem, LVSCW_AUTOSIZE); notify_forward_header(infoPtr, lpnmh); break; @@ -10568,27 +10603,34 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) infoPtr->rcList.bottom -= GetSystemMetrics(SM_CYHSCROLL); infoPtr->rcList.bottom = max (infoPtr->rcList.bottom - 2, 0); } - else if (infoPtr->uView == LV_VIEW_DETAILS) + + /* if control created invisible header isn't created */ + if (infoPtr->hwndHeader) { - /* if control created invisible header isn't created */ - if (infoPtr->hwndHeader) + HDLAYOUT hl; + WINDOWPOS wp; + + hl.prc = &infoPtr->rcList; + hl.pwpos = &wp; + SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); + TRACE(" wp.flags=0x%08x, wp=%d,%d (%dx%d)\n", wp.flags, wp.x, wp.y, wp.cx, wp.cy); + + if (LISTVIEW_IsHeaderEnabled(infoPtr)) + wp.flags |= SWP_SHOWWINDOW; + else { - HDLAYOUT hl; - WINDOWPOS wp; - - hl.prc = &infoPtr->rcList; - hl.pwpos = &wp; - SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); - TRACE(" wp.flags=0x%08x, wp=%d,%d (%dx%d)\n", wp.flags, wp.x, wp.y, wp.cx, wp.cy); - SetWindowPos(wp.hwnd, wp.hwndInsertAfter, wp.x, wp.y, wp.cx, wp.cy, - wp.flags | ((infoPtr->dwStyle & LVS_NOCOLUMNHEADER) - ? SWP_HIDEWINDOW : SWP_SHOWWINDOW)); - TRACE(" after SWP wp=%d,%d (%dx%d)\n", wp.x, wp.y, wp.cx, wp.cy); - - infoPtr->rcList.top = max(wp.cy, 0); + wp.flags |= SWP_HIDEWINDOW; + wp.cy = 0; } - infoPtr->rcList.top += (infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) ? 2 : 0; + + SetWindowPos(wp.hwnd, wp.hwndInsertAfter, wp.x, wp.y, wp.cx, wp.cy, wp.flags); + TRACE(" after SWP wp=%d,%d (%dx%d)\n", wp.x, wp.y, wp.cx, wp.cy); + + infoPtr->rcList.top = max(wp.cy, 0); } + /* extra padding for grid */ + if (infoPtr->uView == LV_VIEW_DETAILS && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) + infoPtr->rcList.top += 2; TRACE(" rcList=%s\n", wine_dbgstr_rect(&infoPtr->rcList)); } @@ -10669,7 +10711,7 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, LISTVIEW_UpdateItemSize(infoPtr); } - if (uNewView == LVS_REPORT) + if (uNewView == LVS_REPORT || infoPtr->dwLvExStyle & LVS_EX_HEADERINALLVIEWS) { if ((lpss->styleOld ^ lpss->styleNew) & LVS_NOCOLUMNHEADER) { diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 1b6fcab..651b941 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1253,6 +1253,8 @@ static void test_create(void) LVCOLUMNA col; RECT rect; WNDCLASSEX cls; + DWORD style; + cls.cbSize = sizeof(WNDCLASSEX); ok(GetClassInfoEx(GetModuleHandle(NULL), "SysListView32", &cls), "GetClassInfoEx failed\n"); listviewWndProc = cls.lpfnWndProc; @@ -1292,6 +1294,8 @@ static void test_create(void) hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); ok(IsWindow(hHeader), "Header should be created\n"); ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + style = GetWindowLong(hHeader, GWL_STYLE); + ok(!(style & HDS_HIDDEN), "Not expected HDS_HIDDEN\n"); DestroyWindow(hList); hList = CreateWindow("SysListView32", "Test", WS_VISIBLE|LVS_LIST, 0, 0, 100, 100, NULL, NULL, @@ -4183,6 +4187,66 @@ static void test_finditem(void) DestroyWindow(hwnd); } +static void test_LVS_EX_HEADERINALLVIEWS(void) +{ + HWND hwnd, header; + DWORD style; + + hwnd = create_custom_listview_control(LVS_ICON); + + SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_HEADERINALLVIEWS, + LVS_EX_HEADERINALLVIEWS); + + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + if (!IsWindow(header)) + { + win_skip("LVS_EX_HEADERINALLVIEWS unsupported\n"); + DestroyWindow(hwnd); + return; + } + + /* LVS_NOCOLUMNHEADER works as before */ + style = GetWindowLongA(hwnd, GWL_STYLE); + SetWindowLongW(hwnd, GWL_STYLE, style | LVS_NOCOLUMNHEADER); + style = GetWindowLongA(header, GWL_STYLE); + ok(style & HDS_HIDDEN, "Expected HDS_HIDDEN\n"); + style = GetWindowLongA(hwnd, GWL_STYLE); + SetWindowLongW(hwnd, GWL_STYLE, style & ~LVS_NOCOLUMNHEADER); + style = GetWindowLongA(header, GWL_STYLE); + ok(!(style & HDS_HIDDEN), "Expected HDS_HIDDEN to be unset\n"); + + /* try to remove style */ + SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_HEADERINALLVIEWS, 0); + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "Expected header to be created\n"); + style = GetWindowLongA(header, GWL_STYLE); + ok(!(style & HDS_HIDDEN), "HDS_HIDDEN not expected\n"); + + DestroyWindow(hwnd); + + /* check other styles */ + hwnd = create_custom_listview_control(LVS_LIST); + SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_HEADERINALLVIEWS, + LVS_EX_HEADERINALLVIEWS); + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "Expected header to be created\n"); + DestroyWindow(hwnd); + + hwnd = create_custom_listview_control(LVS_SMALLICON); + SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_HEADERINALLVIEWS, + LVS_EX_HEADERINALLVIEWS); + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "Expected header to be created\n"); + DestroyWindow(hwnd); + + hwnd = create_custom_listview_control(LVS_REPORT); + SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_HEADERINALLVIEWS, + LVS_EX_HEADERINALLVIEWS); + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "Expected header to be created\n"); + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -4270,6 +4334,7 @@ START_TEST(listview) test_mapidindex(); test_scrollnotify(); test_LVS_EX_TRANSPARENTBKGND(); + test_LVS_EX_HEADERINALLVIEWS(); unload_v6_module(ctx_cookie, hCtx);

1 0