June 2017 - Wine-commits - list.winehq.org

Zebediah Figura : msi: Don't reimplement record formatting.
by Alexandre Julliard 20 Jun '17

20 Jun '17

Module: wine Branch: master Commit: de5246a659563c734cd9f62a241a082b8ff73ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5246a659563c734cd9f62a2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 19 23:46:09 2017 -0500 msi: Don't reimplement record formatting. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 44 +++++++++----------------------------------- 1 file changed, 9 insertions(+), 35 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index e195764..de1cdf2 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1709,8 +1709,8 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC static const WCHAR szSetProgress[] = {'S','e','t','P','r','o','g','r','e','s','s',0}; static const WCHAR szActionText[] = {'A','c','t','i','o','n','T','e','x','t',0}; MSIRECORD *uirow; - LPWSTR deformated, message; - DWORD i, len, total_len, log_type = 0; + LPWSTR deformated, message = {0}; + DWORD len, log_type = 0; INT rc = 0; char *msg; @@ -1776,39 +1776,13 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC } else { - static const WCHAR format[] = {'%','u',':',' ',0}; - UINT count = MSI_RecordGetFieldCount( record ); - WCHAR *p; - - total_len = 1; - for (i = 1; i <= count; i++) - { - len = 0; - MSI_RecordGetStringW( record, i, NULL, &len ); - total_len += len + 13; - } - p = message = msi_alloc( total_len * sizeof(WCHAR) ); - if (!p) return ERROR_OUTOFMEMORY; - - for (i = 1; i <= count; i++) - { - if (count > 1) - { - len = sprintfW( p, format, i ); - total_len -= len; - p += len; - } - len = total_len; - MSI_RecordGetStringW( record, i, p, &len ); - total_len -= len; - p += len; - if (count > 1 && total_len) - { - *p++ = ' '; - total_len--; - } - } - p[0] = 0; + UINT res = MSI_FormatRecordW(package, record, message, &len); + if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) + return res; + len++; + message = msi_alloc(len * sizeof(WCHAR)); + if (!message) return ERROR_OUTOFMEMORY; + MSI_FormatRecordW(package, record, message, &len); } /* convert it to ASCII */

1 0

Marcus Meissner : webservices: Fixed memory leak in build_custom_header ( Coverity).
by Alexandre Julliard 20 Jun '17

20 Jun '17

