wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Marcus Meissner : wined3d: Remove now useless NULL check (Coverity).
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 589b48e495a929d2c0b5c9092f26b3a604f11126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589b48e495a929d2c0b5c9092… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat May 25 09:40:54 2013 +0200 wined3d: Remove now useless NULL check (Coverity). --- dlls/wined3d/resource.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 0e0678d..3d50652 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -169,8 +169,7 @@ void resource_cleanup(struct wined3d_resource *resource) resource->allocatedMemory = 0; resource->heapMemory = 0; - if (resource->device) - device_resource_released(resource->device, resource); + device_resource_released(resource->device, resource); } void resource_unload(struct wined3d_resource *resource)

1 0

Marcus Meissner : oledb32: Avoid leak in error path on safearray conversion (Coverity).
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 36fee7c2e5e9339256d5b1e7cad632af4863690c URL: http://source.winehq.org/git/wine.git/?a=commit;h=36fee7c2e5e9339256d5b1e7c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat May 25 09:25:19 2013 +0200 oledb32: Avoid leak in error path on safearray conversion (Coverity). --- dlls/oledb32/convert.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 0961464..a2fd0cb 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -957,8 +957,10 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, for(i =0; i < size; i++,p++) { hr = SafeArrayPutElement(psa, &i, &p); - if(FAILED(hr)) + if(FAILED(hr)) { + SafeArrayDestroy (psa); return hr; + } } V_VT(v) = VT_ARRAY|VT_UI1;

1 0

Marcus Meissner : d3dx9_36: Allocate the right size (Coverity).
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 64fb92ab380d8bfc90e390289e22bf39d54219ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=64fb92ab380d8bfc90e390289… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat May 25 09:04:37 2013 +0200 d3dx9_36: Allocate the right size (Coverity). --- dlls/d3dx9_36/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ed93eb4..1df0cf2 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1134,8 +1134,8 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, hr = IWICPalette_GetColorCount(wic_palette, &nb_colors); if (SUCCEEDED(hr)) { - colors = HeapAlloc(GetProcessHeap(), 0, nb_colors * sizeof(colors)); - palette = HeapAlloc(GetProcessHeap(), 0, nb_colors * sizeof(palette)); + colors = HeapAlloc(GetProcessHeap(), 0, nb_colors * sizeof(colors[0])); + palette = HeapAlloc(GetProcessHeap(), 0, nb_colors * sizeof(palette[0])); if (!colors || !palette) hr = E_OUTOFMEMORY; }

1 0

Alexandre Julliard : Wine release 1.5.31
by Alexandre Julliard 24 May '13

24 May '13

Module: website Branch: master Commit: eed280315b39968cdd815086808eeb766dd65e2e URL: http://source.winehq.org/git/website.git/?a=commit;h=eed280315b39968cdd8150… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 20:32:20 2013 +0200 Wine release 1.5.31 --- news/en/2013052401.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2013052401.xml b/news/en/2013052401.xml new file mode 100644 index 0000000..cdefb34 --- /dev/null +++ b/news/en/2013052401.xml @@ -0,0 +1,15 @@ +<news> +<date>May 24, 2013</date> +<title>Wine 1.5.31 Released</title> +<body> + The Wine development release 1.5.31 is now available. + <a href="{$root}/announce/1.5.31">What's new</a> in this release: +<ul> + <li>New version of the Gecko engine based on Firefox 21.</li> + <li>Joystick force feedback support on Mac OS X.</li> + <li>Window management fixes in the Mac driver.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.31.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.31 : Alexandre Julliard : Release 1.5.31
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: refs/tags/wine-1.5.31 Tag: d0e39592136ddc895f9fbbd3ecb0089f39ffe90c URL: http://source.winehq.org/git/wine.git/?a=tag;h=d0e39592136ddc895f9fbbd3ecb0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 20:20:06 2013 +0200 Release 1.5.31

1 0

Alexandre Julliard : Release 1.5.31.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: 120cee4f857acbac4ecfe2bd435d4fa9a72af6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=120cee4f857acbac4ecfe2bd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 20:20:05 2013 +0200 Release 1.5.31. --- ANNOUNCE | 632 +++++++++++++++++++++++++++++++++---------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 354 insertions(+), 298 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=120cee4f857acbac4ecfe…

1 0

