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

Dmitry Timoshkov : propsys: Add support for VT_LPSTR to PropVariantChangeType.
by Alexandre Julliard June 20, 2017

June 20, 2017

Module: wine Branch: master Commit: db7e816c9c4294a7ee443a0397fb08e1ef432128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db7e816c9c4294a7ee443a039… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:00 2017 +0800 propsys: Add support for VT_LPSTR to PropVariantChangeType. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index fc6cf58..8a8698f 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -385,6 +385,31 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p return hr; } + case VT_LPSTR: + { + WCHAR *resW; + hr = PropVariantToStringAlloc(propvarSrc, &resW); + if (SUCCEEDED(hr)) + { + char *res; + DWORD len; + + len = WideCharToMultiByte(CP_ACP, 0, resW, -1, NULL, 0, NULL, NULL); + res = CoTaskMemAlloc(len); + if (res) + { + WideCharToMultiByte(CP_ACP, 0, resW, -1, res, len, NULL, NULL); + ppropvarDest->vt = VT_LPSTR; + ppropvarDest->u.pszVal = res; + } + else + hr = E_OUTOFMEMORY; + + CoTaskMemFree(resW); + } + return hr; + } + default: FIXME("Unhandled dest type: %d\n", vt); return E_FAIL;

1 0

Dmitry Timoshkov : propsys: Add support for VT_BSTR to PropVariantChangeType.
by Alexandre Julliard June 20, 2017

June 20, 2017

Module: wine Branch: master Commit: aa8dc616e078e60b947aa6618501d69aaa9ace09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa8dc616e078e60b947aa6618… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:36:51 2017 +0800 propsys: Add support for VT_BSTR to PropVariantChangeType. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index af486d6..1d762d0 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -369,7 +369,9 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p } return hr; } + case VT_LPWSTR: + case VT_BSTR: { WCHAR *res; hr = PropVariantToStringAlloc(propvarSrc, &res);

1 0

Austin English : ntoskrnl: Add KeAcquireSpinLockRaiseToDpc stub.
by Alexandre Julliard June 20, 2017

June 20, 2017

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

Jacek Caban : server: Introduce create_server_async and use it in read request handler.
by Alexandre Julliard June 20, 2017

June 20, 2017

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

Dmitry Timoshkov : include: Print contents of VT_LPSTR and VT_LPWSTR variants in wine_dbgstr_variant.
by Alexandre Julliard June 20, 2017

June 20, 2017

Module: wine Branch: master Commit: 8fd6c63bf33b1d501e12f3937cddfdfbf0a7ab8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd6c63bf33b1d501e12f3937… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:31 2017 +0800 include: Print contents of VT_LPSTR and VT_LPWSTR variants in wine_dbgstr_variant. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/wine/debug.h b/include/wine/debug.h index 5409d70..fb0d6bb 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -296,6 +296,10 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) return wine_dbg_sprintf( "%p {VT_CY: %s}", v, wine_dbgstr_longlong(V_CY(v).int64) ); case VT_DATE: return wine_dbg_sprintf( "%p {VT_DATE: %lf}", v, V_DATE(v) ); + case VT_LPSTR: + return wine_dbg_sprintf( "%p {VT_LPSTR: %s}", v, wine_dbgstr_a((const char *)V_BSTR(v)) ); + case VT_LPWSTR: + return wine_dbg_sprintf( "%p {VT_LPWSTR: %s}", v, wine_dbgstr_w(V_BSTR(v)) ); case VT_BSTR: return wine_dbg_sprintf( "%p {VT_BSTR: %s}", v, wine_dbgstr_w(V_BSTR(v)) ); case VT_DISPATCH:

1 0

Austin English : wmvcore: Add WMCheckURLScheme stub.
by Alexandre Julliard June 20, 2017

June 20, 2017

Module: wine Branch: master Commit: 3f6b7c34dbf76fdbf7561a3fe5019713b10d1c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f6b7c34dbf76fdbf7561a3fe… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jun 14 15:29:26 2017 -0500 wmvcore: Add WMCheckURLScheme stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/wmvcore_main.c | 9 +- include/Makefile.in | 2 + include/nserror.h | 1266 +++++++++++++++++++++++++++++++++++++++++++ include/wmsdk.h | 26 + 5 files changed, 1303 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f6b7c34dbf76fdbf7561…

1 0

Marcus Meissner : msvcrt: Free the temporary filename (Coverity).
by Alexandre Julliard June 20, 2017

June 20, 2017

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

Marcus Meissner : webservices: Fixed memory leak in build_custom_header ( Coverity).
by Alexandre Julliard June 20, 2017

June 20, 2017

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

