Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 70918: [PROGMAN]: Add the famous Program Manager (Win3.1 style) from Wine 1.9.5, with minor fixes for compilation. The icon should be replaced as soon as possible.
by hbelusca＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: hbelusca Date: Fri Mar 4 19:22:35 2016 New Revision: 70918 URL: http://svn.reactos.org/svn/reactos?rev=70918&view=rev Log: [PROGMAN]: Add the famous Program Manager (Win3.1 style) from Wine 1.9.5, with minor fixes for compilation. The icon should be replaced as soon as possible. Added: trunk/reactos/base/shell/progman/ (with props) trunk/reactos/base/shell/progman/CMakeLists.txt (with props) trunk/reactos/base/shell/progman/dialog.c (with props) trunk/reactos/base/shell/progman/group.c (with props) trunk/reactos/base/shell/progman/grpfile.c (with props) trunk/reactos/base/shell/progman/main.c (with props) trunk/reactos/base/shell/progman/progman.h (with props) trunk/reactos/base/shell/progman/progman.rc (with props) trunk/reactos/base/shell/progman/program.c (with props) trunk/reactos/base/shell/progman/res/ (with props) trunk/reactos/base/shell/progman/res/progman.ico (with props) trunk/reactos/base/shell/progman/resource.h (with props) trunk/reactos/base/shell/progman/string.c (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/shell/progman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/CMakeLi… Added: trunk/reactos/base/shell/progman/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/dialog.… Added: trunk/reactos/base/shell/progman/group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/group.c… Added: trunk/reactos/base/shell/progman/grpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/grpfile… Added: trunk/reactos/base/shell/progman/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/main.c?… Added: trunk/reactos/base/shell/progman/progman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/progman… Added: trunk/reactos/base/shell/progman/progman.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/progman… Added: trunk/reactos/base/shell/progman/program.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/program… Added: trunk/reactos/base/shell/progman/res/progman.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/res/pro… Added: trunk/reactos/base/shell/progman/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/resourc… Added: trunk/reactos/base/shell/progman/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/string.…

1 0

[hbelusca] 70919: [PROGMAN] - Fix the Shell-About box. - Whitespace/indentation fixes in string.c - Add missing size for the ICON resource item of the dialog "Program attributes". MSVC resource com...
by hbelusca＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: hbelusca Date: Sat Mar 5 01:27:27 2016 New Revision: 70919 URL: http://svn.reactos.org/svn/reactos?rev=70919&view=rev Log: [PROGMAN] - Fix the Shell-About box. - Whitespace/indentation fixes in string.c - Add missing size for the ICON resource item of the dialog "Program attributes". MSVC resource compiler considered that as an error, while GCC's windres compiled that without warning (who knows what they took as the default value...). Modified: trunk/reactos/base/shell/progman/main.c trunk/reactos/base/shell/progman/progman.rc trunk/reactos/base/shell/progman/string.c Modified: trunk/reactos/base/shell/progman/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/main.c?… ============================================================================== --- trunk/reactos/base/shell/progman/main.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/main.c [iso-8859-1] Sat Mar 5 01:27:27 2016 @@ -310,8 +310,12 @@ break; case PM_ABOUT_WINE: - ShellAboutA(hWnd, "WINE", "Program Manager", 0); - break; + { + WCHAR szTitle[MAX_STRING_LEN]; + LoadStringW(Globals.hInstance, IDS_PROGRAM_MANAGER, szTitle, ARRAYSIZE(szTitle)); + ShellAboutW(hWnd, szTitle, NULL, NULL); + break; + } default: MAIN_MessageBoxIDS(IDS_NOT_IMPLEMENTED, IDS_ERROR, MB_OK); Modified: trunk/reactos/base/shell/progman/progman.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/progman… ============================================================================== --- trunk/reactos/base/shell/progman/progman.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/progman.rc [iso-8859-1] Sat Mar 5 01:27:27 2016 @@ -188,7 +188,7 @@ EDITTEXT PM_DIRECTORY, 95, 40, 90, 15, WS_TABSTOP LTEXT "&Key combination:", PM_HOT_KEY_TXT, 5, 55, 75, 10 EDITTEXT PM_HOT_KEY, 95, 55, 90, 15, WS_TABSTOP -ICON "", PM_ICON, 20, 70 +ICON "", PM_ICON, 20, 70, 20, 20 CHECKBOX "&Minimize at launch", PM_SYMBOL, 95, 75, 90, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 200, 5, 70, 15, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 200, 25, 70, 15, WS_TABSTOP Modified: trunk/reactos/base/shell/progman/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/string.… ============================================================================== --- trunk/reactos/base/shell/progman/string.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/string.c [iso-8859-1] Sat Mar 5 01:27:27 2016 @@ -30,27 +30,31 @@ VOID STRING_LoadMenus(VOID) { - CHAR caption[MAX_STRING_LEN]; - HMENU hMainMenu; + WCHAR caption[MAX_STRING_LEN]; + HMENU hMainMenu; - /* Set frame caption */ - LoadStringA(Globals.hInstance, IDS_PROGRAM_MANAGER, caption, sizeof(caption)); - SetWindowTextA(Globals.hMainWnd, caption); + /* Set frame caption */ + LoadStringW(Globals.hInstance, IDS_PROGRAM_MANAGER, caption, sizeof(caption)); + SetWindowTextW(Globals.hMainWnd, caption); - /* Create menu */ - hMainMenu = LoadMenuW(Globals.hInstance, MAKEINTRESOURCEW(MAIN_MENU)); - Globals.hFileMenu = GetSubMenu(hMainMenu, 0); - Globals.hOptionMenu = GetSubMenu(hMainMenu, 1); - Globals.hWindowsMenu = GetSubMenu(hMainMenu, 2); - Globals.hLanguageMenu = GetSubMenu(hMainMenu, 3); + /* Create menu */ + hMainMenu = LoadMenuW(Globals.hInstance, MAKEINTRESOURCEW(MAIN_MENU)); + Globals.hFileMenu = GetSubMenu(hMainMenu, 0); + Globals.hOptionMenu = GetSubMenu(hMainMenu, 1); + Globals.hWindowsMenu = GetSubMenu(hMainMenu, 2); + Globals.hLanguageMenu = GetSubMenu(hMainMenu, 3); - if (Globals.hMDIWnd) - SendMessageW(Globals.hMDIWnd, WM_MDISETMENU, - (WPARAM) hMainMenu, - (LPARAM) Globals.hWindowsMenu); - else SetMenu(Globals.hMainWnd, hMainMenu); + if (Globals.hMDIWnd) + { + SendMessageW(Globals.hMDIWnd, WM_MDISETMENU, + (WPARAM)hMainMenu, (LPARAM)Globals.hWindowsMenu); + } + else + { + SetMenu(Globals.hMainWnd, hMainMenu); + } - /* Destroy old menu */ - if (Globals.hMainMenu) DestroyMenu(Globals.hMainMenu); - Globals.hMainMenu = hMainMenu; + /* Destroy old menu */ + if (Globals.hMainMenu) DestroyMenu(Globals.hMainMenu); + Globals.hMainMenu = hMainMenu; }

1 0

[hbelusca] 70920: [OOPS] A little bird pointed to me that I forgot to add progman to compilation...
by hbelusca＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: hbelusca Date: Sat Mar 5 01:29:46 2016 New Revision: 70920 URL: http://svn.reactos.org/svn/reactos?rev=70920&view=rev Log: [OOPS] A little bird pointed to me that I forgot to add progman to compilation... Modified: trunk/reactos/base/shell/CMakeLists.txt Modified: trunk/reactos/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/CMakeLists.txt?… ============================================================================== --- trunk/reactos/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/CMakeLists.txt [iso-8859-1] Sat Mar 5 01:29:46 2016 @@ -2,4 +2,5 @@ add_subdirectory(cmd) add_subdirectory(explorer) add_subdirectory(filebrowser) +add_subdirectory(progman) add_subdirectory(rshell)

1 0

