November 2009 - Wine-commits

Juan Lang : crypt32: Correct reference counting when deleting contexts from collections.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: 976c6ff3f8fd679b70f3a92e3fa71c58256ec28f URL: http://source.winehq.org/git/wine.git/?a=commit;h=976c6ff3f8fd679b70f3a92e3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 3 17:04:32 2009 -0800 crypt32: Correct reference counting when deleting contexts from collections. --- dlls/crypt32/collectionstore.c | 34 ++++++++++++++++++++++++++++------ dlls/crypt32/tests/store.c | 22 ++++++++++++++++++++++ 2 files changed, 50 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 12eb7c3..e55c1bf 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -255,11 +255,19 @@ static BOOL CRYPT_CollectionDeleteCert(PWINECRYPT_CERTSTORE store, void *pCertContext) { BOOL ret; + PCCERT_CONTEXT linked; TRACE("(%p, %p)\n", store, pCertContext); - ret = CertDeleteCertificateFromStore( - Context_GetLinkedContext(pCertContext, sizeof(CERT_CONTEXT))); + /* Deleting the linked context results in its ref count getting + * decreased, but the caller of this (CertDeleteCertificateFromStore) also + * decreases pCertContext's ref count, by calling + * CertFreeCertificateContext. Increase ref count of linked context to + * compensate. + */ + linked = Context_GetLinkedContext(pCertContext, sizeof(CERT_CONTEXT)); + CertDuplicateCertificateContext(linked); + ret = CertDeleteCertificateFromStore(linked); return ret; } @@ -333,11 +341,18 @@ static BOOL CRYPT_CollectionDeleteCRL(PWINECRYPT_CERTSTORE store, void *pCrlContext) { BOOL ret; + PCCRL_CONTEXT linked; TRACE("(%p, %p)\n", store, pCrlContext); - ret = CertDeleteCRLFromStore( - Context_GetLinkedContext(pCrlContext, sizeof(CRL_CONTEXT))); + /* Deleting the linked context results in its ref count getting + * decreased, but the caller of this (CertDeleteCRLFromStore) also + * decreases pCrlContext's ref count, by calling CertFreeCRLContext. + * Increase ref count of linked context to compensate. + */ + linked = Context_GetLinkedContext(pCrlContext, sizeof(CRL_CONTEXT)); + CertDuplicateCRLContext(linked); + ret = CertDeleteCRLFromStore(linked); return ret; } @@ -411,11 +426,18 @@ static BOOL CRYPT_CollectionDeleteCTL(PWINECRYPT_CERTSTORE store, void *pCtlContext) { BOOL ret; + PCCTL_CONTEXT linked; TRACE("(%p, %p)\n", store, pCtlContext); - ret = CertDeleteCTLFromStore( - Context_GetLinkedContext(pCtlContext, sizeof(CTL_CONTEXT))); + /* Deleting the linked context results in its ref count getting + * decreased, but the caller of this (CertDeleteCTLFromStore) also + * decreases pCtlContext's ref count, by calling CertFreeCTLContext. + * Increase ref count of linked context to compensate. + */ + linked = Context_GetLinkedContext(pCtlContext, sizeof(CTL_CONTEXT)); + CertDuplicateCTLContext(linked); + ret = CertDeleteCTLFromStore(linked); return ret; } diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 88f53ed..1f6609c 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -574,6 +574,28 @@ static void testCollectionStore(void) CertCloseStore(collection, 0); CertCloseStore(store2, 0); CertCloseStore(store1, 0); + + /* Test adding certificates to and deleting certificates from collections. + */ + store1 = CertOpenSystemStoreA(0, "My"); + collection = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + + ret = CertAddEncodedCertificateToStore(store1, X509_ASN_ENCODING, + bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, &context); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); + CertDeleteCertificateFromStore(context); + + CertAddStoreToCollection(collection, store1, + CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); + + ret = CertAddEncodedCertificateToStore(collection, X509_ASN_ENCODING, + bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, &context); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); + CertDeleteCertificateFromStore(context); + + CertCloseStore(collection, 0); + CertCloseStore(store1, 0); } /* Looks for the property with ID propID in the buffer buf. Returns a pointer

1 0

Juan Lang : crypt32: When removing contexts from a list, make sure the context no longer references the list.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: fb5e0d8a4d85483a3093cf0fdad21eb0da7264a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5e0d8a4d85483a3093cf0fd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 30 16:43:24 2009 -0700 crypt32: When removing contexts from a list, make sure the context no longer references the list. --- dlls/crypt32/context.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 9ada6bf..20fe024 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -289,6 +289,7 @@ void ContextList_Delete(struct ContextList *list, void *context) EnterCriticalSection(&list->cs); list_remove(entry); LeaveCriticalSection(&list->cs); + list_init(entry); list->contextInterface->free(context); }

1 0

Juan Lang : crypt32: When add-ref'ing a context, add-ref its linked contexts too.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: 5f81ad6821c5ae509ec84f29c15bf1c2192d22de URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f81ad6821c5ae509ec84f29c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 30 17:25:28 2009 -0700 crypt32: When add-ref'ing a context, add-ref its linked contexts too. --- dlls/crypt32/context.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 20fe024..4d325c1 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -106,6 +106,34 @@ void Context_AddRef(void *context, size_t contextSize) PBASE_CONTEXT baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); InterlockedIncrement(&baseContext->ref); + if (baseContext->type == ContextTypeLink) + { + void *linkedContext = Context_GetLinkedContext(context, contextSize); + PBASE_CONTEXT linkedBase = BASE_CONTEXT_FROM_CONTEXT(linkedContext, + contextSize); + + /* Add-ref the linked contexts too */ + while (linkedContext && linkedBase->type == ContextTypeLink) + { + InterlockedIncrement(&linkedBase->ref); + linkedContext = Context_GetLinkedContext(linkedContext, + contextSize); + if (linkedContext) + linkedBase = BASE_CONTEXT_FROM_CONTEXT(linkedContext, + contextSize); + else + linkedBase = NULL; + } + if (linkedContext) + { + /* It's not a link context, so it wasn't add-ref'ed in the while + * loop, so add-ref it here. + */ + linkedBase = BASE_CONTEXT_FROM_CONTEXT(linkedContext, + contextSize); + InterlockedIncrement(&linkedBase->ref); + } + } } void *Context_GetExtra(const void *context, size_t contextSize)

1 0

Juan Lang : crypt32: When creating a link context, call Context_AddRef to add-ref it so its children get add-ref'd too.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: 52820b9cf80b9fda123b32884643c9f815be853c URL: http://source.winehq.org/git/wine.git/?a=commit;h=52820b9cf80b9fda123b32884… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 3 17:05:29 2009 -0800 crypt32: When creating a link context, call Context_AddRef to add-ref it so its children get add-ref'd too. --- dlls/crypt32/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 4d325c1..2f1720a 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -94,7 +94,7 @@ void *Context_CreateLinkContext(unsigned int contextSize, void *linked, unsigned linkContext->type = ContextTypeLink; linkContext->linked = linkedBase; if (addRef) - InterlockedIncrement(&linkedBase->ref); + Context_AddRef(linked, contextSize); TRACE("%p's ref count is %d\n", context, linkContext->ref); } TRACE("returning %p\n", context);

1 0

Henri Verbeet : d3d10: Add a D3D10GetGeometryShaderProfile() stub.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: 274d21a443d14801c3df3c769e81ed9c028949e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=274d21a443d14801c3df3c769… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 10:37:15 2009 +0100 d3d10: Add a D3D10GetGeometryShaderProfile() stub. --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/d3d10_main.c | 7 +++++++ include/d3d10shader.h | 1 + 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 332ab38..26f714e 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -8,7 +8,7 @@ @ stub D3D10CreateStateBlock @ stub D3D10DisassembleEffect @ stub D3D10DisassembleShader -@ stub D3D10GetGeometryShaderProfile +@ stdcall D3D10GetGeometryShaderProfile(ptr) @ stub D3D10GetInputAndOutputSignatureBlob @ stub D3D10GetInputSignatureBlob @ stub D3D10GetOutputSignatureBlob diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 84ea2b4..6ccc254 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -248,3 +248,10 @@ LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device) return "vs_4_0"; } + +LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device) +{ + FIXME("device %p stub!\n", device); + + return "gs_4_0"; +} diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 7a0a470..3aaf6fe 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -131,5 +131,6 @@ typedef struct _D3D10_SIGNATURE_PARAMETER_DESC } D3D10_SIGNATURE_PARAMETER_DESC; LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device); +LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device); #endif /* __WINE_D3D10SHADER_H */

1 0

Henri Verbeet : d3d10: Add a D3D10GetPixelShaderProfile() stub.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: b74642ff0b5a60de8df55e919466ee09641ef3a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b74642ff0b5a60de8df55e919… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 10:37:16 2009 +0100 d3d10: Add a D3D10GetPixelShaderProfile() stub. --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/d3d10_main.c | 7 +++++++ include/d3d10shader.h | 1 + 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 26f714e..86e1236 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -12,7 +12,7 @@ @ stub D3D10GetInputAndOutputSignatureBlob @ stub D3D10GetInputSignatureBlob @ stub D3D10GetOutputSignatureBlob -@ stub D3D10GetPixelShaderProfile +@ stdcall D3D10GetPixelShaderProfile(ptr) @ stub D3D10GetShaderDebugInfo @ stub D3D10GetVersion @ stdcall D3D10GetVertexShaderProfile(ptr) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 6ccc254..10bf533 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -255,3 +255,10 @@ LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device) return "gs_4_0"; } + +LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device) +{ + FIXME("device %p stub!\n", device); + + return "ps_4_0"; +} diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 3aaf6fe..582a1c9 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -132,5 +132,6 @@ typedef struct _D3D10_SIGNATURE_PARAMETER_DESC LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device); +LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device); #endif /* __WINE_D3D10SHADER_H */

1 0

