May 2013 - Wine-Commits - list.winehq.org

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

May 27, 2013

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

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

May 27, 2013

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

Alistair Leslie-Hughes : oledb32: Implement GetConversionSize DBTYPE_VARIANT -> DBTYPE_BYTES.
by Alexandre Julliard May 27, 2013

May 27, 2013

Module: wine Branch: master Commit: 0fe64ce339e2b47ff2c7369a6463b61cbffbe713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe64ce339e2b47ff2c7369a6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 21 20:39:09 2013 +1000 oledb32: Implement GetConversionSize DBTYPE_VARIANT -> DBTYPE_BYTES. --- dlls/oledb32/convert.c | 23 ++++++++++++++++++++++- dlls/oledb32/tests/convert.c | 15 +++++++++++++++ 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 490685b..9550e52 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -121,7 +121,7 @@ static int get_length(DBTYPE type) case DBTYPE_UI2: return 2; case DBTYPE_BOOL: - return sizeof(VARIANT_BOOL); + return sizeof(VARIANT_BOOL); case DBTYPE_I4: case DBTYPE_UI4: case DBTYPE_R4: @@ -143,6 +143,7 @@ static int get_length(DBTYPE type) return sizeof(FILETIME); case DBTYPE_GUID: return sizeof(GUID); + case DBTYPE_BYTES: case DBTYPE_WSTR: case DBTYPE_STR: case DBTYPE_BYREF | DBTYPE_WSTR: @@ -1363,6 +1364,26 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, } } break; + case DBTYPE_BYTES: + { + switch (src_type) + { + case DBTYPE_VARIANT: + { + if(V_VT((VARIANT*)src) == VT_BSTR) + *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))) / sizeof(WCHAR); + else + WARN("DBTYPE_BYTES->DBTYPE_VARIANT(%d) unimplemented\n", V_VT((VARIANT*)src)); + + return S_OK; + } + break; + default: + FIXME("unimplemented for %04x -> DBTYPE_BYTES\n", src_type); + return E_NOTIMPL; + } + } + break; default: FIXME("unimplemented for conversion %d->%d\n", src_type, dst_type); return E_NOTIMPL; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 089b28c..a3884dc 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2464,6 +2464,21 @@ static void test_getconversionsize(void) todo_wine ok(dst_len == 110, "%ld\n", dst_len); VariantClear(&var); + dst_len = 0; + src_len = 20; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(strW); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &src_len, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 2, "%ld\n", dst_len); + VariantClear(&var); + + dst_len = 0; + src_len = 20; + V_VT(&var) = VT_NULL; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &src_len, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&var); } static void test_converttobytes(void)

1 0

Alexandre Julliard : Wine release 1.5.31
by Alexandre Julliard May 24, 2013

May 24, 2013

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

Alexandre Julliard : Release 1.5.31.
by Alexandre Julliard May 24, 2013

May 24, 2013

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

Tag wine-1.5.31 : Alexandre Julliard : Release 1.5.31
by Alexandre Julliard May 24, 2013

May 24, 2013

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

André Hentschel : clusapi: Add stub for GetClusterInformation.
by Alexandre Julliard May 24, 2013

May 24, 2013

