May 2014 - Wine-commits - list.winehq.org

Jacek Caban : ntdll: Use MAP_PRIVATE for copy on write mappings.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 5ceb22714e965692acf2b0ec9af0dabc5dfc8b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ceb22714e965692acf2b0ec9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 13 12:02:48 2014 +0200 ntdll: Use MAP_PRIVATE for copy on write mappings. --- dlls/kernel32/tests/virtual.c | 17 +++++++++++------ dlls/ntdll/virtual.c | 3 ++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 174d422..0955d30 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2489,7 +2489,7 @@ static void test_shared_memory(BOOL is_child) CloseHandle(mapping); } -static void test_shared_memory_ro(BOOL is_child) +static void test_shared_memory_ro(BOOL is_child, DWORD child_access) { HANDLE mapping; LONG *p; @@ -2501,7 +2501,7 @@ static void test_shared_memory_ro(BOOL is_child) ok(GetLastError() == ERROR_ALREADY_EXISTS, "expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); SetLastError(0xdeadbef); - p = MapViewOfFile(mapping, FILE_MAP_READ | (is_child ? FILE_MAP_WRITE : 0), 0, 0, 4096); + p = MapViewOfFile(mapping, is_child ? child_access : FILE_MAP_READ, 0, 0, 4096); ok(p != NULL, "MapViewOfFile error %d\n", GetLastError()); if (is_child) @@ -2517,14 +2517,17 @@ static void test_shared_memory_ro(BOOL is_child) DWORD ret; winetest_get_mainargs(&argv); - sprintf(cmdline, "\"%s\" virtual sharedmemro", argv[0]); + sprintf(cmdline, "\"%s\" virtual sharedmemro %x", argv[0], child_access); ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); winetest_wait_child_process(pi.hProcess); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); - ok(*p == 0xdeadbeef, "*p = %x, expected 0xdeadbeef\n", *p); + if(child_access & FILE_MAP_WRITE) + ok(*p == 0xdeadbeef, "*p = %x, expected 0xdeadbeef\n", *p); + else + ok(!*p, "*p = %x, expected 0\n", *p); } UnmapViewOfFile(p); @@ -2551,7 +2554,7 @@ START_TEST(virtual) } if (!strcmp(argv[2], "sharedmemro")) { - test_shared_memory_ro(TRUE); + test_shared_memory_ro(TRUE, strtol(argv[3], NULL, 16)); return; } while (1) @@ -2580,7 +2583,9 @@ START_TEST(virtual) pNtUnmapViewOfSection = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtUnmapViewOfSection"); test_shared_memory(FALSE); - test_shared_memory_ro(FALSE); + test_shared_memory_ro(FALSE, FILE_MAP_READ|FILE_MAP_WRITE); + test_shared_memory_ro(FALSE, FILE_MAP_COPY); + test_shared_memory_ro(FALSE, FILE_MAP_COPY|FILE_MAP_WRITE); test_mapping(); test_CreateFileMapping_protection(); test_VirtualAlloc_protection(); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d9acac6..70dea5a 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2627,7 +2627,8 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p TRACE("handle=%p size=%lx offset=%x%08x\n", handle, size, offset.u.HighPart, offset.u.LowPart ); - res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, MAP_SHARED, !dup_mapping ); + res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, + (vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED, !dup_mapping ); if (res == STATUS_SUCCESS) { *addr_ptr = view->base;

1 0

