Ros-diffs March 2018

ros-diffs@reactos.org

25 participants
436 discussions

01/01: [TRANSLATION][MPLAY32] Italian update translation (#448)
by Bișoc George 25 Mar '18

25 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c9cda4cb3741e967ad4f6… commit c9cda4cb3741e967ad4f6de4448ed89b3ef2d277 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Mar 25 17:33:07 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 25 17:33:07 2018 +0200 [TRANSLATION][MPLAY32] Italian update translation (#448) --- base/applications/mplay32/lang/it-IT.rc | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/base/applications/mplay32/lang/it-IT.rc b/base/applications/mplay32/lang/it-IT.rc index 77930e8a2c..93cf153857 100644 --- a/base/applications/mplay32/lang/it-IT.rc +++ b/base/applications/mplay32/lang/it-IT.rc @@ -11,21 +11,21 @@ BEGIN END POPUP "&Play" BEGIN - MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "Play/&Pausa\tCtrl+P", IDC_PLAY MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR - MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + MENUITEM "Ripet&i\tCtrl+T", IDM_REPEAT END - POPUP "&View" + POPUP "&Visualizza" BEGIN - MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW + MENUITEM "&Modalità Finestra-Singola", IDM_SWITCHVIEW END - POPUP "&Device" + POPUP "&Dispositivo" BEGIN MENUITEM SEPARATOR - MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM "&Proprietà", IDM_DEVPROPS MENUITEM SEPARATOR - MENUITEM "&Volume Control", IDM_VOLUMECTL + MENUITEM "&Controllo Volume", IDM_VOLUMECTL END POPUP "&Aiuto" BEGIN @@ -44,14 +44,14 @@ END STRINGTABLE BEGIN - IDS_MODE_UNKNOWN "Unknown" - IDS_MODE_OPEN "Opened" - IDS_MODE_STOP "Stopped" - IDS_MODE_PLAY "Playing" - IDS_MODE_PAUSE "Paused" - IDS_MODE_RECORD "Recording" - IDS_MODE_SEEK "Seeking" - IDS_MODE_NOT_READY "Not ready" + IDS_MODE_UNKNOWN "Sconosciuto" + IDS_MODE_OPEN "Aperto" + IDS_MODE_STOP "Fermato" + IDS_MODE_PLAY "Riprendendo" + IDS_MODE_PAUSE "In Pausa" + IDS_MODE_RECORD "Registrazione" + IDS_MODE_SEEK "Cerca" + IDS_MODE_NOT_READY "Non pronto" IDS_ALL_TYPES_FILTER "Tutti i tipi supportati" IDS_TOOLTIP_PLAY "Riproduci" IDS_TOOLTIP_STOP "Interrompi" @@ -60,8 +60,8 @@ BEGIN IDS_TOOLTIP_SEEKBACK "Riavvolgimento rapido" IDS_TOOLTIP_SEEKFORW "Avanzamento rapido" IDS_TOOLTIP_FORWARD "Successivo" - IDS_TOOLTIP_PAUSE "Pause" + IDS_TOOLTIP_PAUSE "Pausa" IDS_APPTITLE "Riproduttore multimediale ReactOS" IDS_PLAY "Riproduci" - IDS_DEFAULTMCIERRMSG "No description is available for this error." + IDS_DEFAULTMCIERRMSG "Nessuna descrizione è disponibile per questo tipo di errore." END

1 0

01/01: [devmgr] Partially implement additional buttons on driver page Based on a patch by Jared Smudde. - Add more space between controls - Add german translation - Disable unsupported buttons CORE-10373
by Eric Kohl 25 Mar '18

25 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c177f3debd08049bdccd7… commit c177f3debd08049bdccd790dadd8ca5ad8d09778 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 25 16:20:22 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 25 16:21:45 2018 +0200 [devmgr] Partially implement additional buttons on driver page Based on a patch by Jared Smudde. - Add more space between controls - Add german translation - Disable unsupported buttons CORE-10373 --- dll/win32/devmgr/lang/bg-BG.rc | 12 ++++++++---- dll/win32/devmgr/lang/cs-CZ.rc | 8 ++++++-- dll/win32/devmgr/lang/de-DE.rc | 8 ++++++-- dll/win32/devmgr/lang/el-GR.rc | 8 ++++++-- dll/win32/devmgr/lang/en-US.rc | 8 ++++++-- dll/win32/devmgr/lang/es-ES.rc | 10 +++++++--- dll/win32/devmgr/lang/et-EE.rc | 8 ++++++-- dll/win32/devmgr/lang/fr-FR.rc | 8 ++++++-- dll/win32/devmgr/lang/he-IL.rc | 8 ++++++-- dll/win32/devmgr/lang/hu-HU.rc | 8 ++++++-- dll/win32/devmgr/lang/id-ID.rc | 8 ++++++-- dll/win32/devmgr/lang/it-IT.rc | 8 ++++++-- dll/win32/devmgr/lang/ja-JP.rc | 8 ++++++-- dll/win32/devmgr/lang/no-NO.rc | 8 ++++++-- dll/win32/devmgr/lang/pl-PL.rc | 10 +++++++--- dll/win32/devmgr/lang/pt-BR.rc | 8 ++++++-- dll/win32/devmgr/lang/ro-RO.rc | 8 ++++++-- dll/win32/devmgr/lang/ru-RU.rc | 8 ++++++-- dll/win32/devmgr/lang/sk-SK.rc | 8 ++++++-- dll/win32/devmgr/lang/sq-AL.rc | 10 +++++++--- dll/win32/devmgr/lang/tr-TR.rc | 8 ++++++-- dll/win32/devmgr/lang/uk-UA.rc | 32 ++++++++++++++++++-------------- dll/win32/devmgr/lang/zh-CN.rc | 8 ++++++-- dll/win32/devmgr/lang/zh-TW.rc | 8 ++++++-- dll/win32/devmgr/properties/advprop.cpp | 10 ++++++++++ dll/win32/devmgr/resource.h | 2 ++ 26 files changed, 173 insertions(+), 65 deletions(-) diff --git a/dll/win32/devmgr/lang/bg-BG.rc b/dll/win32/devmgr/lang/bg-BG.rc index b2a049a1fb..7cfd3b1006 100644 --- a/dll/win32/devmgr/lang/bg-BG.rc +++ b/dll/win32/devmgr/lang/bg-BG.rc @@ -174,10 +174,14 @@ BEGIN EDITTEXT IDC_DRVVERSION, 105, 67, 140, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Подписал цифрово:", -1, 37, 81, 70, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 105, 81, 140, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "Подробности за водача...", IDC_DRIVERDETAILS, 7, 106, 95, 15 - LTEXT "Показване на подробности за файловете на водача.", -1, 105, 110, 141, 17, SS_NOPREFIX - PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 95, 15 - LTEXT "Update the device driver.", -1, 105, 130, 141, 17, SS_NOPREFIX + PUSHBUTTON "Подробности за водача...", IDC_DRIVERDETAILS, 7, 106, 90, 15 + LTEXT "Показване на подробности за файловете на водача.", -1, 106, 105, 132, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 134, 90, 15 + LTEXT "Update the device driver.", -1, 106, 138, 132, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 90, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 106, 162, 132, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 90, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 106, 194, 132, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/cs-CZ.rc b/dll/win32/devmgr/lang/cs-CZ.rc index 3a48a45be4..106c3c65e7 100644 --- a/dll/win32/devmgr/lang/cs-CZ.rc +++ b/dll/win32/devmgr/lang/cs-CZ.rc @@ -180,8 +180,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Detaily ovladače...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "Zobrazí detaily souborů ovladače.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Aktualizovat ovladač...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Aktualizuje ovladač zařízení.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Aktualizovat ovladač...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Aktualizuje ovladač zařízení.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/de-DE.rc b/dll/win32/devmgr/lang/de-DE.rc index 92edef1f77..926fe545c6 100644 --- a/dll/win32/devmgr/lang/de-DE.rc +++ b/dll/win32/devmgr/lang/de-DE.rc @@ -177,8 +177,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Treiberdetails...", IDC_DRIVERDETAILS, 7, 106, 80, 15 LTEXT "Einzelheiten über die Treiberdateien anzeigen.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "Treiber &aktualisieren...", IDC_UPDATEDRIVER, 7, 126, 80, 15 - LTEXT "Aktualisiert den Gerätetreiber.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "Treiber &aktualisieren...", IDC_UPDATEDRIVER, 7, 134, 80, 15 + LTEXT "Aktualisiert den Gerätetreiber.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Installierter Treiber", IDC_ROLLBACKDRIVER, 7, 162, 80, 15 + LTEXT "Den installierten Treiber verwenden, falls das Gerät nach der Aktualisierung nicht ordnungsgemäß funktioniert.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Deinstallieren", IDC_UNINSTALLDRIVER, 7, 190, 80, 15 + LTEXT "Treiber deinstallieren. (Erweitert)", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/el-GR.rc b/dll/win32/devmgr/lang/el-GR.rc index a34d6e6ed4..8cd7a35283 100644 --- a/dll/win32/devmgr/lang/el-GR.rc +++ b/dll/win32/devmgr/lang/el-GR.rc @@ -177,8 +177,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Λεπτομέρειες οδηγού...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "To view details about the driver files.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Update the device driver.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/en-US.rc b/dll/win32/devmgr/lang/en-US.rc index 171323e705..4acc22822d 100644 --- a/dll/win32/devmgr/lang/en-US.rc +++ b/dll/win32/devmgr/lang/en-US.rc @@ -175,8 +175,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Driver Details...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "To view details about the driver files.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Update the device driver.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/es-ES.rc b/dll/win32/devmgr/lang/es-ES.rc index c510d8214b..0e4c2bede4 100644 --- a/dll/win32/devmgr/lang/es-ES.rc +++ b/dll/win32/devmgr/lang/es-ES.rc @@ -176,9 +176,13 @@ BEGIN LTEXT "Firmante digital:", -1, 15, 81, 80, 8, SS_NOPREFIX | SS_RIGHT EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Detalles del controlador...", IDC_DRIVERDETAILS, 7, 106, 90, 15 - LTEXT "Ver detalles de los archivos del controlador.", -1, 102, 110, 150, 17, SS_NOPREFIX - PUSHBUTTON "&Actualizar controlador...", IDC_UPDATEDRIVER, 7, 126, 90, 15 - LTEXT "Actualizar el controlador del dispositivo.", -1, 102, 130, 150, 17, SS_NOPREFIX + LTEXT "Ver detalles de los archivos del controlador.", -1, 106, 105, 132, 17, SS_NOPREFIX + PUSHBUTTON "&Actualizar controlador...", IDC_UPDATEDRIVER, 7, 134, 90, 15 + LTEXT "Actualizar el controlador del dispositivo.", -1, 106, 138, 132, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 90, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 106, 162, 132, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 90, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 106, 194, 132, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/et-EE.rc b/dll/win32/devmgr/lang/et-EE.rc index feeecfcd62..9b4246aee3 100644 --- a/dll/win32/devmgr/lang/et-EE.rc +++ b/dll/win32/devmgr/lang/et-EE.rc @@ -182,8 +182,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Draiveri üksikasjad", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "Draiverifailide üksikasjade vaatamiseks.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "Draiveri &värksendamine...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Selle seadme draiveritarkvara värskendamiseks.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "Draiveri &värksendamine...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Selle seadme draiveritarkvara värskendamiseks.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/fr-FR.rc b/dll/win32/devmgr/lang/fr-FR.rc index 54b7d7af65..342b24af01 100644 --- a/dll/win32/devmgr/lang/fr-FR.rc +++ b/dll/win32/devmgr/lang/fr-FR.rc @@ -176,8 +176,12 @@ BEGIN 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 LTEXT "Voir les détails à propos des fichiers du Pilote.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Update the device driver.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/he-IL.rc b/dll/win32/devmgr/lang/he-IL.rc index a53f7c68d8..e7a805fff5 100644 --- a/dll/win32/devmgr/lang/he-IL.rc +++ b/dll/win32/devmgr/lang/he-IL.rc @@ -177,8 +177,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "פרטי מנהל ההתקן...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "לשם הצגת פרטים אודות קבצי מנהל ההתקן.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Update the device driver.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/hu-HU.rc b/dll/win32/devmgr/lang/hu-HU.rc index 0d9a37e1bb..74416ea02d 100644 --- a/dll/win32/devmgr/lang/hu-HU.rc +++ b/dll/win32/devmgr/lang/hu-HU.rc @@ -176,8 +176,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Driver Details...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "To view details about the driver files.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Update the device driver.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/id-ID.rc b/dll/win32/devmgr/lang/id-ID.rc index c919a146ec..04d82264ac 100644 --- a/dll/win32/devmgr/lang/id-ID.rc +++ b/dll/win32/devmgr/lang/id-ID.rc @@ -177,8 +177,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "Rincian &Driver...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "Untuk melihat rincian tetang file driver.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Update the device driver.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/it-IT.rc b/dll/win32/devmgr/lang/it-IT.rc index c32c67744d..e722a0a910 100644 --- a/dll/win32/devmgr/lang/it-IT.rc +++ b/dll/win32/devmgr/lang/it-IT.rc @@ -177,8 +177,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "Dettagli del &Driver...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "Per vedere i dettagli sui file del driver.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Aggiorna il Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Aggiorna il Driver.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Aggiorna il Driver...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Aggiorna il Driver.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/ja-JP.rc b/dll/win32/devmgr/lang/ja-JP.rc index 3e1bae25ae..ee286dcda2 100644 --- a/dll/win32/devmgr/lang/ja-JP.rc +++ b/dll/win32/devmgr/lang/ja-JP.rc @@ -175,8 +175,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "ドライバの詳細(&D)...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "ドライバファイルの詳細を表示します。", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "ドライバの更新(&U)...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "デバイスドライバを更新します。", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "ドライバの更新(&U)...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "デバイスドライバを更新します。", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/no-NO.rc b/dll/win32/devmgr/lang/no-NO.rc index be0749be08..244fccbe4f 100644 --- a/dll/win32/devmgr/lang/no-NO.rc +++ b/dll/win32/devmgr/lang/no-NO.rc @@ -177,8 +177,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Driver detaljer...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "For å vise detaljer om driver filene.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Update the device driver.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/pl-PL.rc b/dll/win32/devmgr/lang/pl-PL.rc index d355cf8ccf..9e350b1089 100644 --- a/dll/win32/devmgr/lang/pl-PL.rc +++ b/dll/win32/devmgr/lang/pl-PL.rc @@ -184,9 +184,13 @@ BEGIN LTEXT "Podpis cyfrowy:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Szczegóły sterownika...", IDC_DRIVERDETAILS, 7, 106, 90, 15 - LTEXT "Wyświetla informacje szczegółowe.", -1, 106, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "Akt&ualizuj sterownik...", IDC_UPDATEDRIVER, 7, 126, 90, 15 - LTEXT "Aktualizuje oprogramowanie sterownika.", -1, 106, 130, 154, 17, SS_NOPREFIX + LTEXT "Wyświetla informacje szczegółowe.", -1, 106, 110, 132, 17, SS_NOPREFIX + PUSHBUTTON "Akt&ualizuj sterownik...", IDC_UPDATEDRIVER, 7, 134, 90, 15 + LTEXT "Aktualizuje oprogramowanie sterownika.", -1, 106, 138, 132, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 90, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 106, 162, 132, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 90, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 106, 194, 132, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/pt-BR.rc b/dll/win32/devmgr/lang/pt-BR.rc index fbd84c73ef..b9003ba929 100644 --- a/dll/win32/devmgr/lang/pt-BR.rc +++ b/dll/win32/devmgr/lang/pt-BR.rc @@ -177,8 +177,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Detalhes do driver...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "Exibir detalhes sobre os arquivos de driver.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Update the device driver.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/ro-RO.rc b/dll/win32/devmgr/lang/ro-RO.rc index 226c694163..9e96ae687a 100644 --- a/dll/win32/devmgr/lang/ro-RO.rc +++ b/dll/win32/devmgr/lang/ro-RO.rc @@ -180,8 +180,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Detalii…", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "Mai multe detalii despre modulele-pilot.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Actualizare…", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Actualizați modulul-pilot pentru dispozitiv.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Actualizare…", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Actualizați modulul-pilot pentru dispozitiv.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/ru-RU.rc b/dll/win32/devmgr/lang/ru-RU.rc index 2bfb3e9ae7..d00633c678 100644 --- a/dll/win32/devmgr/lang/ru-RU.rc +++ b/dll/win32/devmgr/lang/ru-RU.rc @@ -177,8 +177,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Сведения...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "Просмотр сведений о файлах драйверов.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Обновить...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Обновление драйверов для устройства.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Обновить...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Обновление драйверов для устройства.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/sk-SK.rc b/dll/win32/devmgr/lang/sk-SK.rc index 0e4e26826a..3cb51f24d3 100644 --- a/dll/win32/devmgr/lang/sk-SK.rc +++ b/dll/win32/devmgr/lang/sk-SK.rc @@ -180,8 +180,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Driver Details...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "To view details about the driver files.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Update the device driver.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/sq-AL.rc b/dll/win32/devmgr/lang/sq-AL.rc index 59b53b953f..a97e335b7b 100644 --- a/dll/win32/devmgr/lang/sq-AL.rc +++ b/dll/win32/devmgr/lang/sq-AL.rc @@ -178,9 +178,13 @@ BEGIN LTEXT "Firmë Digjitale:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Detajet komanduesit...", IDC_DRIVERDETAILS, 7, 106, 75, 15 - LTEXT "Për të parë detaje në lidhje me dokumentin e komanduesit.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Azhorno Komanduesin...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Azhorno Komanduesin e Pajisje.", -1, 91, 130, 154, 17, SS_NOPREFIX + LTEXT "Për të parë detaje në lidhje me dokumentin e komanduesit.", -1, 91, 105, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Azhorno Komanduesin...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Azhorno Komanduesin e Pajisje.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/tr-TR.rc b/dll/win32/devmgr/lang/tr-TR.rc index c70368165f..26faf2e8d1 100644 --- a/dll/win32/devmgr/lang/tr-TR.rc +++ b/dll/win32/devmgr/lang/tr-TR.rc @@ -177,8 +177,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Sürücü Ayrıntıları...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "Sürücü kütükleri üzerine ayrıntıları görmek için.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "S&ürücüyü Şimdikileştir...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Aygıt sürücüsünü şimdikileştir.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "S&ürücüyü Şimdikileştir...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Aygıt sürücüsünü şimdikileştir.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/uk-UA.rc b/dll/win32/devmgr/lang/uk-UA.rc index 2a97d4d469..d08b504caf 100644 --- a/dll/win32/devmgr/lang/uk-UA.rc +++ b/dll/win32/devmgr/lang/uk-UA.rc @@ -153,16 +153,16 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "Тип пристрою:", -1, 37, 39, 60, 8, SS_NOPREFIX + LTEXT "Тип пристрою:", -1, 37, 39, 60, 8, SS_NOPREFIX EDITTEXT IDC_DEVTYPE, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Виробник:", -1, 37, 53, 60, 8, SS_NOPREFIX + LTEXT "Виробник:", -1, 37, 53, 60, 8, SS_NOPREFIX EDITTEXT IDC_DEVMANUFACTURER, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Розміщення:", -1, 37, 67, 60, 8, SS_NOPREFIX + LTEXT "Розміщення:", -1, 37, 67, 60, 8, SS_NOPREFIX EDITTEXT IDC_DEVLOCATION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - GROUPBOX "Стан пристрою", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 + GROUPBOX "Стан пристрою", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL - PUSHBUTTON "&Усунення несправностей...", IDC_DEVPROBLEM, 146, 163, 94, 15 - LTEXT "&Використання пристрою:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED + PUSHBUTTON "&Усунення несправностей...", IDC_DEVPROBLEM, 146, 163, 94, 15 + LTEXT "&Використання пристрою:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED END @@ -173,18 +173,22 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "Постачальник драйвера:", -1, 4, 39, 85, 8, SS_NOPREFIX + LTEXT "Постачальник драйвера:", -1, 4, 39, 85, 8, SS_NOPREFIX EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Дата драйвера:", -1, 4, 53, 60, 8, SS_NOPREFIX + LTEXT "Дата драйвера:", -1, 4, 53, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Версія драйвера:", -1, 4, 67, 60, 8, SS_NOPREFIX + LTEXT "Версія драйвера:", -1, 4, 67, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Цифровий підпис:", -1, 4, 81, 65, 8, SS_NOPREFIX + LTEXT "Цифровий підпис:", -1, 4, 81, 65, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Відомості...", IDC_DRIVERDETAILS, 7, 106, 75, 15 - LTEXT "Перегляд відомостей про файли драйвера.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Відомості...", IDC_DRIVERDETAILS, 7, 106, 75, 15 + LTEXT "Перегляд відомостей про файли драйвера.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "Update the device driver.", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/zh-CN.rc b/dll/win32/devmgr/lang/zh-CN.rc index 2a64a9b12d..9af8f4addc 100644 --- a/dll/win32/devmgr/lang/zh-CN.rc +++ b/dll/win32/devmgr/lang/zh-CN.rc @@ -177,8 +177,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "驱动程序详细信息...(&D)", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "要查看有关驱动程序文件的详细信息。", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "更新驱动程序...(&U)", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "更新设备驱动程序。", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "更新驱动程序...(&U)", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "更新设备驱动程序。", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/lang/zh-TW.rc b/dll/win32/devmgr/lang/zh-TW.rc index f289b4d0a8..add5f5f6da 100644 --- a/dll/win32/devmgr/lang/zh-TW.rc +++ b/dll/win32/devmgr/lang/zh-TW.rc @@ -177,8 +177,12 @@ BEGIN EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "驅動程式詳細資訊...(&D)", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "要檢視有關驅動程式檔案的詳細資訊。", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "更新驅動程式...(&U)", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "更新裝置驅動程式。", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "更新驅動程式...(&U)", IDC_UPDATEDRIVER, 7, 134, 75, 15 + LTEXT "更新裝置驅動程式。", -1, 91, 138, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 + LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX + PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 + LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 diff --git a/dll/win32/devmgr/properties/advprop.cpp b/dll/win32/devmgr/properties/advprop.cpp index 993dd6b9bc..29a3579bcb 100644 --- a/dll/win32/devmgr/properties/advprop.cpp +++ b/dll/win32/devmgr/properties/advprop.cpp @@ -590,6 +590,14 @@ AdvProcDriverDlgProc(IN HWND hwndDlg, case IDC_UPDATEDRIVER: UpdateDriver(hwndDlg, dap); break; + + case IDC_ROLLBACKDRIVER: + // FIXME + break; + + case IDC_UNINSTALLDRIVER: + // FIXME + break; } break; } @@ -615,6 +623,8 @@ AdvProcDriverDlgProc(IN HWND hwndDlg, UpdateDriverDlg(hwndDlg, dap); } + EnableWindow(GetDlgItem(hwndDlg, IDC_ROLLBACKDRIVER), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UNINSTALLDRIVER), FALSE); Ret = TRUE; break; } diff --git a/dll/win32/devmgr/resource.h b/dll/win32/devmgr/resource.h index 1cd09d6d8f..70894a2d0b 100644 --- a/dll/win32/devmgr/resource.h +++ b/dll/win32/devmgr/resource.h @@ -247,3 +247,5 @@ #define IDC_DETAILSPROPVALUE 0x597 #define IDC_UPDATEDRIVER 0x598 #define IDC_DRIVERRESOURCES 0x599 +#define IDC_ROLLBACKDRIVER 0x600 +#define IDC_UNINSTALLDRIVER 0x601

1 0

01/01: [MVDM] Update some of the file headers to their new versions.
by Hermès Bélusca-Maïto 25 Mar '18

25 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19b18ce238f8a9f4d4c99… commit 19b18ce238f8a9f4d4c9951007a3a0e5ba850c5a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 25 16:19:29 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 25 16:19:29 2018 +0200 [MVDM] Update some of the file headers to their new versions. --- subsystems/mvdm/dos/asmxtras.inc | 9 ++++----- subsystems/mvdm/dos/command.S | 14 ++++---------- subsystems/mvdm/samples/testvdd/testvdd.c | 9 ++++----- subsystems/mvdm/samples/testvdd/testvdd.rc | 6 +++--- subsystems/mvdm/wow16/user/user.c | 9 ++++----- 5 files changed, 19 insertions(+), 28 deletions(-) diff --git a/subsystems/mvdm/dos/asmxtras.inc b/subsystems/mvdm/dos/asmxtras.inc index fe7812ea1a..e9b97e9e07 100644 --- a/subsystems/mvdm/dos/asmxtras.inc +++ b/subsystems/mvdm/dos/asmxtras.inc @@ -1,9 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Kernel - * FILE: asmxtras.inc - * PURPOSE: Extended ASM macros for GAS and MASM/ML64 - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROJECT: ReactOS Virtual DOS Machine + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Extended ASM macros for GAS and MASM/ML64 + * COPYRIGHT: Copyright 2015-2018 Hermes Belusca-Maito * * NOTE: This file is an extension to our well-known asm.inc that defines * a set of macros allowing us to assemble specially-crafted ASM files diff --git a/subsystems/mvdm/dos/command.S b/subsystems/mvdm/dos/command.S index 2aa6b530df..b85c15260a 100644 --- a/subsystems/mvdm/dos/command.S +++ b/subsystems/mvdm/dos/command.S @@ -1,16 +1,10 @@ /* - * COPYRIGHT: GPL - See COPYING in the top level directory - * PROJECT: ReactOS Virtual DOS Machine - * FILE: command.S - * PURPOSE: DOS32 command.com for NTVDM - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROJECT: ReactOS Virtual DOS Machine + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: DOS32 command.com for NTVDM + * COPYRIGHT: Copyright 2015-2018 Hermes Belusca-Maito */ -// -// See http://www.ganino.com/games/scripts/dos-6.0%20source%20code%3F/dev/smartdrv… -// and https://books.google.fr/books?id=rtmJgtfaxz8C&pg=PA256&lpg=PA256&dq=int+21+… -// - /* INCLUDES *******************************************************************/ #include <asm.inc> diff --git a/subsystems/mvdm/samples/testvdd/testvdd.c b/subsystems/mvdm/samples/testvdd/testvdd.c index 8fecf3f7fe..533b33febd 100644 --- a/subsystems/mvdm/samples/testvdd/testvdd.c +++ b/subsystems/mvdm/samples/testvdd/testvdd.c @@ -1,9 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Virtual DOS Machine - * FILE: subsystems/mvdm/samples/testvdd/testvdd.c - * PURPOSE: Testing VDD for NTVDM - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROJECT: ReactOS Virtual DOS Machine + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Testing VDD for NTVDM + * COPYRIGHT: Copyright 2015-2018 Hermes Belusca-Maito */ /* INCLUDES *******************************************************************/ diff --git a/subsystems/mvdm/samples/testvdd/testvdd.rc b/subsystems/mvdm/samples/testvdd/testvdd.rc index e42d7afabf..ba01a6bbf7 100644 --- a/subsystems/mvdm/samples/testvdd/testvdd.rc +++ b/subsystems/mvdm/samples/testvdd/testvdd.rc @@ -1,6 +1,6 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "NTVDM Testing VDD" -#define REACTOS_STR_INTERNAL_NAME "testvdd" -#define REACTOS_STR_ORIGINAL_FILENAME "testvdd.dll" +#define REACTOS_STR_FILE_DESCRIPTION "NTVDM Testing VDD" +#define REACTOS_STR_INTERNAL_NAME "testvdd" +#define REACTOS_STR_ORIGINAL_FILENAME "testvdd.dll" #include <reactos/version.rc> diff --git a/subsystems/mvdm/wow16/user/user.c b/subsystems/mvdm/wow16/user/user.c index cb3890267e..ccd40c4a76 100644 --- a/subsystems/mvdm/wow16/user/user.c +++ b/subsystems/mvdm/wow16/user/user.c @@ -1,9 +1,8 @@ /* - * COPYRIGHT: GPL - See COPYING in the top level directory - * PROJECT: ReactOS-on-ReactOS-16bit (aka. RoR16 or WoW16) - * FILE: subsystems/mvdm/wow16/user.c - * PURPOSE: 16-bit USER stub module - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROJECT: ReactOS-on-ReactOS-16bit (aka. RoR16 or WoW16) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: 16-bit USER stub module + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito */ /* INCLUDES *******************************************************************/

1 0

01/01: [SNDVOL32] Create small speaker icons from the default sndvol32 icon
by Eric Kohl 25 Mar '18

25 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29955aa2315f11f13b86c… commit 29955aa2315f11f13b86c9d5a067e6b24dfc5151 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 25 14:46:44 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 25 14:50:02 2018 +0200 [SNDVOL32] Create small speaker icons from the default sndvol32 icon --- base/applications/sndvol32/resources.h | 4 +++- base/applications/sndvol32/resources/speaker_left.ico | Bin 0 -> 2862 bytes base/applications/sndvol32/resources/speaker_right.ico | Bin 0 -> 2862 bytes base/applications/sndvol32/sndvol32.rc | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/base/applications/sndvol32/resources.h b/base/applications/sndvol32/resources.h index eb4ef5fa2c..92d3dada2e 100644 --- a/base/applications/sndvol32/resources.h +++ b/base/applications/sndvol32/resources.h @@ -2,7 +2,9 @@ #define IDM_MAINMENU 101 -#define IDI_MAINAPP 304 +#define IDI_MAINAPP 301 +#define IDI_SPEAKER_LEFT 302 +#define IDI_SPEAKER_RIGHT 303 #define IDC_PROPERTIES 1001 #define IDC_ADVANCED_CONTROLS 1002 diff --git a/base/applications/sndvol32/resources/speaker_left.ico b/base/applications/sndvol32/resources/speaker_left.ico new file mode 100644 index 0000000000..a06c49c49e Binary files /dev/null and b/base/applications/sndvol32/resources/speaker_left.ico differ diff --git a/base/applications/sndvol32/resources/speaker_right.ico b/base/applications/sndvol32/resources/speaker_right.ico new file mode 100644 index 0000000000..5708797183 Binary files /dev/null and b/base/applications/sndvol32/resources/speaker_right.ico differ diff --git a/base/applications/sndvol32/sndvol32.rc b/base/applications/sndvol32/sndvol32.rc index 9545cdde30..08b208b711 100644 --- a/base/applications/sndvol32/sndvol32.rc +++ b/base/applications/sndvol32/sndvol32.rc @@ -14,6 +14,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_MAINAPP ICON "resources/sndvol32.ico" +IDI_SPEAKER_LEFT ICON "resources/speaker_left.ico" +IDI_SPEAKER_RIGHT ICON "resources/speaker_right.ico" /* UTF-8 */ #pragma code_page(65001)

1 0

01/01: [EXTRAC32] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi 25 Mar '18

25 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ac662291e648703c9604… commit 8ac662291e648703c960448098187d327a4776d3 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 25 12:58:56 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 25 12:58:56 2018 +0100 [EXTRAC32] Sync with Wine Staging 3.3. CORE-14434 --- base/applications/extrac32/extrac32.c | 6 +++--- media/doc/README.WINE | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/applications/extrac32/extrac32.c b/base/applications/extrac32/extrac32.c index 15d2603789..63205e8176 100644 --- a/base/applications/extrac32/extrac32.c +++ b/base/applications/extrac32/extrac32.c @@ -19,14 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <shellapi.h> #include <setupapi.h> #include <shlwapi.h> #include <shlobj.h> -#include <wine/unicode.h> -#include <wine/debug.h> + +#include "wine/unicode.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(extrac32); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 879cb70a37..c0ddf543e1 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -234,7 +234,7 @@ reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3 reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources. -reactos/base/applications/extrac32 # Synced to WineStaging-2.9 +reactos/base/applications/extrac32 # Synced to WineStaging-3.3 reactos/base/applications/iexplore # Synced to WineStaging-2.9 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync

1 0

01/01: [XCOPY_WINETEST] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi 25 Mar '18

25 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e0ce10ccb82a9f182bb9… commit 9e0ce10ccb82a9f182bb9cea87452720f3a4202b Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 25 12:57:16 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 25 12:57:16 2018 +0100 [XCOPY_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/xcopy/xcopy.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/rostests/winetests/xcopy/xcopy.c b/modules/rostests/winetests/xcopy/xcopy.c index 2bb8cbb43d..ec7683aecc 100644 --- a/modules/rostests/winetests/xcopy/xcopy.c +++ b/modules/rostests/winetests/xcopy/xcopy.c @@ -16,7 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/test.h> +#include <windows.h> + +#include "wine/test.h" + static DWORD runcmd(const char* cmd) {

1 0

01/01: [XCOPY] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi 25 Mar '18

25 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9be4c1ba359115e131c50… commit 9be4c1ba359115e131c50eb06d856e7bc60e42ee Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 25 12:56:35 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 25 12:56:35 2018 +0100 [XCOPY] Sync with Wine Staging 3.3. CORE-14434 --- base/applications/cmdutils/xcopy/xcopy.c | 11 +++-------- media/doc/README.WINE | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/base/applications/cmdutils/xcopy/xcopy.c b/base/applications/cmdutils/xcopy/xcopy.c index cda6e4eb63..a173cc14c7 100644 --- a/base/applications/cmdutils/xcopy/xcopy.c +++ b/base/applications/cmdutils/xcopy/xcopy.c @@ -39,17 +39,12 @@ * 5 - Disk write error */ + #include <stdio.h> #include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <winnls.h> -#include <wincon.h> +#include <windows.h> #include <wine/debug.h> -//#include <wine/unicode.h> - +#include <wine/unicode.h> #include "xcopy.h" WINE_DEFAULT_DEBUG_CHANNEL(xcopy); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 55be6ebd18..879cb70a37 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -232,7 +232,7 @@ reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.3 -reactos/base/applications/cmdutils/xcopy # Synced to Wine-3.0 +reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3 reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources. reactos/base/applications/extrac32 # Synced to WineStaging-2.9 reactos/base/applications/iexplore # Synced to WineStaging-2.9

1 0

01/01: [WMIC] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi 25 Mar '18

25 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94b1980b6bb2882b2e0b4… commit 94b1980b6bb2882b2e0b43aa251edb4b85526b70 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 25 12:55:09 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 25 12:55:09 2018 +0100 [WMIC] Sync with Wine Staging 3.3. CORE-14434 --- base/applications/cmdutils/wmic/main.c | 16 ++++++++-------- media/doc/README.WINE | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/base/applications/cmdutils/wmic/main.c b/base/applications/cmdutils/wmic/main.c index ad7c8d9be5..ddd2aecd53 100644 --- a/base/applications/cmdutils/wmic/main.c +++ b/base/applications/cmdutils/wmic/main.c @@ -19,16 +19,16 @@ #define COBJMACROS -//#include <stdio.h> -//#include "windows.h" -//#include "ocidl.h" -#include <initguid.h> -//#include "objidl.h" -#include <wbemcli.h> +#include <stdio.h> +#include "windows.h" +#include "ocidl.h" +#include "initguid.h" +#include "objidl.h" +#include "wbemcli.h" #include "wmic.h" -#include <wine/debug.h> -#include <wine/unicode.h> +#include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wmic); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 0c88f5acc9..55be6ebd18 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -230,7 +230,7 @@ reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.3 -reactos/base/applications/cmdutils/wmic # Synced to WineStaging-2.9 +reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/xcopy # Synced to Wine-3.0 reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources.

1 0

01/01: [TASKKILL] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi 25 Mar '18

25 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8d963ab0d16b41298bae… commit a8d963ab0d16b41298bae1c966f7417bb6375527 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 25 12:54:34 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 25 12:54:34 2018 +0100 [TASKKILL] Sync with Wine Staging 3.3. CORE-14434 --- base/applications/cmdutils/taskkill/taskkill.c | 7 ++----- media/doc/README.WINE | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/base/applications/cmdutils/taskkill/taskkill.c b/base/applications/cmdutils/taskkill/taskkill.c index db3fab414e..6e4e1eb55a 100644 --- a/base/applications/cmdutils/taskkill/taskkill.c +++ b/base/applications/cmdutils/taskkill/taskkill.c @@ -19,11 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <wincon.h> -#include <winuser.h> +#include <stdlib.h> +#include <windows.h> #include <psapi.h> #include <wine/debug.h> #include <wine/unicode.h> diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 9088798b72..0c88f5acc9 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -229,7 +229,7 @@ ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 -reactos/base/applications/cmdutils/taskkill # Synced to Wine-3.0 +reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-2.9 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/xcopy # Synced to Wine-3.0

1 0

01/01: [SCHTASKS] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi 25 Mar '18

25 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ce8df2ba66f1c6c5b1a9… commit 4ce8df2ba66f1c6c5b1a9ca22bc4297badc7025f Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 25 12:53:36 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 25 12:53:36 2018 +0100 [SCHTASKS] Sync with Wine Staging 3.3. CORE-14434 --- base/applications/cmdutils/schtasks/CMakeLists.txt | 2 +- base/applications/cmdutils/schtasks/schtasks.c | 349 ++++++++++++++++++++- media/doc/README.WINE | 2 +- 3 files changed, 346 insertions(+), 7 deletions(-) diff --git a/base/applications/cmdutils/schtasks/CMakeLists.txt b/base/applications/cmdutils/schtasks/CMakeLists.txt index bf79e4c6e9..6b0abd5811 100644 --- a/base/applications/cmdutils/schtasks/CMakeLists.txt +++ b/base/applications/cmdutils/schtasks/CMakeLists.txt @@ -2,5 +2,5 @@ add_executable(schtasks schtasks.c) target_link_libraries(schtasks wine) set_module_type(schtasks win32cui UNICODE) -add_importlibs(schtasks msvcrt kernel32 ntdll) +add_importlibs(schtasks oleaut32 ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET schtasks DESTINATION reactos/system32 FOR all) diff --git a/base/applications/cmdutils/schtasks/schtasks.c b/base/applications/cmdutils/schtasks/schtasks.c index a3af3463ef..2ac7544cd0 100644 --- a/base/applications/cmdutils/schtasks/schtasks.c +++ b/base/applications/cmdutils/schtasks/schtasks.c @@ -16,18 +16,357 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "initguid.h" +#include "taskschd.h" + #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(schtasks); +static const WCHAR change_optW[] = {'/','c','h','a','n','g','e',0}; +static const WCHAR create_optW[] = {'/','c','r','e','a','t','e',0}; +static const WCHAR delete_optW[] = {'/','d','e','l','e','t','e',0}; +static const WCHAR enable_optW[] = {'/','e','n','a','b','l','e',0}; +static const WCHAR f_optW[] = {'/','f',0}; +static const WCHAR ru_optW[] = {'/','r','u',0}; +static const WCHAR tn_optW[] = {'/','t','n',0}; +static const WCHAR tr_optW[] = {'/','t','r',0}; +static const WCHAR xml_optW[] = {'/','x','m','l',0}; + +static ITaskFolder *get_tasks_root_folder(void) +{ + ITaskService *service; + ITaskFolder *root; + VARIANT empty; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskService, (void**)&service); + if (FAILED(hres)) + return NULL; + + V_VT(&empty) = VT_EMPTY; + hres = ITaskService_Connect(service, empty, empty, empty, empty); + if (FAILED(hres)) { + FIXME("Connect failed: %08x\n", hres); + return NULL; + } + + hres = ITaskService_GetFolder(service, NULL, &root); + ITaskService_Release(service); + if (FAILED(hres)) { + FIXME("GetFolder failed: %08x\n", hres); + return NULL; + } + + return root; +} + +static IRegisteredTask *get_registered_task(const WCHAR *name) +{ + IRegisteredTask *registered_task; + ITaskFolder *root; + BSTR str; + HRESULT hres; + + root = get_tasks_root_folder(); + if (!root) + return NULL; + + str = SysAllocString(name); + hres = ITaskFolder_GetTask(root, str, &registered_task); + SysFreeString(str); + ITaskFolder_Release(root); + if (FAILED(hres)) { + FIXME("GetTask failed: %08x\n", hres); + return NULL; + } + + return registered_task; +} + +static BSTR read_file_to_bstr(const WCHAR *file_name) +{ + LARGE_INTEGER file_size; + DWORD read_size, size; + unsigned char *data; + HANDLE file; + BOOL r = FALSE; + BSTR ret; + + file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) { + FIXME("Could not open file\n"); + return NULL; + } + + if (!GetFileSizeEx(file, &file_size) || !file_size.QuadPart) { + FIXME("Empty file\n"); + CloseHandle(file); + return NULL; + } + + data = HeapAlloc(GetProcessHeap(), 0, file_size.QuadPart); + if (data) + r = ReadFile(file, data, file_size.QuadPart, &read_size, NULL); + CloseHandle(file); + if (!r) { + FIXME("Read filed\n"); + HeapFree(GetProcessHeap(), 0, data); + return NULL; + } + + if (read_size > 2 && data[0] == 0xff && data[1] == 0xfe) { /* UTF-16 BOM */ + ret = SysAllocStringLen((const WCHAR *)(data + 2), (read_size - 2) / sizeof(WCHAR)); + }else { + size = MultiByteToWideChar(CP_ACP, 0, (const char *)data, read_size, NULL, 0); + ret = SysAllocStringLen(NULL, size); + if (ret) + MultiByteToWideChar(CP_ACP, 0, (const char *)data, read_size, ret, size); + } + HeapFree(GetProcessHeap(), 0, data); + + return ret; +} + +static int change_command(int argc, WCHAR *argv[]) +{ + BOOL have_option = FALSE, enable = FALSE; + const WCHAR *task_name = NULL; + IRegisteredTask *task; + HRESULT hres; + + while (argc) { + if(!strcmpiW(argv[0], tn_optW)) { + if (argc < 2) { + FIXME("Missing /tn value\n"); + return 1; + } + + if (task_name) { + FIXME("Duplicated /tn argument\n"); + return 1; + } + + task_name = argv[1]; + argc -= 2; + argv += 2; + }else if (!strcmpiW(argv[0], enable_optW)) { + enable = TRUE; + have_option = TRUE; + argc--; + argv++; + }else if (!strcmpiW(argv[0], tr_optW)) { + if (argc < 2) { + FIXME("Missing /tr value\n"); + return 1; + } + + FIXME("Unsupported /tr option %s\n", debugstr_w(argv[1])); + have_option = TRUE; + argc -= 2; + argv += 2; + }else { + FIXME("Unsupported arguments %s\n", debugstr_w(argv[0])); + return 1; + } + } + + if (!task_name) { + FIXME("Missing /tn option\n"); + return 1; + } + + if (!have_option) { + FIXME("Missing change options\n"); + return 1; + } + + task = get_registered_task(task_name); + if (!task) + return 1; + + if (enable) { + hres = IRegisteredTask_put_Enabled(task, VARIANT_TRUE); + if (FAILED(hres)) { + IRegisteredTask_Release(task); + FIXME("put_Enabled failed: %08x\n", hres); + return 1; + } + } + + IRegisteredTask_Release(task); + return 0; +} + +static int create_command(int argc, WCHAR *argv[]) +{ + const WCHAR *task_name = NULL, *xml_file = NULL; + ITaskFolder *root = NULL; + LONG flags = TASK_CREATE; + IRegisteredTask *task; + VARIANT empty; + BSTR str, xml; + HRESULT hres; + + while (argc) { + if (!strcmpiW(argv[0], xml_optW)) { + if (argc < 2) { + FIXME("Missing /xml value\n"); + return 1; + } + + if (xml_file) { + FIXME("Duplicated /xml argument\n"); + return 1; + } + + xml_file = argv[1]; + argc -= 2; + argv += 2; + }else if(!strcmpiW(argv[0], tn_optW)) { + if (argc < 2) { + FIXME("Missing /tn value\n"); + return 1; + } + + if (task_name) { + FIXME("Duplicated /tn argument\n"); + return 1; + } + + task_name = argv[1]; + argc -= 2; + argv += 2; + }else if(!strcmpiW(argv[0], f_optW)) { + flags = TASK_CREATE_OR_UPDATE; + argc--; + argv++; + }else if (!strcmpiW(argv[0], ru_optW)) { + if (argc < 2) { + FIXME("Missing /ru value\n"); + return 1; + } + + FIXME("Unsupported /ru option %s\n", debugstr_w(argv[1])); + argc -= 2; + argv += 2; + }else { + FIXME("Unsupported argument %s\n", debugstr_w(argv[0])); + return 1; + } + } + + if (!task_name) { + FIXME("Missing /tn argument\n"); + return 1; + } + + if (!xml_file) { + FIXME("Missing /xml argument\n"); + return E_FAIL; + } + + xml = read_file_to_bstr(xml_file); + if (!xml) + return 1; + + root = get_tasks_root_folder(); + if (!root) { + SysFreeString(xml); + return 1; + } + + V_VT(&empty) = VT_EMPTY; + str = SysAllocString(task_name); + hres = ITaskFolder_RegisterTask(root, str, xml, flags, empty, empty, + TASK_LOGON_NONE, empty, &task); + SysFreeString(str); + SysFreeString(xml); + ITaskFolder_Release(root); + if (FAILED(hres)) + return 1; + + IRegisteredTask_Release(task); + return 0; +} + +static int delete_command(int argc, WCHAR *argv[]) +{ + const WCHAR *task_name = NULL; + ITaskFolder *root = NULL; + BSTR str; + HRESULT hres; + + while (argc) { + if (!strcmpiW(argv[0], f_optW)) { + TRACE("force opt\n"); + argc--; + argv++; + }else if(!strcmpiW(argv[0], tn_optW)) { + if (argc < 2) { + FIXME("Missing /tn value\n"); + return 1; + } + + if (task_name) { + FIXME("Duplicated /tn argument\n"); + return 1; + } + + task_name = argv[1]; + argc -= 2; + argv += 2; + }else { + FIXME("Unsupported argument %s\n", debugstr_w(argv[0])); + return 1; + } + } + + if (!task_name) { + FIXME("Missing /tn argument\n"); + return 1; + } + + root = get_tasks_root_folder(); + if (!root) + return 1; + + str = SysAllocString(task_name); + hres = ITaskFolder_DeleteTask(root, str, 0); + SysFreeString(str); + ITaskFolder_Release(root); + if (FAILED(hres)) + return 1; + + return 0; +} + int wmain(int argc, WCHAR *argv[]) { - int i; + int i, ret = 0; - WINE_FIXME("stub:"); for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + TRACE(" %s", wine_dbgstr_w(argv[i])); + TRACE("\n"); - return 0; + CoInitialize(NULL); + + if (argc < 2) + FIXME("Print current tasks state\n"); + else if (!strcmpiW(argv[1], change_optW)) + ret = change_command(argc - 2, argv + 2); + else if (!strcmpiW(argv[1], create_optW)) + ret = create_command(argc - 2, argv + 2); + else if (!strcmpiW(argv[1], delete_optW)) + ret = delete_command(argc - 2, argv + 2); + else + FIXME("Unsupported command %s\n", debugstr_w(argv[1])); + + CoUninitialize(); + return ret; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index b032812382..9088798b72 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -228,7 +228,7 @@ ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.3 -reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-2.9 +reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/taskkill # Synced to Wine-3.0 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-2.9 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.3

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
44
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2018