November 2009 - Wine-commits

Jacek Caban : wininet: Directly return error status from NETCON_close.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: c55d0a8516f4faaa2b0e14d935e303e62b4ad7ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c55d0a8516f4faaa2b0e14d93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 00:14:25 2009 +0100 wininet: Directly return error status from NETCON_close. --- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e1044e9..04a4a65 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -432,7 +432,7 @@ BOOL NETCON_init(WININET_NETCONNECTION *connnection, BOOL useSSL); void NETCON_unload(void); DWORD NETCON_create(WININET_NETCONNECTION *connection, int domain, int type, int protocol); -BOOL NETCON_close(WININET_NETCONNECTION *connection); +DWORD NETCON_close(WININET_NETCONNECTION *connection); DWORD NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr, unsigned int addrlen); DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPCWSTR hostname); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 64513ac..36599e9 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -404,11 +404,11 @@ DWORD NETCON_create(WININET_NETCONNECTION *connection, int domain, * NETCON_close * Basically calls 'close()' unless we should use SSL */ -BOOL NETCON_close(WININET_NETCONNECTION *connection) +DWORD NETCON_close(WININET_NETCONNECTION *connection) { int result; - if (!NETCON_connected(connection)) return FALSE; + if (!NETCON_connected(connection)) return ERROR_SUCCESS; #ifdef SONAME_LIBSSL if (connection->useSSL) @@ -425,11 +425,8 @@ BOOL NETCON_close(WININET_NETCONNECTION *connection) connection->socketFD = -1; if (result == -1) - { - INTERNET_SetLastError(sock_get_error(errno)); - return FALSE; - } - return TRUE; + return sock_get_error(errno); + return ERROR_SUCCESS; } #ifdef SONAME_LIBSSL static BOOL check_hostname(X509 *cert, char *hostname)

1 0

Rob Shearman : oleaut32: Fix accessing beyond end of buffer and memory leak in test_DispCallFunc.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: a94265e5a990bbffa7dbfc42bc0cd2d2392995b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a94265e5a990bbffa7dbfc42b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 29 10:21:35 2009 +0000 oleaut32: Fix accessing beyond end of buffer and memory leak in test_DispCallFunc. The parameter isn't automatically converted by DispCallFunc, so make sure we pass in the correct size of memory for the function to store its BSTR in. --- dlls/oleaut32/tests/tmarshal.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 46f1cdc..ae4f2aa 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1388,7 +1388,7 @@ static void test_DispCallFunc(void) V_VT(&vararg[0]) = VT_R8; V_R8(&vararg[0]) = 3.141; V_VT(&vararg[1]) = VT_BSTR; - V_BSTR(&vararg[1]) = SysAllocString(szEmpty); + V_BSTRREF(&vararg[1]) = CoTaskMemAlloc(sizeof(BSTR)); V_VT(&vararg[2]) = VT_BSTR; V_BSTR(&vararg[2]) = SysAllocString(szEmpty); V_VT(&vararg[3]) = VT_VARIANT|VT_BYREF; @@ -1399,7 +1399,8 @@ static void test_DispCallFunc(void) hr = DispCallFunc(pWidget, 9*sizeof(void*), CC_STDCALL, VT_UI4, 4, rgvt, rgpvarg, &varresult); ok_ole_success(hr, DispCallFunc); VariantClear(&varresult); - VariantClear(&vararg[1]); + SysFreeString(*V_BSTRREF(&vararg[1])); + CoTaskMemFree(V_BSTRREF(&vararg[1])); VariantClear(&vararg[2]); IWidget_Release(pWidget); }

1 0

Rob Shearman : ntdll: Don' t read beyond the end of the array on the last ace iteration in RtlValidAcl .
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: f2f50f18dc1a6fab7a0ec68d8e8764e0f3399481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2f50f18dc1a6fab7a0ec68d8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 29 10:28:32 2009 +0000 ntdll: Don't read beyond the end of the array on the last ace iteration in RtlValidAcl. --- dlls/ntdll/sec.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 950b9dd..64efdb5 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1328,7 +1328,8 @@ BOOLEAN WINAPI RtlValidAcl(PACL pAcl) ret = FALSE; break; } - ace = (PACE_HEADER)(((BYTE*)ace)+ace->AceSize); + if (i != pAcl->AceCount) + ace = (PACE_HEADER)(((BYTE*)ace)+ace->AceSize); } } }

1 0

Rob Shearman : ole32: Release the storage object in DataCache_Destroy.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: add909a0210259c763c3ee7e087503fc8d146451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=add909a0210259c763c3ee7e0… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 29 10:30:02 2009 +0000 ole32: Release the storage object in DataCache_Destroy. --- dlls/ole32/datacache.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index a258980..ead53fe 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -234,6 +234,12 @@ static void DataCache_Destroy( LIST_FOR_EACH_ENTRY_SAFE(cache_entry, next_cache_entry, &ptrToDestroy->cache_list, DataCacheEntry, entry) DataCacheEntry_Destroy(cache_entry); + if (ptrToDestroy->presentationStorage != NULL) + { + IStorage_Release(ptrToDestroy->presentationStorage); + ptrToDestroy->presentationStorage = NULL; + } + /* * Free the datacache pointer. */

1 0

Rob Shearman : rpcrt4: Fix uninitialised memory read in ndr_marshall tests.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: c8f9df7f1e3d2e068d4c76f4db8374afe854957b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8f9df7f1e3d2e068d4c76f4d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 29 10:31:05 2009 +0000 rpcrt4: Fix uninitialised memory read in ndr_marshall tests. The memory needs to be initialised since NDR will look at the memory to see if it needs to allocate memory for embedded pointers. --- dlls/rpcrt4/tests/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 91f3040..2dfba12 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -258,7 +258,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, StubMsg.Buffer = StubMsg.BufferStart; StubMsg.MemorySize = 0; - mem_orig = mem = HeapAlloc(GetProcessHeap(), 0, size); + mem_orig = mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) *(void**)mem = NULL;

1 0

Rob Shearman : ole32: Fix the length of data written and read for VT_CF types in property storage code .
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 2226b678e339aa77eb9f5b1f4a6b4ac295b2ad78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2226b678e339aa77eb9f5b1f4… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 29 10:33:44 2009 +0000 ole32: Fix the length of data written and read for VT_CF types in property storage code. --- dlls/ole32/stg_prop.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index bc45cea..643848a 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1143,8 +1143,8 @@ static HRESULT PropertyStorage_ReadProperty(PropertyStorage_impl *This, prop->u.pclipdata = CoTaskMemAlloc(sizeof (CLIPDATA)); prop->u.pclipdata->cbSize = len; prop->u.pclipdata->ulClipFmt = tag; - prop->u.pclipdata->pClipData = CoTaskMemAlloc(len); - memcpy(prop->u.pclipdata->pClipData, data+8, len); + prop->u.pclipdata->pClipData = CoTaskMemAlloc(len - sizeof(prop->u.pclipdata->ulClipFmt)); + memcpy(prop->u.pclipdata->pClipData, data+8, len - sizeof(prop->u.pclipdata->ulClipFmt)); } else hr = STG_E_INVALIDPARAMETER; @@ -1735,7 +1735,8 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, hr = IStream_Write(This->stm, cf_hdr, sizeof(cf_hdr), &count); if (FAILED(hr)) goto end; - hr = IStream_Write(This->stm, var->u.pclipdata->pClipData, len, &count); + hr = IStream_Write(This->stm, var->u.pclipdata->pClipData, + len - sizeof(var->u.pclipdata->ulClipFmt), &count); if (FAILED(hr)) goto end; bytesWritten = count + sizeof cf_hdr;

1 0

Rob Shearman : kernel32: Fix uninitialised memory read in GetPrivateProfileStringA if GetPrivateProfileStringW returns 0 .
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 47acaeaea81e566ea0c47dbc34e06acbf257037c URL: http://source.winehq.org/git/wine.git/?a=commit;h=47acaeaea81e566ea0c47dbc3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 29 10:34:19 2009 +0000 kernel32: Fix uninitialised memory read in GetPrivateProfileStringA if GetPrivateProfileStringW returns 0. The buffer that was passed into the function will remain uninitialised. Fix reading from this by only reading retW characters from bufferW and manually nul-terminating the string. --- dlls/kernel32/profile.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 5a9bd12..b5f7c0f 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1173,14 +1173,13 @@ INT WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry, filenameW.Buffer); if (len) { - ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW + 1, buffer, len, NULL, NULL); - if (!ret) + if (retW) { - ret = len - 1; - buffer[ret] = 0; + ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW, buffer, len - 1, NULL, NULL); + if (!ret) + ret = len - 1; } - else - ret--; /* strip terminating 0 */ + buffer[ret] = 0; } RtlFreeUnicodeString(&sectionW);

1 0

Rob Shearman : rpcrt4: Fix memory leak in test_conf_complex_struct.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: cd453f453fc1a348ed0d463c0f0fad86c5b7460e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd453f453fc1a348ed0d463c0… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 29 10:31:29 2009 +0000 rpcrt4: Fix memory leak in test_conf_complex_struct. --- dlls/rpcrt4/tests/ndr_marshall.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 2dfba12..15ccbef 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1879,6 +1879,7 @@ static void test_conf_complex_struct(void) StubMsg.pfnFree(mem); HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); + HeapFree(GetProcessHeap(), 0, memsrc); } static void test_ndr_buffer(void)