Alexandre Julliard : ntdll: Determine the mapping type automatically from the WRITECOPY flag.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 2cef8dbcc29739278037e6409e0a00a4fa8dc0d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cef8dbcc29739278037e6409… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 13 12:28:58 2014 +0200 ntdll: Determine the mapping type automatically from the WRITECOPY flag. --- dlls/ntdll/virtual.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 70dea5a..4819d2d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -854,10 +854,11 @@ done: * The csVirtual section must be held by caller. */ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start, size_t size, - off_t offset, unsigned int vprot, int flags, BOOL removable ) + off_t offset, unsigned int vprot, BOOL removable ) { void *ptr; int prot = VIRTUAL_GetUnixProt( vprot | VPROT_COMMITTED /* make sure it is accessible */ ); + unsigned int flags = MAP_FIXED | ((vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED); assert( start < view->size ); assert( start + size <= view->size ); @@ -872,7 +873,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start /* only try mmap if media is not removable (or if we require write access) */ if (!removable || (flags & MAP_SHARED)) { - if (mmap( (char *)view->base + start, size, prot, flags | MAP_FIXED, fd, offset ) != (void *)-1) + if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != (void *)-1) goto done; if ((errno == EPERM) && (prot & PROT_EXEC)) @@ -1094,7 +1095,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz if (!st.st_size) goto error; header_size = min( header_size, st.st_size ); if (map_file_into_view( view, fd, 0, header_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) goto error; + !dup_mapping ) != STATUS_SUCCESS) goto error; dos = (IMAGE_DOS_HEADER *)ptr; nt = (IMAGE_NT_HEADERS *)(ptr + dos->e_lfanew); header_end = ptr + ROUND_SIZE( 0, header_size ); @@ -1118,8 +1119,8 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz /* unaligned sections, this happens for native subsystem binaries */ /* in that case Windows simply maps in the whole file */ - if (map_file_into_view( view, fd, 0, total_size, 0, VPROT_COMMITTED | VPROT_READ, - MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) goto error; + if (map_file_into_view( view, fd, 0, total_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, + !dup_mapping ) != STATUS_SUCCESS) goto error; /* check that all sections are loaded at the right offset */ if (nt->OptionalHeader.FileAlignment != nt->OptionalHeader.SectionAlignment) goto error; @@ -1172,8 +1173,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz sec->PointerToRawData, (int)pos, file_size, map_size, sec->Characteristics ); if (map_file_into_view( view, shared_fd, sec->VirtualAddress, map_size, pos, - VPROT_COMMITTED | VPROT_READ | VPROT_WRITE, - MAP_SHARED, FALSE ) != STATUS_SUCCESS) + VPROT_COMMITTED | VPROT_READ | VPROT_WRITE, FALSE ) != STATUS_SUCCESS) { ERR_(module)( "Could not map shared section %.8s\n", sec->Name ); goto error; @@ -1189,8 +1189,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz if (end > base) map_file_into_view( view, shared_fd, base, end - base, pos + (base - sec->VirtualAddress), - VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - MAP_PRIVATE, FALSE ); + VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, FALSE ); } pos += map_size; continue; @@ -1212,7 +1211,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz end < file_start || map_file_into_view( view, fd, sec->VirtualAddress, file_size, file_start, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) + !dup_mapping ) != STATUS_SUCCESS) { ERR_(module)( "Could not map section %.8s, file probably truncated\n", sec->Name ); goto error; @@ -2627,8 +2626,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p TRACE("handle=%p size=%lx offset=%x%08x\n", handle, size, offset.u.HighPart, offset.u.LowPart ); - res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, - (vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED, !dup_mapping ); + res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, !dup_mapping ); if (res == STATUS_SUCCESS) { *addr_ptr = view->base;

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8LobbiedApplication Initialize.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: d9ae2b828e6783cc02273bf9018e2ebba93778df URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ae2b828e6783cc02273bf90… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 14 14:53:40 2014 +1100 dpnet: Implement IDirectPlay8LobbiedApplication Initialize. --- dlls/dpnet/dpnet_private.h | 9 +++++++-- dlls/dpnet/lobbiedapp.c | 16 +++++++++++++--- dlls/dpnet/tests/client.c | 28 ++++++++++++++++++++++++++-- dlls/dpnet/tests/peer.c | 32 ++++++++++++++++++++++++++++++-- 4 files changed, 76 insertions(+), 9 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index af81474..8fd04d6 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -78,8 +78,13 @@ struct IDirectPlay8AddressImpl */ struct IDirectPlay8LobbiedApplicationImpl { - IDirectPlay8LobbiedApplication IDirectPlay8LobbiedApplication_iface; - LONG ref; + IDirectPlay8LobbiedApplication IDirectPlay8LobbiedApplication_iface; + LONG ref; + + PFNDPNMESSAGEHANDLER msghandler; + DWORD flags; + void *usercontext; + DPNHANDLE *connection; }; /***************************************************************************** diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c index b430776..507a895 100644 --- a/dlls/dpnet/lobbiedapp.c +++ b/dlls/dpnet/lobbiedapp.c @@ -89,9 +89,19 @@ static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_Initialize(IDirectPlay8 void * const pvUserContext, const PFNDPNMESSAGEHANDLER pfn, DPNHANDLE * const pdpnhConnection, const DWORD dwFlags) { - IDirectPlay8LobbiedApplicationImpl *This = impl_from_IDirectPlay8LobbiedApplication(iface); - FIXME("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8LobbiedApplicationImpl *This = impl_from_IDirectPlay8LobbiedApplication(iface); + + TRACE("(%p)->(%p %p %p %x)\n", This, pvUserContext, pfn, pdpnhConnection, dwFlags); + + if(!pfn) + return DPNERR_INVALIDPOINTER; + + This->msghandler = pfn; + This->flags = dwFlags; + This->usercontext = pvUserContext; + This->connection = pdpnhConnection; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_RegisterProgram(IDirectPlay8LobbiedApplication *iface, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index bf0d26f..92bed55 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -21,10 +21,12 @@ #include <stdio.h> #include <dplay8.h> +#include <dplobby8.h> #include "wine/test.h" static IDirectPlay8Client* client = NULL; +static IDirectPlay8LobbiedApplication* lobbied = NULL; static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, PVOID buffer) @@ -33,10 +35,17 @@ static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, return S_OK; } +static HRESULT WINAPI DirectPlayLobbyMessageHandler(PVOID context, DWORD message_id, PVOID buffer) +{ + trace("DirectPlayLobbyMessageHandler: 0x%08x\n", message_id); + return S_OK; +} + static BOOL test_init_dp(void) { HRESULT hr; DPN_SP_CAPS caps; + DPNHANDLE lobbyConnection; hr = CoInitialize(0); ok(hr == S_OK, "CoInitialize failed with %x\n", hr); @@ -56,6 +65,14 @@ static BOOL test_init_dp(void) hr = IDirectPlay8Client_Initialize(client, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Client_Initialize failed with %x\n", hr); + hr = CoCreateInstance(&CLSID_DirectPlay8LobbiedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectPlay8LobbiedApplication, (void **)&lobbied); + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + + hr = IDirectPlay8LobbiedApplication_Initialize(lobbied, NULL, DirectPlayLobbyMessageHandler, + &lobbyConnection, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Initialize failed with %x\n", hr); + return client != NULL; } @@ -195,8 +212,15 @@ static void test_cleanup_dp(void) hr = IDirectPlay8Client_Close(client, 0); ok(hr == S_OK, "IDirectPlay8Client_Close failed with %x\n", hr); - hr = IDirectPlay8Client_Release(client); - ok(hr == S_OK, "IDirectPlay8Client_Release failed with %x\n", hr); + if(lobbied) + { + hr = IDirectPlay8LobbiedApplication_Close(lobbied, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Close failed with %x\n", hr); + + IDirectPlay8LobbiedApplication_Release(lobbied); + } + + IDirectPlay8Client_Release(client); CoUninitialize(); } diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index 670b843..1fec1f2 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -20,10 +20,12 @@ #include <stdio.h> #include <dplay8.h> +#include <dplobby8.h> #include "wine/test.h" static IDirectPlay8Peer* peer = NULL; +static IDirectPlay8LobbiedApplication* lobbied = NULL; static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, PVOID buffer) { @@ -31,10 +33,17 @@ static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, return S_OK; } +static HRESULT WINAPI DirectPlayLobbyMessageHandler(PVOID context, DWORD message_id, PVOID buffer) +{ + trace("DirectPlayLobbyMessageHandler: 0x%08x\n", message_id); + return S_OK; +} + static void test_init_dp(void) { HRESULT hr; DPN_SP_CAPS caps; + DPNHANDLE lobbyConnection; hr = CoInitialize(0); ok(hr == S_OK, "CoInitialize failed with %x\n", hr); @@ -53,6 +62,18 @@ static void test_init_dp(void) hr = IDirectPlay8Peer_Initialize(peer, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Peer_Initialize failed with %x\n", hr); + + hr = CoCreateInstance(&CLSID_DirectPlay8LobbiedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectPlay8LobbiedApplication, (void **)&lobbied); + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + + hr = IDirectPlay8LobbiedApplication_Initialize(lobbied, NULL, NULL, + &lobbyConnection, 0); + ok(hr == DPNERR_INVALIDPOINTER, "Failed with %x\n", hr); + + hr = IDirectPlay8LobbiedApplication_Initialize(lobbied, NULL, DirectPlayLobbyMessageHandler, + &lobbyConnection, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Initialize failed with %x\n", hr); } static void test_enum_service_providers(void) @@ -198,8 +219,15 @@ static void test_cleanup_dp(void) hr = IDirectPlay8Peer_Close(peer, 0); ok(hr == S_OK, "IDirectPlay8Peer_Close failed with %x\n", hr); - hr = IDirectPlay8Peer_Release(peer); - ok(hr == S_OK, "IDirectPlay8Peer_Release failed with %x\n", hr); + if(lobbied) + { + hr = IDirectPlay8LobbiedApplication_Close(lobbied, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Close failed with %x\n", hr); + + IDirectPlay8LobbiedApplication_Release(lobbied); + } + + IDirectPlay8Peer_Release(peer); CoUninitialize(); }

1 0

Hans Leidekker : wbemprox: Use a separate index variable to build the safearray in get_properties.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 27b18a395b1c4caa0bdb2ec9e0175cccfbe9bf12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b18a395b1c4caa0bdb2ec9e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 13 13:41:35 2014 +0200 wbemprox: Use a separate index variable to build the safearray in get_properties. --- dlls/wbemprox/query.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index c97b52b..b3a3eb9 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -963,12 +963,12 @@ HRESULT get_properties( const struct view *view, LONG flags, SAFEARRAY **props ) { SAFEARRAY *sa; BSTR str; - LONG i; - UINT num_props = count_selected_properties( view ); + UINT i, num_props = count_selected_properties( view ); + LONG j; if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, num_props ))) return E_OUTOFMEMORY; - for (i = 0; i < view->table->num_cols; i++) + for (i = 0, j = 0; i < view->table->num_cols; i++) { BOOL is_system; @@ -980,12 +980,13 @@ HRESULT get_properties( const struct view *view, LONG flags, SAFEARRAY **props ) else if ((flags & WBEM_FLAG_SYSTEM_ONLY) && !is_system) continue; str = SysAllocString( view->table->columns[i].name ); - if (!str || SafeArrayPutElement( sa, &i, str ) != S_OK) + if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) { SysFreeString( str ); SafeArrayDestroy( sa ); return E_OUTOFMEMORY; } + j++; } *props = sa; return S_OK;

1 0

Hans Leidekker : wbemprox: No longer prefer native.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: e17276b5284d460bd05dcdb8ead360f8abb658c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e17276b5284d460bd05dcdb8e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 13 13:41:58 2014 +0200 wbemprox: No longer prefer native. --- dlls/wbemprox/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index d1b08f1..e6ccd5c 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -118,8 +118,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstDLL; DisableThreadLibraryCalls(hinstDLL);

1 0

Hans Leidekker : wmiutils: Always null-terminate the server string in build_server (valgrind).
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 59ca80cb3d957f6a4639a8bacf7d1915ce30c7f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ca80cb3d957f6a4639a8bac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 13 13:42:34 2014 +0200 wmiutils: Always null-terminate the server string in build_server (valgrind). --- dlls/wmiutils/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index b2b4945..7977416 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -582,6 +582,7 @@ static WCHAR *build_server( struct path *path, int *len ) { p[0] = p[1] = '\\'; p[2] = '.'; + p[3] = 0; } return ret; }

1 0

Hans Leidekker : fusion: Fix a couple of memory leaks (valgrind).
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 2acd2116d9e4ff01cd9262646082491541f318da URL: http://source.winehq.org/git/wine.git/?a=commit;h=2acd2116d9e4ff01cd9262646… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 13 13:42:45 2014 +0200 fusion: Fix a couple of memory leaks (valgrind). --- dlls/fusion/asmname.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index fa84e53..a17957a 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -709,6 +709,8 @@ done: { HeapFree(GetProcessHeap(), 0, name->displayname); HeapFree(GetProcessHeap(), 0, name->name); + HeapFree(GetProcessHeap(), 0, name->culture); + HeapFree(GetProcessHeap(), 0, name->procarch); } return hr; }

1 0

Hans Leidekker : wininet: Fix a memory leak (valgrind).
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: e49ebbe953fd968f820999226ff2f714c221bb10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e49ebbe953fd968f820999226… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 13 13:42:58 2014 +0200 wininet: Fix a memory leak (valgrind). --- dlls/wininet/netconnection.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index fa07a9b..074229e 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -636,6 +636,8 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode } } + heap_free(read_buf); + if(status != SEC_E_OK || res != ERROR_SUCCESS) { WARN("Failed to establish SSL connection: %08x (%u)\n", status, res); heap_free(connection->ssl_buf);

1 0

Hans Leidekker : winhttp: Fix a couple of memory leaks (valgrind).
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 6494c50ad7f613430d3ab1eae7bbebe85bed8925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6494c50ad7f613430d3ab1eae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 13 13:43:11 2014 +0200 winhttp: Fix a couple of memory leaks (valgrind). --- dlls/winhttp/net.c | 1 + dlls/winhttp/request.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 7466d36..b751bf0 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -488,6 +488,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) } } + heap_free(read_buf); if(status != SEC_E_OK || res != ERROR_SUCCESS) { WARN("Failed to initialize security context failed: %08x\n", status); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 374051a..54aa616 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2250,6 +2250,8 @@ static BOOL handle_redirect( request_t *request, DWORD status ) request->read_chunked = FALSE; request->read_chunked_eof = FALSE; } + else heap_free( hostname ); + if (!(ret = add_host_header( request, WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; if (!(ret = open_connection( request ))) goto end; @@ -2278,7 +2280,6 @@ static BOOL handle_redirect( request_t *request, DWORD status ) ret = TRUE; end: - if (!ret) heap_free( hostname ); heap_free( location ); return ret; }

1 0

Nikolay Sivov : xmllite: Support external IMalloc for writer.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: e58070ab833717daa7d56b5cbd73297b765686f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e58070ab833717daa7d56b5cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 13 17:54:48 2014 +0400 xmllite: Support external IMalloc for writer. --- dlls/xmllite/tests/writer.c | 4 ++-- dlls/xmllite/writer.c | 38 ++++++++++++++++++++++++++++---------- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index f182aeb..b5935c1 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -76,10 +76,10 @@ static void test_writer_create(void) if (0) { pCreateXmlWriter(&IID_IXmlWriter, NULL, NULL); - pCreateXmlWriter(NULL, (LPVOID*)&writer, NULL); + pCreateXmlWriter(NULL, (void**)&writer, NULL); } - hr = pCreateXmlWriter(&IID_IXmlWriter, (LPVOID*)&writer, NULL); + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); IXmlWriter_Release(writer); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index a0e2703..5266049 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -47,6 +47,7 @@ typedef struct _xmlwriter { IXmlWriter IXmlWriter_iface; LONG ref; + IMalloc *imalloc; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -59,7 +60,7 @@ static inline xmlwriteroutput *impl_from_IXmlWriterOutput(IXmlWriterOutput *ifac return CONTAINING_RECORD(iface, xmlwriteroutput, IXmlWriterOutput_iface); } -/* reader input memory allocation functions */ +/* writer output memory allocation functions */ static inline void *writeroutput_alloc(xmlwriteroutput *output, size_t len) { return m_alloc(output->imalloc, len); @@ -70,6 +71,17 @@ static inline void writeroutput_free(xmlwriteroutput *output, void *mem) m_free(output->imalloc, mem); } +/* writer memory allocation functions */ +static inline void *writer_alloc(xmlwriter *writer, size_t len) +{ + return m_alloc(writer->imalloc, len); +} + +static inline void writer_free(xmlwriter *writer, void *mem) +{ + m_free(writer->imalloc, mem); +} + static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -102,8 +114,11 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) TRACE("%p\n", This); ref = InterlockedDecrement(&This->ref); - if (ref == 0) - heap_free(This); + if (ref == 0) { + IMalloc *imalloc = This->imalloc; + writer_free(This, This); + if (imalloc) IMalloc_Release(imalloc); + } return ref; } @@ -470,13 +485,11 @@ static const struct IUnknownVtbl xmlwriteroutputvtbl = xmlwriteroutput_Release }; -HRESULT WINAPI CreateXmlWriter(REFIID riid, void **pObject, IMalloc *pMalloc) +HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) { xmlwriter *writer; - TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), pObject, pMalloc); - - if (pMalloc) FIXME("custom IMalloc not supported yet\n"); + TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); if (!IsEqualGUID(riid, &IID_IXmlWriter)) { @@ -484,15 +497,20 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **pObject, IMalloc *pMalloc) return E_FAIL; } - writer = heap_alloc(sizeof(*writer)); + if (imalloc) + writer = IMalloc_Alloc(imalloc, sizeof(*writer)); + else + writer = heap_alloc(sizeof(*writer)); if(!writer) return E_OUTOFMEMORY; writer->IXmlWriter_iface.lpVtbl = &xmlwriter_vtbl; writer->ref = 1; + writer->imalloc = imalloc; + if (imalloc) IMalloc_AddRef(imalloc); - *pObject = &writer->IXmlWriter_iface; + *obj = &writer->IXmlWriter_iface; - TRACE("returning iface %p\n", *pObject); + TRACE("returning iface %p\n", *obj); return S_OK; }

1 0