wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

Andrew Nguyen : dxdiagn: Convert the property linked list to a standard Wine list.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 8c331e334075f42a6e8d0ecc5695b9ef700995fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c331e334075f42a6e8d0ecc5… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 1 04:32:15 2011 -0600 dxdiagn: Convert the property linked list to a standard Wine list. --- dlls/dxdiagn/container.c | 54 +++++++++++++++++----------------------- dlls/dxdiagn/dxdiag_private.h | 8 +++--- 2 files changed, 27 insertions(+), 35 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 317d098..df7f5a9 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -184,7 +184,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfProps(PDXDIAGCONTAINER ifa static HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) { IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; - IDxDiagContainerImpl_Property* p = NULL; + IDxDiagContainerImpl_Property *p; DWORD i = 0; TRACE("(%p, %u, %p, %u)\n", iface, dwIndex, pwszPropName, cchPropName); @@ -193,24 +193,24 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, return E_INVALIDARG; } - p = This->properties; - while (NULL != p) { + LIST_FOR_EACH_ENTRY(p, &This->properties, IDxDiagContainerImpl_Property, entry) + { if (dwIndex == i) { - TRACE("Found property name %s, copying string\n", debugstr_w(p->vName)); - lstrcpynW(pwszPropName, p->vName, cchPropName); - return (cchPropName <= strlenW(p->vName)) ? + TRACE("Found property name %s, copying string\n", debugstr_w(p->propName)); + lstrcpynW(pwszPropName, p->propName, cchPropName); + return (cchPropName <= strlenW(p->propName)) ? DXDIAG_E_INSUFFICIENT_BUFFER : S_OK; } - p = p->next; ++i; } + TRACE("Failed to find property name at specified index\n"); return E_INVALIDARG; } static HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pvarProp) { IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; - IDxDiagContainerImpl_Property* p = NULL; + IDxDiagContainerImpl_Property *p; TRACE("(%p, %s, %p)\n", iface, debugstr_w(pwszPropName), pvarProp); @@ -218,24 +218,23 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWS return E_INVALIDARG; } - p = This->properties; - while (NULL != p) { - if (0 == lstrcmpW(p->vName, pwszPropName)) { + LIST_FOR_EACH_ENTRY(p, &This->properties, IDxDiagContainerImpl_Property, entry) + { + if (0 == lstrcmpW(p->propName, pwszPropName)) { HRESULT hr = VariantClear(pvarProp); if (hr == DISP_E_ARRAYISLOCKED || hr == DISP_E_BADVARTYPE) VariantInit(pvarProp); - return VariantCopy(pvarProp, &p->v); + return VariantCopy(pvarProp, &p->vProp); } - p = p->next; } + return E_INVALIDARG; } HRESULT WINAPI IDxDiagContainerImpl_AddProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pVarProp) { IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; - IDxDiagContainerImpl_Property* p = NULL; - IDxDiagContainerImpl_Property* pNew = NULL; + IDxDiagContainerImpl_Property *pNew; TRACE("(%p, %s, %p)\n", iface, debugstr_w(pwszPropName), pVarProp); @@ -247,25 +246,17 @@ HRESULT WINAPI IDxDiagContainerImpl_AddProp(PDXDIAGCONTAINER iface, LPCWSTR pwsz if (NULL == pNew) { return E_OUTOFMEMORY; } - VariantInit(&pNew->v); - VariantCopy(&pNew->v, pVarProp); - pNew->vName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pwszPropName) + 1) * sizeof(WCHAR)); - if (NULL == pNew->vName) { + + pNew->propName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pwszPropName) + 1) * sizeof(WCHAR)); + if (NULL == pNew->propName) { HeapFree(GetProcessHeap(), 0, pNew); return E_OUTOFMEMORY; } - lstrcpyW(pNew->vName, pwszPropName); - pNew->next = NULL; - - p = This->properties; - if (NULL == p) { - This->properties = pNew; - } else { - while (NULL != p->next) { - p = p->next; - } - p->next = pNew; - } + lstrcpyW(pNew->propName, pwszPropName); + VariantInit(&pNew->vProp); + VariantCopy(&pNew->vProp, pVarProp); + + list_add_tail(&This->properties, &pNew->entry); ++This->nProperties; return S_OK; } @@ -324,6 +315,7 @@ HRESULT DXDiag_CreateDXDiagContainer(REFIID riid, LPVOID *ppobj) { } container->lpVtbl = &DxDiagContainer_Vtbl; container->ref = 0; /* will be inited with QueryInterface */ + list_init(&container->properties); list_init(&container->subContainers); return IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)container, riid, ppobj); } diff --git a/dlls/dxdiagn/dxdiag_private.h b/dlls/dxdiagn/dxdiag_private.h index 5e6d2b8..58de882 100644 --- a/dlls/dxdiagn/dxdiag_private.h +++ b/dlls/dxdiagn/dxdiag_private.h @@ -62,9 +62,9 @@ typedef struct IDxDiagContainerImpl_SubContainer { } IDxDiagContainerImpl_SubContainer; typedef struct IDxDiagContainerImpl_Property { - LPWSTR vName; - VARIANT v; - struct IDxDiagContainerImpl_Property* next; + struct list entry; + WCHAR *propName; + VARIANT vProp; } IDxDiagContainerImpl_Property; @@ -76,7 +76,7 @@ struct IDxDiagContainerImpl { const IDxDiagContainerVtbl *lpVtbl; LONG ref; /* IDxDiagContainer fields */ - IDxDiagContainerImpl_Property* properties; + struct list properties; struct list subContainers; DWORD nProperties; DWORD nSubContainers;

1 0

Andrew Nguyen : dxdiagn: Convert the container linked list to a standard Wine list.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: a421adf0a0334da70e71471f9fa2956acf2938a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a421adf0a0334da70e71471f9… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 1 04:32:05 2011 -0600 dxdiagn: Convert the container linked list to a standard Wine list. --- dlls/dxdiagn/container.c | 35 +++++++++++++---------------------- dlls/dxdiagn/dxdiag_private.h | 11 ++++++----- 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index d3a3cc1..317d098 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -86,7 +86,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfChildContainers(PDXDIAGCON static HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer) { IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; - IDxDiagContainerImpl_SubContainer* p = NULL; + IDxDiagContainerImpl_SubContainer *p; DWORD i = 0; TRACE("(%p, %u, %p, %u)\n", iface, dwIndex, pwszContainer, cchContainer); @@ -95,15 +95,14 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAI return E_INVALIDARG; } - p = This->subContainers; - while (NULL != p) { + LIST_FOR_EACH_ENTRY(p, &This->subContainers, IDxDiagContainerImpl_SubContainer, entry) + { if (dwIndex == i) { TRACE("Found container name %s, copying string\n", debugstr_w(p->contName)); lstrcpynW(pwszContainer, p->contName, cchContainer); return (cchContainer <= strlenW(p->contName)) ? DXDIAG_E_INSUFFICIENT_BUFFER : S_OK; } - p = p->next; ++i; } @@ -114,16 +113,16 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAI static HRESULT IDxDiagContainerImpl_GetChildContainerInternal(PDXDIAGCONTAINER iface, LPCWSTR pwszContainer, IDxDiagContainer** ppInstance) { IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; - IDxDiagContainerImpl_SubContainer* p = NULL; + IDxDiagContainerImpl_SubContainer *p; - p = This->subContainers; - while (NULL != p) { + LIST_FOR_EACH_ENTRY(p, &This->subContainers, IDxDiagContainerImpl_SubContainer, entry) + { if (0 == lstrcmpW(p->contName, pwszContainer)) { *ppInstance = p->pCont; return S_OK; } - p = p->next; } + return E_INVALIDARG; } @@ -273,8 +272,7 @@ HRESULT WINAPI IDxDiagContainerImpl_AddProp(PDXDIAGCONTAINER iface, LPCWSTR pwsz HRESULT WINAPI IDxDiagContainerImpl_AddChildContainer(PDXDIAGCONTAINER iface, LPCWSTR pszContName, PDXDIAGCONTAINER pSubCont) { IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; - IDxDiagContainerImpl_SubContainer* p = NULL; - IDxDiagContainerImpl_SubContainer* pNew = NULL; + IDxDiagContainerImpl_SubContainer *pNew; TRACE("(%p, %s, %p)\n", iface, debugstr_w(pszContName), pSubCont); @@ -286,24 +284,16 @@ HRESULT WINAPI IDxDiagContainerImpl_AddChildContainer(PDXDIAGCONTAINER iface, LP if (NULL == pNew) { return E_OUTOFMEMORY; } - pNew->pCont = pSubCont; + pNew->contName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pszContName) + 1) * sizeof(WCHAR)); if (NULL == pNew->contName) { - HeapFree(GetProcessHeap(), 0, pNew) + HeapFree(GetProcessHeap(), 0, pNew); return E_OUTOFMEMORY; } lstrcpyW(pNew->contName, pszContName); - pNew->next = NULL; + pNew->pCont = pSubCont; - p = This->subContainers; - if (NULL == p) { - This->subContainers = pNew; - } else { - while (NULL != p->next) { - p = p->next; - } - p->next = pNew; - } + list_add_tail(&This->subContainers, &pNew->entry); ++This->nSubContainers; return S_OK; } @@ -334,5 +324,6 @@ HRESULT DXDiag_CreateDXDiagContainer(REFIID riid, LPVOID *ppobj) { } container->lpVtbl = &DxDiagContainer_Vtbl; container->ref = 0; /* will be inited with QueryInterface */ + list_init(&container->subContainers); return IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)container, riid, ppobj); } diff --git a/dlls/dxdiagn/dxdiag_private.h b/dlls/dxdiagn/dxdiag_private.h index 8a2ebad..5e6d2b8 100644 --- a/dlls/dxdiagn/dxdiag_private.h +++ b/dlls/dxdiagn/dxdiag_private.h @@ -27,6 +27,7 @@ #include "winbase.h" #include "wingdi.h" +#include "wine/list.h" #include "dxdiag.h" /* DXDiag Interfaces: */ @@ -55,9 +56,9 @@ struct IDxDiagProviderImpl { /* ---------------- */ typedef struct IDxDiagContainerImpl_SubContainer { - IDxDiagContainer* pCont; - WCHAR* contName; - struct IDxDiagContainerImpl_SubContainer* next; + struct list entry; + WCHAR *contName; + IDxDiagContainer *pCont; } IDxDiagContainerImpl_SubContainer; typedef struct IDxDiagContainerImpl_Property { @@ -75,8 +76,8 @@ struct IDxDiagContainerImpl { const IDxDiagContainerVtbl *lpVtbl; LONG ref; /* IDxDiagContainer fields */ - IDxDiagContainerImpl_Property* properties; - IDxDiagContainerImpl_SubContainer* subContainers; + IDxDiagContainerImpl_Property* properties; + struct list subContainers; DWORD nProperties; DWORD nSubContainers; };

