September 2008 - Wine-Commits

Marcus Meissner : include: Mark up with alloc_size attribute.
by Alexandre Julliard Sept. 10, 2008

Sept. 10, 2008

Module: wine Branch: master Commit: 68f63689cbb611d8485a9719e171bba01bb77b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f63689cbb611d8485a9719e… Author: Marcus Meissner <marcus(a)rennboot.site> Date: Tue Sep 9 13:49:58 2008 +0200 include: Mark up with alloc_size attribute. --- include/rpcndr.h | 14 +++++++------- include/wincrypt.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 2503a3a..38f3c5f 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -189,7 +189,7 @@ typedef struct _MIDL_STUB_MESSAGE ULONG_PTR MaxCount; ULONG Offset; ULONG ActualCount; - void * (__RPC_API *pfnAllocate)(size_t); + void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(size_t); void (__RPC_API *pfnFree)(void *); unsigned char *StackTop; unsigned char *pPresentedType; @@ -316,7 +316,7 @@ typedef struct _USER_MARSHAL_CB typedef struct _MALLOC_FREE_STRUCT { - void * (__RPC_USER *pfnAllocate)(size_t); + void * (__WINE_ALLOC_SIZE(1) __RPC_USER *pfnAllocate)(size_t); void (__RPC_USER *pfnFree)(void *); } MALLOC_FREE_STRUCT; @@ -329,7 +329,7 @@ typedef struct _COMM_FAULT_OFFSETS typedef struct _MIDL_STUB_DESC { void *RpcInterfaceInformation; - void * (__RPC_API *pfnAllocate)(size_t); + void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(size_t); void (__RPC_API *pfnFree)(void *); union { handle_t *pAutoHandle; @@ -468,7 +468,7 @@ typedef struct _NDR_USER_MARSHAL_INFO_LEVEL1 { void *Buffer; ULONG BufferSize; - void * (__RPC_API *pfnAllocate)(size_t); + void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(size_t); void (__RPC_API *pfnFree)(void *); struct IRpcChannelBuffer *pRpcChannelBuffer; ULONG_PTR Reserved[5]; @@ -662,7 +662,7 @@ RPCRTAPI RPC_STATUS RPC_ENTRY ULONG *pFaultStatus, RPC_STATUS Status_ ); RPCRTAPI void* RPC_ENTRY - NdrOleAllocate( size_t Size ); + NdrOleAllocate( size_t Size ) __WINE_ALLOC_SIZE(1); RPCRTAPI void RPC_ENTRY NdrOleFree( void* NodeToFree ); @@ -723,11 +723,11 @@ RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY NdrRpcSmSetClientToOsf( PMIDL_STUB_MESSAGE pMessage ); RPCRTAPI void * RPC_ENTRY - NdrRpcSmClientAllocate( size_t Size ); + NdrRpcSmClientAllocate( size_t Size ) __WINE_ALLOC_SIZE(1); RPCRTAPI void RPC_ENTRY NdrRpcSmClientFree( void *NodeToFree ); RPCRTAPI void * RPC_ENTRY - NdrRpcSsDefaultAllocate( size_t Size ); + NdrRpcSsDefaultAllocate( size_t Size ) __WINE_ALLOC_SIZE(1); RPCRTAPI void RPC_ENTRY NdrRpcSsDefaultFree( void *NodeToFree ); diff --git a/include/wincrypt.h b/include/wincrypt.h index e6006ee..4b28f93 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1082,7 +1082,7 @@ typedef BOOL (WINAPI *PFN_CERT_ENUM_PHYSICAL_STORE)(const void *pvSystemStore, void *pvReserved, void *pvArg); /* Encode/decode object */ -typedef LPVOID (WINAPI *PFN_CRYPT_ALLOC)(size_t cbsize); +typedef LPVOID (__WINE_ALLOC_SIZE(1) WINAPI *PFN_CRYPT_ALLOC)(size_t cbsize); typedef VOID (WINAPI *PFN_CRYPT_FREE)(LPVOID pv); typedef struct _CRYPT_ENCODE_PARA {

1 0

Jacek Caban : jscript: Added Object constructor object implementation.
by Alexandre Julliard Sept. 10, 2008

Sept. 10, 2008

Module: wine Branch: master Commit: dd01f8b8f79d46e0fa951f5ab48b309ff744f581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd01f8b8f79d46e0fa951f5ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 02:33:15 2008 +0200 jscript: Added Object constructor object implementation. --- dlls/jscript/Makefile.in | 3 +- dlls/jscript/dispex.c | 57 ++++++++++++++------ dlls/jscript/function.c | 11 ++++- dlls/jscript/global.c | 34 +++++++++++- dlls/jscript/jscript.h | 15 +++++- dlls/jscript/object.c | 125 ++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/tests/lang.js | 3 + 7 files changed, 226 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd01f8b8f79d46e0fa951…

1 0

Juan Lang : crypt32: Get rid of a magic number and a redundant assignment.
by Alexandre Julliard Sept. 10, 2008

Sept. 10, 2008

Module: wine Branch: master Commit: 8ccd53dd7aaa6f27b097f13fa05953868d150d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ccd53dd7aaa6f27b097f13fa… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 9 12:26:31 2008 -0700 crypt32: Get rid of a magic number and a redundant assignment. --- dlls/crypt32/decode.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 0d46fe3..4ed2abe 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2586,7 +2586,7 @@ static BOOL CRYPT_AsnDecodeAltNameEntry(const BYTE *pbEncoded, DWORD cbEncoded, { *pcbStructInfo = bytesNeeded; /* MS used values one greater than the asn1 ones.. sigh */ - entry->dwAltNameChoice = (pbEncoded[0] & 0x7f) + 1; + entry->dwAltNameChoice = (pbEncoded[0] & ASN_TYPE_MASK) + 1; switch (pbEncoded[0] & ASN_TYPE_MASK) { case 1: /* rfc822Name */ @@ -2604,7 +2604,6 @@ static BOOL CRYPT_AsnDecodeAltNameEntry(const BYTE *pbEncoded, DWORD cbEncoded, break; } case 4: /* directoryName */ - entry->dwAltNameChoice = CERT_ALT_NAME_DIRECTORY_NAME; /* The data are memory-equivalent with the IPAddress case, * fall-through */

1 0

Andrew Talbot : msi: Uninitialized variable fix (Coverity).
by Alexandre Julliard Sept. 10, 2008

Sept. 10, 2008

Module: wine Branch: master Commit: be759dddb81e279d7c57e497c00404484588cd10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be759dddb81e279d7c57e497c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Sep 9 22:50:39 2008 +0100 msi: Uninitialized variable fix (Coverity). --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8a8efe7..2208b58 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3838,7 +3838,7 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) MSIFEATURE *feature; UINT rc; HKEY hkey; - HKEY userdata; + HKEY userdata = NULL; if (!msi_check_publish(package)) return ERROR_SUCCESS;

1 0

Juan Lang : crypt32: Return FALSE rather than crash if memory allocation fails. Fixes Coverity id 135.
by Alexandre Julliard Sept. 10, 2008

Sept. 10, 2008

Module: wine Branch: master Commit: e4a0633818649cedc14e01ce59d4e78f7ac0a8f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a0633818649cedc14e01ce5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 9 10:22:59 2008 -0700 crypt32: Return FALSE rather than crash if memory allocation fails. Fixes Coverity id 135. --- dlls/crypt32/cert.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index d9ab229..8de96c8 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -607,6 +607,11 @@ static BOOL CRYPT_AcquirePrivateKeyFromProvInfo(PCCERT_CONTEXT pCert, CERT_KEY_PROV_INFO_PROP_ID, info, &size); allocated = TRUE; } + else + { + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; + } } else SetLastError(CRYPT_E_NO_KEY_PROPERTY);

1 0

Austin English : widl: Remove unreached code (Smatch).
by Alexandre Julliard Sept. 10, 2008

Sept. 10, 2008

Module: wine Branch: master Commit: bfc34a3c9cea4ef41bd2315f1272a33a0c3ebd09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfc34a3c9cea4ef41bd2315f1… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Sep 9 01:21:53 2008 -0500 widl: Remove unreached code (Smatch). --- tools/widl/write_msft.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 97ec4ec..198ce2d 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1648,7 +1648,6 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) varflags |= 0x01; /* VARFLAG_FREADONLY */ break; /* FIXME: VARFLAG_FREPLACEABLE */ - break; case ATTR_REQUESTEDIT: varflags |= 0x08; /* VARFLAG_FREQUESTEDIT */ break;

1 0

Juan Lang : crypt32: Fix typo. Fixes Coverity item 605.
by Alexandre Julliard Sept. 10, 2008

Sept. 10, 2008

Module: wine Branch: master Commit: 71e394fb89b3100c0d5d5d800c816213671aaed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e394fb89b3100c0d5d5d800… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 9 10:17:11 2008 -0700 crypt32: Fix typo. Fixes Coverity item 605. --- dlls/crypt32/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 77032ac..534d6ae 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1795,7 +1795,7 @@ BOOL WINAPI CertVerifyCertificateChainPolicy(LPCSTR szPolicyOID, set = CryptInitOIDFunctionSet( CRYPT_OID_VERIFY_CERTIFICATE_CHAIN_POLICY_FUNC, 0); CryptGetOIDFunctionAddress(set, X509_ASN_ENCODING, szPolicyOID, 0, - (void **)&verifyPolicy, hFunc); + (void **)&verifyPolicy, &hFunc); } if (verifyPolicy) ret = verifyPolicy(szPolicyOID, pChainContext, pPolicyPara,

1 0

Juan Lang : cabinet: Use helper function to remove duplicate code.
by Alexandre Julliard Sept. 10, 2008

Sept. 10, 2008

Module: wine Branch: master Commit: c479ea631ff9a23a43e9262cbebcb170ba9443b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c479ea631ff9a23a43e9262cb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 6 14:09:39 2008 -0700 cabinet: Use helper function to remove duplicate code. --- dlls/cabinet/fdi.c | 90 ++++++++++++++++++++------------------------------- 1 files changed, 35 insertions(+), 55 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 806a978..4c499dd 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2277,6 +2277,39 @@ static void free_decompression_temps(HFDI hfdi, struct fdi_folder *fol, } } +static void free_decompression_mem(HFDI hfdi, struct fdi_folder *fol, + fdi_decomp_state *decomp_state, fdi_decomp_state *sentinel_decomp_state, + struct fdi_file *file) +{ + while (decomp_state) { + fdi_decomp_state *prev_fds; + + PFDI_CLOSE(hfdi, CAB(cabhf)); + + /* free the storage remembered by mii */ + if (CAB(mii).nextname) PFDI_FREE(hfdi, CAB(mii).nextname); + if (CAB(mii).nextinfo) PFDI_FREE(hfdi, CAB(mii).nextinfo); + if (CAB(mii).prevname) PFDI_FREE(hfdi, CAB(mii).prevname); + if (CAB(mii).previnfo) PFDI_FREE(hfdi, CAB(mii).previnfo); + + while (CAB(firstfol)) { + fol = CAB(firstfol); + CAB(firstfol) = CAB(firstfol)->next; + PFDI_FREE(hfdi, fol); + } + while (CAB(firstfile)) { + file = CAB(firstfile); + if (file->filename) PFDI_FREE(hfdi, (void *)file->filename); + CAB(firstfile) = CAB(firstfile)->next; + PFDI_FREE(hfdi, file); + } + prev_fds = decomp_state; + decomp_state = CAB(next); + if (prev_fds != sentinel_decomp_state) + PFDI_FREE(hfdi, prev_fds); + } +} + /*********************************************************************** * FDICopy (CABINET.22) * @@ -2859,34 +2892,7 @@ BOOL __cdecl FDICopy( } free_decompression_temps(hfdi, fol, decomp_state); - - while (decomp_state) { - fdi_decomp_state *prev_fds; - - PFDI_CLOSE(hfdi, CAB(cabhf)); - - /* free the storage remembered by mii */ - if (CAB(mii).nextname) PFDI_FREE(hfdi, CAB(mii).nextname); - if (CAB(mii).nextinfo) PFDI_FREE(hfdi, CAB(mii).nextinfo); - if (CAB(mii).prevname) PFDI_FREE(hfdi, CAB(mii).prevname); - if (CAB(mii).previnfo) PFDI_FREE(hfdi, CAB(mii).previnfo); - - while (CAB(firstfol)) { - fol = CAB(firstfol); - CAB(firstfol) = CAB(firstfol)->next; - PFDI_FREE(hfdi, fol); - } - while (CAB(firstfile)) { - file = CAB(firstfile); - if (file->filename) PFDI_FREE(hfdi, (void *)file->filename); - CAB(firstfile) = CAB(firstfile)->next; - PFDI_FREE(hfdi, file); - } - prev_fds = decomp_state; - decomp_state = CAB(next); - if (prev_fds != &_decomp_state) - PFDI_FREE(hfdi, prev_fds); - } + free_decompression_mem(hfdi, fol, decomp_state, &_decomp_state, file); return TRUE; @@ -2896,33 +2902,7 @@ BOOL __cdecl FDICopy( if (filehf) PFDI_CLOSE(hfdi, filehf); - while (decomp_state) { - fdi_decomp_state *prev_fds; - - PFDI_CLOSE(hfdi, CAB(cabhf)); - - /* free the storage remembered by mii */ - if (CAB(mii).nextname) PFDI_FREE(hfdi, CAB(mii).nextname); - if (CAB(mii).nextinfo) PFDI_FREE(hfdi, CAB(mii).nextinfo); - if (CAB(mii).prevname) PFDI_FREE(hfdi, CAB(mii).prevname); - if (CAB(mii).previnfo) PFDI_FREE(hfdi, CAB(mii).previnfo); - - while (CAB(firstfol)) { - fol = CAB(firstfol); - CAB(firstfol) = CAB(firstfol)->next; - PFDI_FREE(hfdi, fol); - } - while (CAB(firstfile)) { - file = CAB(firstfile); - if (file->filename) PFDI_FREE(hfdi, (void *)file->filename); - CAB(firstfile) = CAB(firstfile)->next; - PFDI_FREE(hfdi, file); - } - prev_fds = decomp_state; - decomp_state = CAB(next); - if (prev_fds != &_decomp_state) - PFDI_FREE(hfdi, prev_fds); - } + free_decompression_mem(hfdi, fol, decomp_state, &_decomp_state, file); return FALSE; }