Alistair Leslie-Hughes : oledb32: Implemented DataConvert DBTYPE_BSTR-> DBTYPE_DBTIMESTAMP.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: d103894ebca53c772dc3e29fa1fedb733db54b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d103894ebca53c772dc3e29fa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 23 12:13:17 2013 +1000 oledb32: Implemented DataConvert DBTYPE_BSTR->DBTYPE_DBTIMESTAMP. --- dlls/oledb32/convert.c | 30 ++++++++++++++++++++++++++++-- dlls/oledb32/tests/convert.c | 11 +++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 9d41860..0961464 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -480,8 +480,34 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, DBTIMESTAMP *d=dst; switch (src_type) { - case DBTYPE_EMPTY: memset(d, 0, sizeof(DBTIMESTAMP)); hr = S_OK; break; - case DBTYPE_DBTIMESTAMP: memcpy(d, src, sizeof(DBTIMESTAMP)); hr = S_OK; break; + case DBTYPE_EMPTY: memset(d, 0, sizeof(DBTIMESTAMP)); hr = S_OK; break; + case DBTYPE_DBTIMESTAMP: memcpy(d, src, sizeof(DBTIMESTAMP)); hr = S_OK; break; + case DBTYPE_BSTR: + { + VARIANT var; + BSTR s = *(WCHAR**)src; + + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(s); + + if ((hr = VariantChangeType(&var, &var, 0, VT_DATE)) == S_OK) + { + SYSTEMTIME st; + + hr = (VariantTimeToSystemTime( V_DATE(&var), &st) ? S_OK : E_FAIL); + d->year = st.wYear; + d->month = st.wMonth; + d->day = st.wDay; + d->hour = st.wHour; + d->minute = st.wMinute; + d->second = st.wSecond; + d->fraction = st.wMilliseconds * 1000000; + } + + VariantClear(&var); + } + break; case DBTYPE_DATE: { SYSTEMTIME st; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index ee2a39b..fd69fed 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2666,12 +2666,14 @@ static void test_converttovar(void) static void test_converttotimestamp(void) { + static const WCHAR strW[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2',0}; DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; DBTIMESTAMP dst; DBSTATUS dst_status; DBLENGTH dst_len; VARIANT var; HRESULT hr; + BSTR bstr; VariantInit(&var); V_VT(&var) = VT_DATE; @@ -2682,6 +2684,15 @@ static void test_converttotimestamp(void) ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); + + bstr = SysAllocString(strW); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); + SysFreeString(bstr); } START_TEST(convert)

1 0

Jacek Caban : ieframe: Get rid of no longer needed IEDocHost.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: 0bf9266bc74a2614eb610e4a2d12992705ca475c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bf9266bc74a2614eb610e4a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 24 10:39:31 2013 +0200 ieframe: Get rid of no longer needed IEDocHost. --- dlls/ieframe/ie.c | 31 ++++++++------------- dlls/ieframe/ieframe.h | 10 +------ dlls/ieframe/iexplore.c | 69 +++++++++++++++-------------------------------- 3 files changed, 35 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0bf9266bc74a2614eb610…

1 0

Jacek Caban : ieframe: Keep track of InternetExplore external references and use that to release document .
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: b51af0b1c9e56e7bea16a7a53831401f8f75de8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b51af0b1c9e56e7bea16a7a53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 24 10:39:20 2013 +0200 ieframe: Keep track of InternetExplore external references and use that to release document. --- dlls/ieframe/ie.c | 43 +++++++++++++++++++++++++++++++++++++++---- dlls/ieframe/ieframe.h | 2 ++ dlls/ieframe/iexplore.c | 7 +++++-- 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index 42602f9..8ee2819 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -713,6 +713,31 @@ static inline InternetExplorer *impl_from_IExternalConnection(IExternalConnectio return CONTAINING_RECORD(iface, InternetExplorer, IExternalConnection_iface); } +/* + * Document may keep references to InternetExplorer object causing circular references. + * We keep track of external references and release the document object when all + * external references are released. A visible main window is also considered as + * an external reference. + */ +DWORD release_extern_ref(InternetExplorer *This, BOOL last_closes) +{ + LONG ref = InterlockedDecrement(&This->extern_ref); + + TRACE("ref = %d\n", ref); + + if(ref) + return ref; + + if(!last_closes) { + WARN("Last external connection released with FALSE last_closes.\n"); + return ref; + } + + if(This->doc_host) + deactivate_document(&This->doc_host->doc_host); + return ref; +} + static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *iface, REFIID riid, void **ppv) { InternetExplorer *This = impl_from_IExternalConnection(iface); @@ -734,16 +759,26 @@ static ULONG WINAPI ExternalConnection_Release(IExternalConnection *iface) static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved) { InternetExplorer *This = impl_from_IExternalConnection(iface); - FIXME("(%p)\n", This); - return 2; + + TRACE("(%p)->(%x %x)\n", This, extconn, reserved); + + if(extconn != EXTCONN_STRONG) + return 0; + + return InterlockedIncrement(&This->extern_ref); } static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved, BOOL fLastReleaseCloses) { InternetExplorer *This = impl_from_IExternalConnection(iface); - FIXME("(%p)\n", This); - return 1; + + TRACE("(%p)->(%x %x %x)\n", This, extconn, reserved, fLastReleaseCloses); + + if(extconn != EXTCONN_STRONG) + return 0; + + return release_extern_ref(This, fLastReleaseCloses); } static const IExternalConnectionVtbl ExternalConnectionVtbl = { diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 709789c..b879eec 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -229,6 +229,7 @@ struct InternetExplorer { HlinkFrame hlink_frame; LONG ref; + LONG extern_ref; HWND frame_hwnd; HWND status_hwnd; @@ -288,6 +289,7 @@ LRESULT process_dochost_tasks(DocHost*) DECLSPEC_HIDDEN; void InternetExplorer_WebBrowser_Init(InternetExplorer*) DECLSPEC_HIDDEN; HRESULT update_ie_statustext(InternetExplorer*, LPCWSTR) DECLSPEC_HIDDEN; void released_obj(void) DECLSPEC_HIDDEN; +DWORD release_extern_ref(InternetExplorer*,BOOL) DECLSPEC_HIDDEN; void register_iewindow_class(void) DECLSPEC_HIDDEN; void unregister_iewindow_class(void) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index c3d519a..3d822ff 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -669,10 +669,13 @@ static LRESULT WINAPI ie_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM return 0; case WM_SHOWWINDOW: TRACE("WM_SHOWWINDOW %lx\n", wparam); - if(wparam) + if(wparam) { IWebBrowser2_AddRef(&This->IWebBrowser2_iface); - else + InterlockedIncrement(&This->extern_ref); + }else { + release_extern_ref(This, TRUE); IWebBrowser2_Release(&This->IWebBrowser2_iface); + } break; case WM_DESTROY: return iewnd_OnDestroy(This);

1 0

Dmitry Timoshkov : kernel32: Add a test to show that a process with a not closed handle to an already terminated thread fails to terminate cleanly .
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: d256bf4b5fa12cb964ac8b3b6f75af012a169df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d256bf4b5fa12cb964ac8b3b6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 24 16:57:16 2013 +0900 kernel32: Add a test to show that a process with a not closed handle to an already terminated thread fails to terminate cleanly. --- dlls/kernel32/tests/process.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 2bdc42e..350c858 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1926,6 +1926,44 @@ static void test_RegistryQuota(void) "Expected GetSystemRegistryQuota to return TRUE, got %d\n", ret); } +static void test_TerminateProcess(void) +{ + static char cmdline[] = "winver.exe"; + PROCESS_INFORMATION pi; + STARTUPINFO si; + DWORD ret; + HANDLE dummy, thread; + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + SetLastError(0xdeadbeef); + ret = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + thread = CreateRemoteThread(pi.hProcess, NULL, 0, (void *)0xdeadbeef, NULL, CREATE_SUSPENDED, &ret); + ok(thread != 0, "CreateRemoteThread error %d\n", GetLastError()); + + /* create a not closed thread handle duplicate in the target process */ + SetLastError(0xdeadbeef); + ret = DuplicateHandle(GetCurrentProcess(), thread, pi.hProcess, &dummy, + 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(ret, "DuplicateHandle error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = TerminateThread(thread, 0); + ok(ret, "TerminateThread error %u\n", GetLastError()); + CloseHandle(thread); + + SetLastError(0xdeadbeef); + ret = TerminateProcess(pi.hProcess, 0); +todo_wine + ok(ret, "TerminateProcess error %u\n", GetLastError()); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); +} + START_TEST(process) { int b = init(); @@ -1937,6 +1975,7 @@ START_TEST(process) doChild(myARGV[2], (myARGC == 3) ? NULL : myARGV[3]); return; } + test_TerminateProcess(); test_Startup(); test_CommandLine(); test_Directory();

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2013