1 0

Andrew Nguyen : dxdiagn: Avoid zeroing memory in container functions.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 99e36ffabde8a5588c7ee9ae85abede4c7b33bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e36ffabde8a5588c7ee9ae8… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 1 04:31:47 2011 -0600 dxdiagn: Avoid zeroing memory in container functions. --- dlls/dxdiagn/container.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 8585f7d..d3a3cc1 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -244,13 +244,17 @@ HRESULT WINAPI IDxDiagContainerImpl_AddProp(PDXDIAGCONTAINER iface, LPCWSTR pwsz return E_INVALIDARG; } - pNew = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDxDiagContainerImpl_Property)); + pNew = HeapAlloc(GetProcessHeap(), 0, sizeof(IDxDiagContainerImpl_Property)); if (NULL == pNew) { return E_OUTOFMEMORY; } VariantInit(&pNew->v); VariantCopy(&pNew->v, pVarProp); - pNew->vName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (lstrlenW(pwszPropName) + 1) * sizeof(WCHAR)); + pNew->vName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pwszPropName) + 1) * sizeof(WCHAR)); + if (NULL == pNew->vName) { + HeapFree(GetProcessHeap(), 0, pNew); + return E_OUTOFMEMORY; + } lstrcpyW(pNew->vName, pwszPropName); pNew->next = NULL; @@ -278,12 +282,16 @@ HRESULT WINAPI IDxDiagContainerImpl_AddChildContainer(PDXDIAGCONTAINER iface, LP return E_INVALIDARG; } - pNew = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDxDiagContainerImpl_SubContainer)); + pNew = HeapAlloc(GetProcessHeap(), 0, sizeof(IDxDiagContainerImpl_SubContainer)); if (NULL == pNew) { return E_OUTOFMEMORY; } pNew->pCont = pSubCont; - pNew->contName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (lstrlenW(pszContName) + 1) * sizeof(WCHAR)); + pNew->contName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pszContName) + 1) * sizeof(WCHAR)); + if (NULL == pNew->contName) { + HeapFree(GetProcessHeap(), 0, pNew) + return E_OUTOFMEMORY; + } lstrcpyW(pNew->contName, pszContName); pNew->next = NULL;