1 0

Juan Lang : crypt32: Assert condition that can occur only in case of a bug.
by Alexandre Julliard Sept. 10, 2008

Sept. 10, 2008

Module: wine Branch: master Commit: 78baaf932aa5cec1b2cfb9be530c8f7e3e2b2169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78baaf932aa5cec1b2cfb9be5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 9 09:18:14 2008 -0700 crypt32: Assert condition that can occur only in case of a bug. --- 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 a5b749f..959d0c9 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -173,6 +173,7 @@ void Context_CopyProperties(const void *to, const void *from, toProperties = Context_GetProperties((void *)to, contextSize); fromProperties = Context_GetProperties((void *)from, contextSize); + assert(toProperties && fromProperties); ContextPropertyList_Copy(toProperties, fromProperties); }

1 0

Juan Lang : cabinet: Use helper function to remove duplicate code.
by Alexandre Julliard Sept. 10, 2008

Sept. 10, 2008

Module: wine Branch: master Commit: 70cfa0c36eeb873a5326e6153a9ae3dfa57bfd18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70cfa0c36eeb873a5326e6153… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 6 14:09:19 2008 -0700 cabinet: Use helper function to remove duplicate code. --- dlls/cabinet/fdi.c | 51 +++++++++++++++++++++------------------------------ 1 files changed, 21 insertions(+), 30 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 454776a..806a978 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2258,6 +2258,25 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state return DECR_OK; } +static void free_decompression_temps(HFDI hfdi, struct fdi_folder *fol, + fdi_decomp_state *decomp_state) +{ + switch (fol->comp_type & cffoldCOMPTYPE_MASK) { + case cffoldCOMPTYPE_LZX: + if (LZX(window)) { + PFDI_FREE(hfdi, LZX(window)); + LZX(window) = NULL; + } + break; + case cffoldCOMPTYPE_QUANTUM: + if (QTM(window)) { + PFDI_FREE(hfdi, QTM(window)); + QTM(window) = NULL; + } + break; + } +} + /*********************************************************************** * FDICopy (CABINET.22) * @@ -2839,21 +2858,7 @@ BOOL __cdecl FDICopy( } } - /* free decompression temps */ - switch (fol->comp_type & cffoldCOMPTYPE_MASK) { - case cffoldCOMPTYPE_LZX: - if (LZX(window)) { - PFDI_FREE(hfdi, LZX(window)); - LZX(window) = NULL; - } - break; - case cffoldCOMPTYPE_QUANTUM: - if (QTM(window)) { - PFDI_FREE(hfdi, QTM(window)); - QTM(window) = NULL; - } - break; - } + free_decompression_temps(hfdi, fol, decomp_state); while (decomp_state) { fdi_decomp_state *prev_fds; @@ -2887,21 +2892,7 @@ BOOL __cdecl FDICopy( bail_and_fail: /* here we free ram before error returns */ - /* free decompression temps */ - switch (fol->comp_type & cffoldCOMPTYPE_MASK) { - case cffoldCOMPTYPE_LZX: - if (LZX(window)) { - PFDI_FREE(hfdi, LZX(window)); - LZX(window) = NULL; - } - break; - case cffoldCOMPTYPE_QUANTUM: - if (QTM(window)) { - PFDI_FREE(hfdi, QTM(window)); - QTM(window) = NULL; - } - break; - } + free_decompression_temps(hfdi, fol, decomp_state); if (filehf) PFDI_CLOSE(hfdi, filehf);

1 0