July 2018 - Wine-commits - list.winehq.org

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 04 Jul '18

04 Jul '18

Module: wine Branch: master Commit: d9e2b257837a598a67233282d3f69a829fc4b2ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9e2b257837a598a67233282… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jul 4 12:41:15 2018 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/po/fi.po b/po/fi.po index 80c17de..c23864a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3424,32 +3424,24 @@ msgid "Publishers..." msgstr "Julkaisijat..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "Lähiverkkoyhteys" +msgstr "Yhteydet" #: inetcpl.rc:125 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "&Paikallinen palvelin" +msgstr "Välityspalvelin" #: inetcpl.rc:126 msgid "Use a proxy server" -msgstr "" +msgstr "Käytä välityspalvelinta" #: inetcpl.rc:127 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Osoite" +msgstr "Osoite:" #: inetcpl.rc:129 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Kohdeporttivirheitä" +msgstr "Portti:" #: inetcpl.rc:31 msgid "Internet Settings"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 04 Jul '18

04 Jul '18

Module: wine Branch: master Commit: 6122a5fb1237e8ab23f6d36aee234412a7abcb09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6122a5fb1237e8ab23f6d36a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 4 13:52:55 2018 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/po/ru.po b/po/ru.po index 53ec49e..bd72bee 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-06-15 13:16+0300\n" +"PO-Revision-Date: 2018-07-04 13:51+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -3438,32 +3438,24 @@ msgid "Publishers..." msgstr "Издатели..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "Сетевое подключение" +msgstr "Подключения" #: inetcpl.rc:125 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "&Локальный сервер" +msgstr "Прокси-сервер" #: inetcpl.rc:126 msgid "Use a proxy server" -msgstr "" +msgstr "Использовать прокси-сервер" #: inetcpl.rc:127 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Адрес" +msgstr "Адрес:" #: inetcpl.rc:129 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Порт не указан" +msgstr "Порт:" #: inetcpl.rc:31 msgid "Internet Settings" @@ -14802,6 +14794,8 @@ msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" +"Программа неожиданно перестала работать, но WineDbg не смог подключиться к " +"процессу и получить более подробную информацию." #: winedbg.rc:41 msgid "(unidentified)"

1 0

Nikolay Sivov : comctl32/tests: Add some tests for ownerdrawn listbox.
by Alexandre Julliard 04 Jul '18

04 Jul '18

Module: wine Branch: master Commit: 9313cb0866b6ade82e6b81ae78d1374c7aaa1403 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9313cb0866b6ade82e6b81ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 4 13:40:57 2018 +0300 comctl32/tests: Add some tests for ownerdrawn listbox. Adapted from user32 tests contributed by Dmitry Timoshkov. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42602 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 243 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 215 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9313cb0866b6ade82e6b…

1 0

Zebediah Figura : strmbase: Implement CBaseFilter::FindPin().
by Alexandre Julliard 04 Jul '18

04 Jul '18

Module: wine Branch: master Commit: 5b9ae5ad8dbdf70080a6c85939d9dc2d852f4fb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b9ae5ad8dbdf70080a6c859… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 3 23:56:51 2018 +0200 strmbase: Implement CBaseFilter::FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 31 +++++++++++++++++++++++++++++++ include/wine/strmbase.h | 1 + 2 files changed, 32 insertions(+) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index f1b2d49..7d33f80 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -141,6 +141,37 @@ HRESULT WINAPI BaseFilterImpl_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) return EnumPins_Construct(This, This->pFuncsTable->pfnGetPin, This->pFuncsTable->pfnGetPinCount, BaseFilterImpl_GetPinVersion, ppEnum); } +HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin **ret) +{ + BaseFilter *This = impl_from_IBaseFilter(iface); + PIN_INFO info; + HRESULT hr; + IPin *pin; + int i; + + TRACE("(%p)->(%s, %p)\n", This, debugstr_w(id), ret); + + for (i = 0; i < This->pFuncsTable->pfnGetPinCount(This); ++i) + { + pin = This->pFuncsTable->pfnGetPin(This, i); + hr = IPin_QueryPinInfo(pin, &info); + if (FAILED(hr)) + { + IPin_Release(pin); + return hr; + } + + if (!strcmpW(id, info.achName)) + { + *ret = pin; + return S_OK; + } + + IPin_Release(pin); + } + + return VFW_E_NOT_FOUND; +} HRESULT WINAPI BaseFilterImpl_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo) { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index abe92ae..b07dfa2 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -190,6 +190,7 @@ HRESULT WINAPI BaseFilterImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTim HRESULT WINAPI BaseFilterImpl_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock); HRESULT WINAPI BaseFilterImpl_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock); HRESULT WINAPI BaseFilterImpl_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum); +HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin **pin); HRESULT WINAPI BaseFilterImpl_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo); HRESULT WINAPI BaseFilterImpl_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName ); HRESULT WINAPI BaseFilterImpl_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo);

