June 2017 - wine-commits

Austin English : wmvcore: Add WMCheckURLScheme stub.
by Alexandre Julliard 20 Jun '17

20 Jun '17

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

Hugh McMaster : regedit: Use a generic data type to correctly process all data types.
by Alexandre Julliard 20 Jun '17

20 Jun '17

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

Dmitry Timoshkov : include: Print contents of VT_LPSTR and VT_LPWSTR variants in wine_dbgstr_variant.
by Alexandre Julliard 20 Jun '17

20 Jun '17

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

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

20 Jun '17

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: Make VT_FILETIME handling by PropVariantChangeType more implicit.
by Alexandre Julliard 20 Jun '17

20 Jun '17

Module: wine Branch: master Commit: 3a7fb7575175f09eb961822fa86d1f78c5bf9d51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7fb7575175f09eb961822fa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:36:56 2017 +0800 propsys: Make VT_FILETIME handling by PropVariantChangeType more implicit. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 1d762d0..fc6cf58 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -36,12 +36,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(propsys); -static HRESULT PROPVAR_ConvertFILETIME(PROPVARIANT *ppropvarDest, - REFPROPVARIANT propvarSrc, VARTYPE vt) +static HRESULT PROPVAR_ConvertFILETIME(const FILETIME *ft, PROPVARIANT *ppropvarDest, VARTYPE vt) { SYSTEMTIME time; - FileTimeToSystemTime(&propvarSrc->u.filetime, &time); + FileTimeToSystemTime(ft, &time); switch (vt) { @@ -272,9 +271,12 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p FIXME("(%p, %p, %d, %d, %d): semi-stub!\n", ppropvarDest, propvarSrc, propvarSrc->vt, flags, vt); - if(vt == propvarSrc->vt) + if (vt == propvarSrc->vt) return PropVariantCopy(ppropvarDest, propvarSrc); + if (propvarSrc->vt == VT_FILETIME) + return PROPVAR_ConvertFILETIME(&propvarSrc->u.filetime, ppropvarDest, vt); + switch (vt) { case VT_I1: @@ -382,17 +384,11 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p } return hr; } - } - switch (propvarSrc->vt) - { - case VT_FILETIME: - return PROPVAR_ConvertFILETIME(ppropvarDest, propvarSrc, vt); - default: - FIXME("Unhandled source type: %d\n", propvarSrc->vt); + default: + FIXME("Unhandled dest type: %d\n", vt); + return E_FAIL; } - - return E_FAIL; } static void PROPVAR_GUIDToWSTR(REFGUID guid, WCHAR *str)

1 0

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

20 Jun '17

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

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

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

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

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

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

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

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 : 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

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

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

Andrey Gusev : api-ms-win-security-credentials-l1-1-0: Add dll.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: abaddc871842ba4ec0156f4bfed9939b44052ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abaddc871842ba4ec0156f4bf… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jun 19 16:50:19 2017 +0300 api-ms-win-security-credentials-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-security-credentials-l1-1-0.spec | 29 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 34 insertions(+) diff --git a/configure b/configure index 55b5ad8..02de880 100755 --- a/configure +++ b/configure @@ -1032,6 +1032,7 @@ enable_api_ms_win_security_audit_l1_1_1 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 enable_api_ms_win_security_base_private_l1_1_1 +enable_api_ms_win_security_credentials_l1_1_0 enable_api_ms_win_security_grouppolicy_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_1 @@ -17922,6 +17923,7 @@ wine_fn_config_dll api-ms-win-security-audit-l1-1-1 enable_api_ms_win_security_a wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 wine_fn_config_dll api-ms-win-security-base-private-l1-1-1 enable_api_ms_win_security_base_private_l1_1_1 +wine_fn_config_dll api-ms-win-security-credentials-l1-1-0 enable_api_ms_win_security_credentials_l1_1_0 wine_fn_config_dll api-ms-win-security-grouppolicy-l1-1-0 enable_api_ms_win_security_grouppolicy_l1_1_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_security_lsalookup_l1_1_1 diff --git a/configure.ac b/configure.ac index 9ec90f9..7ae29f7 100644 --- a/configure.ac +++ b/configure.ac @@ -2864,6 +2864,7 @@ WINE_CONFIG_DLL(api-ms-win-security-audit-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) WINE_CONFIG_DLL(api-ms-win-security-base-private-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-security-credentials-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-grouppolicy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-1) diff --git a/dlls/api-ms-win-security-credentials-l1-1-0/Makefile.in b/dlls/api-ms-win-security-credentials-l1-1-0/Makefile.in new file mode 100644 index 0000000..8acd7aa --- /dev/null +++ b/dlls/api-ms-win-security-credentials-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-credentials-l1-1-0.dll diff --git a/dlls/api-ms-win-security-credentials-l1-1-0/api-ms-win-security-credentials-l1-1-0.spec b/dlls/api-ms-win-security-credentials-l1-1-0/api-ms-win-security-credentials-l1-1-0.spec new file mode 100644 index 0000000..857795c --- /dev/null +++ b/dlls/api-ms-win-security-credentials-l1-1-0/api-ms-win-security-credentials-l1-1-0.spec @@ -0,0 +1,29 @@ +@ stdcall CredDeleteA(str long long) advapi32.CredDeleteA +@ stdcall CredDeleteW(wstr long long) advapi32.CredDeleteW +@ stdcall CredEnumerateA(str long ptr ptr) advapi32.CredEnumerateA +@ stdcall CredEnumerateW(wstr long ptr ptr) advapi32.CredEnumerateW +@ stub CredFindBestCredentialA +@ stub CredFindBestCredentialW +@ stdcall CredFree(ptr) advapi32.CredFree +@ stdcall CredGetSessionTypes(long ptr) advapi32.CredGetSessionTypes +@ stub CredGetTargetInfoA +@ stub CredGetTargetInfoW +@ stdcall CredIsMarshaledCredentialW(wstr) advapi32.CredIsMarshaledCredentialW +@ stub CredIsProtectedA +@ stub CredIsProtectedW +@ stdcall CredMarshalCredentialA(long ptr ptr) advapi32.CredMarshalCredentialA +@ stdcall CredMarshalCredentialW(long ptr ptr) advapi32.CredMarshalCredentialW +@ stub CredProtectA +@ stub CredProtectW +@ stdcall CredReadA(str long long ptr) advapi32.CredReadA +@ stdcall CredReadDomainCredentialsA(ptr long ptr ptr) advapi32.CredReadDomainCredentialsA +@ stdcall CredReadDomainCredentialsW(ptr long ptr ptr) advapi32.CredReadDomainCredentialsW +@ stdcall CredReadW(wstr long long ptr) advapi32.CredReadW +@ stdcall CredUnmarshalCredentialA(str ptr ptr) advapi32.CredUnmarshalCredentialA +@ stdcall CredUnmarshalCredentialW(wstr ptr ptr) advapi32.CredUnmarshalCredentialW +@ stub CredUnprotectA +@ stub CredUnprotectW +@ stdcall CredWriteA(ptr long) advapi32.CredWriteA +@ stub CredWriteDomainCredentialsA +@ stub CredWriteDomainCredentialsW +@ stdcall CredWriteW(ptr long) advapi32.CredWriteW diff --git a/tools/make_specfiles b/tools/make_specfiles index 910bd0f..ca620da 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -124,6 +124,7 @@ my @dll_groups = "api-ms-win-security-audit-l1-1-1", "api-ms-win-security-base-l1-2-0", "api-ms-win-security-base-private-l1-1-1", + "api-ms-win-security-credentials-l1-1-0", "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-lsalookup-l1-1-1", "api-ms-win-security-lsalookup-l2-1-1",

1 0

Sebastian Lackner : wined3d: Trigger frontbuffer update in surface_cpu_blt.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 7fbdb54ee4c66bf4d50fa6b8eb0fb4c3f7cdbea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbdb54ee4c66bf4d50fa6b8e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 19 17:54:36 2017 +0200 wined3d: Trigger frontbuffer update in surface_cpu_blt. Fixes a regression introduced in ee17d7ba1b72b26baae90c1d5e2ae5b3e4721654. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index af8b5b4..c1bb53e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3343,6 +3343,12 @@ release: context_unmap_bo_address(context, &dst_data, GL_PIXEL_UNPACK_BUFFER); if (!same_sub_resource) context_unmap_bo_address(context, &src_data, GL_PIXEL_UNPACK_BUFFER); + if (SUCCEEDED(hr) && dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture) + { + SetRect(&dst_texture->swapchain->front_buffer_update, + dst_box->left, dst_box->top, dst_box->right, dst_box->bottom); + dst_texture->swapchain->swapchain_ops->swapchain_frontbuffer_updated(dst_texture->swapchain); + } if (converted_texture) wined3d_texture_decref(converted_texture); if (context)

1 0

Zebediah Figura : msacm32: Rewrite PCM conversion functions.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: cadedd73f968fc981e86e020cfe00b32ce9de752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cadedd73f968fc981e86e020c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 15 13:25:48 2017 -0500 msacm32: Rewrite PCM conversion functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/pcmconverter.c | 584 +++++++++++++++++++++++--------------------- dlls/msacm32/tests/msacm.c | 99 ++++++++ 2 files changed, 399 insertions(+), 284 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cadedd73f968fc981e86e…

1 0

Alexandre Julliard : iphlpapi: Check if getifaddrs really exists.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 7f23bbe7f9b252ac6a9e0881b25315cc3a6eeca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f23bbe7f9b252ac6a9e0881b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 19 13:47:38 2017 +0200 iphlpapi: Check if getifaddrs really exists. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/iphlpapi/ifenum.c | 2 +- include/config.h.in | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 10a4204..55b5ad8 100755 --- a/configure +++ b/configure @@ -15403,6 +15403,7 @@ for ac_func in \ futimesat \ getattrlist \ getauxval \ + getifaddrs \ getopt_long_only \ getpwuid \ gettimeofday \ diff --git a/configure.ac b/configure.ac index 573d290..9ec90f9 100644 --- a/configure.ac +++ b/configure.ac @@ -2047,6 +2047,7 @@ AC_CHECK_FUNCS(\ futimesat \ getattrlist \ getauxval \ + getifaddrs \ getopt_long_only \ getpwuid \ gettimeofday \ diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 3070ae5..eed1be1 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -815,7 +815,7 @@ static DWORD getIPAddrRowByName(PMIB_IPADDRROW ipAddrRow, const char *ifName, return ret; } -#ifdef HAVE_IFADDRS_H +#if defined(HAVE_IFADDRS_H) && defined(HAVE_GETIFADDRS) /* Counts the IPv4 addresses in the system using the return value from * getifaddrs, returning the count. diff --git a/include/config.h.in b/include/config.h.in index 7cdf70c..18cacd5 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -204,6 +204,9 @@ /* Define to 1 if you have the `getauxval' function. */ #undef HAVE_GETAUXVAL +/* Define to 1 if you have the `getifaddrs' function. */ +#undef HAVE_GETIFADDRS + /* Define to 1 if you have the `getnameinfo' function. */ #undef HAVE_GETNAMEINFO

1 0

Zebediah Figura : msi: Pass the given record to the callback.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 4e49ae3cc69b595f791410b3060dc18ddb9412cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e49ae3cc69b595f791410b30… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 18 21:53:30 2017 -0500 msi: Pass the given record to the callback. 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 | 3 +-- dlls/msi/tests/package.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index eae01e0..e195764 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1818,8 +1818,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC if (gUIHandlerRecord && (gUIFilterRecord & log_type)) { - MSIHANDLE rec = MsiCreateRecord( 1 ); - MsiRecordSetStringW( rec, 0, message ); + MSIHANDLE rec = alloc_msihandle(&record->hdr); TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, hRecord=%u)\n", gUIHandlerRecord, gUIContextRecord, eMessageType, rec); rc = gUIHandlerRecord( gUIContextRecord, eMessageType, rec ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a7cec7f..146d1fc 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9096,7 +9096,6 @@ static INT CALLBACK externalui_record_callback(void *context, UINT message_type, r = MsiRecordGetFieldCount(hrecord); ok(r == 1, "expected 1, got %u\n", r); r = MsiRecordGetInteger(hrecord, 1); - todo_wine ok(r == 12345, "expected 12345, got %u\n", r); return retval; }

1 0

Zebediah Figura : msi: Store string and record callback data separately.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: df31a7c1ece45ad5492bd96a4ad43611b3dde072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df31a7c1ece45ad5492bd96a4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 18 21:53:28 2017 -0500 msi: Store string and record callback data separately. 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/media.c | 2 +- dlls/msi/msi.c | 4 ++-- dlls/msi/msi_main.c | 2 ++ dlls/msi/msipriv.h | 2 ++ dlls/msi/package.c | 13 ++++++++----- dlls/msi/tests/package.c | 12 ++++++++++-- 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 1357a64..bbfdd6f 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -109,7 +109,7 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) { MSIHANDLE rec = MsiCreateRecord(1); MsiRecordSetStringW(rec, 0, error); - gUIHandlerRecord(gUIContext, MB_RETRYCANCEL | INSTALLMESSAGE_ERROR, rec); + gUIHandlerRecord(gUIContextRecord, MB_RETRYCANCEL | INSTALLMESSAGE_ERROR, rec); MsiCloseHandle(rec); } } diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 8a11e83..ce8a7be 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -4222,8 +4222,8 @@ UINT WINAPI MsiSetExternalUIRecord( INSTALLUI_HANDLER_RECORD handler, *prev = gUIHandlerRecord; gUIHandlerRecord = handler; - gUIFilter = filter; - gUIContext = context; + gUIFilterRecord = filter; + gUIContextRecord = context; return ERROR_SUCCESS; } diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index 0955856..11cbf41 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -44,7 +44,9 @@ INSTALLUI_HANDLERA gUIHandlerA = NULL; INSTALLUI_HANDLERW gUIHandlerW = NULL; INSTALLUI_HANDLER_RECORD gUIHandlerRecord = NULL; DWORD gUIFilter = 0; +DWORD gUIFilterRecord = 0; LPVOID gUIContext = NULL; +LPVOID gUIContextRecord = NULL; WCHAR *gszLogFile = NULL; HINSTANCE msi_hInstance; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2e9e91e..cc42316 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -972,7 +972,9 @@ extern INSTALLUI_HANDLERA gUIHandlerA DECLSPEC_HIDDEN; extern INSTALLUI_HANDLERW gUIHandlerW DECLSPEC_HIDDEN; extern INSTALLUI_HANDLER_RECORD gUIHandlerRecord DECLSPEC_HIDDEN; extern DWORD gUIFilter DECLSPEC_HIDDEN; +extern DWORD gUIFilterRecord DECLSPEC_HIDDEN; extern LPVOID gUIContext DECLSPEC_HIDDEN; +extern LPVOID gUIContextRecord DECLSPEC_HIDDEN; extern WCHAR *gszLogFile DECLSPEC_HIDDEN; extern HINSTANCE msi_hInstance DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 8f86352..eae01e0 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1811,27 +1811,30 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC p[0] = 0; } - TRACE("%p %p %p %x %x %s\n", gUIHandlerA, gUIHandlerW, gUIHandlerRecord, - gUIFilter, log_type, debugstr_w(message)); - /* convert it to ASCII */ len = WideCharToMultiByte( CP_ACP, 0, message, -1, NULL, 0, NULL, NULL ); msg = msi_alloc( len ); WideCharToMultiByte( CP_ACP, 0, message, -1, msg, len, NULL, NULL ); - if (gUIHandlerRecord && (gUIFilter & log_type)) + if (gUIHandlerRecord && (gUIFilterRecord & log_type)) { MSIHANDLE rec = MsiCreateRecord( 1 ); MsiRecordSetStringW( rec, 0, message ); - rc = gUIHandlerRecord( gUIContext, eMessageType, rec ); + TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, hRecord=%u)\n", + gUIHandlerRecord, gUIContextRecord, eMessageType, rec); + rc = gUIHandlerRecord( gUIContextRecord, eMessageType, rec ); MsiCloseHandle( rec ); } if (!rc && gUIHandlerW && (gUIFilter & log_type)) { + TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, szMessage=%s)\n", + gUIHandlerW, gUIContext, eMessageType, debugstr_w(message)); rc = gUIHandlerW( gUIContext, eMessageType, message ); } else if (!rc && gUIHandlerA && (gUIFilter & log_type)) { + TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, szMessage=%s)\n", + gUIHandlerA, gUIContext, eMessageType, debugstr_a(msg)); rc = gUIHandlerA( gUIContext, eMessageType, msg ); } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e18f0f0..a7cec7f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9159,11 +9159,19 @@ static void test_externalui(void) retval = 1; externalui_ran = externalui_record_ran = 0; r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); - todo_wine ok(r == 1, "expected 1, got %u\n", r); - todo_wine ok(externalui_ran == 0, "external UI callback should not have run\n"); ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + /* filter and context should be kept separately */ + r = pMsiSetExternalUIRecord(externalui_record_callback, INSTALLLOGMODE_ERROR, &retval, &prev_record); + ok(r == ERROR_SUCCESS, "MsiSetExternalUIRecord failed %u\n", r); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 1, "external UI callback did not run\n"); + ok(externalui_record_ran == 0, "external UI record callback should not have run\n"); } else win_skip("MsiSetExternalUIRecord is not available\n");

1 0

Zebediah Figura : msi: Use an external UI record handler before a string handler.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: cef67993c5164bb12ff0547152d604f3fcc3d549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef67993c5164bb12ff054715… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 18 21:53:27 2017 -0500 msi: Use an external UI record handler before a string handler. 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 | 20 +++++----- dlls/msi/tests/package.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 10 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 330f80f..8f86352 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1819,21 +1819,21 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC msg = msi_alloc( len ); WideCharToMultiByte( CP_ACP, 0, message, -1, msg, len, NULL, NULL ); - if (gUIHandlerW && (gUIFilter & log_type)) - { - rc = gUIHandlerW( gUIContext, eMessageType, message ); - } - else if (gUIHandlerA && (gUIFilter & log_type)) - { - rc = gUIHandlerA( gUIContext, eMessageType, msg ); - } - else if (gUIHandlerRecord && (gUIFilter & log_type)) + if (gUIHandlerRecord && (gUIFilter & log_type)) { MSIHANDLE rec = MsiCreateRecord( 1 ); MsiRecordSetStringW( rec, 0, message ); rc = gUIHandlerRecord( gUIContext, eMessageType, rec ); MsiCloseHandle( rec ); } + if (!rc && gUIHandlerW && (gUIFilter & log_type)) + { + rc = gUIHandlerW( gUIContext, eMessageType, message ); + } + else if (!rc && gUIHandlerA && (gUIFilter & log_type)) + { + rc = gUIHandlerA( gUIContext, eMessageType, msg ); + } if (!rc && package->log_file != INVALID_HANDLE_VALUE && (eMessageType & 0xff000000) != INSTALLMESSAGE_PROGRESS) @@ -1882,7 +1882,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC break; } - return ERROR_SUCCESS; + return rc; } INT WINAPI MsiProcessMessage( MSIHANDLE hInstall, INSTALLMESSAGE eMessageType, diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 10ef84a..e18f0f0 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -39,6 +39,7 @@ static char CURR_DIR[MAX_PATH]; static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR); static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA)(LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); +static UINT (WINAPI *pMsiSetExternalUIRecord)(INSTALLUI_HANDLER_RECORD, DWORD, LPVOID, PINSTALLUI_HANDLER_RECORD); static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL); @@ -67,6 +68,7 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiApplyMultiplePatchesA); GET_PROC(hmsi, MsiGetComponentPathExA); + GET_PROC(hmsi, MsiSetExternalUIRecord); GET_PROC(hshell32, SHGetFolderPathA); GET_PROC(hadvapi32, CheckTokenMembership); @@ -9074,6 +9076,102 @@ error: DeleteFileA( msifile ); } +static int externalui_ran; + +static INT CALLBACK externalui_callback(void *context, UINT message_type, LPCSTR message) +{ + externalui_ran = 1; + ok(message_type == INSTALLMESSAGE_USER, "expected INSTALLMESSAGE_USER, got %08x\n", message_type); + return 0; +} + +static int externalui_record_ran; + +static INT CALLBACK externalui_record_callback(void *context, UINT message_type, MSIHANDLE hrecord) +{ + INT retval = context ? *((INT *)context) : 0; + UINT r; + externalui_record_ran = 1; + ok(message_type == INSTALLMESSAGE_USER, "expected INSTALLMESSAGE_USER, got %08x\n", message_type); + r = MsiRecordGetFieldCount(hrecord); + ok(r == 1, "expected 1, got %u\n", r); + r = MsiRecordGetInteger(hrecord, 1); + todo_wine + ok(r == 12345, "expected 12345, got %u\n", r); + return retval; +} + +static void test_externalui(void) +{ + /* test that external UI handlers work correctly */ + + INSTALLUI_HANDLERA prev; + INSTALLUI_HANDLER_RECORD prev_record; + MSIHANDLE hpkg, hrecord; + UINT r; + + prev = MsiSetExternalUIA(externalui_callback, INSTALLLOGMODE_USER, NULL); + + r = package_from_db(create_package_db(), &hpkg); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + DeleteFileA(msifile); + return; + } + ok(r == ERROR_SUCCESS, "Expected a valid package %u\n", r); + + hrecord = MsiCreateRecord(1); + ok(hrecord, "Expected a valid record\n"); + r = MsiRecordSetStringA(hrecord, 0, "test message [1]"); + ok(r == ERROR_SUCCESS, "MsiSetString failed %u\n", r); + r = MsiRecordSetInteger(hrecord, 1, 12345); + ok(r == ERROR_SUCCESS, "MsiSetInteger failed %u\n", r); + + externalui_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 1, "external UI callback did not run\n"); + + if (pMsiSetExternalUIRecord) + { + INT retval = 0; + + prev = MsiSetExternalUIA(prev, 0, NULL); + ok(prev == externalui_callback, "wrong callback function %p\n", prev); + r = pMsiSetExternalUIRecord(externalui_record_callback, INSTALLLOGMODE_USER, &retval, &prev_record); + ok(r == ERROR_SUCCESS, "MsiSetExternalUIRecord failed %u\n", r); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 0, "external UI callback should not have run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + MsiSetExternalUIA(externalui_callback, INSTALLLOGMODE_USER, NULL); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 1, "external UI callback did not run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + retval = 1; + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + todo_wine + ok(r == 1, "expected 1, got %u\n", r); + todo_wine + ok(externalui_ran == 0, "external UI callback should not have run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + } + else + win_skip("MsiSetExternalUIRecord is not available\n"); + + MsiCloseHandle(hpkg); + DeleteFileA(msifile); +} + START_TEST(package) { STATEMGRSTATUS status; @@ -9131,6 +9229,7 @@ START_TEST(package) test_MsiApplyPatch(); test_MsiEnumComponentCosts(); test_MsiDatabaseCommit(); + test_externalui(); if (pSRSetRestorePointA && !pMsiGetComponentPathExA && ret) {

1 0

Zebediah Figura : include: Add missing MSI message values.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 37f17fdba2b3fa8707a322f498bcd9750323f8e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37f17fdba2b3fa8707a322f49… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 18 22:00:06 2017 -0500 include: Add missing MSI message values. 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> --- include/msi.h | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/include/msi.h b/include/msi.h index b227fbd..417b606 100644 --- a/include/msi.h +++ b/include/msi.h @@ -103,7 +103,10 @@ typedef enum tagINSTALLMESSAGE INSTALLMESSAGE_COMMONDATA = 0x0b000000, INSTALLMESSAGE_INITIALIZE = 0x0c000000, INSTALLMESSAGE_TERMINATE = 0x0d000000, - INSTALLMESSAGE_SHOWDIALOG = 0x0e000000 + INSTALLMESSAGE_SHOWDIALOG = 0x0e000000, + INSTALLMESSAGE_RMFILESINUSE = 0x19000000, + INSTALLMESSAGE_INSTALLSTART = 0x1A000000, + INSTALLMESSAGE_INSTALLEND = 0x1B000000, } INSTALLMESSAGE; typedef enum tagREINSTALLMODE @@ -128,18 +131,22 @@ typedef enum tagINSTALLLOGMODE INSTALLLOGMODE_WARNING = (1 << (INSTALLMESSAGE_WARNING >> 24)), INSTALLLOGMODE_USER = (1 << (INSTALLMESSAGE_USER >> 24)), INSTALLLOGMODE_INFO = (1 << (INSTALLMESSAGE_INFO >> 24)), + INSTALLLOGMODE_FILESINUSE = (1 << (INSTALLMESSAGE_FILESINUSE >> 24)), INSTALLLOGMODE_RESOLVESOURCE = (1 << (INSTALLMESSAGE_RESOLVESOURCE >> 24)), INSTALLLOGMODE_OUTOFDISKSPACE = (1 << (INSTALLMESSAGE_OUTOFDISKSPACE >> 24)), INSTALLLOGMODE_ACTIONSTART = (1 << (INSTALLMESSAGE_ACTIONSTART >> 24)), INSTALLLOGMODE_ACTIONDATA = (1 << (INSTALLMESSAGE_ACTIONDATA >> 24)), - INSTALLLOGMODE_COMMONDATA = (1 << (INSTALLMESSAGE_COMMONDATA >> 24)), - INSTALLLOGMODE_PROPERTYDUMP = (1 << (INSTALLMESSAGE_PROGRESS >> 24)), - INSTALLLOGMODE_VERBOSE = (1 << (INSTALLMESSAGE_INITIALIZE >> 24)), - INSTALLLOGMODE_EXTRADEBUG = (1 << (INSTALLMESSAGE_TERMINATE >> 24)), INSTALLLOGMODE_PROGRESS = (1 << (INSTALLMESSAGE_PROGRESS >> 24)), + INSTALLLOGMODE_PROPERTYDUMP = (1 << (INSTALLMESSAGE_PROGRESS >> 24)), + INSTALLLOGMODE_COMMONDATA = (1 << (INSTALLMESSAGE_COMMONDATA >> 24)), INSTALLLOGMODE_INITIALIZE = (1 << (INSTALLMESSAGE_INITIALIZE >> 24)), + INSTALLLOGMODE_VERBOSE = (1 << (INSTALLMESSAGE_INITIALIZE >> 24)), INSTALLLOGMODE_TERMINATE = (1 << (INSTALLMESSAGE_TERMINATE >> 24)), - INSTALLLOGMODE_SHOWDIALOG = (1 << (INSTALLMESSAGE_SHOWDIALOG >> 24)) + INSTALLLOGMODE_EXTRADEBUG = (1 << (INSTALLMESSAGE_TERMINATE >> 24)), + INSTALLLOGMODE_SHOWDIALOG = (1 << (INSTALLMESSAGE_SHOWDIALOG >> 24)), + INSTALLLOGMODE_RMFILESINUSE = (1 << (INSTALLMESSAGE_RMFILESINUSE >> 24)), + INSTALLLOGMODE_INSTALLSTART = (1 << (INSTALLMESSAGE_INSTALLSTART >> 24)), + INSTALLLOGMODE_INSTALLEND = (1 << (INSTALLMESSAGE_INSTALLEND >> 24)), } INSTALLLOGMODE; typedef enum tagINSTALLLOGATTRIBUTES

