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

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: e7860b12f72531c298d65a53488235f6e00aec7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7860b12f72531c298d65a534… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 13 10:23:29 2017 +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 | 54 ++++++------------------------------------------------ 1 file changed, 6 insertions(+), 48 deletions(-) diff --git a/po/ru.po b/po/ru.po index 495b1c2..f37831a 100644 --- a/po/ru.po +++ b/po/ru.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-07-11 13:16+0300\n" +"PO-Revision-Date: 2017-07-13 09:32+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -12376,38 +12376,6 @@ msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "Не удалось импортировать «%1». Некорректный файл реестра." #: regedit.rc:408 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regedit [options] [filename] [reg_key]\n" -#| "\n" -#| "Options:\n" -#| " [no option] Launch the graphical version of this program.\n" -#| " /L:system.dat The location of the system.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /R:user.dat The location of the user.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /C Import the contents of a registry file.\n" -#| " /D Delete a specified registry key.\n" -#| " /E Export the contents of a specified registry key to a " -#| "file.\n" -#| " If no key is specified, the entire registry is " -#| "exported.\n" -#| " /S Silent mode. No messages will be displayed.\n" -#| " /V Launch the GUI in advanced mode. Ignored.\n" -#| " /? Display this information and exit.\n" -#| " [filename] The location of the file containing registry information " -#| "to\n" -#| " be imported. When used with [/E], this option specifies " -#| "the\n" -#| " file location where registry information will be " -#| "exported.\n" -#| " [reg_key] The registry key to be modified.\n" -#| "\n" -#| "Usage examples:\n" -#| " regedit \"import.reg\"\n" -#| " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -#| " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgid "" "Usage:\n" " regedit [options] [filename] [reg_key]\n" @@ -12462,7 +12430,7 @@ msgstr "" "Примеры использования:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" @@ -12533,21 +12501,17 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: не удалось открыть ключ «%1».\n" #: regedit.rc:425 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" -msgstr "regedit: «%2» содержит неподдерживаемый тип данных [%1].\n" +msgstr "regedit: «%2» содержит неподдерживаемый тип данных [0x%1!x!].\n" #: regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" msgstr "regedit: значение «%1» будет экспортировано в бинарном виде.\n" #: regedit.rc:427 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "reg: неверное имя раздела\n" +msgstr "regedit: неверный системный ключ [%1]\n" #: regedit.rc:428 msgid "" @@ -12555,10 +12519,8 @@ msgid "" msgstr "regedit: не удалось экспортировать «%1». Указанный ключ не найден.\n" #: regedit.rc:429 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit: не удалось удалить класс «%1».\n" +msgstr "regedit: не удалось удалить ключ «%1».\n" #: regedit.rc:431 msgid "regedit: The line contains invalid syntax.\n" @@ -12705,13 +12667,9 @@ msgid "Confirm Key Delete" msgstr "Подтверждение удаления ключа" #: regedit.rc:213 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete the registry key '%1' and all of its " -#| "subkeys?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "Вы точно хотите удалить ключ реестра «%1» и все вложенные ключи?" +msgstr "Вы точно хотите удалить этот ключ реестра и все вложенные ключи?" #: regedit.rc:199 msgid "Expands or collapses the selected node"

1 0

Can Taşan : po: Update Turkish translation.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: a826fb6f0ad8b38ddc7550571da89cc3058f1275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a826fb6f0ad8b38ddc7550571… Author: Can Taşan <betax34(a)hotmail.com> Date: Thu Jul 13 10:57:34 2017 +0200 po: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 298 +++++++++++++++++++++++---------------------------------------- 1 file changed, 109 insertions(+), 189 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a826fb6f0ad8b38ddc755…

1 0

Rosanne DiMesio : Revise testData_queue outputEditor messages
by Jeremy Newman 13 Jul '17

13 Jul '17