1 0

Piotr Caban : inetcpl.cpl: Add partial support for writing DefaultConnectionSettings registry setting.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: b57d794796476f5de7cc49c99972d32662ee09c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b57d794796476f5de7cc49c9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 28 16:02:45 2018 +0200 inetcpl.cpl: Add partial support for writing DefaultConnectionSettings registry setting. IE 10+ saves connection information in this key. .NET 4.6.2 is using the key to read proxy settings. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcpl.cpl/connections.c | 83 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index bd21b2d..925182a 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/dlls/inetcpl.cpl/connections.c @@ -26,6 +26,7 @@ #include "inetcpl.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); @@ -36,9 +37,65 @@ static const WCHAR internet_settings[] = {'S','o','f','t','w','a','r','e','\\', 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0}; static const WCHAR proxy_enable[] = {'P','r','o','x','y','E','n','a','b','l','e',0}; static const WCHAR proxy_server[] = {'P','r','o','x','y','S','e','r','v','e','r',0}; +static const WCHAR connections[] = {'C','o','n','n','e','c','t','i','o','n','s',0}; +static const WCHAR default_connection_settings[] = {'D','e','f','a','u','l','t', + 'C','o','n','n','e','c','t','i','o','n','S','e','t','t','i','n','g','s',0}; static BOOL initdialog_done; +#define CONNECTION_SETTINGS_VERSION 0x46 +#define MANUAL_PROXY 0x2 + +typedef struct { + DWORD version; + DWORD id; + DWORD flags; + BYTE data[1]; + /* DWORD proxy_server_len; */ + /* UTF8 proxy_server[proxy_server_len]; */ + /* DWORD bypass_list_len; */ + /* UTF8 bypass_list[bypass_list_len]; */ + /* DWORD configuration_script_len; */ + /* UTF8 configuration_script[configuration_script_len]; */ + /* DWORD unk[8]; set to 0 */ +} connection_settings; + +static DWORD create_connection_settings(BOOL manual_proxy, const WCHAR *proxy_server, + connection_settings **ret) +{ + DWORD size = FIELD_OFFSET(connection_settings, data), pos; + DWORD proxy_server_len; + + size += sizeof(DWORD); + if(proxy_server) + { + proxy_server_len = WideCharToMultiByte(CP_UTF8, 0, proxy_server, -1, + NULL, 0, NULL, NULL); + if(!proxy_server_len) return 0; + proxy_server_len--; + } + else + proxy_server_len = 0; + size += proxy_server_len; + size += sizeof(DWORD)*10; + + *ret = heap_alloc_zero(size); + if(!*ret) return 0; + + (*ret)->version = CONNECTION_SETTINGS_VERSION; + (*ret)->flags = 1; + if(manual_proxy) (*ret)->flags |= MANUAL_PROXY; + ((DWORD*)(*ret)->data)[0] = proxy_server_len; + pos = sizeof(DWORD); + if(proxy_server_len) + { + WideCharToMultiByte(CP_UTF8, 0, proxy_server, -1, + (char*)(*ret)->data+pos, proxy_server_len, NULL, NULL); + pos += proxy_server_len; + } + return size; +} + static void connections_on_initdialog(HWND hwnd) { DWORD type, size, enabled; @@ -110,11 +167,12 @@ static INT_PTR connections_on_command(HWND hwnd, WPARAM wparam) static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) { + connection_settings *default_connection; WCHAR addr[INTERNET_MAX_URL_LENGTH]; PSHNOTIFY *psn = (PSHNOTIFY*)lparam; - DWORD addr_len, port_len, enabled; + DWORD addr_len, port_len, enabled, size; LRESULT res; - HKEY hkey; + HKEY hkey, con; if(psn->hdr.code != PSN_APPLY) return FALSE; @@ -156,8 +214,29 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) if(res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } + if(res) + { + RegCloseKey(hkey); + return FALSE; + } TRACE("ProxtServer set to %s\n", wine_dbgstr_w(addr)); + + res = RegCreateKeyExW(hkey, connections, 0, NULL, 0, KEY_WRITE, NULL, &con, NULL); RegCloseKey(hkey); + if(res) + return FALSE; + + size = create_connection_settings(enabled, addr, &default_connection); + if(!size) + { + RegCloseKey(con); + return FALSE; + } + + res = RegSetValueExW(con, default_connection_settings, 0, REG_BINARY, + (BYTE*)default_connection, size); + heap_free(default_connection); + RegCloseKey(con); return !res; }