1 0

Marcus Meissner : webservices: Free header on error exit (Coverity).
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: b65f0f2a97f59e131ba3e24ae0f37358c755b968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b65f0f2a97f59e131ba3e24ae… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 18 15:44:40 2017 +0200 webservices: Free header on error exit (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 74c6fd1..f27aceac 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1008,7 +1008,7 @@ static HRESULT build_standard_header( struct msg *msg, WS_HEADER_TYPE type, WS_T if (!(header = alloc_header( type, FALSE, get_header_name(type), NULL ))) 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_standard_header( msg, type, value_type, option, value, size )) != S_OK) goto done;

1 0

Matteo Bruni : advapi32/tests: Add a token mandatory label test.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 894837168c76f20bd5699fcf3e08171357364161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=894837168c76f20bd5699fcf3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 16 20:41:37 2017 +0200 advapi32/tests: Add a token mandatory label test. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 81 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 8044cae..3c68205 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6716,6 +6716,86 @@ static void test_maximum_allowed(void) CloseHandle(handle); } +static void test_token_label(void) +{ + static SID medium_sid = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_MEDIUM_RID}}; + static SID high_sid = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_HIGH_RID}}; + SECURITY_DESCRIPTOR_CONTROL control; + SYSTEM_MANDATORY_LABEL_ACE *ace; + BOOL ret, present, defaulted; + SECURITY_DESCRIPTOR *sd; + ACL *sacl = NULL, *dacl; + DWORD size, revision; + HANDLE token; + char *str; + SID *sid; + + ret = OpenProcessToken(GetCurrentProcess(), READ_CONTROL | WRITE_OWNER, &token); + ok(ret, "OpenProcessToken failed with error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, sd, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + ret = GetSecurityDescriptorControl(sd, &control, &revision); + ok(ret, "GetSecurityDescriptorControl failed with error %u\n", GetLastError()); + todo_wine ok(control == (SE_SELF_RELATIVE | SE_SACL_AUTO_INHERITED | SE_SACL_PRESENT) || + broken(control == SE_SELF_RELATIVE) /* WinXP, Win2003 */, + "Unexpected security descriptor control %#x\n", control); + ok(revision == 1, "Unexpected security descriptor revision %u\n", revision); + + sid = (void *)0xdeadbeef; + defaulted = TRUE; + ret = GetSecurityDescriptorOwner(sd, (void **)&sid, &defaulted); + ok(ret, "GetSecurityDescriptorOwner failed with error %u\n", GetLastError()); + ok(!sid, "Owner present\n"); + ok(!defaulted, "Owner defaulted\n"); + + sid = (void *)0xdeadbeef; + defaulted = TRUE; + ret = GetSecurityDescriptorGroup(sd, (void **)&sid, &defaulted); + ok(ret, "GetSecurityDescriptorGroup failed with error %u\n", GetLastError()); + ok(!sid, "Group present\n"); + ok(!defaulted, "Group defaulted\n"); + + ret = GetSecurityDescriptorSacl(sd, &present, &sacl, &defaulted); + ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); + ok(present || broken(!present) /* WinXP, Win2003 */, "No SACL in the security descriptor\n"); + ok(sacl || broken(!sacl) /* WinXP, Win2003 */, "NULL SACL in the security descriptor\n"); + + if (present) + { + ok(!defaulted, "SACL defaulted\n"); + ok(sacl->AceCount == 1, "SACL contains an unexpected ACE count %u\n", sacl->AceCount); + + ret = pGetAce(sacl, 0, (void **)&ace); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + + ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, + "Unexpected ACE type %#x\n", ace->Header.AceType); + ok(!ace->Header.AceFlags, "Unexpected ACE flags %#x\n", ace->Header.AceFlags); + ok(ace->Header.AceSize, "Unexpected ACE size %u\n", ace->Header.AceSize); + ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, "Unexpected ACE mask %#x\n", ace->Mask); + + sid = (SID *)&ace->SidStart; + pConvertSidToStringSidA(sid, &str); + ok(EqualSid(sid, &medium_sid) || EqualSid(sid, &high_sid), "Got unexpected SID %s\n", str); + } + + ret = GetSecurityDescriptorDacl(sd, &present, &dacl, &defaulted); + ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + todo_wine ok(!present, "DACL present\n"); + + HeapFree(GetProcessHeap(), 0, sd); + CloseHandle(token); +} + static void test_token_security_descriptor(void) { static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, @@ -7048,6 +7128,7 @@ START_TEST(security) test_GetSidIdentifierAuthority(); test_pseudo_tokens(); test_maximum_allowed(); + test_token_label(); /* Must be the last test, modifies process token */ test_token_security_descriptor();

1 0

Michael Müller : server: Assign a default label to all tokens.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: a78d419420a43e1f428ac155082b87143117e381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78d419420a43e1f428ac1550… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jun 16 20:41:36 2017 +0200 server: Assign a default label to all tokens. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 46 +++++++++++++++---------------------- server/process.c | 6 +++++ server/security.h | 2 ++ server/token.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 28 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3a8e7e9..8044cae 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6847,7 +6847,6 @@ static void test_token_security_descriptor(void) defaulted = TRUE; ret = GetSecurityDescriptorDacl(sd2, &present, &acl2, &defaulted); ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); - todo_wine ok(present, "DACL not present\n"); ok(acl2 != (void *)0xdeadbeef, "DACL not set\n"); ok(!defaulted, "DACL defaulted\n"); @@ -6949,20 +6948,16 @@ static void test_child_token_sd(void) defaulted = TRUE; ret = GetSecurityDescriptorDacl(sd, &present, &acl, &defaulted); ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); - todo_wine ok(present, "DACL not present\n"); + ok(present, "DACL not present\n"); + ok(acl && acl != (void *)0xdeadbeef, "Got invalid DACL\n"); + ok(!defaulted, "DACL defaulted\n"); - if (present && acl) + ok(acl->AceCount, "Expected at least one ACE\n"); + for (i = 0; i < acl->AceCount; i++) { - ok(acl != (void *)0xdeadbeef, "DACL not set\n"); - ok(!defaulted, "DACL defaulted\n"); - - ok(acl->AceCount, "Expected at least one ACE\n"); - for (i = 0; i < acl->AceCount; i++) - { - ok(pGetAce(acl, i, (void **)&acc_ace), "GetAce failed with error %u\n", GetLastError()); - ok(acc_ace->Header.AceType != ACCESS_ALLOWED_ACE_TYPE || !EqualSid(&acc_ace->SidStart, psid), - "ACE inherited from the parent\n"); - } + ok(pGetAce(acl, i, (void **)&acc_ace), "GetAce failed with error %u\n", GetLastError()); + ok(acc_ace->Header.AceType != ACCESS_ALLOWED_ACE_TYPE || !EqualSid(&acc_ace->SidStart, psid), + "ACE inherited from the parent\n"); } LocalFree(psid); @@ -6987,21 +6982,16 @@ static void test_child_token_sd(void) defaulted = TRUE; ret = GetSecurityDescriptorSacl(sd, &present, &acl, &defaulted); ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); - todo_wine ok(present, "SACL not present\n"); - - if (present && acl) - { - ok(acl != (void *)0xdeadbeef, "Got invalid SACL\n"); - ok(!defaulted, "SACL defaulted\n"); - - ok(acl->AceCount == 1, "Expected exactly one ACE\n"); - ret = pGetAce(acl, 0, (void **)&ace_label); - ok(ret, "GetAce failed with error %u\n", GetLastError()); - ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, - "Unexpected ACE type %#x\n", ace_label->Header.AceType); - ok(!EqualSid(&ace_label->SidStart, &low_level), - "Low integrity level should not have been inherited\n"); - } + ok(present, "SACL not present\n"); + ok(acl && acl != (void *)0xdeadbeef, "Got invalid SACL\n"); + ok(!defaulted, "SACL defaulted\n"); + ok(acl->AceCount == 1, "Expected exactly one ACE\n"); + ret = pGetAce(acl, 0, (void **)&ace_label); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, + "Unexpected ACE type %#x\n", ace_label->Header.AceType); + ok(!EqualSid(&ace_label->SidStart, &low_level), + "Low integrity level should not have been inherited\n"); HeapFree(GetProcessHeap(), 0, sd); } diff --git a/server/process.c b/server/process.c index 3e962ca..2327a26 100644 --- a/server/process.c +++ b/server/process.c @@ -570,6 +570,12 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit } if (!process->handles || !process->token) goto error; + /* Assign a high security label to the token. The default would be medium + * but Wine provides admin access to all applications right now so high + * makes more sense for the time being. */ + if (!token_assign_label( process->token, security_high_label_sid )) + goto error; + /* create the main thread */ if (pipe( request_pipe ) == -1) { diff --git a/server/security.h b/server/security.h index 3cbfcb9..873bbc6 100644 --- a/server/security.h +++ b/server/security.h @@ -47,11 +47,13 @@ extern const PSID security_local_user_sid; extern const PSID security_local_system_sid; extern const PSID security_builtin_users_sid; extern const PSID security_builtin_admins_sid; +extern const PSID security_high_label_sid; /* token functions */ extern struct token *token_create_admin(void); +extern int token_assign_label( struct token *token, PSID label ); extern struct token *token_duplicate( struct token *src_token, unsigned primary, int impersonation_level, const struct security_descriptor *sd ); extern int token_check_privileges( struct token *token, int all_required, diff --git a/server/token.c b/server/token.c index f518544..532d7b7 100644 --- a/server/token.c +++ b/server/token.c @@ -70,6 +70,7 @@ static const SID interactive_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, static const SID anonymous_logon_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_ANONYMOUS_LOGON_RID } }; static const SID authenticated_user_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_AUTHENTICATED_USER_RID } }; static const SID local_system_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } }; +static const SID high_label_sid = { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY }, { SECURITY_MANDATORY_HIGH_RID } }; static const struct /* same fields as struct SID */ { BYTE Revision; @@ -100,6 +101,7 @@ const PSID security_local_system_sid = (PSID)&local_system_sid; const PSID security_local_user_sid = (PSID)&local_user_sid; const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid; const PSID security_builtin_users_sid = (PSID)&builtin_users_sid; +const PSID security_high_label_sid = (PSID)&high_label_sid; static luid_t prev_luid_value = { 1000, 0 }; @@ -726,6 +728,56 @@ struct sid_data unsigned int subauth[MAX_SUBAUTH_COUNT]; }; +static struct security_descriptor *create_security_label_sd( struct token *token, PSID label_sid ) +{ + size_t sid_len = security_sid_len( label_sid ), sacl_size, sd_size; + SYSTEM_MANDATORY_LABEL_ACE *smla; + struct security_descriptor *sd; + ACL *sacl; + + sacl_size = sizeof(ACL) + FIELD_OFFSET(SYSTEM_MANDATORY_LABEL_ACE, SidStart) + sid_len; + sd_size = sizeof(struct security_descriptor) + sacl_size; + if (!(sd = mem_alloc( sd_size ))) + return NULL; + + sd->control = SE_SACL_PRESENT; + sd->owner_len = 0; + sd->group_len = 0; + sd->sacl_len = sacl_size; + sd->dacl_len = 0; + + sacl = (ACL *)(sd + 1); + sacl->AclRevision = ACL_REVISION; + sacl->Sbz1 = 0; + sacl->AclSize = sacl_size; + sacl->AceCount = 1; + sacl->Sbz2 = 0; + + smla = (SYSTEM_MANDATORY_LABEL_ACE *)(sacl + 1); + smla->Header.AceType = SYSTEM_MANDATORY_LABEL_ACE_TYPE; + smla->Header.AceFlags = 0; + smla->Header.AceSize = FIELD_OFFSET(SYSTEM_MANDATORY_LABEL_ACE, SidStart) + sid_len; + smla->Mask = SYSTEM_MANDATORY_LABEL_NO_WRITE_UP; + memcpy( &smla->SidStart, label_sid, sid_len ); + + assert( sd_is_valid( sd, sd_size ) ); + return sd; +} + +int token_assign_label( struct token *token, PSID label ) +{ + struct security_descriptor *sd; + int ret = 0; + + if ((sd = create_security_label_sd( token, label ))) + { + ret = set_sd_defaults_from_token( &token->obj, sd, LABEL_SECURITY_INFORMATION, token ); + free( sd ); + } + + return ret; +} + struct token *token_create_admin( void ) { struct token *token = NULL;

1 0

Michael Müller : advapi32/tests: Show that child processes do not inherit mandatory labels.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 08f3fef34caa324dac999bd716c006cb96de8439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f3fef34caa324dac999bd71… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jun 16 20:41:35 2017 +0200 advapi32/tests: Show that child processes do not inherit mandatory labels. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 64 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a25a601..3a8e7e9 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6718,6 +6718,8 @@ static void test_maximum_allowed(void) static void test_token_security_descriptor(void) { + static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_LOW_RID}}; char buffer_sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)&buffer_sd, *sd2; char buffer_acl[256], buffer[MAX_PATH]; @@ -6872,6 +6874,28 @@ static void test_token_security_descriptor(void) ret = SetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, sd); ok(ret, "SetKernelObjectSecurity failed with error %u\n", GetLastError()); + /* The security label is also not inherited */ + if (pAddMandatoryAce) + { + ret = InitializeAcl(acl, 256, ACL_REVISION); + ok(ret, "InitializeAcl failed with error %u\n", GetLastError()); + + ret = pAddMandatoryAce(acl, ACL_REVISION, 0, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, &low_level); + ok(ret, "AddMandatoryAce failed with error %u\n", GetLastError()); + + memset(sd, 0, sizeof(buffer_sd)); + ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); + ok(ret, "InitializeSecurityDescriptor failed with error %u\n", GetLastError()); + + ret = SetSecurityDescriptorSacl(sd, TRUE, acl, FALSE); + ok(ret, "SetSecurityDescriptorSacl failed with error %u\n", GetLastError()); + + ret = SetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, sd); + ok(ret, "SetKernelObjectSecurity failed with error %u\n", GetLastError()); + } + else + win_skip("SYSTEM_MANDATORY_LABEL not supported\n"); + /* Start child process with our modified token */ memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -6895,6 +6919,9 @@ static void test_token_security_descriptor(void) static void test_child_token_sd(void) { + static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_LOW_RID}}; + SYSTEM_MANDATORY_LABEL_ACE *ace_label; BOOL ret, present, defaulted; ACCESS_ALLOWED_ACE *acc_ace; SECURITY_DESCRIPTOR *sd; @@ -6940,6 +6967,43 @@ static void test_child_token_sd(void) LocalFree(psid); HeapFree(GetProcessHeap(), 0, sd); + + if (!pAddMandatoryAce) + { + win_skip("SYSTEM_MANDATORY_LABEL not supported\n"); + return; + } + + ret = GetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, sd, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl = NULL; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorSacl(sd, &present, &acl, &defaulted); + ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); + todo_wine ok(present, "SACL not present\n"); + + if (present && acl) + { + ok(acl != (void *)0xdeadbeef, "Got invalid SACL\n"); + ok(!defaulted, "SACL defaulted\n"); + + ok(acl->AceCount == 1, "Expected exactly one ACE\n"); + ret = pGetAce(acl, 0, (void **)&ace_label); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, + "Unexpected ACE type %#x\n", ace_label->Header.AceType); + ok(!EqualSid(&ace_label->SidStart, &low_level), + "Low integrity level should not have been inherited\n"); + } + + HeapFree(GetProcessHeap(), 0, sd); } START_TEST(security)

1 0