1 0

Rob Shearman : oleaut32: Free the correct pointer on error in TLB_AllocAndInitVarDesc.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 4f73fe3a09982e028eba061900415a30df39c93f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f73fe3a09982e028eba06190… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 29 10:54:42 2009 +0000 oleaut32: Free the correct pointer on error in TLB_AllocAndInitVarDesc. --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 8f552dc..3095d4f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5377,7 +5377,7 @@ static HRESULT TLB_AllocAndInitVarDesc( const VARDESC *src, VARDESC **dest_ptr ) hr = VariantCopy(dest->u.lpvarValue, src->u.lpvarValue); if (FAILED(hr)) { - SysFreeString((BSTR)dest_ptr); + SysFreeString((BSTR)dest); return hr; } }

1 0

Alexandre Julliard : kernel32: Pass the exe name as argument to FormatMessage.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: a04512275420acd74fe5c0d90035a754d255f2ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04512275420acd74fe5c0d90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 29 16:42:50 2009 +0100 kernel32: Pass the exe name as argument to FormatMessage. --- dlls/kernel32/process.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index a49169e..7918048 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1159,6 +1159,8 @@ void CDECL __wine_kernel_init(void) if (!(peb->ImageBaseAddress = LoadLibraryExW( main_exe_name, 0, DONT_RESOLVE_DLL_REFERENCES ))) { + DWORD_PTR args[1]; + WCHAR msgW[1024]; char msg[1024]; DWORD error = GetLastError(); @@ -1182,8 +1184,11 @@ void CDECL __wine_kernel_init(void) ExitProcess( ERROR_BAD_EXE_FORMAT ); } } - FormatMessageA( FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, msg, sizeof(msg), NULL ); - MESSAGE( "wine: could not load %s: %s", debugstr_w(main_exe_name), msg ); + args[0] = (DWORD_PTR)main_exe_name; + FormatMessageW( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY, + NULL, error, 0, msgW, sizeof(msgW)/sizeof(WCHAR), (__ms_va_list *)args ); + WideCharToMultiByte( CP_ACP, 0, msgW, -1, msg, sizeof(msg), NULL, NULL ); + MESSAGE( "wine: %s", msg ); ExitProcess( error ); }

1 0