[rnaumann] 70915: [RAPPS] Display error messages on download failures. Patch by toe_head2001. Thank you!
by rnaumann＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: rnaumann Date: Fri Mar 4 16:10:26 2016 New Revision: 70915 URL: http://svn.reactos.org/svn/reactos?rev=70915&view=rev Log: [RAPPS] Display error messages on download failures. Patch by toe_head2001. Thank you! Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc trunk/reactos/base/applications/rapps/lang/cs-CZ.rc trunk/reactos/base/applications/rapps/lang/de-DE.rc trunk/reactos/base/applications/rapps/lang/en-US.rc trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/base/applications/rapps/lang/fr-FR.rc trunk/reactos/base/applications/rapps/lang/he-IL.rc trunk/reactos/base/applications/rapps/lang/it-IT.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/rapps/lang/no-NO.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/pt-BR.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/rapps/lang/sk-SK.rc trunk/reactos/base/applications/rapps/lang/sq-AL.rc trunk/reactos/base/applications/rapps/lang/sv-SE.rc trunk/reactos/base/applications/rapps/lang/tr-TR.rc trunk/reactos/base/applications/rapps/lang/uk-UA.rc trunk/reactos/base/applications/rapps/lang/zh-CN.rc trunk/reactos/base/applications/rapps/lang/zh-TW.rc trunk/reactos/base/applications/rapps/loaddlg.c trunk/reactos/base/applications/rapps/resource.h Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -204,4 +204,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -205,4 +205,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "ÃberprÃ¼fung des SSL-Zertifikats fehlgeschlagen." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -203,4 +203,6 @@ IDS_CERT_DOES_NOT_MATCH "Ha fallado la comprobaciÃ³n del certificado SSL." IDS_INTEG_CHECK_TITLE "Verificando integridad del paquete..." IDS_INTEG_CHECK_FAIL "El paquete no ha pasado la comprobaciÃ³n de integridad, puede haber sido alterado o estar corrupto. No se recomienda ejecutarlo." -END + IDS_INTERRUPTED_DOWNLOAD "Se ha interrumpido la descarga por un error de red. Comprueba la conexiÃ³n a Internet." + IDS_UNABLE_TO_WRITE "No se ha podido escribir en el disco duro, es posible que no quede espacio libre." +END Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "La vÃ©rification du certificat SSL a Ã©chouÃ©." IDS_INTEG_CHECK_TITLE "VÃ©rification de l'intÃ©gritÃ© du paquet..." IDS_INTEG_CHECK_FAIL "Le contrÃ´le d'intÃ©gritÃ© du paquet a Ã©chouÃ©, il se peut qu'il ait Ã©tÃ© corrompu ou altÃ©rÃ© au cours du tÃ©lÃ©chargement. L'exÃ©cution du programme n'est pas recommandÃ©e." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -202,4 +202,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -208,4 +208,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -202,4 +202,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -206,4 +206,6 @@ IDS_CERT_DOES_NOT_MATCH "Verificarea certificatului SSL a eÈuat." IDS_INTEG_CHECK_TITLE "Se verificÄ integritatea pachetuluiâ¦" IDS_INTEG_CHECK_FAIL "Pachetul nu a trecut de verificarea de integritate. Utilizarea programului nu este recomandatÄ." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ SSL ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ°." IDS_INTEG_CHECK_TITLE "ÐÑÐ¾Ð²ÐµÑÐºÐ° ÑÐµÐ»Ð¾ÑÑÐ½Ð¾ÑÑÐ¸ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ..." IDS_INTEG_CHECK_FAIL "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð¿ÑÐ¾ÑÐ»Ð¾ Ð¿ÑÐ¾Ð²ÐµÑÐºÑ ÑÐµÐ»Ð¾ÑÑÐ½Ð¾ÑÑÐ¸, Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð½Ð¾ Ð±ÑÐ»Ð¾ Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½Ð¾ Ð¸Ð»Ð¸ Ð¿Ð¾Ð´Ð¼ÐµÐ½ÐµÐ½Ð¾. ÐÐ°Ð¿ÑÑÐº Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -205,4 +205,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -204,4 +204,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -207,4 +207,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -202,4 +202,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL onay belgesi doÄrulamasÄ± baÅarÄ±sÄ±z." IDS_INTEG_CHECK_TITLE "Paket bÃ¼tÃ¼nlÃ¼ÄÃ¼ doÄrulanÄ±yor..." IDS_INTEG_CHECK_FAIL "Paket bÃ¼tÃ¼nlÃ¼k denetimini geÃ§medi, bozulmuÅ veyÃ¢ indirme esnÃ¢sÄ±nda oynanmÄ±Å olabilir. YazÄ±lÄ±mÄ± Ã§alÄ±ÅtÄ±rmak Ã¶nerilmez." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -208,4 +208,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -203,4 +203,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -202,4 +202,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL æèé©èå¤±æã" IDS_INTEG_CHECK_TITLE "é©èå¥è£è»é«çå®æ´æ§..." IDS_INTEG_CHECK_FAIL "åæ²æééå®æ´æ§æª¢æ¥ï¼å®å¯è½å·²æå£ï¼æèå¨ä¸è¼éç¨ä¸ç¯¡æ¹ãå»ºè°æ¨ä¸è¦éè¡è©²è»é«ã" -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -458,8 +458,26 @@ do { - if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer), &dwBytesRead)) goto end; - if (!WriteFile(hOut, &lpBuffer[0], dwBytesRead, &dwBytesWritten, NULL)) goto end; + if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer), &dwBytesRead)) + { + WCHAR szMsgText[MAX_STR_LEN]; + + if (!LoadStringW(hInst, IDS_INTERRUPTED_DOWNLOAD, szMsgText, _countof(szMsgText))) + goto end; + + MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); + goto end; + } + if (!WriteFile(hOut, &lpBuffer[0], dwBytesRead, &dwBytesWritten, NULL)) + { + WCHAR szMsgText[MAX_STR_LEN]; + + if (!LoadStringW(hInst, IDS_UNABLE_TO_WRITE, szMsgText, _countof(szMsgText))) + goto end; + + MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); + goto end; + } dwCurrentBytesRead += dwBytesRead; IBindStatusCallback_OnProgress(dl, dwCurrentBytesRead, dwContentLen, 0, AppInfo->szUrlDownload); } Modified: trunk/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… ============================================================================== --- trunk/reactos/base/applications/rapps/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/resource.h [iso-8859-1] Fri Mar 4 16:10:26 2016 @@ -99,6 +99,8 @@ #define IDS_CERT_DOES_NOT_MATCH 120 #define IDS_INTEG_CHECK_TITLE 121 #define IDS_INTEG_CHECK_FAIL 122 +#define IDS_INTERRUPTED_DOWNLOAD 123 +#define IDS_UNABLE_TO_WRITE 124 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200

1 0