Michael Müller : advapi32/tests: Show that tokens do not inherit the DACL while creating child processes.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 7e68ccff8787206f54e403b19a51a32ddf328806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e68ccff8787206f54e403b19… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jun 16 20:41:34 2017 +0200 advapi32/tests: Show that tokens do not inherit the DACL while creating child processes. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 121 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 117 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 65e9758..a25a601 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6720,13 +6720,16 @@ static void test_token_security_descriptor(void) { char buffer_sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)&buffer_sd, *sd2; - char buffer_acl[256]; - ACL *acl = (ACL *)&buffer_acl, *acl2; + char buffer_acl[256], buffer[MAX_PATH]; + ACL *acl = (ACL *)&buffer_acl, *acl2, *acl_child; BOOL defaulted, present, ret, found; HANDLE token, token2, token3; + EXPLICIT_ACCESSW exp_access; + PROCESS_INFORMATION info; + DWORD size, index, retd; ACCESS_ALLOWED_ACE *ace; SECURITY_ATTRIBUTES sa; - DWORD size, index; + STARTUPINFOA startup; PSID psid; if (!pDuplicateTokenEx || !pConvertStringSidToSidA || !pAddAccessAllowedAceEx || !pGetAce @@ -6827,6 +6830,62 @@ static void test_token_security_descriptor(void) HeapFree(GetProcessHeap(), 0, sd2); + /* When creating a child process, the process does inherit the token of + * the parent but not the DACL of the token */ + ret = GetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd2 = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, sd2, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl2 = (void *)0xdeadbeef; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorDacl(sd2, &present, &acl2, &defaulted); + ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + todo_wine + ok(present, "DACL not present\n"); + ok(acl2 != (void *)0xdeadbeef, "DACL not set\n"); + ok(!defaulted, "DACL defaulted\n"); + + exp_access.grfAccessPermissions = GENERIC_ALL; + exp_access.grfAccessMode = GRANT_ACCESS; + exp_access.grfInheritance = NO_PROPAGATE_INHERIT_ACE; + exp_access.Trustee.pMultipleTrustee = NULL; + exp_access.Trustee.TrusteeForm = TRUSTEE_IS_SID; + exp_access.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + exp_access.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; + exp_access.Trustee.ptstrName = (void*)psid; + + retd = pSetEntriesInAclW(1, &exp_access, acl2, &acl_child); + ok(retd == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", retd); + + memset(sd, 0, sizeof(buffer_sd)); + ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); + ok(ret, "InitializeSecurityDescriptor failed with error %u\n", GetLastError()); + + ret = SetSecurityDescriptorDacl(sd, TRUE, acl_child, FALSE); + ok(ret, "SetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + + ret = SetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, sd); + ok(ret, "SetKernelObjectSecurity failed with error %u\n", GetLastError()); + + /* Start child process with our modified token */ + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + sprintf(buffer, "%s tests/security.c test_token_sd", myARGV[0]); + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info); + ok(ret, "CreateProcess failed with error %u\n", GetLastError()); + winetest_wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + + LocalFree(acl_child); LocalFree(psid); CloseHandle(token3); @@ -6834,6 +6893,55 @@ static void test_token_security_descriptor(void) CloseHandle(token); } +static void test_child_token_sd(void) +{ + BOOL ret, present, defaulted; + ACCESS_ALLOWED_ACE *acc_ace; + SECURITY_DESCRIPTOR *sd; + DWORD size, i; + HANDLE token; + PSID psid; + ACL *acl; + + ret = pConvertStringSidToSidA("S-1-5-6", &psid); + ok(ret, "ConvertStringSidToSidA failed with error %u\n", GetLastError()); + + ret = OpenProcessToken(GetCurrentProcess(), MAXIMUM_ALLOWED, &token); + ok(ret, "OpenProcessToken failed with error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, sd, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl = NULL; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorDacl(sd, &present, &acl, &defaulted); + ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + todo_wine ok(present, "DACL not present\n"); + + if (present && acl) + { + ok(acl != (void *)0xdeadbeef, "DACL not set\n"); + ok(!defaulted, "DACL defaulted\n"); + + ok(acl->AceCount, "Expected at least one ACE\n"); + for (i = 0; i < acl->AceCount; i++) + { + ok(pGetAce(acl, i, (void **)&acc_ace), "GetAce failed with error %u\n", GetLastError()); + ok(acc_ace->Header.AceType != ACCESS_ALLOWED_ACE_TYPE || !EqualSid(&acc_ace->SidStart, psid), + "ACE inherited from the parent\n"); + } + } + + LocalFree(psid); + HeapFree(GetProcessHeap(), 0, sd); +} + START_TEST(security) { init(); @@ -6841,7 +6949,10 @@ START_TEST(security) if (myARGC >= 3) { - test_process_security_child(); + if (!strcmp(myARGV[2], "test_token_sd")) + test_child_token_sd(); + else + test_process_security_child(); return; } test_kernel_objects_security(); @@ -6883,5 +6994,7 @@ START_TEST(security) test_GetSidIdentifierAuthority(); test_pseudo_tokens(); test_maximum_allowed(); + + /* Must be the last test, modifies process token */ test_token_security_descriptor(); }

1 0

Michael Müller : advapi32/tests: Show that tokens do not inherit security descriptors during duplication.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 4bd10fbd1a77c065f94956d1aab64eab47aa1801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bd10fbd1a77c065f94956d1a… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jun 16 20:41:33 2017 +0200 advapi32/tests: Show that tokens do not inherit security descriptors during duplication. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 45 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 09c6a72..65e9758 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6722,11 +6722,11 @@ static void test_token_security_descriptor(void) SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)&buffer_sd, *sd2; char buffer_acl[256]; ACL *acl = (ACL *)&buffer_acl, *acl2; - BOOL defaulted, present, ret; + BOOL defaulted, present, ret, found; + HANDLE token, token2, token3; ACCESS_ALLOWED_ACE *ace; SECURITY_ATTRIBUTES sa; - HANDLE token, token2; - DWORD size; + DWORD size, index; PSID psid; if (!pDuplicateTokenEx || !pConvertStringSidToSidA || !pAddAccessAllowedAceEx || !pGetAce @@ -6789,8 +6789,47 @@ static void test_token_security_descriptor(void) HeapFree(GetProcessHeap(), 0, sd2); + /* Duplicate token without security attributes. + * Tokens do not inherit the security descriptor in DuplicateToken. */ + ret = pDuplicateTokenEx(token2, MAXIMUM_ALLOWED, NULL, SecurityImpersonation, TokenImpersonation, &token3); + ok(ret, "DuplicateTokenEx failed with error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(token3, DACL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd2 = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token3, DACL_SECURITY_INFORMATION, sd2, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl2 = (void *)0xdeadbeef; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorDacl(sd2, &present, &acl2, &defaulted); + ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + todo_wine + ok(present, "DACL not present\n"); + + if (present) + { + ok(acl2 != (void *)0xdeadbeef, "DACL not set\n"); + ok(!defaulted, "DACL defaulted\n"); + + index = 0; + found = FALSE; + while (pGetAce(acl2, index++, (void **)&ace)) + { + if (ace->Header.AceType == ACCESS_ALLOWED_ACE_TYPE && EqualSid(&ace->SidStart, psid)) + found = TRUE; + } + ok(!found, "Access allowed ACE was inherited\n"); + } + + HeapFree(GetProcessHeap(), 0, sd2); + LocalFree(psid); + CloseHandle(token3); CloseHandle(token2); CloseHandle(token); }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: aab1fb88db61e8fa81c77664e948024aab9b4272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab1fb88db61e8fa81c77664e… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Jun 17 09:44:57 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index e8dbdd2..0633ad6 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-06-14 08:17+0300\n" +"PO-Revision-Date: 2017-06-17 09:44+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -12068,10 +12068,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: Neatpažinta kaitos seka [\\%1!c!]\n" #: regedit.rc:420 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "regedit: Nepalaikomas registro duomenų tipas [%1]\n" +msgstr "regedit: Nepalaikomas registro duomenų tipas [0x%1!x!]\n" #: regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n"

1 0

André Hentschel : kernel32: Fix EscapeCommFunction prototype.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 1ab9c9d8490e54991ef13e4ce2961605d88d6772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ab9c9d8490e54991ef13e4ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jun 16 18:45:07 2017 +0200 kernel32: Fix EscapeCommFunction prototype. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/comm.c | 2 +- include/winbase.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index f6c1270..b5de654 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -592,7 +592,7 @@ BOOL WINAPI ClearCommBreak(HANDLE handle) * false if the device is not present cannot execute the command * or the command failed. */ -BOOL WINAPI EscapeCommFunction(HANDLE handle, UINT func) +BOOL WINAPI EscapeCommFunction(HANDLE handle, DWORD func) { DWORD ioc; DWORD dwBytesReturned; diff --git a/include/winbase.h b/include/winbase.h index 1347f8c..d634c86 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1899,7 +1899,7 @@ WINBASEAPI BOOL WINAPI DosDateTimeToFileTime(WORD,WORD,LPFILETIME); WINBASEAPI BOOL WINAPI DuplicateHandle(HANDLE,HANDLE,HANDLE,HANDLE*,DWORD,BOOL,DWORD); WINADVAPI BOOL WINAPI DuplicateToken(HANDLE,SECURITY_IMPERSONATION_LEVEL,PHANDLE); WINADVAPI BOOL WINAPI DuplicateTokenEx(HANDLE,DWORD,LPSECURITY_ATTRIBUTES,SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); -WINBASEAPI BOOL WINAPI EscapeCommFunction(HANDLE,UINT); +WINBASEAPI BOOL WINAPI EscapeCommFunction(HANDLE,DWORD); WINBASEAPI void * WINAPI EncodePointer(void *); WINBASEAPI void * WINAPI EncodeSystemPointer(void *); WINADVAPI BOOL WINAPI EncryptFileA(LPCSTR);

1 0

Sebastian Lackner : wined3d: Fix memory leaks in blitter_destroy callbacks.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: a77d957da8777c690972dfa99e7956f18d06ba0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77d957da8777c690972dfa99… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 16 16:01:58 2017 +0200 wined3d: Fix memory leaks in blitter_destroy callbacks. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index abdeb9c..af8b5b4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2394,6 +2394,8 @@ static void fbo_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ if ((next = blitter->next)) next->ops->blitter_destroy(next, context); + + HeapFree(GetProcessHeap(), 0, blitter); } static void fbo_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, @@ -2476,6 +2478,8 @@ static void ffp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ if ((next = blitter->next)) next->ops->blitter_destroy(next, context); + + HeapFree(GetProcessHeap(), 0, blitter); } static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, @@ -2766,6 +2770,8 @@ static void cpu_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ if ((next = blitter->next)) next->ops->blitter_destroy(next, context); + + HeapFree(GetProcessHeap(), 0, blitter); } static HRESULT surface_cpu_blt_compressed(const BYTE *src_data, BYTE *dst_data,

1 0

Sebastian Lackner : wined3d: Create CPU blitter also for GDI render.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 6dd1ca28bfea0d2dcee368a70ba196bc25ec8d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd1ca28bfea0d2dcee368a70… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 16 16:01:34 2017 +0200 wined3d: Create CPU blitter also for GDI render. Fixes a regression introduced in cad4badbcf25992e0c61521aa15e639c2611f5d6. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ded4af6..3d12e41 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1164,6 +1164,15 @@ HRESULT CDECL wined3d_device_init_gdi(struct wined3d_device *device, goto err_out; } device->swapchains[0] = swapchain; + + if (!(device->blitter = wined3d_cpu_blitter_create())) + { + ERR("Failed to create CPU blitter.\n"); + HeapFree(GetProcessHeap(), 0, device->swapchains); + device->swapchain_count = 0; + goto err_out; + } + return WINED3D_OK; err_out: @@ -1252,6 +1261,8 @@ HRESULT CDECL wined3d_device_uninit_gdi(struct wined3d_device *device) { unsigned int i; + device->blitter->ops->blitter_destroy(device->blitter, NULL); + for (i = 0; i < device->swapchain_count; ++i) { TRACE("Releasing the implicit swapchain %u.\n", i);

1 0

Sebastian Lackner : wined3d: Avoid NULL pointer dereference when using GDI renderer.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: a2c0d2bb37244d1bece3ddd411981aaf06f3c842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c0d2bb37244d1bece3ddd41… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 16 16:01:04 2017 +0200 wined3d: Avoid NULL pointer dereference when using GDI renderer. Fixes a regression introduced in 62ca4f38269139ef2a8b9842ec538d9e7f7a0e76. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0f60542..fbc73ca 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2703,12 +2703,13 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint void *context_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info; BYTE *memory; if (!data->buffer_object) return data->addr; + gl_info = context->gl_info; context_bind_bo(context, binding, data->buffer_object); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) @@ -2731,11 +2732,12 @@ void *context_map_bo_address(struct wined3d_context *context, void context_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, GLenum binding) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info; if (!data->buffer_object) return; + gl_info = context->gl_info; context_bind_bo(context, binding, data->buffer_object); GL_EXTCALL(glUnmapBuffer(binding)); context_bind_bo(context, binding, 0);

1 0

Sebastian Lackner : server: Do not shutdown server in persistent mode when creation of first process fails.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 4fc5d8873ca3b1bd0a4029e331f9292564ac86c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fc5d8873ca3b1bd0a4029e33… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 18 01:54:16 2017 +0200 server: Do not shutdown server in persistent mode when creation of first process fails. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index 4f38ae1..3e962ca 100644 --- a/server/process.c +++ b/server/process.c @@ -592,7 +592,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit error: if (process) release_object( process ); /* if we failed to start our first process, close everything down */ - if (!running_processes) close_master_socket( 0 ); + if (!running_processes && master_socket_timeout != TIMEOUT_INFINITE) close_master_socket( 0 ); return NULL; }

1 0

Henri Verbeet : include: Simply forward declare the required D2D interfaces in wincodec.idl.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 92847874b273ec488e6eaa882cac8772005ff9ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=92847874b273ec488e6eaa882… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 16 12:18:25 2017 +0200 include: Simply forward declare the required D2D interfaces in wincodec.idl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincodec.idl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 1ea6e0e..2a80876 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -218,14 +218,9 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppPRGBA, 0x6fddc324,0x4e03,0x4bfe,0 cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);") cpp_quote("#if 0") -typedef DWORD *ID2D1Device; -typedef DWORD *ID2D1Image; typedef DWORD *D2D1_PIXEL_FORMAT; cpp_quote ("#endif") -cpp_quote ("typedef interface ID2D1Device ID2D1Device;") -cpp_quote ("typedef interface ID2D1Image ID2D1Image;") - typedef struct WICRect { INT X; INT Y; @@ -254,6 +249,8 @@ typedef struct WICImageParameters typedef UINT32 WICColor; +interface ID2D1Device; +interface ID2D1Image; interface IWICPalette; [

1 0

Clemens Tamme : gdiplus: Implement triangular line caps in widened paths.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 260cbd022e43b9385b8d501de412151d89debd6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=260cbd022e43b9385b8d501de… Author: Clemens Tamme <clemens.tamme(a)gmail.com> Date: Sat Jun 17 17:28:28 2017 +0200 gdiplus: Implement triangular line caps in widened paths. Signed-off-by: Clemens Tamme <clemens.tamme(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 3d33c29..e34f4ed 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1883,6 +1883,27 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, } break; } + case LineCapTriangle: + { + REAL segment_dy = nextpoint->Y-endpoint->Y; + REAL segment_dx = nextpoint->X-endpoint->X; + REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL distance = pen->width/2.0; + REAL dx, dy; + + dx = distance * segment_dx / segment_length; + dy = distance * segment_dy / segment_length; + + if (add_first_points) { + add_bevel_point(endpoint, nextpoint, pen, 1, last_point); + + *last_point = add_path_list_node(*last_point, endpoint->X - dx, + endpoint->Y - dy, PathPointTypeLine); + } + if (add_last_point) + add_bevel_point(endpoint, nextpoint, pen, 0, last_point); + break; + } } } @@ -2118,10 +2139,10 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, { last_point = points; - if (pen->endcap > LineCapRound) + if (pen->endcap > LineCapTriangle) FIXME("unimplemented end cap %x\n", pen->endcap); - if (pen->startcap > LineCapRound) + if (pen->startcap > LineCapTriangle) FIXME("unimplemented start cap %x\n", pen->startcap); if (pen->dashcap != DashCapFlat)

1 0

Sebastian Lackner : gdiplus: Initialize containers list in GdipCloneImage.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: a4b7fe6a92ec5fd709156c6d3547730929833248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b7fe6a92ec5fd709156c6d3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 16 16:06:12 2017 +0200 gdiplus: Initialize containers list in GdipCloneImage. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 07609ac..720f8f2 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1333,6 +1333,7 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) result->unit = metafile->unit; result->metafile_type = metafile->metafile_type; result->hemf = CopyEnhMetaFileW(metafile->hemf, NULL); + list_init(&result->containers); if (!result->hemf) {

1 0

Francois Gouget : testbot: Force CGI::param() to scalar context for security.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: tools Branch: master Commit: e0e43d8cac1e3d64d1c104bc0b49f930b44df305 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e0e43d8cac1e3d64d1c104bc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 19 09:06:49 2017 +0200 testbot: Force CGI::param() to scalar context for security. Otherwise a call like foo($Page->GetParam("Name")) can end up passing extra arguments to foo() if the URL contains multiple instances of 'Name'. The situation is even worse if one uses named parameters. No code depended on being able to get multiple values and the only place that used CGI:param() to get the list of parameter names is already using Page::GetParameterNames(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 1fb2ca3..50598bf 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -77,7 +77,9 @@ sub GetParamNames($) =head1 C<GetParam()> -This thunks to CGI::param() and thus takes the same arguments list. +This thunks to CGI::param() and thus takes the same arguments list but forces +the result to scalar context to avoid security issues. +To get the list of parameter names use GetParamNames(). =back =cut @@ -86,7 +88,7 @@ sub GetParam($@) { my $self = shift; - return $self->{CGIObj}->param(@_); + return scalar($self->{CGIObj}->param(@_)); } sub CGI($)

1 0

Francois Gouget : testbot: Add Page::GetParamNames() to retrieve a page' s parameter names.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: tools Branch: master Commit: 9cb4b0b9932bfe027529d367aa50e08b461ccf27 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9cb4b0b9932bfe027529d367… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 19 09:06:22 2017 +0200 testbot: Add Page::GetParamNames() to retrieve a page's parameter names. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- testbot/lib/ObjectModel/CGI/Page.pm | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index bc7eb0b..fb743a0 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -362,7 +362,7 @@ sub Save($) { my ($self) = @_; - my @ParamNames = $self->GetParam(); + my @ParamNames = $self->GetParamNames(); foreach my $ParameterName (@ParamNames) { my $PropertyDescriptor = $self->GetPropertyDescriptorByName($ParameterName); diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 046fd12..1fb2ca3 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -58,6 +58,23 @@ sub _initialize($$$) =pod =over 12 +=head1 C<GetParamNames()> + +Returns the list of parameter names. + +=back +=cut + +sub GetParamNames($) +{ + my $self = shift; + + return $self->{CGIObj}->param(); +} + +=pod +=over 12 + =head1 C<GetParam()> This thunks to CGI::param() and thus takes the same arguments list.

1 0

Francois Gouget : testbot/TestLauncher: Trace the time it takes to run each test.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: tools Branch: master Commit: baf733def7e39a18d020dd50f060c870a60be1ac URL: http://source.winehq.org/git/tools.git/?a=commit;h=baf733def7e39a18d020dd50… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 18 13:48:42 2017 +0200 testbot/TestLauncher: Trace the time it takes to run each test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 2e9a62f..1d0abac 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -283,7 +283,7 @@ static BOOL AllImportedDllsPresent(const char *TestExeName) int main(int argc, char *argv[]) { int Arg; - DWORD TimeOut; + DWORD Start, TimeOut; BOOL UsageError; char TestExeFullName[_MAX_PATH]; char *TestExeFileName; @@ -375,12 +375,14 @@ int main(int argc, char *argv[]) exit(1); } + Start = GetTickCount(); printf("%s:%s start - -\n", TestName, Subtest); if (! AllImportedDllsPresent(TestExeFullName)) { printf("%s: %u tests executed (0 marked as todo, %u failures), %u skipped.\n", TestName, Failures, Failures, Skips); - printf("%s:%s done (%u)\n", TestName, Subtest, Failures); + printf("%s:%s done (%u) in %lds\n", TestName, Subtest, Failures, + (GetTickCount() - Start) / 1000); exit(0); } @@ -449,7 +451,8 @@ int main(int argc, char *argv[]) } CloseHandle(ProcessInformation.hProcess); - printf("%s:%s done (%lu)\n", TestName, Subtest, ExitCode); + printf("%s:%s done (%lu) in %lds\n", TestName, Subtest, ExitCode, + (GetTickCount() - Start) / 1000); return 0; }

1 0

Rosanne DiMesio : Update rating of old version when a test is moved
by Jeremy Newman 19 Jun '17

19 Jun '17

Module: appdb Branch: master Commit: 46719d462cad4c6aa6d1ac1c24216d84c7dc8e11 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=46719d462cad4c6aa6d1ac1c… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Jun 16 15:04:05 2017 -0500 Update rating of old version when a test is moved Fixes bug 42989. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/testData.php b/include/testData.php index bf5b727..051ef65 100644 --- a/include/testData.php +++ b/include/testData.php @@ -239,6 +239,8 @@ class testData{ { $oNewVersion = new version($this->iVersionId); $oNewVersion->updateRatingInfo(); + $oOldVersion = new version($oOldTest->iVersionId); + $oOldVersion->updateRatingInfo(); } $oVersion->updateRatingInfo(); }

1 0

Rosanne DiMesio : Do not show delete button or comment box on manage notes page
by Jeremy Newman 19 Jun '17

19 Jun '17

Module: appdb Branch: master Commit: 912ec70350039163fda38e9656f212669746c87e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=912ec70350039163fda38e96… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Jun 16 13:44:06 2017 -0500 Do not show delete button or comment box on manage notes page The sole purpose of the manage notes page is to enable maintainers to reorder the notes display for their version. The delete button and comment box don't actually do anything. Fixes bug 38509. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/objectManager.php | 20 +++++++++++--------- include/tagAssignmentMgr.php | 10 ++++++++++ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 10c52d3..331992b 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -409,17 +409,19 @@ class ObjectManager /* If it isn't implemented, that means there is no default text */ $sDefaultReply = $this->getOptionalSetting("getDefaultReply", ""); - if($this->getIsQueue()) - $sReplyFieldHeader = 'Reply Text'; - else - $sReplyFieldHeader = 'Comment'; + if(!$this->getOptionalSetting("objectHideReplyField", FALSE)) + { + if($this->getIsQueue()) + $sReplyFieldHeader = 'Reply Text'; + else + $sReplyFieldHeader = 'Comment'; - echo html_frame_start($sReplyFieldHeader, "90%", "", 0); - echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; - echo '<tr valign=top><td class="color0"><b>E-mail Text</b></td>',"\n"; - echo '<td><textarea name="sReplyText" style="width: 100%" cols="80" '. + echo html_frame_start($sReplyFieldHeader, "90%", "", 0); + echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; + echo '<tr valign=top><td class="color0"><b>E-mail Text</b></td>',"\n"; + echo '<td><textarea name="sReplyText" style="width: 100%" cols="80" '. 'rows="10">'.$sDefaultReply.'</textarea></td></tr>',"\n"; - + } if($this->getIsQueue()) { ///////////////////////////////////////////////// diff --git a/include/tagAssignmentMgr.php b/include/tagAssignmentMgr.php index 37ddb7f..255bba0 100644 --- a/include/tagAssignmentMgr.php +++ b/include/tagAssignmentMgr.php @@ -52,6 +52,16 @@ abstract class TagAssignmentMgr extends ObjectManagerBase return null; } + function objectHideDelete() + { + return true; + } + + function objectHideReplyField() + { + return true; + } + public function outputEditor() { if(sizeof($this->aTaggedEntries) == 0)

1 0

Rosanne DiMesio : Allow users to see their queued screenshots
by Jeremy Newman 19 Jun '17

19 Jun '17

Module: appdb Branch: master Commit: 9d0754392b73532dc8d5028b2d2ce4968fd8f49d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9d0754392b73532dc8d5028b… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Jun 16 13:42:20 2017 -0500 Allow users to see their queued screenshots Fixes bug 28032. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/user.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/user.php b/include/user.php index 80cd9f4..2d62ea5 100644 --- a/include/user.php +++ b/include/user.php @@ -620,7 +620,8 @@ class User { if(!$oScreenshot->bQueued || ($oScreenshot->bQueued && ($this->hasPriv("admin") || $this->isMaintainer($oScreenshot->iVersionId) || - $this->isSuperMaintainer($oScreenshot->iAppId)))) + $this->isSuperMaintainer($oScreenshot->iAppId) || + $this->iUserId == $oScreenshot->iSubmitterId))) return true; return false;

1 0

Paul Gofman : d3dx9: Add scalar and vector setting path to set_constants() .
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 95a49bdce6cd5a35d5035456e576ab81239fb081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a49bdce6cd5a35d5035456e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 15 01:00:37 2017 +0300 d3dx9: Add scalar and vector setting path to set_constants(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index f10a3c6..2785ca3 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -372,11 +372,14 @@ static void regstore_set_modified(struct d3dx_regstore *rs, unsigned int table, static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, const void *data, unsigned int start_offset, unsigned int count) { + void *out; + if (!count) return; - memcpy((BYTE *)rs->tables[table] + start_offset * table_info[table].component_size, - data, count * table_info[table].component_size); + out = (BYTE *)rs->tables[table] + start_offset * table_info[table].component_size; + assert(data != out); + memcpy(out, data, count * table_info[table].component_size); regstore_set_modified(rs, table, start_offset, count); } @@ -1101,6 +1104,12 @@ static void regstore_set_data(struct d3dx_regstore *rs, unsigned int table, }; enum pres_value_type table_type = table_info[table].type; + if (param_type == table_type) + { + regstore_set_values(rs, table, in, offset, count); + return; + } + set_const_funcs[param_type][table_type]((unsigned int *)rs->tables[table] + offset, in, count); regstore_set_modified(rs, table, offset, count); } @@ -1132,6 +1141,23 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const continue; } param_type = table_type_from_param_type(param->type); + if (const_set->constant_class == D3DXPC_SCALAR || const_set->constant_class == D3DXPC_VECTOR) + { + unsigned int count = max(param->rows, param->columns); + + if (count >= get_reg_components(table)) + { + regstore_set_data(rs, table, start_offset, data, + count * const_set->element_count, param_type); + } + else + { + for (element = 0; element < const_set->element_count; ++element) + regstore_set_data(rs, table, start_offset + get_offset_reg(table, element), + &data[element * count], count, param_type); + } + continue; + } get_const_upload_info(const_set, &info); for (element = 0; element < const_set->element_count; ++element) {

1 0

Paul Gofman : d3dx9: Avoid casting each value separately in set_constants( ).
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: f48d38e5ac72ff0d5cb5951a40072e92a77b4b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48d38e5ac72ff0d5cb5951a4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 15 01:00:36 2017 +0300 d3dx9: Avoid casting each value separately in set_constants(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 101 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 84 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index e9c8387..f10a3c6 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -22,6 +22,7 @@ #include "d3dx9_private.h" #include <float.h> +#include <assert.h> WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -1037,6 +1038,73 @@ static void get_const_upload_info(struct d3dx_const_param_eval_output *const_set info->count = info->major_count * info->minor; } +static void pres_int_from_float(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const float *in_float = in; + int *out_int = out; + + for (i = 0; i < count; ++i) + out_int[i] = in_float[i]; +} + +static void pres_bool_from_value(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const DWORD *in_dword = in; + BOOL *out_bool = out; + + for (i = 0; i < count; ++i) + out_bool[i] = !!in_dword[i]; +} + +static void pres_float_from_int(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const int *in_int = in; + float *out_float = out; + + for (i = 0; i < count; ++i) + out_float[i] = in_int[i]; +} + +static void pres_float_from_bool(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const BOOL *in_bool = in; + float *out_float = out; + + for (i = 0; i < count; ++i) + out_float[i] = !!in_bool[i]; +} + +static void pres_int_from_bool(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const float *in_bool = in; + int *out_int = out; + + for (i = 0; i < count; ++i) + out_int[i] = !!in_bool[i]; +} + +static void regstore_set_data(struct d3dx_regstore *rs, unsigned int table, + unsigned int offset, const unsigned int *in, unsigned int count, enum pres_value_type param_type) +{ + typedef void (*conv_func)(void *out, const void *in, unsigned int count); + static const conv_func set_const_funcs[PRES_VT_COUNT][PRES_VT_COUNT] = + { + {NULL, NULL, pres_int_from_float, pres_bool_from_value}, + {NULL, NULL, NULL, NULL}, + {pres_float_from_int, NULL, NULL, pres_bool_from_value}, + {pres_float_from_bool, NULL, pres_int_from_bool, NULL} + }; + enum pres_value_type table_type = table_info[table].type; + + set_const_funcs[param_type][table_type]((unsigned int *)rs->tables[table] + offset, in, count); + regstore_set_modified(rs, table, offset, count); +} + static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const_tab, ULONG64 new_update_version) { @@ -1047,11 +1115,11 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const struct d3dx_const_param_eval_output *const_set = &const_tab->const_set[const_idx]; unsigned int table = const_set->table; struct d3dx_parameter *param = const_set->param; - enum pres_value_type table_type = table_info[table].type; unsigned int element, i, j, start_offset; unsigned int param_offset; struct const_upload_info info; unsigned int *data = param->data; + enum pres_value_type param_type; if (!is_param_dirty(param, const_tab->update_version)) continue; @@ -1063,22 +1131,23 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const get_offset_reg(table, const_set->register_count)); continue; } + param_type = table_type_from_param_type(param->type); get_const_upload_info(const_set, &info); - for (element = 0; element < const_set->element_count; ++element) { + unsigned int *out = (unsigned int *)rs->tables[table] + start_offset; + + /* Store reshaped but (possibly) not converted yet data temporarily in the same constants buffer. + * All the supported types of parameters and table values have the same size. */ for (i = 0; i < info.major_count; ++i) { for (j = 0; j < info.minor; ++j) { - unsigned int out; - unsigned int *in; unsigned int offset; offset = i * info.major_stride + j; if (get_reg_offset(table, offset) >= const_set->register_count) break; - offset += start_offset; if (info.transpose) param_offset = i + j * info.major; else @@ -1088,23 +1157,19 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const WARN("Parameter data is too short, name %s, component %u.\n", debugstr_a(param->name), i); break; } - - in = (unsigned int *)data + param_offset; - switch (table_type) - { - case PRES_VT_FLOAT: set_number(&out, D3DXPT_FLOAT, in, param->type); break; - case PRES_VT_INT: set_number(&out, D3DXPT_INT, in, param->type); break; - case PRES_VT_BOOL: set_number(&out, D3DXPT_BOOL, in, param->type); break; - default: - FIXME("Unexpected type %#x.\n", table_info[table].type); - break; - } - regstore_set_values(rs, table, &out, offset, 1); + out[offset] = data[param_offset]; } } start_offset += get_offset_reg(table, const_set->register_count); data += param->rows * param->columns; } + start_offset = get_offset_reg(table, const_set->register_index); + if (table_info[table].type == param_type) + regstore_set_modified(rs, table, start_offset, + get_offset_reg(table, const_set->register_count) * const_set->element_count); + else + regstore_set_data(rs, table, start_offset, (unsigned int *)rs->tables[table] + start_offset, + get_offset_reg(table, const_set->register_count) * const_set->element_count, param_type); } const_tab->update_version = new_update_version; } @@ -1310,6 +1375,8 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC ERR("Unexpected register set %u.\n", desc.RegisterSet); return D3DERR_INVALIDCALL; } + assert(table_info[const_set.table].component_size == sizeof(unsigned int)); + assert(param->bytes / (param->rows * param->columns) == sizeof(unsigned int)); const_set.register_count = desc.RegisterCount; table_type = table_info[const_set.table].type; get_const_upload_info(&const_set, &info);

1 0

Nils Kuhnhenn : oleaut32: Use variable with the correct type in LIST_FOR_EACH_ENTRY_SAFE macro.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 0dde88202a97578ffd346ae24d904a4f89cfb9b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dde88202a97578ffd346ae24… Author: Nils Kuhnhenn <kuhnhenn.nils(a)gmail.com> Date: Fri Jun 16 16:05:07 2017 +0200 oleaut32: Use variable with the correct type in LIST_FOR_EACH_ENTRY_SAFE macro. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b88e663..311cca3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4728,10 +4728,9 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) if (!ref) { TLBImpLib *pImpLib, *pImpLibNext; - TLBRefType *ref_type; + TLBRefType *ref_type, *ref_type_next; TLBString *tlbstr, *tlbstr_next; TLBGuid *tlbguid, *tlbguid_next; - void *cursor2; int i; /* remove cache entry */ @@ -4781,7 +4780,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) heap_free(pImpLib); } - LIST_FOR_EACH_ENTRY_SAFE(ref_type, cursor2, &This->ref_list, TLBRefType, entry) + LIST_FOR_EACH_ENTRY_SAFE(ref_type, ref_type_next, &This->ref_list, TLBRefType, entry) { list_remove(&ref_type->entry); heap_free(ref_type);

1 0

Jacek Caban : widl: Try to find imported typelib using .tlb extension if it wasn't specified.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: fbdf119e2c8ac4233c4323835ff82fe3ad3de3d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdf119e2c8ac4233c4323835… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 16 15:25:48 2017 +0200 widl: Try to find imported typelib using .tlb extension if it wasn't specified. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typelib.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 6ac748f..e8dfcb1 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -326,22 +326,42 @@ static void read_msft_importlib(importlib_t *importlib, int fd) free(typeinfo_offs); } +static int open_typelib(const char *name) +{ + char *file_name; + int fd; + + file_name = wpp_find_include(name, NULL); + if(!file_name) + return open(name, O_RDONLY | O_BINARY ); + + fd = open(file_name, O_RDONLY | O_BINARY ); + free(file_name); + return fd; +} + static void read_importlib(importlib_t *importlib) { int fd; INT magic; - char *file_name; - file_name = wpp_find_include(importlib->name, NULL); - if(file_name) { - fd = open(file_name, O_RDONLY | O_BINARY ); - free(file_name); - }else { - fd = open(importlib->name, O_RDONLY | O_BINARY ); + fd = open_typelib(importlib->name); + + /* widl extension: if importlib name has no .tlb extension, try using .tlb */ + if(fd < 0) { + const char *p = strrchr(importlib->name, '.'); + size_t len = p ? p - importlib->name : strlen(importlib->name); + if(strcmp(importlib->name + len, ".tlb")) { + char *tlb_name = xmalloc(len + 5); + memcpy(tlb_name, importlib->name, len); + strcpy(tlb_name + len, ".tlb"); + fd = open_typelib(tlb_name); + free(tlb_name); + } } if(fd < 0) - error("Could not open importlib %s.\n", importlib->name); + error("Could not find importlib %s.\n", importlib->name); tlb_read(fd, &magic, sizeof(magic));

1 0

Hugh McMaster : regedit: Re-insert the default value item after deleting its data.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: cb563dbac61c320032ee14bdb2b6def1960393ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb563dbac61c320032ee14bdb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:59 2017 +0000 regedit: Re-insert the default value item after deleting its data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 3 ++- programs/regedit/framewnd.c | 15 ++++++++++++++- programs/regedit/listview.c | 8 ++++---- programs/regedit/main.h | 2 +- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index d88061c..403def4 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -483,7 +483,8 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW } /* Add the new item to the listview */ - index = AddEntryToList(g_pChildWnd->hListWnd, valueName, valueType, (BYTE *)&valueDword, sizeof(DWORD)); + index = AddEntryToList(g_pChildWnd->hListWnd, valueName, valueType, + (BYTE *)&valueDword, sizeof(DWORD), -1); item.state = LVIS_FOCUSED | LVIS_SELECTED; item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, index, (LPARAM)&item); diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 539be96..361da7e 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -806,7 +806,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } HeapFree(GetProcessHeap(), 0, keyPath); } else if (hWndDelete == g_pChildWnd->hListWnd) { - unsigned int num_selected, index; + unsigned int num_selected, index, focus_idx; WCHAR *keyPath; if (!(num_selected = SendMessageW(g_pChildWnd->hListWnd, LVM_GETSELECTEDCOUNT, 0, 0L))) @@ -821,7 +821,9 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + focus_idx = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED, 0)); index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED, 0)); + while (index != -1) { WCHAR *valueName = GetItemText(g_pChildWnd->hListWnd, index); @@ -832,6 +834,17 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } HeapFree(GetProcessHeap(), 0, valueName); SendMessageW(g_pChildWnd->hListWnd, LVM_DELETEITEM, index, 0L); + /* the default value item is always visible, so add it back in */ + if (!index) + { + AddEntryToList(g_pChildWnd->hListWnd, NULL, REG_SZ, NULL, 0, 0); + if (!focus_idx) + { + LVITEMW item; + item.state = item.stateMask = LVIS_FOCUSED; + SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + } + } index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED, 0)); } HeapFree(GetProcessHeap(), 0, keyPath); diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index caa9a23..1365259 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -157,7 +157,7 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz } } -int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount) +int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos) { LINE_INFO* linfo; LVITEMW item; @@ -178,7 +178,7 @@ int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWOR } item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - item.iItem = SendMessageW(hwndLV, LVM_GETITEMCOUNT, 0, 0); + item.iItem = (pos == -1) ? SendMessageW(hwndLV, LVM_GETITEMCOUNT, 0, 0) : pos; item.iSubItem = 0; item.state = 0; item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; @@ -557,7 +557,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli valSize = max_val_size; if (RegQueryValueExW(hKey, NULL, NULL, &valType, valBuf, &valSize) == ERROR_FILE_NOT_FOUND) { - AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0); + AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0, -1); } for(index = 0; index < val_count; index++) { valNameLen = max_val_name_len; @@ -566,7 +566,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli errCode = RegEnumValueW(hKey, index, valName, &valNameLen, NULL, &valType, valBuf, &valSize); if (errCode != ERROR_SUCCESS) goto done; valBuf[valSize] = 0; - AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize); + AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize, -1); } memset(&item, 0, sizeof(item)); diff --git a/programs/regedit/main.h b/programs/regedit/main.h index f09de34..5331189 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -118,7 +118,7 @@ extern void UpdateStatusBar(void); /* listview.c */ extern void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size); -extern int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount); +extern int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos); extern HWND CreateListView(HWND hwndParent, UINT id); extern BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highlightValue); extern HWND StartValueRename(HWND hwndLV);