Module: wine Branch: master Commit: c6acd7a41c818dee0ae5fdd45590ec48fd53c395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6acd7a41c818dee0ae5fdd45… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 24 01:01:03 2013 +0200 clusapi: Add stub for GetClusterInformation. --- dlls/clusapi/clusapi.c | 14 ++++++++++++++ dlls/clusapi/clusapi.spec | 2 +- include/clusapi.h | 17 +++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/clusapi/clusapi.c b/dlls/clusapi/clusapi.c index f782d43..88c6fbf 100644 --- a/dlls/clusapi/clusapi.c +++ b/dlls/clusapi/clusapi.c @@ -28,6 +28,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(clusapi); /*********************************************************************** + * GetClusterInformation (CLUSAPI.@) + * + */ +DWORD WINAPI GetClusterInformation(HCLUSTER hCluster, LPWSTR lpszClusterName, + LPDWORD lpcchClusterName, LPCLUSTERVERSIONINFO lpClusterInfo) +{ + FIXME("(%p, %p, %p, %p) stub!\n", hCluster, lpszClusterName, lpcchClusterName, lpClusterInfo); + + *lpcchClusterName = 0; + + return ERROR_SUCCESS; +} + +/*********************************************************************** * GetNodeClusterState (CLUSAPI.@) * * PARAMS diff --git a/dlls/clusapi/clusapi.spec b/dlls/clusapi/clusapi.spec index 9c6abe2..01d3329 100644 --- a/dlls/clusapi/clusapi.spec +++ b/dlls/clusapi/clusapi.spec @@ -70,7 +70,7 @@ @ stub GetClusterFromResource @ stub GetClusterGroupKey @ stub GetClusterGroupState -@ stub GetClusterInformation +@ stdcall GetClusterInformation(ptr ptr ptr ptr) @ stub GetClusterKey @ stub GetClusterNetInterface @ stub GetClusterNetInterfaceKey diff --git a/include/clusapi.h b/include/clusapi.h index 7e04964..4ab07cc 100644 --- a/include/clusapi.h +++ b/include/clusapi.h @@ -26,7 +26,24 @@ extern "C" { typedef struct _HCLUSTER *HCLUSTER; typedef struct _HCLUSENUM *HCLUSENUM; + +typedef struct _CLUSTERVERSIONINFO +{ + DWORD dwVersionInfoSize; + WORD MajorVersion; + WORD MinorVersion; + WORD BuildNumber; + WCHAR szVendorId[64]; + WCHAR szCSDVersion[64]; + DWORD dwClusterHighestVersion; + DWORD dwClusterLowestVersion; + DWORD dwFlags; + DWORD dwReserved; +} CLUSTERVERSIONINFO, *LPCLUSTERVERSIONINFO; + BOOL WINAPI CloseCluster(HCLUSTER hCluster); +DWORD WINAPI GetClusterInformation(HCLUSTER hCluster, LPWSTR lpszClusterName, + LPDWORD lpcchClusterName, LPCLUSTERVERSIONINFO lpClusterInfo); DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, LPDWORD pdwClusterState); HCLUSTER WINAPI OpenCluster(LPCWSTR lpszClusterName); HCLUSENUM WINAPI ClusterOpenEnum(HCLUSTER hCluster, DWORD dwType);

1 0

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

May 24, 2013

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

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

May 24, 2013

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

Andrew Eikum : dinput: Support DIPROP_FFGAIN for OSX joysticks.
by Alexandre Julliard May 24, 2013

May 24, 2013

Module: wine Branch: master Commit: 51f97bb3f9213c0934e1dcb8c25ddc9d1e8c41e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f97bb3f9213c0934e1dcb8c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 23 14:58:27 2013 -0500 dinput: Support DIPROP_FFGAIN for OSX joysticks. --- dlls/dinput/joystick_osx.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 555cbf4..66b020e 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1131,6 +1131,18 @@ static HRESULT osx_set_autocenter(JoystickImpl *This, return hr; } +static HRESULT osx_set_ffgain(JoystickImpl *This, const DIPROPDWORD *header) +{ + UInt32 v; + HRESULT hr; + if(!This->ff) + return DIERR_UNSUPPORTED; + v = header->dwData; + hr = osx_to_win32_hresult(FFDeviceSetForceFeedbackProperty(This->ff, FFPROP_FFGAIN, &v)); + TRACE("returning: %08x\n", hr); + return hr; +} + static HRESULT WINAPI JoystickWImpl_SetProperty(IDirectInputDevice8W *iface, const GUID *prop, const DIPROPHEADER *header) { @@ -1142,6 +1154,8 @@ static HRESULT WINAPI JoystickWImpl_SetProperty(IDirectInputDevice8W *iface, { case (DWORD_PTR)DIPROP_AUTOCENTER: return osx_set_autocenter(This, (const DIPROPDWORD *)header); + case (DWORD_PTR)DIPROP_FFGAIN: + return osx_set_ffgain(This, (const DIPROPDWORD *)header); } return JoystickWGenericImpl_SetProperty(iface, prop, header); @@ -1158,6 +1172,8 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(IDirectInputDevice8A *iface, { case (DWORD_PTR)DIPROP_AUTOCENTER: return osx_set_autocenter(This, (const DIPROPDWORD *)header); + case (DWORD_PTR)DIPROP_FFGAIN: + return osx_set_ffgain(This, (const DIPROPDWORD *)header); } return JoystickAGenericImpl_SetProperty(iface, prop, header);

1 0