Module: wine Branch: master Commit: 960d53427891935c782f0c98c86345cf3ea1b020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=960d53427891935c782f0c98c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 20 09:14:46 2017 +0200 webservices: Fixed memory leak in build_custom_header (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index f27aceac..1b5ec04 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1418,7 +1418,7 @@ static HRESULT build_custom_header( struct msg *msg, const WS_XML_STRING *name, if (!(header = alloc_header( 0, FALSE, name, ns ))) return E_OUTOFMEMORY; - if (!msg->writer && (hr = WsCreateWriter( NULL, 0, &msg->writer, NULL )) != S_OK) return hr; + if (!msg->writer && (hr = WsCreateWriter( NULL, 0, &msg->writer, NULL )) != S_OK) goto done; if ((hr = WsCreateXmlBuffer( msg->heap, NULL, 0, &buf, NULL )) != S_OK) goto done; if ((hr = WsSetOutputToBuffer( msg->writer, buf, NULL, 0, NULL )) != S_OK) goto done; if ((hr = write_custom_header( msg->writer, name, ns, type, desc, option, value, size )) != S_OK) goto done;

1 0

Marcus Meissner : msvcrt: Free the temporary filename (Coverity).
by Alexandre Julliard 20 Jun '17

20 Jun '17

Module: wine Branch: master Commit: d3d43ffdedcf765ecbd0ec160f384156069849bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3d43ffdedcf765ecbd0ec160… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 20 09:08:39 2017 +0200 msvcrt: Free the temporary filename (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7c8a0b5..62b06eb 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4989,6 +4989,7 @@ MSVCRT_FILE* CDECL MSVCRT_tmpfile(void) if(fd != -1 && !file) MSVCRT__close(fd); + MSVCRT_free(filename); UNLOCK_FILES(); return file; }

1 0

Alistair Leslie-Hughes : oledb32/tests: Add to DBTYPE_WSTR tests for GetConversionSize.
by Alexandre Julliard 20 Jun '17

20 Jun '17

Module: wine Branch: master Commit: eb96566ef407c40b59649fe8bd9af632bdcc1fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb96566ef407c40b59649fe8b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 18 09:39:12 2017 +0000 oledb32/tests: Add to DBTYPE_WSTR tests for GetConversionSize. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/convert.c | 252 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 252 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb96566ef407c40b59649…

1 0

Marcus Meissner : wsdapi: Fixed memory leak in error path (Coverity).
by Alexandre Julliard 20 Jun '17

20 Jun '17

Module: wine Branch: master Commit: f4e2a10973ff4f8bf4884a4d7170fac760523c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e2a10973ff4f8bf4884a4d7… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 20 09:25:05 2017 +0200 wsdapi: Fixed memory leak in error path (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/discovery.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index c9ef9c2..82a1ca0 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -366,6 +366,7 @@ HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscover if (FAILED(WSDXMLCreateContext(&obj->xmlContext))) { WARN("Unable to create XML context\n"); + HeapFree (GetProcessHeap(), 0, obj); return E_OUTOFMEMORY; } }

1 0

Daniel Lehman : winedbg: Display movaps in disassembly.
by Alexandre Julliard 20 Jun '17

20 Jun '17

Module: wine Branch: master Commit: 5e486f6de0b6adfcb5981d41f94b1747b27d62a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e486f6de0b6adfcb5981d41f… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Jun 20 00:31:44 2017 -0700 winedbg: Display movaps in disassembly. 0f 28 /r movaps xmm1, xmm2/m128 0f 29 /r movaps xmm2/m128, xmm1 Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/db_disasm64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index fe6a538..4957eeb 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -280,8 +280,8 @@ static const struct inst db_inst_0f2x[] = { /*26*/ { "mov", TRUE, LONG, op2(El,TR), 0 }, /*27*/ { "", FALSE, NONE, 0, 0 }, -/*28*/ { "", FALSE, NONE, 0, 0 }, -/*29*/ { "", FALSE, NONE, 0, 0 }, +/*28*/ { "movaps",TRUE, NONE, op2(E, XMM), 0 }, +/*29*/ { "movaps",TRUE, NONE, op2(XMM, E), 0 }, /*2a*/ { "", FALSE, NONE, 0, 0 }, /*2b*/ { "", FALSE, NONE, 0, 0 }, /*2c*/ { "", FALSE, NONE, 0, 0 },

1 0

Jacek Caban : server: Introduce create_server_async and use it in read request handler.
by Alexandre Julliard 20 Jun '17

20 Jun '17

Module: wine Branch: master Commit: 26c5336494de2f85a87fb955a2caf46aa0718fd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c5336494de2f85a87fb955a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 13 16:46:41 2017 +0200 server: Introduce create_server_async and use it in read request handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 14 ++++++++++++++ server/fd.c | 14 ++++---------- server/file.h | 1 + 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/server/async.c b/server/async.c index f9d8af3..d1cea9a 100644 --- a/server/async.c +++ b/server/async.c @@ -272,6 +272,20 @@ struct async *create_async( struct thread *thread, const async_data_t *data, str return async; } +/* create an async associated with iosb for async-based requests */ +struct async *create_request_async( struct thread *thread, const async_data_t *data ) +{ + struct async *async; + struct iosb *iosb; + + if (!(iosb = create_iosb( get_req_data(), get_req_data_size(), get_reply_max_size() ))) + return NULL; + + async = create_async( current, data, iosb ); + release_object( iosb ); + return async; +} + /* set the timeout of an async operation */ void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ) { diff --git a/server/fd.c b/server/fd.c index 3c8f1bd..f05556a 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2446,20 +2446,14 @@ DECL_HANDLER(read) { struct fd *fd = get_handle_fd_obj( current->process, req->async.handle, FILE_READ_DATA ); struct async *async; - struct iosb *iosb; if (!fd) return; - if ((iosb = create_iosb( NULL, 0, get_reply_max_size() ))) + if ((async = create_request_async( current, &req->async ))) { - async = create_async( current, &req->async, iosb ); - if (async) - { - reply->wait = fd->fd_ops->read( fd, async, req->pos ); - reply->options = fd->options; - release_object( async ); - } - release_object( iosb ); + reply->wait = fd->fd_ops->read( fd, async, req->pos ); + reply->options = fd->options; + release_object( async ); } release_object( fd ); } diff --git a/server/file.h b/server/file.h index 5ea8f0f..30db87e 100644 --- a/server/file.h +++ b/server/file.h @@ -176,6 +176,7 @@ extern struct object *create_serial( struct fd *fd ); extern struct async_queue *create_async_queue( struct fd *fd ); extern void free_async_queue( struct async_queue *queue ); extern struct async *create_async( struct thread *thread, const async_data_t *data, struct iosb *iosb ); +extern struct async *create_request_async( struct thread *thread, const async_data_t *data ); extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total );

1 0

Austin English : ntoskrnl: Add KeAcquireSpinLockRaiseToDpc stub.
by Alexandre Julliard 20 Jun '17

20 Jun '17

Module: wine Branch: master Commit: 0c3a2a67a2fe6d84d9db17468271ced18a018191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c3a2a67a2fe6d84d9db17468… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jun 15 14:41:19 2017 -0500 ntoskrnl: Add KeAcquireSpinLockRaiseToDpc stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 ++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4b8a005..6287967 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3240,5 +3240,14 @@ void WINAPI __regs_KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *handle ) void WINAPI KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *handle ) #endif { - FIXME( "stub: %p\n", handle); + FIXME( "stub: %p\n", handle ); +} + +/*********************************************************************** + * KeAcquireSpinLockRaiseToDpc (NTOSKRNL.EXE.@) + */ +KIRQL WINAPI KeAcquireSpinLockRaiseToDpc(KSPIN_LOCK *spinlock) +{ + FIXME( "stub: %p\n", spinlock ); + return 0; } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 25649c9..aba5cb5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -510,6 +510,7 @@ @ stdcall Ke386SetIoAccessMap(long ptr) @ stub KeAcquireInterruptSpinLock @ stub KeAcquireSpinLockAtDpcLevel +@ stdcall -arch=x86_64 KeAcquireSpinLockRaiseToDpc(ptr) @ stub KeAddSystemServiceTable @ stub KeAreApcsDisabled @ stub KeAttachProcess