1 0

Hugh McMaster : regedit: Use the correct mask flags with LVM_GETNEXTITEM.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 7f76cf6c26012bc6ad9488e96b08133f86f148c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f76cf6c26012bc6ad9488e96… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:50 2017 +0000 regedit: Use the correct mask flags with LVM_GETNEXTITEM. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 0503dc8..539be96 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -187,7 +187,7 @@ static void UpdateMenuItems(HMENU hMenu) { selection = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); keyName = GetItemPath(hwndTV, selection, &hRootKey); index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, - MAKELPARAM(LVIS_FOCUSED | LVIS_SELECTED, 0)); + MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); update_expand_or_collapse_item(hwndTV, selection, hMenu); update_modify_items(hMenu, index);

1 0

Hugh McMaster : regedit: Allow the deletion of registry keys beginning with a lowercase 'H'.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 1f08ee245366958147789ec2ae0c7d80d03ac9b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f08ee245366958147789ec2a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:41 2017 +0000 regedit: Allow the deletion of registry keys beginning with a lowercase 'H'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- programs/regedit/tests/regedit.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 2ce77c4..e08ffa6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -624,7 +624,7 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) { WCHAR *p = pos; - if (*p == 'H') + if (*p == 'H' || *p == 'h') delete_registry_key(p); set_state(parser, LINE_START); diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 49e2396..ec488bf 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1238,13 +1238,13 @@ static void test_key_creation_and_deletion(void) "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n"); verify_key_nonexist(hkey, "Subkey3a"); - todo_wine verify_key_nonexist(hkey, "Subkey3b"); + verify_key_nonexist(hkey, "Subkey3b"); lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } static void test_value_deletion(void) @@ -1296,7 +1296,7 @@ static void test_value_deletion(void) ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } START_TEST(regedit)

1 0

Hugh McMaster : regedit: Use a case insensitive comparison when parsing registry classes from registry file versions 4 and 5.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: f535341d2ba9c18cdacb561a38152d3215af305f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f535341d2ba9c18cdacb561a3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:31 2017 +0000 regedit: Use a case insensitive comparison when parsing registry classes from registry file versions 4 and 5. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- programs/regedit/tests/regedit.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 416938d..2ce77c4 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -392,7 +392,7 @@ static HKEY parse_key_name(WCHAR *key_name, WCHAR **key_path) for (i = 0; i < ARRAY_SIZE(reg_class_keys); i++) { int len = lstrlenW(reg_class_namesW[i]); - if (!strncmpW(key_name, reg_class_namesW[i], len) && + if (!strncmpiW(key_name, reg_class_namesW[i], len) && (key_name[len] == 0 || key_name[len] == '\\')) { return reg_class_keys[i]; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 254073b..49e2396 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1231,20 +1231,20 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n"); - todo_wine verify_key_exist(hkey, "Subkey3a"); - todo_wine verify_key_exist(hkey, "Subkey3b"); + verify_key_exist(hkey, "Subkey3a"); + verify_key_exist(hkey, "Subkey3b"); exec_import_str("REGEDIT4\n\n" "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n"); verify_key_nonexist(hkey, "Subkey3a"); - verify_key_nonexist(hkey, "Subkey3b"); + todo_wine verify_key_nonexist(hkey, "Subkey3b"); lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } static void test_value_deletion(void) @@ -1296,7 +1296,7 @@ static void test_value_deletion(void) ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } START_TEST(regedit)

1 0

Hugh McMaster : regedit: Free the memory used by the REG_DWORD and hex data types after saving the registry value.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 8504a1563de17f7c93023cf317a7bccde7718d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8504a1563de17f7c93023cf31… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:23 2017 +0000 regedit: Free the memory used by the REG_DWORD and hex data types after saving the registry value. We use a BOOL to handle all hex types, including those that are undefined (e.g.0x100). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index f7e8d2a..416938d 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -163,6 +163,7 @@ struct parser 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 */ }; @@ -322,6 +323,7 @@ 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; @@ -826,6 +828,13 @@ 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) + { + HeapFree(GetProcessHeap(), 0, parser->data); + parser->data = NULL; + parser->hex_type = FALSE; + } + if (parser->reg_version == REG_VERSION_31) set_state(parser, PARSE_WIN31_LINE); else @@ -1463,6 +1472,7 @@ BOOL import_registry_file(FILE *reg_file) parser.data_type = 0; parser.data = NULL; parser.data_size = 0; + parser.hex_type = FALSE; parser.state = HEADER; pos = parser.two_wchars;

1 0

Hugh McMaster : regedit: Export hex data types without warning about unsupported data types.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: a1924ae2da1d86000f61eefed5e59150a74468ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1924ae2da1d86000f61eefed… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:11 2017 +0000 regedit: Export hex data types without warning about unsupported 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 | 49 ++-------------------------------------------- 1 file changed, 2 insertions(+), 47 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e977c1a..f7e8d2a 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -400,46 +400,6 @@ static HKEY parse_key_name(WCHAR *key_name, WCHAR **key_path) return 0; } -/* Registry data types */ -static const WCHAR type_none[] = {'R','E','G','_','N','O','N','E',0}; -static const WCHAR type_sz[] = {'R','E','G','_','S','Z',0}; -static const WCHAR type_expand_sz[] = {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0}; -static const WCHAR type_binary[] = {'R','E','G','_','B','I','N','A','R','Y',0}; -static const WCHAR type_dword[] = {'R','E','G','_','D','W','O','R','D',0}; -static const WCHAR type_dword_le[] = {'R','E','G','_','D','W','O','R','D','_','L','I','T','T','L','E','_','E','N','D','I','A','N',0}; -static const WCHAR type_dword_be[] = {'R','E','G','_','D','W','O','R','D','_','B','I','G','_','E','N','D','I','A','N',0}; -static const WCHAR type_multi_sz[] = {'R','E','G','_','M','U','L','T','I','_','S','Z',0}; - -static const struct -{ - DWORD type; - const WCHAR *name; -} -type_rels[] = -{ - {REG_NONE, type_none}, - {REG_SZ, type_sz}, - {REG_EXPAND_SZ, type_expand_sz}, - {REG_BINARY, type_binary}, - {REG_DWORD, type_dword}, - {REG_DWORD_LITTLE_ENDIAN, type_dword_le}, - {REG_DWORD_BIG_ENDIAN, type_dword_be}, - {REG_MULTI_SZ, type_multi_sz}, -}; - -static const WCHAR *reg_type_to_wchar(DWORD type) -{ - int i, array_size = ARRAY_SIZE(type_rels); - - for (i = 0; i < array_size; i++) - { - if (type == type_rels[i].type) - return type_rels[i].name; - } - return NULL; -} - - static void close_key(struct parser *parser) { if (parser->hkey) @@ -1308,16 +1268,11 @@ static void export_hkey(FILE *file, HKEY key, break; } - default: - { - output_message(STRING_UNSUPPORTED_TYPE, reg_type_to_wchar(value_type), *reg_key_name_buf); - output_message(STRING_EXPORT_AS_BINARY, *val_name_buf); - } - /* falls through */ + case REG_NONE: case REG_EXPAND_SZ: case REG_MULTI_SZ: - /* falls through */ case REG_BINARY: + default: REGPROC_export_binary(line_buf, line_buf_size, &line_len, value_type, *val_buf, val_size1, unicode); } REGPROC_write_line(file, *line_buf, unicode);

1 0

Hugh McMaster : regedit: Remove an unused #define.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 300df08e703be914384b95b6adfcfba5ad2a466d URL: http://source.winehq.org/git/wine.git/?a=commit;h=300df08e703be914384b95b6a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:01 2017 +0000 regedit: Remove an unused #define. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 50564c8..e977c1a 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -277,8 +277,6 @@ static BYTE *convert_hex_csv_to_hex(WCHAR *str, DWORD *size) return data; } -#define REG_UNKNOWN_TYPE 99 - /****************************************************************************** * Parses the data type of the registry value being imported and modifies * the input parameter to skip the string representation of the data type.

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 2159e65d7038d7dc87a55570f72515dc7b89d986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2159e65d7038d7dc87a55570f… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jun 16 13:50:38 2017 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 59 +++++++++++++++-------------------------------------------- 1 file changed, 15 insertions(+), 44 deletions(-) diff --git a/po/de.po b/po/de.po index f9dc0dc..ef36881 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-03-06 16:05+0100\n" +"PO-Revision-Date: 2017-06-16 13:49+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -3708,7 +3708,7 @@ msgstr "Array-Objekt erwartet" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Wine-Kernel-DLL" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine" @@ -11839,17 +11839,12 @@ msgid "&About Registry Editor" msgstr "&Über den Registrierungs-Editor" #: regedit.rc:89 regedit.rc:96 regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "ausgeklappt" +msgstr "Erweitern" #: regedit.rc:134 regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "Binäre Daten ändern..." +msgstr "&Binäre Daten ändern..." #: regedit.rc:267 msgid "Export registry" @@ -11948,14 +11943,11 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Befehle zum Zugriff auf häufig benutzte Schlüssel" #: regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"Befehle zum Anzeigen der Hilfe oder von Informationen über das Programm" +"Befehle zum Anzeigen der Hilfe oder von Informationen über den " +"Registrierungs-Editor" #: regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -12153,10 +12145,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: Unbekannte Escape-Sequenz [\\%1!c!]\n" #: regedit.rc:420 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "regedit: Nicht unterstützter Registrierungsdatentyp [%1]\n" +msgstr "regedit: Nicht unterstützter Registrierungsdatentyp [0x%1!x!]\n" #: regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -12200,14 +12190,10 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: Die Registrierungsklasse '%1' konnte nicht gelöscht werden.\n" #: regedit.rc:431 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: Zeile '%1' wurde nicht erkannt.\n" +msgstr "regedit: Die Zeile enthält ungültige Syntax.\n" #: regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "Beendet den Registrierungs-Editor" @@ -12224,10 +12210,8 @@ msgid "Shows or hides the status bar" msgstr "Blendet die Statusleiste ein oder aus" #: regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "Ändert die Position das Fensterteilers" +msgstr "Ändert die Position des Fensterteilers" #: regedit.rc:192 msgid "Refreshes the window" @@ -12270,10 +12254,8 @@ msgid "Adds a new binary value" msgstr "Fügt einen neuen Binärwert hinzu" #: regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Fügt einen neuen Binärwert hinzu" +msgstr "Fügt einen neuen 32-Bit-Wert hinzu" #: regedit.rc:177 msgid "Imports a text file into the registry" @@ -12288,10 +12270,8 @@ msgid "Prints all or part of the registry" msgstr "Druckt Teile oder die gesamte Registry aus" #: regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Registrierungs-Editor" +msgstr "Hilfe zum Registrierungs-Editor öffnen" #: regedit.rc:182 msgid "Displays program information, version number and copyright" @@ -12334,26 +12314,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Der Schlüssel '%1' konnte nicht abgefragt werden." #: regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Ändert die Daten eines Wertes" +msgstr "Ändert die Daten eines Wertes in Binärform" #: regedit.rc:175 msgid "Adds a new multi-string value" msgstr "Fügt eine neue mehrteilige Zeichenfolge hinzu" #: regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Exportiert den ausgewählten Zweig der Registrierung in eine Textdatei" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Fügt eine neue Zeichenfolge hinzu" +msgstr "Fügt eine neue erweiterbare Zeichenfolge hinzu" #: regedit.rc:212 msgid "Confirm Key Delete" @@ -12368,14 +12342,11 @@ msgstr "" #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Erweitert oder reduziert den ausgewählten Knoten" #: regedit.rc:231 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "eingeklappt" +msgstr "Reduzieren" #: regsvr32.rc:32 msgid ""

1 0

Marcin Mikołajczak : po: Updated Polish translation.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 1e643a5203081e9f7387f598f6bad5eadabaea60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e643a5203081e9f7387f598f… Author: Marcin Mikołajczak <me(a)m4sk.in> Date: Thu Jun 15 22:42:21 2017 +0200 po: Updated Polish translation. Signed-off-by: Marcin Mikołajczak <me(a)m4sk.in> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/po/pl.po b/po/pl.po index 7a71c24..6ca4cba 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-06-03 20:40+0200\n" +"PO-Revision-Date: 2017-06-15 22:41+0200\n" "Last-Translator: Marcin Mikołajczak <me(a)m4sk.in>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" @@ -6821,7 +6821,7 @@ msgstr "ścieżka %s nie została odnaleziona" #: msi.rc:32 msgid "insert disk %s" -msgstr "włóż dysk '%s'" +msgstr "włóż dysk %s" #: msi.rc:33 msgid "" @@ -6887,7 +6887,7 @@ msgstr "" #: msi.rc:60 msgid "enter which folder contains %s" -msgstr "podaj, który katalog zawiera '%s'" +msgstr "wprowadź folder zawierający %s" #: msi.rc:61 msgid "install source for feature missing" @@ -6903,7 +6903,7 @@ msgstr "funkcja z:" #: msi.rc:64 msgid "choose which folder contains %s" -msgstr "wybierz, który katalog zawiera '%s'" +msgstr "wybierz folder zawierający '%s'" #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8624,7 +8624,7 @@ msgstr "Pokaż wszystko" #: winemac.rc:37 msgid "Quit %@" -msgstr " Zakończ %@" +msgstr "Zakończ %@" #: winemac.rc:38 msgid "Quit" @@ -11720,11 +11720,11 @@ msgstr "Wyszukiwanie zakończone. Liczba pasujących wyrażeń: %1!d!\n" #: reg.rc:61 msgid "reg: Invalid syntax. " -msgstr "reg: Nieprawidłowa składnia." +msgstr "reg: Nieprawidłowa składnia. " #: reg.rc:62 msgid "reg: Invalid option [%1]. " -msgstr "reg: Nieprawidłowa opcja [%1]." +msgstr "reg: Nieprawidłowa opcja [%1]. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" @@ -11811,10 +11811,8 @@ msgid "Expand" msgstr "Rozwiń" #: regedit.rc:134 regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "Zmień dane binarne..." +msgstr "Zmień dane &binarne..." #: regedit.rc:267 msgid "Export registry" @@ -12311,7 +12309,7 @@ msgstr "" #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Rozwija lub zwija zaznaczony węzeł" #: regedit.rc:231 msgid "Collapse" @@ -13535,7 +13533,7 @@ msgstr "" #: winecfg.rc:236 msgid "A&dd..." -msgstr "&Dodaj" +msgstr "&Dodaj…" #: winecfg.rc:238 msgid "Aut&odetect"

1 0

Alexandre Julliard : ws2_32: Use socklen_t where appropriate.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 92b2172038ed23830a399d18b7523dc37fda1e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b2172038ed23830a399d18b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 13:52:38 2017 +0200 ws2_32: Use socklen_t where appropriate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7a768ac..f212ec2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3053,7 +3053,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD DWORD flags ) { union generic_unix_sockaddr uaddr; - unsigned int uaddrlen = sizeof(uaddr); + socklen_t uaddrlen = sizeof(uaddr); struct ws2_transmitfile_async *wsa; NTSTATUS status; int fd; @@ -7720,8 +7720,8 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, { /* It's invalid to receive OOB data from an OOBINLINED socket * as OOB data is turned into normal data. */ - i = sizeof(n); - if (!getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, (char*) &n, &i) && n) + socklen_t len = sizeof(n); + if (!getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, (char*) &n, &len) && n) { err = WSAEINVAL; goto error;

1 0

Alexandre Julliard : include: Make socklen_t a define to avoid conflicting typedefs.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: dfcf4910e53503196a771946e332196d3c3eb1af URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfcf4910e53503196a771946e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 13:46:22 2017 +0200 include: Make socklen_t a define to avoid conflicting typedefs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2tcpip.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 934c727..337383b 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -54,7 +54,11 @@ typedef struct WS(addrinfoW) struct WS(addrinfoW)* ai_next; } ADDRINFOW, *PADDRINFOW; -typedef int WS(socklen_t); +#ifdef USE_WS_PREFIX +typedef int WS_socklen_t; +#else +#define socklen_t int /* avoid conflicts with the system's socklen_t typedef */ +#endif typedef ADDRINFOA ADDRINFO, *LPADDRINFO;

1 0

Julian Rüger : Fix unfortunate wording in German translation of release 2.8
by Jeremy Newman 16 Jun '17