1 0

Alexandre Julliard : ntdll: Add a helper function for checking stack frame limits.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: efbe69514759930257ccaf131563fd3af563677f URL: http://source.winehq.org/git/wine.git/?a=commit;h=efbe69514759930257ccaf131… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 1 12:18:39 2011 +0100 ntdll: Add a helper function for checking stack frame limits. --- dlls/ntdll/signal_i386.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 69c9c3f..13444ae 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -548,6 +548,16 @@ static inline TEB *get_current_teb(void) /******************************************************************* + * is_valid_frame + */ +static inline BOOL is_valid_frame( void *frame ) +{ + if ((ULONG_PTR)frame & 3) return FALSE; + return (frame >= NtCurrentTeb()->Tib.StackLimit && + (void **)frame < (void **)NtCurrentTeb()->Tib.StackBase - 1); +} + +/******************************************************************* * raise_handler * * Handler for exceptions happening inside a handler. @@ -594,9 +604,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) while (frame != (EXCEPTION_REGISTRATION_RECORD*)~0UL) { /* Check frame address */ - if (((void*)frame < NtCurrentTeb()->Tib.StackLimit) || - ((void*)(frame+1) > NtCurrentTeb()->Tib.StackBase) || - (ULONG_PTR)frame & 3) + if (!is_valid_frame( frame )) { rec->ExceptionFlags |= EH_STACK_INVALID; break; @@ -2381,10 +2389,7 @@ void WINAPI __regs_RtlUnwind( EXCEPTION_REGISTRATION_RECORD* pEndFrame, PVOID ta if (pEndFrame && (frame > pEndFrame)) raise_status( STATUS_INVALID_UNWIND_TARGET, pRecord ); - if (((void*)frame < NtCurrentTeb()->Tib.StackLimit) || - ((void*)(frame+1) > NtCurrentTeb()->Tib.StackBase) || - (UINT_PTR)frame & 3) - raise_status( STATUS_BAD_STACK, pRecord ); + if (!is_valid_frame( frame )) raise_status( STATUS_BAD_STACK, pRecord ); /* Call handler */ TRACE( "calling handler at %p code=%x flags=%x\n", @@ -2453,17 +2458,13 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, while (skip--) { - if (((void *)frame < NtCurrentTeb()->Tib.StackLimit) || - ((void *)(frame + 1) >= NtCurrentTeb()->Tib.StackBase) || - ((ULONG_PTR)frame & 3)) return 0; + if (!is_valid_frame( frame )) return 0; frame = (ULONG *)*frame; } for (i = 0; i < count; i++) { - if (((void *)frame < NtCurrentTeb()->Tib.StackLimit) || - ((void *)(frame + 1) >= NtCurrentTeb()->Tib.StackBase) || - ((ULONG_PTR)frame & 3)) break; + if (!is_valid_frame( frame )) break; buffer[i] = (void *)frame[1]; if (hash) *hash += frame[1]; frame = (ULONG *)*frame;