Zebediah Figura : msi: Don't reimplement record formatting.
by Alexandre Julliard June 20, 2017

June 20, 2017

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

Hugh McMaster : regedit: Use a generic data type to correctly process all data types.
by Alexandre Julliard June 20, 2017

June 20, 2017

Module: wine Branch: master Commit: e3234f6ede1e84eb1c7595f2971206620d9b4188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3234f6ede1e84eb1c7595f29… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 20 13:25:32 2017 +0000 regedit: Use a generic data type to correctly process all data types. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 16 ++++++---------- programs/regedit/tests/regedit.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e08ffa6..e75ebec 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -160,10 +160,10 @@ struct parser HKEY hkey; /* current registry key */ WCHAR *key_name; /* current key name */ WCHAR *value_name; /* value name */ + DWORD parse_type; /* generic data type for parsing */ DWORD data_type; /* data type */ void *data; /* value data */ DWORD data_size; /* size of the data (in bytes) */ - BOOL hex_type; /* parsing a hex data type */ enum parser_state state; /* current parser state */ }; @@ -309,6 +309,7 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) if (strncmpW(ptr->tag, *line, ptr->len)) continue; + parser->parse_type = ptr->parse_type; parser->data_type = ptr->parse_type; *line += ptr->len; @@ -323,7 +324,6 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) return FALSE; parser->data_type = val; - parser->hex_type = TRUE; *line = end + 2; } return TRUE; @@ -720,7 +720,7 @@ static WCHAR *data_type_state(struct parser *parser, WCHAR *pos) return line; } - switch (parser->data_type) + switch (parser->parse_type) { case REG_SZ: set_state(parser, STRING_DATA); @@ -728,10 +728,7 @@ static WCHAR *data_type_state(struct parser *parser, WCHAR *pos) case REG_DWORD: set_state(parser, DWORD_DATA); break; - case REG_NONE: - case REG_EXPAND_SZ: - case REG_BINARY: - case REG_MULTI_SZ: + case REG_BINARY: /* all hex data types, including undefined */ set_state(parser, HEX_DATA); break; default: @@ -828,11 +825,10 @@ static WCHAR *set_value_state(struct parser *parser, WCHAR *pos) RegSetValueExW(parser->hkey, parser->value_name, 0, parser->data_type, parser->data, parser->data_size); - if (parser->data_type == REG_DWORD || parser->hex_type) + if (parser->parse_type == REG_DWORD || parser->parse_type == REG_BINARY) { HeapFree(GetProcessHeap(), 0, parser->data); parser->data = NULL; - parser->hex_type = FALSE; } if (parser->reg_version == REG_VERSION_31) @@ -1469,10 +1465,10 @@ BOOL import_registry_file(FILE *reg_file) parser.hkey = NULL; parser.key_name = NULL; parser.value_name = NULL; + parser.parse_type = 0; parser.data_type = 0; parser.data = NULL; parser.data_size = 0; - parser.hex_type = FALSE; parser.state = HEADER; pos = parser.two_wchars; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index ec488bf..96091f8 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -457,14 +457,14 @@ static void test_basic_import(void) "\"Wine13h\"=hex(ffffffff):56,61,6c,75,65,00\n" "\"Wine13i\"=hex(100000000):56,61,6c,75,65,00\n\n"); verify_reg(hkey, "Wine13a", REG_NONE, "Value", 6, 0); - todo_wine verify_reg(hkey, "Wine13b", 0x10, "Value", 6, 0); - todo_wine verify_reg(hkey, "Wine13c", 0x100, "Value", 6, 0); - todo_wine verify_reg(hkey, "Wine13d", 0x1000, "Value", 6, 0); - todo_wine verify_reg(hkey, "Wine13e", 0x7fff, "Value", 6, 0); - todo_wine verify_reg(hkey, "Wine13f", 0xffff, "Value", 6, 0); - todo_wine verify_reg(hkey, "Wine13g", 0x7fffffff, "Value", 6, 0); - todo_wine verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0); - verify_reg_nonexist(hkey, "Wine13i"); + verify_reg(hkey, "Wine13b", 0x10, "Value", 6, 0); + verify_reg(hkey, "Wine13c", 0x100, "Value", 6, 0); + verify_reg(hkey, "Wine13d", 0x1000, "Value", 6, 0); + verify_reg(hkey, "Wine13e", 0x7fff, "Value", 6, 0); + verify_reg(hkey, "Wine13f", 0xffff, "Value", 6, 0); + verify_reg(hkey, "Wine13g", 0x7fffffff, "Value", 6, 0); + verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0); + todo_wine verify_reg_nonexist(hkey, "Wine13i"); RegCloseKey(hkey);

1 0