16 Jun '17

Module: website Branch: master Commit: 3ace9957e8fd1aa3585c6e2e4ba1804cf721edc3 URL: http://source.winehq.org/git/website.git/?a=commit;h=3ace9957e8fd1aa3585c6e… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jun 16 17:46:19 2017 +0200 Fix unfortunate wording in German translation of release 2.8 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017051201.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/de/2017051201.xml b/news/de/2017051201.xml index 2055799..9abe86a 100644 --- a/news/de/2017051201.xml +++ b/news/de/2017051201.xml @@ -7,7 +7,7 @@ <ul> <li>Direct3D-Commandstream läuft nun asynchron.</li> <li>Bessere Autoerkennung von seriellen und parallelen Anschlüssen.</li> - <li>Noch mehr Korrekturen der High-DPI-Einstellungen.</li> + <li>Noch mehr Korrekturen für High-DPI-Umgebungen.</li> <li>Systray-Benachrichtigungen unter MacOS.</li> <li>Diverse Fehlerkorrekturen.</li> </ul>

1 0

Julian Rüger : German translation for release 2.10
by Jeremy Newman 16 Jun '17

16 Jun '17

Module: website Branch: master Commit: fd19f892e0167f2691b078549945937936d25212 URL: http://source.winehq.org/git/website.git/?a=commit;h=fd19f892e0167f2691b078… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jun 16 14:11:08 2017 +0200 German translation for release 2.10 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017060901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2017060901.xml b/news/de/2017060901.xml new file mode 100644 index 0000000..39ac525 --- /dev/null +++ b/news/de/2017060901.xml @@ -0,0 +1,17 @@ +<news> +<date>9. Juni 2017</date> +<title>Wine 2.10 freigegeben</title> +<body> +<p> Die Entwicklungsversion 2.10 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/2.10">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Anfängliche Version eines Android-Grafiktreibers.</li> + <li>Wörterbuch-Unterstützung in WebServices.</li> + <li>Unterschiedliche Direct2D-Korrekturen.</li> + <li>Weitere Verbesserungen der Oberfläche von RegEdit.</li> + <li>Korrekturen am OLE-Zwischenablagen-Cache.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.10.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Julian Rüger : German translation for release 2.9
by Jeremy Newman 16 Jun '17

16 Jun '17

Module: website Branch: master Commit: c54697b1c1e9f6257525c80b2d39d99b47118367 URL: http://source.winehq.org/git/website.git/?a=commit;h=c54697b1c1e9f6257525c8… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jun 16 14:06:34 2017 +0200 German translation for release 2.9 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017052601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2017052601.xml b/news/de/2017052601.xml new file mode 100644 index 0000000..7e0d168 --- /dev/null +++ b/news/de/2017052601.xml @@ -0,0 +1,16 @@ +<news> +<date>26. Mai 2017</date> +<title>Wine 2.9 freigegeben</title> +<body> +<p> Die Entwicklungsversion 2.9 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/2.9">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Unterstützung von Tesselation-Shadern in Direct3D.</li> + <li>Unterstützung des Binärmodus in WebServices.</li> + <li>Änderungen der Zwischenablage werden nun mit Hilfe von Xfixes erkannt.</li> + <li>Verbesserungen an der Benutzeroberfläche von RegEdit.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.9.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Julian Rüger : Update German translation of templates and fix a typo
by Jeremy Newman 16 Jun '17

16 Jun '17

Module: website Branch: master Commit: 3376b3e5d30bae9f0e092e51a008a58bd027dc4d URL: http://source.winehq.org/git/website.git/?a=commit;h=3376b3e5d30bae9f0e092e… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jun 16 14:03:15 2017 +0200 Update German translation of templates and fix a typo Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/de/help.template | 8 ++++---- templates/de/lang.template | 4 ++-- templates/de/search.template | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/templates/de/help.template b/templates/de/help.template index 2242be5..93318ca 100644 --- a/templates/de/help.template +++ b/templates/de/help.template @@ -28,7 +28,7 @@ Die häufigsten Fragen sind schnell beantwortet, nach dem Überfliegen unserer <a href="https://wiki.winehq.org/FAQ">FAQ</a>. Dies ist die erste Anlaufstelle, die Sie aufsuchen sollten, um zu sehen, ob Ihre Frage bereits - beantwortet wurde. + beantwortet wurde. </div> </div> @@ -38,9 +38,9 @@ </div> <div class="col-xs-10 col-md-11"> Wir empfehlen, unsere online verfügbare <a href="{$root}/documentation">Dokumentation</a> zu lesen, - um Antowrten auf Ihre Fragen zu finden. Ebenfalls von Interesse dürfte unsere - <a href="https://wiki.winehq.org/Wine_Installation_and_Configuration">Installations- und Konfigurationsanleitung</a> - sein, die nützliche Informationen besonders für neue Benutzer bereit hält. + um Antworten auf Ihre Fragen zu finden. Ebenfalls von Interesse dürfte unsere + <a href="https://wiki.winehq.org/Wine_Installation_and_Configuration">Installations- und Konfigurationsanleitung</a> + sein, die nützliche Informationen besonders für neue Benutzer bereit hält. </div> </div> diff --git a/templates/de/lang.template b/templates/de/lang.template index c8877b2..a6d2aa4 100644 --- a/templates/de/lang.template +++ b/templates/de/lang.template @@ -1,5 +1,5 @@ - - + +  diff --git a/templates/de/search.template b/templates/de/search.template index bdd55a6..c9aed4f 100644 --- a/templates/de/search.template +++ b/templates/de/search.template @@ -1,5 +1,4 @@  - <h1 class="title" style="margin-bottom: 10px;">Suchergebnisse</h1>

1 0

Julian Rüger : German translation for release 2.8
by Jeremy Newman 16 Jun '17

16 Jun '17

Module: website Branch: master Commit: 8a3f4530d65555a2d9ed1a36e9006e4403448c8e URL: http://source.winehq.org/git/website.git/?a=commit;h=8a3f4530d65555a2d9ed1a… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jun 16 14:00:27 2017 +0200 German translation for release 2.8 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017051201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2017051201.xml b/news/de/2017051201.xml new file mode 100644 index 0000000..2055799 --- /dev/null +++ b/news/de/2017051201.xml @@ -0,0 +1,16 @@ +<news> +<date>12. Mai 2017</date> +<title>Wine 2.8 freigegeben</title> +<body> +<p> Die Entwicklungsversion 2.8 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/2.8">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Direct3D-Commandstream läuft nun asynchron.</li> + <li>Bessere Autoerkennung von seriellen und parallelen Anschlüssen.</li> + <li>Noch mehr Korrekturen der High-DPI-Einstellungen.</li> + <li>Systray-Benachrichtigungen unter MacOS.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.8.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Thomas Faber : advapi32/tests: Properly restore privileges in test_AdjustTokenPrivileges.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: c7f0777fc55229d910461a7a38e21f1e17c8913a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f0777fc55229d910461a7a3… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Jun 15 12:56:48 2017 +0200 advapi32/tests: Properly restore privileges in test_AdjustTokenPrivileges. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0c145a4..09c6a72 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6081,7 +6081,7 @@ static void test_default_dacl_owner_sid(void) static void test_AdjustTokenPrivileges(void) { - TOKEN_PRIVILEGES tp, prev; + TOKEN_PRIVILEGES tp; HANDLE token; DWORD len; LUID luid; @@ -6109,7 +6109,8 @@ static void test_AdjustTokenPrivileges(void) tp.PrivilegeCount = 1; tp.Privileges[0].Luid = luid; tp.Privileges[0].Attributes = 0; - AdjustTokenPrivileges(token, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), &prev, NULL); + ret = AdjustTokenPrivileges(token, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), NULL, NULL); + ok(ret, "got %d\n", ret); CloseHandle(token); }

1 0

Jacek Caban : mshtml/tests: Added IHTMLInputTextElement2 tests.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 0286b11cdaef9a1f7b2efa7017dccb9253326ced URL: http://source.winehq.org/git/wine.git/?a=commit;h=0286b11cdaef9a1f7b2efa701… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 15 13:48:17 2017 +0200 mshtml/tests: Added IHTMLInputTextElement2 tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/elements.js | 64 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 3 ++ dlls/mshtml/tests/script.c | 1 + 3 files changed, 68 insertions(+) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js new file mode 100644 index 0000000..c307e50 --- /dev/null +++ b/dlls/mshtml/tests/elements.js @@ -0,0 +1,64 @@ +/* + * Copyright 2017 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +function test_input_selection() { + var input = document.createElement("input"); + input.type = "text"; + input.value = "test"; + document.body.appendChild(input); + + function test_range(start, end) { + ok(input.selectionStart === start, "input.selectionStart = " + input.selectionStart + " expected " + start); + ok(input.selectionEnd === end, "input.selectionEnd = " + input.selectionEnd + " expected " + end); + } + + test_range(0, 0); + + input.selectionStart = 2; + test_range(2, 2); + + input.selectionStart = -1; + test_range(0, 2); + + input.selectionStart = 10; + test_range(4, 4); + + input.selectionEnd = 2; + test_range(2, 2); + + input.selectionEnd = -1; + test_range(0, 0); + + input.selectionEnd = 10; + test_range(0, 4); + + input.setSelectionRange(2, 3); + test_range(2, 3); + + input.setSelectionRange(-1, 10); + test_range(0, 4); + + input.setSelectionRange(3, 3); + test_range(3, 3); + + next_test(); +} + +var tests = [ + test_input_selection +]; diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 1e2bdd0..2f90c00 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -43,6 +43,9 @@ navigation.js HTML "navigation.js" /* @makedep: xhr.js */ xhr.js HTML "xhr.js" +/* @makedep: elements.js */ +elements.js HTML "elements.js" + /* @makedep: documentmode.js */ documentmode.js HTML "documentmode.js" diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 2753d7d..045835b 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3459,6 +3459,7 @@ static void run_js_tests(void) init_protocol_handler(); run_script_as_http_with_mode("xhr.js", NULL, "11"); + run_script_as_http_with_mode("elements.js", NULL, "11"); run_script_as_http_with_mode("navigation.js", NULL, NULL); run_script_as_http_with_mode("navigation.js", NULL, "11");

1 0

Jacek Caban : mshtml: Expose IHTMLInputTextElement2 to scripts.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 44792c0233524c62037801ed5a1c46a799904c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44792c0233524c62037801ed5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 15 13:48:06 2017 +0200 mshtml: Expose IHTMLInputTextElement2 to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 1 + dlls/mshtml/mshtml_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 06b0d09..c45fe01 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1499,6 +1499,7 @@ static const NodeImplVtbl HTMLInputElementImplVtbl = { static const tid_t HTMLInputElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLInputElement_tid, + IHTMLInputTextElement2_tid, 0 }; static dispex_static_data_t HTMLInputElement_dispex = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index eceadca..a51631c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -175,6 +175,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLImageElementFactory) \ XIID(IHTMLImgElement) \ XIID(IHTMLInputElement) \ + XIID(IHTMLInputTextElement2) \ XIID(IHTMLLabelElement) \ XIID(IHTMLLinkElement) \ XIID(IHTMLLocation) \

1 0

Jacek Caban : mshtml: Added IHTMLInputTextElement2:: setSelectionRange implementation.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 5dee1a3f8917dfa82b4365280292177c4b8c59e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dee1a3f8917dfa82b4365280… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 15 13:47:57 2017 +0200 mshtml: Added IHTMLInputTextElement2::setSelectionRange implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 3dcded9..06b0d09 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1329,8 +1329,21 @@ static HRESULT WINAPI HTMLInputTextElement2_get_selectionEnd(IHTMLInputTextEleme static HRESULT WINAPI HTMLInputTextElement2_setSelectionRange(IHTMLInputTextElement2 *iface, LONG start, LONG end) { HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - FIXME("(%p)->(%d %d)\n", This, start, end); - return E_NOTIMPL; + nsAString none_str; + nsresult nsres; + + static const WCHAR noneW[] = {'n','o','n','e',0}; + + TRACE("(%p)->(%d %d)\n", This, start, end); + + nsAString_InitDepend(&none_str, noneW); + nsres = nsIDOMHTMLInputElement_SetSelectionRange(This->nsinput, start, end, &none_str); + nsAString_Finish(&none_str); + if(NS_FAILED(nsres)) { + ERR("SetSelectionRange failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static const IHTMLInputTextElement2Vtbl HTMLInputTextElement2Vtbl = {

1 0

Jacek Caban : mshtml: Added IHTMLInputTextElement2:: selectionEnd property implementation.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: aebefe17bf0a2c5f54b82f05a7d671b8aacb66f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aebefe17bf0a2c5f54b82f05a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 15 13:47:47 2017 +0200 mshtml: Added IHTMLInputTextElement2::selectionEnd property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 00f714d..3dcded9 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1296,15 +1296,34 @@ static HRESULT WINAPI HTMLInputTextElement2_get_selectionStart(IHTMLInputTextEle static HRESULT WINAPI HTMLInputTextElement2_put_selectionEnd(IHTMLInputTextElement2 *iface, LONG v) { HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - FIXME("(%p)->(%d)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, v); + + nsres = nsIDOMHTMLInputElement_SetSelectionEnd(This->nsinput, v); + if(NS_FAILED(nsres)) { + ERR("SetSelectionEnd failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLInputTextElement2_get_selectionEnd(IHTMLInputTextElement2 *iface, LONG *p) { HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 selection_end; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLInputElement_GetSelectionEnd(This->nsinput, &selection_end); + if(NS_FAILED(nsres)) { + ERR("GetSelectionEnd failed: %08x\n", nsres); + return E_FAIL; + } + + *p = selection_end; + return S_OK; } static HRESULT WINAPI HTMLInputTextElement2_setSelectionRange(IHTMLInputTextElement2 *iface, LONG start, LONG end)

1 0

Jacek Caban : mshtml: Added IHTMLInputTextElement2:: selectionStart property implementation.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 03febf448e989afa92317e2ec045358a31c683cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=03febf448e989afa92317e2ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 15 13:47:37 2017 +0200 mshtml: Added IHTMLInputTextElement2::selectionStart property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index c89dad6..00f714d 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1263,15 +1263,34 @@ static HRESULT WINAPI HTMLInputTextElement2_Invoke(IHTMLInputTextElement2 *iface static HRESULT WINAPI HTMLInputTextElement2_put_selectionStart(IHTMLInputTextElement2 *iface, LONG v) { HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - FIXME("(%p)->(%d)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, v); + + nsres = nsIDOMHTMLInputElement_SetSelectionStart(This->nsinput, v); + if(NS_FAILED(nsres)) { + ERR("SetSelectionStart failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLInputTextElement2_get_selectionStart(IHTMLInputTextElement2 *iface, LONG *p) { HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 selection_start; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLInputElement_GetSelectionStart(This->nsinput, &selection_start); + if(NS_FAILED(nsres)) { + ERR("GetSelectionStart failed: %08x\n", nsres); + return E_FAIL; + } + + *p = selection_start; + return S_OK; } static HRESULT WINAPI HTMLInputTextElement2_put_selectionEnd(IHTMLInputTextElement2 *iface, LONG v)

1 0

Jacek Caban : mshtml: Added IHTMLInputTextElement2 stub implementation.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 0fed758ef022d4b96dfff4d6f18dc3512a1c45c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fed758ef022d4b96dfff4d6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 15 14:55:11 2017 +0200 mshtml: Added IHTMLInputTextElement2 stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 8271bf4..c89dad6 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -39,6 +39,7 @@ struct HTMLInputElement { IHTMLInputElement IHTMLInputElement_iface; IHTMLInputTextElement IHTMLInputTextElement_iface; + IHTMLInputTextElement2 IHTMLInputTextElement2_iface; nsIDOMHTMLInputElement *nsinput; }; @@ -1206,6 +1207,109 @@ static const IHTMLInputTextElementVtbl HTMLInputTextElementVtbl = { HTMLInputTextElement_createTextRange }; +static inline HTMLInputElement *impl_from_IHTMLInputTextElement2(IHTMLInputTextElement2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLInputElement, IHTMLInputTextElement2_iface); +} + +static HRESULT WINAPI HTMLInputTextElement2_QueryInterface(IHTMLInputTextElement2 *iface, REFIID riid, void **ppv) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI HTMLInputTextElement2_AddRef(IHTMLInputTextElement2 *iface) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); +} + +static ULONG WINAPI HTMLInputTextElement2_Release(IHTMLInputTextElement2 *iface) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); +} + +static HRESULT WINAPI HTMLInputTextElement2_GetTypeInfoCount(IHTMLInputTextElement2 *iface, UINT *pctinfo) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLInputTextElement2_GetTypeInfo(IHTMLInputTextElement2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLInputTextElement2_GetIDsOfNames(IHTMLInputTextElement2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLInputTextElement2_Invoke(IHTMLInputTextElement2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLInputTextElement2_put_selectionStart(IHTMLInputTextElement2 *iface, LONG v) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + FIXME("(%p)->(%d)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLInputTextElement2_get_selectionStart(IHTMLInputTextElement2 *iface, LONG *p) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLInputTextElement2_put_selectionEnd(IHTMLInputTextElement2 *iface, LONG v) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + FIXME("(%p)->(%d)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLInputTextElement2_get_selectionEnd(IHTMLInputTextElement2 *iface, LONG *p) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLInputTextElement2_setSelectionRange(IHTMLInputTextElement2 *iface, LONG start, LONG end) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + FIXME("(%p)->(%d %d)\n", This, start, end); + return E_NOTIMPL; +} + +static const IHTMLInputTextElement2Vtbl HTMLInputTextElement2Vtbl = { + HTMLInputTextElement2_QueryInterface, + HTMLInputTextElement2_AddRef, + HTMLInputTextElement2_Release, + HTMLInputTextElement2_GetTypeInfoCount, + HTMLInputTextElement2_GetTypeInfo, + HTMLInputTextElement2_GetIDsOfNames, + HTMLInputTextElement2_Invoke, + HTMLInputTextElement2_put_selectionStart, + HTMLInputTextElement2_get_selectionStart, + HTMLInputTextElement2_put_selectionEnd, + HTMLInputTextElement2_get_selectionEnd, + HTMLInputTextElement2_setSelectionRange +}; + static inline HTMLInputElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLInputElement, element.node); @@ -1229,6 +1333,9 @@ static HRESULT HTMLInputElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IHTMLInputTextElement, riid)) { TRACE("(%p)->(IID_IHTMLInputTextElement %p)\n", This, ppv); *ppv = &This->IHTMLInputTextElement_iface; + }else if(IsEqualGUID(&IID_IHTMLInputTextElement2, riid)) { + TRACE("(%p)->(IID_IHTMLInputTextElement2 %p)\n", This, ppv); + *ppv = &This->IHTMLInputTextElement2_iface; } if(*ppv) { @@ -1361,6 +1468,7 @@ HRESULT HTMLInputElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem ret->IHTMLInputElement_iface.lpVtbl = &HTMLInputElementVtbl; ret->IHTMLInputTextElement_iface.lpVtbl = &HTMLInputTextElementVtbl; + ret->IHTMLInputTextElement2_iface.lpVtbl = &HTMLInputTextElement2Vtbl; ret->element.node.vtbl = &HTMLInputElementImplVtbl; HTMLElement_Init(&ret->element, doc, nselem, &HTMLInputElement_dispex);

1 0

Jacek Caban : mshtml.idl: Added IHTMLInputTextElement2 declaration.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: dadad569f30bea93f9bcf5086b8c861fb3bb62ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=dadad569f30bea93f9bcf5086… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 15 13:47:14 2017 +0200 mshtml.idl: Added IHTMLInputTextElement2 declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 5 +++++ include/mshtml.idl | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 9393b84..947e1b8 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2767,6 +2767,11 @@ #define DISPID_IHTMLINPUTTEXTELEMENT_READONLY DISPID_INPUT+5 #define DISPID_IHTMLINPUTTEXTELEMENT_CREATETEXTRANGE DISPID_INPUT+6 +/* IHTMLInputTextElement2 */ +#define DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONSTART DISPID_INPUT+25 +#define DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONEND DISPID_INPUT+26 +#define DISPID_IHTMLINPUTTEXTELEMENT2_SETSELECTIONRANGE DISPID_INPUT+27 + /* IHTMLSelectElement */ #define DISPID_IHTMLSELECTELEMENT_SIZE DISPID_SELECT+2 #define DISPID_IHTMLSELECTELEMENT_MULTIPLE DISPID_SELECT+3 diff --git a/include/mshtml.idl b/include/mshtml.idl index 4a8913f..10aa69d 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -10955,6 +10955,33 @@ interface IHTMLInputTextElement : IDispatch HRESULT createTextRange([retval, out] IHTMLTxtRange **range); } +/***************************************************************************** + * IHTMLInputTextElement2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f2d2-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLInputTextElement2 : IDispatch +{ + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONSTART)] + HRESULT selectionStart([in] long v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONSTART)] + HRESULT selectionStart([out, retval] long *p); + + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONEND)] + HRESULT selectionEnd([in] long v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONEND)] + HRESULT selectionEnd([out, retval] long *p); + + [id(DISPID_IHTMLINPUTTEXTELEMENT2_SETSELECTIONRANGE)] + HRESULT setSelectionRange([in] long start, [in] long end); +} + [ hidden, uuid(3050f57d-98b5-11cf-bb82-00aa00bdce0b) @@ -11162,6 +11189,21 @@ methods: [propget, id(DISPID_IHTMLINPUTELEMENT2_USEMAP), displaybind, bindable] BSTR useMap(); + + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONSTART)] + void selectionStart(long v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONSTART)] + long selectionStart(); + + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONEND)] + void selectionEnd(long v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT2_SELECTIONEND)] + long selectionEnd(); + + [id(DISPID_IHTMLINPUTTEXTELEMENT2_SETSELECTIONRANGE)] + void setSelectionRange([in] long start, [in] long end); } /***************************************************************************** @@ -11183,7 +11225,7 @@ coclass HTMLInputElement interface IHTMLInputElement; /* interface IHTMLInputElement2; */ interface IHTMLInputTextElement; - /* interface IHTMLInputTextElement2; */ + interface IHTMLInputTextElement2; /* interface IHTMLInputHiddenElement; */ /* interface IHTMLInputButtonElement; */ /* interface IHTMLInputFileElement; */

1 0

Jacek Caban : oleaut32: Simplify VarCat implementation.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 840ab7cd1c797f4a05866dd0eae15bb627b1b637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=840ab7cd1c797f4a05866dd0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 15 15:03:52 2017 +0200 oleaut32: Simplify VarCat implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 123 +++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 70 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index ee203d7..a760a65 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2517,14 +2517,15 @@ VarNumFromParseNum_DecOverflow: */ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) { - VARTYPE leftvt,rightvt,resultvt; + BSTR left_str = NULL, right_str = NULL; + VARTYPE leftvt, rightvt; HRESULT hres; + TRACE("%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), out); + leftvt = V_VT(left); rightvt = V_VT(right); - TRACE("%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), out); - /* when both left and right are NULL the result is NULL */ if (leftvt == VT_NULL && rightvt == VT_NULL) { @@ -2532,9 +2533,6 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) return S_OK; } - hres = S_OK; - resultvt = VT_EMPTY; - /* There are many special case for errors and return types */ if (leftvt == VT_VARIANT && (rightvt == VT_ERROR || rightvt == VT_DATE || rightvt == VT_DECIMAL)) @@ -2560,7 +2558,7 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) rightvt == VT_UINT || rightvt == VT_EMPTY || rightvt == VT_NULL || rightvt == VT_DATE || rightvt == VT_DECIMAL || rightvt == VT_DISPATCH)) - resultvt = VT_BSTR; + hres = S_OK; else if (rightvt == VT_ERROR && leftvt < VT_VOID) hres = DISP_E_TYPEMISMATCH; else if (leftvt == VT_ERROR && (rightvt == VT_DATE || @@ -2590,87 +2588,72 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) /* if result type is not S_OK, then no need to go further */ if (hres != S_OK) { - V_VT(out) = resultvt; + V_VT(out) = VT_EMPTY; return hres; } - /* Else proceed with formatting inputs to strings */ + + if (leftvt == VT_BSTR) + left_str = V_BSTR(left); else { - VARIANT bstrvar_left, bstrvar_right; - VARIANT *tmp; - VARIANT fetched; + VARIANT converted, *tmp = left; - V_VT(out) = VT_BSTR; + VariantInit(&converted); + if(leftvt == VT_DISPATCH) + { + hres = VARIANT_FetchDispatchValue(left, &converted); + if(FAILED(hres)) + goto failed; - VariantInit(&bstrvar_left); - VariantInit(&bstrvar_right); - VariantInit(&fetched); + tmp = &converted; + } - /* Convert left side variant to string */ - if (leftvt != VT_BSTR) + hres = VariantChangeTypeEx(&converted, tmp, 0, VARIANT_ALPHABOOL|VARIANT_LOCALBOOL, VT_BSTR); + if (SUCCEEDED(hres)) + left_str = V_BSTR(&converted); + else if (hres != DISP_E_TYPEMISMATCH) { - tmp = left; - - if(leftvt == VT_DISPATCH) - { - hres = VARIANT_FetchDispatchValue(left, &fetched); - if(FAILED(hres)) - goto failed; + VariantClear(&converted); + goto failed; + } + } - tmp = &fetched; - } + if (rightvt == VT_BSTR) + right_str = V_BSTR(right); + else + { + VARIANT converted, *tmp = right; - hres = VariantChangeTypeEx(&bstrvar_left,tmp,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); - VariantClear(&fetched); - if (hres == DISP_E_TYPEMISMATCH) - { - V_VT(&bstrvar_left) = VT_BSTR; - V_BSTR(&bstrvar_left) = SysAllocStringLen(NULL, 0); - } - else if(hres != S_OK) + VariantInit(&converted); + if(rightvt == VT_DISPATCH) + { + hres = VARIANT_FetchDispatchValue(right, &converted); + if(FAILED(hres)) goto failed; + + tmp = &converted; } - /* convert right side variant to string */ - if (rightvt != VT_BSTR) + hres = VariantChangeTypeEx(&converted, tmp, 0, VARIANT_ALPHABOOL|VARIANT_LOCALBOOL, VT_BSTR); + if (SUCCEEDED(hres)) + right_str = V_BSTR(&converted); + else if (hres != DISP_E_TYPEMISMATCH) { - tmp = right; - - if(rightvt == VT_DISPATCH) - { - hres = VARIANT_FetchDispatchValue(right, &fetched); - if(FAILED(hres)) - goto failed; - - tmp = &fetched; - } - - hres = VariantChangeTypeEx(&bstrvar_right,tmp,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); - VariantClear(&fetched); - if (hres == DISP_E_TYPEMISMATCH) - { - V_VT(&bstrvar_right) = VT_BSTR; - V_BSTR(&bstrvar_right) = SysAllocStringLen(NULL, 0); - } - else if(hres != S_OK) - goto failed; + VariantClear(&converted); + goto failed; } + } - /* Concat the resulting strings together */ - if (leftvt == VT_BSTR && rightvt == VT_BSTR) - hres = VarBstrCat (V_BSTR(left), V_BSTR(right), &V_BSTR(out)); - else if (leftvt != VT_BSTR && rightvt != VT_BSTR) - hres = VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(&bstrvar_right), &V_BSTR(out)); - else if (leftvt != VT_BSTR && rightvt == VT_BSTR) - hres = VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(right), &V_BSTR(out)); - else if (leftvt == VT_BSTR && rightvt != VT_BSTR) - hres = VarBstrCat (V_BSTR(left), V_BSTR(&bstrvar_right), &V_BSTR(out)); + + V_VT(out) = VT_BSTR; + hres = VarBstrCat(left_str, right_str, &V_BSTR(out)); failed: - VariantClear(&bstrvar_left); - VariantClear(&bstrvar_right); - return hres; - } + if(V_VT(left) != VT_BSTR) + SysFreeString(left_str); + if(V_VT(right) != VT_BSTR) + SysFreeString(right_str); + return hres; }

