December 2007 - Wine-Commits

Alexander Nicolaysen Sørnes : shell32: Localize 'new folder' string.
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: b259c4ae801131c804d12366f08097bc615439de URL: http://source.winehq.org/git/wine.git/?a=commit;h=b259c4ae801131c804d12366f… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Dec 6 10:20:48 2007 +0100 shell32: Localize 'new folder' string. --- dlls/shell32/shell32_Bg.rc | 2 ++ dlls/shell32/shell32_Cn.rc | 2 ++ dlls/shell32/shell32_Cs.rc | 2 ++ dlls/shell32/shell32_De.rc | 2 ++ dlls/shell32/shell32_En.rc | 2 ++ dlls/shell32/shell32_Eo.rc | 2 ++ dlls/shell32/shell32_Es.rc | 2 ++ dlls/shell32/shell32_Fi.rc | 2 ++ dlls/shell32/shell32_Fr.rc | 2 ++ dlls/shell32/shell32_It.rc | 2 ++ dlls/shell32/shell32_Ja.rc | 2 ++ dlls/shell32/shell32_Ko.rc | 2 ++ dlls/shell32/shell32_No.rc | 2 ++ dlls/shell32/shell32_Pl.rc | 2 ++ dlls/shell32/shell32_Pt.rc | 2 ++ dlls/shell32/shell32_Ru.rc | 2 ++ dlls/shell32/shell32_Si.rc | 2 ++ dlls/shell32/shell32_Sk.rc | 2 ++ dlls/shell32/shell32_Tr.rc | 2 ++ dlls/shell32/shell32_Uk.rc | 2 ++ dlls/shell32/shell32_Zh.rc | 2 ++ dlls/shell32/shfldr_fs.c | 3 ++- dlls/shell32/shfldr_unixfs.c | 6 ++++-- dlls/shell32/shresdef.h | 2 ++ 24 files changed, 50 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b259c4ae801131c804d12…

1 0

Rob Shearman : rpcrt4: Fix a memory leak caused by NdrFullPointerXlatFree not freeing the entries in the full pointer translation table .
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: 1b79da8be0b6097049a90a9b8d72a4aa14c50841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b79da8be0b6097049a90a9b8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 5 22:41:03 2007 +0000 rpcrt4: Fix a memory leak caused by NdrFullPointerXlatFree not freeing the entries in the full pointer translation table. --- dlls/rpcrt4/ndr_fullpointer.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_fullpointer.c b/dlls/rpcrt4/ndr_fullpointer.c index 5640769..3586bc3 100644 --- a/dlls/rpcrt4/ndr_fullpointer.c +++ b/dlls/rpcrt4/ndr_fullpointer.c @@ -63,8 +63,14 @@ PFULL_PTR_XLAT_TABLES WINAPI NdrFullPointerXlatInit(ULONG NumberOfPointers, void WINAPI NdrFullPointerXlatFree(PFULL_PTR_XLAT_TABLES pXlatTables) { + ULONG i; + TRACE("(%p)\n", pXlatTables); + /* free the entries in the table */ + for (i = 0; i < pXlatTables->RefIdToPointer.NumberOfEntries; i++) + HeapFree(GetProcessHeap(), 0, pXlatTables->RefIdToPointer.XlatTable[i]); + HeapFree(GetProcessHeap(), 0, pXlatTables->RefIdToPointer.XlatTable); HeapFree(GetProcessHeap(), 0, pXlatTables->RefIdToPointer.StateTable); HeapFree(GetProcessHeap(), 0, pXlatTables->PointerToRefId.XlatTable);

1 0

Rob Shearman : rpcrt4: Fix a memory leak when freeing an association by deleting the critical section .
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: 867cc3c05f110a2bb4c4112762397c8ffce82ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=867cc3c05f110a2bb4c411276… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 5 22:40:47 2007 +0000 rpcrt4: Fix a memory leak when freeing an association by deleting the critical section. --- dlls/rpcrt4/rpc_transport.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index fcd3d0c..0c893e8 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1541,6 +1541,8 @@ ULONG RpcAssoc_Release(RpcAssoc *assoc) HeapFree(GetProcessHeap(), 0, assoc->NetworkAddr); HeapFree(GetProcessHeap(), 0, assoc->Protseq); + DeleteCriticalSection(&assoc->cs); + HeapFree(GetProcessHeap(), 0, assoc); }

1 0

Michael Stefaniuc : kernel32: Pass HEAP_ZERO_MEMORY to HeapAlloc() instead of clearing the memory with a separate memset() call.
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: d457af740d510cc18764ec538d2cada011b32588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d457af740d510cc18764ec538… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 5 21:52:41 2007 +0100 kernel32: Pass HEAP_ZERO_MEMORY to HeapAlloc() instead of clearing the memory with a separate memset() call. --- dlls/kernel32/lzexpand.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/lzexpand.c b/dlls/kernel32/lzexpand.c index b446736..0b81bf8 100644 --- a/dlls/kernel32/lzexpand.c +++ b/dlls/kernel32/lzexpand.c @@ -192,10 +192,9 @@ HFILE WINAPI LZInit( HFILE hfSrc ) } for (i = 0; i < MAX_LZSTATES; i++) if (!lzstates[i]) break; if (i == MAX_LZSTATES) return LZERROR_GLOBALLOC; - lzstates[i] = lzs = HeapAlloc( GetProcessHeap(), 0, sizeof(struct lzstate) ); + lzstates[i] = lzs = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*lzs) ); if(lzs == NULL) return LZERROR_GLOBALLOC; - memset(lzs,'\0',sizeof(*lzs)); lzs->realfd = hfSrc; lzs->lastchar = head.lastchar; lzs->reallength = head.reallength;