1 0

Alexandre Julliard : ntdll: Avoid copying and restoring the context in RtlCaptureContext for i386.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 43682ce114ff5499e9e89e396a0fb66eb97f3dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=43682ce114ff5499e9e89e396… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 1 12:13:19 2011 +0100 ntdll: Avoid copying and restoring the context in RtlCaptureContext for i386. --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_i386.c | 35 ++++++++++++++++++++++++++++------- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index da674cd..0976bc5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -435,7 +435,7 @@ # @ stub RtlAssert2 @ stdcall RtlAssert(ptr ptr long long) # @ stub RtlCancelTimer -@ stdcall -register RtlCaptureContext(ptr) +@ stdcall -norelay RtlCaptureContext(ptr) @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) # @ stub RtlCaptureStackContext @ stdcall RtlCharToInteger(ptr long ptr) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index f86c810..69c9c3f 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1151,13 +1151,34 @@ static inline void restore_context( const CONTEXT *context, SIGCONTEXT *sigconte /*********************************************************************** * RtlCaptureContext (NTDLL.@) */ -void WINAPI __regs_RtlCaptureContext( CONTEXT *context, CONTEXT *regs ) -{ - *context = *regs; - if (fpux_support) save_fpux( context ); - else save_fpu( context ); -} -DEFINE_REGS_ENTRYPOINT( RtlCaptureContext, 1 ) +__ASM_STDCALL_FUNC( RtlCaptureContext, 4, + "pushl %eax\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "movl 8(%esp),%eax\n\t" /* context */ + "movl $0x10007,(%eax)\n\t" /* context->ContextFlags */ + "movw %gs,0x8c(%eax)\n\t" /* context->SegGs */ + "movw %fs,0x90(%eax)\n\t" /* context->SegFs */ + "movw %es,0x94(%eax)\n\t" /* context->SegEs */ + "movw %ds,0x98(%eax)\n\t" /* context->SegDs */ + "movl %edi,0x9c(%eax)\n\t" /* context->Edi */ + "movl %esi,0xa0(%eax)\n\t" /* context->Esi */ + "movl %ebx,0xa4(%eax)\n\t" /* context->Ebx */ + "movl %edx,0xa8(%eax)\n\t" /* context->Edx */ + "movl %ecx,0xac(%eax)\n\t" /* context->Ecx */ + "movl %ebp,0xb4(%eax)\n\t" /* context->Ebp */ + "movl 4(%esp),%edx\n\t" + "movl %edx,0xb8(%eax)\n\t" /* context->Eip */ + "movw %cs,0xbc(%eax)\n\t" /* context->SegCs */ + "pushfl\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "popl 0xc0(%eax)\n\t" /* context->EFlags */ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + "leal 8(%esp),%edx\n\t" + "movl %edx,0xc4(%eax)\n\t" /* context->Esp */ + "movw %ss,0xc8(%eax)\n\t" /* context->SegSs */ + "popl 0xb0(%eax)\n\t" /* context->Eax */ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + "ret $4" ) /***********************************************************************

