November 2017 - Wine-commits

Hans Leidekker : advapi32: Fix EnumServicesStatusEx on Wow64.
by Alexandre Julliard 08 Nov '17

08 Nov '17

Module: wine Branch: master Commit: 445996d31ba5818eb9fe4e41130349b6730284a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=445996d31ba5818eb9fe4e411… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 7 14:10:40 2017 +0100 advapi32: Fix EnumServicesStatusEx on Wow64. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 82 +++++++++++++++++++++++++++++++++++++++++-------- include/wine/svcctl.idl | 7 +++++ programs/services/rpc.c | 16 +++++----- 3 files changed, 84 insertions(+), 21 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 79d0693..78491ae 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1893,9 +1893,11 @@ EnumServicesStatusExW( SC_HANDLE hmngr, SC_ENUM_TYPE level, DWORD type, DWORD st LPBYTE buffer, DWORD size, LPDWORD needed, LPDWORD returned, LPDWORD resume_handle, LPCWSTR group ) { - DWORD err, i; - ENUM_SERVICE_STATUS_PROCESSW dummy_status; + DWORD err, i, offset, buflen, count, total_size = 0; ENUM_SERVICE_STATUS_PROCESSW *services = (ENUM_SERVICE_STATUS_PROCESSW *)buffer; + struct enum_service_status_process *entry; + const WCHAR *str; + BYTE *buf; TRACE("%p %u 0x%x 0x%x %p %u %p %p %p %s\n", hmngr, level, type, state, buffer, size, needed, returned, resume_handle, debugstr_w(group)); @@ -1910,18 +1912,24 @@ EnumServicesStatusExW( SC_HANDLE hmngr, SC_ENUM_TYPE level, DWORD type, DWORD st SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } + if (!needed || !returned) + { + SetLastError( ERROR_INVALID_ADDRESS ); + return FALSE; + } - /* make sure we pass a valid buffer pointer */ - if (!services || size < sizeof(*services)) + /* make sure we pass a valid pointer */ + buflen = max( size, sizeof(*services) ); + if (!(buf = heap_alloc( buflen ))) { - buffer = (BYTE *)&dummy_status; - size = sizeof(dummy_status); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; } __TRY { - err = svcctl_EnumServicesStatusExW( hmngr, SC_ENUM_PROCESS_INFO, type, state, buffer, size, needed, - returned, resume_handle, group ); + err = svcctl_EnumServicesStatusExW( hmngr, SC_ENUM_PROCESS_INFO, type, state, buf, buflen, needed, + &count, resume_handle, group ); } __EXCEPT(rpc_filter) { @@ -1929,20 +1937,68 @@ EnumServicesStatusExW( SC_HANDLE hmngr, SC_ENUM_TYPE level, DWORD type, DWORD st } __ENDTRY + *returned = 0; if (err != ERROR_SUCCESS) { + /* double the needed size to fit the potentially larger ENUM_SERVICE_STATUS_PROCESSW */ + if (err == ERROR_MORE_DATA) *needed *= 2; + heap_free( buf ); SetLastError( err ); return FALSE; } - for (i = 0; i < *returned; i++) + entry = (struct enum_service_status_process *)buf; + for (i = 0; i < count; i++) { - /* convert buffer offsets into pointers */ - services[i].lpServiceName = (WCHAR *)((char *)services + (DWORD_PTR)services[i].lpServiceName); - if (services[i].lpDisplayName) - services[i].lpDisplayName = (WCHAR *)((char *)services + (DWORD_PTR)services[i].lpDisplayName); + total_size += sizeof(*services); + if (entry->service_name) + { + str = (const WCHAR *)(buf + entry->service_name); + total_size += (strlenW( str ) + 1) * sizeof(WCHAR); + } + if (entry->display_name) + { + str = (const WCHAR *)(buf + entry->display_name); + total_size += (strlenW( str ) + 1) * sizeof(WCHAR); + } + entry++; } + if (total_size > size) + { + heap_free( buf ); + *needed = total_size; + SetLastError( ERROR_MORE_DATA ); + return FALSE; + } + + offset = count * sizeof(*services); + entry = (struct enum_service_status_process *)buf; + for (i = 0; i < count; i++) + { + DWORD str_size; + str = (const WCHAR *)(buf + entry->service_name); + str_size = (strlenW( str ) + 1) * sizeof(WCHAR); + services[i].lpServiceName = (WCHAR *)((char *)services + offset); + memcpy( services[i].lpServiceName, str, str_size ); + offset += str_size; + + if (!entry->display_name) services[i].lpDisplayName = NULL; + else + { + str = (const WCHAR *)(buf + entry->display_name); + str_size = (strlenW( str ) + 1) * sizeof(WCHAR); + services[i].lpDisplayName = (WCHAR *)((char *)services + offset); + memcpy( services[i].lpDisplayName, str, str_size ); + offset += str_size; + } + services[i].ServiceStatusProcess = entry->service_status_process; + entry++; + } + + heap_free( buf ); + *needed = 0; + *returned = count; return TRUE; } diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index b7d1e92..7c5df7d 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -218,6 +218,13 @@ struct enum_service_status SERVICE_STATUS service_status; }; +struct enum_service_status_process +{ + DWORD service_name; + DWORD display_name; + SERVICE_STATUS_PROCESS service_status_process; +}; + typedef struct _SERVICE_RPC_REQUIRED_PRIVILEGES_INFO { DWORD cbRequiredPrivileges; [size_is(cbRequiredPrivileges)] BYTE *pRequiredPrivileges; diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 7215504..a1d3c9e 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1461,7 +1461,7 @@ DWORD __cdecl svcctl_EnumServicesStatusExW( DWORD_PTR offset; struct sc_manager_handle *manager; struct service_entry *service; - ENUM_SERVICE_STATUS_PROCESSW *s; + struct enum_service_status_process *s; WINE_TRACE("(%p, 0x%x, 0x%x, %p, %u, %p, %p, %s)\n", hmngr, type, state, buffer, size, needed, returned, wine_dbgstr_w(group)); @@ -1489,7 +1489,7 @@ DWORD __cdecl svcctl_EnumServicesStatusExW( if ((service->status.dwServiceType & type) && map_state(service->status.dwCurrentState, state) && match_group(service->config.lpLoadOrderGroup, group)) { - total_size += sizeof(ENUM_SERVICE_STATUS_PROCESSW); + total_size += sizeof(*s); total_size += (strlenW(service->name) + 1) * sizeof(WCHAR); if (service->config.lpDisplayName) { @@ -1505,8 +1505,8 @@ DWORD __cdecl svcctl_EnumServicesStatusExW( scmdatabase_unlock(manager->db); return ERROR_MORE_DATA; } - s = (ENUM_SERVICE_STATUS_PROCESSW *)buffer; - offset = num_services * sizeof(ENUM_SERVICE_STATUS_PROCESSW); + s = (struct enum_service_status_process *)buffer; + offset = num_services * sizeof(*s); LIST_FOR_EACH_ENTRY(service, &manager->db->services, struct service_entry, entry) { if ((service->status.dwServiceType & type) && map_state(service->status.dwCurrentState, state) @@ -1514,18 +1514,18 @@ DWORD __cdecl svcctl_EnumServicesStatusExW( { sz = (strlenW(service->name) + 1) * sizeof(WCHAR); memcpy(buffer + offset, service->name, sz); - s->lpServiceName = (WCHAR *)offset; /* store a buffer offset instead of a pointer */ + s->service_name = offset; offset += sz; - if (!service->config.lpDisplayName) s->lpDisplayName = NULL; + if (!service->config.lpDisplayName) s->display_name = 0; else { sz = (strlenW(service->config.lpDisplayName) + 1) * sizeof(WCHAR); memcpy(buffer + offset, service->config.lpDisplayName, sz); - s->lpDisplayName = (WCHAR *)offset; + s->display_name = offset; offset += sz; } - fill_status_process(&s->ServiceStatusProcess, service); + fill_status_process(&s->service_status_process, service); s++; } }

1 0

Hans Leidekker : advapi32: Fix QueryServiceConfig2 on Wow64.
by Alexandre Julliard 08 Nov '17

08 Nov '17

Module: wine Branch: master Commit: 251c9ccff7077921a5ddd5b6616e104869d16501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=251c9ccff7077921a5ddd5b66… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 7 14:10:41 2017 +0100 advapi32: Fix QueryServiceConfig2 on Wow64. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 83 +++++++++++++++++++++++++++++++++++++++---------- include/wine/svcctl.idl | 6 ++++ programs/services/rpc.c | 37 ++++++++++++---------- 3 files changed, 94 insertions(+), 32 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 78491ae..3f2fb93 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1543,6 +1543,8 @@ BOOL WINAPI QueryServiceConfig2A(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffe BOOL ret; LPBYTE bufferW = NULL; + TRACE("%p %u %p %u %p\n", hService, dwLevel, buffer, size, needed); + if(buffer && size) bufferW = heap_alloc(size); @@ -1591,24 +1593,42 @@ cleanup: BOOL WINAPI QueryServiceConfig2W(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffer, DWORD size, LPDWORD needed) { + BYTE *bufptr; DWORD err; - if(dwLevel!=SERVICE_CONFIG_DESCRIPTION && dwLevel!=SERVICE_CONFIG_PRESHUTDOWN_INFO) { + TRACE("%p %u %p %u %p\n", hService, dwLevel, buffer, size, needed); + + if (!buffer && size) + { + SetLastError(ERROR_INVALID_ADDRESS); + return FALSE; + } + + switch (dwLevel) + { + case SERVICE_CONFIG_DESCRIPTION: + if (!(bufptr = heap_alloc( size ))) return ERROR_OUTOFMEMORY; + break; + + case SERVICE_CONFIG_PRESHUTDOWN_INFO: + bufptr = buffer; + break; + + default: FIXME("Level %d not implemented\n", dwLevel); SetLastError(ERROR_INVALID_LEVEL); return FALSE; } - if(!buffer && size) { + if (!needed) + { SetLastError(ERROR_INVALID_ADDRESS); return FALSE; } - TRACE("%p 0x%d %p 0x%d %p\n", hService, dwLevel, buffer, size, needed); - __TRY { - err = svcctl_QueryServiceConfig2W(hService, dwLevel, buffer, size, needed); + err = svcctl_QueryServiceConfig2W(hService, dwLevel, bufptr, size, needed); } __EXCEPT(rpc_filter) { @@ -1616,22 +1636,53 @@ BOOL WINAPI QueryServiceConfig2W(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffe } __ENDTRY - if (err != ERROR_SUCCESS) - { - SetLastError( err ); - return FALSE; - } - switch (dwLevel) { case SERVICE_CONFIG_DESCRIPTION: - if (buffer) + { + SERVICE_DESCRIPTIONW *desc = (SERVICE_DESCRIPTIONW *)buffer; + struct service_description *s = (struct service_description *)bufptr; + + if (err != ERROR_SUCCESS && err != ERROR_INSUFFICIENT_BUFFER) { - SERVICE_DESCRIPTIONW *descr = (SERVICE_DESCRIPTIONW *)buffer; - if (descr->lpDescription) /* make it an absolute pointer */ - descr->lpDescription = (WCHAR *)(buffer + (ULONG_PTR)descr->lpDescription); - break; + heap_free( bufptr ); + SetLastError( err ); + return FALSE; + } + + /* adjust for potentially larger SERVICE_DESCRIPTIONW structure */ + if (*needed == sizeof(*s)) *needed = sizeof(*desc); + else + *needed = *needed - FIELD_OFFSET(struct service_description, description) + sizeof(*desc); + + if (size < *needed) + { + heap_free( bufptr ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; } + if (desc) + { + if (!s->size) desc->lpDescription = NULL; + else + { + desc->lpDescription = (WCHAR *)(desc + 1); + memcpy( desc->lpDescription, s->description, s->size ); + } + } + heap_free( bufptr ); + break; + } + case SERVICE_CONFIG_PRESHUTDOWN_INFO: + if (err != ERROR_SUCCESS) + { + SetLastError( err ); + return FALSE; + } + break; + + default: + break; } return TRUE; diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index 7c5df7d..c14cd6b 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -225,6 +225,12 @@ struct enum_service_status_process SERVICE_STATUS_PROCESS service_status_process; }; +struct service_description +{ + USHORT size; + WCHAR description[1]; +}; + typedef struct _SERVICE_RPC_REQUIRED_PRIVILEGES_INFO { DWORD cbRequiredPrivileges; [size_is(cbRequiredPrivileges)] BYTE *pRequiredPrivileges; diff --git a/programs/services/rpc.c b/programs/services/rpc.c index a1d3c9e..20c5a27 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -879,27 +879,32 @@ DWORD __cdecl svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, switch (level) { case SERVICE_CONFIG_DESCRIPTION: - { - SERVICE_DESCRIPTIONW *descr = (SERVICE_DESCRIPTIONW *)buffer; + { + struct service_description *desc = (struct service_description *)buffer; + DWORD total_size = sizeof(*desc); + + service_lock(service->service_entry); + if (service->service_entry->description) + total_size += strlenW(service->service_entry->description) * sizeof(WCHAR); - service_lock(service->service_entry); - *needed = sizeof(*descr); + *needed = total_size; + if (size >= total_size) + { if (service->service_entry->description) - *needed += (strlenW(service->service_entry->description) + 1) * sizeof(WCHAR); - if (size >= *needed) { - if (service->service_entry->description) - { - /* store a buffer offset instead of a pointer */ - descr->lpDescription = (WCHAR *)((BYTE *)(descr + 1) - buffer); - strcpyW( (WCHAR *)(descr + 1), service->service_entry->description ); - } - else descr->lpDescription = NULL; + strcpyW( desc->description, service->service_entry->description ); + desc->size = total_size - FIELD_OFFSET(struct service_description, description); + } + else + { + desc->description[0] = 0; + desc->size = 0; } - else err = ERROR_INSUFFICIENT_BUFFER; - service_unlock(service->service_entry); } - break; + else err = ERROR_INSUFFICIENT_BUFFER; + service_unlock(service->service_entry); + } + break; case SERVICE_CONFIG_PRESHUTDOWN_INFO: service_lock(service->service_entry);

1 0

Alistair Leslie-Hughes : oledb32: Fix typo.
by Alexandre Julliard 08 Nov '17

08 Nov '17

Module: wine Branch: master Commit: 7563a497214796be079416fad92614ce040ed957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7563a497214796be079416fad… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 7 23:11:05 2017 +0000 oledb32: Fix typo. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index b45775f..1d55e7f 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2645,7 +2645,7 @@ static void test_converttor8(void) dst_len = 44; V_VT(&var) = VT_NULL; - hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_R4, 0, &dst_len, &var, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_R8, 0, &dst_len, &var, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); ok(dst_len == 44, "got %ld\n", dst_len);

1 0

Alistair Leslie-Hughes : oledb32: DataConvert support DBTYPE_VARIANT -> DBTYPE_R4.
by Alexandre Julliard 08 Nov '17

08 Nov '17

Module: wine Branch: master Commit: 4a5759dcc21ceff27c94b246c561b3d25f0e7784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5759dcc21ceff27c94b246c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 7 23:11:03 2017 +0000 oledb32: DataConvert support DBTYPE_VARIANT -> DBTYPE_R4. 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/convert.c | 5 +++++ dlls/oledb32/tests/convert.c | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 7fa4c81..267de1b 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -343,6 +343,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_UI4: hr = VarR4FromUI4(*(DWORD*)src, d); break; case DBTYPE_I8: hr = VarR4FromI8(*(LONGLONG*)src, d); break; case DBTYPE_UI8: hr = VarR4FromUI8(*(ULONGLONG*)src, d); break; + case DBTYPE_VARIANT: + VariantInit(&tmp); + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_R4)) == S_OK) + *d = V_R4(&tmp); + break; default: FIXME("Unimplemented conversion %04x -> R4\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 708471b..b45775f 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2580,6 +2580,15 @@ static void test_converttor4(void) ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); ok(dst_len == 44, "got %ld\n", dst_len); + + dst_len = dst = 0x1234; + V_VT(&v) = VT_I2; + V_I2(&v) = 0x4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_R4, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 0x4321, "got %f\n", dst); } static void test_converttor8(void)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 08 Nov '17

08 Nov '17

Module: wine Branch: master Commit: babc2951a0f73f5569fd30240ab646d617d8456b URL: http://source.winehq.org/git/wine.git/?a=commit;h=babc2951a0f73f5569fd30240… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Nov 8 09:01:48 2017 +0200 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 4c400ac..583287d 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-08-20 08:43+0300\n" +"PO-Revision-Date: 2017-11-08 09:01+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" @@ -14912,10 +14912,8 @@ msgid "Expert" msgstr "Ekspertas" #: winemine.rc:72 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "Rezultatas" +msgstr "Išvalyti rezultatus" #: winemine.rc:78 msgid "Congratulations!"

1 0

Vijay Kiran Kamuju : msvcp100: Add time_get:: get function with format parameters.
by Alexandre Julliard 08 Nov '17

08 Nov '17

Module: wine Branch: master Commit: f94f1695184b8b51a8c5c2e10af03284cceafb13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94f1695184b8b51a8c5c2e10… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Nov 8 10:01:33 2017 +0100 msvcp100: Add time_get::get function with format parameters. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 8 ++++---- dlls/msvcp120/msvcp120.spec | 8 ++++---- dlls/msvcp120_app/msvcp120_app.spec | 8 ++++---- dlls/msvcp140/msvcp140.spec | 8 ++++---- dlls/msvcp90/locale.c | 11 +++++++++++ 6 files changed, 29 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f94f1695184b8b51a8c5c…

1 0

Alexandre Julliard : patches: Determine signoff information automatically from the patch replies.
by Alexandre Julliard 08 Nov '17

08 Nov '17

Module: tools Branch: master Commit: a5ffe4fb09403bb2cb1e1ac9dc12cdc4081b4682 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a5ffe4fb09403bb2cb1e1ac9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 10:19:30 2017 +0100 patches: Determine signoff information automatically from the patch replies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/patches/update b/patches/update index 9e12c4b..87e640d 100755 --- a/patches/update +++ b/patches/update @@ -99,6 +99,12 @@ sub format_author($) return $str; } +sub uniq +{ + my %seen; + return grep { !$seen{$_}++ } @_; +} + my $js = <<END; function toggle_display(id) { @@ -185,16 +191,6 @@ foreach my $file (readdir DIR) $patch{"review"} = format_author($_); close REVIEW; } - if (open SIGNOFF, "<:raw", "$dir/$file.signoff") - { - while (<SIGNOFF>) - { - chomp; - utf8::decode($_); - push @{$patch{"signoff"}}, format_author($_); - } - close SIGNOFF; - } $patch{"testbot"} = ""; $patch{"testjob"} = ""; $patch{"testurl"} = ""; @@ -243,6 +239,7 @@ foreach my $file (sort keys %patches) # add it to the parent's children and remove it from the list $patch->{"parent"} = $parent; push @{$parent->{"children"}}, $patch; + push @{$parent->{"signoff"}}, @{$patch->{"signoff"}} if $patch->{"signoff"}; delete $patches{$file}; } @@ -271,9 +268,10 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k { printf INDEX "<td></td>"; } - if (defined($patch->{"signoff"})) + my @signoff = defined($patch->{"signoff"}) ? uniq( @{$patch->{"signoff"}} ) : (); + if (@signoff) { - printf INDEX "<td class=\"checkmark\" onclick=\"toggle_display('$file.signoff')\">%s</td>", "✓" x @{$patch->{"signoff"}}; + printf INDEX "<td class=\"checkmark\" onclick=\"toggle_display('$file.signoff')\">%s</td>", "✓" x @signoff; } else { @@ -298,11 +296,11 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k print INDEX "<td></td>"; } print INDEX "</tr>\n"; - if (defined($patch->{"signoff"})) + if (@signoff) { printf INDEX "<tr class=\"%s\" id=\"$file.signoff\" style=\"display: none;\" onclick=\"toggle_display('$file.signoff')\">" . "<td colspan=\"5\" /><td colspan=\"4\" class=\"signoffextra author\">%s</td></tr>\n", - $row & 1 ? "odd" : "even", join("", map { "Signed-off-by: " . escapeHTML($_) . "<br/>"; } @{$patch->{"signoff"}}); + $row & 1 ? "odd" : "even", join("", map { "Signed-off-by: " . escapeHTML($_) . "<br/>"; } @signoff ); } foreach my $child (@{$patch->{"children"}}) {

1 0

Alexandre Julliard : patches: Display replies under the main patch.
by Alexandre Julliard 08 Nov '17

08 Nov '17

Module: tools Branch: master Commit: 0d60762f674e42035b8ad788b2a26f49a8b97fe5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0d60762f674e42035b8ad788… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 10:17:12 2017 +0100 patches: Display replies under the main patch. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/patches.css | 5 +++- patches/update | 84 ++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 75 insertions(+), 14 deletions(-) diff --git a/patches/patches.css b/patches/patches.css index c1ef34f..f7bb560 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -132,15 +132,18 @@ div.buglist { border: 1px solid #601919; } table.main, table.legend { width: 100%; } +table.main { border-collapse: collapse; } table.legend ul { margin: 2px 0; } tr.even { background-color: #fff8f8; } tr.odd { background-color: #f8e8e8; } +.indent { padding: 0 2em; } .id, .status, .testbot { text-align: center; } -.id, .status, .author { white-space: nowrap; padding: 0 3px; } +.id, .status, .author { white-space: nowrap; padding: 2px 3px; } .checkmark { text-align: center; color:green; } +.arrow { text-align: center; padding: 0 0; } .failmark { text-align: center; color: red; } .signoffextra { color: #A50D0D; border: 1px solid #601919; } .sha1 { white-space: nowrap; font-family: monospace; padding: 2px 12px; } diff --git a/patches/update b/patches/update index cdc172d..9e12c4b 100755 --- a/patches/update +++ b/patches/update @@ -90,6 +90,7 @@ my @legend = my $dir = $ARGV[0] || "$ENV{HOME}/patches"; my $dest = "/home/winehq/opt/source/patches"; my %patches; +my %messages; sub format_author($) { @@ -126,7 +127,7 @@ print INDEX "<div id=\"logo_blurb\">Wine source repository – Patch status< print INDEX "<div id=\"main_content\"><div id=\"content\"><div class=\"main\">\n"; print INDEX "<table id=\"main_table\" class=\"main\"><thead><tr><th class=\"id\">ID</th>", "<th class=\"status\">Status</th>", - "<th class=\"author\">Author</th>", + "<th colspan=\"2\" class=\"author\">Author</th>", "<th class=\"subject\">Subject</th>", "<th class=\"author\">Reviewer</th>", "<th class=\"status\">Sign</th>", @@ -144,6 +145,8 @@ foreach my $file (readdir DIR) utf8::decode($_); if (/^Subject: (.*)$/) { $patch{"subject"} = $1; } elsif (/^From: (.*)$/) { $patch{"author"} = format_author($1); } + elsif (/^Message-Id: (.*)$/) { $patch{"msgid"} = $1; } + elsif (/^In-Reply-To: (.*)$/) { $patch{"reply"} = $1; } last if (/^$/); } while (<PATCH>) @@ -152,8 +155,14 @@ foreach my $file (readdir DIR) if (/^\s*Signed-off-by: (.*)$/) { push @{$patch{"signoff"}}, format_author($1); } last if (/^---$/); } + while (<PATCH>) + { + utf8::decode($_); + if (/^diff --git a\//) { $patch{"has_patch"} = 1; last; } + } close PATCH; + $patch{"id"} = $file; $patch{"status"} = "nil"; if (open STATUS, "<$dir/$file.status") { @@ -208,19 +217,52 @@ foreach my $file (readdir DIR) { $patch{"testbot"} = "Failed"; } + if (defined $patch{"msgid"}) + { + $messages{$patch{"msgid"}} = \%patch; + } $patches{$file} = \%patch; } closedir DIR; +# build mail threads + +foreach my $file (sort keys %patches) +{ + my $patch = $patches{$file}; + next if defined $patch->{"has_patch"}; + next unless defined $patch->{"reply"}; + next unless defined $messages{$patch->{"reply"}}; + my $parent = $messages{$patch->{"reply"}}; + # find top parent + while (!defined($parent->{"has_patch"}) && defined($parent->{"reply"})) + { + $parent = $messages{$parent->{"reply"}}; + } + next unless defined $parent; + # add it to the parent's children and remove it from the list + $patch->{"parent"} = $parent; + push @{$parent->{"children"}}, $patch; + delete $patches{$file}; +} + my $row = 0; foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } keys %patches) { my $patch = $patches{$file}; - printf INDEX "<tr class=\"%s %s\"><td class=\"id\">%s</td><td class=\"status\"><a href=\"#legend\">%s</a></td><td class=\"author\">%s</td>", - $row & 1 ? "odd" : "even", $patch->{"status"}, $file, $status_descr{$patch->{"status"}} || $patch->{"status"}, - escapeHTML($patch->{"author"}); - printf INDEX "<td class=\"subject\"><a href=\"data/$file\">%s</a></td>", - escapeHTML($patch->{"subject"}); + + printf INDEX "<tr class=\"%s %s\"><td class=\"id\">%s</td><td class=\"status\"><a href=\"#legend\">%s</a></td>", + $row & 1 ? "odd" : "even", $patch->{"status"}, $file, $status_descr{$patch->{"status"}} || $patch->{"status"}; + if (defined $patch->{"children"}) + { + printf INDEX "<td class=\"author\">%s</td>", escapeHTML($patch->{"author"}); + printf INDEX "<td class=\"arrow\" onclick=\"toggle_display('$file.reply')\">▼</td>"; + } + else + { + printf INDEX "<td colspan=\"2\" class=\"author\">%s</td>", escapeHTML($patch->{"author"}); + } + printf INDEX "<td class=\"subject\"><a href=\"data/$file\">%s</a></td>", escapeHTML($patch->{"subject"}); if ($patch->{"review"}) { printf INDEX "<td class=\"author\">%s</td>", escapeHTML($patch->{"review"}); @@ -259,9 +301,17 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k if (defined($patch->{"signoff"})) { printf INDEX "<tr class=\"%s\" id=\"$file.signoff\" style=\"display: none;\" onclick=\"toggle_display('$file.signoff')\">" . - "<td colspan=\"4\" /><td colspan=\"4\" class=\"signoffextra author\">%s</td></tr>\n", + "<td colspan=\"5\" /><td colspan=\"4\" class=\"signoffextra author\">%s</td></tr>\n", $row & 1 ? "odd" : "even", join("", map { "Signed-off-by: " . escapeHTML($_) . "<br/>"; } @{$patch->{"signoff"}}); } + foreach my $child (@{$patch->{"children"}}) + { + printf INDEX "<tr class=\"%s\" id=\"$file.reply\" style=\"display: none;\" onclick=\"toggle_display('$file.reply')\">" . + "<td colspan=\"2\" /><td colspan=\"2\" class=\"reply author\"><span class=\"indent\" />%s</td> " . + "<td class=\"reply author\"><span class=\"indent\" /><a href=\"data/%s\">%s</a></td> " . + "<td colspan=\"4\" /></tr>\n", + $row & 1 ? "odd" : "even", escapeHTML($child->{"author"}), $child->{"id"}, escapeHTML($child->{"subject"}); + } $row++; } print INDEX "</tbody></table></div>\n"; @@ -284,7 +334,7 @@ my $sorter = <<END; tbody = table.children[1], ths = thead.getElementsByTagName('th'), trs = tbody.getElementsByTagName('tr'), - i, do_reverse, th, sort_func; + i, j, k, id, do_reverse, th, sort_func; for (i = 0; i < ths.length; i++) ths[i].onclick = sort_table; @@ -307,13 +357,20 @@ my $sorter = <<END; do_reverse = 1; th.setAttribute('data-order', do_reverse) - for (j = 0, i = trs.length - 1; i != -1; i--) + for (j = 0, k = 0, i = trs.length - 1; i != -1; i--) { - tr = tbody.removeChild(trs[i]) + tr = tbody.removeChild(trs[0]) if (!tr.getAttribute('id')) + { clone_trs[j++] = tr; - else - sign_trs[text_content(trs[i - 1].children[0])] = tr; /* based on the patch ID */ + id = text_content(tr.children[0]); + k = 0; + } + else if (id) /* based on the patch ID */ + { + if (!k) sign_trs[id] = []; + sign_trs[id][k++] = tr; + } } clone_trs.sort(sorter); @@ -323,7 +380,8 @@ my $sorter = <<END; tbody.appendChild(clone_trs[i]); j = text_content(clone_trs[i].children[0]); if (sign_trs[j]) - tbody.appendChild(sign_trs[j]); + for (k = 0; k < sign_trs[j].length; k++) + tbody.appendChild(sign_trs[j][k]); } }

1 0

Andrey Semakin : winemine: Add Reset Results button.
by Alexandre Julliard 07 Nov '17

07 Nov '17

Module: wine Branch: master Commit: b75b6655ef644fed0353bf0947e3929c2976fcd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75b6655ef644fed0353bf094… Author: Andrey Semakin <and-semakin(a)ya.ru> Date: Mon Nov 6 16:13:27 2017 +0500 winemine: Add Reset Results button. Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 22 ++++++++++++++-------- po/bg.po | 22 ++++++++++++++-------- po/ca.po | 22 ++++++++++++++-------- po/cs.po | 22 ++++++++++++++-------- po/da.po | 22 ++++++++++++++-------- po/de.po | 22 ++++++++++++++-------- po/el.po | 21 +++++++++++++-------- po/en.po | 20 ++++++++++++-------- po/en_US.po | 20 ++++++++++++-------- po/eo.po | 22 ++++++++++++++-------- po/es.po | 22 ++++++++++++++-------- po/fa.po | 21 +++++++++++++-------- po/fi.po | 22 ++++++++++++++-------- po/fr.po | 22 ++++++++++++++-------- po/he.po | 22 ++++++++++++++-------- po/hi.po | 20 ++++++++++++-------- po/hr.po | 22 ++++++++++++++-------- po/hu.po | 22 ++++++++++++++-------- po/it.po | 22 ++++++++++++++-------- po/ja.po | 22 ++++++++++++++-------- po/ko.po | 22 ++++++++++++++-------- po/lt.po | 22 ++++++++++++++-------- po/ml.po | 20 ++++++++++++-------- po/nb_NO.po | 22 ++++++++++++++-------- po/nl.po | 22 ++++++++++++++-------- po/or.po | 20 ++++++++++++-------- po/pa.po | 20 ++++++++++++-------- po/pl.po | 22 ++++++++++++++-------- po/pt_BR.po | 22 ++++++++++++++-------- po/pt_PT.po | 22 ++++++++++++++-------- po/rm.po | 20 ++++++++++++-------- po/ro.po | 22 ++++++++++++++-------- po/ru.po | 20 ++++++++++++-------- po/sk.po | 22 ++++++++++++++-------- po/sl.po | 22 ++++++++++++++-------- po/sr_RS(a)cyrillic.po | 22 ++++++++++++++-------- po/sr_RS(a)latin.po | 22 ++++++++++++++-------- po/sv.po | 22 ++++++++++++++-------- po/te.po | 20 ++++++++++++-------- po/th.po | 21 +++++++++++++-------- po/tr.po | 22 ++++++++++++++-------- po/uk.po | 22 ++++++++++++++-------- po/wa.po | 20 ++++++++++++-------- po/wine.pot | 20 ++++++++++++-------- po/zh_CN.po | 22 ++++++++++++++-------- po/zh_TW.po | 22 ++++++++++++++-------- programs/winemine/dialog.c | 14 ++++++++++++++ programs/winemine/main.c | 14 ++++++++++++-- programs/winemine/main.h | 2 ++ programs/winemine/resource.h | 1 + programs/winemine/winemine.rc | 23 ++++++++++++----------- 51 files changed, 660 insertions(+), 381 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b75b6655ef644fed0353b…

1 0

Gerald Pfeifer : configure: Use the -Wno-packed-not-aligned compiler option if available.
by Alexandre Julliard 07 Nov '17

07 Nov '17

Module: wine Branch: master Commit: 6864803f1ab70f9f9e90903b13e67da40973d12a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6864803f1ab70f9f9e90903b1… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Nov 4 20:06:07 2017 +0100 configure: Use the -Wno-packed-not-aligned compiler option if available. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 25 +++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 26 insertions(+) diff --git a/configure b/configure index cb21f2a..4a1d0eb 100755 --- a/configure +++ b/configure @@ -14876,6 +14876,31 @@ $as_echo "$ac_cv_cflags__Wignored_qualifiers" >&6; } if test "x$ac_cv_cflags__Wignored_qualifiers" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wignored-qualifiers" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-packed-not-aligned" >&5 +$as_echo_n "checking whether the compiler supports -Wno-packed-not-aligned... " >&6; } +if ${ac_cv_cflags__Wno_packed_not_aligned+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wno-packed-not-aligned" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wno_packed_not_aligned=yes +else + ac_cv_cflags__Wno_packed_not_aligned=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_packed_not_aligned" >&5 +$as_echo "$ac_cv_cflags__Wno_packed_not_aligned" >&6; } +if test "x$ac_cv_cflags__Wno_packed_not_aligned" = xyes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wno-packed-not-aligned" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wshift-overflow=2" >&5 $as_echo_n "checking whether the compiler supports -Wshift-overflow=2... " >&6; } if ${ac_cv_cflags__Wshift_overflow_2+:} false; then : diff --git a/configure.ac b/configure.ac index 29f4cd1..637979a 100644 --- a/configure.ac +++ b/configure.ac @@ -1824,6 +1824,7 @@ then WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) + WINE_TRY_CFLAGS([-Wno-packed-not-aligned]) WINE_TRY_CFLAGS([-Wshift-overflow=2]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits])

1 0