[hbelusca] 70916: [FORMAT] - Completely reunicodify the application. CORE-9369 - Add back the original copyright/author information.
by hbelusca＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: hbelusca Date: Fri Mar 4 16:26:57 2016 New Revision: 70916 URL: http://svn.reactos.org/svn/reactos?rev=70916&view=rev Log: [FORMAT] - Completely reunicodify the application. CORE-9369 - Add back the original copyright/author information. Modified: trunk/reactos/base/system/format/CMakeLists.txt trunk/reactos/base/system/format/format.c Modified: trunk/reactos/base/system/format/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/CMakeLi… ============================================================================== --- trunk/reactos/base/system/format/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/format/CMakeLists.txt [iso-8859-1] Fri Mar 4 16:26:57 2016 @@ -1,6 +1,8 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fmifs) add_executable(format format.c format.rc) -set_module_type(format win32cui) +set_module_type(format win32cui UNICODE) set_target_properties(format PROPERTIES SUFFIX ".com") add_importlibs(format user32 fmifs msvcrt kernel32 ntdll) add_cd_file(TARGET format DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.c [iso-8859-1] (original) +++ trunk/reactos/base/system/format/format.c [iso-8859-1] Fri Mar 4 16:26:57 2016 @@ -1,18 +1,63 @@ +//====================================================================== +// +// Formatx +// // Copyright (c) 1998 Mark Russinovich // Systems Internals // http://www.sysinternals.com - +// +// Format clone that demonstrates the use of the FMIFS file system +// utility library. +// +// -------------------------------------------------------------------- +// +// This software is free software; you can redistribute it and/or +// modify it under the terms of the GNU Library General Public License as +// published by the Free Software Foundation; either version 2 of the +// License, or (at your option) any later version. +// +// This software is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Library General Public License for more details. +// +// You should have received a copy of the GNU Library General Public +// License along with this software; see the file COPYING.LIB. If +// not, write to the Free Software Foundation, Inc., 675 Mass Ave, +// Cambridge, MA 02139, USA. +// +// -------------------------------------------------------------------- +// +// 1999 February (Emanuele Aliberti) +// Adapted for ReactOS and lcc-win32. +// +// 1999 April (Emanuele Aliberti) +// Adapted for ReactOS and egcs. +// +// 2003 April (Casper S. Hornstrup) +// Reintegration. +// +//====================================================================== + +#include <stdio.h> +#include <tchar.h> + +/* PSDK/NDK Headers */ #define WIN32_NO_STATUS -#include <stdio.h> #include <windef.h> #include <winbase.h> #include <winnls.h> #include <winuser.h> -#include <wine/winternl.h> + +#define NTOS_MODE_USER +#include <ndk/rtlfuncs.h> + +/* FMIFS Public Header */ #include <fmifs/fmifs.h> -#include <tchar.h> #include "resource.h" + +#define FMIFS_IMPORT_DLL // Globals BOOL Error = FALSE; @@ -22,46 +67,76 @@ DWORD ClusterSize = 0; BOOL CompressDrive = FALSE; BOOL GotALabel = FALSE; -LPTSTR Label = _T(""); -LPTSTR Drive = NULL; -LPTSTR FileSystem = _T("FAT"); - -TCHAR RootDirectory[MAX_PATH]; -TCHAR LabelString[12]; +PWCHAR Label = L""; +PWCHAR Drive = NULL; +PWCHAR FileSystem = L"FAT"; + +WCHAR RootDirectory[MAX_PATH]; +WCHAR LabelString[12]; + +#ifndef FMIFS_IMPORT_DLL +// +// Functions in FMIFS.DLL +// +PFORMATEX FormatEx; +PENABLEVOLUMECOMPRESSION EnableVolumeCompression; +PQUERYAVAILABLEFILESYSTEMFORMAT QueryAvailableFileSystemFormat; +#endif + // // Size array // typedef struct { - TCHAR SizeString[16]; + WCHAR SizeString[16]; DWORD ClusterSize; } SIZEDEFINITION, *PSIZEDEFINITION; SIZEDEFINITION LegalSizes[] = { - { _T("512"), 512 }, - { _T("1024"), 1024 }, - { _T("2048"), 2048 }, - { _T("4096"), 4096 }, - { _T("8192"), 8192 }, - { _T("16K"), 16384 }, - { _T("32K"), 32768 }, - { _T("64K"), 65536 }, - { _T("128K"), 65536 * 2 }, - { _T("256K"), 65536 * 4 }, - { _T(""), 0 }, + { L"512", 512 }, + { L"1024", 1024 }, + { L"2048", 2048 }, + { L"4096", 4096 }, + { L"8192", 8192 }, + { L"16K", 16384 }, + { L"32K", 32768 }, + { L"64K", 65536 }, + { L"128K", 65536 * 2 }, + { L"256K", 65536 * 4 }, + { L"", 0 }, }; -int LoadStringAndOem(HINSTANCE hInst, - UINT uID, - LPTSTR szStr, - int Siz -) -{ - TCHAR szTmp[RC_STRING_MAX_SIZE]; - int res = LoadString(hInst, uID, szTmp, sizeof(szTmp)); - CharToOem(szTmp, szStr); - return(res); +VOID PrintStringV(LPWSTR szStr, va_list args) +{ + WCHAR bufFormatted[RC_STRING_MAX_SIZE]; + CHAR bufFormattedOem[RC_STRING_MAX_SIZE]; + + _vsnwprintf(bufFormatted, ARRAYSIZE(bufFormatted), szStr, args); + + CharToOemW(bufFormatted, bufFormattedOem); + puts(bufFormattedOem); +} + +VOID PrintString(LPWSTR szStr, ...) +{ + va_list args; + + va_start(args, szStr); + PrintStringV(szStr, args); + va_end(args); +} + +VOID PrintResourceString(UINT uID, ...) +{ + WCHAR bufSrc[RC_STRING_MAX_SIZE]; + va_list args; + + LoadStringW(GetModuleHandleW(NULL), uID, bufSrc, ARRAYSIZE(bufSrc)); + + va_start(args, uID); + PrintStringV(bufSrc, args); + va_end(args); } @@ -72,16 +147,16 @@ // Takes the win32 error code and prints the text version. // //---------------------------------------------------------------------- -static VOID PrintWin32Error( LPTSTR Message, DWORD ErrorCode ) -{ - LPTSTR lpMsgBuf; - - FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, +static VOID PrintWin32Error( LPWSTR Message, DWORD ErrorCode ) +{ + LPWSTR lpMsgBuf; + + FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, ErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&lpMsgBuf, 0, NULL ); - - _tprintf(_T("%s: %s\n"), Message, lpMsgBuf ); + (LPWSTR)&lpMsgBuf, 0, NULL ); + + PrintString(L"%s: %s\n", Message, lpMsgBuf ); LocalFree( lpMsgBuf ); } @@ -93,7 +168,7 @@ // Get the switches. // //---------------------------------------------------------------------- -static int ParseCommandLine( int argc, TCHAR *argv[] ) +static int ParseCommandLine( int argc, WCHAR *argv[] ) { int i, j; BOOLEAN gotFormat = FALSE; @@ -107,41 +182,41 @@ switch( argv[i][0] ) { - case '-': - case '/': - - if( !_tcsnicmp( &argv[i][1], _T("FS:"), 3 )) { + case L'-': + case L'/': + + if( !_wcsnicmp( &argv[i][1], L"FS:", 3 )) { if( gotFormat) return -1; FileSystem = &argv[i][4]; gotFormat = TRUE; - } else if( !_tcsnicmp( &argv[i][1], _T("A:"), 2 )) { + } else if( !_wcsnicmp( &argv[i][1], L"A:", 2 )) { if( gotSize ) return -1; j = 0; while( LegalSizes[j].ClusterSize && - _tcsicmp( LegalSizes[j].SizeString, &argv[i][3] )) j++; + wcsicmp( LegalSizes[j].SizeString, &argv[i][3] )) j++; if( !LegalSizes[j].ClusterSize ) return i; ClusterSize = LegalSizes[j].ClusterSize; gotSize = TRUE; - } else if( ! _tcsnicmp( &argv[i][1], _T("V:"), 2 )) { + } else if( ! _wcsnicmp( &argv[i][1], L"V:", 2 )) { if( gotLabel ) return -1; Label = &argv[i][3]; gotLabel = TRUE; GotALabel = TRUE; - } else if( !_tcsicmp( &argv[i][1], _T("Q") )) { + } else if( !wcsicmp( &argv[i][1], L"Q" )) { if( gotQuick ) return -1; QuickFormat = TRUE; gotQuick = TRUE; - } else if( !_tcsicmp( &argv[i][1], _T("C") )) { + } else if( !wcsicmp( &argv[i][1], L"C" )) { if( gotCompressed ) return -1; CompressDrive = TRUE; @@ -153,7 +228,7 @@ default: if( Drive ) return i; - if( argv[i][1] != _T(':') ) return i; + if( argv[i][1] != L':' ) return i; Drive = argv[i]; break; @@ -179,7 +254,6 @@ PDWORD percent; PTEXTOUTPUT output; PBOOLEAN status; - TCHAR szMsg[RC_STRING_MAX_SIZE]; // // We get other types of commands, but we don't have to pay attention to them @@ -188,21 +262,19 @@ case PROGRESS: percent = (PDWORD) Argument; - LoadStringAndOem( GetModuleHandle(NULL), STRING_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, *percent); + PrintResourceString(STRING_COMPLETE, *percent); break; case OUTPUT: output = (PTEXTOUTPUT) Argument; - fprintf(stdout, "%s", output->Output); + wprintf(L"%S", output->Output); break; case DONE: status = (PBOOLEAN) Argument; if( *status == FALSE ) { - LoadStringAndOem( GetModuleHandle(NULL), STRING_FORMAT_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf("%s", szMsg); + PrintResourceString(STRING_FORMAT_FAIL); Error = TRUE; } break; @@ -220,14 +292,13 @@ case UNKNOWND: case STRUCTUREPROGRESS: case CLUSTERSIZETOOSMALL: - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf("%s", szMsg); + PrintResourceString(STRING_NO_SUPPORT); return FALSE; } return TRUE; } - +#ifndef FMIFS_IMPORT_DLL //---------------------------------------------------------------------- // // LoadFMIFSEntryPoints @@ -235,32 +306,34 @@ // Loads FMIFS.DLL and locates the entry point(s) we are going to use // //---------------------------------------------------------------------- -BOOLEAN LoadFMIFSEntryPoints() -{ - HMODULE hFmifs = LoadLibrary( _T("fmifs.dll") ); +static BOOLEAN LoadFMIFSEntryPoints(VOID) +{ + HMODULE hFmifs = LoadLibraryW( L"fmifs.dll" ); if (hFmifs == NULL) { return FALSE; } - if( !(void*) GetProcAddress( hFmifs, "FormatEx" ) ) { + FormatEx = (PFORMATEX)GetProcAddress(hFmifs, "FormatEx"); + if (!FormatEx) { FreeLibrary(hFmifs); return FALSE; } - if( !((void *) GetProcAddress( hFmifs, - "EnableVolumeCompression" )) ) { + EnableVolumeCompression = (PENABLEVOLUMECOMPRESSION)GetProcAddress(hFmifs, "EnableVolumeCompression"); + if (!EnableVolumeCompression) { FreeLibrary(hFmifs); return FALSE; } - if( !((void *) GetProcAddress( hFmifs, - "QueryAvailableFileSystemFormat" )) ) { + QueryAvailableFileSystemFormat = (PQUERYAVAILABLEFILESYSTEMFORMAT)GetProcAddress(hFmifs, "QueryAvailableFileSystemFormat"); + if (!QueryAvailableFileSystemFormat) { FreeLibrary(hFmifs); return FALSE; } return TRUE; } +#endif //---------------------------------------------------------------------- @@ -270,24 +343,24 @@ // Tell the user how to use the program // //---------------------------------------------------------------------- -static VOID Usage( LPTSTR ProgramName ) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; - TCHAR szFormats[MAX_PATH]; -#ifndef UNICODE - TCHAR szFormatA[MAX_PATH]; -#endif +static VOID Usage( LPWSTR ProgramName ) +{ + WCHAR szMsg[RC_STRING_MAX_SIZE]; + WCHAR szFormats[MAX_PATH]; WCHAR szFormatW[MAX_PATH]; DWORD Index = 0; BYTE dummy; BOOLEAN latestVersion; - LoadStringAndOem( GetModuleHandle(NULL), STRING_HELP, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringW(GetModuleHandle(NULL), STRING_HELP, szMsg, ARRAYSIZE(szMsg)); + +#ifndef FMIFS_IMPORT_DLL if (!LoadFMIFSEntryPoints()) { - _tprintf(szMsg, ProgramName, _T("")); + PrintString(szMsg, ProgramName, L""); return; } +#endif szFormats[0] = 0; while (QueryAvailableFileSystemFormat(Index++, szFormatW, &dummy, &dummy, &latestVersion)) @@ -295,15 +368,11 @@ if (!latestVersion) continue; if (szFormats[0]) - _tcscat(szFormats, _T(", ")); -#ifdef UNICODE - _tcscat(szFormats, szFormatW); -#else - if (0 != WideCharToMultiByte(CP_ACP, 0, szFormatW, -1, szFormatA, sizeof(szFormatA), NULL, NULL)) - _tcscat(szFormats, szFormatA); -#endif - } - _tprintf(szMsg, ProgramName, szFormats); + wcscat(szFormats, L", "); + + wcscat(szFormats, szFormatW); + } + PrintString(szMsg, ProgramName, szFormats); } @@ -319,39 +388,40 @@ // arguments. // //---------------------------------------------------------------------- -int -_tmain(int argc, TCHAR *argv[]) +int wmain(int argc, WCHAR *argv[]) { int badArg; DWORD media = FMIFS_HARDDISK; DWORD driveType; - TCHAR fileSystem[1024]; - TCHAR volumeName[1024]; - TCHAR input[1024]; + WCHAR fileSystem[1024]; + WCHAR volumeName[1024]; + WCHAR input[1024]; DWORD serialNumber; DWORD flags, maxComponent; ULARGE_INTEGER freeBytesAvailableToCaller, totalNumberOfBytes, totalNumberOfFreeBytes; -#ifndef UNICODE - WCHAR RootDirectoryW[MAX_PATH], FileSystemW[MAX_PATH], LabelW[MAX_PATH]; + WCHAR szMsg[RC_STRING_MAX_SIZE]; + + wprintf(L"\n" + L"Formatx v1.0 by Mark Russinovich\n" + L"Systems Internals - http://www.sysinternals.com\n" + L"ReactOS adaptation 1999 by Emanuele Aliberti\n\n"); + +#ifndef FMIFS_IMPORT_DLL + // + // Get function pointers + // + if( !LoadFMIFSEntryPoints()) { + PrintResourceString(STRING_FMIFS_FAIL); + return -1; + } #endif - TCHAR szMsg[RC_STRING_MAX_SIZE]; - - // - // Get function pointers - // - if( !LoadFMIFSEntryPoints()) { - LoadStringAndOem( GetModuleHandle(NULL), STRING_FMIFS_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf("%s", szMsg); - return -1; - } // // Parse command line // if( (badArg = ParseCommandLine( argc, argv ))) { - LoadStringAndOem( GetModuleHandle(NULL), STRING_UNKNOW_ARG, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, argv[badArg] ); + PrintResourceString(STRING_UNKNOW_ARG, argv[badArg]); Usage(argv[0]); return -1; @@ -362,44 +432,41 @@ // if( !Drive ) { - LoadStringAndOem( GetModuleHandle(NULL), STRING_DRIVE_PARM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg); + PrintResourceString(STRING_DRIVE_PARM); Usage( argv[0] ); return -1; } else { - _tcscpy( RootDirectory, Drive ); - } - RootDirectory[2] = _T('\\'); - RootDirectory[3] = _T('\0'); + wcscpy( RootDirectory, Drive ); + } + RootDirectory[2] = L'\\'; + RootDirectory[3] = L'\0'; // // See if the drive is removable or not // - driveType = GetDriveType( RootDirectory ); + driveType = GetDriveTypeW( RootDirectory ); switch (driveType) { case DRIVE_UNKNOWN : - LoadStringAndOem( GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringW(GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, szMsg, ARRAYSIZE(szMsg)); PrintWin32Error( szMsg, GetLastError()); return -1; case DRIVE_REMOTE: case DRIVE_CDROM: - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); - _tprintf(szMsg); + PrintResourceString(STRING_NO_SUPPORT); return -1; case DRIVE_NO_ROOT_DIR: - LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); PrintWin32Error( szMsg, GetLastError()); return -1; case DRIVE_REMOVABLE: - LoadStringAndOem( GetModuleHandle(NULL), STRING_INSERT_DISK, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, RootDirectory[0] ); - _fgetts( input, sizeof(input)/2, stdin ); + PrintResourceString(STRING_INSERT_DISK, RootDirectory[0]); + fgetws( input, ARRAYSIZE(input), stdin ); media = FMIFS_FLOPPY; break; @@ -411,17 +478,16 @@ // Reject attempts to format the system drive { - TCHAR path[MAX_PATH + 1]; + WCHAR path[MAX_PATH + 1]; UINT rc; - rc = GetWindowsDirectory(path, MAX_PATH); + rc = GetWindowsDirectoryW(path, MAX_PATH); if (rc == 0 || rc > MAX_PATH) // todo: Report "Unable to query system directory" return -1; - if (_totlower(path[0]) == _totlower(Drive[0])) + if (towlower(path[0]) == towlower(Drive[0])) { // todo: report "Cannot format system drive" - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); - _tprintf(szMsg); + PrintResourceString(STRING_NO_SUPPORT); return -1; } } @@ -429,27 +495,26 @@ // // Determine the drive's file system format // - if( !GetVolumeInformation( RootDirectory, - volumeName, sizeof(volumeName)/2, + if( !GetVolumeInformationW( RootDirectory, + volumeName, ARRAYSIZE(volumeName), &serialNumber, &maxComponent, &flags, - fileSystem, sizeof(fileSystem)/2)) { - - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + fileSystem, ARRAYSIZE(fileSystem))) { + + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); PrintWin32Error( szMsg, GetLastError()); return -1; } - if( !GetDiskFreeSpaceEx( RootDirectory, + if( !GetDiskFreeSpaceExW( RootDirectory, &freeBytesAvailableToCaller, &totalNumberOfBytes, &totalNumberOfFreeBytes )) { - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, szMsg, ARRAYSIZE(szMsg)); PrintWin32Error( szMsg, GetLastError()); return -1; } - LoadStringAndOem( GetModuleHandle(NULL), STRING_FILESYSTEM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, fileSystem ); + PrintResourceString(STRING_FILESYSTEM, fileSystem); // // Make sure they want to do this @@ -460,30 +525,27 @@ while(1 ) { - LoadStringAndOem( GetModuleHandle(NULL), STRING_LABEL_NAME_EDIT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, RootDirectory[0] ); - _fgetts( input, sizeof(input)/2, stdin ); - input[ _tcslen( input ) - 1] = 0; - - if( !_tcsicmp( input, volumeName )) { + PrintResourceString(STRING_LABEL_NAME_EDIT, RootDirectory[0]); + fgetws( input, ARRAYSIZE(input), stdin ); + input[ wcslen( input ) - 1] = 0; + + if( !wcsicmp( input, volumeName )) { break; } - LoadStringAndOem( GetModuleHandle(NULL), STRING_ERROR_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf("%s", szMsg); + PrintResourceString(STRING_ERROR_LABEL); } } - LoadStringAndOem( GetModuleHandle(NULL), STRING_YN_FORMAT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, RootDirectory[0] ); - - LoadStringAndOem( GetModuleHandle(NULL), STRING_YES_NO_FAQ, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + PrintResourceString(STRING_YN_FORMAT, RootDirectory[0]); + + LoadStringW(GetModuleHandle(NULL), STRING_YES_NO_FAQ, szMsg, ARRAYSIZE(szMsg)); while( 1 ) { - _fgetts( input, sizeof(input)/2, stdin ); - if(_strnicmp(&input[0],&szMsg[0],1) == 0) break; - if(_strnicmp(&input[0],&szMsg[1],1) == 0) { - _tprintf(_T("\n")); + fgetws( input, ARRAYSIZE(input), stdin ); + if(_wcsnicmp(&input[0],&szMsg[0],1) == 0) break; + if(_wcsnicmp(&input[0],&szMsg[1],1) == 0) { + wprintf(L"\n"); return 0; } } @@ -494,64 +556,48 @@ // if( !QuickFormat ) { - LoadString( GetModuleHandle(NULL), STRING_VERIFYING, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringW(GetModuleHandle(NULL), STRING_VERIFYING, szMsg, ARRAYSIZE(szMsg)); if( totalNumberOfBytes.QuadPart > 1024*1024*10 ) { - _tprintf(_T("%s %luM\n"),szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); + PrintString(L"%s %luM\n",szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); } else { - _tprintf(_T("%s %.1fM\n"),szMsg, + PrintString(L"%s %.1fM\n",szMsg, ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); } } else { - LoadStringAndOem( GetModuleHandle(NULL), STRING_FAST_FMT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringW(GetModuleHandle(NULL), STRING_FAST_FMT, szMsg, ARRAYSIZE(szMsg)); if( totalNumberOfBytes.QuadPart > 1024*1024*10 ) { - _tprintf(_T("%s %luM\n"),szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); + PrintString(L"%s %luM\n",szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); } else { - _tprintf(_T("%s %.2fM\n"),szMsg, + PrintString(L"%s %.2fM\n",szMsg, ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); } - LoadStringAndOem( GetModuleHandle(NULL), STRING_CREATE_FSYS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf("%s", szMsg); + PrintResourceString(STRING_CREATE_FSYS); } // // Format away! // -#ifndef UNICODE - MultiByteToWideChar(CP_ACP, 0, RootDirectory, -1, RootDirectoryW, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, FileSystem, -1, FileSystemW, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, Label, -1, LabelW, MAX_PATH); - FormatEx( RootDirectoryW, media, FileSystemW, LabelW, QuickFormat, - ClusterSize, FormatExCallback ); -#else FormatEx( RootDirectory, media, FileSystem, Label, QuickFormat, ClusterSize, FormatExCallback ); -#endif if( Error ) return -1; - LoadStringAndOem( GetModuleHandle(NULL), STRING_FMT_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf("%s", szMsg); + PrintResourceString(STRING_FMT_COMPLETE); // // Enable compression if desired // if( CompressDrive ) { -#ifndef UNICODE - MultiByteToWideChar(CP_ACP, 0, RootDirectory, -1, RootDirectoryW, MAX_PATH); - if( !EnableVolumeCompression( RootDirectoryW, TRUE )) { -#else if( !EnableVolumeCompression( RootDirectory, TRUE )) { -#endif - - LoadStringAndOem( GetModuleHandle(NULL), STRING_VOL_COMPRESS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf("%s", szMsg); + + PrintResourceString(STRING_VOL_COMPRESS); } } @@ -560,25 +606,24 @@ // if( !GotALabel ) { - LoadString( GetModuleHandle(NULL), STRING_ENTER_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf("%s", szMsg); - _fgetts( input, sizeof(LabelString)/2, stdin ); - - input[ _tcslen(input)-1] = 0; - if( !SetVolumeLabel( RootDirectory, input )) { - - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + PrintResourceString(STRING_ENTER_LABEL); + fgetws( input, ARRAYSIZE(LabelString), stdin ); + + input[ wcslen(input)-1] = 0; + if( !SetVolumeLabelW( RootDirectory, input )) { + + LoadStringW(GetModuleHandle(NULL), STRING_NO_LABEL, szMsg, ARRAYSIZE(szMsg)); PrintWin32Error(szMsg, GetLastError()); return -1; } } - if( !GetVolumeInformation( RootDirectory, - volumeName, sizeof(volumeName)/2, + if( !GetVolumeInformationW( RootDirectory, + volumeName, ARRAYSIZE(volumeName), &serialNumber, &maxComponent, &flags, - fileSystem, sizeof(fileSystem)/2)) { - - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + fileSystem, ARRAYSIZE(fileSystem))) { + + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); PrintWin32Error( szMsg, GetLastError()); return -1; } @@ -586,34 +631,33 @@ // // Print out some stuff including the formatted size // - if( !GetDiskFreeSpaceEx( RootDirectory, + if( !GetDiskFreeSpaceExW( RootDirectory, &freeBytesAvailableToCaller, &totalNumberOfBytes, &totalNumberOfFreeBytes )) { - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, szMsg, ARRAYSIZE(szMsg)); PrintWin32Error(szMsg, GetLastError()); return -1; } - LoadStringAndOem( GetModuleHandle(NULL), STRING_FREE_SPACE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, totalNumberOfBytes.QuadPart, totalNumberOfFreeBytes.QuadPart ); + PrintResourceString(STRING_FREE_SPACE, totalNumberOfBytes.QuadPart, totalNumberOfFreeBytes.QuadPart ); // // Get the drive's serial number // - if( !GetVolumeInformation( RootDirectory, - volumeName, sizeof(volumeName)/2, + if( !GetVolumeInformationW( RootDirectory, + volumeName, ARRAYSIZE(volumeName), &serialNumber, &maxComponent, &flags, - fileSystem, sizeof(fileSystem)/2)) { - - LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + fileSystem, ARRAYSIZE(fileSystem))) { + + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); PrintWin32Error( szMsg, GetLastError()); return -1; } - LoadStringAndOem( GetModuleHandle(NULL), STRING_SERIAL_NUMBER, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, (unsigned int)(serialNumber >> 16), - (unsigned int)(serialNumber & 0xFFFF) ); + PrintResourceString(STRING_SERIAL_NUMBER, + (unsigned int)(serialNumber >> 16), + (unsigned int)(serialNumber & 0xFFFF)); return 0; }

