Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [ZIPFLDR] Extraction is now in its own thread (#2261)
by Guntha 07 Feb '20

07 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=645c77335cb466750bb8a… commit 645c77335cb466750bb8a01ed87aab35a748ecbb Author: Guntha <39413331+alexGuntha(a)users.noreply.github.com> AuthorDate: Fri Feb 7 19:21:21 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 7 19:21:21 2020 +0100 [ZIPFLDR] Extraction is now in its own thread (#2261) Extraction happens now in its own thread, allowing for cancelling in the middle of extraction or moving the window during the extraction. File extraction was previously happening in the main thread, freezing the whole window until the end. Now when the user clicks "Next", a new thread is created and the extraction starts from there, allowing to move the window during the extraction, or to cancel the extraction in the middle. (Note: after clicking "Cancel", extraction continues until the current file is extracted). CORE-14934 --- dll/shellext/zipfldr/CZipExtract.cpp | 97 ++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 5 deletions(-) diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index d3b3756f34e..66ac782e425 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -70,12 +70,17 @@ public: class CExtractSettingsPage : public CPropertyPageImpl<CExtractSettingsPage> { private: + HANDLE m_hExtractionThread; + bool m_bExtractionThreadCancel; + CZipExtract* m_pExtract; CStringA* m_pPassword; public: CExtractSettingsPage(CZipExtract* extract, CStringA* password) :CPropertyPageImpl<CExtractSettingsPage>(MAKEINTRESOURCE(IDS_WIZ_TITLE)) + ,m_hExtractionThread(NULL) + ,m_bExtractionThreadCancel(false) ,m_pExtract(extract) ,m_pPassword(password) { @@ -95,6 +100,28 @@ public: int OnWizardNext() { + if (m_hExtractionThread != NULL) + { + /* We enter here when extraction has finished, and go to next page if it succeeded */ + WaitForSingleObject(m_hExtractionThread, INFINITE); + CloseHandle(m_hExtractionThread); + m_hExtractionThread = NULL; + m_pExtract->Release(); + if (!m_bExtractionThreadCancel) + { + return 0; + } + else + { + SetWindowLongPtr(DWLP_MSGRESULT, -1); + return TRUE; + } + } + + /* We end up here if the user manually clicks Next: start extraction */ + m_bExtractionThreadCancel = false; + + /* Grey out every control during extraction to prevent user interaction */ ::EnableWindow(GetDlgItem(IDC_BROWSE), FALSE); ::EnableWindow(GetDlgItem(IDC_DIRECTORY), FALSE); ::EnableWindow(GetDlgItem(IDC_PASSWORD), FALSE); @@ -103,20 +130,64 @@ public: if (m_pExtract->m_DirectoryChanged) UpdateDirectory(); - if (!m_pExtract->Extract(m_hWnd, GetDlgItem(IDC_PROGRESS))) + m_pExtract->AddRef(); + + m_hExtractionThread = CreateThread(NULL, 0, + &CExtractSettingsPage::ExtractEntry, + this, + 0, NULL); + if (!m_hExtractionThread) { - /* Extraction failed, do not go to the next page */ + /* Extraction thread creation failed, do not go to the next page */ + DWORD err = GetLastError(); + DPRINT1("ERROR, m_hExtractionThread: CreateThread failed: 0x%x\n", err); + m_pExtract->Release(); + SetWindowLongPtr(DWLP_MSGRESULT, -1); ::EnableWindow(GetDlgItem(IDC_BROWSE), TRUE); ::EnableWindow(GetDlgItem(IDC_DIRECTORY), TRUE); ::EnableWindow(GetDlgItem(IDC_PASSWORD), TRUE); SetWizardButtons(PSWIZB_NEXT); + } + return TRUE; + } - return TRUE; + static DWORD WINAPI ExtractEntry(LPVOID lpParam) + { + CExtractSettingsPage* pPage = (CExtractSettingsPage*)lpParam; + bool res = pPage->m_pExtract->Extract(pPage->m_hWnd, pPage->GetDlgItem(IDC_PROGRESS), &(pPage->m_bExtractionThreadCancel)); + /* Failing and cancelling extraction both mean we stay on the same property page */ + pPage->m_bExtractionThreadCancel = !res; + + pPage->SetWizardButtons(PSWIZB_NEXT); + if (!res) + { + /* Extraction failed/cancelled: the page becomes interactive again */ + ::EnableWindow(pPage->GetDlgItem(IDC_BROWSE), TRUE); + ::EnableWindow(pPage->GetDlgItem(IDC_DIRECTORY), TRUE); + ::EnableWindow(pPage->GetDlgItem(IDC_PASSWORD), TRUE); + + /* Reset the progress bar's appearance */ + CWindow Progress(pPage->GetDlgItem(IDC_PROGRESS)); + Progress.SendMessage(PBM_SETRANGE32, 0, 1); + Progress.SendMessage(PBM_SETPOS, 0, 0); } + SendMessageCallback(pPage->GetParent().m_hWnd, PSM_PRESSBUTTON, PSBTN_NEXT, 0, NULL, NULL); + return 0; } + + BOOL OnQueryCancel() + { + if (m_hExtractionThread != NULL) + { + /* Extraction will check the value of m_bExtractionThreadCancel between each file in the archive */ + m_bExtractionThreadCancel = true; + return TRUE; + } + return FALSE; + } struct browse_info { @@ -268,7 +339,7 @@ public: PropertySheetW(&psh); } - bool Extract(HWND hDlg, HWND hProgress) + bool Extract(HWND hDlg, HWND hProgress, const bool* bCancel) { unz_global_info64 gi; uf = unzOpen2_64(m_Filename.GetString(), &g_FFunc); @@ -301,6 +372,12 @@ public: bool bOverwriteAll = false; while (zipEnum.next(Name, Info)) { + if (*bCancel) + { + Close(); + return false; + } + bool is_dir = Name.GetLength() > 0 && Name[Name.GetLength()-1] == '/'; char CombinedPath[MAX_PATH * 2] = { 0 }; @@ -418,6 +495,16 @@ public: do { + if (*bCancel) + { + CloseHandle(hFile); + BOOL deleteResult = DeleteFileA(FullPath); + if (deleteResult == 0) + DPRINT1("ERROR, DeleteFileA: 0x%x\n", GetLastError()); + Close(); + return false; + } + err = unzReadCurrentFile(uf, Buffer, sizeof(Buffer)); if (err < 0) @@ -451,7 +538,7 @@ public: LocalFileTimeToFileTime(&LocalFileTime, &FileTime); SetFileTime(hFile, &FileTime, &LastAccessTime, &FileTime); - /* Done.. */ + /* Done */ CloseHandle(hFile); if (err)

1 0

[reactos] 01/01: [USER32] Update the translations of IDS_ASK_TERMINATE.
by Hermès Bélusca-Maïto 07 Feb '20

07 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b97977db9c14dfb573f37… commit b97977db9c14dfb573f37b8c4f37895fcbceb49e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Feb 7 19:07:22 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Feb 7 19:07:22 2020 +0100 [USER32] Update the translations of IDS_ASK_TERMINATE. --- win32ss/user/user32/lang/bg-BG.rc | 2 +- win32ss/user/user32/lang/cs-CZ.rc | 2 +- win32ss/user/user32/lang/da-DK.rc | 2 +- win32ss/user/user32/lang/de-DE.rc | 2 +- win32ss/user/user32/lang/el-GR.rc | 2 +- win32ss/user/user32/lang/en-US.rc | 2 +- win32ss/user/user32/lang/es-ES.rc | 2 +- win32ss/user/user32/lang/fr-FR.rc | 2 +- win32ss/user/user32/lang/he-IL.rc | 2 +- win32ss/user/user32/lang/hu-HU.rc | 2 +- win32ss/user/user32/lang/id-ID.rc | 2 +- win32ss/user/user32/lang/it-IT.rc | 2 +- win32ss/user/user32/lang/ja-JP.rc | 2 +- win32ss/user/user32/lang/lt-LT.rc | 2 +- win32ss/user/user32/lang/nl-NL.rc | 2 +- win32ss/user/user32/lang/no-NO.rc | 2 +- win32ss/user/user32/lang/ro-RO.rc | 2 +- win32ss/user/user32/lang/sk-SK.rc | 2 +- win32ss/user/user32/lang/sv-SE.rc | 2 +- win32ss/user/user32/lang/tr-TR.rc | 2 +- win32ss/user/user32/lang/uk-UA.rc | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/win32ss/user/user32/lang/bg-BG.rc b/win32ss/user/user32/lang/bg-BG.rc index b1a4c308b1a..b717eeb1a78 100644 --- a/win32ss/user/user32/lang/bg-BG.rc +++ b/win32ss/user/user32/lang/bg-BG.rc @@ -59,7 +59,7 @@ STRINGTABLE BEGIN IDS_ERROR "Грешка" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "Добре" IDS_CANCEL "Отказ" diff --git a/win32ss/user/user32/lang/cs-CZ.rc b/win32ss/user/user32/lang/cs-CZ.rc index aeade5a416b..fbdbc9482fd 100644 --- a/win32ss/user/user32/lang/cs-CZ.rc +++ b/win32ss/user/user32/lang/cs-CZ.rc @@ -64,7 +64,7 @@ STRINGTABLE BEGIN IDS_ERROR "Chyba" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "OK" IDS_CANCEL "Storno" diff --git a/win32ss/user/user32/lang/da-DK.rc b/win32ss/user/user32/lang/da-DK.rc index 447b4e2f067..c0902e6ced9 100644 --- a/win32ss/user/user32/lang/da-DK.rc +++ b/win32ss/user/user32/lang/da-DK.rc @@ -59,7 +59,7 @@ STRINGTABLE BEGIN IDS_ERROR "Fejl" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "OK" IDS_CANCEL "Fortryd" diff --git a/win32ss/user/user32/lang/de-DE.rc b/win32ss/user/user32/lang/de-DE.rc index 38ccbdfe4a2..1b666388a6a 100644 --- a/win32ss/user/user32/lang/de-DE.rc +++ b/win32ss/user/user32/lang/de-DE.rc @@ -61,7 +61,7 @@ STRINGTABLE BEGIN IDS_ERROR "Fehler" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "OK" IDS_CANCEL "Abbrechen" diff --git a/win32ss/user/user32/lang/el-GR.rc b/win32ss/user/user32/lang/el-GR.rc index d750968c932..ad389eab9d2 100644 --- a/win32ss/user/user32/lang/el-GR.rc +++ b/win32ss/user/user32/lang/el-GR.rc @@ -59,7 +59,7 @@ STRINGTABLE BEGIN IDS_ERROR "Σφάλμα" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "OK" IDS_CANCEL "’κυρο" diff --git a/win32ss/user/user32/lang/en-US.rc b/win32ss/user/user32/lang/en-US.rc index 24f3bbaee86..18066ffcf16 100644 --- a/win32ss/user/user32/lang/en-US.rc +++ b/win32ss/user/user32/lang/en-US.rc @@ -59,7 +59,7 @@ STRINGTABLE BEGIN IDS_ERROR "Error" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "OK" IDS_CANCEL "Cancel" diff --git a/win32ss/user/user32/lang/es-ES.rc b/win32ss/user/user32/lang/es-ES.rc index 1b2e4548ca3..ee947772cdd 100644 --- a/win32ss/user/user32/lang/es-ES.rc +++ b/win32ss/user/user32/lang/es-ES.rc @@ -61,7 +61,7 @@ STRINGTABLE BEGIN IDS_ERROR "Error" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "Aceptar" IDS_CANCEL "Cancelar" diff --git a/win32ss/user/user32/lang/fr-FR.rc b/win32ss/user/user32/lang/fr-FR.rc index 912aa243c18..d5fba47a489 100644 --- a/win32ss/user/user32/lang/fr-FR.rc +++ b/win32ss/user/user32/lang/fr-FR.rc @@ -61,7 +61,7 @@ STRINGTABLE BEGIN IDS_ERROR "Erreur" IDS_NOT_RESPONDING " (ne répond pas)" - IDS_ASK_TERMINATE "Cette application ne répond pas. Faut-il l'arrêter ?" + IDS_ASK_TERMINATE "Cette application ne répond pas. Voulez-vous l'arrêter ?" IDS_HUNG_UP_TITLE "Ne répond pas !" IDS_OK "OK" IDS_CANCEL "Annuler" diff --git a/win32ss/user/user32/lang/he-IL.rc b/win32ss/user/user32/lang/he-IL.rc index d09463ddd6a..d1b04a72c90 100644 --- a/win32ss/user/user32/lang/he-IL.rc +++ b/win32ss/user/user32/lang/he-IL.rc @@ -60,7 +60,7 @@ STRINGTABLE BEGIN IDS_ERROR "שגיאה" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "אישור" IDS_CANCEL "ביטול" diff --git a/win32ss/user/user32/lang/hu-HU.rc b/win32ss/user/user32/lang/hu-HU.rc index 64194f4d152..c50f54fe448 100644 --- a/win32ss/user/user32/lang/hu-HU.rc +++ b/win32ss/user/user32/lang/hu-HU.rc @@ -61,7 +61,7 @@ STRINGTABLE BEGIN IDS_ERROR "Hiba" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "OK" IDS_CANCEL "Mégse" diff --git a/win32ss/user/user32/lang/id-ID.rc b/win32ss/user/user32/lang/id-ID.rc index b3e26d9a539..26fb10d5473 100644 --- a/win32ss/user/user32/lang/id-ID.rc +++ b/win32ss/user/user32/lang/id-ID.rc @@ -59,7 +59,7 @@ STRINGTABLE BEGIN IDS_ERROR "Salah" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "OK" IDS_CANCEL "Batal" diff --git a/win32ss/user/user32/lang/it-IT.rc b/win32ss/user/user32/lang/it-IT.rc index 14a5c8d5f82..370a1f8221b 100644 --- a/win32ss/user/user32/lang/it-IT.rc +++ b/win32ss/user/user32/lang/it-IT.rc @@ -59,7 +59,7 @@ STRINGTABLE BEGIN IDS_ERROR "Errore" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "OK" IDS_CANCEL "Annulla" diff --git a/win32ss/user/user32/lang/ja-JP.rc b/win32ss/user/user32/lang/ja-JP.rc index cf5e221c84f..01453795a9b 100644 --- a/win32ss/user/user32/lang/ja-JP.rc +++ b/win32ss/user/user32/lang/ja-JP.rc @@ -59,7 +59,7 @@ STRINGTABLE BEGIN IDS_ERROR "エラー" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "OK" IDS_CANCEL "キャンセル" diff --git a/win32ss/user/user32/lang/lt-LT.rc b/win32ss/user/user32/lang/lt-LT.rc index 30cdd312110..b3fd5f37f79 100644 --- a/win32ss/user/user32/lang/lt-LT.rc +++ b/win32ss/user/user32/lang/lt-LT.rc @@ -61,7 +61,7 @@ STRINGTABLE BEGIN IDS_ERROR "Klaida" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "Gerai" IDS_CANCEL "Atsisakyti" diff --git a/win32ss/user/user32/lang/nl-NL.rc b/win32ss/user/user32/lang/nl-NL.rc index 28635a19c49..edf189b7115 100644 --- a/win32ss/user/user32/lang/nl-NL.rc +++ b/win32ss/user/user32/lang/nl-NL.rc @@ -59,7 +59,7 @@ STRINGTABLE BEGIN IDS_ERROR "Fout" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "OK" IDS_CANCEL "Annuleren" diff --git a/win32ss/user/user32/lang/no-NO.rc b/win32ss/user/user32/lang/no-NO.rc index 5f2ef946ff5..78933b119df 100644 --- a/win32ss/user/user32/lang/no-NO.rc +++ b/win32ss/user/user32/lang/no-NO.rc @@ -59,7 +59,7 @@ STRINGTABLE BEGIN IDS_ERROR "Feil" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "OK" IDS_CANCEL "Avbryt" diff --git a/win32ss/user/user32/lang/ro-RO.rc b/win32ss/user/user32/lang/ro-RO.rc index 039dfdcf186..cfc74bdfe23 100644 --- a/win32ss/user/user32/lang/ro-RO.rc +++ b/win32ss/user/user32/lang/ro-RO.rc @@ -64,7 +64,7 @@ STRINGTABLE BEGIN IDS_ERROR "Eroare" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "Con&firmă" IDS_CANCEL "A&nulează" diff --git a/win32ss/user/user32/lang/sk-SK.rc b/win32ss/user/user32/lang/sk-SK.rc index c749e4e770d..e020da18861 100644 --- a/win32ss/user/user32/lang/sk-SK.rc +++ b/win32ss/user/user32/lang/sk-SK.rc @@ -61,7 +61,7 @@ STRINGTABLE BEGIN IDS_ERROR "Chyba" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "OK" IDS_CANCEL "Zrušiť" diff --git a/win32ss/user/user32/lang/sv-SE.rc b/win32ss/user/user32/lang/sv-SE.rc index 04c7f44f079..8f822885d4b 100644 --- a/win32ss/user/user32/lang/sv-SE.rc +++ b/win32ss/user/user32/lang/sv-SE.rc @@ -61,7 +61,7 @@ STRINGTABLE BEGIN IDS_ERROR "Fel" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "OK" IDS_CANCEL "Avbryt" diff --git a/win32ss/user/user32/lang/tr-TR.rc b/win32ss/user/user32/lang/tr-TR.rc index f318ffaf0d4..61e8d29f01c 100644 --- a/win32ss/user/user32/lang/tr-TR.rc +++ b/win32ss/user/user32/lang/tr-TR.rc @@ -61,7 +61,7 @@ STRINGTABLE BEGIN IDS_ERROR "Yanlışlık" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "Tamam" IDS_CANCEL "İptal" diff --git a/win32ss/user/user32/lang/uk-UA.rc b/win32ss/user/user32/lang/uk-UA.rc index 9c79df5c50a..e633463c8ec 100644 --- a/win32ss/user/user32/lang/uk-UA.rc +++ b/win32ss/user/user32/lang/uk-UA.rc @@ -59,7 +59,7 @@ STRINGTABLE BEGIN IDS_ERROR "Помилка" IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" + IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" IDS_HUNG_UP_TITLE "Hung up!" IDS_OK "OK" IDS_CANCEL "Скасувати"

1 0

[reactos] 01/01: [USER32] Update Brazilian-Portuguese translation (#2283)
by Assis Duarte 07 Feb '20

07 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=567b2d79fce645484fb7e… commit 567b2d79fce645484fb7e1aa78a2fb65196cfffc Author: Assis Duarte <assisguitar23(a)gmail.com> AuthorDate: Fri Feb 7 14:59:32 2020 -0300 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 7 18:59:32 2020 +0100 [USER32] Update Brazilian-Portuguese translation (#2283) --- win32ss/user/user32/lang/pt-BR.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/user/user32/lang/pt-BR.rc b/win32ss/user/user32/lang/pt-BR.rc index 484d133ffa8..aff3ae5cf82 100644 --- a/win32ss/user/user32/lang/pt-BR.rc +++ b/win32ss/user/user32/lang/pt-BR.rc @@ -60,9 +60,9 @@ END STRINGTABLE BEGIN IDS_ERROR "Erro" - IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" - IDS_HUNG_UP_TITLE "Hung up!" + IDS_NOT_RESPONDING " (Não respondendo)" + IDS_ASK_TERMINATE "Este programa não está respondendo. Você quer finalizar esse programa?" + IDS_HUNG_UP_TITLE "Não está respondendo!" IDS_OK "OK" IDS_CANCEL "Cancelar" IDS_ABORT "&Abortar"

1 0

[reactos] 01/01: [TRANSLATION] Update Hungarian translation of userenv (#2293)
by Tibor Lajos Füzi 07 Feb '20

07 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a16c02f283c6874ccc113… commit a16c02f283c6874ccc1136898a518a8b1d2883cc Author: Tibor Lajos Füzi <tibor.fuzi(a)gmail.com> AuthorDate: Fri Feb 7 18:12:20 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 7 18:12:20 2020 +0100 [TRANSLATION] Update Hungarian translation of userenv (#2293) --- dll/win32/userenv/lang/hu-HU.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/win32/userenv/lang/hu-HU.rc b/dll/win32/userenv/lang/hu-HU.rc index 2553f2fd317..3f78f8d2507 100644 --- a/dll/win32/userenv/lang/hu-HU.rc +++ b/dll/win32/userenv/lang/hu-HU.rc @@ -4,22 +4,22 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" - IDS_APPDATA "Application Data" - IDS_DESKTOP "Asztalk" + IDS_APPDATA "Alkalmazás adatok" + IDS_DESKTOP "Asztal" IDS_FAVORITES "Kedvencek" IDS_MYDOCUMENTS "Dokumentumok" IDS_NETHOOD "NetHood" IDS_PRINTHOOD "PrintHood" IDS_RECENT "Recent" IDS_SENDTO "SendTo" - IDS_TEMPLATES "Templates" - IDS_STARTMENU "Start Menu" - IDS_PROGRAMS "Start Menu\\Programs" - IDS_STARTUP "Start Menu\\Programs\\Startup" + IDS_TEMPLATES "Sablonok" + IDS_STARTMENU "Start menü" + IDS_PROGRAMS "Start menü\\Programok" + IDS_STARTUP "Start Menü\\Programok\\Automatikus indítás" IDS_LOCALSETTINGS "Local Settings" - IDS_LOCALAPPDATA "Local Settings\\Application Data" + IDS_LOCALAPPDATA "Local Settings\\Alkalmazás adatok" IDS_TEMP "Local Settings\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Local Settings\\Temporary Internet Files" IDS_HISTORY "Local Settings\\History" - IDS_COOKIES "Cookies" + IDS_COOKIES "Sütik" END

1 0

[reactos] 01/01: [OPENGL32][MESA] Describe the current status (#2309)
by Masanori Ogino 07 Feb '20

07 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e63bbef5aa507bc5373ce… commit e63bbef5aa507bc5373ce4b1672d2f190f233f30 Author: Masanori Ogino <masanori.ogino(a)gmail.com> AuthorDate: Sat Feb 8 02:09:38 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 7 18:09:38 2020 +0100 [OPENGL32][MESA] Describe the current status (#2309) Since 5f2bebf7, the Mesa library in dll/opengl/ has been downgraded from 8.0.4 to 2.6, while the related documents were not updated to reflect the change. --- dll/opengl/Mesa_for_ReactOS.txt | 50 +++++++---------------------------------- media/doc/3rd Party Files.txt | 2 +- 2 files changed, 9 insertions(+), 43 deletions(-) diff --git a/dll/opengl/Mesa_for_ReactOS.txt b/dll/opengl/Mesa_for_ReactOS.txt index 0356cb37624..429c8174318 100644 --- a/dll/opengl/Mesa_for_ReactOS.txt +++ b/dll/opengl/Mesa_for_ReactOS.txt @@ -1,42 +1,8 @@ -Here is a brief explanation on how to sync Mesa in trunk base. - -Current version is 8.0.4 - -- SOURCE FILES : -________________ - -All unnecessary files and directories where removed from the tree, as it's already a huge piece of code. - - - build tools (bin, configs, scons, src/gallium/tools) were removed, as we don't use it. - - documentation (docs, src/gallium/docs, doxygen) were removed. If you want to contribute to libMesa, you'd better use their build system, not our adapted one - - tests and testing tools were removed (test, src/gallium/tests, src/gallium/tools) - - egl functionality (src/egl) is useless to us and were removed. - - gbm functionality (src/gbm) is useless to us and were removed. - - getopt implementation (src/getopt, for MSVC compatibility) is useless to us, we already have one - - glx (src/glx) functionality is useless to us and were removed. - - src/gallium - - All gallium drivers (src/gallium/driver) where deleted, except for the softpipe one. - - All gallium state trackers (src/gallium/state_trackers) were removed, except for the wgl one - - All gallium targets (src/gallium/targets) were removed, except for the libgl-gdi one. - - All gallium window system backends (src/gallium/winsys) were removed, except for the gdi one (sw/gdi) - - src/mapi - - only mapi and glapi directories were relevant and kept - - src/mesa - - All MESA drivers where deleted (src/mesa/drivers), except for the "common" part and osmesa (off-screen mesa) library. - - Architecture specifics were removed. x86 and x86_64 might be restored in future - - src/glu where kept and will be used for the glu32 dll implementation - - -- GENERATED FILES: -__________________ - -libMesa build system generates source files (using scons). -They were taken from an out-of-source build an put in the "generated" directory, using the same -directory structure for the sake of ease of maintainability. - - -- CMAKELISTS FILES: -___________________ - -Those files were written using the Sconscript and source list files as reference. I think that diff-ing them between two -versions would permit to easily update the cmake configuration files. +Windows provides OpenGL 1.1 with platform-specific extensions (WGL) in its +software implementation of OpenGL. The purpose of Mesa in this directory is to +provide an equivalent of that. In order to accomplish just this purpose, it is +based on Mesa 2.6 and not intended to be synchronized with recent versions. +See CORE-7499 for details. + +If you look for a modern software OpenGL implemenation, a Mesa package with +the Gallium LLVMpipe driver is available on RAPPS. diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index b67e5f03735..f0964adf64e 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -27,7 +27,7 @@ Used Version: 2.9.0 Website: http://www.freetype.org Title: Mesa3D -Used Version: 8.0.4 +Used Version: 2.6 Website: http://www.mesa3d.org Title: Mesa3D glu libary

1 0

[reactos] 01/01: [GLU32] Sync with glu 9.0.1 (#2314)
by Masanori Ogino 07 Feb '20

07 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=695946a5cd46efa769006… commit 695946a5cd46efa7690066fe35015ddcb5c1634f Author: Masanori Ogino <masanori.ogino(a)gmail.com> AuthorDate: Sat Feb 8 02:07:56 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 7 18:07:56 2020 +0100 [GLU32] Sync with glu 9.0.1 (#2314) --- dll/opengl/glu32/src/libnurbs/internals/arctess.cc | 34 +++++++------- dll/opengl/glu32/src/libnurbs/internals/ccw.cc | 54 +++++++++++----------- dll/opengl/glu32/src/libnurbs/internals/hull.cc | 2 +- dll/opengl/glu32/src/libnurbs/internals/mapdesc.cc | 10 ++-- dll/opengl/glu32/src/libnurbs/internals/mesher.cc | 52 ++++++++++----------- .../glu32/src/libnurbs/internals/trimline.cc | 8 ++-- dll/opengl/glu32/src/libtess/priorityq.c | 1 + dll/opengl/glu32/src/libutil/error.c | 1 + dll/opengl/glu32/src/libutil/mipmap.c | 2 + media/doc/3rd Party Files.txt | 4 +- 10 files changed, 85 insertions(+), 83 deletions(-) diff --git a/dll/opengl/glu32/src/libnurbs/internals/arctess.cc b/dll/opengl/glu32/src/libnurbs/internals/arctess.cc index 48de92c4ab6..e13c8edf034 100644 --- a/dll/opengl/glu32/src/libnurbs/internals/arctess.cc +++ b/dll/opengl/glu32/src/libnurbs/internals/arctess.cc @@ -381,13 +381,13 @@ ArcTessellator::tessellateNonlinear( Arc *arc, REAL geo_stepsize, REAL arc_steps #ifndef NOELIMINATION int ocanremove = 0; #endif - register long order = bezierArc->order; + long order = bezierArc->order; for( step=1, ++vert; step<nsteps; step++, vert++ ) { - register REAL p = dp * step; - register REAL u = pow_u[0]; - register REAL v = pow_v[0]; - register REAL w = pow_w[0]; - for( register int i = 1; i < order; i++ ) { + REAL p = dp * step; + REAL u = pow_u[0]; + REAL v = pow_v[0]; + REAL w = pow_w[0]; + for( int i = 1; i < order; i++ ) { u = u * p + pow_u[i]; v = v * p + pow_v[i]; w = w * p + pow_w[i]; @@ -444,12 +444,12 @@ ArcTessellator::tessellateNonlinear( Arc *arc, REAL geo_stepsize, REAL arc_steps #ifndef NOELIMINATION int ocanremove = 0; #endif - register long order = bezierArc->order; + long order = bezierArc->order; for( step=1, ++vert; step<nsteps; step++, vert++ ) { - register REAL p = dp * step; - register REAL u = pow_u[0]; - register REAL v = pow_v[0]; - for( register int i = 1; i < bezierArc->order; i++ ) { + REAL p = dp * step; + REAL u = pow_u[0]; + REAL v = pow_v[0]; + for( int i = 1; i < bezierArc->order; i++ ) { u = u * p + pow_u[i]; v = v * p + pow_v[i]; } @@ -591,9 +591,9 @@ const REAL ArcTessellator::gl_Bernstein[][MAXORDER][MAXORDER] = { void ArcTessellator::trim_power_coeffs( BezierArc *bez_arc, REAL *p, int coord ) { - register int stride = bez_arc->stride; - register int order = bez_arc->order; - register REAL *base = bez_arc->cpts + coord; + int stride = bez_arc->stride; + int order = bez_arc->order; + REAL *base = bez_arc->cpts + coord; REAL const (*mat)[MAXORDER][MAXORDER] = &gl_Bernstein[order-1]; REAL const (*lrow)[MAXORDER] = &(*mat)[order]; @@ -601,9 +601,9 @@ ArcTessellator::trim_power_coeffs( BezierArc *bez_arc, REAL *p, int coord ) /* WIN32 didn't like the following line within the for-loop */ REAL const (*row)[MAXORDER] = &(*mat)[0]; for( ; row != lrow; row++ ) { - register REAL s = 0.0; - register REAL *point = base; - register REAL const *mlast = *row + order; + REAL s = 0.0; + REAL *point = base; + REAL const *mlast = *row + order; for( REAL const *m = *row; m != mlast; m++, point += stride ) s += *(m) * (*point); *(p++) = s; diff --git a/dll/opengl/glu32/src/libnurbs/internals/ccw.cc b/dll/opengl/glu32/src/libnurbs/internals/ccw.cc index fcd85a427f6..f70cb3c5e71 100644 --- a/dll/opengl/glu32/src/libnurbs/internals/ccw.cc +++ b/dll/opengl/glu32/src/libnurbs/internals/ccw.cc @@ -56,12 +56,12 @@ Subdivider::bbox( TrimVertex *a, TrimVertex *b, TrimVertex *c, int p ) int Subdivider::ccwTurn_sr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1 { - register TrimVertex *v1 = &j1->pwlArc->pts[j1->pwlArc->npts-1]; - register TrimVertex *v1last = &j1->pwlArc->pts[0]; - register TrimVertex *v2 = &j2->pwlArc->pts[0]; - register TrimVertex *v2last = &j2->pwlArc->pts[j2->pwlArc->npts-1]; - register TrimVertex *v1next = v1-1; - register TrimVertex *v2next = v2+1; + TrimVertex *v1 = &j1->pwlArc->pts[j1->pwlArc->npts-1]; + TrimVertex *v1last = &j1->pwlArc->pts[0]; + TrimVertex *v2 = &j2->pwlArc->pts[0]; + TrimVertex *v2last = &j2->pwlArc->pts[j2->pwlArc->npts-1]; + TrimVertex *v1next = v1-1; + TrimVertex *v2next = v2+1; int sgn; assert( v1 != v1last ); @@ -169,12 +169,12 @@ Subdivider::ccwTurn_sr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1 int Subdivider::ccwTurn_sl( Arc_ptr j1, Arc_ptr j2 ) // dir = 0 { - register TrimVertex *v1 = &j1->pwlArc->pts[j1->pwlArc->npts-1]; - register TrimVertex *v1last = &j1->pwlArc->pts[0]; - register TrimVertex *v2 = &j2->pwlArc->pts[0]; - register TrimVertex *v2last = &j2->pwlArc->pts[j2->pwlArc->npts-1]; - register TrimVertex *v1next = v1-1; - register TrimVertex *v2next = v2+1; + TrimVertex *v1 = &j1->pwlArc->pts[j1->pwlArc->npts-1]; + TrimVertex *v1last = &j1->pwlArc->pts[0]; + TrimVertex *v2 = &j2->pwlArc->pts[0]; + TrimVertex *v2last = &j2->pwlArc->pts[j2->pwlArc->npts-1]; + TrimVertex *v1next = v1-1; + TrimVertex *v2next = v2+1; int sgn; assert( v1 != v1last ); @@ -282,12 +282,12 @@ Subdivider::ccwTurn_sl( Arc_ptr j1, Arc_ptr j2 ) // dir = 0 int Subdivider::ccwTurn_tr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1 { - register TrimVertex *v1 = &j1->pwlArc->pts[j1->pwlArc->npts-1]; - register TrimVertex *v1last = &j1->pwlArc->pts[0]; - register TrimVertex *v2 = &j2->pwlArc->pts[0]; - register TrimVertex *v2last = &j2->pwlArc->pts[j2->pwlArc->npts-1]; - register TrimVertex *v1next = v1-1; - register TrimVertex *v2next = v2+1; + TrimVertex *v1 = &j1->pwlArc->pts[j1->pwlArc->npts-1]; + TrimVertex *v1last = &j1->pwlArc->pts[0]; + TrimVertex *v2 = &j2->pwlArc->pts[0]; + TrimVertex *v2last = &j2->pwlArc->pts[j2->pwlArc->npts-1]; + TrimVertex *v1next = v1-1; + TrimVertex *v2next = v2+1; int sgn; assert( v1 != v1last ); @@ -395,12 +395,12 @@ Subdivider::ccwTurn_tr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1 int Subdivider::ccwTurn_tl( Arc_ptr j1, Arc_ptr j2 ) { - register TrimVertex *v1 = &j1->pwlArc->pts[j1->pwlArc->npts-1]; - register TrimVertex *v1last = &j1->pwlArc->pts[0]; - register TrimVertex *v2 = &j2->pwlArc->pts[0]; - register TrimVertex *v2last = &j2->pwlArc->pts[j2->pwlArc->npts-1]; - register TrimVertex *v1next = v1-1; - register TrimVertex *v2next = v2+1; + TrimVertex *v1 = &j1->pwlArc->pts[j1->pwlArc->npts-1]; + TrimVertex *v1last = &j1->pwlArc->pts[0]; + TrimVertex *v2 = &j2->pwlArc->pts[0]; + TrimVertex *v2last = &j2->pwlArc->pts[j2->pwlArc->npts-1]; + TrimVertex *v1next = v1-1; + TrimVertex *v2next = v2+1; int sgn; assert( v1 != v1last ); @@ -508,12 +508,10 @@ Subdivider::ccwTurn_tl( Arc_ptr j1, Arc_ptr j2 ) #ifndef NDEBUG int -Subdivider::bbox( register REAL sa, register REAL sb, register REAL sc, - register REAL ta, register REAL tb, register REAL tc ) +Subdivider::bbox( REAL sa, REAL sb, REAL sc, REAL ta, REAL tb, REAL tc ) #else int -Subdivider::bbox( register REAL sa, register REAL sb, register REAL sc, - register REAL , register REAL , register REAL ) +Subdivider::bbox( REAL sa, REAL sb, REAL sc, REAL , REAL , REAL ) #endif { #ifndef NDEBUG diff --git a/dll/opengl/glu32/src/libnurbs/internals/hull.cc b/dll/opengl/glu32/src/libnurbs/internals/hull.cc index 16eb0c03f17..b307abef1a6 100644 --- a/dll/opengl/glu32/src/libnurbs/internals/hull.cc +++ b/dll/opengl/glu32/src/libnurbs/internals/hull.cc @@ -139,7 +139,7 @@ Hull::nextupper( GridTrimVertex *gv ) } GridTrimVertex * -Hull::nextlower( register GridTrimVertex *gv ) +Hull::nextlower( GridTrimVertex *gv ) { if( lower.left ) { gv->set( lower.left->next() ); diff --git a/dll/opengl/glu32/src/libnurbs/internals/mapdesc.cc b/dll/opengl/glu32/src/libnurbs/internals/mapdesc.cc index 99c4995f07e..977ec72dbaa 100644 --- a/dll/opengl/glu32/src/libnurbs/internals/mapdesc.cc +++ b/dll/opengl/glu32/src/libnurbs/internals/mapdesc.cc @@ -156,7 +156,7 @@ Mapdesc::copyPt( REAL *d, REAL *s ) *-------------------------------------------------------------------------- */ void -Mapdesc::sumPt( REAL *dst, REAL *src1, REAL *src2, register REAL alpha, register REAL beta ) +Mapdesc::sumPt( REAL *dst, REAL *src1, REAL *src2, REAL alpha, REAL beta ) { assert( hcoords > 0 ); switch( hcoords ) { @@ -204,10 +204,10 @@ Mapdesc::clipbits( REAL *p ) assert( inhcoords >= 0 ); assert( inhcoords <= 3 ); - register int nc = inhcoords; - register REAL pw = p[nc]; - register REAL nw = -pw; - register unsigned int bits = 0; + int nc = inhcoords; + REAL pw = p[nc]; + REAL nw = -pw; + unsigned int bits = 0; if( pw == 0.0 ) return mask; diff --git a/dll/opengl/glu32/src/libnurbs/internals/mesher.cc b/dll/opengl/glu32/src/libnurbs/internals/mesher.cc index 3b4c0f00c94..c83c904ec4f 100644 --- a/dll/opengl/glu32/src/libnurbs/internals/mesher.cc +++ b/dll/opengl/glu32/src/libnurbs/internals/mesher.cc @@ -276,13 +276,13 @@ Mesher::output( int x ) void Mesher::addLast( ) { - register int ilast = itop; + int ilast = itop; if( lastedge == 0 ) { if( equal( 0, 1 ) ) { output( ilast ); swapMesh(); - for( register int i = 2; i < ilast; i++ ) { + for( int i = 2; i < ilast; i++ ) { swapMesh(); output( i ); } @@ -290,7 +290,7 @@ Mesher::addLast( ) } else if( equal( ilast-2, ilast-1) ) { swapMesh(); output( ilast ); - for( register int i = ilast-3; i >= 0; i-- ) { + for( int i = ilast-3; i >= 0; i-- ) { output( i ); swapMesh(); } @@ -299,7 +299,7 @@ Mesher::addLast( ) closeMesh(); openMesh(); output( ilast ); output( 0 ); - for( register int i = 1; i < ilast; i++ ) { + for( int i = 1; i < ilast; i++ ) { swapMesh(); output( i ); } @@ -309,7 +309,7 @@ Mesher::addLast( ) if( equal( 1, 0) ) { swapMesh(); output( ilast ); - for( register int i = 2; i < ilast; i++ ) { + for( int i = 2; i < ilast; i++ ) { output( i ); swapMesh(); } @@ -317,7 +317,7 @@ Mesher::addLast( ) } else if( equal( ilast-1, ilast-2) ) { output( ilast ); swapMesh(); - for( register int i = ilast-3; i >= 0; i-- ) { + for( int i = ilast-3; i >= 0; i-- ) { swapMesh(); output( i ); } @@ -326,7 +326,7 @@ Mesher::addLast( ) closeMesh(); openMesh(); output( 0 ); output( ilast ); - for( register int i = 1; i < ilast; i++ ) { + for( int i = 1; i < ilast; i++ ) { output( i ); swapMesh(); } @@ -334,19 +334,19 @@ Mesher::addLast( ) } } closeMesh(); - //for( register long k=0; k<=ilast; k++ ) pop( k ); + //for( long k=0; k<=ilast; k++ ) pop( k ); } void Mesher::addUpper( ) { - register int ilast = itop; + int ilast = itop; if( lastedge == 0 ) { if( equal( 0, 1 ) ) { output( ilast ); swapMesh(); - for( register int i = 2; i < ilast; i++ ) { + for( int i = 2; i < ilast; i++ ) { swapMesh(); output( i ); } @@ -354,7 +354,7 @@ Mesher::addUpper( ) } else if( equal( ilast-2, ilast-1) ) { swapMesh(); output( ilast ); - for( register int i = ilast-3; i >= 0; i-- ) { + for( int i = ilast-3; i >= 0; i-- ) { output( i ); swapMesh(); } @@ -363,14 +363,14 @@ Mesher::addUpper( ) closeMesh(); openMesh(); output( ilast ); output( 0 ); - for( register int i = 1; i < ilast; i++ ) { + for( int i = 1; i < ilast; i++ ) { swapMesh(); output( i ); } copy( ilast, ilast-1 ); } lastedge = 1; - //for( register long k=0; k<ilast-1; k++ ) pop( k ); + //for( long k=0; k<ilast-1; k++ ) pop( k ); move( 0, ilast-1 ); move( 1, ilast ); itop = 1; @@ -383,7 +383,7 @@ Mesher::addUpper( ) if( equal( ilast-1, ilast-2 ) ) { output( ilast ); swapMesh(); - for( register int i=ilast-3; i>=itop-1; i-- ) { + for( int i=ilast-3; i>=itop-1; i-- ) { swapMesh(); output( i ); } @@ -391,7 +391,7 @@ Mesher::addUpper( ) } else if( equal( itop, itop-1 ) ) { swapMesh(); output( ilast ); - for( register int i = itop+1; i < ilast; i++ ) { + for( int i = itop+1; i < ilast; i++ ) { output( i ); swapMesh(); } @@ -400,13 +400,13 @@ Mesher::addUpper( ) closeMesh(); openMesh(); output( ilast ); output( ilast-1 ); - for( register int i=ilast-2; i>=itop-1; i-- ) { + for( int i=ilast-2; i>=itop-1; i-- ) { swapMesh(); output( i ); } copy( ilast, itop-1 ); } - //for( register int k=itop; k<ilast; k++ ) pop( k ); + //for( int k=itop; k<ilast; k++ ) pop( k ); move( itop, ilast ); } } @@ -414,13 +414,13 @@ Mesher::addUpper( ) void Mesher::addLower() { - register int ilast = itop; + int ilast = itop; if( lastedge == 1 ) { if( equal( 1, 0) ) { swapMesh(); output( ilast ); - for( register int i = 2; i < ilast; i++ ) { + for( int i = 2; i < ilast; i++ ) { output( i ); swapMesh(); } @@ -428,7 +428,7 @@ Mesher::addLower() } else if( equal( ilast-1, ilast-2) ) { output( ilast ); swapMesh(); - for( register int i = ilast-3; i >= 0; i-- ) { + for( int i = ilast-3; i >= 0; i-- ) { swapMesh(); output( i ); } @@ -437,7 +437,7 @@ Mesher::addLower() closeMesh(); openMesh(); output( 0 ); output( ilast ); - for( register int i = 1; i < ilast; i++ ) { + for( int i = 1; i < ilast; i++ ) { output( i ); swapMesh(); } @@ -445,7 +445,7 @@ Mesher::addLower() } lastedge = 0; - //for( register long k=0; k<ilast-1; k++ ) pop( k ); + //for( long k=0; k<ilast-1; k++ ) pop( k ); move( 0, ilast-1 ); move( 1, ilast ); itop = 1; @@ -458,7 +458,7 @@ Mesher::addLower() if( equal( ilast-2, ilast-1) ) { swapMesh(); output( ilast ); - for( register int i=ilast-3; i>=itop-1; i--) { + for( int i=ilast-3; i>=itop-1; i--) { output( i ); swapMesh( ); } @@ -466,7 +466,7 @@ Mesher::addLower() } else if( equal( itop-1, itop) ) { output( ilast ); swapMesh(); - for( register int i=itop+1; i<ilast; i++ ) { + for( int i=itop+1; i<ilast; i++ ) { swapMesh( ); output( i ); } @@ -475,13 +475,13 @@ Mesher::addLower() closeMesh(); openMesh(); output( ilast-1 ); output( ilast ); - for( register int i=ilast-2; i>=itop-1; i-- ) { + for( int i=ilast-2; i>=itop-1; i-- ) { output( i ); swapMesh( ); } copy( itop-1, ilast ); } - //for( register int k=itop; k<ilast; k++ ) pop( k ); + //for( int k=itop; k<ilast; k++ ) pop( k ); move( itop, ilast ); } } diff --git a/dll/opengl/glu32/src/libnurbs/internals/trimline.cc b/dll/opengl/glu32/src/libnurbs/internals/trimline.cc index 26948b2bcca..be6004a6f93 100644 --- a/dll/opengl/glu32/src/libnurbs/internals/trimline.cc +++ b/dll/opengl/glu32/src/libnurbs/internals/trimline.cc @@ -117,7 +117,7 @@ Trimline::getNextPts( REAL vval, Backend& backend ) reset(); swap(); append( tinterp ); assert( tinterp->param[1] >= vval ); - register TrimVertex *p; + TrimVertex *p; for( p=jarcl.getnextpt() ; p->param[1] >= vval; p=jarcl.getnextpt() ) { append( p ); } @@ -139,7 +139,7 @@ Trimline::getPrevPts( REAL vval, Backend& backend ) reset(); swap(); append( tinterp ); assert( tinterp->param[1] >= vval ); - register TrimVertex *q; + TrimVertex *q; for( q=jarcl.getprevpt(); q->param[1] >= vval; q=jarcl.getprevpt() ) { append( q ); } @@ -165,7 +165,7 @@ Trimline::getNextPts( Arc_ptr botarc ) TrimVertex *lastpt1 = &lastpwl->pts[lastpwl->npts-1]; #endif TrimVertex *lastpt2 = botarc->pwlArc->pts; - register TrimVertex *p = jarcl.getnextpt(); + TrimVertex *p = jarcl.getnextpt(); for( append( p ); p != lastpt2; append( p ) ) { assert( p != lastpt1 ); p = jarcl.getnextpt(); @@ -183,7 +183,7 @@ Trimline::getPrevPts( Arc_ptr botarc ) TrimVertex *lastpt2 = botarc->pwlArc->pts; #endif - register TrimVertex *q = jarcl.getprevpt(); + TrimVertex *q = jarcl.getprevpt(); for( append( q ); q != lastpt1; append( q ) ) { assert( q != lastpt2 ); q = jarcl.getprevpt(); diff --git a/dll/opengl/glu32/src/libtess/priorityq.c b/dll/opengl/glu32/src/libtess/priorityq.c index a03c007bbe6..cebde24e741 100644 --- a/dll/opengl/glu32/src/libtess/priorityq.c +++ b/dll/opengl/glu32/src/libtess/priorityq.c @@ -65,6 +65,7 @@ PriorityQ *pqNewPriorityQ( int (*leq)(PQkey key1, PQkey key2) ) return NULL; } + pq->order = NULL; pq->size = 0; pq->max = INIT_SIZE; pq->initialized = FALSE; diff --git a/dll/opengl/glu32/src/libutil/error.c b/dll/opengl/glu32/src/libutil/error.c index 7212748450d..d3b26663cf5 100644 --- a/dll/opengl/glu32/src/libutil/error.c +++ b/dll/opengl/glu32/src/libutil/error.c @@ -30,6 +30,7 @@ #include "gluos.h" #include "gluint.h" +#include <stddef.h> #include <GL/glu.h> diff --git a/dll/opengl/glu32/src/libutil/mipmap.c b/dll/opengl/glu32/src/libutil/mipmap.c index 29dce0c1119..59a3c350540 100644 --- a/dll/opengl/glu32/src/libutil/mipmap.c +++ b/dll/opengl/glu32/src/libutil/mipmap.c @@ -4509,6 +4509,8 @@ static int gluBuild2DMipmapLevelsCore(GLenum target, GLint internalFormat, glPixelStorei(GL_UNPACK_SKIP_PIXELS, psm.unpack_skip_pixels); glPixelStorei(GL_UNPACK_ROW_LENGTH, psm.unpack_row_length); glPixelStorei(GL_UNPACK_SWAP_BYTES, psm.unpack_swap_bytes); + free(srcImage); + free(dstImage); return GLU_OUT_OF_MEMORY; } diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 5868eb95bbe..b67e5f03735 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -31,8 +31,8 @@ Used Version: 8.0.4 Website: http://www.mesa3d.org Title: Mesa3D glu libary -Used Version: 9.0 -Website: ftp://ftp.freedesktop.org/pub/mesa/glu/ +Used Version: 9.0.1 +Website: https://gitlab.freedesktop.org/mesa/glu | ftp://ftp.freedesktop.org/pub/mesa/glu/ Title: GNU adns Used Version: 1.0 REV 5

1 0

[reactos] 01/01: [CPL][INPUT] Fix french typography error.
by Hermès Bélusca-Maïto 07 Feb '20

07 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=507cda98cf1d2b5a4e3fd… commit 507cda98cf1d2b5a4e3fdff2c4623ff903b94aed Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Feb 7 18:03:15 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Feb 7 18:03:15 2020 +0100 [CPL][INPUT] Fix french typography error. --- dll/cpl/input/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/input/lang/fr-FR.rc b/dll/cpl/input/lang/fr-FR.rc index f28c103a1a3..e6d45431874 100644 --- a/dll/cpl/input/lang/fr-FR.rc +++ b/dll/cpl/input/lang/fr-FR.rc @@ -106,7 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Maj" IDS_LEFT_ALT_SHIFT "Alt Gauche+Maj" IDS_SWITCH_BET_INLANG "Changer les langues de saisie" - IDS_REBOOT_NOW, "Redémarrer maintenant?" + IDS_REBOOT_NOW, "Redémarrer maintenant ?" END /* FIXME : À améliorer/compléter */

1 0

[reactos] 01/01: [CPL][INPUT] Translate IDS_REBOOT_NOW into Japanese
by Katayama Hirofumi MZ 07 Feb '20

07 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=043d5215454e7b3a1cb00… commit 043d5215454e7b3a1cb009038811b9df48f57979 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 8 01:28:50 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Feb 8 01:28:50 2020 +0900 [CPL][INPUT] Translate IDS_REBOOT_NOW into Japanese --- dll/cpl/input/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/input/lang/ja-JP.rc b/dll/cpl/input/lang/ja-JP.rc index bebf3fc39fe..be53b949ef0 100644 --- a/dll/cpl/input/lang/ja-JP.rc +++ b/dll/cpl/input/lang/ja-JP.rc @@ -106,7 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "左Alt+Shift" IDS_SWITCH_BET_INLANG "入力言語の切り替え" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW, "再起動しますか?" END STRINGTABLE

1 0

[reactos] 01/01: [CPL][INPUT] Translate IDS_REBOOT_NOW into French
by Katayama Hirofumi MZ 07 Feb '20

07 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fdb6c30e13d6e6ea53ed4… commit fdb6c30e13d6e6ea53ed472062a4d57a2a7a5d61 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 8 01:27:14 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Feb 8 01:27:23 2020 +0900 [CPL][INPUT] Translate IDS_REBOOT_NOW into French CORE-16601 --- dll/cpl/input/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/input/lang/fr-FR.rc b/dll/cpl/input/lang/fr-FR.rc index 5c1bfa13fc7..f28c103a1a3 100644 --- a/dll/cpl/input/lang/fr-FR.rc +++ b/dll/cpl/input/lang/fr-FR.rc @@ -106,7 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Maj" IDS_LEFT_ALT_SHIFT "Alt Gauche+Maj" IDS_SWITCH_BET_INLANG "Changer les langues de saisie" - IDS_REBOOT_NOW, "Reboot now?" + IDS_REBOOT_NOW, "Redémarrer maintenant?" END /* FIXME : À améliorer/compléter */

1 0

[reactos] 01/01: [SETUPAPI] Add Japanese translation
by Katayama Hirofumi MZ 07 Feb '20

07 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e964c7cb49936036607b… commit 4e964c7cb49936036607b93a79cc2c55a18ca0c7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Feb 7 21:45:59 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Feb 7 21:45:59 2020 +0900 [SETUPAPI] Add Japanese translation --- dll/win32/setupapi/lang/ja-JP.rc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dll/win32/setupapi/lang/ja-JP.rc b/dll/win32/setupapi/lang/ja-JP.rc index c380170f9f3..e551f471da4 100644 --- a/dll/win32/setupapi/lang/ja-JP.rc +++ b/dll/win32/setupapi/lang/ja-JP.rc @@ -15,29 +15,29 @@ END IDPROMPTFORDISK DIALOG 0, 0, 260, 120 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Files Needed" -FONT 8, "MS Shell Dlg" +CAPTION "ファイルが必要です" +FONT 9, "MS UI Gothic" BEGIN - LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "製造元のインストールディスクを挿入し、下に正しいドライブが選択されていることを確認して下さい。", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "コピーしたい製造元のファイル:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "キャンセル", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "参照...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END STRINGTABLE BEGIN - IDS_PROMPTDISK "The file '%1' on %2 is needed" - IDS_UNKNOWN "Unknown" - IDS_COPYFROM "Copy files from:" - IDS_INFO "Type the path where the file is located, and then click OK." + IDS_PROMPTDISK "%2 上のファイル '%1' が必要です" + IDS_UNKNOWN "未知" + IDS_COPYFROM "コピーしたいファイル:" + IDS_INFO "ファイルがある場所のパスを入力し、OKをクリックして下さい。" END STRINGTABLE BEGIN - IDS_QUERY_REBOOT_TEXT "Your computer needs to be rebooted to finish installation. Do you want to proceed?" - IDS_QUERY_REBOOT_CAPTION "Reboot" - IDS_INF_FILE "Setup Information" + IDS_QUERY_REBOOT_TEXT "インストールを完了するには、コンピューターを再起動する必要があります。続行しますか？" + IDS_QUERY_REBOOT_CAPTION "再起動" + IDS_INF_FILE "セットアップ情報" END

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs