February 2011 - Wine-commits

Alexandre Julliard : msvcrt: longjmp doesn't have a return value.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 9b76c16e7ed2999a8e5ea087b7be79308b37176e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b76c16e7ed2999a8e5ea087b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 1 16:34:42 2011 +0100 msvcrt: longjmp doesn't have a return value. --- dlls/msvcrt/except.c | 2 +- include/msvcrt/setjmp.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 94a4367..db36af6 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -473,7 +473,7 @@ int CDECL __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *jmp, int nb_args, /********************************************************************* * longjmp (MSVCRT.@) */ -int CDECL MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval) +void CDECL MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval) { unsigned long cur_frame = 0; diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index ded4c9a..2468373 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -95,7 +95,7 @@ extern "C" { #endif int __cdecl _setjmp(jmp_buf); -int __cdecl longjmp(jmp_buf,int); +void __cdecl longjmp(jmp_buf,int); #ifdef __cplusplus }

1 0

Alexandre Julliard : msvcrt: Implement longjmp for x86_64.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 37af4c371baf62aca31d18f88f3cdd0b6783baac URL: http://source.winehq.org/git/wine.git/?a=commit;h=37af4c371baf62aca31d18f88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 1 16:40:31 2011 +0100 msvcrt: Implement longjmp for x86_64. --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 4 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/except.c | 49 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 30 ++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 4 +- dlls/msvcrt40/msvcrt40.spec | 4 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 12 files changed, 92 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37af4c371baf62aca31d1…

1 0

Paul Vriens : explorerframe/tests: Don' t compare potentially uninitialized variables (Coverity).
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: fd2bf1fae12f7824bd87b4b49d0f6ae1e55130c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd2bf1fae12f7824bd87b4b49… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Feb 1 14:46:14 2011 +0100 explorerframe/tests: Don't compare potentially uninitialized variables (Coverity). --- dlls/explorerframe/tests/nstc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index df69a1a..047d7cd 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -811,7 +811,6 @@ static void test_basics(void) } ILFree(pidl_desktop); } - ok(psidesktop != psidesktop2, "psidesktop == psidesktop2\n"); IShellFolder_Release(psfdesktop); if(FAILED(hr)) @@ -820,6 +819,8 @@ static void test_basics(void) return; } + ok(psidesktop != psidesktop2, "psidesktop == psidesktop2\n"); + CreateFilesFolders(); GetCurrentDirectoryW(MAX_PATH, curdirW); ok(lstrlenW(curdirW), "Got 0 length string.\n");

1 0

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: Simplify the root container initialization.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: c99e0fbc0e7a631b9dd1a39afb76619c49c9aed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c99e0fbc0e7a631b9dd1a39af… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 1 04:32:24 2011 -0600 dxdiagn: Simplify the root container initialization. --- dlls/dxdiagn/provider.c | 92 +++++++++++++++++---------------------- dlls/dxdiagn/tests/container.c | 79 ++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c99e0fbc0e7a631b9dd1a…

1 0

Andrew Nguyen : dxdiagn: Avoid caching a single instance of the root container.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 1fe904bd08b26b0f0548b77f9b1d7ef3c00a5509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe904bd08b26b0f0548b77f9… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 1 04:32:34 2011 -0600 dxdiagn: Avoid caching a single instance of the root container. --- dlls/dxdiagn/dxdiag_private.h | 1 - dlls/dxdiagn/provider.c | 19 +++++++++++-------- dlls/dxdiagn/tests/provider.c | 9 ++++++++- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/dxdiagn/dxdiag_private.h b/dlls/dxdiagn/dxdiag_private.h index 58de882..ba48c14 100644 --- a/dlls/dxdiagn/dxdiag_private.h +++ b/dlls/dxdiagn/dxdiag_private.h @@ -48,7 +48,6 @@ struct IDxDiagProviderImpl { /* IDxDiagProvider fields */ BOOL init; DXDIAG_INIT_PARAMS params; - IDxDiagContainer* pRootContainer; }; /* ---------------- */ diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 428c7ef..0734241 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -107,21 +107,24 @@ static HRESULT WINAPI IDxDiagProviderImpl_Initialize(PDXDIAGPROVIDER iface, DXDI } static HRESULT WINAPI IDxDiagProviderImpl_GetRootContainer(PDXDIAGPROVIDER iface, IDxDiagContainer** ppInstance) { - HRESULT hr = S_OK; + HRESULT hr; IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; + IDxDiagContainer *root; + TRACE("(%p,%p)\n", iface, ppInstance); if (FALSE == This->init) { return CO_E_NOTINITIALIZED; } - if (NULL == This->pRootContainer) { - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &This->pRootContainer); - if (FAILED(hr)) { - return hr; - } - hr = DXDiag_InitRootDXDiagContainer(This->pRootContainer); + + hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void **)&root); + if (FAILED(hr)) { + return hr; } - return IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)This->pRootContainer, &IID_IDxDiagContainer, (void**) ppInstance); + + DXDiag_InitRootDXDiagContainer(root); + + return IDxDiagContainerImpl_QueryInterface(root, &IID_IDxDiagContainer, (void **)ppInstance); } static const IDxDiagProviderVtbl DxDiagProvider_Vtbl = diff --git a/dlls/dxdiagn/tests/provider.c b/dlls/dxdiagn/tests/provider.c index 0aa228b..69006f0 100644 --- a/dlls/dxdiagn/tests/provider.c +++ b/dlls/dxdiagn/tests/provider.c @@ -94,7 +94,7 @@ static void test_GetRootContainer(void) { HRESULT hr; IDxDiagProvider *pddp; - IDxDiagContainer *pddc; + IDxDiagContainer *pddc, *pddc2; DXDIAG_INIT_PARAMS params; hr = CoCreateInstance(&CLSID_DxDiagProvider, NULL, CLSCTX_INPROC_SERVER, @@ -140,6 +140,13 @@ static void test_GetRootContainer(void) hr = IDxDiagProvider_GetRootContainer(pddp, &pddc); ok(hr == S_OK, "Expected IDxDiagProvider::GetRootContainer to return S_OK, got %x\n", hr); + /* IDxDiagProvider::GetRootContainer creates new instances of the root + * container rather than maintain a static root container. */ + hr = IDxDiagProvider_GetRootContainer(pddp, &pddc2); + ok(hr == S_OK, "Expected IDxDiagProvider::GetRootContainer to return S_OK, got %x\n", hr); + ok(pddc != pddc2, "Expected the two pointers (%p vs. %p) to be unequal\n", pddc, pddc2); + + IDxDiagContainer_Release(pddc2); IDxDiagContainer_Release(pddc); IDxDiagProvider_Release(pddp); }

1 0

Nikolay Sivov : oleaut32/tests: Fix a IRecordInfo leak (Valgrind).
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: a0e7c9996b90887dd7bd8ab2ef5d28d81f8cd1eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e7c9996b90887dd7bd8ab2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 1 14:12:46 2011 +0300 oleaut32/tests: Fix a IRecordInfo leak (Valgrind). --- dlls/oleaut32/tests/safearray.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index a01f05d..689494d 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -111,7 +111,12 @@ static ULONG CALLBACK IRecordInfoImpl_AddRef(IRecordInfo *iface) static ULONG CALLBACK IRecordInfoImpl_Release(IRecordInfo *iface) { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); - return InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; } static BOOL fail_GetSize; /* Whether to fail the GetSize call */ @@ -1463,6 +1468,7 @@ static void test_SafeArrayCreateEx(void) hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); ok(iRec->clearCalled == sab[0].cElements, "Destroy->Clear called %d times\n", iRec->clearCalled); + ok(iRec->ref == START_REF_COUNT, "got %d, expected %d\n", iRec->ref, START_REF_COUNT); } /* Test VT_RECORD array */ @@ -1662,7 +1668,7 @@ static void test_SafeArrayChangeTypeEx(void) } /* To/from BSTR only works with arrays of VT_UI1 */ - for (vt = 0; vt <= VT_CLSID; vt++) + for (vt = VT_EMPTY; vt <= VT_CLSID; vt++) { if (vt == VT_UI1) continue;

1 0

Nikolay Sivov : oleaut32/tests: Fix a safearray leak (Valgrind).
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 1dcf3f7aefbbb62dfa8b9ae8acca1b275ea5cc03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dcf3f7aefbbb62dfa8b9ae8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 1 14:29:50 2011 +0300 oleaut32/tests: Fix a safearray leak (Valgrind). --- dlls/oleaut32/tests/safearray.c | 13 +++++++++++-- dlls/oleaut32/variant.c | 5 ++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 689494d..97ba9dd 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1683,9 +1683,18 @@ static void test_SafeArrayChangeTypeEx(void) VariantInit(&v2); hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_BSTR); - ok(hres != S_OK, "CTE VT_ARRAY|VT %d->BSTR succeeded\n", vt); + if (vt == VT_INT_PTR || vt == VT_UINT_PTR) + { + ok(hres == DISP_E_BADVARTYPE, "expected DISP_E_BADVARTYPE, got 0x%08x\n", hres); + SafeArrayDestroy(sa); + } + else + { + ok(hres == DISP_E_TYPEMISMATCH, "got 0x%08x for vt=%d, instead of DISP_E_TYPEMISMATCH\n", hres, vt); + hres = VariantClear(&v); + ok(hres == S_OK, "expected S_OK, got 0x%08x\n", hres); + } VariantClear(&v2); - VariantClear(&v); } /* Can't change an array of one type into array of another type , even diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 776c0e7..5d32c3b 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -652,7 +652,7 @@ HRESULT VARIANT_ClearInd(VARIANTARG *pVarg) */ HRESULT WINAPI VariantClear(VARIANTARG* pVarg) { - HRESULT hres = S_OK; + HRESULT hres; TRACE("(%p->(%s%s))\n", pVarg, debugstr_VT(pVarg), debugstr_VF(pVarg)); @@ -664,8 +664,7 @@ HRESULT WINAPI VariantClear(VARIANTARG* pVarg) { if (V_ISARRAY(pVarg) || V_VT(pVarg) == VT_SAFEARRAY) { - if (V_ARRAY(pVarg)) - hres = SafeArrayDestroy(V_ARRAY(pVarg)); + hres = SafeArrayDestroy(V_ARRAY(pVarg)); } else if (V_VT(pVarg) == VT_BSTR) {

1 0

Hans Leidekker : hnetcfg: Return success from fw_app_put_Enabled.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 726c045549217ae079b04708a04b5bdb62c789f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=726c045549217ae079b04708a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 1 12:26:50 2011 +0100 hnetcfg: Return success from fw_app_put_Enabled. --- dlls/hnetcfg/apps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index 81bfe36..90a1807 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -262,7 +262,7 @@ static HRESULT WINAPI fw_app_put_Enabled( fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); FIXME("%p, %d\n", This, enabled); - return E_NOTIMPL; + return S_OK; } static const struct INetFwAuthorizedApplicationVtbl fw_app_vtbl =

1 0

Hans Leidekker : msi: Reset file attributes before removing a file.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: bc13c7eb90f486bca0cebe9976b2038325295ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc13c7eb90f486bca0cebe997… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 1 12:27:09 2011 +0100 msi: Reset file attributes before removing a file. --- dlls/msi/files.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 1205690..a044ec7 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -1048,9 +1048,11 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) } TRACE("removing %s\n", debugstr_w(file->File) ); + + SetFileAttributesW( file->TargetPath, FILE_ATTRIBUTE_NORMAL ); if (!DeleteFileW( file->TargetPath )) { - WARN("failed to delete %s\n", debugstr_w(file->TargetPath)); + WARN("failed to delete %s (%u)\n", debugstr_w(file->TargetPath), GetLastError()); } /* FIXME: check persistence for each directory */ else if (r && (dir = strdupW( file->TargetPath )))

1 0