January 2012 - Wine-commits

Pierre Schweitzer : wininet: Fix handle leak.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 85e2b4d7df04387908eeb027731e0492e68fa506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85e2b4d7df04387908eeb0277… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Fri Dec 30 21:55:42 2011 +0100 wininet: Fix handle leak. --- dlls/wininet/http.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 631a184..8fc01fe 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1883,6 +1883,8 @@ static void http_release_netconn(http_request_t *req, BOOL reuse) if(module) FreeLibrary(module); } + else + CloseHandle(thread); } return; }

1 0

Pierre Schweitzer : taskmgr: Fix handle leaks.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 4f18f4d2c32b0a27cd41bffe46a14496d82d390f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f18f4d2c32b0a27cd41bffe4… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Fri Dec 30 21:56:00 2011 +0100 taskmgr: Fix handle leaks. --- programs/taskmgr/applpage.c | 2 +- programs/taskmgr/perfpage.c | 2 +- programs/taskmgr/procpage.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index 3a51dd8..52d08f1 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -891,7 +891,7 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) UpdateApplicationListControlViewSetting(); /* Start our refresh thread */ - CreateThread(NULL, 0, ApplicationPageRefreshThread, NULL, 0, NULL); + CloseHandle( CreateThread(NULL, 0, ApplicationPageRefreshThread, NULL, 0, NULL)); return TRUE; diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c index 5b1fd41..8d52091 100644 --- a/programs/taskmgr/perfpage.c +++ b/programs/taskmgr/perfpage.c @@ -343,7 +343,7 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) GraphCtrl_SetPlotColor(&PerformancePageMemUsageHistoryGraph, 0, RGB(255, 255, 0)) ; /* Start our refresh thread */ #ifdef RUN_PERF_PAGE - CreateThread(NULL, 0, PerformancePageRefreshThread, NULL, 0, NULL); + CloseHandle( CreateThread(NULL, 0, PerformancePageRefreshThread, NULL, 0, NULL)); #endif /* diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 7941d5c..dce76f3 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -483,7 +483,7 @@ ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) OldProcessListWndProc = (WNDPROC)SetWindowLongPtrW(hProcessPageListCtrl, GWLP_WNDPROC, (LONG_PTR)ProcessListWndProc); /* Start our refresh thread */ - CreateThread(NULL, 0, ProcessPageRefreshThread, NULL, 0, NULL); + CloseHandle( CreateThread(NULL, 0, ProcessPageRefreshThread, NULL, 0, NULL)); return TRUE;

1 0

Pierre Schweitzer : winetest: Fix handle leak.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 278e614065da56c70eb529d3617228e1eae3043f URL: http://source.winehq.org/git/wine.git/?a=commit;h=278e614065da56c70eb529d36… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Fri Dec 30 21:56:16 2011 +0100 winetest: Fix handle leak. --- programs/winetest/gui.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index d5e3e27..6bbe940 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -532,6 +532,7 @@ report (enum report_type t, ...) GetLastError ()); else { DWORD ret = WaitForSingleObject (initEvent, INFINITE); + CloseHandle(DlgThread); switch (ret) { case WAIT_OBJECT_0: funcs = GUI_funcs;

1 0

Pierre Schweitzer : kernel32: Fix handle leak.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 8ed701b3c6536c555e8e90c6a899edaacb3b6d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed701b3c6536c555e8e90c6a… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Fri Dec 30 21:54:31 2011 +0100 kernel32: Fix handle leak. --- dlls/kernel32/console.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 2ca74c9..fdc4552 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1998,6 +1998,8 @@ static DWORD WINAPI CONSOLE_SendEventThread(void* pmt) */ int CONSOLE_HandleCtrlC(unsigned sig) { + HANDLE thread; + /* FIXME: better test whether a console is attached to this process ??? */ extern unsigned CONSOLE_GetNumHistoryEntries(void); if (CONSOLE_GetNumHistoryEntries() == (unsigned)-1) return 0; @@ -2014,7 +2016,11 @@ int CONSOLE_HandleCtrlC(unsigned sig) * console critical section, we need another execution environment where * we can wait on this critical section */ - CreateThread(NULL, 0, CONSOLE_SendEventThread, (void*)CTRL_C_EVENT, 0, NULL); + thread = CreateThread(NULL, 0, CONSOLE_SendEventThread, (void*)CTRL_C_EVENT, 0, NULL); + if (thread == NULL) + return 0; + + CloseHandle(thread); } return 1; }

1 0

Pierre Schweitzer : dplayx: Fix handle leak.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 2d14f89fea8fa7d7819e5c22ace94dbf41411601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d14f89fea8fa7d7819e5c22a… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Fri Dec 30 21:54:16 2011 +0100 dplayx: Fix handle leak. --- dlls/dplayx/dplayx_messages.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c index 2e34950..8b9320d 100644 --- a/dlls/dplayx/dplayx_messages.c +++ b/dlls/dplayx/dplayx_messages.c @@ -58,6 +58,7 @@ DWORD CreateLobbyMessageReceptionThread( HANDLE hNotifyEvent, HANDLE hStart, { DWORD dwMsgThreadId; LPMSGTHREADINFO lpThreadInfo; + HANDLE hThread; lpThreadInfo = HeapAlloc( GetProcessHeap(), 0, sizeof( *lpThreadInfo ) ); if( lpThreadInfo == NULL ) @@ -83,21 +84,20 @@ DWORD CreateLobbyMessageReceptionThread( HANDLE hNotifyEvent, HANDLE hStart, lpThreadInfo->hDeath = hDeath; lpThreadInfo->hSettingRead = hConnRead; - if( !CreateThread( NULL, /* Security attribs */ - 0, /* Stack */ - DPL_MSG_ThreadMain, /* Msg reception function */ - lpThreadInfo, /* Msg reception func parameter */ - 0, /* Flags */ - &dwMsgThreadId /* Updated with thread id */ - ) - ) + hThread = CreateThread( NULL, /* Security attribs */ + 0, /* Stack */ + DPL_MSG_ThreadMain, /* Msg reception function */ + lpThreadInfo, /* Msg reception func parameter */ + 0, /* Flags */ + &dwMsgThreadId /* Updated with thread id */ + ); + if ( hThread == NULL ) { ERR( "Unable to create msg thread\n" ); goto error; } - /* FIXME: Should I be closing the handle to the thread or does that - terminate the thread? */ + CloseHandle(hThread); return dwMsgThreadId;

1 0

Marcus Meissner : ws2_32: Removed dead code (Coverity).
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: d34e0515fd320f48a1921dc968e1b576ef81a26d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d34e0515fd320f48a1921dc96… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Dec 31 15:12:41 2011 +0100 ws2_32: Removed dead code (Coverity). --- dlls/ws2_32/tests/sock.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5677a2c..2905267 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5328,8 +5328,6 @@ static void test_completion_port(void) if (dest != INVALID_SOCKET) closesocket(dest); - if (src != INVALID_SOCKET) - closesocket(src); src = socket(AF_INET, SOCK_STREAM, 0);

1 0

Marcus Meissner : gdi32: Check return value of REGION_UnionRectWithRegion ( Coverity).
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 15162ddf3c58ab33b7a5704bf0a2338648996ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15162ddf3c58ab33b7a5704bf… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Dec 31 16:21:48 2011 +0100 gdi32: Check return value of REGION_UnionRectWithRegion (Coverity). --- dlls/gdi32/region.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 4daf88c..66ca1c3 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1271,11 +1271,12 @@ static BOOL REGION_UnionRectWithRegion(const RECT *rect, WINEREGION *rgn) BOOL add_rect_to_region( HRGN rgn, const RECT *rect ) { RGNOBJ *obj = GDI_GetObjPtr( rgn, OBJ_REGION ); + BOOL ret; if (!obj) return FALSE; - REGION_UnionRectWithRegion( rect, &obj->rgn ); + ret = REGION_UnionRectWithRegion( rect, &obj->rgn ); GDI_ReleaseObj( rgn ); - return TRUE; + return ret; } /***********************************************************************

1 0

Michael Stefaniuc : jscript: Remove break after return (Smatch).
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 158c8b76cbb6e216589ddb5027d8d2e217d51437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=158c8b76cbb6e216589ddb502… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 2 22:23:48 2012 +0100 jscript: Remove break after return (Smatch). --- dlls/jscript/jsutils.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 2463a0b..b145d8a 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -571,10 +571,8 @@ HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str) case VT_I4: *str = int_to_bstr(V_I4(v)); break; - case VT_R8: { + case VT_R8: return double_to_bstr(V_R8(v), str); - break; - } case VT_BSTR: *str = SysAllocString(V_BSTR(v)); break;

1 0

Michael Stefaniuc : ddraw: Fix two memory leaks (Smatch).
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: f1f5536d8ffdd9bd2f8caf5fc5931dea9bfc28a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f5536d8ffdd9bd2f8caf5fc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 2 22:27:07 2012 +0100 ddraw: Fix two memory leaks (Smatch). --- dlls/ddraw/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d110acc..2f92edf 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1353,6 +1353,7 @@ static HRESULT ddraw_surface_blt_clipped(IDirectDrawSurfaceImpl *dst_surface, co &dst_rect, clip_list, &clip_list_size))) { WARN("Failed to get clip list, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, clip_list); return hr; } @@ -1386,6 +1387,7 @@ static HRESULT ddraw_surface_blt_clipped(IDirectDrawSurfaceImpl *dst_surface, co } } + HeapFree(GetProcessHeap(), 0, clip_list); return hr; }

1 0

Alistair Leslie-Hughes : mscoree: Implement CLRRuntimeHost_ExecuteInDefaultAppDomain.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: acaa258054ab2a79efcb2b99595ab6a771401288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acaa258054ab2a79efcb2b995… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 16 09:15:11 2011 +1100 mscoree: Implement CLRRuntimeHost_ExecuteInDefaultAppDomain. --- dlls/mscoree/corruntimehost.c | 83 +++++++++++++++++++++++++++++++++++++++- dlls/mscoree/metahost.c | 1 + dlls/mscoree/mscoree_private.h | 2 + 3 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index b7e4f5f..04482be 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -534,9 +534,88 @@ static HRESULT WINAPI CLRRuntimeHost_ExecuteInDefaultAppDomain(ICLRRuntimeHost* LPCWSTR pwzAssemblyPath, LPCWSTR pwzTypeName, LPCWSTR pwzMethodName, LPCWSTR pwzArgument, DWORD *pReturnValue) { - FIXME("(%p,%s,%s,%s,%s)\n", iface, debugstr_w(pwzAssemblyPath), + RuntimeHost *This = impl_from_ICLRRuntimeHost( iface ); + HRESULT hr; + MonoDomain *domain; + MonoAssembly *assembly; + MonoImage *image; + MonoClass *klass; + MonoMethod *method; + MonoObject *result; + MonoString *str; + void *args[2]; + char *filenameA = NULL, *classA = NULL, *methodA = NULL; + char *argsA = NULL, *ns; + + TRACE("(%p,%s,%s,%s,%s)\n", iface, debugstr_w(pwzAssemblyPath), debugstr_w(pwzTypeName), debugstr_w(pwzMethodName), debugstr_w(pwzArgument)); - return E_NOTIMPL; + + hr = RuntimeHost_GetDefaultDomain(This, &domain); + if(hr != S_OK) + { + ERR("Couldn't get Default Domain\n"); + return hr; + } + + hr = E_FAIL; + + filenameA = WtoA(pwzAssemblyPath); + assembly = This->mono->mono_domain_assembly_open(domain, filenameA); + if (!assembly) + { + ERR("Cannot open assembly %s\n", filenameA); + goto cleanup; + } + + image = This->mono->mono_assembly_get_image(assembly); + if (!image) + { + ERR("Couldn't get assembly image\n"); + goto cleanup; + } + + classA = WtoA(pwzTypeName); + ns = strrchr(classA, '.'); + *ns = '\0'; + klass = This->mono->mono_class_from_name(image, classA, ns+1); + if (!klass) + { + ERR("Couldn't get class from image\n"); + goto cleanup; + } + + methodA = WtoA(pwzMethodName); + method = This->mono->mono_class_get_method_from_name(klass, methodA, 1); + if (!method) + { + ERR("Couldn't get method from class\n"); + goto cleanup; + } + + argsA = WtoA(pwzArgument); + str = This->mono->mono_string_new(domain, argsA); + args[0] = &str; + args[1] = NULL; + result = This->mono->mono_runtime_invoke(method, NULL, args, NULL); + if (!result) + ERR("Couldn't get result pointer\n"); + else + { + *pReturnValue = *(DWORD*)This->mono->mono_object_unbox(result); + hr = S_OK; + } + +cleanup: + if(filenameA) + HeapFree(GetProcessHeap(), 0, filenameA); + if(classA) + HeapFree(GetProcessHeap(), 0, classA); + if(argsA) + HeapFree(GetProcessHeap(), 0, argsA); + if(methodA) + HeapFree(GetProcessHeap(), 0, methodA); + + return hr; } static const struct ICLRRuntimeHostVtbl CLRHostVtbl = diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index d9e36a8..454a653 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -185,6 +185,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) LOAD_MONO_FUNCTION(mono_runtime_quit); LOAD_MONO_FUNCTION(mono_set_dirs); LOAD_MONO_FUNCTION(mono_stringify_assembly_name); + LOAD_MONO_FUNCTION(mono_string_new); /* GLib imports obsoleted by the 2.0 ABI */ if (This->mono_abi_version == 1) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 71bf738..a45a405 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -41,6 +41,7 @@ typedef struct _MonoType MonoType; typedef struct _MonoImage MonoImage; typedef struct _MonoClass MonoClass; typedef struct _MonoObject MonoObject; +typedef struct _MonoString MonoString; typedef struct _MonoMethod MonoMethod; typedef struct _MonoProfiler MonoProfiler; @@ -161,6 +162,7 @@ struct loaded_mono void (CDECL *mono_thread_pool_cleanup)(void); void (CDECL *mono_thread_suspend_all_other_threads)(void); void (CDECL *mono_threads_set_shutting_down)(void); + MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); }; /* loaded runtime interfaces */

1 0