1 0

Hugh McMaster : regedit: Add data parsing operations to the state machine.
by Alexandre Julliard 15 Jun '17

15 Jun '17

1 0

Hugh McMaster : regedit: Perform value name operations in the state machine.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: d60c31eadb121e834c44e4e8ff8cba663effc3e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d60c31eadb121e834c44e4e8f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 12:01:26 2017 +0000 regedit: Perform value name operations in the state machine. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 146 +++++++++++++++++++++++++++------------ programs/regedit/tests/regedit.c | 2 +- 2 files changed, 101 insertions(+), 47 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e1352a7..ad3c5d5 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -138,6 +138,10 @@ enum parser_state LINE_START, /* at the beginning of a registry line */ KEY_NAME, /* parsing a key name */ DELETE_KEY, /* deleting a registry key */ + DEFAULT_VALUE_NAME, /* parsing a default value name */ + QUOTED_VALUE_NAME, /* parsing a double-quoted value name */ + DATA_START, /* preparing for data parsing operations */ + DELETE_VALUE, /* deleting a registry value */ SET_VALUE, /* adding a value to the registry */ NB_PARSER_STATES }; @@ -163,6 +167,10 @@ static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos); static WCHAR *line_start_state(struct parser *parser, WCHAR *pos); static WCHAR *key_name_state(struct parser *parser, WCHAR *pos); static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos); +static WCHAR *default_value_name_state(struct parser *parser, WCHAR *pos); +static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos); +static WCHAR *data_start_state(struct parser *parser, WCHAR *pos); +static WCHAR *delete_value_state(struct parser *parser, WCHAR *pos); static WCHAR *set_value_state(struct parser *parser, WCHAR *pos); static const parser_state_func parser_funcs[NB_PARSER_STATES] = @@ -172,6 +180,10 @@ static const parser_state_func parser_funcs[NB_PARSER_STATES] = line_start_state, /* LINE_START */ key_name_state, /* KEY_NAME */ delete_key_state, /* DELETE_KEY */ + default_value_name_state, /* DEFAULT_VALUE_NAME */ + quoted_value_name_state, /* QUOTED_VALUE_NAME */ + data_start_state, /* DATA_START */ + delete_value_state, /* DELETE_VALUE */ set_value_state, /* SET_VALUE */ }; @@ -435,7 +447,7 @@ static LONG setValue(WCHAR* val_name, WCHAR* val_data, BOOL is_unicode) DWORD dwData, dwLen; WCHAR del[] = {'-',0}; - if ( (val_name == NULL) || (val_data == NULL) ) + if (!val_data) return ERROR_INVALID_PARAMETER; if (lstrcmpW(val_data, del) == 0) @@ -549,49 +561,6 @@ static LONG openKeyW(WCHAR* stdInput) } -/****************************************************************************** - * This function is a wrapper for the setValue function. It prepares the - * land and cleans the area once completed. - * Note: this function modifies the line parameter. - * - * line - registry file unwrapped line. Should have the registry value name and - * complete registry value data. - */ -static void processSetValue(WCHAR* line, BOOL is_unicode) -{ - WCHAR *val_name; - int len = 0; - LONG res; - - /* get value name */ - val_name = line; - - if (*line == '@') - *line++ = 0; - else if (!REGPROC_unescape_string(++val_name, &line)) - goto error; - - while (*line == ' ' || *line == '\t') line++; - if (*line != '=') - goto error; - line++; - while (*line == ' ' || *line == '\t') line++; - - /* trim trailing blanks */ - len = strlenW(line); - while (len > 0 && (line[len - 1] == ' ' || line[len - 1] == '\t')) len--; - line[len] = 0; - - res = setValue(val_name, line, is_unicode); - if ( res != ERROR_SUCCESS ) - output_message(STRING_SETVALUE_FAILED, val_name, currentKeyName); - return; - -error: - output_message(STRING_SETVALUE_FAILED, val_name, currentKeyName); - output_message(STRING_INVALID_LINE_SYNTAX); -} - enum reg_versions { REG_VERSION_31, REG_VERSION_40, @@ -728,9 +697,11 @@ static WCHAR *line_start_state(struct parser *parser, WCHAR *pos) set_state(parser, KEY_NAME); return p + 1; case '@': - case '"': - processSetValue(p, parser->is_unicode); + set_state(parser, DEFAULT_VALUE_NAME); return p; + case '"': + set_state(parser, QUOTED_VALUE_NAME); + return p + 1; case ' ': case '\t': break; @@ -778,6 +749,86 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) return p; } +/* handler for parser DEFAULT_VALUE_NAME state */ +static WCHAR *default_value_name_state(struct parser *parser, WCHAR *pos) +{ + parser->value_name = NULL; + + set_state(parser, DATA_START); + return pos + 1; +} + +/* handler for parser QUOTED_VALUE_NAME state */ +static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *val_name = pos, *p; + + if (parser->value_name) + { + HeapFree(GetProcessHeap(), 0, parser->value_name); + parser->value_name = NULL; + } + + if (!REGPROC_unescape_string(val_name, &p)) + goto invalid; + + /* copy the value name in case we need to parse multiple lines and the buffer is overwritten */ + parser->value_name = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(val_name) + 1) * sizeof(WCHAR)); + CHECK_ENOUGH_MEMORY(parser->value_name); + lstrcpyW(parser->value_name, val_name); + + set_state(parser, DATA_START); + return p; + +invalid: + set_state(parser, LINE_START); + return p; +} + +/* handler for parser DATA_START state */ +static WCHAR *data_start_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *p = pos; + unsigned int len; + + while (*p == ' ' || *p == '\t') p++; + if (*p != '=') goto done; + p++; + while (*p == ' ' || *p == '\t') p++; + + /* trim trailing whitespace */ + len = strlenW(p); + while (len > 0 && (p[len - 1] == ' ' || p[len - 1] == '\t')) len--; + p[len] = 0; + + if (*p == '-') + { + set_state(parser, DELETE_VALUE); + return p; + } + else if (setValue(parser->value_name, p, parser->is_unicode) != ERROR_SUCCESS) + output_message(STRING_SETVALUE_FAILED, parser->value_name, currentKeyName); + +done: + set_state(parser, LINE_START); + return p; +} + +/* handler for parser DELETE_VALUE state */ +static WCHAR *delete_value_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *p = pos + 1; + + while (*p == ' ' || *p == '\t') p++; + if (*p && *p != ';') goto done; + + RegDeleteValueW(currentKeyHandle, parser->value_name); + +done: + set_state(parser, LINE_START); + return p; +} + /* handler for parser SET_VALUE state */ static WCHAR *set_value_state(struct parser *parser, WCHAR *pos) { @@ -1432,6 +1483,9 @@ BOOL import_registry_file(FILE *reg_file) if (parser.reg_version == REG_VERSION_FUZZY || parser.reg_version == REG_VERSION_INVALID) return parser.reg_version == REG_VERSION_FUZZY; + if (parser.value_name) + HeapFree(GetProcessHeap(), 0, parser.value_name); + closeKey(); return TRUE; } diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 32d190c..c7465d8 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1289,7 +1289,7 @@ static void test_value_deletion(void) verify_reg_nonexist(hkey, "Wine46b"); verify_reg_nonexist(hkey, "Wine46c"); verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); - todo_wine verify_reg_nonexist(hkey, "Wine46e"); + verify_reg_nonexist(hkey, "Wine46e"); verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); lr = RegCloseKey(hkey);

1 0

Hugh McMaster : regedit: Perform key operations in the state machine.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: ca98e234518ac0fd61ffd95090dbd20763690fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca98e234518ac0fd61ffd9509… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 12:00:55 2017 +0000 regedit: Perform key operations in the state machine. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 150 ++++++++++++++++++++++----------------------- 1 file changed, 73 insertions(+), 77 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 15ad04e..e1352a7 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -136,6 +136,8 @@ enum parser_state HEADER, /* parsing the registry file version header */ PARSE_WIN31_LINE, /* parsing a Windows 3.1 registry line */ LINE_START, /* at the beginning of a registry line */ + KEY_NAME, /* parsing a key name */ + DELETE_KEY, /* deleting a registry key */ SET_VALUE, /* adding a value to the registry */ NB_PARSER_STATES }; @@ -159,6 +161,8 @@ typedef WCHAR *(*parser_state_func)(struct parser *parser, WCHAR *pos); static WCHAR *header_state(struct parser *parser, WCHAR *pos); static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos); static WCHAR *line_start_state(struct parser *parser, WCHAR *pos); +static WCHAR *key_name_state(struct parser *parser, WCHAR *pos); +static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos); static WCHAR *set_value_state(struct parser *parser, WCHAR *pos); static const parser_state_func parser_funcs[NB_PARSER_STATES] = @@ -166,6 +170,8 @@ static const parser_state_func parser_funcs[NB_PARSER_STATES] = header_state, /* HEADER */ parse_win31_line_state, /* PARSE_WIN31_LINE */ line_start_state, /* LINE_START */ + key_name_state, /* KEY_NAME */ + delete_key_state, /* DELETE_KEY */ set_value_state, /* SET_VALUE */ }; @@ -348,21 +354,20 @@ static BOOL REGPROC_unescape_string(WCHAR *str, WCHAR **unparsed) return ret; } -static HKEY parseKeyName(LPWSTR lpKeyName, LPWSTR *lpKeyPath) +static HKEY parse_key_name(WCHAR *key_name, WCHAR **key_path) { unsigned int i; - if (lpKeyName == NULL) - return 0; + if (!key_name) return 0; - *lpKeyPath = strchrW(lpKeyName, '\\'); - if (*lpKeyPath) (*lpKeyPath)++; + *key_path = strchrW(key_name, '\\'); + if (*key_path) (*key_path)++; for (i = 0; i < ARRAY_SIZE(reg_class_keys); i++) { int len = lstrlenW(reg_class_namesW[i]); - if (!strncmpW(lpKeyName, reg_class_namesW[i], len) && - (lpKeyName[len] == 0 || lpKeyName[len] == '\\')) + if (!strncmpW(key_name, reg_class_namesW[i], len) && + (key_name[len] == 0 || key_name[len] == '\\')) { return reg_class_keys[i]; } @@ -500,36 +505,36 @@ static LONG setValue(WCHAR* val_name, WCHAR* val_data, BOOL is_unicode) return res; } +static void closeKey(void) +{ + if (currentKeyHandle) + { + HeapFree(GetProcessHeap(), 0, currentKeyName); + currentKeyName = NULL; + + RegCloseKey(currentKeyHandle); + currentKeyHandle = NULL; + } +} + /****************************************************************************** - * A helper function for processRegEntry() that opens the current key. - * That key must be closed by calling closeKey(). + * Opens the registry key given by the input path. + * This key must be closed by calling close_key(). */ static LONG openKeyW(WCHAR* stdInput) { - HKEY keyClass; - WCHAR* keyPath; - DWORD dwDisp; + HKEY key_class; + WCHAR *key_path; LONG res; - /* Sanity checks */ - if (stdInput == NULL) - return ERROR_INVALID_PARAMETER; + closeKey(); /* Get the registry class */ - if (!(keyClass = parseKeyName(stdInput, &keyPath))) + if (!stdInput || !(key_class = parse_key_name(stdInput, &key_path))) return ERROR_INVALID_PARAMETER; - res = RegCreateKeyExW( - keyClass, /* Class */ - keyPath, /* Sub Key */ - 0, /* MUST BE 0 */ - NULL, /* object type */ - REG_OPTION_NON_VOLATILE, /* option, REG_OPTION_NON_VOLATILE ... */ - KEY_ALL_ACCESS, /* access mask, KEY_ALL_ACCESS */ - NULL, /* security attribute */ - &currentKeyHandle, /* result */ - &dwDisp); /* disposition, REG_CREATED_NEW_KEY or - REG_OPENED_EXISTING_KEY */ + res = RegCreateKeyExW(key_class, key_path, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, NULL, &currentKeyHandle, NULL); if (res == ERROR_SUCCESS) { @@ -545,19 +550,6 @@ static LONG openKeyW(WCHAR* stdInput) } /****************************************************************************** - * Close the currently opened key. - */ -static void closeKey(void) -{ - if (currentKeyHandle) - { - HeapFree(GetProcessHeap(), 0, currentKeyName); - RegCloseKey(currentKeyHandle); - currentKeyHandle = NULL; - } -} - -/****************************************************************************** * This function is a wrapper for the setValue function. It prepares the * land and cleans the area once completed. * Note: this function modifies the line parameter. @@ -600,38 +592,6 @@ error: output_message(STRING_INVALID_LINE_SYNTAX); } -/****************************************************************************** - * This function receives the currently read entry and performs the - * corresponding action. - * isUnicode affects parsing of REG_MULTI_SZ values - */ -static void processRegEntry(WCHAR* stdInput, BOOL isUnicode) -{ - if ( stdInput[0] == '[') /* We are reading a new key */ - { - WCHAR* keyEnd; - closeKey(); /* Close the previous key */ - - /* Get rid of the square brackets */ - stdInput++; - keyEnd = strrchrW(stdInput, ']'); - if (keyEnd) - *keyEnd='\0'; - else return; - - /* delete the key if we encounter '-' at the start of reg key */ - if (stdInput[0] == '-') - delete_registry_key(stdInput + 1); - else if (openKeyW(stdInput) != ERROR_SUCCESS) - output_message(STRING_OPEN_KEY_FAILED, stdInput); - } else if( currentKeyHandle && - (( stdInput[0] == '@') || /* reading a default @=data pair */ - ( stdInput[0] == '\"'))) /* reading a new value=data pair */ - { - processSetValue(stdInput, isUnicode); - } -} - enum reg_versions { REG_VERSION_31, REG_VERSION_40, @@ -765,11 +725,12 @@ static WCHAR *line_start_state(struct parser *parser, WCHAR *pos) switch (*p) { case '[': + set_state(parser, KEY_NAME); + return p + 1; case '@': case '"': - processRegEntry(p, parser->is_unicode); - set_state(parser, LINE_START); - return line; + processSetValue(p, parser->is_unicode); + return p; case ' ': case '\t': break; @@ -782,6 +743,41 @@ static WCHAR *line_start_state(struct parser *parser, WCHAR *pos) return p; } +/* handler for parser KEY_NAME state */ +static WCHAR *key_name_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *p = pos, *key_end; + + if (*p == ' ' || *p == '\t' || !(key_end = strrchrW(p, ']'))) + goto done; + + *key_end = 0; + + if (*p == '-') + { + set_state(parser, DELETE_KEY); + return p + 1; + } + else if (openKeyW(p) != ERROR_SUCCESS) + output_message(STRING_OPEN_KEY_FAILED, p); + +done: + set_state(parser, LINE_START); + return p; +} + +/* handler for parser DELETE_KEY state */ +static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *p = pos; + + if (*p == 'H') + delete_registry_key(p); + + set_state(parser, LINE_START); + return p; +} + /* handler for parser SET_VALUE state */ static WCHAR *set_value_state(struct parser *parser, WCHAR *pos) { @@ -1348,7 +1344,7 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) lstrcpyW(reg_key_name_buf, reg_key_name); /* open the specified key */ - if (!(reg_key_class = parseKeyName(reg_key_name, &branch_name))) { + if (!(reg_key_class = parse_key_name(reg_key_name, &branch_name))) { output_message(STRING_INCORRECT_REG_CLASS, reg_key_name); exit(1); } @@ -1455,7 +1451,7 @@ void delete_registry_key(WCHAR *reg_key_name) if (!reg_key_name || !reg_key_name[0]) return; - if (!(key_class = parseKeyName(reg_key_name, &key_name))) { + if (!(key_class = parse_key_name(reg_key_name, &key_name))) { output_message(STRING_INCORRECT_REG_CLASS, reg_key_name); exit(1); }

1 0

Hugh McMaster : regedit: Introduce a partial state machine for importing registry data.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: ec87800856c20b90a73924e05ab442a6bae0eec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec87800856c20b90a73924e05… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 12:00:31 2017 +0000 regedit: Introduce a partial state machine for importing registry data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 265 ++++++++++++++++++++++++++++----------- programs/regedit/tests/regedit.c | 16 +-- 2 files changed, 201 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec87800856c20b90a7392…

1 0

Hugh McMaster : regedit: Free the stringValueData buffer before using it again (Coverity).
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: b1e48fb469c8bba38716b85a49965deefb79ec5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1e48fb469c8bba38716b85a4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 11:58:54 2017 +0000 regedit: Free the stringValueData buffer before using it again (Coverity). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index fcf2a60..d88061c 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -378,6 +378,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) { int index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); + HeapFree(GetProcessHeap(), 0, stringValueData); stringValueData = read_value(hwnd, hKey, valueName, &type, &len); format_value_data(g_pChildWnd->hListWnd, index, type, stringValueData, len); }

1 0

Hugh McMaster : regedit/tests: Test whether "" is interpreted as the default registry value.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 06b0a6d94d1428dce9714cebe2092cf4e72e1c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b0a6d94d1428dce9714cebe… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 11:58:46 2017 +0000 regedit/tests: Test whether "" is interpreted as the default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 6800380..c470414 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -264,8 +264,10 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Empty string\"=\"\"\n\n"); + "\"Empty string\"=\"\"\n" + "\"\"=\"Default registry value\"\n\n"); verify_reg(hkey, "Empty string", REG_SZ, "", 1, 0); + verify_reg(hkey, NULL, REG_SZ, "Default registry value", 23, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : regedit/tests: Output "(Default)" when referring to the default registry value.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: c414b2b570973a6e448219163f93bd98631b94d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c414b2b570973a6e448219163… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 11:58:38 2017 +0000 regedit/tests: Output "(Default)" when referring to the default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index b7d6de3..6800380 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -154,13 +154,10 @@ static void r_verify_reg_wsz(unsigned line, HKEY key, const char *value_name, co static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *value_name) { LONG lr; - DWORD fnd_type, fnd_len; - char fnd_value[32]; - fnd_len = sizeof(fnd_value); - lr = RegQueryValueExA(key, value_name, NULL, &fnd_type, (BYTE*)fnd_value, &fnd_len); - lok(lr == ERROR_FILE_NOT_FOUND, "Reg value shouldn't exist: %s\n", - value_name); + lr = RegQueryValueExA(key, value_name, NULL, NULL, NULL, NULL); + lok(lr == ERROR_FILE_NOT_FOUND, "registry value '%s' shouldn't exist; got %d, expected 2\n", + (value_name && *value_name) ? value_name : "(Default)", lr); } #define verify_key_exist(k,s) verify_key_exist_(__LINE__,k,s)

1 0

Hugh McMaster : reg/tests: Test whether "" is interpreted as the default registry value.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 103c8bb6d40e64f50647847b37cdae10fa2e3321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=103c8bb6d40e64f50647847b3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 11:58:30 2017 +0000 reg/tests: Test whether "" is interpreted as the default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 36ec730..2c1cc67 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1320,9 +1320,11 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Empty string\"=\"\"\n\n", &r); + "\"Empty string\"=\"\"\n" + "\"\"=\"Default Value Name\"\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Empty string", REG_SZ, "", 1, 0); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default Value Name", 19, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2160,9 +2162,11 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Empty string\"=\"\"\n\n", &r); + "\"Empty string\"=\"\"\n" + "\"\"=\"Default registry value\"\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Empty string", REG_SZ, "", 1, 0); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default registry value", 23, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : reg/tests: Output "(Default)" when referring to the default registry value.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: c882a064299a0ad39f6c91144138858961f903c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c882a064299a0ad39f6c91144… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 11:58:21 2017 +0000 reg/tests: Output "(Default)" when referring to the default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index d285910..36ec730 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -88,7 +88,7 @@ static void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) err = RegQueryValueExA(hkey, value, NULL, NULL, NULL, NULL); lok(err == ERROR_FILE_NOT_FOUND, "registry value '%s' shouldn't exist; got %d, expected 2\n", - value, err); + (value && *value) ? value : "(Default)", err); } #define verify_key_exist(k,s) verify_key_exist_(__LINE__,k,s)

1 0

