February 2015 - Wine-commits

Hans Leidekker : winhttp: Implement IWinHttpRequest::get_ResponseStream.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 5505413a81c67547f72236674619c8ee9025a89c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5505413a81c67547f72236674… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 16 14:41:47 2015 +0100 winhttp: Implement IWinHttpRequest::get_ResponseStream. --- dlls/winhttp/request.c | 195 ++++++++++++++++++++++++++++++++++++++++++- dlls/winhttp/tests/winhttp.c | 63 ++++++++++++-- 2 files changed, 248 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 135a291..a12d73a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3695,12 +3695,203 @@ done: return HRESULT_FROM_WIN32( err ); } +struct stream +{ + IStream IStream_iface; + LONG refs; + char *data; + ULARGE_INTEGER pos, size; +}; + +static inline struct stream *impl_from_IStream( IStream *iface ) +{ + return CONTAINING_RECORD( iface, struct stream, IStream_iface ); +} + +static HRESULT WINAPI stream_QueryInterface( IStream *iface, REFIID riid, void **obj ) +{ + struct stream *stream = impl_from_IStream( iface ); + + TRACE("%p, %s, %p\n", stream, debugstr_guid(riid), obj); + + if (IsEqualGUID( riid, &IID_IStream ) || IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IStream_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI stream_AddRef( IStream *iface ) +{ + struct stream *stream = impl_from_IStream( iface ); + return InterlockedIncrement( &stream->refs ); +} + +static ULONG WINAPI stream_Release( IStream *iface ) +{ + struct stream *stream = impl_from_IStream( iface ); + LONG refs = InterlockedDecrement( &stream->refs ); + if (!refs) + { + heap_free( stream->data ); + heap_free( stream ); + } + return refs; +} + +static HRESULT WINAPI stream_Read( IStream *iface, void *buf, ULONG len, ULONG *read ) +{ + struct stream *stream = impl_from_IStream( iface ); + ULONG size; + + if (stream->pos.QuadPart >= stream->size.QuadPart) + { + *read = 0; + return S_FALSE; + } + + size = min( stream->size.QuadPart - stream->pos.QuadPart, len ); + memcpy( buf, stream->data + stream->pos.QuadPart, size ); + stream->pos.QuadPart += size; + *read = size; + + return S_OK; +} + +static HRESULT WINAPI stream_Write( IStream *iface, const void *buf, ULONG len, ULONG *written ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Seek( IStream *iface, LARGE_INTEGER move, DWORD origin, ULARGE_INTEGER *newpos ) +{ + struct stream *stream = impl_from_IStream( iface ); + + if (origin == STREAM_SEEK_SET) + stream->pos.QuadPart = move.QuadPart; + else if (origin == STREAM_SEEK_CUR) + stream->pos.QuadPart += move.QuadPart; + else if (origin == STREAM_SEEK_END) + stream->pos.QuadPart = stream->size.QuadPart - move.QuadPart; + + if (newpos) newpos->QuadPart = stream->pos.QuadPart; + return S_OK; +} + +static HRESULT WINAPI stream_SetSize( IStream *iface, ULARGE_INTEGER newsize ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_CopyTo( IStream *iface, IStream *stream, ULARGE_INTEGER len, ULARGE_INTEGER *read, + ULARGE_INTEGER *written ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Commit( IStream *iface, DWORD flags ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Revert( IStream *iface ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_LockRegion( IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER len, DWORD locktype ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_UnlockRegion( IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER len, DWORD locktype ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Stat( IStream *iface, STATSTG *stg, DWORD flag ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Clone( IStream *iface, IStream **stream ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const IStreamVtbl stream_vtbl = +{ + stream_QueryInterface, + stream_AddRef, + stream_Release, + stream_Read, + stream_Write, + stream_Seek, + stream_SetSize, + stream_CopyTo, + stream_Commit, + stream_Revert, + stream_LockRegion, + stream_UnlockRegion, + stream_Stat, + stream_Clone +}; + static HRESULT WINAPI winhttp_request_get_ResponseStream( IWinHttpRequest *iface, VARIANT *body ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + DWORD err = ERROR_SUCCESS; + struct stream *stream; + + TRACE("%p, %p\n", request, body); + + if (!body) return E_INVALIDARG; + + EnterCriticalSection( &request->cs ); + if (request->state < REQUEST_STATE_SENT) + { + err = ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND; + goto done; + } + if (!(stream = heap_alloc( sizeof(*stream) ))) + { + err = ERROR_OUTOFMEMORY; + goto done; + } + stream->IStream_iface.lpVtbl = &stream_vtbl; + stream->refs = 1; + if (!(stream->data = heap_alloc( request->offset ))) + { + heap_free( stream ); + err = ERROR_OUTOFMEMORY; + goto done; + } + memcpy( stream->data, request->buffer, request->offset ); + stream->pos.QuadPart = 0; + stream->size.QuadPart = request->offset; + V_VT( body ) = VT_UNKNOWN; + V_UNKNOWN( body ) = (IUnknown *)&stream->IStream_iface; + +done: + LeaveCriticalSection( &request->cs ); + return HRESULT_FROM_WIN32( err ); } static HRESULT WINAPI winhttp_request_get_Option( diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2cad807..1423cef 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2624,11 +2624,15 @@ static void test_IWinHttpRequest(void) IWinHttpRequest *req; BSTR method, url, username, password, response = NULL, status_text = NULL, headers = NULL; BSTR date, today, connection, value = NULL; - VARIANT async, empty, timeout, body, proxy_server, bypass_list, data; + VARIANT async, empty, timeout, body, body2, proxy_server, bypass_list, data; VARIANT_BOOL succeeded; LONG status; WCHAR todayW[WINHTTP_TIME_FORMAT_BUFSIZE]; SYSTEMTIME st; + IStream *stream, *stream2; + LARGE_INTEGER pos; + char buf[128]; + DWORD count; GetSystemTime( &st ); WinHttpTimeFromSystemTime( &st, todayW ); @@ -2680,8 +2684,7 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_Abort( req ); ok( hr == S_OK, "got %08x\n", hr ); - hr = IWinHttpRequest_Release( req ); - ok( hr == S_OK, "got %08x\n", hr ); + IWinHttpRequest_Release( req ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2714,8 +2717,7 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_Abort( req ); ok( hr == S_OK, "got %08x\n", hr ); - hr = IWinHttpRequest_Release( req ); - ok( hr == S_OK, "got %08x\n", hr ); + IWinHttpRequest_Release( req ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2974,6 +2976,41 @@ static void test_IWinHttpRequest(void) hr = VariantClear( &body ); ok( hr == S_OK, "got %08x\n", hr ); + VariantInit( &body ); + V_VT( &body ) = VT_ERROR; + hr = IWinHttpRequest_get_ResponseStream( req, &body ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &body ) == VT_UNKNOWN, "got %08x\n", V_VT( &body ) ); + + hr = IUnknown_QueryInterface( V_UNKNOWN( &body ), &IID_IStream, (void **)&stream ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_UNKNOWN( &body ) == (IUnknown *)stream, "got different interface pointer\n" ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = IStream_Read( stream, buf, 128, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count != 0xdeadbeef, "count not set\n" ); + ok( buf[0], "no data\n" ); + + VariantInit( &body2 ); + V_VT( &body2 ) = VT_ERROR; + hr = IWinHttpRequest_get_ResponseStream( req, &body2 ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &body2 ) == VT_UNKNOWN, "got %08x\n", V_VT( &body2 ) ); + ok( V_UNKNOWN( &body ) != V_UNKNOWN( &body2 ), "got same interface pointer\n" ); + + hr = IUnknown_QueryInterface( V_UNKNOWN( &body2 ), &IID_IStream, (void **)&stream2 ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_UNKNOWN( &body2 ) == (IUnknown *)stream2, "got different interface pointer\n" ); + IStream_Release( stream2 ); + + hr = VariantClear( &body ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = VariantClear( &body2 ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3003,8 +3040,19 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_Abort( req ); ok( hr == S_OK, "got %08x\n", hr ); - hr = IWinHttpRequest_Release( req ); + IWinHttpRequest_Release( req ); + + pos.QuadPart = 0; + IStream_Seek( stream, pos, STREAM_SEEK_SET, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = IStream_Read( stream, buf, 128, &count ); ok( hr == S_OK, "got %08x\n", hr ); + ok( count != 0xdeadbeef, "count not set\n" ); + ok( buf[0], "no data\n" ); + IStream_Release( stream ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3020,8 +3068,7 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_WaitForResponse( req, timeout, &succeeded ); ok( hr == S_OK, "got %08x\n", hr ); - hr = IWinHttpRequest_Release( req ); - ok( hr == S_OK, "got %08x\n", hr ); + IWinHttpRequest_Release( req ); SysFreeString( method ); SysFreeString( url );

1 0

Hans Leidekker : netapi32: Add a partial implementation of NetUserEnum.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 56ff1cc76a6e79dd67526532094eb7832b391811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56ff1cc76a6e79dd675265320… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 16 14:42:29 2015 +0100 netapi32: Add a partial implementation of NetUserEnum. --- dlls/netapi32/netapi32.c | 63 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 5 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index d2a61fa..3823fa9 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -2287,13 +2287,66 @@ NetUserGetLocalGroups(LPCWSTR servername, LPCWSTR username, DWORD level, */ NET_API_STATUS WINAPI NetUserEnum(LPCWSTR servername, DWORD level, DWORD filter, LPBYTE* bufptr, - DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, - LPDWORD resume_handle) + DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, + LPDWORD resume_handle) { - FIXME("(%s,%d, 0x%d,%p,%d,%p,%p,%p) stub!\n", debugstr_w(servername), level, - filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); + NET_API_STATUS status; + USER_INFO_0 *info; + WCHAR *user; + DWORD size; + + TRACE("(%s, %u, 0x%x, %p, %u, %p, %p, %p)\n", debugstr_w(servername), level, + filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); + + status = NETAPI_ValidateServername(servername); + if (status != NERR_Success) + return status; - return ERROR_ACCESS_DENIED; + if (!NETAPI_IsLocalComputer(servername)) + { + FIXME("Only implemented for local computer, but remote server" + "%s was requested.\n", debugstr_w(servername)); + return NERR_InvalidComputer; + } + + if (level) + { + FIXME("level %u not supported\n", level); + return ERROR_INVALID_LEVEL; + } + + size = UNLEN + 1; + status = NetApiBufferAllocate(size * sizeof(WCHAR), (void **)&user); + if (status != NERR_Success) + return status; + + if (!GetUserNameW(user, &size)) + { + NetApiBufferFree(user); + return ERROR_NOT_ENOUGH_MEMORY; + } + + size = sizeof(*info) + (strlenW(user) + 1) * sizeof(WCHAR); + + if (prefmaxlen < size) + status = ERROR_MORE_DATA; + else + status = NetApiBufferAllocate(size, (void **)&info); + + if (status != NERR_Success) + { + NetApiBufferFree(user); + return status; + } + + info->usri0_name = (WCHAR *)((char *)info + sizeof(*info)); + strcpyW(info->usri0_name, user); + + *bufptr = (BYTE *)info; + *entriesread = *totalentries = 1; + + NetApiBufferFree(user); + return NERR_Success; } /************************************************************

1 0

Hans Leidekker : wbemprox: Fix the type mapping for Win32_SoundDevice.StatusInfo.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 797bd65f624de0f8575bfe1efda0d8a6be738e8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=797bd65f624de0f8575bfe1ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 16 14:43:02 2015 +0100 wbemprox: Fix the type mapping for Win32_SoundDevice.StatusInfo. --- dlls/wbemprox/builtin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 79ce561..16c58a8 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -543,7 +543,7 @@ static const struct column col_sounddevice[] = { { prop_nameW, CIM_STRING }, { prop_productnameW, CIM_STRING }, - { prop_statusinfoW, CIM_UINT16 } + { prop_statusinfoW, CIM_UINT16, VT_I4 } }; static const struct column col_stdregprov[] = {

1 0

Jacek Caban : mshtml: Added execCommand("fontsize") support.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 32f177ae309ce6026ebb8214c5f386b67ee7dd1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f177ae309ce6026ebb8214c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 13 17:54:15 2015 +0100 mshtml: Added execCommand("fontsize") support. --- dlls/mshtml/htmldoc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 79dc5c1..a9ef3d9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1141,6 +1141,8 @@ static const WCHAR cutW[] = {'c','u','t',0}; static const WCHAR fontnameW[] = {'f','o','n','t','n','a','m','e',0}; +static const WCHAR fontsizeW[] = + {'f','o','n','t','s','i','z','e',0}; static const WCHAR indentW[] = {'i','n','d','e','n','t',0}; static const WCHAR insertorderedlistW[] = @@ -1161,6 +1163,7 @@ static const struct { {copyW, IDM_COPY}, {cutW, IDM_CUT}, {fontnameW, IDM_FONTNAME}, + {fontsizeW, IDM_FONTSIZE}, {indentW, IDM_INDENT}, {insertorderedlistW, IDM_ORDERLIST}, {insertunorderedlistW, IDM_UNORDERLIST},

1 0

Ken Thomases : gdi32: Change an ERR to a WARN for fonts with too-long names.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: e9c36154e35c66673199fb6aebd447a53a16ebe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9c36154e35c66673199fb6ae… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sat Feb 14 07:29:14 2015 -0600 gdi32: Change an ERR to a WARN for fonts with too-long names. The situation is commonplace on Macs and benign. --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5122fb5..fc19f51 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2026,7 +2026,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (strlenW(family->FamilyName) >= LF_FACESIZE) { - ERR("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); + WARN("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); release_face( face ); release_family( family ); return;

1 0

Nikolay Sivov : wshom.ocx: Properly handle optional argument in Run().
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: f0e2ea988e666533dd9f5ba1a6e68b2853dd0038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e2ea988e666533dd9f5ba1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 15 14:30:00 2015 +0300 wshom.ocx: Properly handle optional argument in Run(). --- dlls/wshom.ocx/shell.c | 43 +++++++++++++++++++++++------------------- dlls/wshom.ocx/tests/wshom.c | 32 ++++++++++++++++++++++++++++++- dlls/wshom.ocx/tests/wshom.idl | 2 +- dlls/wshom.ocx/wshom.idl | 2 +- 4 files changed, 57 insertions(+), 22 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 09c7504..14eab75 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -912,14 +912,22 @@ static HRESULT WINAPI WshShell3_get_Environment(IWshShell3 *iface, VARIANT *type return WshEnvironment_Create(env); } -static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *WaitOnReturn, int *exit_code) +static inline BOOL is_optional_argument(const VARIANT *arg) +{ + return V_VT(arg) == VT_ERROR && V_ERROR(arg) == DISP_E_PARAMNOTFOUND; +} + +static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *wait, DWORD *exit_code) { SHELLEXECUTEINFOW info; int waitforprocess; - VARIANT s, w; + VARIANT s; HRESULT hr; - TRACE("(%s %s %s %p)\n", debugstr_w(cmd), debugstr_variant(style), debugstr_variant(WaitOnReturn), exit_code); + TRACE("(%s %s %s %p)\n", debugstr_w(cmd), debugstr_variant(style), debugstr_variant(wait), exit_code); + + if (!style || !wait || !exit_code) + return E_POINTER; VariantInit(&s); hr = VariantChangeType(&s, style, 0, VT_I4); @@ -929,19 +937,21 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, return hr; } - VariantInit(&w); - hr = VariantChangeType(&w, WaitOnReturn, 0, VT_I4); - if (FAILED(hr)) - { - ERR("failed to convert wait argument, 0x%08x\n", hr); - return hr; + if (is_optional_argument(wait)) + waitforprocess = 0; + else { + VARIANT w; + + VariantInit(&w); + hr = VariantChangeType(&w, wait, 0, VT_I4); + if (FAILED(hr)) + return hr; + + waitforprocess = V_I4(&w); } memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); - - waitforprocess = V_I4(&w); - info.fMask = waitforprocess ? SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS : SEE_MASK_DEFAULT; info.lpFile = cmd; info.nShow = V_I4(&s); @@ -955,16 +965,11 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, { if (waitforprocess) { - if (exit_code) - { - DWORD code; - GetExitCodeProcess(info.hProcess, &code); - *exit_code = code; - } + GetExitCodeProcess(info.hProcess, exit_code); CloseHandle(info.hProcess); } else - if (exit_code) *exit_code = 0; + *exit_code = 0; return S_OK; } diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 4c3581e..b2e9859 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -33,6 +33,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static void test_wshshell(void) { + static const WCHAR notepadW[] = {'n','o','t','e','p','a','d','.','e','x','e',0}; static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; static const WCHAR lnk1W[] = {'f','i','l','e','.','l','n','k',0}; static const WCHAR pathW[] = {'%','P','A','T','H','%',0}; @@ -51,8 +52,9 @@ static void test_wshshell(void) TYPEATTR *tattr; DISPPARAMS dp; EXCEPINFO ei; - VARIANT arg, res; + VARIANT arg, res, arg2; BSTR str, ret; + DWORD retval; UINT err; hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -171,6 +173,34 @@ static void test_wshshell(void) IWshEnvironment_Release(env); + V_VT(&arg) = VT_I2; + V_I2(&arg) = 0; + V_VT(&arg2) = VT_ERROR; + V_ERROR(&arg2) = DISP_E_PARAMNOTFOUND; + + str = SysAllocString(notepadW); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + retval = 10; + hr = IWshShell3_Run(sh3, str, NULL, &arg2, &retval); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(retval == 10, "got %u\n", retval); + + retval = 10; + hr = IWshShell3_Run(sh3, str, &arg, NULL, &retval); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(retval == 10, "got %u\n", retval); + + retval = 10; + V_VT(&arg2) = VT_ERROR; + V_ERROR(&arg2) = 0; + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr); + ok(retval == 10, "got %u\n", retval); + + SysFreeString(str); + IWshCollection_Release(coll); IDispatch_Release(disp); IWshShell3_Release(sh3); diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index 6255dc6..6647b2b 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -526,7 +526,7 @@ library IWshRuntimeLibrary [in] BSTR Command, [in, optional] VARIANT* WindowStyle, [in, optional] VARIANT* WaitOnReturn, - [out, retval] int* out_ExitCode); + [out, retval] DWORD* out_ExitCode); [id(0x03e9)] HRESULT Popup( diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index 02224a3..aade499 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -528,7 +528,7 @@ library IWshRuntimeLibrary [in] BSTR Command, [in, optional] VARIANT* WindowStyle, [in, optional] VARIANT* WaitOnReturn, - [out, retval] int* out_ExitCode); + [out, retval] DWORD* out_ExitCode); [id(0x03e9)] HRESULT Popup(

1 0

Gerald Pfeifer : vbscript: Avoid use of uninitialized variable in Global_InStrRev().
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 69a61383503c2c1ff55cefddae83c5f00b421c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69a61383503c2c1ff55cefdda… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Feb 16 02:11:40 2015 +0100 vbscript: Avoid use of uninitialized variable in Global_InStrRev(). --- dlls/vbscript/global.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9bcd2b2..77fc1d6 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1810,6 +1810,8 @@ static HRESULT Global_InStrRev(vbdisp_t *This, VARIANT *args, unsigned args_cnt, }else { start = SysStringLen(str1); } + } else { + str2 = NULL; } if(SUCCEEDED(hres)) {

1 0

Marcus Meissner : msi: Fix memory leak (Coverity).
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: c4bf8a85eea28f198e1ec8cc03fd6b7d0a2a12e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4bf8a85eea28f198e1ec8cc0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Feb 16 08:31:14 2015 +0100 msi: Fix memory leak (Coverity). --- dlls/msi/action.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index afded69..ed09be7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6968,6 +6968,7 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) data = msi_alloc(size); if (!data) { + msi_free(deformatted); RegCloseKey(env); return ERROR_OUTOFMEMORY; }

1 0

Marcus Meissner : winex11.drv: Free uriList (Coverity).
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: ab854893aa68cb4878b36f86378f7a769c752b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab854893aa68cb4878b36f863… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Feb 16 08:34:08 2015 +0100 winex11.drv: Free uriList (Coverity). --- dlls/winex11.drv/clipboard.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index b2705b4..dad4a7a 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1590,8 +1590,10 @@ static HANDLE X11DRV_CLIPBOARD_ImportTextUriList(Display *display, Window w, Ato return 0; out = HeapAlloc(GetProcessHeap(), 0, capacity * sizeof(WCHAR)); - if (out == NULL) + if (out == NULL) { + HeapFree(GetProcessHeap(), 0, uriList); return 0; + } while (end < len) { @@ -1650,6 +1652,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportTextUriList(Display *display, Window w, Ato } } HeapFree(GetProcessHeap(), 0, out); + HeapFree(GetProcessHeap(), 0, uriList); return handle; }

1 0

Nikolay Sivov : vbscript: Fix potential crash if script site creation failed.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: dba0fe3614b2bf8002551a7636cc90c7315e2c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dba0fe3614b2bf8002551a763… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 16 11:30:11 2015 +0300 vbscript: Fix potential crash if script site creation failed. --- dlls/vbscript/global.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 77fc1d6..448b886 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -209,11 +209,12 @@ static HRESULT set_object_site(script_ctx_t *ctx, IUnknown *obj) return S_OK; ax_site = create_ax_site(ctx); - if(ax_site) + if(ax_site) { hres = IObjectWithSite_SetSite(obj_site, ax_site); + IUnknown_Release(ax_site); + } else hres = E_OUTOFMEMORY; - IUnknown_Release(ax_site); IObjectWithSite_Release(obj_site); return hres; }

1 0