1 0

Michael Stefaniuc : mshtml: Rename the wrappers around HeapAlloc() &Co to use the new standard naming.
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: a084d1db62b89392803d2f366d7f1b26a7a46ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a084d1db62b89392803d2f366… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 5 21:52:31 2007 +0100 mshtml: Rename the wrappers around HeapAlloc() &Co to use the new standard naming. --- dlls/mshtml/conpoint.c | 6 +++--- dlls/mshtml/editor.c | 8 ++++---- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmldoc.c | 6 +++--- dlls/mshtml/htmlelem.c | 26 +++++++++++++------------- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmlnode.c | 4 ++-- dlls/mshtml/htmloption.c | 6 +++--- dlls/mshtml/htmlselect.c | 2 +- dlls/mshtml/htmlstyle.c | 4 ++-- dlls/mshtml/htmlstylesheet.c | 8 ++++---- dlls/mshtml/htmltable.c | 2 +- dlls/mshtml/htmltextarea.c | 2 +- dlls/mshtml/htmlwindow.c | 8 ++++---- dlls/mshtml/install.c | 30 +++++++++++++++--------------- dlls/mshtml/loadopts.c | 14 +++++++------- dlls/mshtml/main.c | 12 ++++++------ dlls/mshtml/mshtml_private.h | 8 ++++---- dlls/mshtml/navigate.c | 24 ++++++++++++------------ dlls/mshtml/nsembed.c | 4 ++-- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/nsio.c | 24 ++++++++++++------------ dlls/mshtml/persist.c | 10 +++++----- dlls/mshtml/protocol.c | 36 ++++++++++++++++++------------------ dlls/mshtml/selection.c | 4 ++-- dlls/mshtml/service.c | 4 ++-- dlls/mshtml/task.c | 6 +++--- dlls/mshtml/txtrange.c | 12 ++++++------ dlls/mshtml/view.c | 2 +- 30 files changed, 140 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a084d1db62b89392803d2…

1 0

Rob Shearman : rpcrt4: Fix a memory leak in RpcAssoc_BindConnection.
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: 5fb5fccac02b66d7a988f016d69ee31d868545a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb5fccac02b66d7a988f016d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 5 22:40:52 2007 +0000 rpcrt4: Fix a memory leak in RpcAssoc_BindConnection. --- dlls/rpcrt4/rpc_transport.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 40cc613..fcd3d0c 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1667,6 +1667,7 @@ static RPC_STATUS RpcAssoc_BindConnection(const RpcAssoc *assoc, RpcConnection * break; } + I_RpcFreeBuffer(&msg); RPCRT4_FreeHeader(response_hdr); return status; }