Alistair Leslie-Hughes : include/wmsdkidl.idl: Add IWMLanguageList, IWMReaderPlaylistBurn interfaces.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: fd6442f43116ccb56730fe9eac7c8c60ec15904a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd6442f43116ccb56730fe9ea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 14 23:27:39 2017 +0000 include/wmsdkidl.idl: Add IWMLanguageList, IWMReaderPlaylistBurn interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index ea8d63b..b4bd600 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1571,6 +1571,51 @@ interface IWMReaderTypeNegotiation : IUnknown [in] IWMOutputMediaProps *props); }; +[ + object, + uuid(df683f00-2d49-4d8e-92b7-fb19f6a0dc57), + pointer_default(unique), + local +] +interface IWMLanguageList : IUnknown +{ + HRESULT GetLanguageCount( + [out] WORD *count); + + HRESULT GetLanguageDetails( + [in] WORD index, + [out, size_is( *length )] WCHAR *language, + [in, out] WORD *length); + + HRESULT AddLanguageByRFC1766String( + [in] LPCWSTR_WMSDK_TYPE_SAFE language, + [out] WORD *index); +}; + +[ + object, + uuid(f28c0300-9baa-4477-a846-1744d9cbf533), + pointer_default(unique), + local +] +interface IWMReaderPlaylistBurn : IUnknown +{ + HRESULT InitPlaylistBurn( + [in] DWORD count, + [in] LPCWSTR_WMSDK_TYPE_SAFE *filenames, + [in] IWMStatusCallback *callback, + [in] void *context); + + HRESULT GetInitResults( + [in] DWORD count, + [out] HRESULT *stat); + + HRESULT Cancel(); + + HRESULT EndPlaylistBurn([in] HRESULT result); +}; + + cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);")

1 0

André Hentschel : include: Remove duplicate declaration of PFXVerifyPassword.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 0d6906bf21a77fb17abcb972ada9da2cf4b12c10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6906bf21a77fb17abcb972a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 14 23:33:16 2017 +0200 include: Remove duplicate declaration of PFXVerifyPassword. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincrypt.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 2af6a57..abbe99f 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4584,8 +4584,6 @@ BOOL WINAPI PFXExportCertStoreEx(HCERTSTORE hStore, CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, void *pvReserved, DWORD dwFlags); BOOL WINAPI PFXExportCertStore(HCERTSTORE hStore, CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, DWORD dwFlags); -BOOL WINAPI PFXVerifyPassword(CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, - DWORD dwFlags); /* cryptnet.dll functions */ BOOL WINAPI CryptCancelAsyncRetrieval(HCRYPTASYNC hAsyncRetrieval);

1 0

Michael Müller : advapi32/tests: Add basic tests for token security descriptors.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 3ef07ac9dd9eddb14a3e05e1be7ee0b2d188346d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef07ac9dd9eddb14a3e05e1b… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 14 20:20:44 2017 +0200 advapi32/tests: Add basic tests for token security descriptors. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 82 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 7842d0e..0c145a4 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -229,6 +229,7 @@ static void init(void) pGetAce = (void *)GetProcAddress(hmod, "GetAce"); pGetWindowsAccountDomainSid = (void *)GetProcAddress(hmod, "GetWindowsAccountDomainSid"); pGetSidIdentifierAuthority = (void *)GetProcAddress(hmod, "GetSidIdentifierAuthority"); + pDuplicateTokenEx = (void *)GetProcAddress(hmod, "DuplicateTokenEx"); myARGC = winetest_get_mainargs( &myARGV ); } @@ -3012,7 +3013,6 @@ static void test_impersonation_level(void) HKEY hkey; DWORD error; - pDuplicateTokenEx = (void *)GetProcAddress(hmod, "DuplicateTokenEx"); if( !pDuplicateTokenEx ) { win_skip("DuplicateTokenEx is not available\n"); return; @@ -6715,6 +6715,85 @@ static void test_maximum_allowed(void) CloseHandle(handle); } +static void test_token_security_descriptor(void) +{ + char buffer_sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; + SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)&buffer_sd, *sd2; + char buffer_acl[256]; + ACL *acl = (ACL *)&buffer_acl, *acl2; + BOOL defaulted, present, ret; + ACCESS_ALLOWED_ACE *ace; + SECURITY_ATTRIBUTES sa; + HANDLE token, token2; + DWORD size; + PSID psid; + + if (!pDuplicateTokenEx || !pConvertStringSidToSidA || !pAddAccessAllowedAceEx || !pGetAce + || !pSetEntriesInAclW) + { + win_skip("Some functions not available\n"); + return; + } + + /* Test whether we can create tokens with security descriptors */ + ret = OpenProcessToken(GetCurrentProcess(), MAXIMUM_ALLOWED, &token); + ok(ret, "OpenProcessToken failed with error %u\n", GetLastError()); + + ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); + ok(ret, "InitializeSecurityDescriptor failed with error %u\n", GetLastError()); + + ret = InitializeAcl(acl, 256, ACL_REVISION); + ok(ret, "InitializeAcl failed with error %u\n", GetLastError()); + + ret = pConvertStringSidToSidA("S-1-5-6", &psid); + ok(ret, "ConvertStringSidToSidA failed with error %u\n", GetLastError()); + + ret = pAddAccessAllowedAceEx(acl, ACL_REVISION, NO_PROPAGATE_INHERIT_ACE, GENERIC_ALL, psid); + ok(ret, "AddAccessAllowedAceEx failed with error %u\n", GetLastError()); + + ret = SetSecurityDescriptorDacl(sd, TRUE, acl, FALSE); + ok(ret, "SetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + + sa.nLength = sizeof(SECURITY_ATTRIBUTES); + sa.lpSecurityDescriptor = sd; + sa.bInheritHandle = FALSE; + + ret = pDuplicateTokenEx(token, MAXIMUM_ALLOWED, &sa, SecurityImpersonation, TokenImpersonation, &token2); + ok(ret, "DuplicateTokenEx failed with error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(token2, DACL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd2 = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token2, DACL_SECURITY_INFORMATION, sd2, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl2 = (void *)0xdeadbeef; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorDacl(sd2, &present, &acl2, &defaulted); + ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + ok(present, "acl2 not present\n"); + ok(acl2 != (void *)0xdeadbeef, "acl2 not set\n"); + ok(acl2->AceCount == 1, "Expected 1 ACE, got %d\n", acl2->AceCount); + ok(!defaulted, "acl2 defaulted\n"); + + ret = pGetAce(acl2, 0, (void **)&ace); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + ok(ace->Header.AceType == ACCESS_ALLOWED_ACE_TYPE, "Unexpected ACE type %#x\n", ace->Header.AceType); + ok(EqualSid(&ace->SidStart, psid), "Expected access allowed ACE\n"); + ok(ace->Header.AceFlags == NO_PROPAGATE_INHERIT_ACE, + "Expected NO_PROPAGATE_INHERIT_ACE as flags, got %x\n", ace->Header.AceFlags); + + HeapFree(GetProcessHeap(), 0, sd2); + + LocalFree(psid); + + CloseHandle(token2); + CloseHandle(token); +} + START_TEST(security) { init(); @@ -6764,4 +6843,5 @@ START_TEST(security) test_GetSidIdentifierAuthority(); test_pseudo_tokens(); test_maximum_allowed(); + test_token_security_descriptor(); }

1 0

Michael Müller : server: Implement setting a security descriptor when duplicating tokens.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 7c08e787b1a0381a4741cd8710834bfbae29e32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c08e787b1a0381a4741cd871… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 14 20:20:43 2017 +0200 server: Implement setting a security descriptor when duplicating tokens. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 7 ++++++- include/wine/server_protocol.h | 5 +++-- server/process.c | 2 +- server/protocol.def | 2 +- server/request.h | 5 ++--- server/security.h | 2 +- server/token.c | 14 +++++++++++--- server/trace.c | 2 +- 8 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 86beb03..8938d5d 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -83,11 +83,15 @@ NTSTATUS WINAPI NtDuplicateToken( OUT PHANDLE NewToken) { NTSTATUS status; + data_size_t len; + struct object_attributes *objattr; TRACE("(%p,0x%08x,%s,0x%08x,0x%08x,%p)\n", ExistingToken, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes), ImpersonationLevel, TokenType, NewToken); + if ((status = alloc_object_attributes( ObjectAttributes, &objattr, &len ))) return status; + if (ObjectAttributes && ObjectAttributes->SecurityQualityOfService) { SECURITY_QUALITY_OF_SERVICE *SecurityQOS = ObjectAttributes->SecurityQualityOfService; @@ -102,14 +106,15 @@ NTSTATUS WINAPI NtDuplicateToken( { req->handle = wine_server_obj_handle( ExistingToken ); req->access = DesiredAccess; - req->attributes = ObjectAttributes ? ObjectAttributes->Attributes : 0; req->primary = (TokenType == TokenPrimary); req->impersonation_level = ImpersonationLevel; + wine_server_add_data( req, objattr, len ); status = wine_server_call( req ); if (!status) *NewToken = wine_server_ptr_handle( reply->new_handle ); } SERVER_END_REQ; + RtlFreeHeap( GetProcessHeap(), 0, objattr ); return status; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0d7a7cd..d31579c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4732,9 +4732,10 @@ struct duplicate_token_request struct request_header __header; obj_handle_t handle; unsigned int access; - unsigned int attributes; int primary; int impersonation_level; + /* VARARG(objattr,object_attributes); */ + char __pad_28[4]; }; struct duplicate_token_reply { @@ -6418,6 +6419,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 532 +#define SERVER_PROTOCOL_VERSION 533 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index 5eabbbe..4f38ae1 100644 --- a/server/process.c +++ b/server/process.c @@ -565,7 +565,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit : alloc_handle_table( process, 0 ); /* Note: for security reasons, starting a new process does not attempt * to use the current impersonation token for the new process */ - process->token = token_duplicate( parent->token, TRUE, 0 ); + process->token = token_duplicate( parent->token, TRUE, 0, NULL ); process->affinity = parent->affinity; } if (!process->handles || !process->token) goto error; diff --git a/server/protocol.def b/server/protocol.def index 7eaaec2..1f88c6a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3316,9 +3316,9 @@ enum caret_state @REQ(duplicate_token) obj_handle_t handle; /* handle to the token to duplicate */ unsigned int access; /* access rights to the new token */ - unsigned int attributes; /* object attributes */ int primary; /* is the new token to be a primary one? */ int impersonation_level; /* impersonation level of the new token */ + VARARG(objattr,object_attributes); /* object attributes */ @REPLY obj_handle_t new_handle; /* duplicated handle */ @END diff --git a/server/request.h b/server/request.h index ad89f30..30d2234 100644 --- a/server/request.h +++ b/server/request.h @@ -2113,9 +2113,8 @@ C_ASSERT( FIELD_OFFSET(struct check_token_privileges_reply, has_privileges) == 8 C_ASSERT( sizeof(struct check_token_privileges_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, access) == 16 ); -C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, attributes) == 20 ); -C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, primary) == 24 ); -C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, impersonation_level) == 28 ); +C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, primary) == 20 ); +C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, impersonation_level) == 24 ); C_ASSERT( sizeof(struct duplicate_token_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct duplicate_token_reply, new_handle) == 8 ); C_ASSERT( sizeof(struct duplicate_token_reply) == 16 ); diff --git a/server/security.h b/server/security.h index 5c76821..3cbfcb9 100644 --- a/server/security.h +++ b/server/security.h @@ -53,7 +53,7 @@ extern const PSID security_builtin_admins_sid; extern struct token *token_create_admin(void); extern struct token *token_duplicate( struct token *src_token, unsigned primary, - int impersonation_level ); + int impersonation_level, const struct security_descriptor *sd ); extern int token_check_privileges( struct token *token, int all_required, const LUID_AND_ATTRIBUTES *reqprivs, unsigned int count, LUID_AND_ATTRIBUTES *usedprivs); diff --git a/server/token.c b/server/token.c index 9183595..f518544 100644 --- a/server/token.c +++ b/server/token.c @@ -622,7 +622,7 @@ static struct token *create_token( unsigned primary, const SID *user, } struct token *token_duplicate( struct token *src_token, unsigned primary, - int impersonation_level ) + int impersonation_level, const struct security_descriptor *sd ) { const luid_t *modified_id = primary || (impersonation_level == src_token->impersonation_level) ? @@ -672,6 +672,9 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, return NULL; } + if (sd) default_set_sd( &token->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION ); + return token; } @@ -1240,15 +1243,20 @@ DECL_HANDLER(get_token_privileges) DECL_HANDLER(duplicate_token) { struct token *src_token; + struct unicode_str name; + const struct security_descriptor *sd; + const struct object_attributes *objattr = get_req_object_attributes( &sd, &name, NULL ); + + if (!objattr) return; if ((src_token = (struct token *)get_handle_obj( current->process, req->handle, TOKEN_DUPLICATE, &token_ops ))) { - struct token *token = token_duplicate( src_token, req->primary, req->impersonation_level ); + struct token *token = token_duplicate( src_token, req->primary, req->impersonation_level, sd ); if (token) { - reply->new_handle = alloc_handle( current->process, token, req->access, req->attributes); + reply->new_handle = alloc_handle_no_access_check( current->process, token, req->access, objattr->attributes ); release_object( token ); } release_object( src_token ); diff --git a/server/trace.c b/server/trace.c index 6e23184..962b122 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3927,9 +3927,9 @@ static void dump_duplicate_token_request( const struct duplicate_token_request * { fprintf( stderr, " handle=%04x", req->handle ); fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); fprintf( stderr, ", primary=%d", req->primary ); fprintf( stderr, ", impersonation_level=%d", req->impersonation_level ); + dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_duplicate_token_reply( const struct duplicate_token_reply *req )

1 0

Michael Müller : server: Do not set SE_{D, S}ACL_PRESENT if no {D, S}ACL was set.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 187b53e5a5b13b85356a3b564565c45a101690ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=187b53e5a5b13b85356a3b564… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 14 20:20:42 2017 +0200 server: Do not set SE_{D, S}ACL_PRESENT if no {D, S}ACL was set. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- server/handle.c | 2 -- server/object.c | 16 ++++++++++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index dfc0a23..7842d0e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6207,8 +6207,8 @@ static void test_AddMandatoryAce(void) present = TRUE; ret = GetSecurityDescriptorSacl(sd2, &present, &sacl, &defaulted); ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); - todo_wine ok(!present, "SACL is present\n"); - todo_wine ok(sacl == (void *)0xdeadbeef, "SACL is set\n"); + ok(!present, "SACL is present\n"); + ok(sacl == (void *)0xdeadbeef, "SACL is set\n"); HeapFree(GetProcessHeap(), 0, sd2); CloseHandle(handle); diff --git a/server/handle.c b/server/handle.c index faa3a9f..35ab860 100644 --- a/server/handle.c +++ b/server/handle.c @@ -734,7 +734,6 @@ DECL_HANDLER(get_security_object) else req_sd.group_len = 0; - req_sd.control |= SE_SACL_PRESENT; sacl = sd_get_sacl( sd, &present ); if (req->security_info & SACL_SECURITY_INFORMATION && present) req_sd.sacl_len = sd->sacl_len; @@ -747,7 +746,6 @@ DECL_HANDLER(get_security_object) else req_sd.sacl_len = 0; - req_sd.control |= SE_DACL_PRESENT; dacl = sd_get_dacl( sd, &present ); if (req->security_info & DACL_SECURITY_INFORMATION && present) req_sd.dacl_len = sd->dacl_len; diff --git a/server/object.c b/server/object.c index 70872e8..4455718 100644 --- a/server/object.c +++ b/server/object.c @@ -583,15 +583,18 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri } else new_sd.group_len = 0; - new_sd.control |= SE_SACL_PRESENT; sacl = sd_get_sacl( sd, &present ); if (set_info & SACL_SECURITY_INFORMATION && present) + { + new_sd.control |= SE_SACL_PRESENT; new_sd.sacl_len = sd->sacl_len; + } else if (set_info & LABEL_SECURITY_INFORMATION && present) { const ACL *old_sacl = NULL; if (obj->sd && obj->sd->control & SE_SACL_PRESENT) old_sacl = sd_get_sacl( obj->sd, &present ); if (!(replaced_sacl = replace_security_labels( old_sacl, sacl ))) return 0; + new_sd.control |= SE_SACL_PRESENT; new_sd.sacl_len = replaced_sacl->AclSize; sacl = replaced_sacl; } @@ -600,24 +603,33 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri if (obj->sd) sacl = sd_get_sacl( obj->sd, &present ); if (obj->sd && present) + { + new_sd.control |= SE_SACL_PRESENT; new_sd.sacl_len = obj->sd->sacl_len; + } else new_sd.sacl_len = 0; } - new_sd.control |= SE_DACL_PRESENT; dacl = sd_get_dacl( sd, &present ); if (set_info & DACL_SECURITY_INFORMATION && present) + { + new_sd.control |= SE_DACL_PRESENT; new_sd.dacl_len = sd->dacl_len; + } else { if (obj->sd) dacl = sd_get_dacl( obj->sd, &present ); if (obj->sd && present) + { + new_sd.control |= SE_DACL_PRESENT; new_sd.dacl_len = obj->sd->dacl_len; + } else if (token) { dacl = token_get_default_dacl( token ); + new_sd.control |= SE_DACL_PRESENT; new_sd.dacl_len = dacl->AclSize; } else new_sd.dacl_len = 0;

1 0

Michael Müller : server: Implement changing the label of a security descriptor.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: af2d01c2fac1065382d162cdc7c6b2390e0b4b22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af2d01c2fac1065382d162cdc… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 14 20:20:41 2017 +0200 server: Implement changing the label of a security descriptor. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 151 ++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/sec.c | 3 +- server/handle.c | 3 +- server/object.c | 16 ++++- server/security.h | 1 + server/token.c | 69 +++++++++++++++++++ 6 files changed, 239 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af2d01c2fac1065382d16…

1 0

Michael Müller : server: Implement querying the security label of a security descriptor.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 2ebe67963803d46cce77c770696f3b733a627fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ebe67963803d46cce77c7706… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 14 20:20:40 2017 +0200 server: Implement querying the security label of a security descriptor. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 84 ++++++++++++++++++++++++++++++++++++++---- include/winnt.h | 35 +++++++++--------- server/handle.c | 9 +++++ server/security.h | 1 + server/token.c | 41 +++++++++++++++++++++ 5 files changed, 146 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ebe67963803d46cce77c…

1 0

Rosanne DiMesio : Remove default text from screenshots reply edit box
by Jeremy Newman 15 Jun '17

15 Jun '17

Module: appdb Branch: master Commit: 8be8ec82ab9c2af0c6935cac09164cdbbe3cbd7c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8be8ec82ab9c2af0c6935cac… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Jun 15 14:13:23 2017 -0500 Remove default text from screenshots reply edit box Fixes the last remaining problem mentioned in bug 26930. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/screenshot.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index 1c14aed..a2f4da2 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -761,11 +761,6 @@ class screenshot return TRUE; } - function getDefaultReply() - { - return appData::getDefaultReply(); - } - function display() { /* STUB */

1 0

Rosanne DiMesio : Update appdb_tables
by Jeremy Newman 15 Jun '17

15 Jun '17

Module: appdb Branch: master Commit: 9fb59dab09876f41a8476f2223735f45ec5d6c7d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9fb59dab09876f41a8476f22… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Jun 15 11:52:05 2017 -0500 Update appdb_tables Common reply tags are already in the live database; also added missing drop table statements. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- tables/appdb_tables.sql | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index d60ee68..d4c5b6b 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -13,7 +13,10 @@ drop table if exists appData; drop table if exists appBundle; drop table if exists appVotes; drop table if exists appNotes; -drop table if exists tags; +drop table if exists tags_NoteVersion_assignments; +drop table if exists commonReplies; +drop table if exists tags_CommonReply; +drop table if exists tags_CommonReply_assignments; /* @@ -217,6 +220,13 @@ create table tags_CommonReply ( key(id) ); +INSERT INTO `tags_CommonReply` (`id`, `state`, `textId`, `name`, `description`, `multipleAssignments`) VALUES +(1, 'accepted', '_show_for_version_queue', 'Show when processing versions', '', 1), +(2, 'accepted', '_show_for_application_queue', 'Show when processing applications', '', 1), +(3, 'accepted', '_show_for_screenshot', 'Show when processing screenshots', '', 1), +(4, 'accepted', '_show_for_testData_queue', 'Show when processing test results', '', 1), +(5, 'accepted', '_show_for_bug', 'Show when processing bug links', '', 1), +(6, 'accepted', '_show_for_maintainer', 'Show when processing maintainer entries', '', 1); /* * Tags for CommonReply - assignments

1 0

Rosanne DiMesio : Add updateVersionRatings function
by Jeremy Newman 15 Jun '17

15 Jun '17

Module: appdb Branch: master Commit: 55d0546e94d725687a9b58641feb14181397fe6f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=55d0546e94d725687a9b5864… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jun 14 09:41:41 2017 -0500 Add updateVersionRatings function Adds a function to the control center to enable admins to force an update of the version ratings cached in the appVersion table. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin.php | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/admin.php b/admin.php index f38924d..79fbd58 100644 --- a/admin.php +++ b/admin.php @@ -220,13 +220,29 @@ function deleteOrphanVersions() echo "Deleted ".query_affected_rows()." orphan versions.<br>"; } +function updateVersionRatings() +{ + $hResult = version::objectGetEntries('accepted'); + + $i = 0; + while($oRow = query_fetch_object($hResult)) + { + $oVersion = new version(null, $oRow); + $oVersion->updateRatingInfo(); + $i++; + } + + echo "Updated $i entries"; +} + function showChoices() { echo '<a href="admin.php?sAction=fixNoteLinks">Fix/Show note links</a><br />'; echo '<a href="admin.php?sAction=updateAppMaintainerStates">Update application maintainer states</a><br />'; echo '<a href="admin.php?sAction=updateVersionMaintainerStates">Update version maintainer states</a><br />'; echo '<a href="admin.php?sAction=deleteOrphanComments">Delete Orphan Comments</a><br>'; - echo '<a href="admin.php?sAction=deleteOrphanVersions">Delete Orphan Versions</a><br>'; + echo '<a href="admin.php?sAction=deleteOrphanVersions">Delete Orphan Versions</a><br>'; + echo '<a href="admin.php?sAction=updateVersionRatings">Update Version Ratings</a><br>'; } switch(getInput('sAction', $aClean)) @@ -249,7 +265,11 @@ switch(getInput('sAction', $aClean)) case 'deleteOrphanVersions': deleteOrphanVersions(); - break; + break; + + case 'updateVersionRatings': + updateVersionRatings(); + break; default: showChoices();

1 0

Rosanne DiMesio : Use latest test for version rating
by Jeremy Newman 15 Jun '17

15 Jun '17

Module: appdb Branch: master Commit: d96133072376c633f3f825b731bced7703b4af2d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d96133072376c633f3f825b7… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jun 14 09:03:22 2017 -0500 Use latest test for version rating Fixes bug 19377. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> --- include/testData.php | 84 ++++++++-------------------------------------------- include/version.php | 8 ++--- 2 files changed, 16 insertions(+), 76 deletions(-) diff --git a/include/testData.php b/include/testData.php index 61b23a0..bf5b727 100644 --- a/include/testData.php +++ b/include/testData.php @@ -185,6 +185,13 @@ class testData{ $sWhatChanged .= "Tested release was changed from ". $oOldTest->sTestedRelease." to $this->sTestedRelease.\n"; } + + if($this->iStaging != $oOldTest->iStaging) + { + $bUpdateRatingInfo = true; + $sWhatChanged .= "Staging checkbox was changed from ". + $oOldTest->iStaging." to $this->iStaging.\n"; + } if($this->iVersionId != $oOldTest->iVersionId) { @@ -729,79 +736,12 @@ class testData{ /* Gets rating info for the selected version: an array with the elements 0 - Rating - 1 - Wine version - The $sDate parameter can be used to calculate the rating at a given point in time */ - public static function getRatingInfoForVersionId($iVersionId, $sDate = 'NOW()') + 1 - Wine version (including staging info)*/ + public static function getRatingInfoForVersionId($iVersionId) { - $sQuery = "SELECT testedRating,testedDate,testedRelease,staging,versions.id as versionId - FROM testResults, ?.versions WHERE - versions.value = testResults.testedRelease - AND - versions.product_id = '?' - AND versionId = '?' - AND - state = '?' - AND - TO_DAYS(testedDate) > (TO_DAYS(?) - ?) - ORDER BY versions.id DESC,testedDate DESC"; - - $hResult = query_parameters($sQuery, BUGZILLA_DB, BUGZILLA_PRODUCT_ID, $iVersionId, 'accepted', $sDate, TESTDATA_AGED_THRESHOLD); - - $aEntries = array(); - - if($hResult) - { - $iPrevRelease = 0; - $iIndex = -1; - for($i = 0; $oRow = query_fetch_object($hResult); $i++) - { - if($iPrevRelease != $oRow->versionId) - { - $iIndex++; - $iPrevRelease = $oRow->versionId; - } - - if(!$aEntries[$iIndex]) - { - $aEntries[$iIndex] = array(); - $aEntries[$iIndex][0] = 0; - $aEntries[$iIndex][1] = 0; - $aEntries[$iIndex][2] = $oRow->testedRelease; - } - - $aEntries[$iIndex][0] += testData::RatingToNumber($oRow->testedRating); - $aEntries[$iIndex][1]++; - } - } - - $sRelease = ''; - - if(sizeof($aEntries)) - { - $fRating = 0.0; - - for($i = 0; $i < sizeof($aEntries); $i++) - { - /* Discard the rating if it's the only one for that Wine version - and its score is lower than previous averages */ - if(($aEntries[$i][1] < 2) && sizeof($aEntries) > ($i+1) && ($aEntries[$i][0] < ($aEntries[$i+1][0] / $aEntries[$i+1][1]))) - continue; - - $fRating = $aEntries[$i][0] / $aEntries[$i][1]; - $sRelease = $aEntries[$i][2]; - break; - } - - $sRating = testData::NumberToRating(round($fRating, 0)); - } - - if(!$sRelease) - { - $iNewestId = testData::getNewestTestIdFromVersionId($iVersionId); - $oTestData = new testData($iNewestId); - return array($oTestData->sTestedRating, $oTestData->sTestedRelease); - } - return array($sRating,$sRelease); + $iNewestId = testData::getNewestTestIdFromVersionId($iVersionId); + $oTestData = new testData($iNewestId); + return array($oTestData->sTestedRating, ($oTestData->sTestedRelease) . ($oTestData->iStaging != 0 ? '-staging':'')); } /* retrieve the latest test result for a given version id */ diff --git a/include/version.php b/include/version.php index 2c09be7..f75b711 100644 --- a/include/version.php +++ b/include/version.php @@ -1021,11 +1021,11 @@ class version { <td>{$shVoteText}</td> </tr> <tr> - <td><b>Rating:</b></td> + <td><b>Latest Rating:</b></td> <td>{$this->sTestedRating}</td> </tr> <tr> - <td><b>Wine Version:</b></td> + <td><b>Latest Wine Version Tested:</b></td> <td>{$this->sTestedRelease}</td> </tr> </tbody> @@ -1230,11 +1230,11 @@ EOT; $oTableRow->AddTextCell("Description"); - $oTableCell = new TableCell("Rating"); + $oTableCell = new TableCell("Latest Rating"); $oTableCell->SetWidth("80"); $oTableRow->AddCell($oTableCell); - $oTableCell = new TableCell("Wine version"); + $oTableCell = new TableCell("Latest Wine version tested"); $oTableCell->SetWidth("80"); $oTableRow->AddCell($oTableCell);

1 0

Francois Gouget : testbot/TestLauncher: Constify some variables.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: tools Branch: master Commit: 97048a6013c588651cc36cdf4ad2c9268f350979 URL: http://source.winehq.org/git/tools.git/?a=commit;h=97048a6013c588651cc36cdf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 15 01:46:42 2017 +0200 testbot/TestLauncher: Constify some variables. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 53590f8..2e9a62f 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -53,9 +53,9 @@ static void _ReportError(const char *Format, ...) Failures++; } -static DWORD ConvertRVAToDiskOffset(DWORD RVA, DWORD SectionHeaderCount, PIMAGE_SECTION_HEADER SectionHeaders) +static DWORD ConvertRVAToDiskOffset(DWORD RVA, DWORD SectionHeaderCount, const IMAGE_SECTION_HEADER *SectionHeaders) { - PIMAGE_SECTION_HEADER SectionHeader; + const IMAGE_SECTION_HEADER *SectionHeader; for (SectionHeader = SectionHeaders; SectionHeader < SectionHeaders + SectionHeaderCount; SectionHeader++) { @@ -66,7 +66,7 @@ static DWORD ConvertRVAToDiskOffset(DWORD RVA, DWORD SectionHeaderCount, PIMAGE_ return 0; } -static BOOL DllPresent(char *DllName) +static BOOL DllPresent(const char *DllName) { HMODULE DllModule; @@ -91,15 +91,15 @@ static BOOL DllPresent(char *DllName) * So instead we just dive into the executable's import table, determine which modules are being * imported and check if they are present. */ -static BOOL AllImportedDllsPresent(char *TestExeName) +static BOOL AllImportedDllsPresent(const char *TestExeName) { HANDLE TestExe; IMAGE_DOS_HEADER DosHeader; IMAGE_NT_HEADERS NTHeaders; - PIMAGE_DATA_DIRECTORY DataDirectoryImportTable; - PIMAGE_SECTION_HEADER SectionHeaders; - PIMAGE_IMPORT_DESCRIPTOR ImportDescriptors; - PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor; + const IMAGE_DATA_DIRECTORY *DataDirectoryImportTable; + IMAGE_SECTION_HEADER *SectionHeaders; + IMAGE_IMPORT_DESCRIPTOR *ImportDescriptors; + const IMAGE_IMPORT_DESCRIPTOR *ImportDescriptor; DWORD NR; DWORD NewPos; DWORD FileOffset; @@ -157,7 +157,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName) return FALSE; } - SectionHeaders = (PIMAGE_SECTION_HEADER) malloc(NTHeaders.FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER)); + SectionHeaders = (IMAGE_SECTION_HEADER*) malloc(NTHeaders.FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER)); if (SectionHeaders == NULL) { CloseHandle(TestExe); @@ -173,7 +173,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName) return FALSE; } - ImportDescriptors = (PIMAGE_IMPORT_DESCRIPTOR) malloc(DataDirectoryImportTable->Size); + ImportDescriptors = (IMAGE_IMPORT_DESCRIPTOR*) malloc(DataDirectoryImportTable->Size); if (ImportDescriptors == NULL) { free(SectionHeaders); @@ -287,8 +287,8 @@ int main(int argc, char *argv[]) BOOL UsageError; char TestExeFullName[_MAX_PATH]; char *TestExeFileName; - char *Suffix; - char *Subtest; + const char *Suffix; + const char *Subtest; int TestArg; char *CommandLine; int CommandLen;

1 0

Francois Gouget : winetest/build-index: Report invalid build directories.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: tools Branch: master Commit: bb3c31eae70e81e593df3a2147e4baa9a1435e50 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bb3c31eae70e81e593df3a21… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 15 01:44:21 2017 +0200 winetest/build-index: Report invalid build directories. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 2c1cbaf..f2e3dcf 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -199,8 +199,12 @@ my @too_old; opendir(DIR, "data") or die "could not open the 'data' directory: $!"; foreach my $build (readdir(DIR)) { - next if $build =~ /^\./; - next unless $build =~ /^[-.0-9a-zA-Z]+$/; + next if ($build =~ /^(\.\.?|index\.html|errors\.html|tests)$/); + if ($build !~ /^[0-9a-f]{40}$/) + { + error("'data/$build' is not a valid build directory\n"); + next; + } next unless -f "data/$build/index.html"; my ($date, $subject) = get_build_info($build);

1 0

Francois Gouget : winetest/dissect: Better defend against truncated reports.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: tools Branch: master Commit: b4863f82dad8b5c9bbd5dbd26fe4ec2bb21cb0f6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b4863f82dad8b5c9bbd5dbd2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 15 01:44:04 2017 +0200 winetest/dissect: Better defend against truncated reports. Avoid manipulating undef values if we prematurely reach the end-of-file. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index fc1fe40..4cb31b0 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -239,12 +239,12 @@ open IN, "<:raw", $report or mydie "could not open '$report' for reading: $!"; # - <dll> <unit> <total> <todo> <failures> <skipped> <source> <rev> open SUM, ">$tmpdir/summary.txt" or mydie "could not open '$tmpdir/summary.txt' for writing: $!"; -my $line = <IN>; +my $line = <IN> || ""; $line =~ /^Version (\d+)\r?$/ or mydie "no version header: $line"; mydie "illegal version: $1" if ($1 lt $minimum_report_version); print SUM "Version $summary_version\n"; -$line = <IN>; +$line = <IN> || ""; $line =~ /^Tests from build ([-.0-9a-zA-Z]+)\r?$/ or mydie "no build header: $line"; my $testbuild = $1; $testbuild =~ /^[0-9a-f]{40}$/ or mydie "not a valid commit id $testbuild"; @@ -257,8 +257,8 @@ my $archive = "winetest-$shortbuild.exe"; my ($date, $_subject) = get_build_info($testbuild); my $short_date = short_date($date); -$line = <IN>; -$line = <IN> if ($line =~ /^Archive: /); # ignore Archive header +$line = <IN> || ""; +$line = <IN> || "" if ($line =~ /^Archive: /); # Ignore the Archive header $line =~ /^Tag: ([-.0-9a-zA-Z]*)\r?$/ or mydie "no tag line: $line"; $tag = $1; @@ -278,15 +278,15 @@ sub create_box($$$) return $box; } -$line = <IN>; -$line =~ /^Build info:\r?$/ or mydie "no Build info header: $line"; +$line = <IN> || ""; +$line =~ /^Build info:\r?$/ or mydie "no build info header: $line"; my $box = create_box( "version", "version", "$tag $short_date information" ); $box->{data} .= "<h2>Build version</h2>\n"; $box->{data} .= "<table class=\"output\">\n"; $box->{data} .= "<tr><td>Build</td><td><a title=\"$testbuild\" href=\"$gitweb/?a=shortlog;h=$testbuild\">$shortbuild</a></td></tr>\n"; $box->{data} .= "<tr><td>Tag</td><td><a title=\"Full report\" href=\"report.html\">$tag</a></td></tr></table>\n"; $box->{data} .= "<div class=\"output\"> </div>\n"; -while ($line = <IN>) +while ($line = <IN> || "") { last if ($line !~ s/^ //); chomp $line; @@ -299,7 +299,7 @@ $box->{data} .= "<h2>Operating system version</h2>\n"; $box->{data} .= "<table class=\"output\">\n"; my ($wine, $wine_build, $major, $minor, $plid, $product, $host); -while ($line = <IN>) +while ($line = <IN> || "") { last if ($line !~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/); if ($1 eq "URL") { @@ -412,7 +412,7 @@ $box->{data} .= "<h2>DLL version</h2>\n"; my $skipped_units; my %dllinfo; -while ($line = <IN>) +while ($line = <IN> || "") { last if ($line !~ /^\s+([^ =]+)=(.*?)\r?$/); my ($dll, $info) = ($1, $2);

1 0

Alistair Leslie-Hughes : oleaut32: Improve support for IDispatch in VarCat.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 538e46adea88a3d6bdadd7f762eb620cd11cbeef URL: http://source.winehq.org/git/wine.git/?a=commit;h=538e46adea88a3d6bdadd7f76… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 13 22:35:06 2017 +0000 oleaut32: Improve support for IDispatch in VarCat. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 20 ++++++-- dlls/oleaut32/variant.c | 103 ++++++++++++++++++++++++------------------ 2 files changed, 76 insertions(+), 47 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index a271c50..d8a6ebf 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -6093,7 +6093,7 @@ static void test_VarCat(void) SET_EXPECT(dispatch_invoke); hres = VarCat(&left, &right, &result); - todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08x\n", hres); ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); CHECK_CALLED(dispatch_invoke); @@ -6108,7 +6108,7 @@ static void test_VarCat(void) SET_EXPECT(dispatch_invoke); hres = VarCat(&left, &right, &result); - todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08x\n", hres); ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); CHECK_CALLED(dispatch_invoke); @@ -6140,7 +6140,21 @@ static void test_VarCat(void) SET_EXPECT(dispatch_invoke); hres = VarCat(&left, &right, &result); - todo_wine ok(hres == E_OUTOFMEMORY, "got 0x%08x\n", hres); + ok(hres == E_OUTOFMEMORY, "got 0x%08x\n", hres); + CHECK_CALLED(dispatch_invoke); + + VariantClear(&left); + VariantClear(&right); + VariantClear(&result); + + init_test_dispatch(VT_NULL, &dispatch); + dispatch.result = DISP_E_TYPEMISMATCH; + V_VT(&right) = VT_DISPATCH; + V_DISPATCH(&right) = &dispatch.IDispatch_iface; + + SET_EXPECT(dispatch_invoke); + hres = VarCat(&left, &right, &result); + ok(hres == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hres); CHECK_CALLED(dispatch_invoke); VariantClear(&left); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 2dcded5..ee203d7 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -515,6 +515,22 @@ static inline HRESULT VARIANT_CoerceArray(VARIANTARG* pd, VARIANTARG* ps, VARTYP return DISP_E_TYPEMISMATCH; } +static HRESULT VARIANT_FetchDispatchValue(LPVARIANT pvDispatch, LPVARIANT pValue) +{ + HRESULT hres; + static DISPPARAMS emptyParams = { NULL, NULL, 0, 0 }; + + if ((V_VT(pvDispatch) & VT_TYPEMASK) == VT_DISPATCH) { + if (NULL == V_DISPATCH(pvDispatch)) return DISP_E_TYPEMISMATCH; + hres = IDispatch_Invoke(V_DISPATCH(pvDispatch), DISPID_VALUE, &IID_NULL, + LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, &emptyParams, pValue, + NULL, NULL); + } else { + hres = DISP_E_TYPEMISMATCH; + } + return hres; +} + /****************************************************************************** * Check if a variants type is valid. */ @@ -2503,7 +2519,7 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) { VARTYPE leftvt,rightvt,resultvt; HRESULT hres; - static const WCHAR sz_empty[] = {'\0'}; + leftvt = V_VT(left); rightvt = V_VT(right); @@ -2581,64 +2597,79 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) else { VARIANT bstrvar_left, bstrvar_right; + VARIANT *tmp; + VARIANT fetched; + V_VT(out) = VT_BSTR; VariantInit(&bstrvar_left); VariantInit(&bstrvar_right); + VariantInit(&fetched); /* Convert left side variant to string */ if (leftvt != VT_BSTR) { - /* Fill with empty string for later concat with right side */ - if (leftvt == VT_NULL) + tmp = left; + + if(leftvt == VT_DISPATCH) { - V_VT(&bstrvar_left) = VT_BSTR; - V_BSTR(&bstrvar_left) = SysAllocString(sz_empty); + hres = VARIANT_FetchDispatchValue(left, &fetched); + if(FAILED(hres)) + goto failed; + + tmp = &fetched; } - else + + hres = VariantChangeTypeEx(&bstrvar_left,tmp,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); + VariantClear(&fetched); + if (hres == DISP_E_TYPEMISMATCH) { - hres = VariantChangeTypeEx(&bstrvar_left,left,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); - if (hres != S_OK) { - VariantClear(&bstrvar_left); - VariantClear(&bstrvar_right); - return hres; - } + V_VT(&bstrvar_left) = VT_BSTR; + V_BSTR(&bstrvar_left) = SysAllocStringLen(NULL, 0); } + else if(hres != S_OK) + goto failed; } /* convert right side variant to string */ if (rightvt != VT_BSTR) { - /* Fill with empty string for later concat with right side */ - if (rightvt == VT_NULL) + tmp = right; + + if(rightvt == VT_DISPATCH) { - V_VT(&bstrvar_right) = VT_BSTR; - V_BSTR(&bstrvar_right) = SysAllocString(sz_empty); + hres = VARIANT_FetchDispatchValue(right, &fetched); + if(FAILED(hres)) + goto failed; + + tmp = &fetched; } - else + + hres = VariantChangeTypeEx(&bstrvar_right,tmp,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); + VariantClear(&fetched); + if (hres == DISP_E_TYPEMISMATCH) { - hres = VariantChangeTypeEx(&bstrvar_right,right,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); - if (hres != S_OK) { - VariantClear(&bstrvar_left); - VariantClear(&bstrvar_right); - return hres; - } + V_VT(&bstrvar_right) = VT_BSTR; + V_BSTR(&bstrvar_right) = SysAllocStringLen(NULL, 0); } + else if(hres != S_OK) + goto failed; } /* Concat the resulting strings together */ if (leftvt == VT_BSTR && rightvt == VT_BSTR) - VarBstrCat (V_BSTR(left), V_BSTR(right), &V_BSTR(out)); + hres = VarBstrCat (V_BSTR(left), V_BSTR(right), &V_BSTR(out)); else if (leftvt != VT_BSTR && rightvt != VT_BSTR) - VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(&bstrvar_right), &V_BSTR(out)); + hres = VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(&bstrvar_right), &V_BSTR(out)); else if (leftvt != VT_BSTR && rightvt == VT_BSTR) - VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(right), &V_BSTR(out)); + hres = VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(right), &V_BSTR(out)); else if (leftvt == VT_BSTR && rightvt != VT_BSTR) - VarBstrCat (V_BSTR(left), V_BSTR(&bstrvar_right), &V_BSTR(out)); + hres = VarBstrCat (V_BSTR(left), V_BSTR(&bstrvar_right), &V_BSTR(out)); +failed: VariantClear(&bstrvar_left); VariantClear(&bstrvar_right); - return S_OK; + return hres; } } @@ -2865,22 +2896,6 @@ HRESULT WINAPI VarCmp(LPVARIANT left, LPVARIANT right, LCID lcid, DWORD flags) #undef _VARCMP } -static HRESULT VARIANT_FetchDispatchValue(LPVARIANT pvDispatch, LPVARIANT pValue) -{ - HRESULT hres; - static DISPPARAMS emptyParams = { NULL, NULL, 0, 0 }; - - if ((V_VT(pvDispatch) & VT_TYPEMASK) == VT_DISPATCH) { - if (NULL == V_DISPATCH(pvDispatch)) return DISP_E_TYPEMISMATCH; - hres = IDispatch_Invoke(V_DISPATCH(pvDispatch), DISPID_VALUE, &IID_NULL, - LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, &emptyParams, pValue, - NULL, NULL); - } else { - hres = DISP_E_TYPEMISMATCH; - } - return hres; -} - /********************************************************************** * VarAnd [OLEAUT32.142] *

1 0

Daniel Lehman : msvcrt: Support rethrowing SEH exceptions.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 66b65474d1106c0e5ee07b9cc097b3d0f731df79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b65474d1106c0e5ee07b9cc… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jun 14 11:59:19 2017 +0200 msvcrt: Support rethrowing SEH exceptions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index df99153..7e9c38d 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -118,6 +118,7 @@ typedef struct { ULONG64 dest_frame; ULONG64 orig_frame; + EXCEPTION_RECORD *seh_rec; DISPATCHER_CONTEXT *dispatch; const cxx_function_descr *descr; } se_translator_ctx; @@ -350,6 +351,7 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) ULONG64 frame = rec->ExceptionInformation[1]; const cxx_function_descr *descr = (void*)rec->ExceptionInformation[2]; EXCEPTION_RECORD *prev_rec = (void*)rec->ExceptionInformation[4]; + EXCEPTION_RECORD *untrans_rec = (void*)rec->ExceptionInformation[6]; void* (__cdecl *handler)(ULONG64 unk, ULONG64 rbp) = (void*)rec->ExceptionInformation[5]; int *unwind_help = rva_to_ptr(descr->unwind_help, frame); cxx_catch_ctx ctx; @@ -370,8 +372,17 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode); ctx.rethrow = TRUE; - RaiseException(prev_rec->ExceptionCode, prev_rec->ExceptionFlags, - prev_rec->NumberParameters, prev_rec->ExceptionInformation); + if (untrans_rec) + { + __DestructExceptionObject(prev_rec); + RaiseException(untrans_rec->ExceptionCode, untrans_rec->ExceptionFlags, + untrans_rec->NumberParameters, untrans_rec->ExceptionInformation); + } + else + { + RaiseException(prev_rec->ExceptionCode, prev_rec->ExceptionFlags, + prev_rec->NumberParameters, prev_rec->ExceptionInformation); + } } __ENDTRY } @@ -384,12 +395,12 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) static inline BOOL cxx_is_consolidate(const EXCEPTION_RECORD *rec) { - return rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters==6 && + return rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters==7 && rec->ExceptionInformation[0]==(ULONG_PTR)call_catch_block; } -static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, - DISPATCHER_CONTEXT *dispatch, +static inline void find_catch_block(EXCEPTION_RECORD *rec, EXCEPTION_RECORD *untrans_rec, + ULONG64 frame, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr, cxx_exception_type *info, ULONG64 orig_frame) { @@ -465,7 +476,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, memset(&catch_record, 0, sizeof(catch_record)); catch_record.ExceptionCode = STATUS_UNWIND_CONSOLIDATE; catch_record.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - catch_record.NumberParameters = 6; + catch_record.NumberParameters = 7; catch_record.ExceptionInformation[0] = (ULONG_PTR)call_catch_block; catch_record.ExceptionInformation[1] = orig_frame; catch_record.ExceptionInformation[2] = (ULONG_PTR)descr; @@ -473,6 +484,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, catch_record.ExceptionInformation[4] = (ULONG_PTR)rec; catch_record.ExceptionInformation[5] = (ULONG_PTR)rva_to_ptr(catchblock->handler, dispatch->ImageBase); + catch_record.ExceptionInformation[6] = (ULONG_PTR)untrans_rec; RtlUnwindEx((void*)frame, (void*)dispatch->ControlPc, &catch_record, NULL, &context, NULL); } } @@ -493,7 +505,7 @@ static LONG CALLBACK se_translation_filter(EXCEPTION_POINTERS *ep, void *c) } exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; - find_catch_block(rec, ctx->dest_frame, ctx->dispatch, + find_catch_block(rec, ctx->seh_rec, ctx->dest_frame, ctx->dispatch, ctx->descr, exc_type, ctx->orig_frame); __DestructExceptionObject(rec); @@ -590,6 +602,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, ctx.dest_frame = frame; ctx.orig_frame = orig_frame; + ctx.seh_rec = rec; ctx.dispatch = dispatch; ctx.descr = descr; __TRY @@ -605,7 +618,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, } } - find_catch_block(rec, frame, dispatch, descr, exc_type, orig_frame); + find_catch_block(rec, NULL, frame, dispatch, descr, exc_type, orig_frame); return ExceptionContinueSearch; }

