Ros-diffs May 2020

ros-diffs@reactos.org

28 participants
193 discussions

[reactos] 01/01: [WINSPOOL] GetPrinterA(): Refactor failure handling (#2830)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=373a8dbb5c654e9cbde05… commit 373a8dbb5c654e9cbde05f77363f537548c838eb Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat May 23 09:08:00 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat May 23 09:08:00 2020 +0200 [WINSPOOL] GetPrinterA(): Refactor failure handling (#2830) Addendum to ecde3768254664ca40a3f2fa49d1342d4bd92c02. --- win32ss/printing/base/winspool/printers.c | 55 ++++++++++++++++--------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 219e831cb16..1576ca0edd4 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -1117,6 +1117,8 @@ Cleanup: BOOL WINAPI GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pcbNeeded) { + DWORD dwErrorCode; + BOOL bResult; PPRINTER_INFO_1A ppi1a = (PPRINTER_INFO_1A)pPrinter; PPRINTER_INFO_1W ppi1w = (PPRINTER_INFO_1W)pPrinter; PPRINTER_INFO_2A ppi2a = (PPRINTER_INFO_2A)pPrinter; @@ -1128,23 +1130,21 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD PPRINTER_INFO_7A ppi7a = (PPRINTER_INFO_7A)pPrinter; PPRINTER_INFO_7W ppi7w = (PPRINTER_INFO_7W)pPrinter; DWORD cch; - BOOL bReturnValue = FALSE; TRACE("GetPrinterA(%p, %lu, %p, %lu, %p)\n", hPrinter, Level, pPrinter, cbBuf, pcbNeeded); // Check for invalid levels here for early error return. Should be 1-9. if (Level < 1 || Level > 9) { - SetLastError(ERROR_INVALID_LEVEL); + dwErrorCode = ERROR_INVALID_LEVEL; ERR("Invalid Level!\n"); goto Cleanup; } - bReturnValue = GetPrinterW(hPrinter, Level, pPrinter, cbBuf, pcbNeeded); - - if (!bReturnValue) + bResult = GetPrinterW(hPrinter, Level, pPrinter, cbBuf, pcbNeeded); + if (!bResult) { - TRACE("GetPrinterW failed!\n"); + dwErrorCode = GetLastError(); goto Cleanup; } @@ -1162,7 +1162,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszDescription = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszDescription) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1183,7 +1183,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1204,7 +1204,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszComment = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszComment) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1229,7 +1229,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszServerName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszServerName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1250,7 +1250,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszPrinterName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszPrinterName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1271,7 +1271,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszShareName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszShareName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1292,7 +1292,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszPortName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszPortName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1313,7 +1313,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszDriverName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszDriverName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1334,7 +1334,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszComment = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszComment) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1355,7 +1355,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszLocation = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszLocation) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1376,7 +1376,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszSepFile = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszSepFile) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1397,7 +1397,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszPrintProcessor = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszPrintProcessor) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1418,7 +1418,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszDatatype = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszDatatype) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1439,7 +1439,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszParameters = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszParameters) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1464,7 +1464,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszPrinterName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszPrinterName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1485,7 +1485,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszServerName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszServerName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1510,7 +1510,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszPrinterName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszPrinterName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1531,7 +1531,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszPortName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszPortName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1556,7 +1556,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pszaObjectGUID = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszaObjectGUID) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -1570,8 +1570,11 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD } } // switch + dwErrorCode = ERROR_SUCCESS; + Cleanup: - return bReturnValue; + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } BOOL WINAPI

4 years, 7 months

[reactos] 01/01: [DEVMGR] Use the ShellAboutW API routine to display the about dialog and French translation update (#2807)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57401cb66d4131e1d04f7… commit 57401cb66d4131e1d04f7c21bd14d3e2d3911809 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri May 22 15:53:17 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 22 22:53:17 2020 +0900 [DEVMGR] Use the ShellAboutW API routine to display the about dialog and French translation update (#2807) As the dialog simply displays the copyright names and nothing particular it makes sense to use ShellAboutW() instead. Similar to #2743 by @HBelusca --- dll/win32/devmgr/CMakeLists.txt | 2 +- dll/win32/devmgr/devmgmt/MainWindow.cpp | 18 ++++++++++++------ dll/win32/devmgr/lang/bg-BG.rc | 1 + dll/win32/devmgr/lang/cs-CZ.rc | 1 + dll/win32/devmgr/lang/de-DE.rc | 1 + dll/win32/devmgr/lang/el-GR.rc | 1 + dll/win32/devmgr/lang/en-US.rc | 1 + dll/win32/devmgr/lang/es-ES.rc | 1 + dll/win32/devmgr/lang/et-EE.rc | 1 + dll/win32/devmgr/lang/fr-FR.rc | 25 +++++++++++++------------ dll/win32/devmgr/lang/he-IL.rc | 1 + dll/win32/devmgr/lang/hu-HU.rc | 1 + dll/win32/devmgr/lang/id-ID.rc | 1 + dll/win32/devmgr/lang/it-IT.rc | 1 + dll/win32/devmgr/lang/ja-JP.rc | 1 + dll/win32/devmgr/lang/no-NO.rc | 1 + dll/win32/devmgr/lang/pl-PL.rc | 1 + dll/win32/devmgr/lang/pt-BR.rc | 1 + dll/win32/devmgr/lang/pt-PT.rc | 1 + dll/win32/devmgr/lang/ro-RO.rc | 1 + dll/win32/devmgr/lang/ru-RU.rc | 1 + dll/win32/devmgr/lang/sk-SK.rc | 1 + dll/win32/devmgr/lang/sq-AL.rc | 1 + dll/win32/devmgr/lang/tr-TR.rc | 1 + dll/win32/devmgr/lang/uk-UA.rc | 1 + dll/win32/devmgr/lang/zh-CN.rc | 1 + dll/win32/devmgr/lang/zh-TW.rc | 1 + dll/win32/devmgr/precomp.h | 1 + dll/win32/devmgr/resource.h | 1 + 29 files changed, 52 insertions(+), 19 deletions(-) diff --git a/dll/win32/devmgr/CMakeLists.txt b/dll/win32/devmgr/CMakeLists.txt index f427c3a3c35..88b24753e5c 100644 --- a/dll/win32/devmgr/CMakeLists.txt +++ b/dll/win32/devmgr/CMakeLists.txt @@ -36,6 +36,6 @@ add_library(devmgr MODULE set_module_type(devmgr win32dll UNICODE) target_link_libraries(devmgr uuid wine) -add_importlibs(devmgr setupapi advapi32 newdev user32 gdi32 comctl32 version msvcrt kernel32 ole32 oleaut32 uxtheme ntdll) +add_importlibs(devmgr setupapi advapi32 shell32 newdev user32 gdi32 comctl32 version msvcrt kernel32 ole32 oleaut32 uxtheme ntdll) add_pch(devmgr precomp.h SOURCE) add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/devmgr/devmgmt/MainWindow.cpp b/dll/win32/devmgr/devmgmt/MainWindow.cpp index 3273aad5bbb..697a176c2b2 100644 --- a/dll/win32/devmgr/devmgmt/MainWindow.cpp +++ b/dll/win32/devmgr/devmgmt/MainWindow.cpp @@ -11,7 +11,6 @@ #include "devmgmt.h" #include "MainWindow.h" - /* DATA *****************************************************/ #define BTN_PROPERTIES 0 @@ -652,11 +651,18 @@ CDeviceManager::OnCommand(_In_ WPARAM wParam, case IDM_ABOUT: { - // Apportion blame - MessageBoxW(m_hMainWnd, - L"ReactOS Device Manager\r\nCopyright Ged Murphy 2015", - L"About", - MB_OK | MB_APPLMODAL); + CAtlStringW szAppName; + CAtlStringW szAppAuthors; + HICON hIcon; + + if (!szAppName.LoadStringW(g_hThisInstance, IDS_APPNAME)) + szAppName = L"ReactOS Device Manager"; + if (!szAppAuthors.LoadStringW(g_hThisInstance, IDS_APP_AUTHORS)) + szAppAuthors = L""; + hIcon = LoadIconW(g_hThisInstance, MAKEINTRESOURCEW(IDI_MAIN_ICON)); + ShellAboutW(m_hMainWnd, szAppName, szAppAuthors, hIcon); + if (hIcon) + DestroyIcon(hIcon); // Set focus back to the treeview m_DeviceView->SetFocus(); diff --git a/dll/win32/devmgr/lang/bg-BG.rc b/dll/win32/devmgr/lang/bg-BG.rc index b85967b01d7..f6aa5f6ef6b 100644 --- a/dll/win32/devmgr/lang/bg-BG.rc +++ b/dll/win32/devmgr/lang/bg-BG.rc @@ -288,6 +288,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ReactOS Device Manager" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" IDS_CONFIRM_UNINSTALL "Warning: You are about to uninstall this device from your system.\r\nDo you want to continue?" END diff --git a/dll/win32/devmgr/lang/cs-CZ.rc b/dll/win32/devmgr/lang/cs-CZ.rc index 0cc466fd7ff..fffe15662db 100644 --- a/dll/win32/devmgr/lang/cs-CZ.rc +++ b/dll/win32/devmgr/lang/cs-CZ.rc @@ -292,6 +292,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "Správce zařízení ReactOS" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Zakázáním tohoto zařízení dojde k ukončení jeho činnosti.\r\nOpravdu si jej přejete zakázat?" IDS_CONFIRM_UNINSTALL "Varování: Chystáte se odebrat toto zařízení ze systému.\r\nPřejete si pokračovat?" END diff --git a/dll/win32/devmgr/lang/de-DE.rc b/dll/win32/devmgr/lang/de-DE.rc index 115a3df9a8b..2eb0f492b10 100644 --- a/dll/win32/devmgr/lang/de-DE.rc +++ b/dll/win32/devmgr/lang/de-DE.rc @@ -288,6 +288,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ReactOS Geräte-Manager" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Dieses Gerät zu deaktivieren wird dessen Funktion einstellen.\r\nWollen Sie es wirklich deaktivieren?" IDS_CONFIRM_UNINSTALL "Warnung: Sie sind dabei, dieses Gerät deinstallieren\r\nMöchten Sie den Vorgang fortsetzen?" END diff --git a/dll/win32/devmgr/lang/el-GR.rc b/dll/win32/devmgr/lang/el-GR.rc index 548f69ddab5..419df07d2bd 100644 --- a/dll/win32/devmgr/lang/el-GR.rc +++ b/dll/win32/devmgr/lang/el-GR.rc @@ -289,6 +289,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ReactOS Device Manager" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" IDS_CONFIRM_UNINSTALL "Warning: You are about to uninstall this device from your system.\r\nDo you want to continue?" END diff --git a/dll/win32/devmgr/lang/en-US.rc b/dll/win32/devmgr/lang/en-US.rc index d90a94638d5..abb315d1714 100644 --- a/dll/win32/devmgr/lang/en-US.rc +++ b/dll/win32/devmgr/lang/en-US.rc @@ -287,6 +287,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ReactOS Device Manager" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" IDS_CONFIRM_UNINSTALL "Warning: You are about to uninstall this device from your system.\r\nDo you want to continue?" END diff --git a/dll/win32/devmgr/lang/es-ES.rc b/dll/win32/devmgr/lang/es-ES.rc index 9a7d536b91f..7c13b93dd5e 100644 --- a/dll/win32/devmgr/lang/es-ES.rc +++ b/dll/win32/devmgr/lang/es-ES.rc @@ -296,6 +296,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "Administrador de dispositivos de ReactOS" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Deshabilitar este dispositivo hará que deje de funcionar.\r\n¿Seguro que quiere deshabilitarlo?" IDS_CONFIRM_UNINSTALL "Advertencia: Está a punto de desinstalar este dispositivo de su equipo.\r\n¿Seguro que quiere continuar?" END diff --git a/dll/win32/devmgr/lang/et-EE.rc b/dll/win32/devmgr/lang/et-EE.rc index ef39b51a74b..e3df647dcd7 100644 --- a/dll/win32/devmgr/lang/et-EE.rc +++ b/dll/win32/devmgr/lang/et-EE.rc @@ -294,6 +294,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ReactOS Seadmehaldur" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Selle seadme keelamine põhjustab selle töötamise lakkamise.\r\nKas soovite kindlasti seda keelata?" IDS_CONFIRM_UNINSTALL "Hoiatus: Hakkate seda seadet süsteemist desinstallima.\r\nKas soovite jätkata?" END diff --git a/dll/win32/devmgr/lang/fr-FR.rc b/dll/win32/devmgr/lang/fr-FR.rc index 648bd25167f..de5481316e7 100644 --- a/dll/win32/devmgr/lang/fr-FR.rc +++ b/dll/win32/devmgr/lang/fr-FR.rc @@ -16,13 +16,13 @@ BEGIN IDS_ENABLEDEVICE "Utiliser ce périphérique (activé)" IDS_DISABLEDEVICE "Ne pas utiliser ce matériel (désactivé)" IDS_UNKNOWNDEVICE "Matériel inconnu" - IDS_NODRIVERLOADED "Aucun driver n'est installé pour ce matériel." + IDS_NODRIVERLOADED "Aucun pilote n'est installé pour ce matériel." IDS_DEVONPARENT "sur %1" IDS_TROUBLESHOOTDEV "&Dépannage..." IDS_ENABLEDEV "A&ctiver le matériel" - IDS_REINSTALLDRV "Ré&installer le Driver" + IDS_REINSTALLDRV "Ré&installer le pilote" IDS_PROPERTIES "&Propriétés" - IDS_UPDATEDRV "Mettre à jour le Driver..." + IDS_UPDATEDRV "Mettre à jour le pilote..." IDS_REBOOT "&Redémarrer l'ordinateur..." IDS_NOTAVAILABLE "Non disponible" IDS_NOTDIGITALLYSIGNED "Non signé numériquement" @@ -40,7 +40,7 @@ BEGIN IDS_DEV_NO_PROBLEM "Ce périphérique fonctionne correctement." IDS_DEV_NOT_CONFIGURED "Ce périphérique n'est pas configuré correctement." IDS_DEV_DEVLOADER_FAILED "ReactOS n'a pas pu charger le pilote de ce périphérique car l'ordinateur signale deux types de bus %1." - IDS_DEV_DEVLOADER_FAILED2 "Le(s) chargeur(s) de périphérique %1 pour ce périphérique n'ont pas pu charger le driver." + IDS_DEV_DEVLOADER_FAILED2 "Le(s) chargeur(s) de périphérique %1 pour ce périphérique n'ont pas pu charger le pilote." IDS_DEV_OUT_OF_MEMORY "Le pilote de ce périphérique peut être mauvais, ou votre système peut être à court de mémoire ou d'autres ressources." IDS_DEV_ENTRY_IS_WRONG_TYPE "Ce périphérique ne fonctionne pas correctement parce qu'un des pilotes de ce périphérique peut être mauvais, ou votre base de registres peut être mauvaise." IDS_DEV_LACKED_ARBITRATOR "Le pilote de ce périphérique a demandé une ressource que ReactOS ne sait pas prendre en compte." @@ -64,7 +64,7 @@ BEGIN IDS_DEV_WILL_BE_REMOVED "ReactOS est en train de supprimer ce périphérique." IDS_DEV_DISABLED "Ce périphérique n'est pas démarré." IDS_DEV_DISABLED2 "Ce périphérique est désactivé." - IDS_DEV_DEVLOADER_NOT_READY "Les chargeurs de ce périphérique ne peuvent pas charger les drivers requis." + IDS_DEV_DEVLOADER_NOT_READY "Les chargeurs de ce périphérique ne peuvent pas charger les pilotes requis." IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ IDS_DEV_DEVICE_NOT_THERE "Ce périphérique est soit non présent, soit ne fonctionne pas correctement, ou n'a pas tous les pilotes installés." @@ -174,13 +174,13 @@ BEGIN EDITTEXT IDC_DRVVERSION, 120, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Signature numérique :", -1, 37, 81, 80, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 120, 81, 126, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Détails...", IDC_DRIVERDETAILS, 7, 106, 75, 15 + PUSHBUTTON "&Détails...", IDC_DRIVERDETAILS, 5, 106, 79, 15 LTEXT "Voir les détails à propos des fichiers du Pilote.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Mettre le pilote à jour...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + PUSHBUTTON "&Mettre le pilote à jour...", IDC_UPDATEDRIVER, 5, 134, 79, 15 LTEXT "Mettre à jour le pilote du périphérique.", -1, 91, 138, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Restaurer le pilote", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + PUSHBUTTON "&Restaurer le pilote", IDC_ROLLBACKDRIVER, 5, 162, 79, 15 LTEXT "Si le périphérique ne fonctionne plus après la mise à jour du pilote, permet de retourner au pilote précédemment installé.", -1, 91, 162, 154, 25, SS_NOPREFIX - PUSHBUTTON "Dé&sinstaller", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + PUSHBUTTON "Dé&sinstaller", IDC_UNINSTALLDRIVER, 5, 190, 79, 15 LTEXT "Désinstaller le pilote (Avancé).", -1, 91, 194, 154, 17, SS_NOPREFIX END @@ -243,14 +243,14 @@ END IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Confirm Device Removal" +CAPTION "Confirmer la suppression d'un périphérique" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX - LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + LTEXT "Attention : vous êtes sur le point de désinstaller ce périphérique de votre système.", -1, 7, 37, 204, 50 DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 166, 100, 50, 14 END @@ -288,6 +288,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "Gestionnaire de périphériques ReactOS" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Désactiver ce périphérique va le rendre inopérant.\r\nVoulez-vous réellement le désactiver ?" IDS_CONFIRM_UNINSTALL "Attention : vous êtes sur le point de désinstaller ce périphérique de votre système.\r\nVoulez-vous continuer ?" END diff --git a/dll/win32/devmgr/lang/he-IL.rc b/dll/win32/devmgr/lang/he-IL.rc index 6f99febcd04..b1fa1f9f596 100644 --- a/dll/win32/devmgr/lang/he-IL.rc +++ b/dll/win32/devmgr/lang/he-IL.rc @@ -289,6 +289,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "מנהל ההתקנים של ReactOS" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" IDS_CONFIRM_UNINSTALL "Warning: You are about to uninstall this device from your system.\r\nDo you want to continue?" END diff --git a/dll/win32/devmgr/lang/hu-HU.rc b/dll/win32/devmgr/lang/hu-HU.rc index cda88fb50ac..98556207f27 100644 --- a/dll/win32/devmgr/lang/hu-HU.rc +++ b/dll/win32/devmgr/lang/hu-HU.rc @@ -288,6 +288,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ReactOS Device Manager" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" IDS_CONFIRM_UNINSTALL "Warning: You are about to uninstall this device from your system.\r\nDo you want to continue?" END diff --git a/dll/win32/devmgr/lang/id-ID.rc b/dll/win32/devmgr/lang/id-ID.rc index 4457766ad8f..17c6c65b01a 100644 --- a/dll/win32/devmgr/lang/id-ID.rc +++ b/dll/win32/devmgr/lang/id-ID.rc @@ -289,6 +289,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "Manajer Perangkat ReactOS" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Mematikan perangkat ini akan menyebabkan fungsionalitasnya berhenti.\r\nYakin ingin mematikannya?" IDS_CONFIRM_UNINSTALL "Peringatan: Anda akan mencopot perangkat ini dari sistem anda.\r\nIngin melanjutkan?" END diff --git a/dll/win32/devmgr/lang/it-IT.rc b/dll/win32/devmgr/lang/it-IT.rc index 60aef021f08..3101fbed6c4 100644 --- a/dll/win32/devmgr/lang/it-IT.rc +++ b/dll/win32/devmgr/lang/it-IT.rc @@ -289,6 +289,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ReactOS Device Manager" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" IDS_CONFIRM_UNINSTALL "Warning: You are about to uninstall this device from your system.\r\nDo you want to continue?" END diff --git a/dll/win32/devmgr/lang/ja-JP.rc b/dll/win32/devmgr/lang/ja-JP.rc index 07148be945c..5ad299f4c7c 100644 --- a/dll/win32/devmgr/lang/ja-JP.rc +++ b/dll/win32/devmgr/lang/ja-JP.rc @@ -287,6 +287,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ReactOS デバイスマネージャ" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "このデバイスを無効にすると、機能が止まります。\r\nこれを本当に無効にしたいですか？" IDS_CONFIRM_UNINSTALL "警告: あなたのシステムからこのデバイスをアンインストールしようとしています。\r\n続行したいですか？" END diff --git a/dll/win32/devmgr/lang/no-NO.rc b/dll/win32/devmgr/lang/no-NO.rc index 3c0d03ed087..e4118bbae4e 100644 --- a/dll/win32/devmgr/lang/no-NO.rc +++ b/dll/win32/devmgr/lang/no-NO.rc @@ -289,6 +289,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ReactOS Device Manager" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" IDS_CONFIRM_UNINSTALL "Warning: You are about to uninstall this device from your system.\r\nDo you want to continue?" END diff --git a/dll/win32/devmgr/lang/pl-PL.rc b/dll/win32/devmgr/lang/pl-PL.rc index e9a48f437f6..ef0605fc901 100644 --- a/dll/win32/devmgr/lang/pl-PL.rc +++ b/dll/win32/devmgr/lang/pl-PL.rc @@ -298,6 +298,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "Menedźer urządzeń ReactOS" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Wyłączenie tego urządzenia spowoduje, że przestanie ono funkcjonować. Czy na /npewno chcesz je wyłączyć?" IDS_CONFIRM_UNINSTALL "Ostrzeżenie: Urządzenie to zostanie zaraz odinstalowane z systemu.\r\nCzy chcesz kontynuować?" END diff --git a/dll/win32/devmgr/lang/pt-BR.rc b/dll/win32/devmgr/lang/pt-BR.rc index 03cb0496efc..c8f0985db99 100644 --- a/dll/win32/devmgr/lang/pt-BR.rc +++ b/dll/win32/devmgr/lang/pt-BR.rc @@ -289,6 +289,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ReactOS Device Manager" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" IDS_CONFIRM_UNINSTALL "Warning: You are about to uninstall this device from your system.\r\nDo you want to continue?" END diff --git a/dll/win32/devmgr/lang/pt-PT.rc b/dll/win32/devmgr/lang/pt-PT.rc index 937e5b40d8a..1394979736a 100644 --- a/dll/win32/devmgr/lang/pt-PT.rc +++ b/dll/win32/devmgr/lang/pt-PT.rc @@ -287,6 +287,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ReactOS Gestor de dispositivos" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Desactivar este dispositivo fará com que pare de funcionar. \r\nDeseja realmente desactiva-lo?" IDS_CONFIRM_UNINSTALL "Aviso: Está prestes a desinstalar este dispositivo do sistema.\r\nDeseja continuar?" END diff --git a/dll/win32/devmgr/lang/ro-RO.rc b/dll/win32/devmgr/lang/ro-RO.rc index 9419f3297c9..24cc8a0bece 100644 --- a/dll/win32/devmgr/lang/ro-RO.rc +++ b/dll/win32/devmgr/lang/ro-RO.rc @@ -292,6 +292,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "Gestionar de dispozitive" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Dezactivarea acestui dispozitiv va cauza oprirea funcționării sale.\r\nSigur doriți dezactivarea sa?" IDS_CONFIRM_UNINSTALL "Avertisment: Urmează să dezinstalați acest dispozitiv din sistem.\r\nContinuați?" END diff --git a/dll/win32/devmgr/lang/ru-RU.rc b/dll/win32/devmgr/lang/ru-RU.rc index 66256ddf492..f887d413ba7 100644 --- a/dll/win32/devmgr/lang/ru-RU.rc +++ b/dll/win32/devmgr/lang/ru-RU.rc @@ -289,6 +289,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "Диспетчер устройств ReactOS" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Отключение устройства означает, что оно перестанет работать. Отключить устройство?" IDS_CONFIRM_UNINSTALL "Предупреждение: Сейчас устройство будет удалено из системы.\r\nВы хотите продолжить?" END diff --git a/dll/win32/devmgr/lang/sk-SK.rc b/dll/win32/devmgr/lang/sk-SK.rc index 5076416f458..45510591b75 100644 --- a/dll/win32/devmgr/lang/sk-SK.rc +++ b/dll/win32/devmgr/lang/sk-SK.rc @@ -292,6 +292,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ReactOS Device Manager" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" IDS_CONFIRM_UNINSTALL "Warning: You are about to uninstall this device from your system.\r\nDo you want to continue?" END diff --git a/dll/win32/devmgr/lang/sq-AL.rc b/dll/win32/devmgr/lang/sq-AL.rc index ff6925492b9..9d97a7f917a 100644 --- a/dll/win32/devmgr/lang/sq-AL.rc +++ b/dll/win32/devmgr/lang/sq-AL.rc @@ -291,6 +291,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ReactOS Device Manager" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" IDS_CONFIRM_UNINSTALL "Warning: You are about to uninstall this device from your system.\r\nDo you want to continue?" END diff --git a/dll/win32/devmgr/lang/tr-TR.rc b/dll/win32/devmgr/lang/tr-TR.rc index a42c7f3328a..6ac16e7d6d2 100644 --- a/dll/win32/devmgr/lang/tr-TR.rc +++ b/dll/win32/devmgr/lang/tr-TR.rc @@ -289,6 +289,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ReactOS Aygıt Yöneticisi" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Bu aygıtı edilginleştirmek işleyiş durmasına neden olacaktır.\r\nOnu edilginleştirmeyi gerçekten istiyor musunuz?" IDS_CONFIRM_UNINSTALL "Uyarı: Bu aygıtı dizgenizden kaldırmak üzeresiniz.\r\nSürdürmek istiyor musunuz?" END diff --git a/dll/win32/devmgr/lang/uk-UA.rc b/dll/win32/devmgr/lang/uk-UA.rc index be539b38f11..6e44ad77128 100644 --- a/dll/win32/devmgr/lang/uk-UA.rc +++ b/dll/win32/devmgr/lang/uk-UA.rc @@ -295,6 +295,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ReactOS Device Manager" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" IDS_CONFIRM_UNINSTALL "Warning: You are about to uninstall this device from your system.\r\nDo you want to continue?" END diff --git a/dll/win32/devmgr/lang/zh-CN.rc b/dll/win32/devmgr/lang/zh-CN.rc index 46e61fda555..a65d7efe8b5 100644 --- a/dll/win32/devmgr/lang/zh-CN.rc +++ b/dll/win32/devmgr/lang/zh-CN.rc @@ -289,6 +289,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ReactOS 设备管理器" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "禁用此设备会使其停止运行。\r\n你真的想要禁用它吗?" IDS_CONFIRM_UNINSTALL "警告: 您将要从系统中卸载此设备。\r\n你想要继续吗?" END diff --git a/dll/win32/devmgr/lang/zh-TW.rc b/dll/win32/devmgr/lang/zh-TW.rc index 82b62a0d36b..823cc0f42e0 100644 --- a/dll/win32/devmgr/lang/zh-TW.rc +++ b/dll/win32/devmgr/lang/zh-TW.rc @@ -289,6 +289,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ReactOS 裝置管理員" + IDS_APP_AUTHORS "Copyright 2015 Ged Murphy" IDS_CONFIRM_DISABLE "禁用此裝置會使其停止運行。\r\n你真的想要禁用它嗎?" IDS_CONFIRM_UNINSTALL "警告: 您將要從系統中解除安裝此裝置。\r\n你想要繼續嗎?" END diff --git a/dll/win32/devmgr/precomp.h b/dll/win32/devmgr/precomp.h index 92c8e109011..1ca2f4b1111 100644 --- a/dll/win32/devmgr/precomp.h +++ b/dll/win32/devmgr/precomp.h @@ -53,6 +53,7 @@ OUT LPDWORD lpReboot); #include <winnls.h> #include <wincon.h> #include <shlobj.h> +#include <shellapi.h> #include <shlwapi.h> #include <strsafe.h> #include <process.h> diff --git a/dll/win32/devmgr/resource.h b/dll/win32/devmgr/resource.h index f8054f38ccb..b99006e05ac 100644 --- a/dll/win32/devmgr/resource.h +++ b/dll/win32/devmgr/resource.h @@ -3,6 +3,7 @@ #define IDC_STATIC -1 #define IDS_APPNAME 10 +#define IDS_APP_AUTHORS 11 #define IDI_MAIN_ICON 20 #define IDB_ROOT_IMAGE 21

4 years, 7 months

[reactos] 01/01: [SYSSETUP][MAIN] Fix Mouse Properties UI and improve French translation (#2810)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ce7081766002ab38adcb… commit 4ce7081766002ab38adcb9ae4b75d7765253b91c Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri May 22 15:49:27 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 22 22:49:27 2020 +0900 [SYSSETUP][MAIN] Fix Mouse Properties UI and improve French translation (#2810) - PS2 Mouse Advanced Properties : Static control (frame) added - PS2 Mouse Advanced Properties : French translation added and control layout adapted accordingly - Mouse CPL > Wheel > Sroll line text box ES_NUMBER style added - ReactOS Setup : French translation added --- dll/cpl/main/lang/bg-BG.rc | 4 +-- dll/cpl/main/lang/cs-CZ.rc | 4 +-- dll/cpl/main/lang/de-DE.rc | 4 +-- dll/cpl/main/lang/el-GR.rc | 4 +-- dll/cpl/main/lang/en-US.rc | 4 +-- dll/cpl/main/lang/es-ES.rc | 4 +-- dll/cpl/main/lang/fr-FR.rc | 4 +-- dll/cpl/main/lang/he-IL.rc | 4 +-- dll/cpl/main/lang/hu-HU.rc | 4 +-- dll/cpl/main/lang/id-ID.rc | 4 +-- dll/cpl/main/lang/it-IT.rc | 4 +-- dll/cpl/main/lang/ja-JP.rc | 4 +-- dll/cpl/main/lang/nl-NL.rc | 4 +-- dll/cpl/main/lang/no-NO.rc | 4 +-- dll/cpl/main/lang/pl-PL.rc | 4 +-- dll/cpl/main/lang/pt-PT.rc | 4 +-- dll/cpl/main/lang/ro-RO.rc | 4 +-- dll/cpl/main/lang/ru-RU.rc | 4 +-- dll/cpl/main/lang/sk-SK.rc | 4 +-- dll/cpl/main/lang/sq-AL.rc | 4 +-- dll/cpl/main/lang/tr-TR.rc | 4 +-- dll/cpl/main/lang/uk-UA.rc | 4 +-- dll/cpl/main/lang/zh-CN.rc | 4 +-- dll/cpl/main/lang/zh-TW.rc | 4 +-- dll/win32/syssetup/lang/bg-BG.rc | 1 + dll/win32/syssetup/lang/cs-CZ.rc | 1 + dll/win32/syssetup/lang/da-DK.rc | 1 + dll/win32/syssetup/lang/de-DE.rc | 1 + dll/win32/syssetup/lang/el-GR.rc | 1 + dll/win32/syssetup/lang/en-US.rc | 1 + dll/win32/syssetup/lang/es-ES.rc | 1 + dll/win32/syssetup/lang/et-EE.rc | 1 + dll/win32/syssetup/lang/fi-FI.rc | 1 + dll/win32/syssetup/lang/fr-FR.rc | 55 ++++++++++++++++++++-------------------- dll/win32/syssetup/lang/he-IL.rc | 1 + dll/win32/syssetup/lang/hi-IN.rc | 1 + dll/win32/syssetup/lang/hu-HU.rc | 1 + dll/win32/syssetup/lang/id-ID.rc | 1 + dll/win32/syssetup/lang/it-IT.rc | 1 + dll/win32/syssetup/lang/ja-JP.rc | 1 + dll/win32/syssetup/lang/lt-LT.rc | 1 + dll/win32/syssetup/lang/nl-NL.rc | 1 + dll/win32/syssetup/lang/no-NO.rc | 1 + dll/win32/syssetup/lang/pl-PL.rc | 1 + dll/win32/syssetup/lang/pt-BR.rc | 1 + dll/win32/syssetup/lang/pt-PT.rc | 1 + dll/win32/syssetup/lang/ro-RO.rc | 1 + dll/win32/syssetup/lang/ru-RU.rc | 1 + dll/win32/syssetup/lang/sk-SK.rc | 1 + dll/win32/syssetup/lang/sq-AL.rc | 1 + dll/win32/syssetup/lang/sv-SE.rc | 1 + dll/win32/syssetup/lang/th-TH.rc | 1 + dll/win32/syssetup/lang/tr-TR.rc | 1 + dll/win32/syssetup/lang/uk-UA.rc | 1 + dll/win32/syssetup/lang/zh-CN.rc | 1 + dll/win32/syssetup/lang/zh-TW.rc | 1 + dll/win32/syssetup/resource.h | 1 + 57 files changed, 108 insertions(+), 75 deletions(-) diff --git a/dll/cpl/main/lang/bg-BG.rc b/dll/cpl/main/lang/bg-BG.rc index 779cf8a57aa..56157fc935a 100644 --- a/dll/cpl/main/lang/bg-BG.rc +++ b/dll/cpl/main/lang/bg-BG.rc @@ -137,8 +137,8 @@ BEGIN LTEXT "Завъртане на колелото на една стъпка", -1, 60, 15, 150, 10 RADIOBUTTON "Брой &редове наведнъж", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&Един екран наведнъж", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/cs-CZ.rc b/dll/cpl/main/lang/cs-CZ.rc index 0c085eda143..600dd5987ba 100644 --- a/dll/cpl/main/lang/cs-CZ.rc +++ b/dll/cpl/main/lang/cs-CZ.rc @@ -140,8 +140,8 @@ BEGIN LTEXT "Otočení kolečka o jeden krok posune o:", -1, 60, 15, 150, 10 RADIOBUTTON "&tento počet řádků", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&celou obrazovku", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/de-DE.rc b/dll/cpl/main/lang/de-DE.rc index 4acb62c6bf7..e418a70f5cd 100644 --- a/dll/cpl/main/lang/de-DE.rc +++ b/dll/cpl/main/lang/de-DE.rc @@ -136,8 +136,8 @@ BEGIN LTEXT "Durch Drehen des Rades um eine Einbuchtung wird ein Bildlauf durchgeführt um:", -1, 60, 11, 150, 16 RADIOBUTTON "&Folgende Anzahl Zeilen:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&Eine Bildschirmseite", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/el-GR.rc b/dll/cpl/main/lang/el-GR.rc index 8aa4934850d..6bf3d20298d 100644 --- a/dll/cpl/main/lang/el-GR.rc +++ b/dll/cpl/main/lang/el-GR.rc @@ -134,8 +134,8 @@ BEGIN LTEXT "Μετακίνηση κατα την κύλιση του τροχού κατα μια θέση:", -1, 60, 15, 150, 20 RADIOBUTTON "&Αριθμός γραμμών την φορά", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&Ολόκληρη σελίδα", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/en-US.rc b/dll/cpl/main/lang/en-US.rc index ee77beb46ee..4617e223543 100644 --- a/dll/cpl/main/lang/en-US.rc +++ b/dll/cpl/main/lang/en-US.rc @@ -134,8 +134,8 @@ BEGIN LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 RADIOBUTTON "The following &number of lines at a time:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/es-ES.rc b/dll/cpl/main/lang/es-ES.rc index 8c2f80a7dfd..db7014eedbb 100644 --- a/dll/cpl/main/lang/es-ES.rc +++ b/dll/cpl/main/lang/es-ES.rc @@ -134,8 +134,8 @@ BEGIN LTEXT "Girar la rueda una posición para desplazar", -1, 60, 15, 150, 10 RADIOBUTTON "&El siguiente número de líneas a la vez", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&Una pantalla a la vez", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/fr-FR.rc b/dll/cpl/main/lang/fr-FR.rc index 40311b05f44..94e40573c22 100644 --- a/dll/cpl/main/lang/fr-FR.rc +++ b/dll/cpl/main/lang/fr-FR.rc @@ -134,8 +134,8 @@ BEGIN LTEXT "Bouger la roulette pour défiler", -1, 60, 15, 150, 10 RADIOBUTTON "Le nombre suivant de &lignes à la fois", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&Une page à la fois", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/he-IL.rc b/dll/cpl/main/lang/he-IL.rc index 0b6b9a8d500..be647e0138d 100644 --- a/dll/cpl/main/lang/he-IL.rc +++ b/dll/cpl/main/lang/he-IL.rc @@ -136,8 +136,8 @@ BEGIN LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 RADIOBUTTON "The following &number of lines at a time:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/hu-HU.rc b/dll/cpl/main/lang/hu-HU.rc index 8bc93581e2a..1b19377cd08 100644 --- a/dll/cpl/main/lang/hu-HU.rc +++ b/dll/cpl/main/lang/hu-HU.rc @@ -134,8 +134,8 @@ BEGIN LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 RADIOBUTTON "The following &number of lines at a time:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/id-ID.rc b/dll/cpl/main/lang/id-ID.rc index 53c6b733270..51126c877da 100644 --- a/dll/cpl/main/lang/id-ID.rc +++ b/dll/cpl/main/lang/id-ID.rc @@ -134,8 +134,8 @@ BEGIN LTEXT "Putar roda satu derajat untuk menggulir", -1, 60, 15, 150, 10 RADIOBUTTON "&Jumlah baris dalam sekali waktu", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&Satu layar dalam sekali waktu", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/it-IT.rc b/dll/cpl/main/lang/it-IT.rc index 6b362fa4d30..292399e100a 100644 --- a/dll/cpl/main/lang/it-IT.rc +++ b/dll/cpl/main/lang/it-IT.rc @@ -136,8 +136,8 @@ BEGIN LTEXT "Gira la rotella di una tacca per scorrere", -1, 60, 15, 150, 10 RADIOBUTTON "Il seguente numero di linee per volta", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&Uno schermo alla volta", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/ja-JP.rc b/dll/cpl/main/lang/ja-JP.rc index 491868c1da1..62dd0f50c8d 100644 --- a/dll/cpl/main/lang/ja-JP.rc +++ b/dll/cpl/main/lang/ja-JP.rc @@ -134,8 +134,8 @@ BEGIN LTEXT "マウスのホイール(車輪)を回転されるとスクリールします", -1, 60, 15, 150, 10 RADIOBUTTON "一度に次の行数、スクロール(&N):", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "一度に一画面、スクロール(&O)", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/nl-NL.rc b/dll/cpl/main/lang/nl-NL.rc index 74b34ca63f8..9815955eba6 100644 --- a/dll/cpl/main/lang/nl-NL.rc +++ b/dll/cpl/main/lang/nl-NL.rc @@ -134,8 +134,8 @@ BEGIN LTEXT "Bij elke rolbeweging van het bladerwieltje:", -1, 60, 15, 150, 10 RADIOBUTTON "Dit &aantal regels verschuiven:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&Een scherm tegelijk verschuiven", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/no-NO.rc b/dll/cpl/main/lang/no-NO.rc index afd9b3c07e5..4dbe251fde4 100644 --- a/dll/cpl/main/lang/no-NO.rc +++ b/dll/cpl/main/lang/no-NO.rc @@ -134,8 +134,8 @@ BEGIN LTEXT "Rull hjulet ett hakk for å rulle:", -1, 60, 15, 150, 10 RADIOBUTTON "Følgende &antall linjer om gangen:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&En skjermhøyde av gangen", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 150, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/pl-PL.rc b/dll/cpl/main/lang/pl-PL.rc index aa34d51b732..3ae0a29a373 100644 --- a/dll/cpl/main/lang/pl-PL.rc +++ b/dll/cpl/main/lang/pl-PL.rc @@ -142,8 +142,8 @@ BEGIN LTEXT "Obrócenie kółkiem o jeden skok powoduje przewinięcie:", -1, 42, 15, 179, 10 RADIOBUTTON "&O tyle linii naraz:", IDC_RADIO_WHEEL_SCROLL_LINES, 42, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "O jeden &ekran", IDC_RADIO_WHEEL_SCROLL_PAGE, 42, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 69, 45, 37, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 105, 45, 11, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 69, 45, 37, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 105, 45, 11, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/pt-PT.rc b/dll/cpl/main/lang/pt-PT.rc index 172e80c2bd9..5aa0b59b277 100644 --- a/dll/cpl/main/lang/pt-PT.rc +++ b/dll/cpl/main/lang/pt-PT.rc @@ -134,8 +134,8 @@ BEGIN LTEXT "Rodar a roda um nó para deslocar", -1, 60, 15, 150, 10 RADIOBUTTON "O seguinte numero de linhas de cada vez:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&Um ecrã de cada vez", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/ro-RO.rc b/dll/cpl/main/lang/ro-RO.rc index 345279c8cfc..40cac5a341f 100644 --- a/dll/cpl/main/lang/ro-RO.rc +++ b/dll/cpl/main/lang/ro-RO.rc @@ -139,8 +139,8 @@ BEGIN LTEXT "La acționarea rotiței va fi derulat", -1, 60, 15, 150, 10 RADIOBUTTON "Si&multan următorul număr de linii:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "Câte un &ecran", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 100, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/ru-RU.rc b/dll/cpl/main/lang/ru-RU.rc index 73f64fb2243..5a0c1dbe992 100644 --- a/dll/cpl/main/lang/ru-RU.rc +++ b/dll/cpl/main/lang/ru-RU.rc @@ -134,8 +134,8 @@ BEGIN LTEXT "Поворот колесика на один щелчок служит для прокрутки:", -1, 20, 17, 212, 10 RADIOBUTTON "на указанное количество &строк:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "на один &экран", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 56, 12, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 56, 12, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/sk-SK.rc b/dll/cpl/main/lang/sk-SK.rc index e2c5774980b..1a5e35feec8 100644 --- a/dll/cpl/main/lang/sk-SK.rc +++ b/dll/cpl/main/lang/sk-SK.rc @@ -139,8 +139,8 @@ BEGIN LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 RADIOBUTTON "The following &number of lines at a time:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/sq-AL.rc b/dll/cpl/main/lang/sq-AL.rc index 00936ab5f98..18cc4cc8f08 100644 --- a/dll/cpl/main/lang/sq-AL.rc +++ b/dll/cpl/main/lang/sq-AL.rc @@ -138,8 +138,8 @@ BEGIN LTEXT "Rolltullo rrotën një pikë të lëviz", -1, 60, 15, 150, 10 RADIOBUTTON "Vijimi dhe numri i vijave në një kohë:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&Një ekran në një kohë", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/tr-TR.rc b/dll/cpl/main/lang/tr-TR.rc index 90b56965970..1fc85466b82 100644 --- a/dll/cpl/main/lang/tr-TR.rc +++ b/dll/cpl/main/lang/tr-TR.rc @@ -136,8 +136,8 @@ BEGIN LTEXT "Kaydırma için tekerleği bir çentik döndür:", -1, 60, 15, 150, 10 RADIOBUTTON "&Bir kezde aşağıdaki yataç sayısı:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "B&ir kezde bir görüntülük.", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/uk-UA.rc b/dll/cpl/main/lang/uk-UA.rc index 8d394cce8b2..3c584bd0563 100644 --- a/dll/cpl/main/lang/uk-UA.rc +++ b/dll/cpl/main/lang/uk-UA.rc @@ -142,8 +142,8 @@ BEGIN LTEXT "Поворот коліщатка на одне клацання прокручує", -1, 60, 15, 150, 10 RADIOBUTTON "На вказану кількість &рядків:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "На один &екран", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/zh-CN.rc b/dll/cpl/main/lang/zh-CN.rc index 7775973851d..ac22f124442 100644 --- a/dll/cpl/main/lang/zh-CN.rc +++ b/dll/cpl/main/lang/zh-CN.rc @@ -141,8 +141,8 @@ BEGIN LTEXT "滚动滑轮一个齿格以滚动", -1, 60, 15, 150, 10 RADIOBUTTON "一次滚动下列行数(&N)", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "一次滚动一个屏幕(&O)", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/cpl/main/lang/zh-TW.rc b/dll/cpl/main/lang/zh-TW.rc index c5a0abc0f75..ada615c6788 100644 --- a/dll/cpl/main/lang/zh-TW.rc +++ b/dll/cpl/main/lang/zh-TW.rc @@ -140,8 +140,8 @@ BEGIN LTEXT "滾動滑輪一個齒格以滾動", -1, 60, 15, 150, 10 RADIOBUTTON "一次滾動下列行數(&N)", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "一次滾動一個螢幕(&O)", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | ES_NUMBER | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS, 125, 45, 12, 12 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index 8cd84944369..b44ed78a87c 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -149,6 +149,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index fb772edfcc4..81e8900915f 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -155,6 +155,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index 6e40752aa8b..e0ef504d3ff 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -168,6 +168,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index 2c04c138921..db51991860f 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -149,6 +149,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Erweiterte Einstellungen" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Abtastrate:", -1, 27, 35, 90, 8 LTEXT "-mal pro Sekunde", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 6e1a9f668e0..a1591e40d72 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -149,6 +149,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index eea2920ef1d..ee4deaa57f6 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -168,6 +168,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index e5ecf26c24c..ac7c02d2517 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -158,6 +158,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Configuración avanzada" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Promedio de muestra:", -1, 27, 35, 90, 8 LTEXT "reportes por segundo", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index 3d07a9d2c56..d32aa2eb4bd 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -149,6 +149,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Täpsemad suvandid" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Diskreetimissagedus:", -1, 27, 35, 90, 8 LTEXT "raporti sekundis", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index a4c1480ade1..6ebf43e9acf 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -168,6 +168,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index 66dc007feb0..dabba0db3b6 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -23,16 +23,16 @@ BEGIN END IDD_PRODUCT DIALOGEX 0, 0, 317, 143 -CAPTION "ReactOS Setup" +CAPTION "Installation de ReactOS" STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 - LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 - LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + LTEXT "Veuillez choisir une option produit :", IDC_STATIC, 35, 7, 230, 12 + LTEXT "&Options produit :", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + GROUPBOX "Informations produit", IDC_STATIC, 5, 50, 305, 85 + LTEXT "Description :", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END @@ -146,20 +146,21 @@ END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION -CAPTION "Advanced Settings" +CAPTION "Paramètres avancés" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 - LTEXT "reports per second", -1, 169, 35, 76, 8 - COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 - COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 - LTEXT "packets", -1, 169, 75, 26, 8 - EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER - CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 - AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 - PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 + RTEXT "&Taux d'échantillonnage :", -1, 17, 35, 90, 8 + LTEXT "rapports par seconde", -1, 159, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 114, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Détection de roue :", -1, 17, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 114, 53, 125, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Taille du tampon:", -1, 17, 75, 90, 8 + LTEXT "paquets", -1, 159, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 114, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 158, 70, 10, 14 + AUTOCHECKBOX "&Initialisation rapide", IDC_PS2MOUSEFASTINIT, 114, 97, 90, 10 + PUSHBUTTON "&Valeurs par défaut", IDC_PS2MOUSEDEFAULTS, 180, 188, 65, 14 END STRINGTABLE @@ -226,9 +227,9 @@ END STRINGTABLE BEGIN - IDS_DETECTIONDISABLED "Detection disabled" - IDS_LOOKFORWHEEL "Look for wheel" - IDS_ASSUMEPRESENT "Assume wheel is present" + IDS_DETECTIONDISABLED "Détection désactivée" + IDS_LOOKFORWHEEL "Rechercher une roulette" + IDS_ASSUMEPRESENT "Supposer une roulette présente" END STRINGTABLE @@ -241,11 +242,11 @@ END STRINGTABLE BEGIN - IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" - IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." - IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." - IDS_DEFAULT "(Default)" + IDS_PRODUCTTITLE "Options de produit" + IDS_PRODUCTSUBTITLE "Vous pouvez choisir une option de produit qui affectera le comportement du système." + IDS_PRODUCTSERVERNAME "Serveur ReactOS" + IDS_PRODUCTWORKSTATIONNAME "Station de travail ReactOS" + IDS_PRODUCTSERVERINFO "Le système sera reconnu comme un serveur. Les dossiers privés ""Mes images"", ""Mes vidéos"" et ""Ma musique"" sont indépendant de ""Mes Documents""." + IDS_PRODUCTWORKSTATIONINFO "Le système sera reconnu comme une station de travail. Les dossiers privés ""Mes images"", ""Mes vidéos"" et ""Ma musique"" sont dans ""Mes Documents""." + IDS_DEFAULT "(Défaut)" END diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index dc201d16d53..0427892aa4e 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -149,6 +149,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc index 86bf4160689..984694686d3 100644 --- a/dll/win32/syssetup/lang/hi-IN.rc +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -156,6 +156,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "एडवांस सेटिंग" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&नमूना दर:", -1, 27, 35, 90, 8 LTEXT "प्रति सेकंड की रिपोर्ट", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index 70f414fb0b5..d0ccb457c08 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -148,6 +148,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Haladó beállítások" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Mintavételi ráta:", -1, 10, 35, 90, 8 LTEXT "jelentés másodpercenként", -1, 152, 35, 95, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 107, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index 9b08333fd1d..9a6174cd70b 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -149,6 +149,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Setelan Tingkat Lanjut" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "laporan per detik", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index e8aec4e87a7..fdbf25d98d2 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -149,6 +149,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Impostazioni avanzate" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "report per secondo", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index bb6e31cb6bc..19e65b7b706 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -149,6 +149,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "高度な設定" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "サンプルレート(&S):", -1, 27, 35, 90, 8 LTEXT "報告/秒", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index 9aae25cea7a..af6758fca4c 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -168,6 +168,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index 5837718d597..41d051a2535 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -149,6 +149,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index 2891b5790b6..3b91ee6195e 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -149,6 +149,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index 5f2854ce9da..948850737ed 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -149,6 +149,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Ustawienia zaawansowane" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "C&zęstotliwość próbkowania:", -1, 27, 35, 90, 8 LTEXT "raportów na sekundę", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index f78bd39a79e..aa53f8aac7d 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -149,6 +149,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index dff8801bcb7..de3be1e4467 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -149,6 +149,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Definições avançadas" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Frequencia de amostragem:", -1, 27, 35, 90, 8 LTEXT "Relatórios por segundo", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index 4ab26a635f1..0020754b2cd 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -158,6 +158,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Opțiuni avansate" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "Rata de &eșantionare:", -1, 27, 35, 90, 8 LTEXT "semnale pe secundă", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index 4e8f4dbdde6..57776b7055a 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -152,6 +152,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index 2341f62500a..ecdb07f61d1 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -155,6 +155,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index 83ebd25cb57..0fc1f13688a 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -168,6 +168,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index b24a9c69e33..1c31d23d2f2 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -168,6 +168,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 1e99af5eaaa..48f1156f2ae 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -168,6 +168,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index a911d89e318..8c94f5a07c6 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -151,6 +151,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Gelişmiş Ayarlar" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "Ö&rnekleme hızı:", -1, 27, 35, 90, 8 LTEXT "saniyede bildirme", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index b759b174866..4310bfb315c 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -157,6 +157,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index fdf9e957017..dbce04d3cbc 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -151,6 +151,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "高级设置" FONT 9, "宋体" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "采样率(&S):", -1, 27, 35, 90, 8 LTEXT "每秒报告", -1, 169, 35, 54, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index dcc72bf9e2b..a55f92f6bf8 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -171,6 +171,7 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "進階設定" FONT 9, "新細明體" BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 RTEXT "采樣速率(&S):", -1, 27, 35, 90, 8 LTEXT "每秒報告", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h index a324cfea1ae..57dcff258f1 100644 --- a/dll/win32/syssetup/resource.h +++ b/dll/win32/syssetup/resource.h @@ -87,6 +87,7 @@ #define IDC_PS2MOUSEINPUTUPDN 2304 #define IDC_PS2MOUSEFASTINIT 2305 #define IDC_PS2MOUSEDEFAULTS 2306 +#define IDC_PS2STATIC 2307 #define IDD_PRODUCT 2400 #define IDC_PRODUCT_ICON 2401

4 years, 7 months

[reactos] 01/01: [BROWSER] Add the browser service

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b90e5424278e49346e77… commit 1b90e5424278e49346e77e522a4b06bcf5c01873 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu May 21 22:49:33 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu May 21 22:49:33 2020 +0200 [BROWSER] Add the browser service --- base/services/CMakeLists.txt | 1 + base/services/browser/CMakeLists.txt | 22 ++++ base/services/browser/browser.c | 184 +++++++++++++++++++++++++++++++ base/services/browser/browser.rc | 5 + base/services/browser/browser.spec | 3 + base/services/browser/precomp.h | 33 ++++++ base/services/browser/rpcserver.c | 208 +++++++++++++++++++++++++++++++++++ boot/bootdata/hivesys.inf | 12 ++ 8 files changed, 468 insertions(+) diff --git a/base/services/CMakeLists.txt b/base/services/CMakeLists.txt index 2605101c793..98bae238acc 100644 --- a/base/services/CMakeLists.txt +++ b/base/services/CMakeLists.txt @@ -1,5 +1,6 @@ add_subdirectory(audiosrv) +add_subdirectory(browser) add_subdirectory(dcomlaunch) add_subdirectory(dhcpcsvc) add_subdirectory(dnsrslvr) diff --git a/base/services/browser/CMakeLists.txt b/base/services/browser/CMakeLists.txt new file mode 100644 index 00000000000..b5d590e89c4 --- /dev/null +++ b/base/services/browser/CMakeLists.txt @@ -0,0 +1,22 @@ + +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl) +add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/browser.idl) +spec2def(browser.dll browser.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + browser.c + rpcserver.c + precomp.h) + +add_library(browser MODULE + ${SOURCE} + browser.rc + ${CMAKE_CURRENT_BINARY_DIR}/browser_s.c + ${CMAKE_CURRENT_BINARY_DIR}/browser_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/browser.def) + +set_module_type(browser win32dll UNICODE) +target_link_libraries(browser wine ${PSEH_LIB}) +add_importlibs(browser advapi32 rpcrt4 msvcrt kernel32 ntdll) +add_pch(browser precomp.h SOURCE) +add_cd_file(TARGET browser DESTINATION reactos/system32 FOR all) diff --git a/base/services/browser/browser.c b/base/services/browser/browser.c new file mode 100644 index 00000000000..406386cc6ff --- /dev/null +++ b/base/services/browser/browser.c @@ -0,0 +1,184 @@ +/* + * PROJECT: ReactOS Browser Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Browser service RPC server + * COPYRIGHT: Eric Kohl 2020 <eric.kohl(a)reactos.org> + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(browser); + + +/* GLOBALS ******************************************************************/ + +HINSTANCE hDllInstance; + +static WCHAR ServiceName[] = L"browser"; + +static SERVICE_STATUS_HANDLE ServiceStatusHandle; +static SERVICE_STATUS ServiceStatus; + + +/* FUNCTIONS *****************************************************************/ + +static +VOID +UpdateServiceStatus( + DWORD dwState) +{ + ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwCurrentState = dwState; + ServiceStatus.dwControlsAccepted = 0; + ServiceStatus.dwWin32ExitCode = 0; + ServiceStatus.dwServiceSpecificExitCode = 0; + ServiceStatus.dwCheckPoint = 0; + + if (dwState == SERVICE_START_PENDING || + dwState == SERVICE_STOP_PENDING || + dwState == SERVICE_PAUSE_PENDING || + dwState == SERVICE_CONTINUE_PENDING) + ServiceStatus.dwWaitHint = 10000; + else + ServiceStatus.dwWaitHint = 0; + + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); +} + + +static +DWORD +WINAPI +ServiceControlHandler( + DWORD dwControl, + DWORD dwEventType, + LPVOID lpEventData, + LPVOID lpContext) +{ + TRACE("ServiceControlHandler()\n"); + + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + TRACE(" SERVICE_CONTROL_STOP received\n"); + /* Stop listening to incoming RPC messages */ + RpcMgmtStopServerListening(NULL); + UpdateServiceStatus(SERVICE_STOPPED); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_PAUSE: + TRACE(" SERVICE_CONTROL_PAUSE received\n"); + UpdateServiceStatus(SERVICE_PAUSED); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_CONTINUE: + TRACE(" SERVICE_CONTROL_CONTINUE received\n"); + UpdateServiceStatus(SERVICE_RUNNING); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_INTERROGATE: + TRACE(" SERVICE_CONTROL_INTERROGATE received\n"); + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_SHUTDOWN: + TRACE(" SERVICE_CONTROL_SHUTDOWN received\n"); + UpdateServiceStatus(SERVICE_STOPPED); + return ERROR_SUCCESS; + + default : + TRACE(" Control %lu received\n", dwControl); + return ERROR_CALL_NOT_IMPLEMENTED; + } +} + + +static +DWORD +ServiceInit(VOID) +{ + HANDLE hThread; + + hThread = CreateThread(NULL, + 0, + (LPTHREAD_START_ROUTINE)RpcThreadRoutine, + NULL, + 0, + NULL); + + if (!hThread) + { + ERR("Can't create PortThread\n"); + return GetLastError(); + } + else + CloseHandle(hThread); + + return ERROR_SUCCESS; +} + + +VOID +WINAPI +ServiceMain( + _In_ INT ArgCount, + _In_ PWSTR *ArgVector) +{ + DWORD dwError; + + UNREFERENCED_PARAMETER(ArgCount); + UNREFERENCED_PARAMETER(ArgVector); + + FIXME("ServiceMain(%d %p)\n", ArgCount, ArgVector); + + ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, + ServiceControlHandler, + NULL); + if (!ServiceStatusHandle) + { + ERR("RegisterServiceCtrlHandlerExW() failed! (Error %lu)\n", GetLastError()); + return; + } + + UpdateServiceStatus(SERVICE_START_PENDING); + + dwError = ServiceInit(); + if (dwError != ERROR_SUCCESS) + { + ERR("Service stopped (dwError: %lu\n", dwError); + UpdateServiceStatus(SERVICE_STOPPED); + return; + } + + UpdateServiceStatus(SERVICE_RUNNING); +} + + +BOOL +WINAPI +DllMain( + _In_ HINSTANCE hinstDLL, + _In_ DWORD fdwReason, + _In_ PVOID pvReserved) +{ + UNREFERENCED_PARAMETER(pvReserved); + + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + hDllInstance = hinstDLL; + break; + + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} + +/* EOF */ diff --git a/base/services/browser/browser.rc b/base/services/browser/browser.rc new file mode 100644 index 00000000000..5f18870c5fe --- /dev/null +++ b/base/services/browser/browser.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Browser Service Dll" +#define REACTOS_STR_INTERNAL_NAME "browser" +#define REACTOS_STR_ORIGINAL_FILENAME "browser.dll" +#include <reactos/version.rc> diff --git a/base/services/browser/browser.spec b/base/services/browser/browser.spec new file mode 100644 index 00000000000..78e9d5ead71 --- /dev/null +++ b/base/services/browser/browser.spec @@ -0,0 +1,3 @@ +@ stub I_BrowserServerEnumForXactsrv +@ stdcall ServiceMain(long ptr) +@ stub SvchostPushServiceGlobals diff --git a/base/services/browser/precomp.h b/base/services/browser/precomp.h new file mode 100644 index 00000000000..e978c3cfd9f --- /dev/null +++ b/base/services/browser/precomp.h @@ -0,0 +1,33 @@ +/* + * PROJECT: ReactOS Browser Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Browser service RPC server + * COPYRIGHT: Eric Kohl 2020 <eric.kohl(a)reactos.org> + */ + +#ifndef _BROWSER_PCH_ +#define _BROWSER_PCH_ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <limits.h> +#include <stdarg.h> +#include <stdio.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winsvc.h> + +#include <browser_s.h> + +#include <wine/debug.h> + +extern HINSTANCE hDllInstance; + +DWORD +WINAPI +RpcThreadRoutine( + LPVOID lpParameter); + +#endif /* _BROWSER_PCH_ */ diff --git a/base/services/browser/rpcserver.c b/base/services/browser/rpcserver.c new file mode 100644 index 00000000000..91825043020 --- /dev/null +++ b/base/services/browser/rpcserver.c @@ -0,0 +1,208 @@ +/* + * PROJECT: ReactOS Browser Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Browser service RPC server + * COPYRIGHT: Eric Kohl 2020 <eric.kohl(a)reactos.org> + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +//#include "lmerr.h" + +WINE_DEFAULT_DEBUG_CHANNEL(browser); + +/* FUNCTIONS *****************************************************************/ + +DWORD +WINAPI +RpcThreadRoutine( + LPVOID lpParameter) +{ + RPC_STATUS Status; + + Status = RpcServerUseProtseqEpW(L"ncacn_np", 20, L"\\pipe\\browser", NULL); + if (Status != RPC_S_OK) + { + ERR("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerRegisterIf(browser_v0_0_s_ifspec, NULL, NULL); + if (Status != RPC_S_OK) + { + ERR("RpcServerRegisterIf() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, FALSE); + if (Status != RPC_S_OK) + { + ERR("RpcServerListen() failed (Status %lx)\n", Status); + } + + return 0; +} + + +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + + +/* Function 0 */ +NET_API_STATUS +__stdcall +I_BrowserrServerEnum( + BROWSER_IDENTIFY_HANDLE ServerName, + LPWSTR Transport, + LPWSTR ClientName, + LPSERVER_ENUM_STRUCT EnumStruct, + DWORD PreferedMaximumLength, + LPDWORD TotalEntries, + DWORD ServerType, + LPWSTR Domain, + LPDWORD ResumeHandle) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 1 (BrowserrDebugCall) */ +NET_API_STATUS +__stdcall +BrowserOpnum1NotUsedOnWire(VOID) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 2 */ +NET_API_STATUS +__stdcall +I_BrowserrQueryOtherDomains( + BROWSER_IDENTIFY_HANDLE ServerName, + LPSERVER_ENUM_STRUCT EnumStruct, + LPDWORD TotalEntries) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 3 */ +NET_API_STATUS +__stdcall +I_BrowserrResetNetlogonState( + BROWSER_IDENTIFY_HANDLE ServerName) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 4 */ +NET_API_STATUS +__stdcall +I_BrowserrDebugTrace( + BROWSER_IDENTIFY_HANDLE ServerName, + LPSTR String) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 5 */ +NET_API_STATUS +__stdcall +I_BrowserrQueryStatistics( + BROWSER_IDENTIFY_HANDLE ServerName, + LPBROWSER_STATISTICS *Statistics) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 6 */ +NET_API_STATUS +__stdcall +I_BrowserrResetStatistics( + BROWSER_IDENTIFY_HANDLE ServerName) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 7 - Not used on wire */ +NET_API_STATUS +__stdcall +NetrBrowserStatisticsClear( + BROWSER_IDENTIFY_HANDLE ServerName) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 8 */ +NET_API_STATUS +__stdcall +NetrBrowserStatisticsGet( + BROWSER_IDENTIFY_HANDLE ServerName, + DWORD Level, + LPBROWSER_STATISTICS_STRUCT StatisticsStruct) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 9 */ +NET_API_STATUS +__stdcall +I_BrowserrSetNetlogonState( + BROWSER_IDENTIFY_HANDLE ServerName, + LPWSTR DomainName, + LPWSTR EmulatedComputerName, + DWORD Role) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 10 */ +NET_API_STATUS +__stdcall +I_BrowserrQueryEmulatedDomains( + BROWSER_IDENTIFY_HANDLE ServerName, + PBROWSER_EMULATED_DOMAIN_CONTAINER EmulatedDomains) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 11 (BrowserrServerEnumEx) */ +NET_API_STATUS +__stdcall +BrowserOpnum11NotUsedOnWire(void) +{ + UNIMPLEMENTED; + return 0; +} + +/* EOF */ diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 639ea7bd7ec..d3041b676a0 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1556,6 +1556,18 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Blue","ImagePath",0x00020000,"system32\d HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Type",0x00010001,0x00000001 +; Browser service +HKLM,"SYSTEM\CurrentControlSet\Services\Browser",,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\Browser","DisplayName",0x00000000,%BROWSER_SERVICE% +HKLM,"SYSTEM\CurrentControlSet\Services\Browser","Description",0x00000000,%BROWSER_SERVICE_DESCRIPTION% +HKLM,"SYSTEM\CurrentControlSet\Services\Browser","DependOnService",0x00010000,"LanmanWorkstation","LanmanServer" +HKLM,"SYSTEM\CurrentControlSet\Services\Browser","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Browser","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" +HKLM,"SYSTEM\CurrentControlSet\Services\Browser","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\Browser","Start",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\Browser","Type",0x00010001,0x00000020 +HKLM,"SYSTEM\CurrentControlSet\Services\Browser\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\browser.dll" + ; EMS Serial Administration Console Driver HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","Group",0x00000000,"EMS"

4 years, 7 months

[reactos] 01/01: [UMPNPMGR] Start work on PNP_GetNextResDes()

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80b139d7269b1762c92b6… commit 80b139d7269b1762c92b6bd632382b393d48c40b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu May 21 21:49:46 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu May 21 21:51:06 2020 +0200 [UMPNPMGR] Start work on PNP_GetNextResDes() --- base/services/umpnpmgr/rpcserver.c | 79 +++++++++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 2 deletions(-) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index c2312abd509..004eb659b01 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -4108,8 +4108,83 @@ PNP_GetNextResDes( DWORD *pulNextResTag, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + HKEY hConfigKey = NULL; + DWORD RegDataType = 0; + ULONG ulDataSize = 0; + LPBYTE lpData = NULL; + CONFIGRET ret = CR_SUCCESS; + + DPRINT1("PNP_GetNextResDes(%p %S 0x%lx %lu %lu %ul %p %p 0x%08lx)\n", + hBinding, pDeviceID, ulLogConfTag, ulLogConfType, ResourceID, + ulResourceTag, pulNextResType, pulNextResTag, ulFlags); + + if (pulNextResType == NULL) + return CR_INVALID_POINTER; + + *pulNextResType = 0; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (!IsValidDeviceInstanceID(pDeviceID)) + return CR_INVALID_DEVINST; + + ret = OpenConfigurationKey(pDeviceID, + &hConfigKey); + if (ret != CR_SUCCESS) + { + DPRINT1("OpenConfigurationKey() failed (Error %lu)\n", ret); + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + + ret = GetConfigurationData(hConfigKey, + ulLogConfType, + &RegDataType, + &ulDataSize, + &lpData); + if (ret != CR_SUCCESS) + { + DPRINT1("GetConfigurationData() failed (Error %lu)\n", ret); + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + + DPRINT1("Data size %lu\n", ulDataSize); + + if (ulDataSize == 0 || lpData == NULL) + { + DPRINT1("No config data available!\n"); + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + + /* Get the next resource descriptor */ + if (RegDataType == REG_RESOURCE_LIST) + { + DPRINT1("FIXME: REG_RESOURCE_LIST\n"); + /* FIXME */ + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + else if (RegDataType == REG_RESOURCE_REQUIREMENTS_LIST) + { + DPRINT1("FIXME: REG_RESOURCE_REQUIREMENTS_LIST\n"); + /* FIXME */ + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + +done: + if (lpData != NULL) + HeapFree(GetProcessHeap(), 0, lpData); + + if (hConfigKey != NULL) + RegCloseKey(hConfigKey); + + DPRINT1("PNP_GetNextResDes() returns %lu\n", ret); + + return ret; }

4 years, 7 months

[reactos] 01/01: [SYSSETUP] DoWriteProductOption(): Fix 'pData' copypastas (#2826)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef6711c9047d37c1c5b7a… commit ef6711c9047d37c1c5b7ac4c72fedfbf78280c3e Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu May 21 18:52:50 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 22 01:52:50 2020 +0900 [SYSSETUP] DoWriteProductOption(): Fix 'pData' copypastas (#2826) Addendum to 612729b09272aeb693e156de6b5991891951dbf2. CORE-17069 --- dll/win32/syssetup/wizard.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 6564407c5a9..ad2e9c71847 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -395,13 +395,13 @@ static const WCHAR s_szProductOptions[] = L"SYSTEM\\CurrentControlSet\\Control\\ static const WCHAR s_szRosVersion[] = L"SYSTEM\\CurrentControlSet\\Control\\ReactOS\\Settings\\Version"; static const WCHAR s_szControlWindows[] = L"SYSTEM\\CurrentControlSet\\Control\\Windows"; -typedef struct PRODUCT_OPTION_DATA +typedef struct _PRODUCT_OPTION_DATA { LPCWSTR ProductSuite; LPCWSTR ProductType; DWORD ReportAsWorkstation; DWORD CSDVersion; -} PRODUCT_OPTION_DATA, *LPPRODUCT_OPTION_DATA; +} PRODUCT_OPTION_DATA; static const PRODUCT_OPTION_DATA s_ProductOptionData[] = { @@ -430,7 +430,7 @@ DoWriteProductOption(PRODUCT_OPTION nOption) /* write ProductSuite */ pszData = pData->ProductSuite; cbData = (lstrlenW(pszData) + 2) * sizeof(WCHAR); - error = RegSetValueExW(hKey, L"ProductSuite", 0, REG_MULTI_SZ, (const BYTE *)pData, cbData); + error = RegSetValueExW(hKey, L"ProductSuite", 0, REG_MULTI_SZ, (const BYTE *)pszData, cbData); if (error) { DPRINT1("RegSetValueExW failed\n"); @@ -440,7 +440,7 @@ DoWriteProductOption(PRODUCT_OPTION nOption) /* write ProductType */ pszData = pData->ProductType; cbData = (lstrlenW(pszData) + 1) * sizeof(WCHAR); - error = RegSetValueExW(hKey, L"ProductType", 0, REG_SZ, (const BYTE *)pData, cbData); + error = RegSetValueExW(hKey, L"ProductType", 0, REG_SZ, (const BYTE *)pszData, cbData); if (error) { DPRINT1("RegSetValueExW failed\n");

4 years, 7 months

[reactos] 01/01: [ACCESS.CPL] Improvements to Portuguese translation (#2800)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3ab469e447d79ba96758… commit c3ab469e447d79ba96758427803c0717d254c370 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Thu May 21 14:36:33 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 21 15:36:33 2020 +0200 [ACCESS.CPL] Improvements to Portuguese translation (#2800) --- dll/cpl/access/lang/pt-PT.rc | 172 +++++++++++++++++++++---------------------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/dll/cpl/access/lang/pt-PT.rc b/dll/cpl/access/lang/pt-PT.rc index 4558d675121..834ee956f7e 100644 --- a/dll/cpl/access/lang/pt-PT.rc +++ b/dll/cpl/access/lang/pt-PT.rc @@ -5,22 +5,22 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Teclado" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Teclas de aderência", -1, 6, 11, 234, 62 - LTEXT "Use as teclas de aderência se deseja usar SHIFT, CTRL, ALT ou a tecla de logotipo do ReactOS pressionando uma tecla de cada vez.", + GROUPBOX "Teclas presas", -1, 6, 11, 234, 62 + LTEXT "Utilize as ""Teclas presas"" se deseja utilizar SHIFT, CTRL, ALT pressionando uma tecla de cada vez.", -1, 12, 20, 222, 29 - AUTOCHECKBOX "&Usar as teclas de aderência", IDC_STICKY_BOX, 12, 49, 126, 14 - PUSHBUTTON "&Configurações", IDC_STICKY_BUTTON, 144, 49, 90, 14 - GROUPBOX "Teclas de filtragem", -1, 6, 79, 234, 67 - LTEXT "Use as teclas de filtragem para que o ReactOS ignore teclas pressionadas rápida ou repetidamente ou para que diminua a taxa de repetição.", + AUTOCHECKBOX "&Utilizar ""Teclas presas""", IDC_STICKY_BOX, 12, 49, 126, 14 + PUSHBUTTON "&Definições", IDC_STICKY_BUTTON, 144, 49, 90, 14 + GROUPBOX "Teclas lentas", -1, 6, 79, 234, 67 + LTEXT "Utilize as ""Teclas lentas"" para que o ReactOS ignore os batimentos breves ou repetidos de teclas ou diminua a taxa de repetição.", -1, 12, 89, 222, 29 - AUTOCHECKBOX "Usar as teclas de &filtragem", IDC_FILTER_BOX, 12, 121, 126, 14 - PUSHBUTTON "C&onfigurações", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "Teclas de alternância", -1, 6, 148, 234, 62 - LTEXT "Use as teclas de alternância para ouvir sons quando pressionar CAPS LOCK, NUM LOCK e SCROLL LOCK.", + AUTOCHECKBOX "Utilizar as ""Teclas lentas""", IDC_FILTER_BOX, 12, 121, 126, 14 + PUSHBUTTON "D&efinições", IDC_FILTER_BUTTON, 144, 121, 90, 14 + GROUPBOX "Teclas sonoras", -1, 6, 148, 234, 62 + LTEXT "Utilize ""Teclas sonoras"" para ouvir sinais quando pressionar CAPS LOCK, NUM LOCK e SCROLL LOCK.", -1, 12, 161, 222, 20 - AUTOCHECKBOX "Usar as &teclas de alternância", IDC_TOGGLE_BOX, 12, 184, 126, 14 - PUSHBUTTON "Co&nfigurações", IDC_TOGGLE_BUTTON, 144, 184, 90, 14 - AUTOCHECKBOX "Fornecer ajuda &extra para teclado em programas", IDC_KEYBOARD_EXTRA, + AUTOCHECKBOX "Utilizar ""Teclas sonoras""", IDC_TOGGLE_BOX, 12, 184, 126, 14 + PUSHBUTTON "De&finições", IDC_TOGGLE_BUTTON, 144, 184, 90, 14 + AUTOCHECKBOX "Fornecer a&juda adicional do teclado nos programas", IDC_KEYBOARD_EXTRA, 6, 212, 234, 14 END @@ -29,31 +29,31 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Som" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Sinalizador de som", -1, 6, 11, 234, 98 - LTEXT "Use o sinalizador de som se desejar que o ReactOS gere avisos visuais quando o sistema emitir um som.", + GROUPBOX "Sons visuais", -1, 6, 11, 234, 98 + LTEXT "Utilize ""Sons visuais"" se pretender que o ReactOS crie avisos visuais quando o sistema emitir um som.", -1, 12, 20, 222, 29 - AUTOCHECKBOX "U&sar o sinalizador de som", IDC_SENTRY_BOX, 12, 49, 90, 14 + AUTOCHECKBOX "&Utilizar ""Sons visuais""", IDC_SENTRY_BOX, 12, 49, 90, 14 LTEXT "Escolha o aviso visual:", IDC_SENTRY_TEXT, 12, 72, 222, 11 COMBOBOX IDC_SENTRY_COMBO, 12, 83, 222, 56, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Mostrar sons", -1, 6, 115, 234, 67 - LTEXT "Use este recurso se desejar que os programas exibam legendas para a fala e os sons emitidos.", + GROUPBOX "Legendas para sons", -1, 6, 115, 234, 67 + LTEXT "Utilize este recurso para que os programas mostrem legendas da fala e dos sons emitidos.", -1, 12, 125, 222, 29 - AUTOCHECKBOX "&Usar o recurso para mostrar sons", IDC_SSHOW_BOX, 12, 148, 222, 14 + AUTOCHECKBOX "&Utilizar ""Legendas para sons""", IDC_SSHOW_BOX, 12, 148, 222, 14 END IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Vídeo" +CAPTION "Visualização" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Alto contraste", -1, 6, 11, 234, 62 - LTEXT "Use esta opção para que o ReactOS utilize cores e fontes que facilitam a leitura.", + LTEXT "Use esta opção para que o ReactOS utilize cores e tipos de letra concebidos para uma leitura fácil.", -1, 12, 20, 222, 29 - AUTOCHECKBOX "&Usar alto contraste", IDC_CONTRAST_BOX, 12, 49, 126, 14 - PUSHBUTTON "&Configurações", IDC_CONTRAST_BUTTON, 144, 49, 90, 14 + AUTOCHECKBOX "&Utilizar ""Alto contraste""", IDC_CONTRAST_BOX, 12, 49, 126, 14 + PUSHBUTTON "&Definições", IDC_CONTRAST_BUTTON, 144, 49, 90, 14 GROUPBOX "Opções do cursor", -1, 6, 79, 234, 115 - LTEXT "Mova os controles deslizantes para alterar a velocidade com que o cursor pisca (taxa de intermitência do cursor) e sua largura.", + LTEXT "Mova o controle deslizante para alterar a velocidade com que o cursor pisca (taxa de intermitência do cursor) e a sua largura.", -1, 12, 88, 222, 20 CTEXT "&Taxa de intermitência:", -1, 12, 115, 222, 11 LTEXT "Nenhuma", -1, 18, 130, 36, 11 @@ -61,8 +61,8 @@ BEGIN CONTROL "", IDC_CURSOR_BLINK_TRACK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 124, 126, 20 CTEXT "La&rgura:", -1, 12, 151, 222, 11 - LTEXT "Estreito", -1, 18, 171, 36, 11 - LTEXT "Largo", -1, 192, 171, 36, 11 + LTEXT "Estreita", -1, 18, 171, 36, 11 + LTEXT "Larga", -1, 192, 171, 36, 11 CONTROL "", IDC_CURSOR_WIDTH_TRACK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 169, 126, 20 LTEXT "", IDC_CURSOR_WIDTH_TEXT, 18, 142, 24, 16 @@ -70,14 +70,14 @@ END IDD_PROPPAGEMOUSE DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Mouse" +CAPTION "Rato" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Teclas para mouse", -1, 6, 11, 234, 62 - LTEXT "Use as teclas para mouse para controlar o ponteiro com o teclado numérico.", + GROUPBOX "Rato por teclado", -1, 6, 11, 234, 62 + LTEXT "Use ""Rato por teclado"" para controlar o ponteiro com o teclado numérico.", -1, 12, 20, 222, 29 - AUTOCHECKBOX "Usar as teclas para &mouse", IDC_MOUSE_BOX, 12, 49, 126, 14 - PUSHBUTTON "&Configurações", IDC_MOUSE_BUTTON, 144, 49, 90, 14 + AUTOCHECKBOX "Utilizar ""Rato por teclado""", IDC_MOUSE_BOX, 12, 49, 126, 14 + PUSHBUTTON "&Definições", IDC_MOUSE_BUTTON, 144, 49, 90, 14 END IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 246, 228 @@ -85,8 +85,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Geral" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Reconfiguração automática", -1, 6, 11, 234, 47 - AUTOCHECKBOX "&Desactivar recursos de acessibilidade se o computador ficar inactivo por:", + GROUPBOX "Repor automáticamente", -1, 6, 11, 234, 47 + AUTOCHECKBOX "&Desactivar recursos de acessibilidade se inactivas durante:", IDC_RESET_BOX, 12, 18, 222, 14 COMBOBOX IDC_RESET_COMBO, 24, 38, 60, 47, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP @@ -95,36 +95,36 @@ BEGIN 12, 72, 222, 14 AUTOCHECKBOX "Emitir um &som ao activar ou desactivar um recurso", IDC_NOTIFICATION_SOUND, 12, 90, 222, 14 - GROUPBOX "Dispositivos seriais de acessibilidade", -1, 6, 115, 234, 47 - LTEXT "Os dispositivos seriais de acessibilidade permitem o acesso alternativo aos recursos de teclado e mouse.", + GROUPBOX "Dispositivos ""Teclas série""", -1, 6, 115, 234, 47 + LTEXT "Os dispositivos ""Teclas série"" permitem o acesso alternativo aos recursos de teclado e do rato.", -1, 12, 124, 222, 20 - AUTOCHECKBOX "&Usar as teclas seriais", IDC_SERIAL_BOX, 12, 142, 126, 14 - PUSHBUTTON "&Configurações", IDC_SERIAL_BUTTON, 144, 142, 90, 14 + AUTOCHECKBOX "&Utilizar as ""Teclas série""", IDC_SERIAL_BOX, 12, 142, 126, 14 + PUSHBUTTON "&Definições", IDC_SERIAL_BUTTON, 144, 142, 90, 14 GROUPBOX "Opções administrativas", -1, 6, 169, 234, 47 - AUTOCHECKBOX "&Aplicar todas as configurações à área de trabalho de logon", IDC_ADMIN_LOGON_BOX, + AUTOCHECKBOX "&Aplicar todas as definições à área de trabalho de início de sessão", IDC_ADMIN_LOGON_BOX, 12, 178, 222, 14 - AUTOCHECKBOX "Aplicar &todas as configurações padrão para novos utilizadores", IDC_ADMIN_USERS_BOX, + AUTOCHECKBOX "Aplicar &todas as predefinições para novos utilizadores", IDC_ADMIN_USERS_BOX, 12, 196, 222, 14 END IDD_STICKYKEYSOPTIONS DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configurações das teclas de aderência" +CAPTION "Definições para ""Teclas presas""" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Atalho do teclado", -1, 6, 11, 234, 62 - LTEXT "O atalho para as teclas de aderência é:\npressionar a tecla SHIFT cinco vezes.", + LTEXT "O atalho para ""Teclas presas"":\nPrima a tecla SHIFT cinco vezes.", -1, 12, 20, 222, 29 - AUTOCHECKBOX "&Usar atalho", IDC_STICKY_ACTIVATE_CHECK, 12, 49, 222, 14 + AUTOCHECKBOX "&Utilizar atalho", IDC_STICKY_ACTIVATE_CHECK, 12, 49, 222, 14 GROUPBOX "Opções", -1, 6, 83, 234, 44 - AUTOCHECKBOX "&Pressionar a tecla modificadora duas vezes para bloquear", IDC_STICKY_LOCK_CHECK, + AUTOCHECKBOX "&Pressionar a tecla modificadora duas vezes para fixar", IDC_STICKY_LOCK_CHECK, 12, 92, 222, 14 - AUTOCHECKBOX "Desac&tivar teclas de aderência se duas teclas forem pressionadas ao mesmo tempo", IDC_STICKY_UNLOCK_CHECK, + AUTOCHECKBOX "Desac&tivar ""Teclas presas"" ao premir duas teclas em simultâneo", IDC_STICKY_UNLOCK_CHECK, 12, 105, 222, 18, BS_MULTILINE GROUPBOX "Notificação", -1, 6, 133, 234, 44 AUTOCHECKBOX "&Emitir sons quando a tecla modificadora for pressionada", IDC_STICKY_SOUND_CHECK, 12, 148, 222, 14 - AUTOCHECKBOX "Mostrar o &status das teclas de aderência na tela", IDC_STICKY_STATUS_CHECK, + AUTOCHECKBOX "Mostrar no ecrã o &estado de ""Teclas de presas""", IDC_STICKY_STATUS_CHECK, 12, 160, 222, 14 DEFPUSHBUTTON "OK", IDOK, 135, 207, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 189, 207, 50, 14 @@ -132,26 +132,26 @@ END IDD_FILTERKEYSOPTIONS DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configurações das teclas de filtragem" +CAPTION "Definições para ""Teclas lentas""" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Atalho do teclado", -1, 6, 11, 234, 62 - LTEXT "O atalho para as teclas de filtragem é:\nmanter a tecla SHIFT direita pressionada por oito segundos.", + LTEXT "O atalho para ""Teclas lentas"" é:\nmanter a tecla SHIFT direita pressionada por oito segundos.", -1, 12, 20, 222, 29 - AUTOCHECKBOX "&Usar atalho", IDC_FILTER_ACTIVATE_CHECK, 12, 49, 126, 14 - GROUPBOX "Opções de filtragem", -1, 6, 79, 234, 79 - AUTORADIOBUTTON "&Ignorar pressionamentos de tecla repetidos", IDC_FILTER_BOUNCE_RADIO, + AUTOCHECKBOX "&Utilizar atalho", IDC_FILTER_ACTIVATE_CHECK, 12, 49, 126, 14 + GROUPBOX "Opções de filtro", -1, 6, 79, 234, 79 + AUTORADIOBUTTON "&Ignorar os batimentos de tecla repetidos", IDC_FILTER_BOUNCE_RADIO, 12, 91, 162, 11, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Ig&norar teclas pressionadas rapidamente e diminuir a taxa de repetição", IDC_FILTER_REPEAT_RADIO, 12, 106, 162, 20, BS_TOP | BS_MULTILINE - PUSHBUTTON "&Configurações", IDC_FILTER_BOUNCE_BUTTON, 168, 88, 66, 14, WS_GROUP - PUSHBUTTON "C&onfigurações", IDC_FILTER_REPEAT_BUTTON, 168, 106, 66, 14, WS_GROUP - LTEXT "C&lique e digite para testar a configuração das teclas de filtragem:", -1, 12, 129, 222, 11 + PUSHBUTTON "&Definições", IDC_FILTER_BOUNCE_BUTTON, 168, 88, 66, 14, WS_GROUP + PUSHBUTTON "De&finições", IDC_FILTER_REPEAT_BUTTON, 168, 106, 66, 14, WS_GROUP + LTEXT "C&lique e digite para testar as definições de ""Teclas lentas"":", -1, 12, 129, 222, 11 EDITTEXT IDC_FILTER_TEST_EDIT, 12, 138, 222, 14, WS_GROUP | ES_AUTOHSCROLL GROUPBOX "Notificação", -1, 6, 161, 234, 41 - AUTOCHECKBOX "&Emitir alarme sonoro para teclas pressionadas ou aceites", IDC_FILTER_SOUND_CHECK, + AUTOCHECKBOX "&Emitir alarme sonoro quando as teclas são premidas ou aceites", IDC_FILTER_SOUND_CHECK, 12, 169, 222, 10 - AUTOCHECKBOX "E&xibir o status da tecla de filtragem na tela", IDC_FILTER_STATUS_CHECK, + AUTOCHECKBOX "&Mostrar o estado de ""Teclas lentas"" no ecrã", IDC_FILTER_STATUS_CHECK, 12, 188, 222, 10 DEFPUSHBUTTON "OK", IDOK, 135, 207, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 189, 207, 50, 14 @@ -159,27 +159,27 @@ END IDD_TOGGLEKEYSOPTIONS DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configurações das teclas de alternância" +CAPTION "Definições para ""Teclas sonoras""" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Atalho do teclado", -1, 6, 11, 234, 62 - LTEXT "O atalho para as teclas de alternância é:\nmanter a tecla NUM LOCK pressionada por cinco segundos.", + LTEXT "O atalho para ""Teclas de sonoras"" é:\nManter a tecla NUM LOCK pressionada por cinco segundos.", -1, 12, 20, 222, 29 - AUTOCHECKBOX "&Usar atalho", IDC_TOGGLE_ACTIVATE_CHECK, 12, 49, 222, 14 + AUTOCHECKBOX "&Utilizar atalho", IDC_TOGGLE_ACTIVATE_CHECK, 12, 49, 222, 14 DEFPUSHBUTTON "OK", IDOK, 135, 207, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 189, 207, 50, 14 END IDD_CONTRASTOPTIONS DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configurações de alto contraste" +CAPTION "Definições para ""Alto contraste""" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Atalho do teclado", -1, 6, 11, 234, 62 - LTEXT "O atalho para o alto contraste é:\npressionar ALT esquerda + SHIFT esquerda + PRINT SCREEN.", + LTEXT "O atalho para ""Alto contraste"" é:\nPremir ALT esquerda + SHIFT esquerda + PRINT SCREEN.", -1, 12, 20, 222, 29 - AUTOCHECKBOX "&Usar atalho", IDC_CONTRAST_ACTIVATE_CHECK, 12, 49, 222, 14 - GROUPBOX "Esquema de aparência de alto contraste", -1, 6, 83, 234, 44 + AUTOCHECKBOX "&Utilizar atalho", IDC_CONTRAST_ACTIVATE_CHECK, 12, 49, 222, 14 + GROUPBOX "Esquema de visualização de alto contraste", -1, 6, 83, 234, 44 LTEXT "O e&squema actual de alto contraste é:", -1, 12, 94, 222, 11 COMBOBOX IDC_CONTRAST_COMBO, 12, 103, 222, 56, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP @@ -189,13 +189,13 @@ END IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configurações das teclas para mouse" +CAPTION "Definições para ""Rato por teclado""" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Atalho do teclado", -1, 6, 11, 234, 62 - LTEXT "O atalho para as teclas para mouse é:\npressionar ALT esquerda + SHIFT esquerda + NUM LOCK.", + LTEXT "O atalho para ""Rato por teclado"" é:\nPremir ALT esquerda + SHIFT esquerda + NUM LOCK.", -1, 12, 20, 222, 29 - AUTOCHECKBOX "&Usar atalho", IDC_MOUSEKEYS_ACTIVATE_CHECK, + AUTOCHECKBOX "&Utilizar atalho", IDC_MOUSEKEYS_ACTIVATE_CHECK, 12, 49, 222, 14 GROUPBOX "Velocidade do ponteiro", -1, 6, 83, 234, 83 LTEXT "Velocidade &máxima:", -1, 12, 94, 48, 20 @@ -208,12 +208,12 @@ BEGIN CONTROL "", IDC_MOUSEKEYS_ACCEL_TRACK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 121, 114, 20 LTEXT "Rápida", -1, 204, 123, 24, 11 - AUTOCHECKBOX "&Pressionar Ctrl p/ aumentar a velocidade e Shift p/ diminuí-la", IDC_MOUSEKEYS_SPEED_CHECK, + AUTOCHECKBOX "&Premir Ctrl para aumentar a velocidade e Shift para diminuír", IDC_MOUSEKEYS_SPEED_CHECK, 12, 142, 222, 14 - LTEXT "Usar as teclas para mouse quando Num Lock estiver:", -1, 6, 168, 120, 20 - AUTORADIOBUTTON "Ac&tivado", IDC_MOUSEKEYS_ON_RADIO, 126, 171, 48, 11 - AUTORADIOBUTTON "&Desactivado", IDC_MOUSEKEYS_OFF_RADIO, 180, 171, 48, 11 - AUTOCHECKBOX "M&ostrar o status das teclas para mouse na tela", IDC_MOUSEKEYS_STATUS_CHECK, + LTEXT "Utilizar ""Rato por teclado"" quando a tecla Num Lock estiver:", -1, 6, 168, 120, 20 + AUTORADIOBUTTON "Ac&tivada", IDC_MOUSEKEYS_ON_RADIO, 126, 171, 48, 11 + AUTORADIOBUTTON "&Desactivada", IDC_MOUSEKEYS_OFF_RADIO, 180, 171, 50, 11 + AUTOCHECKBOX "M&ostrar no ecrã o estado de ""Rato por teclado""", IDC_MOUSEKEYS_STATUS_CHECK, 6, 184, 222, 14 DEFPUSHBUTTON "OK", IDOK, 135, 207, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 189, 207, 50, 14 @@ -221,11 +221,11 @@ END IDD_BOUNCEKEYSOPTIONS DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configurações avançadas para teclas de filtragem" +CAPTION "Definições avançadas para ""Teclas lentas""" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Repetição de teclas", -1, 6, 11, 234, 47 - LTEXT "&Ignorar pressionamentos de tecla repetidos em um intervalo de tempo menor que:", -1, 12, 21, 222, 20 + LTEXT "&Ignorar batimentos de tecla repetidos num intervalo de tempo menor que:", -1, 12, 21, 222, 20 COMBOBOX IDC_BOUNCE_TIME_COMBO, 12, 40, 222, 56, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Á&rea de teste:", -1, 6, 68, 48, 11 @@ -236,14 +236,14 @@ END IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configurações avançadas de teclas de filtragem" +CAPTION "Definições avançadas para ""Teclas lentas""" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Teclas de repetição", -1, 6, 11, 234, 106 - LTEXT "Anular as configurações de teclado no 'Painel de controle':", + GROUPBOX "Velocidade de repetição", -1, 6, 11, 234, 106 + LTEXT "Substituir as definições no painel de controle ""Teclado"":", -1, 12, 20, 222, 20 - AUTORADIOBUTTON "&Nenhuma repetição de teclado", IDC_REPEAT_NOREPEAT_RADIO, 12, 32, 222, 11, WS_GROUP - AUTORADIOBUTTON "&Diminuir as taxas de repetição de teclado", IDC_REPEAT_REPEAT_RADIO, 12, 45, 222, 11 + AUTORADIOBUTTON "&Sem repetição de teclado", IDC_REPEAT_NOREPEAT_RADIO, 12, 32, 222, 11, WS_GROUP + AUTORADIOBUTTON "&Diminuir as taxas de repetição do teclado", IDC_REPEAT_REPEAT_RADIO, 12, 45, 222, 11 LTEXT "&Intervalo de repetição:", -1, 24, 60, 96, 11 COMBOBOX IDC_REPEAT_DELAY_COMBO, 24, 71, 210, 56, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP @@ -251,7 +251,7 @@ BEGIN COMBOBOX IDC_REPEAT_REPEAT_COMBO, 24, 100, 210, 65, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Teclas lentas", -1, 6, 124, 234, 42 - LTEXT "&As teclas têm que ser mantidas pressionadas por:", -1, 12, 133, 222, 11 + LTEXT "&As teclas premidas durante:", -1, 12, 133, 222, 11 COMBOBOX IDC_REPEAT_WAIT_COMBO, 12, 150, 222, 74, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Á&rea de teste:", -1, 6, 178, 48, 11 @@ -262,16 +262,16 @@ END IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configurações de dispositivos seriais" +CAPTION "Definições para ""Teclas série""" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Teclas seriais", -1, 6, 11, 234, 92 - LTEXT "Escolha a porta para a ligação de um dispositivo de entrada alternativo.", + GROUPBOX "Teclas série", -1, 6, 11, 234, 92 + LTEXT "Seleccione a porta para ligação de um dispositivo de entrada alternativo.", -1, 12, 20, 222, 20 - LTEXT "&Porta serial:", -1, 12, 34, 222, 20 + LTEXT "&Porta série:", -1, 12, 34, 222, 20 COMBOBOX IDC_SERIAL_PORT_COMBO, 12, 45, 222, 56, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "&Taxa de transm.:", -1, 12, 65, 222, 20 + LTEXT "&Velocidade de transmissão:", -1, 12, 65, 222, 20 COMBOBOX IDC_SERIAL_BAUD_COMBO, 12, 76, 222, 74, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 135, 207, 50, 14 @@ -281,10 +281,10 @@ END STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Acessibilidade" - IDS_CPLSYSTEMDESCRIPTION "Ajustar as configurações do computador para visão, audição e mobilidade." + IDS_CPLSYSTEMDESCRIPTION "Ajustar as definições do computador para visão, audição e mobilidade." IDS_SENTRY_NONE "[Nenhuma]" - IDS_SENTRY_TITLE "Piscar a barra de legenda ativa" - IDS_SENTRY_WINDOW "Piscar a janela ativa" + IDS_SENTRY_TITLE "Piscar a barra de legenda activa" + IDS_SENTRY_WINDOW "Piscar a janela activa" IDS_SENTRY_DISPLAY "Piscar a área de trabalho" IDS_SECONDS "Segundos" IDS_MINUTES "Minutos"

4 years, 7 months

[reactos] 01/01: [NTOS:INBV] Fix screen flash and more (#2821)

by Yaroslav Kibysh

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=319374eb719f675b91e83… commit 319374eb719f675b91e8380e836b31affb824e2b Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Thu May 21 01:23:17 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 21 00:23:17 2020 +0200 [NTOS:INBV] Fix screen flash and more (#2821) - Fix screen flash (CORE-16786); - Don't process rotating bar if not used. --- ntoskrnl/inbv/inbv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index 76af14c4bd7..8613f7a3b14 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -1279,12 +1279,12 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #endif #ifdef INBV_ROTBAR_IMPLEMENTED - if (Bar) + if ((TempRotBarSelection == RB_SQUARE_CELLS) && Bar) { /* Save previous screen pixels to buffer */ InbvScreenToBufferBlt(Buffer, 0, 0, 22, 9, 24); /* Draw the progress bar bit */ - InbvBitBlt(Bar, 0, 0); + BitBltPalette(Bar, TRUE, 0, 0); /* Store it in global buffer */ InbvScreenToBufferBlt(RotBarBuffer, 0, 0, 22, 9, 24); /* Restore screen pixels */

4 years, 7 months

[reactos] 01/01: [RAPPS] Rapps trivial fixes (#2819)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5336bd2af180c8414a74… commit e5336bd2af180c8414a7421aff0c2ebf5936bf16 Author: He Yang <1160386205(a)qq.com> AuthorDate: Thu May 21 06:21:26 2020 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 21 00:21:26 2020 +0200 [RAPPS] Rapps trivial fixes (#2819) - Specify W explicitly for URL_COMPONENTS; - Remove malloc/free for once used HostName in urlComponents; - Use PathAppendW to operate on path string. --- base/applications/rapps/loaddlg.cpp | 5 +---- base/applications/rapps/winmain.cpp | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index b394d0d572a..cc88af6cc16 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -563,7 +563,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) unsigned char lpBuffer[4096]; LPCWSTR lpszAgent = L"RApps/1.0"; - URL_COMPONENTS urlComponents; + URL_COMPONENTSW urlComponents; size_t urlLength, filenameLength; const ATL::CSimpleArray<DownloadInfo> &InfoArray = static_cast<DownloadParam*>(param)->AppInfo; @@ -698,8 +698,6 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) urlLength = InfoArray[iAppId].szUrl.GetLength(); urlComponents.dwSchemeLength = urlLength + 1; urlComponents.lpszScheme = (LPWSTR) malloc(urlComponents.dwSchemeLength * sizeof(WCHAR)); - urlComponents.dwHostNameLength = urlLength + 1; - urlComponents.lpszHostName = (LPWSTR) malloc(urlComponents.dwHostNameLength * sizeof(WCHAR)); if (!InternetCrackUrlW(InfoArray[iAppId].szUrl, urlLength + 1, ICU_DECODE | ICU_ESCAPE, &urlComponents)) { @@ -766,7 +764,6 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) } free(urlComponents.lpszScheme); - free(urlComponents.lpszHostName); #ifdef USE_CERT_PINNING // are we using HTTPS to download the RAPPS update package? check if the certificate is original diff --git a/base/applications/rapps/winmain.cpp b/base/applications/rapps/winmain.cpp index f4e4a4f4a07..1c351e864f8 100644 --- a/base/applications/rapps/winmain.cpp +++ b/base/applications/rapps/winmain.cpp @@ -63,7 +63,9 @@ VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo) szDownloadDir.ReleaseBuffer(); } - szDownloadDir += L"\\RAPPS Downloads"; + PathAppendW(szDownloadDir.GetBuffer(MAX_PATH), L"\\RAPPS Downloads"); + szDownloadDir.ReleaseBuffer(); + ATL::CStringW::CopyChars(pSettingsInfo->szDownloadDir, _countof(pSettingsInfo->szDownloadDir), szDownloadDir.GetString(),

4 years, 7 months

[reactos] 01/01: [SDK][FREETYPE] Fix GCC8.4 -O2 build

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5349f49cfec9065d804d2… commit 5349f49cfec9065d804d2f8be31bda1eb337ad5b Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Thu May 21 01:07:26 2020 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Thu May 21 01:07:26 2020 +0300 [SDK][FREETYPE] Fix GCC8.4 -O2 build --- sdk/lib/3rdparty/freetype/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk/lib/3rdparty/freetype/CMakeLists.txt b/sdk/lib/3rdparty/freetype/CMakeLists.txt index f14ed5c47f5..d2d87133831 100644 --- a/sdk/lib/3rdparty/freetype/CMakeLists.txt +++ b/sdk/lib/3rdparty/freetype/CMakeLists.txt @@ -60,6 +60,8 @@ list(APPEND SOURCE add_library(freetype ${SOURCE}) -if(USE_CLANG_CL) - target_compile_options(freetype PRIVATE "-Wno-tautological-constant-compare") +if(GCC) + target_compile_options(freetype PRIVATE -fno-builtin-malloc) +elseif(CLANG) + target_compile_options(freetype PRIVATE -Wno-tautological-constant-compare) endif()

4 years, 7 months

← Newer
1
2
3
4
5
6
7
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2020