1 0

André Hentschel : dbghelp: Recompute location after fixing it.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: 3d482d3f9f0a3ffa69540af87594b3c1dc46e07b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d482d3f9f0a3ffa69540af8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 2 15:52:42 2018 +0200 dbghelp: Recompute location after fixing it. Fix a assertion raised by every exception with newer clang versions (>3.7) at least on ARM64: ../../../dlls/dbghelp/dwarf.c:1641: void dwarf2_parse_variable(dwarf2_subprogram_t *, struct symt_block *, dwarf2_debug_info_t *): Assertion `subpgm->func' failed. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 1a75a79..dc3ec29 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -942,6 +942,7 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, *ptr = xloc.u.block.size; memcpy(ptr + 1, xloc.u.block.ptr, xloc.u.block.size); loc->offset = (unsigned long)ptr; + compute_location(&lctx, loc, NULL, frame); } } return TRUE;

1 0

Marcus Meissner : comctl32/tests: Header item struct gets characters not bytes.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: 6e437acf1c9a2e50800e1c0c7f534169ce69b0ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e437acf1c9a2e50800e1c0c… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Jun 29 17:34:55 2018 +0200 comctl32/tests: Header item struct gets characters not bytes. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e9b715e..c118f02 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5490,7 +5490,7 @@ static void test_header_notification2(void) memset(&itemW, 0, sizeof(itemW)); itemW.mask = HDI_WIDTH | HDI_ORDER | HDI_TEXT; itemW.pszText = buffer; - itemW.cchTextMax = sizeof(buffer); + itemW.cchTextMax = ARRAY_SIZE(buffer); ret = SendMessageW(header, HDM_GETITEMW, 0, (LPARAM)&itemW); expect(1, ret);

1 0

Marcus Meissner : comctl32: Treeview item gets characters not bytes passed in.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: 7e0de24a7585da7000517151e080cae6ec6aa003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e0de24a7585da7000517151… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Jun 29 17:29:39 2018 +0200 comctl32: Treeview item gets characters not bytes passed in. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index b0b8325..bbef651 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4694,7 +4694,7 @@ static INT TREEVIEW_ProcessLetterKeys(TREEVIEW_INFO *infoPtr, WPARAM charCode, L item.mask = TVIF_TEXT; item.hItem = idx; item.pszText = buffer; - item.cchTextMax = sizeof(buffer); + item.cchTextMax = ARRAY_SIZE(buffer); TREEVIEW_GetItemT( infoPtr, &item, TRUE ); /* check for a match */

1 0

Marcus Meissner : shell32: Set size in characters in MENUITEMINFOW struct.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: aba4789b0eface4636a723dacfdee19124248ab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aba4789b0eface4636a723da… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Jun 29 17:23:26 2018 +0200 shell32: Set size in characters in MENUITEMINFOW struct. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 4548bf3..40306d6 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1236,7 +1236,7 @@ static HRESULT shellex_run_context_menu_default( IShellExtInit *obj, info.cbSize = sizeof info; info.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE | MIIM_DATA | MIIM_ID; info.dwTypeData = string; - info.cch = sizeof string; + info.cch = ARRAY_SIZE(string); string[0] = 0; GetMenuItemInfoW( hmenu, i, TRUE, &info );

1 0

Austin English : winecfg: Recommend against overriding secur32.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: 53cc1da18f3683197fa5e62c2f7d4f9d3ef39c51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53cc1da18f3683197fa5e62c… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 2 05:23:07 2018 +0200 winecfg: Recommend against overriding secur32. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45344 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/libraries.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 22e9435..ee60978 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -64,6 +64,7 @@ static const char * const builtin_only[] = "ntoskrnl.exe", "opengl32", "sane.ds", + "secur32", "twain_32", "unicows", "user32",

1 0