1 0

[hbelusca] 70917: [AUTOCHK][CHKDSK] - Whitespace fixes; - Remove useless comments. [FORMAT] - Whitespace (tabs -> spaces) and indentation fixes. [VFATLIB] - Change of name of variable.
by hbelusca＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: hbelusca Date: Fri Mar 4 17:09:34 2016 New Revision: 70917 URL: http://svn.reactos.org/svn/reactos?rev=70917&view=rev Log: [AUTOCHK][CHKDSK] - Whitespace fixes; - Remove useless comments. [FORMAT] - Whitespace (tabs -> spaces) and indentation fixes. [VFATLIB] - Change of name of variable. Modified: trunk/reactos/base/system/autochk/autochk.c trunk/reactos/base/system/chkdsk/chkdsk.c trunk/reactos/base/system/format/format.c trunk/reactos/lib/fslib/vfatlib/vfatlib.c Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] (original) +++ trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] Fri Mar 4 17:09:34 2016 @@ -297,7 +297,7 @@ /* Get the file system */ Status = GetFileSystem(DrivePath, FileSystem, - sizeof(FileSystem) / sizeof(FileSystem[0])); + ARRAYSIZE(FileSystem)); if (!NT_SUCCESS(Status)) { DPRINT1("GetFileSystem() failed with status 0x%08lx\n", Status); @@ -334,7 +334,7 @@ NtDrivePath[wcslen(NtDrivePath)-1] = 0; RtlInitUnicodeString(&DrivePathU, NtDrivePath); - DPRINT("AUTOCHK: Checking %wZ\n", &DrivePathU); + DPRINT1("AUTOCHK: Checking %wZ\n", &DrivePathU); Status = ChkdskFunc(&DrivePathU, TRUE, // FixErrors TRUE, // Verbose Modified: trunk/reactos/base/system/chkdsk/chkdsk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/chkdsk/chkdsk.… ============================================================================== --- trunk/reactos/base/system/chkdsk/chkdsk.c [iso-8859-1] (original) +++ trunk/reactos/base/system/chkdsk/chkdsk.c [iso-8859-1] Fri Mar 4 17:09:34 2016 @@ -29,13 +29,13 @@ // -------------------------------------------------------------------- // // 1999 February (Emanuele Aliberti) -// Adapted for ReactOS and lcc-win32. +// Adapted for ReactOS and lcc-win32. // // 1999 April (Emanuele Aliberti) -// Adapted for ReactOS and egcs. +// Adapted for ReactOS and egcs. // // 2008 July (Aleksey Bragin) -// Cleanup, use ReactOS's fmifs.h +// Cleanup, use ReactOS's fmifs.h // //====================================================================== @@ -70,10 +70,10 @@ #ifndef FMIFS_IMPORT_DLL // -// FMIFS function -// -// PCHKDSK Chkdsk; -#endif /* ndef FMIFS_IMPORT_DLL */ +// Functions in FMIFS.DLL +// +PCHKDSK Chkdsk; +#endif //---------------------------------------------------------------------- @@ -144,10 +144,7 @@ // //---------------------------------------------------------------------- static int -ParseCommandLine( - int argc, - WCHAR *argv[] - ) +ParseCommandLine(int argc, WCHAR *argv[]) { int i; BOOLEAN gotFix = FALSE; @@ -231,8 +228,7 @@ ChkdskCallback( CALLBACKCOMMAND Command, DWORD Modifier, - PVOID Argument - ) + PVOID Argument) { PDWORD percent; PBOOLEAN status; @@ -329,8 +325,6 @@ // // Loads FMIFS.DLL and locates the entry point(s) we are going to use // -// 19990216 EA Used wide functions -// //---------------------------------------------------------------------- static BOOLEAN LoadFMIFSEntryPoints(VOID) @@ -340,7 +334,6 @@ return FALSE; Chkdsk = (PCHKDSK)GetProcAddress(hFmifs, "Chkdsk"); - if (!Chkdsk) { FreeLibrary(hFmifs); @@ -349,7 +342,7 @@ return TRUE; } -#endif /* ndef FMIFS_IMPORT_DLL */ +#endif //---------------------------------------------------------------------- @@ -374,10 +367,10 @@ DWORD serialNumber; DWORD flags, maxComponent; - wprintf(L"\n\ -Chkdskx v1.0.1 by Mark Russinovich\n\ -Systems Internals - http://www.sysinternals.com/\n\ -ReactOS adaptation 1999 by Emanuele Aliberti\n\n"); + wprintf(L"\n" + L"Chkdskx v1.0.1 by Mark Russinovich\n" + L"Systems Internals - http://www.sysinternals.com\n" + L"ReactOS adaptation 1999 by Emanuele Aliberti\n\n"); #ifndef FMIFS_IMPORT_DLL // @@ -388,7 +381,7 @@ wprintf(L"Could not located FMIFS entry points.\n\n"); return -1; } -#endif /* ndef FMIFS_IMPORT_DLL */ +#endif // // Parse command line Modified: trunk/reactos/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.c [iso-8859-1] (original) +++ trunk/reactos/base/system/format/format.c [iso-8859-1] Fri Mar 4 17:09:34 2016 @@ -60,19 +60,19 @@ #define FMIFS_IMPORT_DLL // Globals -BOOL Error = FALSE; +BOOL Error = FALSE; // switches -BOOL QuickFormat = FALSE; -DWORD ClusterSize = 0; -BOOL CompressDrive = FALSE; -BOOL GotALabel = FALSE; -PWCHAR Label = L""; -PWCHAR Drive = NULL; -PWCHAR FileSystem = L"FAT"; - -WCHAR RootDirectory[MAX_PATH]; -WCHAR LabelString[12]; +BOOL QuickFormat = FALSE; +DWORD ClusterSize = 0; +BOOL CompressDrive = FALSE; +BOOL GotALabel = FALSE; +PWCHAR Label = L""; +PWCHAR Drive = NULL; +PWCHAR FileSystem = L"FAT"; + +WCHAR RootDirectory[MAX_PATH]; +WCHAR LabelString[12]; #ifndef FMIFS_IMPORT_DLL // @@ -88,22 +88,22 @@ // Size array // typedef struct { - WCHAR SizeString[16]; - DWORD ClusterSize; + WCHAR SizeString[16]; + DWORD ClusterSize; } SIZEDEFINITION, *PSIZEDEFINITION; SIZEDEFINITION LegalSizes[] = { - { L"512", 512 }, - { L"1024", 1024 }, - { L"2048", 2048 }, - { L"4096", 4096 }, - { L"8192", 8192 }, - { L"16K", 16384 }, - { L"32K", 32768 }, - { L"64K", 65536 }, - { L"128K", 65536 * 2 }, - { L"256K", 65536 * 4 }, - { L"", 0 }, + { L"512", 512 }, + { L"1024", 1024 }, + { L"2048", 2048 }, + { L"4096", 4096 }, + { L"8192", 8192 }, + { L"16K", 16384 }, + { L"32K", 32768 }, + { L"64K", 65536 }, + { L"128K", 65536 * 2 }, + { L"256K", 65536 * 4 }, + { L"", 0 }, }; @@ -147,17 +147,17 @@ // Takes the win32 error code and prints the text version. // //---------------------------------------------------------------------- -static VOID PrintWin32Error( LPWSTR Message, DWORD ErrorCode ) -{ - LPWSTR lpMsgBuf; - - FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, ErrorCode, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPWSTR)&lpMsgBuf, 0, NULL ); - - PrintString(L"%s: %s\n", Message, lpMsgBuf ); - LocalFree( lpMsgBuf ); +static VOID PrintWin32Error(LPWSTR Message, DWORD ErrorCode) +{ + LPWSTR lpMsgBuf; + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, ErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPWSTR)&lpMsgBuf, 0, NULL); + + PrintString(L"%s: %s\n", Message, lpMsgBuf); + LocalFree(lpMsgBuf); } @@ -168,73 +168,77 @@ // Get the switches. // //---------------------------------------------------------------------- -static int ParseCommandLine( int argc, WCHAR *argv[] ) -{ - int i, j; - BOOLEAN gotFormat = FALSE; - BOOLEAN gotQuick = FALSE; - BOOLEAN gotSize = FALSE; - BOOLEAN gotLabel = FALSE; - BOOLEAN gotCompressed = FALSE; - - - for( i = 1; i < argc; i++ ) { - - switch( argv[i][0] ) { - - case L'-': - case L'/': - - if( !_wcsnicmp( &argv[i][1], L"FS:", 3 )) { - - if( gotFormat) return -1; - FileSystem = &argv[i][4]; - gotFormat = TRUE; - - - } else if( !_wcsnicmp( &argv[i][1], L"A:", 2 )) { - - if( gotSize ) return -1; - j = 0; - while( LegalSizes[j].ClusterSize && - wcsicmp( LegalSizes[j].SizeString, &argv[i][3] )) j++; - - if( !LegalSizes[j].ClusterSize ) return i; - ClusterSize = LegalSizes[j].ClusterSize; - gotSize = TRUE; - - } else if( ! _wcsnicmp( &argv[i][1], L"V:", 2 )) { - - if( gotLabel ) return -1; - Label = &argv[i][3]; - gotLabel = TRUE; - GotALabel = TRUE; - - } else if( !wcsicmp( &argv[i][1], L"Q" )) { - - if( gotQuick ) return -1; - QuickFormat = TRUE; - gotQuick = TRUE; - - } else if( !wcsicmp( &argv[i][1], L"C" )) { - - if( gotCompressed ) return -1; - CompressDrive = TRUE; - gotCompressed = TRUE; - - } else return i; - break; - - default: - - if( Drive ) return i; - if( argv[i][1] != L':' ) return i; - - Drive = argv[i]; - break; - } - } - return 0; +static int ParseCommandLine(int argc, WCHAR *argv[]) +{ + int i, j; + BOOLEAN gotFormat = FALSE; + BOOLEAN gotQuick = FALSE; + BOOLEAN gotSize = FALSE; + BOOLEAN gotLabel = FALSE; + BOOLEAN gotCompressed = FALSE; + + for (i = 1; i < argc; i++) + { + switch (argv[i][0]) + { + case L'-': case L'/': + + if (!_wcsnicmp(&argv[i][1], L"FS:", 3)) + { + if (gotFormat) return -1; + FileSystem = &argv[i][4]; + gotFormat = TRUE; + } + else if (!_wcsnicmp(&argv[i][1], L"A:", 2)) + { + if (gotSize) return -1; + j = 0; + while (LegalSizes[j].ClusterSize && + wcsicmp(LegalSizes[j].SizeString, &argv[i][3])) + { + j++; + } + + if (!LegalSizes[j].ClusterSize) return i; + ClusterSize = LegalSizes[j].ClusterSize; + gotSize = TRUE; + } + else if (!_wcsnicmp(&argv[i][1], L"V:", 2)) + { + if (gotLabel) return -1; + Label = &argv[i][3]; + gotLabel = TRUE; + GotALabel = TRUE; + } + else if (!wcsicmp(&argv[i][1], L"Q")) + { + if (gotQuick) return -1; + QuickFormat = TRUE; + gotQuick = TRUE; + } + else if (!wcsicmp(&argv[i][1], L"C")) + { + if (gotCompressed) return -1; + CompressDrive = TRUE; + gotCompressed = TRUE; + } + else + { + return i; + } + break; + + default: + { + if (Drive) return i; + if (argv[i][1] != L':') return i; + + Drive = argv[i]; + break; + } + } + } + return 0; } //---------------------------------------------------------------------- @@ -246,56 +250,57 @@ // //---------------------------------------------------------------------- BOOLEAN WINAPI -FormatExCallback ( - CALLBACKCOMMAND Command, - ULONG Modifier, - PVOID Argument) -{ - PDWORD percent; - PTEXTOUTPUT output; - PBOOLEAN status; - - // - // We get other types of commands, but we don't have to pay attention to them - // - switch( Command ) { - - case PROGRESS: - percent = (PDWORD) Argument; - PrintResourceString(STRING_COMPLETE, *percent); - break; - - case OUTPUT: - output = (PTEXTOUTPUT) Argument; - wprintf(L"%S", output->Output); - break; - - case DONE: - status = (PBOOLEAN) Argument; - if( *status == FALSE ) { - - PrintResourceString(STRING_FORMAT_FAIL); - Error = TRUE; - } - break; - case DONEWITHSTRUCTURE: - case UNKNOWN2: - case UNKNOWN3: - case UNKNOWN4: - case UNKNOWN5: - case INSUFFICIENTRIGHTS: - case FSNOTSUPPORTED: - case VOLUMEINUSE: - case UNKNOWN9: - case UNKNOWNA: - case UNKNOWNC: - case UNKNOWND: - case STRUCTUREPROGRESS: - case CLUSTERSIZETOOSMALL: - PrintResourceString(STRING_NO_SUPPORT); - return FALSE; - } - return TRUE; +FormatExCallback( + CALLBACKCOMMAND Command, + ULONG Modifier, + PVOID Argument) +{ + PDWORD percent; + PTEXTOUTPUT output; + PBOOLEAN status; + + // + // We get other types of commands, but we don't have to pay attention to them + // + switch (Command) + { + case PROGRESS: + percent = (PDWORD)Argument; + PrintResourceString(STRING_COMPLETE, *percent); + break; + + case OUTPUT: + output = (PTEXTOUTPUT)Argument; + wprintf(L"%S", output->Output); + break; + + case DONE: + status = (PBOOLEAN)Argument; + if (*status == FALSE) + { + PrintResourceString(STRING_FORMAT_FAIL); + Error = TRUE; + } + break; + + case DONEWITHSTRUCTURE: + case UNKNOWN2: + case UNKNOWN3: + case UNKNOWN4: + case UNKNOWN5: + case INSUFFICIENTRIGHTS: + case FSNOTSUPPORTED: + case VOLUMEINUSE: + case UNKNOWN9: + case UNKNOWNA: + case UNKNOWNC: + case UNKNOWND: + case STRUCTUREPROGRESS: + case CLUSTERSIZETOOSMALL: + PrintResourceString(STRING_NO_SUPPORT); + return FALSE; + } + return TRUE; } #ifndef FMIFS_IMPORT_DLL @@ -308,30 +313,32 @@ //---------------------------------------------------------------------- static BOOLEAN LoadFMIFSEntryPoints(VOID) { - HMODULE hFmifs = LoadLibraryW( L"fmifs.dll" ); - if (hFmifs == NULL) { - return FALSE; - } + HMODULE hFmifs = LoadLibraryW( L"fmifs.dll"); + if (hFmifs == NULL) + return FALSE; FormatEx = (PFORMATEX)GetProcAddress(hFmifs, "FormatEx"); - if (!FormatEx) { - FreeLibrary(hFmifs); - return FALSE; - } + if (!FormatEx) + { + FreeLibrary(hFmifs); + return FALSE; + } EnableVolumeCompression = (PENABLEVOLUMECOMPRESSION)GetProcAddress(hFmifs, "EnableVolumeCompression"); - if (!EnableVolumeCompression) { - FreeLibrary(hFmifs); - return FALSE; - } + if (!EnableVolumeCompression) + { + FreeLibrary(hFmifs); + return FALSE; + } QueryAvailableFileSystemFormat = (PQUERYAVAILABLEFILESYSTEMFORMAT)GetProcAddress(hFmifs, "QueryAvailableFileSystemFormat"); - if (!QueryAvailableFileSystemFormat) { - FreeLibrary(hFmifs); - return FALSE; - } - - return TRUE; + if (!QueryAvailableFileSystemFormat) + { + FreeLibrary(hFmifs); + return FALSE; + } + + return TRUE; } #endif @@ -343,36 +350,36 @@ // Tell the user how to use the program // //---------------------------------------------------------------------- -static VOID Usage( LPWSTR ProgramName ) -{ - WCHAR szMsg[RC_STRING_MAX_SIZE]; - WCHAR szFormats[MAX_PATH]; - WCHAR szFormatW[MAX_PATH]; - DWORD Index = 0; - BYTE dummy; - BOOLEAN latestVersion; +static VOID Usage(LPWSTR ProgramName) +{ + WCHAR szMsg[RC_STRING_MAX_SIZE]; + WCHAR szFormats[MAX_PATH]; + WCHAR szFormatW[MAX_PATH]; + DWORD Index = 0; + BYTE dummy; + BOOLEAN latestVersion; LoadStringW(GetModuleHandle(NULL), STRING_HELP, szMsg, ARRAYSIZE(szMsg)); #ifndef FMIFS_IMPORT_DLL - if (!LoadFMIFSEntryPoints()) - { + if (!LoadFMIFSEntryPoints()) + { PrintString(szMsg, ProgramName, L""); - return; - } + return; + } #endif - szFormats[0] = 0; - while (QueryAvailableFileSystemFormat(Index++, szFormatW, &dummy, &dummy, &latestVersion)) - { - if (!latestVersion) - continue; - if (szFormats[0]) - wcscat(szFormats, L", "); - - wcscat(szFormats, szFormatW); - } - PrintString(szMsg, ProgramName, szFormats); + szFormats[0] = 0; + while (QueryAvailableFileSystemFormat(Index++, szFormatW, &dummy, &dummy, &latestVersion)) + { + if (!latestVersion) + continue; + if (szFormats[0]) + wcscat(szFormats, L", "); + + wcscat(szFormats, szFormatW); + } + PrintString(szMsg, ProgramName, szFormats); } @@ -390,274 +397,276 @@ //---------------------------------------------------------------------- int wmain(int argc, WCHAR *argv[]) { - int badArg; - DWORD media = FMIFS_HARDDISK; - DWORD driveType; - WCHAR fileSystem[1024]; - WCHAR volumeName[1024]; - WCHAR input[1024]; - DWORD serialNumber; - DWORD flags, maxComponent; - ULARGE_INTEGER freeBytesAvailableToCaller, totalNumberOfBytes, totalNumberOfFreeBytes; - WCHAR szMsg[RC_STRING_MAX_SIZE]; - - wprintf(L"\n" + int badArg; + DWORD media = FMIFS_HARDDISK; + DWORD driveType; + WCHAR fileSystem[1024]; + WCHAR volumeName[1024]; + WCHAR input[1024]; + DWORD serialNumber; + DWORD flags, maxComponent; + ULARGE_INTEGER freeBytesAvailableToCaller, totalNumberOfBytes, totalNumberOfFreeBytes; + WCHAR szMsg[RC_STRING_MAX_SIZE]; + + wprintf(L"\n" L"Formatx v1.0 by Mark Russinovich\n" L"Systems Internals - http://www.sysinternals.com\n" L"ReactOS adaptation 1999 by Emanuele Aliberti\n\n"); #ifndef FMIFS_IMPORT_DLL - // - // Get function pointers - // - if( !LoadFMIFSEntryPoints()) { - PrintResourceString(STRING_FMIFS_FAIL); - return -1; - } + // + // Get function pointers + // + if (!LoadFMIFSEntryPoints()) + { + PrintResourceString(STRING_FMIFS_FAIL); + return -1; + } #endif - // - // Parse command line - // - if( (badArg = ParseCommandLine( argc, argv ))) { - - PrintResourceString(STRING_UNKNOW_ARG, argv[badArg]); - - Usage(argv[0]); - return -1; - } - - // - // Get the drive's format - // - if( !Drive ) { - - PrintResourceString(STRING_DRIVE_PARM); - Usage( argv[0] ); - return -1; - - } else { - - wcscpy( RootDirectory, Drive ); - } - RootDirectory[2] = L'\\'; - RootDirectory[3] = L'\0'; - - // - // See if the drive is removable or not - // - driveType = GetDriveTypeW( RootDirectory ); - switch (driveType) - { - case DRIVE_UNKNOWN : - LoadStringW(GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, szMsg, ARRAYSIZE(szMsg)); - PrintWin32Error( szMsg, GetLastError()); - return -1; - - case DRIVE_REMOTE: - case DRIVE_CDROM: - PrintResourceString(STRING_NO_SUPPORT); - return -1; - - case DRIVE_NO_ROOT_DIR: - LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); - PrintWin32Error( szMsg, GetLastError()); - return -1; - - case DRIVE_REMOVABLE: - PrintResourceString(STRING_INSERT_DISK, RootDirectory[0]); - fgetws( input, ARRAYSIZE(input), stdin ); - media = FMIFS_FLOPPY; - break; - - case DRIVE_FIXED: - case DRIVE_RAMDISK: - media = FMIFS_HARDDISK; - break; - } - - // Reject attempts to format the system drive - { - WCHAR path[MAX_PATH + 1]; - UINT rc; - rc = GetWindowsDirectoryW(path, MAX_PATH); - if (rc == 0 || rc > MAX_PATH) - // todo: Report "Unable to query system directory" - return -1; - if (towlower(path[0]) == towlower(Drive[0])) - { - // todo: report "Cannot format system drive" - PrintResourceString(STRING_NO_SUPPORT); - return -1; - } - } - - // - // Determine the drive's file system format - // - if( !GetVolumeInformationW( RootDirectory, - volumeName, ARRAYSIZE(volumeName), - &serialNumber, &maxComponent, &flags, - fileSystem, ARRAYSIZE(fileSystem))) { - - LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); - PrintWin32Error( szMsg, GetLastError()); - return -1; - } - - if( !GetDiskFreeSpaceExW( RootDirectory, - &freeBytesAvailableToCaller, - &totalNumberOfBytes, - &totalNumberOfFreeBytes )) { - - LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, szMsg, ARRAYSIZE(szMsg)); - PrintWin32Error( szMsg, GetLastError()); - return -1; - } - PrintResourceString(STRING_FILESYSTEM, fileSystem); - - // - // Make sure they want to do this - // - if( driveType == DRIVE_FIXED ) { - - if( volumeName[0] ) { - - while(1 ) { - - PrintResourceString(STRING_LABEL_NAME_EDIT, RootDirectory[0]); - fgetws( input, ARRAYSIZE(input), stdin ); - input[ wcslen( input ) - 1] = 0; - - if( !wcsicmp( input, volumeName )) { - - break; - } - PrintResourceString(STRING_ERROR_LABEL); - } - } - - PrintResourceString(STRING_YN_FORMAT, RootDirectory[0]); - - LoadStringW(GetModuleHandle(NULL), STRING_YES_NO_FAQ, szMsg, ARRAYSIZE(szMsg)); - - while( 1 ) { - fgetws( input, ARRAYSIZE(input), stdin ); - if(_wcsnicmp(&input[0],&szMsg[0],1) == 0) break; - if(_wcsnicmp(&input[0],&szMsg[1],1) == 0) { - wprintf(L"\n"); - return 0; - } - } - } - - // - // Tell the user we're doing a long format if appropriate - // - if( !QuickFormat ) { - - LoadStringW(GetModuleHandle(NULL), STRING_VERIFYING, szMsg, ARRAYSIZE(szMsg)); - - if( totalNumberOfBytes.QuadPart > 1024*1024*10 ) { - - PrintString(L"%s %luM\n",szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); - - } else { - - PrintString(L"%s %.1fM\n",szMsg, - ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); - } - } else { - - LoadStringW(GetModuleHandle(NULL), STRING_FAST_FMT, szMsg, ARRAYSIZE(szMsg)); - if( totalNumberOfBytes.QuadPart > 1024*1024*10 ) { - - PrintString(L"%s %luM\n",szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); - - } else { - - PrintString(L"%s %.2fM\n",szMsg, - ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); - } - PrintResourceString(STRING_CREATE_FSYS); - } - - // - // Format away! - // - FormatEx( RootDirectory, media, FileSystem, Label, QuickFormat, - ClusterSize, FormatExCallback ); - if( Error ) return -1; - PrintResourceString(STRING_FMT_COMPLETE); - - // - // Enable compression if desired - // - if( CompressDrive ) { - - if( !EnableVolumeCompression( RootDirectory, TRUE )) { - - PrintResourceString(STRING_VOL_COMPRESS); - } - } - - // - // Get the label if we don't have it - // - if( !GotALabel ) { - - PrintResourceString(STRING_ENTER_LABEL); - fgetws( input, ARRAYSIZE(LabelString), stdin ); - - input[ wcslen(input)-1] = 0; - if( !SetVolumeLabelW( RootDirectory, input )) { - - LoadStringW(GetModuleHandle(NULL), STRING_NO_LABEL, szMsg, ARRAYSIZE(szMsg)); - PrintWin32Error(szMsg, GetLastError()); - return -1; - } - } - - if( !GetVolumeInformationW( RootDirectory, - volumeName, ARRAYSIZE(volumeName), - &serialNumber, &maxComponent, &flags, - fileSystem, ARRAYSIZE(fileSystem))) { - - LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); - PrintWin32Error( szMsg, GetLastError()); - return -1; - } - - // - // Print out some stuff including the formatted size - // - if( !GetDiskFreeSpaceExW( RootDirectory, - &freeBytesAvailableToCaller, - &totalNumberOfBytes, - &totalNumberOfFreeBytes )) { - - LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, szMsg, ARRAYSIZE(szMsg)); - PrintWin32Error(szMsg, GetLastError()); - return -1; - } - - PrintResourceString(STRING_FREE_SPACE, totalNumberOfBytes.QuadPart, totalNumberOfFreeBytes.QuadPart ); - - // - // Get the drive's serial number - // - if( !GetVolumeInformationW( RootDirectory, - volumeName, ARRAYSIZE(volumeName), - &serialNumber, &maxComponent, &flags, - fileSystem, ARRAYSIZE(fileSystem))) { - - LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); - PrintWin32Error( szMsg, GetLastError()); - return -1; - } - PrintResourceString(STRING_SERIAL_NUMBER, - (unsigned int)(serialNumber >> 16), - (unsigned int)(serialNumber & 0xFFFF)); - - return 0; -} + // + // Parse command line + // + badArg = ParseCommandLine(argc, argv); + if (badArg) + { + PrintResourceString(STRING_UNKNOW_ARG, argv[badArg]); + Usage(argv[0]); + return -1; + } + + // + // Get the drive's format + // + if (!Drive) + { + PrintResourceString(STRING_DRIVE_PARM); + Usage(argv[0]); + return -1; + } + else + { + wcscpy(RootDirectory, Drive); + } + RootDirectory[2] = L'\\'; + RootDirectory[3] = L'\0'; + + // + // See if the drive is removable or not + // + driveType = GetDriveTypeW(RootDirectory); + switch (driveType) + { + case DRIVE_UNKNOWN : + LoadStringW(GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, szMsg, ARRAYSIZE(szMsg)); + PrintWin32Error(szMsg, GetLastError()); + return -1; + + case DRIVE_REMOTE: + case DRIVE_CDROM: + PrintResourceString(STRING_NO_SUPPORT); + return -1; + + case DRIVE_NO_ROOT_DIR: + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); + PrintWin32Error(szMsg, GetLastError()); + return -1; + + case DRIVE_REMOVABLE: + PrintResourceString(STRING_INSERT_DISK, RootDirectory[0]); + fgetws(input, ARRAYSIZE(input), stdin); + media = FMIFS_FLOPPY; + break; + + case DRIVE_FIXED: + case DRIVE_RAMDISK: + media = FMIFS_HARDDISK; + break; + } + + // Reject attempts to format the system drive + { + WCHAR path[MAX_PATH + 1]; + UINT rc; + rc = GetWindowsDirectoryW(path, MAX_PATH); + if (rc == 0 || rc > MAX_PATH) + // todo: Report "Unable to query system directory" + return -1; + if (towlower(path[0]) == towlower(Drive[0])) + { + // todo: report "Cannot format system drive" + PrintResourceString(STRING_NO_SUPPORT); + return -1; + } + } + + // + // Determine the drive's file system format + // + if (!GetVolumeInformationW(RootDirectory, + volumeName, ARRAYSIZE(volumeName), + &serialNumber, &maxComponent, &flags, + fileSystem, ARRAYSIZE(fileSystem))) + { + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); + PrintWin32Error(szMsg, GetLastError()); + return -1; + } + + if (!GetDiskFreeSpaceExW(RootDirectory, + &freeBytesAvailableToCaller, + &totalNumberOfBytes, + &totalNumberOfFreeBytes)) + { + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, szMsg, ARRAYSIZE(szMsg)); + PrintWin32Error(szMsg, GetLastError()); + return -1; + } + PrintResourceString(STRING_FILESYSTEM, fileSystem); + + // + // Make sure they want to do this + // + if (driveType == DRIVE_FIXED) + { + if (volumeName[0]) + { + while (TRUE) + { + PrintResourceString(STRING_LABEL_NAME_EDIT, RootDirectory[0]); + fgetws(input, ARRAYSIZE(input), stdin); + input[wcslen(input) - 1] = 0; + + if (!wcsicmp(input, volumeName)) + break; + + PrintResourceString(STRING_ERROR_LABEL); + } + } + + PrintResourceString(STRING_YN_FORMAT, RootDirectory[0]); + + LoadStringW(GetModuleHandle(NULL), STRING_YES_NO_FAQ, szMsg, ARRAYSIZE(szMsg)); + while (TRUE) + { + fgetws(input, ARRAYSIZE(input), stdin); + if (_wcsnicmp(&input[0], &szMsg[0], 1) == 0) break; + if (_wcsnicmp(&input[0], &szMsg[1], 1) == 0) + { + wprintf(L"\n"); + return 0; + } + } + } + + // + // Tell the user we're doing a long format if appropriate + // + if (!QuickFormat) + { + LoadStringW(GetModuleHandle(NULL), STRING_VERIFYING, szMsg, ARRAYSIZE(szMsg)); + if (totalNumberOfBytes.QuadPart > 1024*1024*10) + { + PrintString(L"%s %luM\n", szMsg, (DWORD)(totalNumberOfBytes.QuadPart/(1024*1024))); + } + else + { + PrintString(L"%s %.1fM\n", szMsg, + ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); + } + } + else + { + LoadStringW(GetModuleHandle(NULL), STRING_FAST_FMT, szMsg, ARRAYSIZE(szMsg)); + if (totalNumberOfBytes.QuadPart > 1024*1024*10) + { + PrintString(L"%s %luM\n", szMsg, (DWORD)(totalNumberOfBytes.QuadPart/(1024*1024))); + } + else + { + PrintString(L"%s %.2fM\n", szMsg, + ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); + } + PrintResourceString(STRING_CREATE_FSYS); + } + + // + // Format away! + // + FormatEx(RootDirectory, media, FileSystem, Label, QuickFormat, + ClusterSize, FormatExCallback); + if (Error) return -1; + PrintResourceString(STRING_FMT_COMPLETE); + + // + // Enable compression if desired + // + if (CompressDrive) + { + if (!EnableVolumeCompression(RootDirectory, TRUE)) + PrintResourceString(STRING_VOL_COMPRESS); + } + + // + // Get the label if we don't have it + // + if (!GotALabel) + { + PrintResourceString(STRING_ENTER_LABEL); + fgetws(input, ARRAYSIZE(LabelString), stdin); + + input[wcslen(input) - 1] = 0; + if (!SetVolumeLabelW(RootDirectory, input)) + { + LoadStringW(GetModuleHandle(NULL), STRING_NO_LABEL, szMsg, ARRAYSIZE(szMsg)); + PrintWin32Error(szMsg, GetLastError()); + return -1; + } + } + + if (!GetVolumeInformationW(RootDirectory, + volumeName, ARRAYSIZE(volumeName), + &serialNumber, &maxComponent, &flags, + fileSystem, ARRAYSIZE(fileSystem))) + { + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); + PrintWin32Error(szMsg, GetLastError()); + return -1; + } + + // + // Print out some stuff including the formatted size + // + if (!GetDiskFreeSpaceExW(RootDirectory, + &freeBytesAvailableToCaller, + &totalNumberOfBytes, + &totalNumberOfFreeBytes)) + { + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, szMsg, ARRAYSIZE(szMsg)); + PrintWin32Error(szMsg, GetLastError()); + return -1; + } + + PrintResourceString(STRING_FREE_SPACE, totalNumberOfBytes.QuadPart, + totalNumberOfFreeBytes.QuadPart); + + // + // Get the drive's serial number + // + if (!GetVolumeInformationW(RootDirectory, + volumeName, ARRAYSIZE(volumeName), + &serialNumber, &maxComponent, &flags, + fileSystem, ARRAYSIZE(fileSystem))) + { + LoadStringW(GetModuleHandle(NULL), STRING_NO_VOLUME, szMsg, ARRAYSIZE(szMsg)); + PrintWin32Error(szMsg, GetLastError()); + return -1; + } + PrintResourceString(STRING_SERIAL_NUMBER, + (unsigned int)(serialNumber >> 16), + (unsigned int)(serialNumber & 0xFFFF)); + + return 0; +} + +/* EOF */ Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Fri Mar 4 17:09:34 2016 @@ -362,11 +362,11 @@ VOID VfatPrint(PCHAR Format, ...) { - va_list valist; - - va_start(valist, Format); - VfatPrintV(Format, valist); - va_end(valist); + va_list args; + + va_start(args, Format); + VfatPrintV(Format, args); + va_end(args); }