1 0

Andrew Talbot : cabinet: Remove unneeded casts.
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: f2df3d7582ab558daaff07550d90c25900b65169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2df3d7582ab558daaff07550… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 5 21:28:30 2007 +0000 cabinet: Remove unneeded casts. --- dlls/cabinet/fci.c | 2 +- dlls/cabinet/fdi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index b0774c0..55c219d 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -188,7 +188,7 @@ HFCI __cdecl FCICreate( return NULL; } - if (!((hfci = ((HFCI) (*pfnalloc)(sizeof(FCI_Int)))))) { + if (!((hfci = (*pfnalloc)(sizeof(FCI_Int))))) { perf->erfOper = FCIERR_ALLOC_FAIL; perf->erfType = ERROR_NOT_ENOUGH_MEMORY; perf->fError = TRUE; diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index a522b86..91e2daf 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -377,7 +377,7 @@ HFDI __cdecl FDICreate( return NULL; } - if (!((rv = ((HFDI) (*pfnalloc)(sizeof(FDI_Int)))))) { + if (!((rv = (*pfnalloc)(sizeof(FDI_Int))))) { perf->erfOper = FDIERROR_ALLOC_FAIL; perf->erfType = ERROR_NOT_ENOUGH_MEMORY; perf->fError = TRUE;

1 0

Rob Shearman : mshtml: Use the correct deallocator in the htmldoc tests for the memory returned by IMoniker_GetDisplayName and fix a use-after-free error .
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: 1c2827368648ef7ff5ecc785a4d84a6ee8628878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2827368648ef7ff5ecc785a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 5 16:28:36 2007 +0000 mshtml: Use the correct deallocator in the htmldoc tests for the memory returned by IMoniker_GetDisplayName and fix a use-after-free error. --- dlls/mshtml/tests/htmldoc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index fe0d09d..ccfe05e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2506,7 +2506,7 @@ static void test_GetCurMoniker(IUnknown *unk, IMoniker *exmon, LPCWSTR exurl) IPersistMoniker_Release(permon); if(exmon) { - BSTR url; + LPOLESTR url; BOOL exb = expect_GetDisplayName; BOOL clb = called_GetDisplayName; @@ -2520,10 +2520,10 @@ static void test_GetCurMoniker(IUnknown *unk, IMoniker *exmon, LPCWSTR exurl) expect_GetDisplayName = exb; called_GetDisplayName = clb; - SysFreeString(url); ok(!lstrcmpW(url, doc_url), "url != doc_url\n"); + CoTaskMemFree(url); }else if(exurl) { - BSTR url; + LPOLESTR url; ok(hres == S_OK, "GetCurrentMoniker failed: %08x\n", hres); @@ -2533,7 +2533,7 @@ static void test_GetCurMoniker(IUnknown *unk, IMoniker *exmon, LPCWSTR exurl) ok(!lstrcmpW(url, exurl), "unexpected url\n"); ok(!lstrcmpW(url, doc_url), "url != doc_url\n"); - SysFreeString(url); + CoTaskMemFree(url); }else { ok(hres == E_UNEXPECTED, "GetCurrentMoniker failed: %08x, expected E_UNEXPECTED\n", hres);

1 0

Andrew Talbot : ddraw: Remove unneeded casts.
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: 1f73a97a5a4377bfe1cb8b1417f138cffec348d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f73a97a5a4377bfe1cb8b141… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 5 21:28:34 2007 +0000 ddraw: Remove unneeded casts. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7785624..5e2d564 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1725,7 +1725,7 @@ ULONG WINAPI D3D7CB_DestroyDepthStencilSurface(IWineD3DSurface *pSurface) { IUnknown* surfaceParent; TRACE("(%p) call back\n", pSurface); - IWineD3DSurface_GetParent(pSurface, (IUnknown **) &surfaceParent); + IWineD3DSurface_GetParent(pSurface, &surfaceParent); IUnknown_Release(surfaceParent); return IUnknown_Release(surfaceParent); } diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3091017..53ef2f1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4179,7 +4179,7 @@ IDirect3DDeviceImpl_7_GetTexture(IDirect3DDevice7 *iface, } EnterCriticalSection(&ddraw_cs); - hr = IWineD3DDevice_GetTexture(This->wineD3DDevice, Stage, (IWineD3DBaseTexture **) &Surf); + hr = IWineD3DDevice_GetTexture(This->wineD3DDevice, Stage, &Surf); if( (hr != D3D_OK) || (!Surf) ) { *Texture = NULL;

1 0

Michael Stefaniuc : secur32: Remove the SECUR32_ALLOC() macro around HeapAlloc().
by Alexandre Julliard Dec. 6, 2007

Dec. 6, 2007

Module: wine Branch: master Commit: d117938f7a309552916903d294907f5e8d021aa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d117938f7a309552916903d29… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 5 21:52:20 2007 +0100 secur32: Remove the SECUR32_ALLOC() macro around HeapAlloc(). --- dlls/secur32/ntlm.c | 2 +- dlls/secur32/secur32.c | 18 +++++++++--------- dlls/secur32/secur32_priv.h | 8 +------- dlls/secur32/thunks.c | 16 ++++++++-------- dlls/secur32/wrapper.c | 10 +++++----- 5 files changed, 24 insertions(+), 30 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index e700373..f50b4c6 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -748,7 +748,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( if (fContextReq & ISC_REQ_ALLOCATE_MEMORY) { - pOutput->pBuffers[token_idx].pvBuffer = SECUR32_ALLOC(bin_len); + pOutput->pBuffers[token_idx].pvBuffer = HeapAlloc(GetProcessHeap(), 0, bin_len); pOutput->pBuffers[token_idx].cbBuffer = bin_len; } else if (pOutput->pBuffers[token_idx].cbBuffer < bin_len) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 1e040ea..eb37879 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -169,7 +169,7 @@ PWSTR SECUR32_strdupW(PCWSTR str) if (str) { - ret = (PWSTR)SECUR32_ALLOC((lstrlenW(str) + 1) * sizeof(WCHAR)); + ret = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(str) + 1) * sizeof(WCHAR)); if (ret) lstrcpyW(ret, str); } @@ -188,7 +188,7 @@ PWSTR SECUR32_AllocWideFromMultiByte(PCSTR str) if (charsNeeded) { - ret = (PWSTR)SECUR32_ALLOC(charsNeeded * sizeof(WCHAR)); + ret = HeapAlloc(GetProcessHeap(), 0, charsNeeded * sizeof(WCHAR)); if (ret) MultiByteToWideChar(CP_ACP, 0, str, -1, ret, charsNeeded); } @@ -211,7 +211,7 @@ PSTR SECUR32_AllocMultiByteFromWide(PCWSTR str) if (charsNeeded) { - ret = (PSTR)SECUR32_ALLOC(charsNeeded); + ret = HeapAlloc(GetProcessHeap(), 0, charsNeeded); if (ret) WideCharToMultiByte(CP_ACP, 0, str, -1, ret, charsNeeded, NULL, NULL); @@ -663,8 +663,8 @@ static void SECUR32_freeProviders(void) { LIST_FOR_EACH_ENTRY(package, &packageTable->table, SecurePackage, entry) { - SECUR32_FREE(package->infoW.Name); - SECUR32_FREE(package->infoW.Comment); + HeapFree(GetProcessHeap(), 0, package->infoW.Name); + HeapFree(GetProcessHeap(), 0, package->infoW.Comment); } HeapFree(GetProcessHeap(), 0, packageTable); @@ -675,7 +675,7 @@ static void SECUR32_freeProviders(void) { LIST_FOR_EACH_ENTRY(provider, &providerTable->table, SecureProvider, entry) { - SECUR32_FREE(provider->moduleName); + HeapFree(GetProcessHeap(), 0, provider->moduleName); if (provider->lib) FreeLibrary(provider->lib); } @@ -698,7 +698,7 @@ static void SECUR32_freeProviders(void) */ SECURITY_STATUS WINAPI FreeContextBuffer(PVOID pv) { - SECUR32_FREE(pv); + HeapFree(GetProcessHeap(), 0, pv); return SEC_E_OK; } @@ -731,7 +731,7 @@ SECURITY_STATUS WINAPI EnumerateSecurityPackagesW(PULONG pcPackages, } if (bytesNeeded) { - *ppPackageInfo = (PSecPkgInfoW)SECUR32_ALLOC(bytesNeeded); + *ppPackageInfo = HeapAlloc(GetProcessHeap(), 0, bytesNeeded); if (*ppPackageInfo) { ULONG i = 0; @@ -796,7 +796,7 @@ static PSecPkgInfoA thunk_PSecPkgInfoWToA(ULONG cPackages, bytesNeeded += WideCharToMultiByte(CP_ACP, 0, info[i].Comment, -1, NULL, 0, NULL, NULL); } - ret = (PSecPkgInfoA)SECUR32_ALLOC(bytesNeeded); + ret = HeapAlloc(GetProcessHeap(), 0, bytesNeeded); if (ret) { PSTR nextString; diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 4835525..8d5756d 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -24,12 +24,6 @@ #include <sys/types.h> #include "wine/list.h" -/* Memory allocation functions for memory accessible by callers of secur32. - * The details are implementation specific. - */ -#define SECUR32_ALLOC(bytes) HeapAlloc(GetProcessHeap(), 0, (bytes)) -#define SECUR32_FREE(p) HeapFree(GetProcessHeap(), 0, (p)) - typedef struct _SecureProvider { struct list entry; @@ -119,7 +113,7 @@ SecurePackage *SECUR32_findPackageW(PCWSTR packageName); SecurePackage *SECUR32_findPackageA(PCSTR packageName); /* A few string helpers; will return NULL if str is NULL. Free return with - * SECUR32_FREE */ + * HeapFree */ PWSTR SECUR32_strdupW(PCWSTR str); PWSTR SECUR32_AllocWideFromMultiByte(PCSTR str); PSTR SECUR32_AllocMultiByteFromWide(PCWSTR str); diff --git a/dlls/secur32/thunks.c b/dlls/secur32/thunks.c index b56507d..33f8bb1 100644 --- a/dlls/secur32/thunks.c +++ b/dlls/secur32/thunks.c @@ -76,8 +76,8 @@ SECURITY_STATUS SEC_ENTRY thunk_AcquireCredentialsHandleW( ret = AcquireCredentialsHandleA(principal, package, fCredentialsUse, pvLogonID, pAuthData, pGetKeyFn, pvGetKeyArgument, phCredential, ptsExpiry); - SECUR32_FREE(principal); - SECUR32_FREE(package); + HeapFree(GetProcessHeap(), 0, principal); + HeapFree(GetProcessHeap(), 0, package); } else ret = SEC_E_SECPKG_NOT_FOUND; @@ -259,7 +259,7 @@ SECURITY_STATUS SEC_ENTRY thunk_InitializeSecurityContextW( phCredential, phContext, target, fContextReq, Reserved1, TargetDataRep, pInput, Reserved2, phNewContext, pOutput, pfContextAttr, ptsExpiry); - SECUR32_FREE(target); + HeapFree(GetProcessHeap(), 0, target); } else ret = SEC_E_UNSUPPORTED_FUNCTION; @@ -337,8 +337,8 @@ SECURITY_STATUS SEC_ENTRY thunk_AddCredentialsW(PCredHandle hCredentials, ret = package->provider->fnTableA.AddCredentialsA( cred, szPrincipal, szPackage, fCredentialUse, pAuthData, pGetKeyFn, pvGetKeyArgument, ptsExpiry); - SECUR32_FREE(szPrincipal); - SECUR32_FREE(szPackage); + HeapFree(GetProcessHeap(), 0, szPrincipal); + HeapFree(GetProcessHeap(), 0, szPackage); } else ret = SEC_E_UNSUPPORTED_FUNCTION; @@ -372,7 +372,7 @@ static PSecPkgInfoA _copyPackageInfoFlatWToA(const SecPkgInfoW *infoW) NULL, 0, NULL, NULL); bytesNeeded += commentLen; } - ret = (PSecPkgInfoA)SECUR32_ALLOC(bytesNeeded); + ret = HeapAlloc(GetProcessHeap(), 0, bytesNeeded); if (ret) { PSTR nextString = (PSTR)((PBYTE)ret + sizeof(SecPkgInfoA)); @@ -597,7 +597,7 @@ static PSecPkgInfoW _copyPackageInfoFlatAToW(const SecPkgInfoA *infoA) NULL, 0); bytesNeeded += commentLen * sizeof(WCHAR); } - ret = (PSecPkgInfoW)SECUR32_ALLOC(bytesNeeded); + ret = HeapAlloc(GetProcessHeap(), 0, bytesNeeded); if (ret) { PWSTR nextString = (PWSTR)((PBYTE)ret + sizeof(SecPkgInfoW)); @@ -894,6 +894,6 @@ SECURITY_STATUS SEC_ENTRY thunk_ImportSecurityContextW( TRACE("%s %p %p %p\n", debugstr_w(pszPackage), pPackedContext, Token, phContext); ret = ImportSecurityContextA(package, pPackedContext, Token, phContext); - SECUR32_FREE(package); + HeapFree(GetProcessHeap(), 0, package); return ret; } diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index 0b2d6dd..d51165a 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -41,7 +41,7 @@ static SECURITY_STATUS SECUR32_makeSecHandle(PSecHandle phSec, if (phSec && package && realHandle) { - PSecHandle newSec = (PSecHandle)SECUR32_ALLOC(sizeof(SecHandle)); + PSecHandle newSec = HeapAlloc(GetProcessHeap(), 0, sizeof(SecHandle)); if (newSec) { @@ -169,7 +169,7 @@ SECURITY_STATUS WINAPI FreeCredentialsHandle( ret = package->provider->fnTableW.FreeCredentialsHandle(cred); else ret = SEC_E_INVALID_HANDLE; - SECUR32_FREE(cred); + HeapFree(GetProcessHeap(), 0, cred); } else ret = SEC_E_INVALID_HANDLE; @@ -465,7 +465,7 @@ SECURITY_STATUS WINAPI DeleteSecurityContext(PCtxtHandle phContext) ret = package->provider->fnTableW.DeleteSecurityContext(ctxt); else ret = SEC_E_INVALID_HANDLE; - SECUR32_FREE(ctxt); + HeapFree(GetProcessHeap(), 0, ctxt); } else ret = SEC_E_INVALID_HANDLE; @@ -710,7 +710,7 @@ SECURITY_STATUS WINAPI QuerySecurityPackageInfoA(SEC_CHAR *pszPackageName, package->infoW.Comment, -1, NULL, 0, NULL, NULL); bytesNeeded += commentLen; } - *ppPackageInfo = (PSecPkgInfoA)SECUR32_ALLOC(bytesNeeded); + *ppPackageInfo = HeapAlloc(GetProcessHeap(), 0, bytesNeeded); if (*ppPackageInfo) { PSTR nextString = (PSTR)((PBYTE)*ppPackageInfo + @@ -772,7 +772,7 @@ SECURITY_STATUS WINAPI QuerySecurityPackageInfoW(SEC_WCHAR *pszPackageName, commentLen = lstrlenW(package->infoW.Comment) + 1; bytesNeeded += commentLen * sizeof(WCHAR); } - *ppPackageInfo = (PSecPkgInfoW)SECUR32_ALLOC(bytesNeeded); + *ppPackageInfo = HeapAlloc(GetProcessHeap(), 0, bytesNeeded); if (*ppPackageInfo) { PWSTR nextString = (PWSTR)((PBYTE)*ppPackageInfo +

1 0