1 0

Daniel Lehman : msvcrt: Only unwind current catch block when handling nested exception.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: f1d307cae5eb72e6f1ec3fd3faaf3bcbb08f4692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d307cae5eb72e6f1ec3fd3f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jun 14 11:59:05 2017 +0200 msvcrt: Only unwind current catch block when handling nested exception. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index fffabbb..df99153 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -306,7 +306,7 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, } TRACE("current level: %d, last level: %d\n", trylevel, last_level); - while (trylevel != last_level) + while (trylevel > last_level) { if (trylevel<0 || trylevel>=descr->unwind_count) { @@ -321,7 +321,7 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, } trylevel = unwind_table[trylevel].prev; } - unwind_help[0] = last_level; + unwind_help[0] = trylevel; } static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c) @@ -512,6 +512,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, DWORD throw_func_off; void *throw_func; UINT i, j; + int unwindlevel = -1; if (descr->magic<CXX_FRAME_MAGIC_VC6 || descr->magic>CXX_FRAME_MAGIC_VC8) { @@ -545,6 +546,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (rva_to_ptr(catchblock->handler, dispatch->ImageBase) == throw_func) { TRACE("nested exception detected\n"); + unwindlevel = tryblock->end_level; orig_frame = *(ULONG64*)rva_to_ptr(catchblock->frame, frame); TRACE("setting orig_frame to %lx\n", orig_frame); } @@ -554,23 +556,11 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) { - if (cxx_is_consolidate(rec)) - { - if (rec->ExceptionFlags & EH_TARGET_UNWIND) - { - const cxx_function_descr *orig_descr = (void*)rec->ExceptionInformation[2]; - int end_level = rec->ExceptionInformation[3]; - orig_frame = rec->ExceptionInformation[1]; - - cxx_local_unwind(orig_frame, dispatch, orig_descr, end_level); - } - else if(frame == orig_frame) - cxx_local_unwind(frame, dispatch, descr, -1); - return ExceptionContinueSearch; - } - - if (frame == orig_frame) - cxx_local_unwind(frame, dispatch, descr, rec->ExceptionFlags & EH_TARGET_UNWIND ? trylevel : -1); + if (rec->ExceptionFlags & EH_TARGET_UNWIND) + cxx_local_unwind(orig_frame, dispatch, descr, + cxx_is_consolidate(rec) ? rec->ExceptionInformation[3] : trylevel); + else + cxx_local_unwind(orig_frame, dispatch, descr, unwindlevel); return ExceptionContinueSearch; } if (!descr->tryblock_count) return ExceptionContinueSearch;

1 0

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 June 2017