Module: appdb Branch: master Commit: 719414b00e5eceab9d3c78f7b3acc18a35d74e6b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=719414b00e5eceab9d3c78f7… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Jul 13 12:35:28 2017 -0500 Revise testData_queue outputEditor messages Clarifies instructions for both users and maintainers/admins regarding adding/added distributions. Uses bootstrap alert to make the admin/maintainer message more visible. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData_queue.php | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/include/testData_queue.php b/include/testData_queue.php index 64c68b5..ee718b9 100644 --- a/include/testData_queue.php +++ b/include/testData_queue.php @@ -88,27 +88,36 @@ class testData_queue function outputEditor() { $this->oTestData->outputEditor(); + + echo "<table width='90%' border=0 cellpadding=2 cellspacing=0>\n"; + echo '<tr><td>'; - /* If we are processing queued test results with a queued distribution, - we display some additional help here */ - if($this->oDistribution->iDistributionId && - $this->oDistribution->objectGetState() != 'accepted' && $this->canEdit()) + //a new test report, not yet queued + if(!$this->oTestData->iTestingId) { - echo "The user submitted a new operating system, which will be un-queued ". - "together with the test data unless you select an existing one ". - "from the list above."; + echo '<b>Add new operating system:</b> use this form to add your operating system if it '; + echo 'is not in the dropdown list above.'; } + //queued test results with a queued distribution + if($this->oDistribution->iDistributionId && + $this->oDistribution->objectGetState() != 'accepted' + && $this->canEdit()) + { + echo '<div class="alert alert-danger" role="alert">'; + echo '<b>New operating system added:</b> You may correct this submission '; + echo 'by selecting an operating system from the list above '; + echo 'or editing the information in the textboxes below. '; + echo '</div>'; + } /* If the testData is already associated with a distribution and the distribution is un-queued, there is no need to display the - distribution form here */ - if(!$this->oTestData->iDistributionId or - $this->oDistribution->objectGetState() != 'accepted') - { - echo html_frame_start("New operating system", "90%"); - $this->oDistribution->outputEditor(); - echo html_frame_end(); - } + distribution form. */ + if(!$this->oTestData->iDistributionId || + $this->oDistribution->objectGetState() != 'accepted') + echo $this->oDistribution->outputEditor(); + + echo '</tr></td></table>'; } function getOutputEditorValues($aClean)

1 0

Rosanne DiMesio : Make new distribution added notice more visible
by Jeremy Newman 13 Jul '17

13 Jul '17

Module: appdb Branch: master Commit: e878633435036dc498a0b166b6ce04bed4262251 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e878633435036dc498a0b166… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Jul 13 11:58:19 2017 -0500 Make new distribution added notice more visible Add a warning icon and background color to make the inline notice to maintainers/admins more visible on the form. Also changes one more instance of distribution to operating system. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/include/testData.php b/include/testData.php index 84f87c7..cd3fc8b 100644 --- a/include/testData.php +++ b/include/testData.php @@ -811,14 +811,11 @@ class testData{ if(!$this->iDistributionId) { $sDistributionHelp = "If yours is not on the list, ". - "please add it using the form below."; + "please add it using the form below.<br>"; } else { - $sDistributionHelp = "The user added a new operating system; ". - "review it in the form below or replace ". - "it with one from the list."; + $sDistributionHelp = '<p class="bg-danger"><span class = "text-danger fa fa-exclamation-triangle" style="font-size:125%"></span> The user submitted a new operating system; please review it in the form below.</p>'; } - $sDistributionHelp .= "<br>\n"; } echo '<tr valign=top><td class="color0"><b>Operating system</b></td class="color0">',"\n"; @@ -928,7 +925,7 @@ class testData{ // No Distribution entered, and nothing in the list is selected if (empty($aValues['sDistribution']) && !$aValues['iTestDistributionId']) - $errors .= "<li>Please enter a distribution.</li>\n"; + $errors .= "<li>Please enter an operating system.</li>\n"; if (empty($aValues['sInstalls'])) $errors .= "<li>Please enter whether this application installs or not.</li>\n";

1 0

André Hentschel : winemaker: Remove trailing semicolon from PreprocessorDefinitions.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 989a9dc91778c94d0cf0c769709f10dcc92a5ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=989a9dc91778c94d0cf0c7697… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 12 19:49:06 2017 +0200 winemaker: Remove trailing semicolon from PreprocessorDefinitions. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winemaker/winemaker | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winemaker/winemaker b/tools/winemaker/winemaker index d077061..ec5fb16 100755 --- a/tools/winemaker/winemaker +++ b/tools/winemaker/winemaker @@ -967,6 +967,7 @@ sub source_scan_project_file($$$) } if ($vc_compiler_tool->getName eq "PreprocessorDefinitions") { $configt=$vc_compiler_tool->getValue; + $configt=~s/;+$//; $configt=~s/;\s*/ -D/g; $prj_target_defines.="-D".$configt." "; }

1 0

Hugh McMaster : regedit: Update some resource strings associated with key parsing.
by Alexandre Julliard 12 Jul '17

12 Jul '17

1 0

Hugh McMaster : regedit: Update string resources associated with key deletion.
by Alexandre Julliard 12 Jul '17

12 Jul '17

1 0

Hugh McMaster : regedit: Remove the unused _CmdWndProc callback function from listview.c.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 9e1278dd47ef785ce6dcfbc81760cfbdcba23c07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1278dd47ef785ce6dcfbc81… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 12 11:09:30 2017 +0000 regedit: Remove the unused _CmdWndProc callback function from listview.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 9e271ad..aaec88f 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -362,25 +362,9 @@ HWND StartValueRename(HWND hwndLV) return (HWND)SendMessageW(hwndLV, LVM_EDITLABELW, item, 0); } -static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - switch (LOWORD(wParam)) { - /* case ID_FILE_OPEN: */ - /* break; */ - default: - return FALSE; - } - return TRUE; -} - static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { - case WM_COMMAND: - if (!_CmdWndProc(hWnd, message, wParam, lParam)) { - return CallWindowProcW(g_orgListWndProc, hWnd, message, wParam, lParam); - } - break; case WM_NOTIFY_REFLECT: switch (((LPNMHDR)lParam)->code) {

1 0

Hugh McMaster : regedit: Move treeview notify messages to a separate function.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: aa42d81e6da9d114bdcdab6a099db510c5e17d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa42d81e6da9d114bdcdab6a0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 12 11:09:38 2017 +0000 regedit: Move treeview notify messages to a separate function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 114 +++++++++++++++++++++++++------------------- 1 file changed, 64 insertions(+), 50 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 2a646ef..0a89647 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -293,6 +293,67 @@ static void set_last_key(HWND hwndTV) } } +static int treeview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (((NMHDR *)lParam)->code) + { + case NM_SETFOCUS: + g_pChildWnd->nFocusPanel = 0; + break; + case TVN_BEGINLABELEDITW: + { + HKEY hRootKey; + WCHAR *path; + + if (!GetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA)) + return 1; + + path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); + if (!path || !*path) + return 1; + return 0; + } + case TVN_ENDLABELEDITW: + { + HKEY hRootKey; + NMTVDISPINFOW *dispInfo = (NMTVDISPINFOW *)lParam; + WCHAR *path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); + BOOL res = RenameKey(hWnd, hRootKey, path, dispInfo->item.pszText); + + HeapFree(GetProcessHeap(), 0, path); + + if (res) + { + TVITEMW item; + WCHAR *fullPath; + + item.mask = TVIF_HANDLE | TVIF_TEXT; + item.hItem = dispInfo->item.hItem; + item.pszText = dispInfo->item.pszText; + SendMessageW(g_pChildWnd->hTreeWnd, TVM_SETITEMW, 0, (LPARAM)&item); + + path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); + update_listview_path(path); + + fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, path); + SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); + HeapFree(GetProcessHeap(), 0, fullPath); + HeapFree(GetProcessHeap(), 0, path); + } + + SetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA, 0); + return res; + } + case TVN_ITEMEXPANDINGW: + return !OnTreeExpanding(g_pChildWnd->hTreeWnd, (NMTREEVIEWW *)lParam); + case TVN_SELCHANGEDW: + OnTreeSelectionChanged(g_pChildWnd->hTreeWnd, g_pChildWnd->hListWnd, + ((NMTREEVIEWW *)lParam)->itemNew.hItem, TRUE); + break; + } + return 0; +} + #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) @@ -427,57 +488,10 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa break; case WM_NOTIFY: - if (((int)wParam == TREE_WINDOW) && (g_pChildWnd != NULL)) { - switch (((LPNMHDR)lParam)->code) { - case TVN_ITEMEXPANDINGW: - return !OnTreeExpanding(g_pChildWnd->hTreeWnd, (NMTREEVIEWW*)lParam); - case TVN_SELCHANGEDW: - OnTreeSelectionChanged(g_pChildWnd->hTreeWnd, g_pChildWnd->hListWnd, - ((NMTREEVIEWW *)lParam)->itemNew.hItem, TRUE); - break; - case NM_SETFOCUS: - g_pChildWnd->nFocusPanel = 0; - break; - case TVN_BEGINLABELEDITW: { - HKEY hRootKey; - LPWSTR path; - - if (!GetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA)) - return 1; - - path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); - if (!path || !*path) return 1; - return 0; - } - case TVN_ENDLABELEDITW: { - HKEY hRootKey; - LPNMTVDISPINFOW dispInfo = (LPNMTVDISPINFOW)lParam; - LPWSTR path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); - BOOL res = RenameKey(hWnd, hRootKey, path, dispInfo->item.pszText); - HeapFree(GetProcessHeap(), 0, path); - if (res) { - TVITEMW item; - WCHAR *fullPath; - item.mask = TVIF_HANDLE | TVIF_TEXT; - item.hItem = dispInfo->item.hItem; - item.pszText = dispInfo->item.pszText; - SendMessageW( g_pChildWnd->hTreeWnd, TVM_SETITEMW, 0, (LPARAM)&item ); - path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); - fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, path); - SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); - HeapFree(GetProcessHeap(), 0, fullPath); - update_listview_path(path); - HeapFree(GetProcessHeap(), 0, path); - } - SetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA, 0); - return res; - } - default: - return 0; /* goto def; */ - } - } else if ((int)wParam == LIST_WINDOW && g_pChildWnd != NULL) { + if (wParam == TREE_WINDOW && g_pChildWnd) + return treeview_notify(hWnd, message, wParam, lParam); + else if (wParam == LIST_WINDOW && g_pChildWnd) return SendMessageW(g_pChildWnd->hListWnd, WM_NOTIFY_REFLECT, wParam, lParam); - } break; case WM_SIZE:

1 0

Hugh McMaster : regedit: Remove the listview' s sub-class and move its messages to childwnd.c.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 683b9992f6217e5e4f535dffdd5ba60a47b555cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=683b9992f6217e5e4f535dffd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 12 11:09:49 2017 +0000 regedit: Remove the listview's sub-class and move its messages to childwnd.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 130 ++++++++++++++++++++++++++++++++++++++++---- programs/regedit/listview.c | 127 +++---------------------------------------- programs/regedit/main.h | 17 +++++- 3 files changed, 143 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=683b9992f6217e5e4f535…

1 0