1 0

[akhaldi] 70911: [PSAPI_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Fri Mar 4 09:44:49 2016 New Revision: 70911 URL: http://svn.reactos.org/svn/reactos?rev=70911&view=rev Log: [PSAPI_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/psapi/psapi_main.c Modified: trunk/rostests/winetests/psapi/psapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/psapi/psapi_mai… ============================================================================== --- trunk/rostests/winetests/psapi/psapi_main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/psapi/psapi_main.c [iso-8859-1] Fri Mar 4 09:44:49 2016 @@ -254,7 +254,7 @@ /* compare with values from SYSTEM_PROCESS_INFORMATION */ size = 0; status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &size); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_LENGTH_MISMATCH, got %08x\n", status); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); ok(size > 0, "incorrect length %d\n", size); while (status == STATUS_INFO_LENGTH_MISMATCH) {

1 0

[akhaldi] 70912: [RASAPI32] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Fri Mar 4 09:46:02 2016 New Revision: 70912 URL: http://svn.reactos.org/svn/reactos?rev=70912&view=rev Log: [RASAPI32] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/rasapi32/rasapi.c trunk/reactos/dll/win32/rasapi32/rasapi32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rasapi32/rasapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/rasapi.… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/rasapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasapi32/rasapi.c [iso-8859-1] Fri Mar 4 09:46:02 2016 @@ -498,6 +498,18 @@ return 0; } +DWORD WINAPI RasSetCustomAuthDataA(const char *phonebook, const char *entry, BYTE *authdata, DWORD size) +{ + FIXME("(%s,%s,%p,0x%08x), stub!\n", debugstr_a(phonebook), debugstr_a(entry), authdata, size); + return 0; +} + +DWORD WINAPI RasSetCustomAuthDataW(const WCHAR *phonebook, const WCHAR *entry, BYTE *authdata, DWORD size) +{ + FIXME("(%s,%s,%p,0x%08x), stub!\n", debugstr_w(phonebook), debugstr_w(entry), authdata, size); + return 0; +} + DWORD WINAPI RasSetEntryDialParamsA(LPCSTR lpszPhonebook, LPRASDIALPARAMSA lprasdialparams, BOOL fRemovePassword) { @@ -531,3 +543,9 @@ dwcbDeviceConfig); return 0; } + +DWORD WINAPI RasGetLinkStatistics(HRASCONN connection, DWORD entry, RAS_STATS *statistics) +{ + FIXME("(%p,%u,%p), stub!\n", connection, entry, statistics); + return 0; +} Modified: trunk/reactos/dll/win32/rasapi32/rasapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/rasapi3… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/rasapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasapi32/rasapi32.spec [iso-8859-1] Fri Mar 4 09:46:02 2016 @@ -45,9 +45,9 @@ @ stdcall RasGetErrorStringW(long ptr long) @ stub RasGetErrorStringWow @ stub RasGetHport +@ stdcall RasGetLinkStatistics(ptr long ptr) @ stdcall RasGetProjectionInfoA(ptr ptr ptr ptr) @ stdcall RasGetProjectionInfoW(ptr ptr ptr ptr) -@ stub RasGetLinkStatistics @ stub RasGetSubEntryHandleA @ stub RasGetSubEntryHandleW @ stub RasGetSubEntryPropertiesA @@ -65,6 +65,8 @@ @ stdcall RasSetAutodialParamW(long ptr long) @ stub RasSetCredentialsA @ stub RasSetCredentialsW +@ stdcall RasSetCustomAuthDataA(str str ptr long) +@ stdcall RasSetCustomAuthDataW(wstr wstr ptr long) @ stdcall RasSetEntryDialParamsA(str ptr long) @ stdcall RasSetEntryDialParamsW(wstr ptr long) @ stdcall RasSetEntryPropertiesA(str str ptr long ptr long) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Mar 4 09:46:02 2016 @@ -159,7 +159,7 @@ reactos/dll/win32/qmgr # Synced to WineStaging-1.9.4 reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.7.55 reactos/dll/win32/query # Synced to WineStaging-1.7.55 -reactos/dll/win32/rasapi32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/rasapi32 # Synced to WineStaging-1.9.4 reactos/dll/win32/resutils # Synced to WineStaging-1.7.55 reactos/dll/win32/riched20 # Synced to WineStaging-1.7.55 reactos/dll/win32/riched32 # Synced to WineStaging-1.7.55

1 0

[akhaldi] 70913: [PSDK] Update richedit.h. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Fri Mar 4 10:18:29 2016 New Revision: 70913 URL: http://svn.reactos.org/svn/reactos?rev=70913&view=rev Log: [PSDK] Update richedit.h. CORE-10912 Modified: trunk/reactos/include/psdk/richedit.h Modified: trunk/reactos/include/psdk/richedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/richedit.h?re… ============================================================================== --- trunk/reactos/include/psdk/richedit.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/richedit.h [iso-8859-1] Fri Mar 4 10:18:29 2016 @@ -692,7 +692,7 @@ typedef struct _repastespecial { DWORD dwAspect; - DWORD dwParam; + DWORD_PTR dwParam; } REPASTESPECIAL; typedef struct _punctuation { @@ -1068,8 +1068,8 @@ #define ST_DEFAULT 0x00000000 #define ST_KEEPUNDO 0x00000001 #define ST_SELECTION 0x00000002 - #define ST_NEWCHARS 0x00000004 +#define ST_UNICODE 0x00000008 #ifdef __cplusplus }

1 0

[rnaumann] 70914: [APPWIZ] Stubplement ConfigStartMenu Patch by Jared Smudde. CORE-10788
by rnaumann＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: rnaumann Date: Fri Mar 4 15:43:31 2016 New Revision: 70914 URL: http://svn.reactos.org/svn/reactos?rev=70914&view=rev Log: [APPWIZ] Stubplement ConfigStartMenu Patch by Jared Smudde. CORE-10788 Added: trunk/reactos/dll/cpl/appwiz/removestartmenuitems.c (with props) Modified: trunk/reactos/dll/cpl/appwiz/CMakeLists.txt trunk/reactos/dll/cpl/appwiz/appwiz.h trunk/reactos/dll/cpl/appwiz/appwiz.spec trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc trunk/reactos/dll/cpl/appwiz/lang/en-US.rc trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc trunk/reactos/dll/cpl/appwiz/lang/sq-AL.rc trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc trunk/reactos/dll/cpl/appwiz/lang/zh-TW.rc trunk/reactos/dll/cpl/appwiz/resource.h Modified: trunk/reactos/dll/cpl/appwiz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/CMakeLists.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/CMakeLists.txt [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -10,6 +10,7 @@ addons.c appwiz.c createlink.c + removestartmenuitems.c appwiz.h) file(GLOB appwiz_rc_deps resources/*.*) Modified: trunk/reactos/dll/cpl/appwiz/appwiz.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.h?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.h [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -43,6 +43,10 @@ LONG CALLBACK NewLinkHere(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2); +/* removestartmenuitems.c */ +LONG CALLBACK +ConfigStartMenu(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2); + void ShowLastWin32Error(HWND hWndOwner); typedef enum { Modified: trunk/reactos/dll/cpl/appwiz/appwiz.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.spec… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.spec [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.spec [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -1,4 +1,5 @@ @ stdcall CPlApplet(ptr long ptr ptr) +@ stdcall ConfigStartMenu(ptr long ptr ptr) @ stdcall NewLinkHere(ptr long ptr ptr) NewLinkHereA @ stdcall NewLinkHereA(ptr long ptr ptr) @ stdcall NewLinkHereW(ptr long ptr ptr) Modified: trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/bg-BG.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -41,6 +41,18 @@ LTEXT "ÐÐ°ÑÐ¸ÑÐ½ÐµÑÐµ ""ÐÑÐ°Ð¹"" Ð·Ð° ÑÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿ÑÐµÐ¿ÑÐ°ÑÐºÐ°.", -1, 120, 50, 170, 10 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -46,6 +46,18 @@ LTEXT "KliknutÃm na DokonÄit vytvoÅÃte zÃ¡stupce.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko InstalÃ¡tor" Modified: trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -41,6 +41,18 @@ LTEXT "Klicken Sie auf Fertig stellen, um die VerknÃ¼pfung zu erstellen.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installation" Modified: trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/el-GR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -41,6 +41,18 @@ LTEXT "Î Î±ÏÎ®ÏÏÎµ 'Î¤ÎÎ»Î¿Ï' Î³Î¹Î± Î½Î± Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÎµÏÎµ ÏÎ· ÏÏÎ½ÏÏÎ¼ÎµÏÏÎ·.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/en-US.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -41,6 +41,18 @@ LTEXT "Click Finish to create the shortcut.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -47,6 +47,18 @@ LTEXT "Haga clic en Finalizar para crear el acceso directo.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalador de Wine Gecko" Modified: trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -41,6 +41,18 @@ LTEXT "Cliquez sur Terminer pour crÃ©er le raccourci.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation du package Wine Gecko" Modified: trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/he-IL.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -42,6 +42,18 @@ LTEXT "×××¥ ×¢× ×¡××× ××× ×××¦××¨ ××ª ×§××¦××¨ ×××¨×.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -41,6 +41,18 @@ LTEXT "Premere Fine per creare il collegamento.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/no-NO.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -41,6 +41,18 @@ LTEXT "Trykk pÃ¥ fullfÃ¸rt for Ã¥ opprette snarveien.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -50,6 +50,18 @@ LTEXT "NaciÅnij ZakoÅcz by utworzyÄ skrÃ³t.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalator Wine Gecko" Modified: trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pt-BR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -43,6 +43,18 @@ LTEXT "Pressione Terminar para criar o atalho.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ro-RO.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -47,6 +47,18 @@ LTEXT "ApÄsaÈi âSfÃ¢rÈitâ pentru a crea scurtÄtura.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalare Wine Gecko" Modified: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -41,6 +41,18 @@ LTEXT "Ð©ÐµÐ»ÐºÐ½Ð¸ÑÐµ ""ÐÐ°Ð²ÐµÑÑÐ¸ÑÑ"" Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑÑÐ»ÑÐºÐ°.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ð£ÑÑÐ°Ð½Ð¾Ð²ÑÐ¸Ðº Wine Gecko" Modified: trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/sk-SK.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -45,6 +45,18 @@ LTEXT "Kliknite na tlaÄidlo DokonÄiÅ¥ pre vytvorenie odkazu.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/sq-AL.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/sq-AL.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -45,6 +45,18 @@ LTEXT "Kliko Finish per te krijuar njÃ« shortcut.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instaluesi Wine Gecko" Modified: trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/tr-TR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -43,6 +43,18 @@ LTEXT "KÄ±sayolu oluÅturmak iÃ§in ""Bitir""e tÄ±klayÄ±nÄ±z.", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Kurucusu" Modified: trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -49,6 +49,18 @@ LTEXT "Ð©Ð¾Ð± ÑÑÐ²Ð¾ÑÐ¸ÑÐ¸ ÑÑÐ»Ð¸Ðº, Ð½Ð°ÑÐ¸ÑÐ½ÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ ""ÐÐ¾ÑÐ¾Ð²Ð¾"".", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" Modified: trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/zh-CN.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -48,6 +48,18 @@ LTEXT "ç¹å»âå®æâåå»ºå¿«æ·æ¹å¼", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko å®è£å" Modified: trunk/reactos/dll/cpl/appwiz/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/zh-TW.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/zh-TW.rc [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -48,6 +48,18 @@ LTEXT "é»é¸âå®æâåµå»ºå¿«æ·æ¹å¼", -1, 118, 97, 178, 17 END +IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 + PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP +END + ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko å®è£å" Added: trunk/reactos/dll/cpl/appwiz/removestartmenuitems.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/removestart… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/removestartmenuitems.c (added) +++ trunk/reactos/dll/cpl/appwiz/removestartmenuitems.c [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -0,0 +1,46 @@ +/* + * PROJECT: ReactOS Software Control Panel + * FILE: dll/cpl/appwiz/removestartmenuitems.c + * PURPOSE: ReactOS Software Control Panel + * PROGRAMMERS: Jared Smudde (computerwhiz02(a)hotmail.com) + */ + +#include "appwiz.h" + +INT_PTR CALLBACK RemoveStartMenuItemsProc(HWND hwndCPl, UINT Message, WPARAM wParam, LPARAM lParam) +{ + switch(Message) + { + case WM_INITDIALOG: + return TRUE; + + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + EndDialog(hwndCPl, IDOK); + break; + case IDCANCEL: + EndDialog(hwndCPl, IDCANCEL); + break; + } + break; + default: + return FALSE; + } + return TRUE; +} + +LONG CALLBACK +ShowRemoveStartMenuItems(HWND hwndCPl, LPWSTR szPath) +{ + DialogBox(hApplet, MAKEINTRESOURCEW(IDD_CONFIG_STARTMENU), hwndCPl, RemoveStartMenuItemsProc); + return TRUE; +} + +LONG +CALLBACK +ConfigStartMenu(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + return ShowRemoveStartMenuItems(hwndCPl, (LPWSTR) lParam1); +} Propchange: trunk/reactos/dll/cpl/appwiz/removestartmenuitems.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/appwiz/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/resource.h [iso-8859-1] Fri Mar 4 15:43:31 2016 @@ -16,6 +16,7 @@ /* Dialogs */ #define IDD_SHORTCUT_LOCATION 203 #define IDD_SHORTCUT_FINISH 204 +#define IDD_CONFIG_STARTMENU 400 /* Bitmaps */ #define IDB_WATERMARK 5001 @@ -35,6 +36,8 @@ #define IDC_SHORTCUT_LOCATION 107 #define IDC_SHORTCUT_BROWSE 108 #define IDC_SHORTCUT_NAME 109 +#define IDC_STARTMENU_TREE 110 +#define IDC_REMOVE_ENTRIES 111 #define ID_DWL_GECKO_DIALOG 1200 #define ID_DWL_PROGRESS 1201

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs