Ros-diffs December 2018

ros-diffs@reactos.org

26 participants
322 discussions

[reactos] 01/02: Revert "[CMAKE] Use configured include files to define the __RELFILE__ hack (#979)"
by Timo Kreuzer 11 Dec '18

11 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05169a498755234738811… commit 05169a49875523473881171b37425f97e45a9f0c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Dec 9 14:23:55 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Dec 11 21:50:58 2018 +0100 Revert "[CMAKE] Use configured include files to define the __RELFILE__ hack (#979)" This reverts commit 07bd6089ec96b068d92f42e764cc7336a7de24a0. --- CMakeLists.txt | 3 +++ sdk/include/reactos/builddir.h.cmake | 7 ------- sdk/include/reactos/debug.h | 7 +------ sdk/include/reactos/version.cmake | 1 - sdk/include/reactos/wine/debug.h | 7 +------ 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f79577f65d..d2e8b861ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,6 +57,9 @@ endif() include(sdk/cmake/compilerflags.cmake) add_definitions(-D__REACTOS__) +add_definitions(-DREACTOS_SOURCE_DIR="\\"${REACTOS_SOURCE_DIR}\\"") +add_definitions(-DREACTOS_BINARY_DIR="\\"${REACTOS_BINARY_DIR}\\"") +add_compile_flags(-D__RELFILE__="&__FILE__[sizeof REACTOS_SOURCE_DIR]") if(MSVC_IDE) add_compile_flags("/MP") diff --git a/sdk/include/reactos/builddir.h.cmake b/sdk/include/reactos/builddir.h.cmake deleted file mode 100644 index 8bd5b44ac5..0000000000 --- a/sdk/include/reactos/builddir.h.cmake +++ /dev/null @@ -1,7 +0,0 @@ -/* Do not edit - Machine generated */ -#pragma once - -#define REACTOS_SOURCE_DIR "@REACTOS_SOURCE_DIR@" -#define REACTOS_BINARY_DIR "@REACTOS_BINARY_DIR@" - -/* EOF */ diff --git a/sdk/include/reactos/debug.h b/sdk/include/reactos/debug.h index f56090b65c..ab332fda18 100644 --- a/sdk/include/reactos/debug.h +++ b/sdk/include/reactos/debug.h @@ -15,12 +15,7 @@ #pragma once #ifndef __RELFILE__ -# ifdef __REACTOS__ -# include <reactos/builddir.h> -# define __RELFILE__ &__FILE__[sizeof(REACTOS_SOURCE_DIR)] -# else -# define __RELFILE__ __FILE__ -# endif +#define __RELFILE__ __FILE__ #endif /* Define DbgPrint/DbgPrintEx/RtlAssert unless the NDK is used */ diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index 6f9cec7167..c1c22ee913 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -53,4 +53,3 @@ endif() configure_file(sdk/include/reactos/version.h.cmake ${REACTOS_BINARY_DIR}/sdk/include/reactos/version.h) configure_file(sdk/include/reactos/buildno.h.cmake ${REACTOS_BINARY_DIR}/sdk/include/reactos/buildno.h) -configure_file(sdk/include/reactos/builddir.h.cmake ${REACTOS_BINARY_DIR}/sdk/include/reactos/builddir.h) diff --git a/sdk/include/reactos/wine/debug.h b/sdk/include/reactos/wine/debug.h index 23f402a13f..35aefc9852 100644 --- a/sdk/include/reactos/wine/debug.h +++ b/sdk/include/reactos/wine/debug.h @@ -28,12 +28,7 @@ #endif #ifndef __RELFILE__ -# ifdef __REACTOS__ -# include <reactos/builddir.h> -# define __RELFILE__ &__FILE__[sizeof(REACTOS_SOURCE_DIR)] -# else -# define __RELFILE__ __FILE__ -# endif +#define __RELFILE__ __FILE__ #endif #ifdef __WINE_WINE_TEST_H

1 0

[reactos] 01/01: [VCDCONTROLTOOL] Add French translation
by Pierre Schweitzer 11 Dec '18

11 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93164cf87312741276ae6… commit 93164cf87312741276ae6052eae47094ba07f3a7 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Dec 11 19:59:07 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Dec 11 20:13:52 2018 +0100 [VCDCONTROLTOOL] Add French translation --- .../applications/vcdcontroltool/lang/fr-FR.rc | 62 ++++++++++++++++++++++ .../applications/vcdcontroltool/vcdcontroltool.rc | 3 ++ 2 files changed, 65 insertions(+) diff --git a/modules/rosapps/applications/vcdcontroltool/lang/fr-FR.rc b/modules/rosapps/applications/vcdcontroltool/lang/fr-FR.rc new file mode 100644 index 0000000000..3db5862c5e --- /dev/null +++ b/modules/rosapps/applications/vcdcontroltool/lang/fr-FR.rc @@ -0,0 +1,62 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_MAINWINDOW DIALOGEX 0, 0, 320, 200 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Panneau de contrôle des CD-ROM virtuels" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDC_MAINOK, 211, 179, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_MAINDEVICES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 7, 7, 306, 83 + GROUPBOX "Géométrie du lecteur", IDC_STATIC, 7, 101, 153, 74, BS_GROUPBOX | WS_CHILD | WS_VISIBLE + LTEXT "Nombre de secteurs", IDC_STATIC, 15, 115, 65, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Taille de secteur", IDC_STATIC, 15, 127, 61, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Clusters libres", IDC_STATIC, 15, 139, 49, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Total de clusters", IDC_STATIC, 15, 151, 57, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_MAINSECTORS, 88, 115, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_MAINSIZE, 88, 127, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_MAINFREE, 88, 139, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_MAINTOTAL, 88, 151, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Ajouter lecteur", IDC_MAINADD, 183, 123, 52, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Supprimer lecteur", IDC_MAINREMOVE, 242, 123, 48, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Monter", IDC_MAINMOUNT, 183, 142, 52, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Ejecter", IDC_MAINEJECT, 183, 161, 109, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Remonter", IDC_MAINREMOUNT, 242, 142, 48, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Contrôle pilote ...", IDC_MAINCONTROL, 183, 105, 109, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_MOUNTWINDOW DIALOG 0, 0, 187, 97 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Options spécifiques de montage" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDC_MOUNTOK, 130, 59, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Annuler", IDC_MOUNTCANCEL, 130, 76, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT IDC_MOUNTIMAGE, 7, 17, 173, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + LTEXT "Image à monter", IDC_STATIC, 7, 7, 173, 10, SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE | WS_GROUP + AUTOCHECKBOX "Supprimer l'UDF", IDC_MOUNTUDF, 7, 40, 114, 10, BS_FLAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "Supprimer le Joliet", IDC_MOUNTJOLIET, 7, 56, 111, 9, BS_FLAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "Montage permanant", IDC_MOUNTPERSIST, 7, 71, 111, 9, BS_FLAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_DRIVERWINDOW DIALOG 0, 0, 189, 123 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Contrôle du pilote de CD-DROM virtuel" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDC_DRIVEROK, 43, 98, 103, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Installer pilote ...", IDC_DRIVERINSTALL, 40, 61, 51, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Démarrer", IDC_DRIVERSTART, 40, 79, 51, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Arrêter", IDC_DRIVERSTOP, 96, 79, 53, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Supprimer pilote", IDC_DRIVERREMOVE, 96, 61, 53, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT IDC_DRIVERINFO, 7, 7, 175, 50, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_DRIVE "Lecteur" + IDS_MAPPEDIMAGE "Image montée" + IDS_NOMOUNTED "Aucune image montée. Dernière image montée - %s" + IDS_NONE "Aucune" + IDS_FILTER "Toutes les images supportées (*.udf; *.cdfs; *.jo; *.iso; *.rock)\0*.udf;*.cdfs;*.jo;*.iso;*.rock\0" +END diff --git a/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.rc b/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.rc index d52dea4f02..4edbf8ce8f 100644 --- a/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.rc +++ b/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.rc @@ -19,3 +19,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif

1 0

[reactos] 01/01: [TRANSLATION][SHELL32] Grammar fix: content -> contents (#1115)
by Auron Hines 11 Dec '18

11 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86c5cfd81ac6861049778… commit 86c5cfd81ac6861049778ba69351043b21ce6010 Author: Auron Hines <auronhines(a)gmail.com> AuthorDate: Tue Dec 11 13:43:46 2018 -0500 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 11 19:43:46 2018 +0100 [TRANSLATION][SHELL32] Grammar fix: content -> contents (#1115) --- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/en-GB.rc | 2 +- dll/win32/shell32/lang/en-US.rc | 2 +- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 2 +- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/pt-BR.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- dll/win32/shell32/lang/zh-TW.rc | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 70c550ec67..f0375cd17f 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -777,7 +777,7 @@ BEGIN IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Recycle Bin?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Recycle Bin?" + IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its contents to the Recycle Bin?" IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 4aaf1f3997..ee6538710c 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -783,7 +783,7 @@ BEGIN IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Recycle Bin?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Recycle Bin?" + IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its contents to the Recycle Bin?" IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "Overskriv fil %1?" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 7580deaa7a..f12cdaa689 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -777,7 +777,7 @@ BEGIN IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Recycle Bin?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Recycle Bin?" + IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its contents to the Recycle Bin?" IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 0af93f1f2c..30d6c5d304 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -778,7 +778,7 @@ BEGIN IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Recycle Bin?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Recycle Bin?" + IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its contents to the Recycle Bin?" IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index c26f324d1c..6f85dcf18a 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -777,7 +777,7 @@ BEGIN IDS_DELETEMULTIPLE_TEXT "Haluatko varmasti tuhota nämä %1?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Recycle Bin?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Recycle Bin?" + IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its contents to the Recycle Bin?" IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 8904340619..1093822d0c 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -777,7 +777,7 @@ BEGIN IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Recycle Bin?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Recycle Bin?" + IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its contents to the Recycle Bin?" IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 41f67c32a7..b9e37cfd33 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -777,7 +777,7 @@ BEGIN IDS_DELETEMULTIPLE_TEXT "Biztosan törölni szeretnéd ezt a(z) %1 elemet?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Recycle Bin?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Recycle Bin?" + IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its contents to the Recycle Bin?" IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index fa24d55a30..40992f1bd4 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -777,7 +777,7 @@ BEGIN IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Recycle Bin?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Recycle Bin?" + IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its contents to the Recycle Bin?" IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 387541fa42..79f22f32d4 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -777,7 +777,7 @@ BEGIN IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Recycle Bin?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Recycle Bin?" + IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its contents to the Recycle Bin?" IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index fd9d8bfa82..05119f8585 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -777,7 +777,7 @@ BEGIN IDS_DELETEMULTIPLE_TEXT "Você tem certeza que deseja excluir estes %1 arquivos?" IDS_DELETESELECTED_TEXT "Você tem certeza que deseja excluir o(s) arquivo(s) selecionado(s)?" IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Recycle Bin?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Recycle Bin?" + IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its contents to the Recycle Bin?" IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 0d9f4c8f43..ad457edbb2 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -777,7 +777,7 @@ BEGIN IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Recycle Bin?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Recycle Bin?" + IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its contents to the Recycle Bin?" IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index bdb8fe1e20..5fcd310f27 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -785,7 +785,7 @@ BEGIN IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Recycle Bin?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Recycle Bin?" + IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its contents to the Recycle Bin?" IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?"

1 0

[reactos] 01/01: [VCDCLI] Implement support for persistent mounts
by Pierre Schweitzer 11 Dec '18

11 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8e4096eb74e18be5c1b2… commit e8e4096eb74e18be5c1b22211c35a9bd41b1b8f4 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Dec 11 15:24:38 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Dec 11 15:24:38 2018 +0100 [VCDCLI] Implement support for persistent mounts --- .../rosapps/applications/cmdutils/vcdcli/vcdcli.c | 39 +++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.c b/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.c index c3bcf0cc56..db13566cb3 100644 --- a/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.c +++ b/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.c @@ -10,6 +10,7 @@ #include <windef.h> #include <winbase.h> #include <winsvc.h> +#include <winreg.h> #include <ndk/rtltypes.h> #include <ndk/rtlfuncs.h> #include <tchar.h> @@ -37,11 +38,12 @@ PrintUsage(int type) else if (type == 1) { _ftprintf(stdout, _T("mount usage:\n")); - _ftprintf(stdout, _T("\tmount <drive letter> <path.iso> [/u] [/j]\n")); + _ftprintf(stdout, _T("\tmount <drive letter> <path.iso> [/u] [/j] [/p]\n")); _ftprintf(stdout, _T("\tMount the ISO image given in <path.iso> on the previously created virtual drive <drive letter>\n")); _ftprintf(stdout, _T("\t\tDo not use colon for drive letter\n")); _ftprintf(stdout, _T("\t\tUse /u to make UDF volumes not appear as such\n")); _ftprintf(stdout, _T("\t\tUse /j to make Joliet volumes not appear as such\n")); + _ftprintf(stdout, _T("\t\tUse /p to make the mounting persistent\n")); } else if (type == 2) { @@ -334,8 +336,11 @@ _tmain(int argc, const TCHAR *argv[]) else if (_tcscmp(argv[1], _T("mount")) == 0) { DWORD i; + HKEY hKey; HANDLE hFile; WCHAR Letter; + BOOLEAN bPersist; + TCHAR szBuffer[260]; UNICODE_STRING NtPathName; MOUNT_PARAMETERS MountParams; @@ -383,6 +388,7 @@ _tmain(int argc, const TCHAR *argv[]) MountParams.Flags = 0; /* Do we have to suppress anything? */ + bPersist = FALSE; for (i = 4; i < argc; ++i) { /* Make UDF uneffective */ @@ -395,6 +401,11 @@ _tmain(int argc, const TCHAR *argv[]) { MountParams.Flags |= MOUNT_FLAG_SUPP_JOLIET; } + /* Should it be persistent? */ + else if (_tcscmp(argv[i], _T("/p")) == 0) + { + bPersist = TRUE; + } } /* No longer needed */ @@ -425,6 +436,32 @@ _tmain(int argc, const TCHAR *argv[]) _ftprintf(stdout, _T("%s mounted on %c\n"), argv[3], Letter); CloseHandle(hDev); + + /* Should it persistent? */ + if (bPersist) + { + /* Create the registry key Device<Letter> */ + _stprintf(szBuffer, _T("SYSTEM\\CurrentControlSet\\Services\\Vcdrom\\Parameters\\Device%c"), Letter); + if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, szBuffer, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY | KEY_SET_VALUE, NULL, &hKey, NULL) == ERROR_SUCCESS) + { + /* Set the image path */ + _tcsncpy(szBuffer, MountParams.Path, MountParams.Length); + szBuffer[MountParams.Length / sizeof(TCHAR)] = 0; + RegSetValueExW(hKey, _T("IMAGE"), 0, REG_SZ, (BYTE *)szBuffer, MountParams.Length); + + /* Set the drive letter */ + szBuffer[0] = Letter; + szBuffer[1] = _T(':'); + szBuffer[2] = 0; + RegSetValueExW(hKey, _T("DRIVE"), 0, REG_SZ, (BYTE *)szBuffer, 3 * sizeof(TCHAR)); + + RegCloseKey(hKey); + } + else + { + _ftprintf(stderr, _T("Failed to make mounting persistent: %x\n"), GetLastError()); + } + } } else if (_tcscmp(argv[1], _T("remount")) == 0) {

1 0

[reactos] 04/04: [VCDCONTROLTOOL] Enable driver start/stop buttons depending on the service status
by Pierre Schweitzer 11 Dec '18

11 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=044a7022c513019571be1… commit 044a7022c513019571be161df99763cc4ad7f697 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Dec 11 15:03:09 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Dec 11 15:04:25 2018 +0100 [VCDCONTROLTOOL] Enable driver start/stop buttons depending on the service status --- .../applications/vcdcontroltool/vcdcontroltool.c | 37 +++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.c b/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.c index 542bb1dcbb..b2245c6cde 100644 --- a/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.c +++ b/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.c @@ -182,6 +182,20 @@ RefreshDevicesList(WCHAR Letter) } } +VOID +SetServiceState(BOOLEAN Started) +{ + HWND hControl; + + /* If started, disable start button */ + hControl = GetDlgItem(hDriverWnd, IDC_DRIVERSTART); + EnableWindow(hControl, !Started); + + /* If started, enable stop button */ + hControl = GetDlgItem(hDriverWnd, IDC_DRIVERSTOP); + EnableWindow(hControl, Started); +} + INT_PTR QueryDriverInfo(HWND hDlg) { @@ -190,6 +204,7 @@ QueryDriverInfo(HWND hDlg) LPQUERY_SERVICE_CONFIGW pConfig; WCHAR szText[2 * MAX_PATH]; HWND hControl; + SERVICE_STATUS Status; hDriverWnd = hDlg; @@ -198,7 +213,7 @@ QueryDriverInfo(HWND hDlg) if (hMgr != NULL) { /* Open our service */ - hSvc = OpenService(hMgr, L"Vcdrom", SERVICE_QUERY_CONFIG); + hSvc = OpenService(hMgr, L"Vcdrom", SERVICE_QUERY_CONFIG | SERVICE_QUERY_STATUS); if (hSvc != NULL) { /* Probe its config size */ @@ -219,6 +234,20 @@ QueryDriverInfo(HWND hDlg) HeapFree(GetProcessHeap(), 0, pConfig); } + /* Get its status */ + if (QueryServiceStatus(hSvc, &Status)) + { + if (Status.dwCurrentState != SERVICE_RUNNING && + Status.dwCurrentState != SERVICE_START_PENDING) + { + SetServiceState(FALSE); + } + else + { + SetServiceState(TRUE); + } + } + CloseServiceHandle(hSvc); } @@ -261,6 +290,9 @@ StartDriver(VOID) /* Refresh the list in case there were persistent mounts */ RefreshDevicesList(0); + + /* Update buttons */ + SetServiceState(TRUE); } CloseServiceHandle(hMgr); @@ -290,6 +322,9 @@ StopDriver(VOID) /* Refresh the list to clear it */ RefreshDevicesList(0); + + /* Update buttons */ + SetServiceState(FALSE); } CloseServiceHandle(hMgr);

1 0

[reactos] 03/04: [VCDCONTROLTOOL] Implement support for persistent mounts
by Pierre Schweitzer 11 Dec '18

11 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b518fc065d5e236bd73ee… commit b518fc065d5e236bd73ee51a48e8e12eaa7140e4 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Dec 11 14:55:09 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Dec 11 15:04:25 2018 +0100 [VCDCONTROLTOOL] Implement support for persistent mounts --- .../applications/vcdcontroltool/vcdcontroltool.c | 35 +++++++++++++++++----- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.c b/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.c index bd7ca6cf70..542bb1dcbb 100644 --- a/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.c +++ b/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.c @@ -14,6 +14,7 @@ #include <winuser.h> #include <wingdi.h> #include <winsvc.h> +#include <winreg.h> #include <commctrl.h> #include <commdlg.h> #include <wchar.h> @@ -371,12 +372,6 @@ SetMountFileName(HWND hDlg, hEditText = GetDlgItem(hMountWnd, IDC_MOUNTIMAGE); SendMessage(hEditText, WM_SETTEXT, 0, lParam); - /* FIXME: we don't support persistent mounts yet*/ - { - hEditText = GetDlgItem(hMountWnd, IDC_MOUNTPERSIST); - EnableWindow(hEditText, FALSE); - } - /* Show our window */ ShowWindow(hDlg, SW_SHOW); @@ -400,6 +395,9 @@ PerformMount(VOID) UNICODE_STRING NtPathName; HANDLE hLet; DWORD BytesRead; + BOOLEAN bPersist, Res; + WCHAR szKeyName[256]; + HKEY hKey; /* Zero our input structure */ ZeroMemory(&MountParams, sizeof(MOUNT_PARAMETERS)); @@ -418,6 +416,10 @@ PerformMount(VOID) MountParams.Flags |= MOUNT_FLAG_SUPP_JOLIET; } + /* Should the mount be persistent? */ + hControl = GetDlgItem(hMountWnd, IDC_MOUNTPERSIST); + bPersist = (SendMessage(hControl, BM_GETCHECK, 0, 0) == BST_CHECKED); + /* Get the file name */ hControl = GetDlgItem(hMountWnd, IDC_MOUNTIMAGE); GetWindowText(hControl, szFileName, sizeof(szFileName) / sizeof(WCHAR)); @@ -435,12 +437,31 @@ PerformMount(VOID) if (hLet != INVALID_HANDLE_VALUE) { /* And issue the mount IOCTL */ - DeviceIoControl(hLet, IOCTL_VCDROM_MOUNT_IMAGE, &MountParams, sizeof(MountParams), NULL, 0, &BytesRead, NULL); + Res = DeviceIoControl(hLet, IOCTL_VCDROM_MOUNT_IMAGE, &MountParams, sizeof(MountParams), NULL, 0, &BytesRead, NULL); CloseHandle(hLet); /* Refresh the list so that our mount appears */ RefreshDevicesList(0); + + /* If mount succeed and has to persistent, write it to registry */ + if (Res && bPersist) + { + wsprintf(szKeyName, L"SYSTEM\\CurrentControlSet\\Services\\Vcdrom\\Parameters\\Device%c", wMountLetter); + if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, szKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY | KEY_SET_VALUE, NULL, &hKey, NULL) == ERROR_SUCCESS) + { + wcsncpy(szKeyName, MountParams.Path, MountParams.Length); + szKeyName[MountParams.Length / sizeof(WCHAR)] = 0; + RegSetValueExW(hKey, L"IMAGE", 0, REG_SZ, (BYTE *)szKeyName, MountParams.Length); + + szKeyName[0] = wMountLetter; + szKeyName[1] = L':'; + szKeyName[2] = 0; + RegSetValueExW(hKey, L"DRIVE", 0, REG_SZ, (BYTE *)szKeyName, 3 * sizeof(WCHAR)); + + RegCloseKey(hKey); + } + } } }

1 0

[reactos] 02/04: [VCDCONTROLTOOL] Add a GUI app to manage virtual CD-ROM devices
by Pierre Schweitzer 11 Dec '18

11 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10ce523a2c81e7f648627… commit 10ce523a2c81e7f648627b3ccbda6f678b12ad66 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Dec 11 14:24:49 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Dec 11 15:04:10 2018 +0100 [VCDCONTROLTOOL] Add a GUI app to manage virtual CD-ROM devices This is just an open sourced version of the tool provided by MS along with the driver. It will avoid users fighting with the CLI tool (that was doing the job though ;-)). Looks like that: https://twitter.com/HeisSpiter/status/1072482763348107264 Nota 1: it doesn't have an icon Nota 2: code may be ugly, I'm not a umode guy! ;-) --- modules/rosapps/applications/CMakeLists.txt | 1 + .../applications/vcdcontroltool/CMakeLists.txt | 9 + .../applications/vcdcontroltool/lang/en-US.rc | 62 ++ .../rosapps/applications/vcdcontroltool/resource.h | 37 + .../applications/vcdcontroltool/vcdcontroltool.c | 920 +++++++++++++++++++++ .../applications/vcdcontroltool/vcdcontroltool.rc | 21 + 6 files changed, 1050 insertions(+) diff --git a/modules/rosapps/applications/CMakeLists.txt b/modules/rosapps/applications/CMakeLists.txt index e42ab38721..74dd129590 100644 --- a/modules/rosapps/applications/CMakeLists.txt +++ b/modules/rosapps/applications/CMakeLists.txt @@ -8,4 +8,5 @@ add_subdirectory(notevil) add_subdirectory(rosinternals) add_subdirectory(screensavers) add_subdirectory(sysutils) +add_subdirectory(vcdcontroltool) add_subdirectory(winfile) diff --git a/modules/rosapps/applications/vcdcontroltool/CMakeLists.txt b/modules/rosapps/applications/vcdcontroltool/CMakeLists.txt new file mode 100644 index 0000000000..b8d9f814fd --- /dev/null +++ b/modules/rosapps/applications/vcdcontroltool/CMakeLists.txt @@ -0,0 +1,9 @@ +include_directories(${REACTOS_SOURCE_DIR}/modules/rosapps/drivers/vcdrom) + +list(APPEND SOURCE + vcdcontroltool.c) + +add_executable(vcdcontroltool ${SOURCE} vcdcontroltool.rc) +set_module_type(vcdcontroltool win32gui UNICODE) +add_importlibs(vcdcontroltool advapi32 user32 gdi32 comctl32 comdlg32 ntdll msvcrt kernel32) +add_cd_file(TARGET vcdcontroltool DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/vcdcontroltool/lang/en-US.rc b/modules/rosapps/applications/vcdcontroltool/lang/en-US.rc new file mode 100755 index 0000000000..68834eaa79 --- /dev/null +++ b/modules/rosapps/applications/vcdcontroltool/lang/en-US.rc @@ -0,0 +1,62 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_MAINWINDOW DIALOGEX 0, 0, 320, 200 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Virtual CDRom Control Panel" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDC_MAINOK, 211, 179, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_MAINDEVICES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 7, 7, 306, 83 + GROUPBOX "Drive Geometry", IDC_STATIC, 7, 101, 153, 74, BS_GROUPBOX | WS_CHILD | WS_VISIBLE + LTEXT "Number of sectors", IDC_STATIC, 15, 115, 60, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Sector Size", IDC_STATIC, 15, 127, 49, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Free Clusters", IDC_STATIC, 15, 139, 49, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Total Clusters", IDC_STATIC, 15, 151, 49, 9, WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_MAINSECTORS, 88, 115, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_MAINSIZE, 88, 127, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_MAINFREE, 88, 139, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_MAINTOTAL, 88, 151, 49, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Add Drive", IDC_MAINADD, 183, 123, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Remove Drive", IDC_MAINREMOVE, 242, 123, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Mount", IDC_MAINMOUNT, 183, 142, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Eject", IDC_MAINEJECT, 183, 161, 109, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Remount", IDC_MAINREMOUNT, 242, 142, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Driver Control ...", IDC_MAINCONTROL, 183, 105, 109, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_MOUNTWINDOW DIALOG 0, 0, 187, 97 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Special Mount Options" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDC_MOUNTOK, 130, 59, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDC_MOUNTCANCEL, 130, 76, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT IDC_MOUNTIMAGE, 7, 17, 173, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + LTEXT "Image to be mounted", IDC_STATIC, 7, 7, 173, 10, SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE | WS_GROUP + AUTOCHECKBOX "Suppress UDF", IDC_MOUNTUDF, 7, 40, 114, 10, BS_FLAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "Suppress Joliet", IDC_MOUNTJOLIET, 7, 56, 111, 9, BS_FLAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "Persistent mount", IDC_MOUNTPERSIST, 7, 71, 111, 9, BS_FLAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_DRIVERWINDOW DIALOG 0, 0, 189, 123 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Virtual CD-ROM Driver Control" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDC_DRIVEROK, 43, 98, 103, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Install Driver ...", IDC_DRIVERINSTALL, 43, 61, 51, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Start", IDC_DRIVERSTART, 43, 79, 51, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Stop", IDC_DRIVERSTOP, 96, 79, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Remove Driver", IDC_DRIVERREMOVE, 96, 61, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT IDC_DRIVERINFO, 7, 7, 175, 50, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_DRIVE "Drive" + IDS_MAPPEDIMAGE "Mapped Image" + IDS_NOMOUNTED "No Image Mounted. Last one was - %s" + IDS_NONE "None" + IDS_FILTER "All Supported Image (*.udf; *.cdfs; *.jo; *.iso; *.rock)\0*.udf;*.cdfs;*.jo;*.iso;*.rock\0" +END diff --git a/modules/rosapps/applications/vcdcontroltool/resource.h b/modules/rosapps/applications/vcdcontroltool/resource.h new file mode 100644 index 0000000000..6ce5ed2d50 --- /dev/null +++ b/modules/rosapps/applications/vcdcontroltool/resource.h @@ -0,0 +1,37 @@ +#pragma once + +#define IDD_MAINWINDOW 200 +#define IDD_MOUNTWINDOW 201 +#define IDD_DRIVERWINDOW 202 + +#define IDC_STATIC -1 +#define IDC_MAINOK 1001 +#define IDC_MAINDEVICES 1002 +#define IDC_MAINSECTORS 1003 +#define IDC_MAINSIZE 1004 +#define IDC_MAINFREE 1005 +#define IDC_MAINTOTAL 1006 +#define IDC_MAINADD 1007 +#define IDC_MAINREMOVE 1008 +#define IDC_MAINMOUNT 1009 +#define IDC_MAINEJECT 1010 +#define IDC_MAINREMOUNT 1011 +#define IDC_MAINCONTROL 1012 +#define IDC_MOUNTOK 1013 +#define IDC_MOUNTCANCEL 1014 +#define IDC_MOUNTIMAGE 1015 +#define IDC_MOUNTUDF 1016 +#define IDC_MOUNTJOLIET 1017 +#define IDC_MOUNTPERSIST 1018 +#define IDC_DRIVEROK 1019 +#define IDC_DRIVERINSTALL 1020 +#define IDC_DRIVERSTART 1021 +#define IDC_DRIVERSTOP 1022 +#define IDC_DRIVERREMOVE 1023 +#define IDC_DRIVERINFO 1024 + +#define IDS_DRIVE 2000 +#define IDS_MAPPEDIMAGE 2001 +#define IDS_NOMOUNTED 2002 +#define IDS_NONE 2003 +#define IDS_FILTER 2004 diff --git a/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.c b/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.c new file mode 100644 index 0000000000..bd7ca6cf70 --- /dev/null +++ b/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.c @@ -0,0 +1,920 @@ +/* + * PROJECT: ReactOS Virtual CD Control Tool + * LICENSE: GPL - See COPYING in the top level directory + * FILE: modules/rosapps/applications/vcdcontroltool/vcdcontroltool.c + * PURPOSE: main dialog implementation + * COPYRIGHT: Copyright 2018 Pierre Schweitzer + * + */ + +#define WIN32_NO_STATUS +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <wingdi.h> +#include <winsvc.h> +#include <commctrl.h> +#include <commdlg.h> +#include <wchar.h> +#include <ndk/rtltypes.h> +#include <ndk/rtlfuncs.h> + +#include <vcdioctl.h> +#define IOCTL_CDROM_BASE FILE_DEVICE_CD_ROM +#define IOCTL_CDROM_EJECT_MEDIA CTL_CODE(IOCTL_CDROM_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) + +#include "resource.h" + +HWND hWnd; +HWND hMountWnd; +HWND hDriverWnd; +HINSTANCE hInstance; +/* FIXME: to improve, ugly hack */ +WCHAR wMountLetter; + +static +HANDLE +OpenMaster(VOID) +{ + /* Just open the device */ + return CreateFile(L"\\\\.\\\\VirtualCdRom", GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); +} + +static +HANDLE +OpenLetter(WCHAR Letter) +{ + WCHAR Device[255]; + + /* Make name */ + wsprintf(Device, L"\\\\.\\%c:", Letter); + + /* And open */ + return CreateFile(Device, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); +} + +static +VOID +RefreshDevicesList(WCHAR Letter) +{ + HWND hListView; + WCHAR szFormat[50]; + WCHAR szText[MAX_PATH + 50]; + WCHAR szImage[MAX_PATH]; + HANDLE hMaster, hLet; + DWORD BytesRead, i; + DRIVES_LIST Drives; + BOOLEAN Res; + IMAGE_PATH Image; + LVITEMW lvItem; + LRESULT lResult; + INT iSelected; + + /* Get our list view */ + hListView = GetDlgItem(hWnd, IDC_MAINDEVICES); + + /* Purge it */ + SendMessage(hListView, LVM_DELETEALLITEMS, 0, 0); + + /* Now, query the driver for all the devices */ + hMaster = OpenMaster(); + if (hMaster != INVALID_HANDLE_VALUE) + { + Res = DeviceIoControl(hMaster, IOCTL_VCDROM_ENUMERATE_DRIVES, NULL, 0, &Drives, sizeof(Drives), &BytesRead, NULL); + CloseHandle(hMaster); + + if (Res) + { + /* Loop to add all the devices to the list */ + iSelected = -1; + for (i = 0; i < Drives.Count; ++i) + { + /* We'll query device one by one */ + hLet = OpenLetter(Drives.Drives[i]); + if (hLet != INVALID_HANDLE_VALUE) + { + /* Get info about the mounted image */ + Res = DeviceIoControl(hLet, IOCTL_VCDROM_GET_IMAGE_PATH, NULL, 0, &Image, sizeof(Image), &BytesRead, NULL); + if (Res) + { + /* First of all, add our driver letter to the list */ + ZeroMemory(&lvItem, sizeof(LVITEMW)); + lvItem.mask = LVIF_TEXT; + lvItem.pszText = szText; + lvItem.iItem = i; + szText[0] = Drives.Drives[i]; + szText[1] = L':'; + szText[2] = 0; + + /* If it worked, we'll complete with the info about the device: + * (mounted? which image?) + */ + lResult = SendMessage(hListView, LVM_INSERTITEM, 0, (LPARAM)&lvItem); + if (lResult != -1) + { + /* If it matches arg, that's the letter to select at the end */ + if (Drives.Drives[i] == Letter) + { + iSelected = lResult; + } + + /* We'll fill second column with info */ + lvItem.iSubItem = 1; + + /* Gather the image path */ + if (Image.Length != 0) + { + memcpy(szImage, Image.Path, Image.Length); + szImage[(Image.Length / sizeof(WCHAR))] = L'\0'; + } + + /* It's not mounted... */ + if (Image.Mounted == 0) + { + /* If we don't have an image, set default text instead */ + if (Image.Length == 0) + { + szImage[0] = 0; + LoadString(hInstance, IDS_NONE, szImage, sizeof(szImage) / sizeof(WCHAR)); + szImage[(sizeof(szImage) / sizeof(WCHAR)) - 1] = L'\0'; + } + + /* Display the last known image */ + szFormat[0] = 0; + LoadString(hInstance, IDS_NOMOUNTED, szFormat, sizeof(szFormat) / sizeof(WCHAR)); + szFormat[(sizeof(szFormat) / sizeof(WCHAR)) - 1] = L'\0'; + + swprintf(szText, szFormat, szImage); + lvItem.pszText = szText; + } + else + { + /* Mounted, just display the image path */ + lvItem.pszText = szImage; + } + + /* Set text */ + SendMessage(hListView, LVM_SETITEM, lResult, (LPARAM)&lvItem); + } + } + + /* Don't leak our device */ + CloseHandle(hLet); + } + } + + /* If we had something to select, then just do it */ + if (iSelected != -1) + { + ZeroMemory(&lvItem, sizeof(LVITEMW)); + + lvItem.mask = LVIF_STATE; + lvItem.iItem = iSelected; + lvItem.state = LVIS_FOCUSED | LVIS_SELECTED; + lvItem.stateMask = LVIS_FOCUSED | LVIS_SELECTED; + SendMessage(hListView, LVM_SETITEMSTATE, iSelected, (LPARAM)&lvItem); + } + } + } +} + +INT_PTR +QueryDriverInfo(HWND hDlg) +{ + DWORD dwSize; + SC_HANDLE hMgr, hSvc; + LPQUERY_SERVICE_CONFIGW pConfig; + WCHAR szText[2 * MAX_PATH]; + HWND hControl; + + hDriverWnd = hDlg; + + /* Open service manager */ + hMgr = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); + if (hMgr != NULL) + { + /* Open our service */ + hSvc = OpenService(hMgr, L"Vcdrom", SERVICE_QUERY_CONFIG); + if (hSvc != NULL) + { + /* Probe its config size */ + if (!QueryServiceConfig(hSvc, NULL, 0, &dwSize) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + /* And get its config */ + pConfig = HeapAlloc(GetProcessHeap(), 0, dwSize); + + if (QueryServiceConfig(hSvc, pConfig, dwSize, &dwSize)) + { + /* Display name & driver */ + wsprintf(szText, L"%s:\n(%s)", pConfig->lpDisplayName, pConfig->lpBinaryPathName); + hControl = GetDlgItem(hDriverWnd, IDC_DRIVERINFO); + SendMessage(hControl, WM_SETTEXT, 0, (LPARAM)szText); + } + + HeapFree(GetProcessHeap(), 0, pConfig); + } + + CloseServiceHandle(hSvc); + } + + CloseServiceHandle(hMgr); + } + + /* FIXME: we don't allow uninstall/install */ + { + hControl = GetDlgItem(hDriverWnd, IDC_DRIVERINSTALL); + EnableWindow(hControl, FALSE); + hControl = GetDlgItem(hDriverWnd, IDC_DRIVERREMOVE); + EnableWindow(hControl, FALSE); + } + + /* Display our sub window */ + ShowWindow(hDlg, SW_SHOW); + + return TRUE; +} + +static +VOID +StartDriver(VOID) +{ + SC_HANDLE hMgr, hSvc; + + /* Open the SC manager */ + hMgr = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); + if (hMgr != NULL) + { + /* Open the service matching our driver */ + hSvc = OpenService(hMgr, L"Vcdrom", SERVICE_START); + if (hSvc != NULL) + { + /* Start it */ + /* FIXME: improve */ + StartService(hSvc, 0, NULL); + + CloseServiceHandle(hSvc); + + /* Refresh the list in case there were persistent mounts */ + RefreshDevicesList(0); + } + + CloseServiceHandle(hMgr); + } +} + +static +VOID +StopDriver(VOID) +{ + SC_HANDLE hMgr, hSvc; + SERVICE_STATUS Status; + + /* Open the SC manager */ + hMgr = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); + if (hMgr != NULL) + { + /* Open the service matching our driver */ + hSvc = OpenService(hMgr, L"Vcdrom", SERVICE_STOP); + if (hSvc != NULL) + { + /* Stop it */ + /* FIXME: improve */ + ControlService(hSvc, SERVICE_CONTROL_STOP, &Status); + + CloseServiceHandle(hSvc); + + /* Refresh the list to clear it */ + RefreshDevicesList(0); + } + + CloseServiceHandle(hMgr); + } +} + +static +INT_PTR +HandleDriverCommand(WPARAM wParam, + LPARAM lParam) +{ + WORD Msg; + + /* Dispatch the message for the controls we manage */ + Msg = LOWORD(wParam); + switch (Msg) + { + case IDC_DRIVEROK: + DestroyWindow(hDriverWnd); + return TRUE; + + case IDC_DRIVERSTART: + StartDriver(); + return TRUE; + + case IDC_DRIVERSTOP: + StopDriver(); + return TRUE; + } + + return FALSE; +} + +static +INT_PTR +CALLBACK +DriverDialogProc(HWND hDlg, + UINT Message, + WPARAM wParam, + LPARAM lParam) +{ + /* Dispatch the message */ + switch (Message) + { + case WM_INITDIALOG: + return QueryDriverInfo(hDlg); + + case WM_COMMAND: + return HandleDriverCommand(wParam, lParam); + + case WM_CLOSE: + return DestroyWindow(hDlg); + } + + return FALSE; +} + +static +VOID +DriverControl(VOID) +{ + /* Just create a new window with our driver control dialog */ + CreateDialogParamW(hInstance, + MAKEINTRESOURCE(IDD_DRIVERWINDOW), + NULL, + DriverDialogProc, + 0); +} + +static +INT_PTR +SetMountFileName(HWND hDlg, + LPARAM lParam) +{ + HWND hEditText; + + hMountWnd = hDlg; + + /* Set the file name that was passed when creating dialog */ + hEditText = GetDlgItem(hMountWnd, IDC_MOUNTIMAGE); + SendMessage(hEditText, WM_SETTEXT, 0, lParam); + + /* FIXME: we don't support persistent mounts yet*/ + { + hEditText = GetDlgItem(hMountWnd, IDC_MOUNTPERSIST); + EnableWindow(hEditText, FALSE); + } + + /* Show our window */ + ShowWindow(hDlg, SW_SHOW); + + return TRUE; +} + +FORCEINLINE +DWORD +Min(DWORD a, DWORD b) +{ + return (a > b ? b : a); +} + +static +VOID +PerformMount(VOID) +{ + HWND hControl; + WCHAR szFileName[MAX_PATH]; + MOUNT_PARAMETERS MountParams; + UNICODE_STRING NtPathName; + HANDLE hLet; + DWORD BytesRead; + + /* Zero our input structure */ + ZeroMemory(&MountParams, sizeof(MOUNT_PARAMETERS)); + + /* Do we have to suppress UDF? */ + hControl = GetDlgItem(hMountWnd, IDC_MOUNTUDF); + if (SendMessage(hControl, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + MountParams.Flags |= MOUNT_FLAG_SUPP_UDF; + } + + /* Do we have to suppress Joliet? */ + hControl = GetDlgItem(hMountWnd, IDC_MOUNTJOLIET); + if (SendMessage(hControl, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + MountParams.Flags |= MOUNT_FLAG_SUPP_JOLIET; + } + + /* Get the file name */ + hControl = GetDlgItem(hMountWnd, IDC_MOUNTIMAGE); + GetWindowText(hControl, szFileName, sizeof(szFileName) / sizeof(WCHAR)); + + /* Get NT path for the driver */ + if (RtlDosPathNameToNtPathName_U(szFileName, &NtPathName, NULL, NULL)) + { + /* Copy it in the parameter structure */ + wcsncpy(MountParams.Path, NtPathName.Buffer, 255); + MountParams.Length = Min(NtPathName.Length, 255 * sizeof(WCHAR)); + RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathName.Buffer); + + /* Open the device */ + hLet = OpenLetter(wMountLetter); + if (hLet != INVALID_HANDLE_VALUE) + { + /* And issue the mount IOCTL */ + DeviceIoControl(hLet, IOCTL_VCDROM_MOUNT_IMAGE, &MountParams, sizeof(MountParams), NULL, 0, &BytesRead, NULL); + + CloseHandle(hLet); + + /* Refresh the list so that our mount appears */ + RefreshDevicesList(0); + } + } + + DestroyWindow(hMountWnd); +} + +static +INT_PTR +HandleMountCommand(WPARAM wParam, + LPARAM lParam) +{ + WORD Msg; + + /* Dispatch the message for the controls we manage */ + Msg = LOWORD(wParam); + switch (Msg) + { + case IDC_MOUNTCANCEL: + DestroyWindow(hMountWnd); + return TRUE; + + case IDC_MOUNTOK: + PerformMount(); + return TRUE; + } + + return FALSE; +} + +static +INT_PTR +CALLBACK +MountDialogProc(HWND hDlg, + UINT Message, + WPARAM wParam, + LPARAM lParam) +{ + /* Dispatch the message */ + switch (Message) + { + case WM_INITDIALOG: + return SetMountFileName(hDlg, lParam); + + case WM_COMMAND: + return HandleMountCommand(wParam, lParam); + + case WM_CLOSE: + return DestroyWindow(hDlg); + } + + return FALSE; +} + +static +VOID +AddDrive(VOID) +{ + WCHAR Letter; + BOOLEAN Res; + DWORD BytesRead; + HANDLE hMaster; + + /* Open the driver */ + hMaster = OpenMaster(); + if (hMaster != INVALID_HANDLE_VALUE) + { + /* Issue the create IOCTL */ + Res = DeviceIoControl(hMaster, IOCTL_VCDROM_CREATE_DRIVE, NULL, 0, &Letter, sizeof(WCHAR), &BytesRead, NULL); + CloseHandle(hMaster); + + /* If it failed, reset the drive letter */ + if (!Res) + { + Letter = 0; + } + + /* Refresh devices list. If it succeed, we pass the created drive letter + * So that, user can directly click on "mount" to mount an image, without + * needing to select appropriate device. + */ + RefreshDevicesList(Letter); + } +} + +static +WCHAR +GetSelectedDriveLetter(VOID) +{ + INT iItem; + HWND hListView; + LVITEM lvItem; + WCHAR szText[255]; + + /* Get the select device in the list view */ + hListView = GetDlgItem(hWnd, IDC_MAINDEVICES); + iItem = SendMessage(hListView, LVM_GETNEXTITEM, -1, LVNI_SELECTED); + /* If there's one... */ + if (iItem != -1) + { + ZeroMemory(&lvItem, sizeof(LVITEM)); + lvItem.pszText = szText; + lvItem.cchTextMax = sizeof(szText) / sizeof(WCHAR); + szText[0] = 0; + + /* Get the item text, it will be the drive letter */ + SendMessage(hListView, LVM_GETITEMTEXT, iItem, (LPARAM)&lvItem); + return szText[0]; + } + + /* Nothing selected */ + return 0; +} + +static +VOID +MountImage(VOID) +{ + WCHAR szFilter[255]; + WCHAR szFileName[MAX_PATH]; + OPENFILENAMEW ImageOpen; + + /* Get the selected drive letter + * FIXME: I make it global, because I don't know how to pass + * it properly to the later involved functions. + * Feel free to improve (without breaking ;-)) + */ + wMountLetter = GetSelectedDriveLetter(); + /* We can only mount if we have a device */ + if (wMountLetter != 0) + { + /* First of all, we need an image to mount */ + ZeroMemory(&ImageOpen, sizeof(OPENFILENAMEW)); + + ImageOpen.lStructSize = sizeof(ImageOpen); + ImageOpen.hwndOwner = NULL; + ImageOpen.lpstrFilter = szFilter; + ImageOpen.lpstrFile = szFileName; + ImageOpen.nMaxFile = MAX_PATH; + ImageOpen.Flags = OFN_EXPLORER| OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; + + /* Get our filter (only supported images) */ + szFileName[0] = 0; + szFilter[0] = 0; + LoadString(hInstance, IDS_FILTER, szFilter, sizeof(szFilter) / sizeof(WCHAR)); + szFilter[(sizeof(szFilter) / sizeof(WCHAR)) - 1] = L'\0'; + + /* Get the image name */ + if (!GetOpenFileName(&ImageOpen)) + { + /* The user canceled... */ + return; + } + + /* Start the mount dialog, so that user can select mount options */ + CreateDialogParamW(hInstance, + MAKEINTRESOURCE(IDD_MOUNTWINDOW), + NULL, + MountDialogProc, + (LPARAM)szFileName); + } +} + +static +VOID +RemountImage(VOID) +{ + WCHAR Letter; + HANDLE hLet; + DWORD BytesRead; + + /* Get the select drive letter */ + Letter = GetSelectedDriveLetter(); + if (Letter != 0) + { + /* Open it */ + hLet = OpenLetter(Letter); + if (hLet != INVALID_HANDLE_VALUE) + { + /* And ask the driver for a remount */ + DeviceIoControl(hLet, IOCTL_STORAGE_LOAD_MEDIA, NULL, 0, NULL, 0, &BytesRead, NULL); + + CloseHandle(hLet); + + /* Refresh the list, to display the fact the image is now mounted. + * Make sure it's selected as it was previously selected. + */ + RefreshDevicesList(Letter); + } + } +} + +static +VOID +EjectDrive(VOID) +{ + WCHAR Letter; + HANDLE hLet; + DWORD BytesRead; + + /* Get the select drive letter */ + Letter = GetSelectedDriveLetter(); + if (Letter != 0) + { + /* Open it */ + hLet = OpenLetter(Letter); + if (hLet != INVALID_HANDLE_VALUE) + { + /* And ask the driver for an ejection */ + DeviceIoControl(hLet, IOCTL_CDROM_EJECT_MEDIA, NULL, 0, NULL, 0, &BytesRead, NULL); + + CloseHandle(hLet); + + /* Refresh the list, to display the fact the image is now unmounted but + * still known by the driver + * Make sure it's selected as it was previously selected. + */ + RefreshDevicesList(Letter); + } + } +} + +static +VOID +RemoveDrive(VOID) +{ + WCHAR Letter; + HANDLE hLet; + DWORD BytesRead; + + /* Get the select drive letter */ + Letter = GetSelectedDriveLetter(); + if (Letter != 0) + { + /* Open it */ + hLet = OpenLetter(Letter); + if (hLet != INVALID_HANDLE_VALUE) + { + /* And ask the driver for a deletion */ + DeviceIoControl(hLet, IOCTL_VCDROM_DELETE_DRIVE, NULL, 0, NULL, 0, &BytesRead, NULL); + + CloseHandle(hLet); + + /* Refresh the list, to make the device disappear */ + RefreshDevicesList(0); + } + } +} + +static +INT_PTR +HandleCommand(WPARAM wParam, + LPARAM lParam) +{ + WORD Msg; + + /* Dispatch the message for the controls we manage */ + Msg = LOWORD(wParam); + switch (Msg) + { + case IDC_MAINCONTROL: + DriverControl(); + return TRUE; + + case IDC_MAINOK: + DestroyWindow(hWnd); + return TRUE; + + case IDC_MAINADD: + AddDrive(); + return TRUE; + + case IDC_MAINMOUNT: + MountImage(); + return TRUE; + + case IDC_MAINREMOUNT: + RemountImage(); + return TRUE; + + case IDC_MAINEJECT: + EjectDrive(); + return TRUE; + + case IDC_MAINREMOVE: + RemoveDrive(); + return TRUE; + } + + return FALSE; +} + +static +VOID ResetStats(VOID) +{ + HWND hEditText; + static const WCHAR szText[] = { L'0', 0 }; + + /* Simply set '0' in all the edittext controls we + * manage regarding statistics. + */ + hEditText = GetDlgItem(hWnd, IDC_MAINSECTORS); + SendMessage(hEditText, WM_SETTEXT, 0, (LPARAM)szText); + + hEditText = GetDlgItem(hWnd, IDC_MAINSIZE); + SendMessage(hEditText, WM_SETTEXT, 0, (LPARAM)szText); + + hEditText = GetDlgItem(hWnd, IDC_MAINFREE); + SendMessage(hEditText, WM_SETTEXT, 0, (LPARAM)szText); + + hEditText = GetDlgItem(hWnd, IDC_MAINTOTAL); + SendMessage(hEditText, WM_SETTEXT, 0, (LPARAM)szText); +} + +static +INT_PTR +HandleNotify(LPARAM lParam) +{ + WCHAR Letter; + LPNMHDR NmHdr; + WCHAR szText[255]; + HWND hEditText; + DWORD ClusterSector, SectorSize, FreeClusters, Clusters, Sectors; + + NmHdr = (LPNMHDR)lParam; + + /* We only want notifications on click on our devices list */ + if (NmHdr->code == NM_CLICK && + NmHdr->idFrom == IDC_MAINDEVICES) + { + /* Get the newly selected device */ + Letter = GetSelectedDriveLetter(); + if (Letter != 0) + { + /* Setup its name */ + szText[0] = Letter; + szText[1] = L':'; + szText[2] = 0; + + /* And get its capacities */ + if (GetDiskFreeSpace(szText, &ClusterSector, &SectorSize, &FreeClusters, &Clusters)) + { + /* Nota: the application returns the total amount of clusters and sectors + * So, compute it + */ + Sectors = ClusterSector * Clusters; + + /* And now, update statistics about the device */ + hEditText = GetDlgItem(hWnd, IDC_MAINSECTORS); + wsprintf(szText, L"%ld", Sectors); + SendMessage(hEditText, WM_SETTEXT, 0, (LPARAM)szText); + + hEditText = GetDlgItem(hWnd, IDC_MAINSIZE); + wsprintf(szText, L"%ld", SectorSize); + SendMessage(hEditText, WM_SETTEXT, 0, (LPARAM)szText); + + hEditText = GetDlgItem(hWnd, IDC_MAINFREE); + wsprintf(szText, L"%ld", FreeClusters); + SendMessage(hEditText, WM_SETTEXT, 0, (LPARAM)szText); + + hEditText = GetDlgItem(hWnd, IDC_MAINTOTAL); + wsprintf(szText, L"%ld", Clusters); + SendMessage(hEditText, WM_SETTEXT, 0, (LPARAM)szText); + + return TRUE; + } + } + + /* We failed somewhere, make sure we're at 0 */ + ResetStats(); + + return TRUE; + } + + return FALSE; +} + +static +INT_PTR +CreateListViewColumns(HWND hDlg) +{ + WCHAR szText[255]; + LVCOLUMNW lvColumn; + HWND hListView; + + hWnd = hDlg; + hListView = GetDlgItem(hDlg, IDC_MAINDEVICES); + + /* Select the whole line, not just the first column */ + SendMessage(hListView, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); + + /* Set up the first column */ + ZeroMemory(&lvColumn, sizeof(LVCOLUMNW)); + lvColumn.pszText = szText; + lvColumn.mask = LVCF_FMT | LVCF_TEXT | LVCF_SUBITEM | LVCF_WIDTH; + lvColumn.fmt = LVCFMT_LEFT; + lvColumn.cx = 100; + szText[0] = 0; + LoadString(hInstance, IDS_DRIVE, szText, sizeof(szText) / sizeof(WCHAR)); + szText[(sizeof(szText) / sizeof(WCHAR)) - 1] = L'\0'; + SendMessage(hListView, LVM_INSERTCOLUMNW, 0, (LPARAM)&lvColumn); + + /* Set up the second column */ + szText[0] = 0; + lvColumn.cx = 350; + LoadString(hInstance, IDS_MAPPEDIMAGE, szText, sizeof(szText) / sizeof(WCHAR)); + szText[(sizeof(szText) / sizeof(WCHAR)) - 1] = L'\0'; + SendMessage(hListView, LVM_INSERTCOLUMNW, 1, (LPARAM)&lvColumn); + + /* Make sure stats are at 0 */ + ResetStats(); + + /* And populate our device list */ + RefreshDevicesList(0); + + return TRUE; +} + +static +INT_PTR +CALLBACK +MainDialogProc(HWND hDlg, + UINT Message, + WPARAM wParam, + LPARAM lParam) +{ + /* Dispatch the message */ + switch (Message) + { + case WM_INITDIALOG: + return CreateListViewColumns(hDlg); + + case WM_COMMAND: + return HandleCommand(wParam, lParam); + + case WM_NOTIFY: + return HandleNotify(lParam); + + case WM_CLOSE: + return DestroyWindow(hDlg); + + case WM_DESTROY: + PostQuitMessage(0); + return TRUE; + } + + return FALSE; +} + +INT +WINAPI +wWinMain(HINSTANCE hInst, + HINSTANCE hPrev, + LPWSTR Cmd, + int iCmd) +{ + MSG Msg; + + hInstance = hInst; + + /* Just start our main window */ + hWnd = CreateDialogParamW(hInst, + MAKEINTRESOURCE(IDD_MAINWINDOW), + NULL, + MainDialogProc, + 0); + /* And dispatch messages in case of a success */ + if (hWnd != NULL) + { + while (GetMessageW(&Msg, NULL, 0, 0) != 0) + { + TranslateMessage(&Msg); + DispatchMessageW(&Msg); + } + } + + return 0; +} diff --git a/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.rc b/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.rc new file mode 100644 index 0000000000..d52dea4f02 --- /dev/null +++ b/modules/rosapps/applications/vcdcontroltool/vcdcontroltool.rc @@ -0,0 +1,21 @@ +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "Virtual CD Control Tool" +#define REACTOS_STR_INTERNAL_NAME "vcdcontroltool" +#define REACTOS_STR_ORIGINAL_FILENAME "vcdcontroltool.exe" +#include <reactos/version.rc> + +#include <reactos/manifest_exe.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif

1 0

[reactos] 01/04: [VCDROM] Add a display name for the service
by Pierre Schweitzer 11 Dec '18

11 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cab37c94558163d862404… commit cab37c94558163d862404d1cdbf0408fa3be0a73 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Dec 11 14:19:29 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Dec 11 15:04:10 2018 +0100 [VCDROM] Add a display name for the service --- modules/rosapps/drivers/vcdrom/vcdrom_reg.inf | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/rosapps/drivers/vcdrom/vcdrom_reg.inf b/modules/rosapps/drivers/vcdrom/vcdrom_reg.inf index 3eaf361c7c..dcdc118d3c 100644 --- a/modules/rosapps/drivers/vcdrom/vcdrom_reg.inf +++ b/modules/rosapps/drivers/vcdrom/vcdrom_reg.inf @@ -5,3 +5,4 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Vcdrom","Group",0x00000000,"SCSI Class" HKLM,"SYSTEM\CurrentControlSet\Services\Vcdrom","ImagePath",0x00020000,"system32\drivers\vcdrom.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Vcdrom","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\Vcdrom","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Vcdrom","DisplayName",0x00000000,"Virtual CD-ROM Device Driver"

1 0

[reactos] 01/01: [WIN32SS][FONT] Check NULL of Face->style_name (#1113)
by Katayama Hirofumi MZ 11 Dec '18

11 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=43e208947638c2a3d1cf2… commit 43e208947638c2a3d1cf2e6ba9d7b1fe39cc83e3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 11 18:32:39 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 11 18:32:39 2018 +0900 [WIN32SS][FONT] Check NULL of Face->style_name (#1113) CORE-15433 --- win32ss/gdi/ntgdi/freetype.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index fb823d48d1..744db67cb1 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1095,7 +1095,8 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, Status = RtlAnsiStringToUnicodeString(&Entry->FaceName, &AnsiString, TRUE); if (NT_SUCCESS(Status)) { - if (Face->style_name[0] && strcmp(Face->style_name, "Regular")) + if (Face->style_name && Face->style_name[0] && + strcmp(Face->style_name, "Regular") != 0) { RtlInitAnsiString(&AnsiString, Face->style_name); Status = RtlAnsiStringToUnicodeString(&Entry->StyleName, &AnsiString, TRUE);

1 0

[reactos] 01/01: [SHELL32] Enable environment variables in 'Run' dialog (#1111)
by Katayama Hirofumi MZ 11 Dec '18

11 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06d717e3bc3923d6c1fc2… commit 06d717e3bc3923d6c1fc2e3420430dd597e517a6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 11 16:35:45 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 11 16:35:45 2018 +0900 [SHELL32] Enable environment variables in 'Run' dialog (#1111) CORE-15431 --- dll/win32/shell32/dialogs/dialogs.cpp | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index 47b6f04d5a..fc23284a13 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -551,7 +551,8 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA LRESULT lRet; HWND htxt = GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH); INT ic; - WCHAR *psz, *parent = NULL; + WCHAR *psz, *pszExpanded, *parent = NULL; + DWORD cchExpand; NMRUNFILEDLGW nmrfd; ic = GetWindowTextLengthW(htxt); @@ -575,6 +576,24 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA GetWindowTextW(htxt, psz, ic + 1); StrTrimW(psz, L" \t"); + if (wcschr(psz, L'%') != NULL) + { + cchExpand = ExpandEnvironmentStringsW(psz, NULL, 0); + pszExpanded = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, cchExpand * sizeof(WCHAR)); + if (!pszExpanded) + { + HeapFree(GetProcessHeap(), 0, psz); + EndDialog(hwnd, IDCANCEL); + return TRUE; + } + ExpandEnvironmentStringsW(psz, pszExpanded, cchExpand); + StrTrimW(pszExpanded, L" \t"); + } + else + { + pszExpanded = psz; + } + /* * The precedence is the following: first the user-given * current directory is used; if there is none, a current @@ -604,7 +623,7 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA nmrfd.hdr.code = RFN_VALIDATE; nmrfd.hdr.hwndFrom = hwnd; nmrfd.hdr.idFrom = 0; - nmrfd.lpFile = psz; + nmrfd.lpFile = pszExpanded; nmrfd.lpDirectory = pszStartDir; nmrfd.nShow = SW_SHOWNORMAL; @@ -617,12 +636,12 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA break; case RF_OK: - if (SUCCEEDED(ShellExecCmdLine(hwnd, psz, pszStartDir, SW_SHOWNORMAL, NULL, + if (SUCCEEDED(ShellExecCmdLine(hwnd, pszExpanded, pszStartDir, SW_SHOWNORMAL, NULL, SECL_ALLOW_NONEXE))) { /* Call again GetWindowText in case the contents of the edit box has changed? */ - GetWindowTextW(htxt, psz, ic + 1); - FillList(htxt, psz, ic + 2 + 1, FALSE); + GetWindowTextW(htxt, pszExpanded, ic + 1); + FillList(htxt, pszExpanded, ic + 2 + 1, FALSE); EndDialog(hwnd, IDOK); break; } @@ -638,6 +657,8 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA HeapFree(GetProcessHeap(), 0, parent); HeapFree(GetProcessHeap(), 0, psz); + if (psz != pszExpanded) + HeapFree(GetProcessHeap(), 0, pszExpanded); return TRUE; }

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2018