1 0

Andrew Nguyen : ntdll/tests: Avoid casting away const in comparison functions.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: f7385699a9aa26125eabc4143a50254a289cda49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7385699a9aa26125eabc4143… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 1 04:40:44 2011 -0600 ntdll/tests: Avoid casting away const in comparison functions. --- dlls/ntdll/tests/string.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 03fc436..14464d9 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1143,22 +1143,32 @@ static void test_wcsrchr(void) "wcsrchr should have returned NULL\n"); } -static __cdecl int intcomparefunc(const void *a, const void*b) +static __cdecl int intcomparefunc(const void *a, const void *b) { - ok (a != b, "must never get the same pointer\n"); - return (*(int*)a) - (*(int*)b); + const int *p = a, *q = b; + + ok (a != b, "must never get the same pointer\n"); + + return *p - *q; } -static __cdecl int charcomparefunc(const void *a, const void*b) +static __cdecl int charcomparefunc(const void *a, const void *b) { - ok (a != b, "must never get the same pointer\n"); - return (*(char*)a) - (*(char*)b); + const char *p = a, *q = b; + + ok (a != b, "must never get the same pointer\n"); + + return *p - *q; } -static __cdecl int strcomparefunc(const void *a, const void*b) +static __cdecl int strcomparefunc(const void *a, const void *b) { - ok (a != b, "must never get the same pointer\n"); - return lstrcmpA(*(char**)a,*(char**)b); + const char * const *p = a; + const char * const *q = b; + + ok (a != b, "must never get the same pointer\n"); + + return lstrcmpA(*p, *q); } static void test_qsort(void)

1 0

Andrew Nguyen : msvcr90/tests: Avoid casting away const in comparison functions.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 39eb51f978042e209d78f962e280018f876cb3b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39eb51f978042e209d78f962e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 1 04:40:14 2011 -0600 msvcr90/tests: Avoid casting away const in comparison functions. --- dlls/msvcr90/tests/msvcr90.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index d4a7262..67b00fc 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -462,25 +462,35 @@ static void test_wcsncat_s(void) } /* Based on dlls/ntdll/tests/string.c */ -static __cdecl int intcomparefunc(void *context, const void *a, const void*b) +static __cdecl int intcomparefunc(void *context, const void *a, const void *b) { + const int *p = a, *q = b; + ok (a != b, "must never get the same pointer\n"); ++*(int *) context; - return (*(int*)a) - (*(int*)b); + + return *p - *q; } -static __cdecl int charcomparefunc(void *context, const void *a, const void*b) +static __cdecl int charcomparefunc(void *context, const void *a, const void *b) { + const char *p = a, *q = b; + ok (a != b, "must never get the same pointer\n"); ++*(int *) context; - return (*(char*)a) - (*(char*)b); + + return *p - *q; } -static __cdecl int strcomparefunc(void *context, const void *a, const void*b) +static __cdecl int strcomparefunc(void *context, const void *a, const void *b) { + const char * const *p = a; + const char * const *q = b; + ok (a != b, "must never get the same pointer\n"); ++*(int *) context; - return lstrcmpA(*(char**)a,*(char**)b); + + return lstrcmpA(*p, *q); } static void test_qsort_s(void)

1 0

Andrew Nguyen : ntdll: Fix one-time warning message output.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: c698fc86b9ee15fed718c95b850b8017ce80349d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c698fc86b9ee15fed718c95b8… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 1 04:33:47 2011 -0600 ntdll: Fix one-time warning message output. --- dlls/ntdll/directory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 5a5d101..66572da 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -847,7 +847,7 @@ static void add_fs_cache( dev_t dev, fsid_t fsid, BOOLEAN case_sensitive ) } /* Cache is out of space, warn */ - if (once++) + if (!once++) WARN( "FS cache is out of space, expect performance problems\n" ); }

1 0

Andrew Nguyen : shell32: Keep at least one reference to the autocompletion object at initialization until the edit window is destroyed .
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: fff50be3e8018df5292de632c88771f7cf78563d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fff50be3e8018df5292de632c… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 1 04:16:38 2011 -0600 shell32: Keep at least one reference to the autocompletion object at initialization until the edit window is destroyed. Spotted with Valgrind. --- dlls/shell32/autocomplete.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index b259f6f..8db542a 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -203,18 +203,16 @@ static ULONG WINAPI IAutoComplete2_fnRelease( { IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - + TRACE("(%p)->(%u)\n", This, refCount + 1); if (!refCount) { - TRACE(" destroying IAutoComplete(%p)\n",This); + TRACE("destroying IAutoComplete(%p)\n", This); HeapFree(GetProcessHeap(), 0, This->quickComplete); HeapFree(GetProcessHeap(), 0, This->txtbackup); - if (This->hwndListBox) - DestroyWindow(This->hwndListBox); - if (This->enumstr) - IEnumString_Release(This->enumstr); - HeapFree(GetProcessHeap(), 0, This); + if (This->enumstr) + IEnumString_Release(This->enumstr); + HeapFree(GetProcessHeap(), 0, This); } return refCount; } @@ -275,6 +273,8 @@ static HRESULT WINAPI IAutoComplete2_fnInit( This->initialized = TRUE; This->hwndEdit = hwndEdit; This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW( hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); + /* Keep at least one reference to the object until the edit window is destroyed. */ + IAutoComplete2_AddRef((IAutoComplete2 *)This); SetPropW( hwndEdit, autocomplete_propertyW, This ); if (This->options & ACO_AUTOSUGGEST) @@ -631,7 +631,12 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, { WNDPROC proc = This->wpOrigEditProc; + RemovePropW(hwnd, autocomplete_propertyW); + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)proc); This->hwndEdit = NULL; + if (This->hwndListBox) + DestroyWindow(This->hwndListBox); + IAutoComplete2_Release((IAutoComplete2 *)This); return CallWindowProcW(proc, hwnd, uMsg, wParam, lParam); } default:

1 0

Andrew Nguyen : shell32: Store the autocompletion object pointer in a window property rather than in the window user data .
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 4145fe0ec2943b1ad81cf812a5f8963911bf442e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4145fe0ec2943b1ad81cf812a… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 1 04:16:30 2011 -0600 shell32: Store the autocompletion object pointer in a window property rather than in the window user data. --- dlls/shell32/autocomplete.c | 8 +++++--- dlls/shell32/tests/autocomplete.c | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 95db44c..b259f6f 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -82,7 +82,9 @@ typedef struct static const IAutoComplete2Vtbl acvt; static const IAutoCompleteDropDownVtbl acdropdownvt; - +static const WCHAR autocomplete_propertyW[] = {'W','i','n','e',' ','A','u','t','o', + 'c','o','m','p','l','e','t','e',' ', + 'c','o','n','t','r','o','l',0}; /* converts This to an interface pointer */ @@ -273,7 +275,7 @@ static HRESULT WINAPI IAutoComplete2_fnInit( This->initialized = TRUE; This->hwndEdit = hwndEdit; This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW( hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); - SetWindowLongPtrW( hwndEdit, GWLP_USERDATA, (LONG_PTR)This); + SetPropW( hwndEdit, autocomplete_propertyW, This ); if (This->options & ACO_AUTOSUGGEST) create_listbox(This); @@ -464,7 +466,7 @@ static const IAutoCompleteDropDownVtbl acdropdownvt = */ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - IAutoCompleteImpl *This = (IAutoCompleteImpl *)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + IAutoCompleteImpl *This = GetPropW(hwnd, autocomplete_propertyW); LPOLESTR strs; HRESULT hr; WCHAR hwndText[255]; diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index a96aa97..5ff8847 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -141,6 +141,7 @@ static IAutoComplete *test_init(void) HRESULT r; IAutoComplete *ac; IUnknown *acSource; + LONG_PTR user_data; /* AutoComplete instance */ r = CoCreateInstance(&CLSID_AutoComplete, NULL, CLSCTX_INPROC_SERVER, @@ -163,10 +164,16 @@ static IAutoComplete *test_init(void) } ok(r == S_OK, "no IID_IACList (0x%08x)\n", r); + user_data = GetWindowLongPtrA(hEdit, GWLP_USERDATA); + ok(user_data == 0, "Expected the edit control user data to be zero\n"); + /* bind to edit control */ r = IAutoComplete_Init(ac, hEdit, acSource, NULL, NULL); ok(r == S_OK, "Init returned 0x%08x\n", r); + user_data = GetWindowLongPtrA(hEdit, GWLP_USERDATA); + ok(user_data == 0, "Expected the edit control user data to be zero\n"); + IUnknown_Release(acSource); return ac;

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 February 2011