1 0

Dmitry Timoshkov : propsys: Add support for VT_I1 and VT_UI1 to PropVariantChangeType.
by Alexandre Julliard 20 Jun '17

20 Jun '17

Module: wine Branch: master Commit: 09a2547f2d68c7892c148f0c4116268a98a49ccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a2547f2d68c7892c148f0c4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:36:35 2017 +0800 propsys: Add support for VT_I1 and VT_UI1 to PropVariantChangeType. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 3fee67a..007fd94 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -264,6 +264,32 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p switch (vt) { + case VT_I1: + { + LONGLONG res; + + hr = PROPVAR_ConvertNumber(propvarSrc, 8, TRUE, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_I1; + ppropvarDest->u.cVal = (char)res; + } + return hr; + } + + case VT_UI1: + { + LONGLONG res; + + hr = PROPVAR_ConvertNumber(propvarSrc, 8, FALSE, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_UI1; + ppropvarDest->u.bVal = (UCHAR)res; + } + return hr; + } + case VT_I2: { SHORT res;

1 0

Dmitry Timoshkov : propsys: Add support for VT_LPWSTR and VT_BSTR to PropVariantToStringAlloc.
by Alexandre Julliard 20 Jun '17

20 Jun '17

Module: wine Branch: master Commit: 97c512082c0eccb1606061c4f5435d2065a74bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97c512082c0eccb1606061c4f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:36:47 2017 +0800 propsys: Add support for VT_LPWSTR and VT_BSTR to PropVariantToStringAlloc. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 007fd94..af486d6 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -224,6 +224,7 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) res = CoTaskMemAlloc(1*sizeof(WCHAR)); res[0] = '\0'; break; + case VT_LPSTR: if(propvarIn->u.pszVal) { @@ -237,6 +238,18 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) MultiByteToWideChar(CP_ACP, 0, propvarIn->u.pszVal, -1, res, len); } break; + + case VT_LPWSTR: + case VT_BSTR: + if (propvarIn->u.pwszVal) + { + DWORD size = (lstrlenW(propvarIn->u.pwszVal) + 1) * sizeof(WCHAR); + res = CoTaskMemAlloc(size); + if(!res) return E_OUTOFMEMORY; + memcpy(res, propvarIn->u.pwszVal, size); + } + break; + default: FIXME("Unsupported conversion (%d)\n", propvarIn->vt); hr = E_FAIL;

1 0