Henri Verbeet : wined3d: Initialize "context[0]" in IWineD3DDeviceImpl_CreateSwapChain() when not using OpenGL (Valgrind).
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: 8d351a11417d75cc16f77f41b19060317f54fc76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d351a11417d75cc16f77f41b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 10:37:17 2009 +0100 wined3d: Initialize "context[0]" in IWineD3DDeviceImpl_CreateSwapChain() when not using OpenGL (Valgrind). --- dlls/wined3d/device.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e6931ea..a5a6c2e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1211,6 +1211,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice *iface, object->win_handle, object->context[0]->glCtx); } } + else + { + object->context[0] = NULL; + } /********************* * Create the back, front and stencil buffers

1 0

Owen Rudge : comctl32: Add absolute version of iterator_frameditems.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: 14991b78d8cdac5b46752d6c42c0fb15c882141d URL: http://source.winehq.org/git/wine.git/?a=commit;h=14991b78d8cdac5b46752d6c4… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 2 10:57:41 2009 -0600 comctl32: Add absolute version of iterator_frameditems. --- dlls/comctl32/listview.c | 53 ++++++++++++++++++++++++++++----------------- 1 files changed, 33 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 952c589..4bedd89 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1268,20 +1268,17 @@ static inline BOOL iterator_rangesitems(ITERATOR* i, RANGES ranges) } /*** - * Creates an iterator over the items which intersect lprc. + * Creates an iterator over the items which intersect frame. + * Uses absolute coordinates rather than compensating for the current offset. */ -static BOOL iterator_frameditems(ITERATOR* i, const LISTVIEW_INFO* infoPtr, const RECT *lprc) +static BOOL iterator_frameditems_absolute(ITERATOR* i, const LISTVIEW_INFO* infoPtr, const RECT *frame) { - RECT frame = *lprc, rcItem, rcTemp; - POINT Origin; + RECT rcItem, rcTemp; /* in case we fail, we want to return an empty iterator */ if (!iterator_empty(i)) return FALSE; - LISTVIEW_GetOrigin(infoPtr, &Origin); - - TRACE("(lprc=%s)\n", wine_dbgstr_rect(lprc)); - OffsetRect(&frame, -Origin.x, -Origin.y); + TRACE("(frame=%s)\n", wine_dbgstr_rect(frame)); if (infoPtr->uView == LV_VIEW_ICON || infoPtr->uView == LV_VIEW_SMALLICON) { @@ -1290,7 +1287,7 @@ static BOOL iterator_frameditems(ITERATOR* i, const LISTVIEW_INFO* infoPtr, cons if (infoPtr->uView == LV_VIEW_ICON && infoPtr->nFocusedItem != -1) { LISTVIEW_GetItemBox(infoPtr, infoPtr->nFocusedItem, &rcItem); - if (IntersectRect(&rcTemp, &rcItem, lprc)) + if (IntersectRect(&rcTemp, &rcItem, frame)) i->nSpecial = infoPtr->nFocusedItem; } if (!(iterator_rangesitems(i, ranges_create(50)))) return FALSE; @@ -1302,7 +1299,7 @@ static BOOL iterator_frameditems(ITERATOR* i, const LISTVIEW_INFO* infoPtr, cons rcItem.top = (LONG_PTR)DPA_GetPtr(infoPtr->hdpaPosY, nItem); rcItem.right = rcItem.left + infoPtr->nItemWidth; rcItem.bottom = rcItem.top + infoPtr->nItemHeight; - if (IntersectRect(&rcTemp, &rcItem, &frame)) + if (IntersectRect(&rcTemp, &rcItem, frame)) ranges_additem(i->ranges, nItem); } return TRUE; @@ -1311,11 +1308,11 @@ static BOOL iterator_frameditems(ITERATOR* i, const LISTVIEW_INFO* infoPtr, cons { RANGE range; - if (frame.left >= infoPtr->nItemWidth) return TRUE; - if (frame.top >= infoPtr->nItemHeight * infoPtr->nItemCount) return TRUE; + if (frame->left >= infoPtr->nItemWidth) return TRUE; + if (frame->top >= infoPtr->nItemHeight * infoPtr->nItemCount) return TRUE; - range.lower = max(frame.top / infoPtr->nItemHeight, 0); - range.upper = min((frame.bottom - 1) / infoPtr->nItemHeight, infoPtr->nItemCount - 1) + 1; + range.lower = max(frame->top / infoPtr->nItemHeight, 0); + range.upper = min((frame->bottom - 1) / infoPtr->nItemHeight, infoPtr->nItemCount - 1) + 1; if (range.upper <= range.lower) return TRUE; if (!iterator_rangeitems(i, range)) return FALSE; TRACE(" report=%s\n", debugrange(&i->range)); @@ -1323,8 +1320,8 @@ static BOOL iterator_frameditems(ITERATOR* i, const LISTVIEW_INFO* infoPtr, cons else { INT nPerCol = max((infoPtr->rcList.bottom - infoPtr->rcList.top) / infoPtr->nItemHeight, 1); - INT nFirstRow = max(frame.top / infoPtr->nItemHeight, 0); - INT nLastRow = min((frame.bottom - 1) / infoPtr->nItemHeight, nPerCol - 1); + INT nFirstRow = max(frame->top / infoPtr->nItemHeight, 0); + INT nLastRow = min((frame->bottom - 1) / infoPtr->nItemHeight, nPerCol - 1); INT nFirstCol; INT nLastCol; INT lower; @@ -1333,13 +1330,13 @@ static BOOL iterator_frameditems(ITERATOR* i, const LISTVIEW_INFO* infoPtr, cons if (infoPtr->nItemWidth) { - nFirstCol = max(frame.left / infoPtr->nItemWidth, 0); - nLastCol = min((frame.right - 1) / infoPtr->nItemWidth, (infoPtr->nItemCount + nPerCol - 1) / nPerCol); + nFirstCol = max(frame->left / infoPtr->nItemWidth, 0); + nLastCol = min((frame->right - 1) / infoPtr->nItemWidth, (infoPtr->nItemCount + nPerCol - 1) / nPerCol); } else { - nFirstCol = max(frame.left, 0); - nLastCol = min(frame.right - 1, (infoPtr->nItemCount + nPerCol - 1) / nPerCol); + nFirstCol = max(frame->left, 0); + nLastCol = min(frame->right - 1, (infoPtr->nItemCount + nPerCol - 1) / nPerCol); } lower = nFirstCol * nPerCol + nFirstRow; @@ -1365,6 +1362,22 @@ static BOOL iterator_frameditems(ITERATOR* i, const LISTVIEW_INFO* infoPtr, cons } /*** + * Creates an iterator over the items which intersect lprc. + */ +static BOOL iterator_frameditems(ITERATOR* i, const LISTVIEW_INFO* infoPtr, const RECT *lprc) +{ + RECT frame = *lprc; + POINT Origin; + + TRACE("(lprc=%s)\n", wine_dbgstr_rect(lprc)); + + LISTVIEW_GetOrigin(infoPtr, &Origin); + OffsetRect(&frame, -Origin.x, -Origin.y); + + return iterator_frameditems_absolute(i, infoPtr, &frame); +} + +/*** * Creates an iterator over the items which intersect the visible region of hdc. */ static BOOL iterator_visibleitems(ITERATOR *i, const LISTVIEW_INFO *infoPtr, HDC hdc)

1 0

Owen Rudge : comctl32: Move marquee logic into separate function.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: 038e36aded6d06c42dee6c08777c519cb97c2014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=038e36aded6d06c42dee6c087… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 2 10:57:52 2009 -0600 comctl32: Move marquee logic into separate function. --- dlls/comctl32/listview.c | 210 ++++++++++++++++++++++++++++------------------ 1 files changed, 127 insertions(+), 83 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4bedd89..415a863 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -249,7 +249,9 @@ typedef struct tagLISTVIEW_INFO BOOL bRButtonDown; BOOL bDragging; BOOL bMarqueeSelect; /* marquee selection/highlight underway */ - RECT marqueeRect; + RECT marqueeRect; /* absolute coordinates of marquee selection */ + RECT marqueeDrawRect; /* relative coordinates for drawing marquee */ + POINT marqueeOrigin; /* absolute coordinates of marquee click origin */ POINT ptClickPos; /* point where the user clicked */ BOOL bNoItemMetrics; /* flags if item metrics are not yet computed */ INT nItemHeight; @@ -3595,6 +3597,103 @@ static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, I /*** * DESCRIPTION: + * Utility routine to draw and highlight items within a marquee selection rectangle. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * [I] coords_orig : original co-ordinates of the cursor + * [I] coords_offs : offsetted coordinates of the cursor + * [I] offset : offset amount + * [I] scroll : Bitmask of which directions we should scroll, if at all + * + * RETURN: + * None. + */ +static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, LPPOINT coords_orig, LPPOINT coords_offs, LPPOINT offset, INT scroll) +{ + BOOL controlDown = FALSE; + LVITEMW item; + ITERATOR i; + RECT rect; + + if (coords_offs->x > infoPtr->marqueeOrigin.x) + { + rect.left = infoPtr->marqueeOrigin.x; + rect.right = coords_offs->x; + } + else + { + rect.left = coords_offs->x; + rect.right = infoPtr->marqueeOrigin.x; + } + + if (coords_offs->y > infoPtr->marqueeOrigin.y) + { + rect.top = infoPtr->marqueeOrigin.y; + rect.bottom = coords_offs->y; + } + else + { + rect.top = coords_offs->y; + rect.bottom = infoPtr->marqueeOrigin.y; + } + + /* Cancel out the old marquee rectangle and draw the new one */ + LISTVIEW_InvalidateRect(infoPtr, &infoPtr->marqueeDrawRect); + + /* Invert the items in the old marquee rectangle */ + iterator_frameditems_absolute(&i, infoPtr, &infoPtr->marqueeRect); + + while (iterator_next(&i)) + { + if (i.nItem > -1) + { + if (LISTVIEW_GetItemState(infoPtr, i.nItem, LVIS_SELECTED) == LVIS_SELECTED) + item.state = 0; + else + item.state = LVIS_SELECTED; + + item.stateMask = LVIS_SELECTED; + + LISTVIEW_SetItemState(infoPtr, i.nItem, &item); + } + } + + iterator_destroy(&i); + + CopyRect(&infoPtr->marqueeRect, &rect); + + CopyRect(&infoPtr->marqueeDrawRect, &rect); + OffsetRect(&infoPtr->marqueeDrawRect, offset->x, offset->y); + + /* Iterate over the items within our marquee rectangle */ + iterator_frameditems_absolute(&i, infoPtr, &infoPtr->marqueeRect); + + if (GetKeyState(VK_CONTROL) & 0x8000) + controlDown = TRUE; + + while (iterator_next(&i)) + { + if (i.nItem > -1) + { + /* If CTRL is pressed, invert. If not, always select the item. */ + if ((controlDown) && (LISTVIEW_GetItemState(infoPtr, i.nItem, LVIS_SELECTED))) + item.state = 0; + else + item.state = LVIS_SELECTED; + + item.stateMask = LVIS_SELECTED; + + LISTVIEW_SetItemState(infoPtr, i.nItem, &item); + } + } + + iterator_destroy(&i); + LISTVIEW_InvalidateRect(infoPtr, &rect); +} + +/*** + * DESCRIPTION: * Called whenever WM_MOUSEMOVE is received. * * PARAMETER(S): @@ -3620,93 +3719,27 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN WORD wDragWidth = GetSystemMetrics(SM_CXDRAG); WORD wDragHeight= GetSystemMetrics(SM_CYDRAG); - /* Ensure coordinates are within client bounds */ - if (x < 0) - x = 0; - - if (y < 0) - y = 0; - - if (x > infoPtr->rcList.right) - x = infoPtr->rcList.right; - - if (y > infoPtr->rcList.bottom) - y = infoPtr->rcList.bottom; - if (infoPtr->bMarqueeSelect) { - LVITEMW item; - ITERATOR i; - - if (x > infoPtr->ptClickPos.x) - { - rect.left = infoPtr->ptClickPos.x; - rect.right = x; - } - else - { - rect.left = x; - rect.right = infoPtr->ptClickPos.x; - } - - if (y > infoPtr->ptClickPos.y) - { - rect.top = infoPtr->ptClickPos.y; - rect.bottom = y; - } - else - { - rect.top = y; - rect.bottom = infoPtr->ptClickPos.y; - } - - /* Cancel out the old marquee rectangle and draw the new one */ - LISTVIEW_InvalidateRect(infoPtr, &infoPtr->marqueeRect); - - /* Invert the items in the old marquee rectangle */ - iterator_frameditems(&i, infoPtr, &infoPtr->marqueeRect); - - while (iterator_next(&i)) - { - if (i.nItem > -1) - { - if (LISTVIEW_GetItemState(infoPtr, i.nItem, LVIS_SELECTED) == LVIS_SELECTED) - item.state = 0; - else - item.state = LVIS_SELECTED; - - item.stateMask = LVIS_SELECTED; - - LISTVIEW_SetItemState(infoPtr, i.nItem, &item); - } - } - - iterator_destroy(&i); + POINT coords_orig; + POINT coords_offs; + POINT offset; - CopyRect(&infoPtr->marqueeRect, &rect); + coords_orig.x = x; + coords_orig.y = y; - /* Iterate over the items within our marquee rectangle */ - iterator_frameditems(&i, infoPtr, &rect); + /* Get offset */ + LISTVIEW_GetOrigin(infoPtr, &offset); - while (iterator_next(&i)) - { - if (i.nItem > -1) - { - /* If CTRL is pressed, invert. If not, always select the item. */ - if ((fwKeys & MK_CONTROL) && (LISTVIEW_GetItemState(infoPtr, i.nItem, LVIS_SELECTED))) - item.state = 0; - else - item.state = LVIS_SELECTED; + /* Ensure coordinates are within client bounds */ + coords_offs.x = max(min(x, infoPtr->rcList.right), 0); + coords_offs.y = max(min(y, infoPtr->rcList.bottom), 0); - item.stateMask = LVIS_SELECTED; + /* Offset coordinates by the appropriate amount */ + coords_offs.x -= offset.x; + coords_offs.y -= offset.y; - LISTVIEW_SetItemState(infoPtr, i.nItem, &item); - } - } - - iterator_destroy(&i); - - LISTVIEW_InvalidateRect(infoPtr, &rect); + LISTVIEW_MarqueeHighlight(infoPtr, &coords_orig, &coords_offs, &offset, 0); return 0; } @@ -3758,6 +3791,14 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN If return value is non-zero, cancel. */ if (!(infoPtr->dwStyle & LVS_SINGLESEL) && (notify_hdr(infoPtr, LVN_MARQUEEBEGIN, &hdr) == 0)) { + /* Store the absolute coordinates of the click */ + POINT offset; + LISTVIEW_GetOrigin(infoPtr, &offset); + + infoPtr->marqueeOrigin.x = infoPtr->ptClickPos.x - offset.x; + infoPtr->marqueeOrigin.y = infoPtr->ptClickPos.y - offset.y; + + /* Begin selection and capture mouse */ infoPtr->bMarqueeSelect = TRUE; SetCapture(infoPtr->hwndSelf); } @@ -4767,7 +4808,7 @@ enddraw: /* Draw marquee rectangle if appropriate */ if (infoPtr->bMarqueeSelect) - DrawFocusRect(hdc, &infoPtr->marqueeRect); + DrawFocusRect(hdc, &infoPtr->marqueeDrawRect); if (cdmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd); @@ -9621,14 +9662,17 @@ static LRESULT LISTVIEW_LButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT /* Remove the marquee rectangle and release our mouse capture */ if (infoPtr->bMarqueeSelect) { - LISTVIEW_InvalidateRect(infoPtr, &infoPtr->marqueeRect); + LISTVIEW_InvalidateRect(infoPtr, &infoPtr->marqueeDrawRect); ReleaseCapture(); } SetRect(&infoPtr->marqueeRect, 0, 0, 0, 0); + SetRect(&infoPtr->marqueeDrawRect, 0, 0, 0, 0); infoPtr->bDragging = FALSE; infoPtr->bMarqueeSelect = FALSE; + + KillTimer(infoPtr->hwndSelf, (UINT_PTR) infoPtr); return 0; }

1 0

Owen Rudge : comctl32: Cancel marquee selection if we lose focus in listview.
by Alexandre Julliard 04 Nov '09

04 Nov '09

Module: wine Branch: master Commit: c1877a2d5052122ee7770921d028b5b7900deca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1877a2d5052122ee7770921d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 2 10:58:00 2009 -0600 comctl32: Cancel marquee selection if we lose focus in listview. --- dlls/comctl32/listview.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 415a863..ba9bb3b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9453,7 +9453,19 @@ static LRESULT LISTVIEW_KillFocus(LISTVIEW_INFO *infoPtr) /* if we have a focus rectangle, get rid of it */ LISTVIEW_ShowFocusRect(infoPtr, FALSE); - + + /* if have a marquee selection, stop it */ + if (infoPtr->bMarqueeSelect) + { + /* Remove the marquee rectangle and release our mouse capture */ + LISTVIEW_InvalidateRect(infoPtr, &infoPtr->marqueeRect); + ReleaseCapture(); + + SetRect(&infoPtr->marqueeRect, 0, 0, 0, 0); + + infoPtr->bMarqueeSelect = FALSE; + } + /* set window focus flag */ infoPtr->bFocus = FALSE;

1 0