Ros-diffs June 2016

ros-diffs@reactos.org

17 participants
228 discussions

[hbelusca] 71618: [DXDIAG]: Sync some translations with the english one.
by hbelusca＠svn.reactos.org 12 Jun '16

12 Jun '16

Author: hbelusca Date: Sun Jun 12 13:43:39 2016 New Revision: 71618 URL: http://svn.reactos.org/svn/reactos?rev=71618&view=rev Log: [DXDIAG]: Sync some translations with the english one. Modified: trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc trunk/reactos/base/applications/dxdiag/lang/de-DE.rc trunk/reactos/base/applications/dxdiag/lang/es-ES.rc trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc trunk/reactos/base/applications/dxdiag/lang/he-IL.rc trunk/reactos/base/applications/dxdiag/lang/it-IT.rc trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc trunk/reactos/base/applications/dxdiag/lang/no-NO.rc trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc trunk/reactos/base/applications/dxdiag/lang/uk-UA.rc trunk/reactos/base/applications/dxdiag/lang/zh-CN.rc trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc Modified: trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -238,7 +238,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Ð©Ðµ Ð±ÑÐ´Ðµ Ð¸Ð·Ð¿Ð¸ÑÐ°Ð½ DirectDraw Ð·Ð° Ð¸Ð·Ð¾Ð±ÑÐ°Ð·ÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÑÐ» ÐµÐºÑÐ°Ð½. Ð¢ÑÑÐ±Ð²Ð° Ð´Ð° Ð±ÑÐ´Ðµ Ð¸Ð·Ð¾Ð±ÑÐ°Ð·ÐµÐ½ Ð´Ð²Ð¸Ð¶ÐµÑ ÑÐµ Ð±ÑÐ» Ð¿ÑÐ°Ð²Ð¾ÑÐ³ÑÐ»Ð½Ð¸Ðº. ÐÐ° Ð¿ÑÐ¾Ð´ÑÐ»Ð¶Ð¸Ð¼ Ð»Ð¸?" IDS_DDFULLSCREEN_RESULT "ÐÐ¸Ð´ÑÑÑÐµ Ð»Ð¸ Ð±ÑÐ» Ð´Ð²Ð¸Ð¶ÐµÑ ÑÐµ Ð¿ÑÐ°Ð²Ð¾ÑÐ³ÑÐ»Ð½Ð¸Ðº Ð² ÑÐµÐ¶Ð¸Ð¼ âÑÑÐ» ÐµÐºÑÐ°Ð½â?" IDS_FORMAT_ADAPTER_MEM "%u ÐÐ" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u Ð±Ð¸ÑÐ°)(%uÐ¥Ñ)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u Ð±Ð¸ÑÐ°)(%uÐ¥Ñ)" IDS_OPTION_NO "ÐÐµ" IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?" IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface." Modified: trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -243,7 +243,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Tento test pouÅ¾ije DirectDraw k vykreslovÃ¡nÃ do celoobrazovkovÃ©ho mÃ³du. MÄl by bÃ½t vykreslen bÃlÃ½ pohybujÃcÃ se obdÃ©lnÃk. PokraÄovat?" IDS_DDFULLSCREEN_RESULT "VidÄli jste bÃlÃ½ pohybujÃcÃ se obdÃ©lnÃk v celoobrazovkovÃ©m mÃ³du?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "Ne" IDS_D3DTEST_DESCRIPTION "SpustÃ se test rozhranÃ Direct3D. PokraÄovat?" IDS_D3DTEST_D3Dx "Tento test pouÅ¾ije hardwarovÄ akcelerovanÃ© rozhranÃ Direct3D %u." Modified: trunk/reactos/base/applications/dxdiag/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/de-DE.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -238,7 +238,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Dieser Test wird DirectDraw benutzen, um im Vollbildmodus zu zeichnen. Ein bewegtes weiÃes Rechteck sollte zu sehen sein. Fortfahren?" IDS_DDFULLSCREEN_RESULT "Haben Sie das bewegte weiÃe Rechteck im Vollbildmodus gesehen?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "Nein" IDS_D3DTEST_DESCRIPTION "Dies wird den Direct3D-Interfacetest starten. Fortfahren?" IDS_D3DTEST_D3Dx "Dieser Test wird das hardwarebeschleunigte Direct3D %u Interface verwenden." Modified: trunk/reactos/base/applications/dxdiag/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/es-ES.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -240,7 +240,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Esta prueba usarÃ¡ DirectDraw para dibujar en pantalla completa. Debe aparecer un rectÃ¡ngulo blanco en movimiento. Â¿Desea continuar?" IDS_DDFULLSCREEN_RESULT "Â¿Ve un rectÃ¡ngulo blanco moviÃ©ndose en pantalla completa?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "No" IDS_D3DTEST_DESCRIPTION "Va a comenzar la prueba del interfaz Direct3D. Â¿Desea continuar?" IDS_D3DTEST_D3Dx "Esta prueba utilizarÃ¡ un interfaz Direct3D %u acelerado por hardware." Modified: trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -238,7 +238,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Ce test utilisera DirectDraw pour dessiner en mode plein Ã©cran. Un rectangle blanc en mouvement devrait Ãªtre dessinÃ©. Continuer ?" IDS_DDFULLSCREEN_RESULT "Avez-vous vu le rectangle blanc en mouvement en mode plein Ã©cran ?" IDS_FORMAT_ADAPTER_MEM "%u Mo" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "Non" IDS_D3DTEST_DESCRIPTION "Ceci va dÃ©marrer le test de l'interface Direct3D. Continuer ?" IDS_D3DTEST_D3Dx "Ce test va utiliser l'interface Direct3D %u accÃ©lÃ©rÃ©e matÃ©riellement." Modified: trunk/reactos/base/applications/dxdiag/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/he-IL.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -239,7 +239,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "×××××§× ×××× ×ª×©×ª××© ×- DirectDraw ××× ××¦×××¨ ×××¦× ××¡× ×××. ××ª× ××××¨ ××¨×××ª ×ª××× ××× × ×§××¤×¦×ª." IDS_DDFULLSCREEN_RESULT "××× ×¨×××ª ×ª××× ××× × ×§××¤×¦×ª ×××¡× ×××?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "××" IDS_D3DTEST_DESCRIPTION "×¤×¢××× ×× ×ª××××§ Direct3D ×××ª×§× ××. ××× ××××©××?" IDS_D3DTEST_D3Dx "××××§× ×× ×ª×©×ª××© ××××©×§× Direct3D %u ×××××¦×× ××××¦×¢××ª ××××¨×." Modified: trunk/reactos/base/applications/dxdiag/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/it-IT.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -238,7 +238,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Questo test utilizza DirectDraw per disegnare in una modalitÃ schermo intero. I Spostamenti del rettangolo bianco devono essere compilati. Continuare?" IDS_DDFULLSCREEN_RESULT "Hai visto un rettangolo bianco in movimento in modalitÃ schermo intero?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "No" IDS_D3DTEST_DESCRIPTION "Avviare il test dell'interfaccia Direct3D. Continuare?" IDS_D3DTEST_D3Dx "Questo test utilizza accelerazione hardware dell'interfaccia Direct3D % u." Modified: trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -238,7 +238,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "ãã®ãã¹ãã§ã¯ãDirectDraw ãä½¿ã£ã¦å¨ç»é¢è¡¨ç¤ºã¢ã¼ãã§æç»ãã¾ããç§»åãã¦ããç½ãç©å½¢ãæç»ããã¾ããç¶è¡ãã¾ãã?" IDS_DDFULLSCREEN_RESULT "å¨ç»é¢è¡¨ç¤ºã¢ã¼ãã§ç§»åãã¦ããç½ãç©å½¢ãè¦ãã¾ããã?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "ããã" IDS_D3DTEST_DESCRIPTION "Direct3D ã¤ã³ã¿ãã§ã¼ã¹ãã¹ããéå§ãããã¨ãã¦ãã¾ããç¶è¡ãã¾ãã?" IDS_D3DTEST_D3Dx "ãã®ãã¹ãã¯ãã¼ãã¦ã§ã¢ ã¢ã¯ã»ã©ã¼ã¬ã¼ã¿ Direct3D %u ã¤ã³ã¿ã¼ãã§ã¤ã¹ãä½¿ãã¾ãã" Modified: trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -240,7 +240,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "ì´ íì¤í¸ë DirectDrawë¥¼ ì¬ì©íì¬ ì ì²´ íë©´ì ê·¸ë¦´ ê²ìëë¤. ìì§ì´ë íì ì¬ê°íìì´ ê·¸ë ¤ì§ ê²ìëë¤. ê³ìí ê¹ì?" IDS_DDFULLSCREEN_RESULT "ì ì²´ íë©´ ìíìì ìì§ì´ë íì ì¬ê°íì ë³´ì¨ëì?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u ë¹í¸)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u ë¹í¸)(%uHz)" IDS_OPTION_NO "ìëì¤" IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?" IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface." Modified: trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -238,7 +238,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "De volgende test gebruikt DirectDraw om te tekenen op het primaire oppervlak in de modus voor het volledige scherm. Er moet een stuiterend wit vlak worden weergegeven. Wilt u doorgaan?" IDS_DDFULLSCREEN_RESULT "Hebt u het stuiterende vlak op het volledige scherm gezien?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "Nee" IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?" IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface." Modified: trunk/reactos/base/applications/dxdiag/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/no-NO.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -238,7 +238,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Denne testen vil bruke DirectDraw to draw in a fullscreen mode. Moving white rectangle should be drawn. Fortsette?" IDS_DDFULLSCREEN_RESULT "SÃ¥ du de hvite bevegende rektangeler i fullskjermmodus?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "Nei" IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?" IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface." Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -247,7 +247,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Ten test wykorzysta DirectDraw do rysowania w trybie peÅnoekranowym. Narysowany zostanie poruszajÄcy siÄ biaÅy kwadrat. KontynuowaÄ?" IDS_DDFULLSCREEN_RESULT "Czy byÅo widaÄ poruszajÄcy siÄ biaÅy kwadrat, w trybie peÅnoekranowym?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "Nie" IDS_D3DTEST_DESCRIPTION "Uruchomiony zostanie test interfejsu Direct3D. KontynuowaÄ?" IDS_D3DTEST_D3Dx "Test obejmie przyspieszany sprzÄtowo interfejs Direct3D dla %u." Modified: trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -240,7 +240,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Este teste utilizarÃ¡ DirectDraw para desenhar em tela cheia. Um retÃ¢ngulo branco em movimento serÃ¡ desenhado. Prosseguir?" IDS_DDFULLSCREEN_RESULT "VocÃª visualizou o retÃ¢ngulo branco se movendo em tela cheia?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "NÃ£o" IDS_D3DTEST_DESCRIPTION "SerÃ¡ iniciada a interface de teste do Direct3D. Prosseguir?" IDS_D3DTEST_D3Dx "Este teste utilizarÃ¡ a interface Direct3D %u com aceleraÃ§Ã£o por hardware." Modified: trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -244,7 +244,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Testul urmÄtor va utiliza DirectDraw pentru desenarea unui dreptunghi alb Ã®n miÈcare utilizÃ¢nd tot ecranul. ContinuaÈi?" IDS_DDFULLSCREEN_RESULT "Pe ecranul complet, dreptunghiul alb Ã®n miÈcare a fost vizibil?" IDS_FORMAT_ADAPTER_MEM "%u Mo" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u biÈi)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u biÈi)(%uHz)" IDS_OPTION_NO "Nu" IDS_D3DTEST_DESCRIPTION "UrmeazÄ testul de interfaÈÄ Direct3D. ContinuaÈi?" IDS_D3DTEST_D3Dx "Testul urmÄtor va utiliza interfaÈa Direct3D %u cu accelerare de echipament fizic." Modified: trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -243,7 +243,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen mode. Moving white rectangle should be drawn. Continue?" IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen mode?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "Nie" IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?" IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface." Modified: trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -242,7 +242,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Ky test do tÃ« pÃ«rdorÃ« DirectDraw pÃ«r tÃ« nxjerrÃ« nÃ« njÃ« buffer tÃ« paangazhuar. LÃ«vizja e drejtkÃ«ndÃ«shit tÃ« bardhÃ« duhet tÃ« vizatohet. Vazhdo?" IDS_DDFULLSCREEN_RESULT "A e shihni ju drejtkÃ«ndÃ«sh tÃ« bardhÃ« tÃ« lÃ«vizshem nÃ« ekran tÃ« plotÃ«?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "No" IDS_D3DTEST_DESCRIPTION "Kjo do tÃ« fillojÃ« ndÃ«rfaqes etestit Direct3D. Vazhdo?" IDS_D3DTEST_D3Dx "Ky test do tÃ« pÃ«rdore pjesÃ« elektronike tÃ« pÃ«rshpejtuara pÃ«r Direct3D %u ndÃ«rfaqe." Modified: trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -245,7 +245,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Denna testen kommer att anvÃ¤nda DirectDraw fÃ¶r att rita i fullskÃ¤rmslÃ¤ge. En animerad vit rektangel kommer att ritas. FortsÃ¤tta?" IDS_DDFULLSCREEN_RESULT "SÃ¥g du en vit animerad rektangel i fullskÃ¤rmslÃ¤ge?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "Nej" IDS_D3DTEST_DESCRIPTION "Detta kommer att starta Direct3D enhetstest. FortsÃ¤tt?" IDS_D3DTEST_D3Dx "Detta testet kommer att anvÃ¤nda hÃ¥rdvaruaccellererad Direct3D %u enheten." Modified: trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -240,7 +240,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Bu sÄ±nama, ReactDraw'Ä± tÃ¼m gÃ¶rÃ¼ntÃ¼lÃ¼kte Ã§izmek iÃ§in kullanacak. Devinen bir ak dikdÃ¶rtgen gÃ¶receksiniz. SÃ¼rdÃ¼rmek ister misiniz?" IDS_DDFULLSCREEN_RESULT "TÃ¼m gÃ¶rÃ¼ntÃ¼lÃ¼kte devinen bir ak dikdÃ¶rtgen gÃ¶rdÃ¼nÃ¼z mÃ¼?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%d*%d (%u bitlik) (%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bitlik) (%uHz)" IDS_OPTION_NO "HayÄ±r" IDS_D3DTEST_DESCRIPTION "Bu, React3D arayÃ¼z sÄ±namasÄ±nÄ± baÅlatÄ±lacak. SÃ¼rdÃ¼rmek ister misiniz?" IDS_D3DTEST_D3Dx "Bu sÄ±nama, donanÄ±m ivmeli React3D %u arayÃ¼zÃ¼nÃ¼ kullanacak." Modified: trunk/reactos/base/applications/dxdiag/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/uk-UA.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -246,7 +246,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Ð¦ÐµÐ¹ ÑÐµÑÑ Ð±ÑÐ´Ðµ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ DirectDraw Ð´Ð»Ñ Ð¼Ð°Ð»ÑÐ²Ð°Ð½Ð½Ñ Ð² Ð¿Ð¾Ð²Ð½Ð¾ÐµÐºÑÐ°Ð½Ð½Ð¾Ð¼Ñ ÑÐµÐ¶Ð¸Ð¼Ñ. ÐÐ¾Ð²Ð¸Ð½ÐµÐ½ ÑÑÑÐ°ÑÐ¸ÑÑ Ð±ÑÐ»Ð¸Ð¹ Ð¿ÑÑÐ¼Ð¾ÐºÑÑÐ½Ð¸Ðº. ÐÑÐ¾Ð´Ð¾Ð²Ð¶Ð¸ÑÐ¸?" IDS_DDFULLSCREEN_RESULT "ÐÐ¸ Ð±Ð°ÑÐ¸Ð»Ð¸, ÑÐº ÑÑÑÐ°Ð²ÑÑ Ð±ÑÐ»Ð¸Ð¹ Ð¿ÑÑÐ¼Ð¾ÐºÑÑÐ½Ð¸Ðº Ð² Ð¿Ð¾Ð²Ð½Ð¾ÐµÐºÑÐ°Ð½Ð½Ð¾Ð¼Ñ ÑÐµÐ¶Ð¸Ð¼Ñ?" IDS_FORMAT_ADAPTER_MEM "%u ÐÐ±" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u Ð±ÑÑ)(%uÐÑ)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u Ð±ÑÑ)(%uÐÑ)" IDS_OPTION_NO "ÐÑ" IDS_D3DTEST_DESCRIPTION "ÐÑÐ´Ðµ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð° Ð¿ÐµÑÐµÐ²ÑÑÐºÐ° ÑÐ½ÑÐµÑÑÐµÐ¹ÑÑ Direct3D. ÐÑÐ¾Ð´Ð¾Ð²Ð¶Ð¸ÑÐ¸?" IDS_D3DTEST_D3Dx "Ð¦ÐµÐ¹ ÑÐµÑÑ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ñ Ð°Ð¿Ð°ÑÐ°ÑÐ½Ð¾-Ð¿ÑÐ¸ÑÐºÐ¾ÑÐµÐ½Ð¸Ð¹ Direct3D ÑÐ½ÑÐµÑÑÐµÐ¹Ñ %u." Modified: trunk/reactos/base/applications/dxdiag/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/zh-CN.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -246,7 +246,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "æ¤æµè¯å°ä½¿ç¨ DirectDraw å¨å¨è¤å¹æ¨¡å¼ç»å¾ãä½ åºä¼çè§å¨ç§»å¨çç½è²ç©å½¢ãè¦ç»§ç»ï¼" IDS_DDFULLSCREEN_RESULT "ä½ å¨å¨è¤å¹æ¨¡å¼ä¸çè§å¨ç§»å¨çç½è²ç©å½¢åï¼" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "å¦" IDS_D3DTEST_DESCRIPTION "è¿å°å¯å¨ Direct3D çé¢æµè¯ãè¦ç»§ç»ï¼" IDS_D3DTEST_D3Dx "æ¤æµè¯å°ä½¿ç¨ç¡¬ä½å éç Direct3D %u çé¢ã" Modified: trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -246,7 +246,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "æ¤æ¸¬è©¦å°ä½¿ç¨ DirectDraw å¨å¨è¢å¹æ¨¡å¼ç¹ªåãä½ ææçè¦å¨ç§»åçç½è²ç©å½¢ãè¦ç¹¼çºï¼" IDS_DDFULLSCREEN_RESULT "ä½ å¨å¨è¢å¹æ¨¡å¼ä¸çè¦å¨ç§»åçç½è²ç©å½¢åï¼" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "å¦" IDS_D3DTEST_DESCRIPTION "éå°åå Direct3D çé¢æ¸¬è©¦ãè¦ç¹¼çºï¼" IDS_D3DTEST_D3Dx "æ¤æ¸¬è©¦å°ä½¿ç¨ç¡¬é«å éç Direct3D %u çé¢ã"

1 0

[tthompson] 71616: [NTFS] Add fixes to WriteAttribute(): -Remove erroneous check for end of run (before writing to the last run returned) -Properly dereference RealLengthWritten pointer, as reporte...
by tthompson＠svn.reactos.org 12 Jun '16

12 Jun '16

Author: tthompson Date: Sun Jun 12 04:02:52 2016 New Revision: 71616 URL: http://svn.reactos.org/svn/reactos?rev=71616&view=rev Log: [NTFS] Add fixes to WriteAttribute(): -Remove erroneous check for end of run (before writing to the last run returned) -Properly dereference RealLengthWritten pointer, as reported in CR-90 Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sun Jun 12 04:02:52 2016 @@ -520,17 +520,6 @@ } else DataRunStartLCN = -1; - - if (*DataRun == 0) - { - if (Length == 0) - return STATUS_SUCCESS; - - // This code shouldn't execute, because we should have extended the allocation size - // or failed the request by now. It's just a sanity check. - DPRINT1("Encountered EOF before expected!\n"); - return STATUS_END_OF_FILE; - } } // Do we have more data to write? @@ -559,7 +548,7 @@ Length -= WriteLength; SourceBuffer += WriteLength; - RealLengthWritten += WriteLength; + *RealLengthWritten += WriteLength; // We finished this request, but there's still data in this data run. if (Length == 0 && WriteLength != DataRunLength * Vcb->NtfsInfo.BytesPerCluster)

1 0

[ekohl] 71615: [SC] Implement the qc, qdescription and qfailure commands.
by ekohl＠svn.reactos.org 11 Jun '16

11 Jun '16

Author: ekohl Date: Sat Jun 11 21:24:40 2016 New Revision: 71615 URL: http://svn.reactos.org/svn/reactos?rev=71615&view=rev Log: [SC] Implement the qc, qdescription and qfailure commands. Added: trunk/reactos/base/applications/sc/qc.c (with props) trunk/reactos/base/applications/sc/qdescription.c (with props) trunk/reactos/base/applications/sc/qfailure.c (with props) Modified: trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/sc/sc.c trunk/reactos/base/applications/sc/sc.h trunk/reactos/base/applications/sc/usage.c Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Sat Jun 11 21:24:40 2016 @@ -6,6 +6,9 @@ create.c delete.c print.c + qc.c + qdescription.c + qfailure.c query.c sc.c sdset.c Added: trunk/reactos/base/applications/sc/qc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/qc.c?… ============================================================================== --- trunk/reactos/base/applications/sc/qc.c (added) +++ trunk/reactos/base/applications/sc/qc.c [iso-8859-1] Sat Jun 11 21:24:40 2016 @@ -0,0 +1,190 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/sc/qc.c + * PURPOSE: Show the service configuration + * COPYRIGHT: Copyright 2016 Eric Kohl + * + */ + +#include "sc.h" + +BOOL QueryConfig(LPCTSTR ServiceName) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + BOOL bResult = TRUE; + DWORD cbBytesNeeded = 0; + LPQUERY_SERVICE_CONFIG pServiceConfig = NULL; + LPWSTR lpPtr; + INT nLen, i; + +#ifdef SCDBG + _tprintf(_T("service to show configuration - %s\n\n"), ServiceName); +#endif + + hManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_CONNECT); + if (hManager == NULL) + { + bResult = FALSE; + goto done; + } + + hService = OpenService(hManager, ServiceName, SERVICE_QUERY_CONFIG); + if (hService == NULL) + { + bResult = FALSE; + goto done; + } + + if (!QueryServiceConfig(hService, + NULL, + 0, + &cbBytesNeeded)) + { + if (cbBytesNeeded == 0) + { + bResult = FALSE; + goto done; + } + } + + pServiceConfig = HeapAlloc(GetProcessHeap(), 0, cbBytesNeeded); + if (pServiceConfig == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + bResult = FALSE; + goto done; + } + + if (!QueryServiceConfig(hService, + pServiceConfig, + cbBytesNeeded, + &cbBytesNeeded)) + { + bResult = FALSE; + goto done; + } + + _tprintf(_T("SERVICE_NAME: %s\n"), ServiceName); + _tprintf(_T(" TYPE : %-3lx "), pServiceConfig->dwServiceType); + switch (pServiceConfig->dwServiceType) + { + case SERVICE_KERNEL_DRIVER: + _tprintf(_T("KERNEL_DRIVER\n")); + break; + + case SERVICE_FILE_SYSTEM_DRIVER: + _tprintf(_T("FILE_SYSTEM_DRIVER\n")); + break; + + case SERVICE_WIN32_OWN_PROCESS: + _tprintf(_T("WIN32_OWN_PROCESS\n")); + break; + + case SERVICE_WIN32_SHARE_PROCESS: + _tprintf(_T("WIN32_SHARE_PROCESS\n")); + break; + + case SERVICE_WIN32_OWN_PROCESS + SERVICE_INTERACTIVE_PROCESS: + _tprintf(_T("WIN32_OWN_PROCESS (interactive)\n")); + break; + + case SERVICE_WIN32_SHARE_PROCESS + SERVICE_INTERACTIVE_PROCESS: + _tprintf(_T("WIN32_SHARE_PROCESS (interactive)\n")); + break; + + default: + _tprintf(_T("\n")); + break; + } + + _tprintf(_T(" START_TYPE : %-3lx "), pServiceConfig->dwStartType); + switch (pServiceConfig->dwStartType) + { + case SERVICE_BOOT_START: + _tprintf(_T("BOOT_START\n")); + break; + + case SERVICE_SYSTEM_START: + _tprintf(_T("SYSTEM_START\n")); + break; + + case SERVICE_AUTO_START: + _tprintf(_T("AUTO_START\n")); + break; + + case SERVICE_DEMAND_START: + _tprintf(_T("DEMAND_START\n")); + break; + + case SERVICE_DISABLED: + _tprintf(_T("DISABLED\n")); + break; + + default: + _tprintf(_T("\n")); + break; + } + + _tprintf(_T(" ERROR_CONTROL : %-3lx "), pServiceConfig->dwErrorControl); + switch (pServiceConfig->dwErrorControl) + { + case SERVICE_ERROR_IGNORE: + _tprintf(_T("IGNORE\n")); + break; + + case SERVICE_ERROR_NORMAL: + _tprintf(_T("NORMAL\n")); + break; + + case SERVICE_ERROR_SEVERE: + _tprintf(_T("SEVERE\n")); + break; + + case SERVICE_ERROR_CRITICAL: + _tprintf(_T("CRITICAL\n")); + break; + + default: + _tprintf(_T("\n")); + break; + } + + _tprintf(_T(" BINARY_PATH_NAME : %s\n"), pServiceConfig->lpBinaryPathName); + _tprintf(_T(" LOAD_ORDER_GROUP : %s\n"), pServiceConfig->lpLoadOrderGroup); + _tprintf(_T(" TAG : %lu\n"), pServiceConfig->dwTagId); + _tprintf(_T(" DISPLAY_NAME : %s\n"), pServiceConfig->lpDisplayName); + _tprintf(_T(" DEPENDENCIES : ")); + lpPtr = pServiceConfig->lpDependencies; + i = 0; + while (*lpPtr != _T('\0')) + { + nLen = _tcslen(lpPtr); + if (i != 0) + _tprintf(_T("\n : ")); + _tprintf(_T("%s"), lpPtr); + lpPtr = lpPtr + nLen + 1; + i++; + } + _tprintf(_T("\n")); + + _tprintf(_T(" SERVICE_START_NAME : %s\n"), pServiceConfig->lpServiceStartName); + +done: + if (bResult == FALSE) + ReportLastError(); + + if (pServiceConfig != NULL) + HeapFree(GetProcessHeap(), 0, pServiceConfig); + + if (hService) + CloseServiceHandle(hService); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} Propchange: trunk/reactos/base/applications/sc/qc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/sc/qdescription.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/qdesc… ============================================================================== --- trunk/reactos/base/applications/sc/qdescription.c (added) +++ trunk/reactos/base/applications/sc/qdescription.c [iso-8859-1] Sat Jun 11 21:24:40 2016 @@ -0,0 +1,88 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/sc/qdescription.c + * PURPOSE: Show the service description + * COPYRIGHT: Copyright 2016 Eric Kohl + * + */ + +#include "sc.h" + +BOOL QueryDescription(LPCTSTR ServiceName) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + BOOL bResult = TRUE; + DWORD cbBytesNeeded = 0; + LPSERVICE_DESCRIPTION pServiceDescription = NULL; + +#ifdef SCDBG + _tprintf(_T("service to show description - %s\n\n"), ServiceName); +#endif + + hManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_CONNECT); + if (hManager == NULL) + { + bResult = FALSE; + goto done; + } + + hService = OpenService(hManager, ServiceName, SERVICE_QUERY_CONFIG); + if (hService == NULL) + { + bResult = FALSE; + goto done; + } + + if (!QueryServiceConfig2(hService, + SERVICE_CONFIG_DESCRIPTION, + NULL, + 0, + &cbBytesNeeded)) + { + if (cbBytesNeeded == 0) + { + bResult = FALSE; + goto done; + } + } + + pServiceDescription = HeapAlloc(GetProcessHeap(), 0, cbBytesNeeded); + if (pServiceDescription == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + bResult = FALSE; + goto done; + } + + if (!QueryServiceConfig2(hService, + SERVICE_CONFIG_DESCRIPTION, + (LPBYTE)pServiceDescription, + cbBytesNeeded, + &cbBytesNeeded)) + { + bResult = FALSE; + goto done; + } + + _tprintf(_T("SERVICE_NAME: %s\n"), ServiceName); + _tprintf(_T(" DESCRIPTION : %s\n"), pServiceDescription->lpDescription); + +done: + if (bResult == FALSE) + ReportLastError(); + + if (pServiceDescription != NULL) + HeapFree(GetProcessHeap(), 0, pServiceDescription); + + if (hService) + CloseServiceHandle(hService); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} Propchange: trunk/reactos/base/applications/sc/qdescription.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/sc/qfailure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/qfail… ============================================================================== --- trunk/reactos/base/applications/sc/qfailure.c (added) +++ trunk/reactos/base/applications/sc/qfailure.c [iso-8859-1] Sat Jun 11 21:24:40 2016 @@ -0,0 +1,118 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/sc/qfailure.c + * PURPOSE: Show the service failure action + * COPYRIGHT: Copyright 2016 Eric Kohl + * + */ + +#include "sc.h" + +BOOL QueryFailure(LPCTSTR ServiceName) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + BOOL bResult = TRUE; + DWORD cbBytesNeeded = 0; + LPSERVICE_FAILURE_ACTIONS pServiceFailure = NULL; + INT i; + +#ifdef SCDBG + _tprintf(_T("service to show failure action - %s\n\n"), ServiceName); +#endif + + hManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_CONNECT); + if (hManager == NULL) + { + bResult = FALSE; + goto done; + } + + hService = OpenService(hManager, ServiceName, SERVICE_QUERY_CONFIG); + if (hService == NULL) + { + bResult = FALSE; + goto done; + } + + if (!QueryServiceConfig2(hService, + SERVICE_CONFIG_FAILURE_ACTIONS, + NULL, + 0, + &cbBytesNeeded)) + { + if (cbBytesNeeded == 0) + { + bResult = FALSE; + goto done; + } + } + + pServiceFailure = HeapAlloc(GetProcessHeap(), 0, cbBytesNeeded); + if (pServiceFailure == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + bResult = FALSE; + goto done; + } + + if (!QueryServiceConfig2(hService, + SERVICE_CONFIG_FAILURE_ACTIONS, + (LPBYTE)pServiceFailure, + cbBytesNeeded, + &cbBytesNeeded)) + { + bResult = FALSE; + goto done; + } + + _tprintf(_T("SERVICE_NAME: %s\n"), ServiceName); + _tprintf(_T(" RESET_PERIOD : %lu seconds\n"), pServiceFailure->dwResetPeriod); + _tprintf(_T(" REBOOT_MESSAGE : %s\n"), (pServiceFailure->lpRebootMsg) ? pServiceFailure->lpRebootMsg : _T("")); + _tprintf(_T(" COMMAND_LINE : %s\n"), (pServiceFailure->lpCommand) ? pServiceFailure->lpCommand : _T("")); + _tprintf(_T(" FAILURE_ACTIONS : ")); + for (i = 0; i < pServiceFailure->cActions; i++) + { + if (i != 0) + _tprintf(_T(" ")); + switch (pServiceFailure->lpsaActions[i].Type) + { + case SC_ACTION_NONE: + continue; + + case SC_ACTION_RESTART: + _tprintf(_T("RESTART -- Delay = %lu milliseconds.\n"), pServiceFailure->lpsaActions[i].Delay); + break; + + case SC_ACTION_REBOOT: + _tprintf(_T("REBOOT -- Delay = %lu milliseconds.\n"), pServiceFailure->lpsaActions[i].Delay); + break; + + case SC_ACTION_RUN_COMMAND: + _tprintf(_T("RUN_COMMAND -- Delay = %lu milliseconds.\n"), pServiceFailure->lpsaActions[i].Delay); + break; + + default: + _tprintf(_T("\n")); + break; + } + } + +done: + if (bResult == FALSE) + ReportLastError(); + + if (pServiceFailure != NULL) + HeapFree(GetProcessHeap(), 0, pServiceFailure); + + if (hService) + CloseServiceHandle(hService); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} Propchange: trunk/reactos/base/applications/sc/qfailure.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sc/sc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.c?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.c [iso-8859-1] Sat Jun 11 21:24:40 2016 @@ -208,6 +208,42 @@ else SdSetUsage(); } + else if (!lstrcmpi(Command, _T("qc"))) + { + if (ArgCount > 0) + { + ServiceName = *ServiceArgs++; + ArgCount--; + + QueryConfig(ServiceName); + } + else + QueryConfigUsage(); + } + else if (!lstrcmpi(Command, _T("qdescription"))) + { + if (ArgCount > 0) + { + ServiceName = *ServiceArgs++; + ArgCount--; + + QueryDescription(ServiceName); + } + else + QueryDescriptionUsage(); + } + else if (!lstrcmpi(Command, _T("qfailure"))) + { + if (ArgCount > 0) + { + ServiceName = *ServiceArgs++; + ArgCount--; + + QueryFailure(ServiceName); + } + else + QueryFailureUsage(); + } else { MainUsage(); Modified: trunk/reactos/base/applications/sc/sc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.h?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.h [iso-8859-1] Sat Jun 11 21:24:40 2016 @@ -21,6 +21,9 @@ LPSERVICE_STATUS_PROCESS QueryService(LPCTSTR ServiceName); BOOL SdShow(LPCTSTR ServiceName); BOOL SdSet(LPCTSTR ServiceName, LPCTSTR SecurityDescriptor); +BOOL QueryConfig(LPCTSTR ServiceName); +BOOL QueryDescription(LPCTSTR ServiceName); +BOOL QueryFailure(LPCTSTR ServiceName); /* print and error functions */ VOID PrintService(LPCTSTR ServiceName, LPSERVICE_STATUS_PROCESS pStatus, BOOL bExtended); @@ -40,5 +43,8 @@ VOID ControlUsage(VOID); VOID SdShowUsage(VOID); VOID SdSetUsage(VOID); +VOID QueryConfigUsage(VOID); +VOID QueryDescriptionUsage(VOID); +VOID QueryFailureUsage(VOID); #endif /* _SC_PCH_ */ Modified: trunk/reactos/base/applications/sc/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/usage… ============================================================================== --- trunk/reactos/base/applications/sc/usage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/usage.c [iso-8859-1] Sat Jun 11 21:24:40 2016 @@ -36,9 +36,9 @@ // "\t config : Changes the configuration of a service (persistant).\n" // "\t description : Changes the description of a service.\n" // "\t failure : Changes the actions taken by a service upon failure.\n" -// "\t qc : Queries the configuration information for a service.\n" -// "\t qdescription : Queries the description for a service.\n" -// "\t qfailure : Queries the actions taken by a service upon failure.\n" + _T("\t qc : Queries the configuration information for a service.\n") + _T("\t qdescription : Queries the description for a service.\n") + _T("\t qfailure : Queries the actions taken by a service upon failure.\n") _T("\t delete : Deletes a service (from the registry).\n") _T("\t create : Creates a service. (adds it to the registry).\n") _T("\t control : Sends a control to a service.\n") @@ -194,15 +194,39 @@ VOID SdShowUsage(VOID) { _tprintf(_T("DESCRIPTION:\n") - _T(" Displays a service's security descriptor in SDDL format.\n") - _T("USAGE:\n") - _T(" sc <server> sdshow <service name>\n")); + _T(" Displays a service's security descriptor in SDDL format.\n") + _T("USAGE:\n") + _T(" sc <server> sdshow <service name>\n")); } VOID SdSetUsage(VOID) { _tprintf(_T("DESCRIPTION:\n") - _T(" Sets a service's security descriptor.\n") - _T("USAGE:\n") - _T(" sc <server> sdset <service name> <SD in SDDL format>\n")); -} + _T(" Sets a service's security descriptor.\n") + _T("USAGE:\n") + _T(" sc <server> sdset <service name> <SD in SDDL format>\n")); +} + +VOID QueryConfigUsage(VOID) +{ + _tprintf(_T("DESCRIPTION:\n") + _T(" Queries the configuration information for a service.\n") + _T("USAGE:\n") + _T(" sc <server> qc [service name] <bufferSize>\n")); +} + +VOID QueryDescriptionUsage(VOID) +{ + _tprintf(_T("DESCRIPTION:\n") + _T(" Retrieves the description string of a service.\n") + _T("USAGE:\n") + _T(" sc <server> qdescription [service name] <bufferSize>\n")); +} + +VOID QueryFailureUsage(VOID) +{ + _tprintf(_T("DESCRIPTION:\n") + _T(" Retrieves the actions performed on service failure.\n") + _T("USAGE:\n") + _T(" sc <server> qfailure [service name] <bufferSize>\n")); +}

1 0

[mjansen] 71614: [APPHELP] Implement automatic stringtable generation when writing an Sdb database. CORE-10367
by mjansen＠svn.reactos.org 11 Jun '16

11 Jun '16

Author: mjansen Date: Sat Jun 11 21:12:43 2016 New Revision: 71614 URL: http://svn.reactos.org/svn/reactos?rev=71614&view=rev Log: [APPHELP] Implement automatic stringtable generation when writing an Sdb database. CORE-10367 Added: trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c (with props) trunk/reactos/dll/appcompat/apphelp/sdbstringtable.h (with props) trunk/reactos/dll/appcompat/hacking.txt (with props) Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt trunk/reactos/dll/appcompat/apphelp/apphelp.h trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/reactos/dll/appcompat/apphelp/sdbpapi.h trunk/reactos/dll/appcompat/apphelp/sdbtypes.h trunk/reactos/dll/appcompat/apphelp/sdbwrite.c Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/CMak… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -5,9 +5,10 @@ apphelp.c layer.c sdbapi.c + sdbfileattr.c sdbread.c + sdbstringtable.c sdbwrite.c - sdbfileattr.c apphelp.spec apphelp.h ${CMAKE_CURRENT_BINARY_DIR}/apphelp_stubs.c) Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -50,26 +50,11 @@ }; } ATTRINFO, *PATTRINFO; -typedef enum _SHIM_LOG_LEVEL { - SHIM_ERR = 1, - SHIM_WARN = 2, - SHIM_INFO = 3, -}SHIM_LOG_LEVEL; - /* apphelp.c */ -BOOL WINAPIV ShimDbgPrint(SHIM_LOG_LEVEL Level, PCSTR FunctionName, PCSTR Format, ...); -extern ULONG g_ShimDebugLevel; - -#define SHIM_ERR(fmt, ...) do { if (g_ShimDebugLevel) ShimDbgPrint(SHIM_ERR, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) -#define SHIM_WARN(fmt, ...) do { if (g_ShimDebugLevel) ShimDbgPrint(SHIM_WARN, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) -#define SHIM_INFO(fmt, ...) do { if (g_ShimDebugLevel) ShimDbgPrint(SHIM_INFO, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) - #include "sdbpapi.h" PWSTR SdbpStrDup(LPCWSTR string); -BOOL WINAPI SdbpCheckTagType(TAG tag, WORD type); -BOOL WINAPI SdbpCheckTagIDType(PDB db, TAGID tagid, WORD type); PDB WINAPI SdbOpenDatabase(LPCWSTR path, PATH_TYPE type); void WINAPI SdbCloseDatabase(PDB); Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -23,6 +23,7 @@ #include "ntndk.h" #include "strsafe.h" #include "apphelp.h" +#include "sdbstringtable.h" #include "wine/unicode.h" @@ -228,9 +229,6 @@ InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, NULL, NULL); - //Status = NtCreateFile(&db->file, FILE_GENERIC_READ | SYNCHRONIZE, - // &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, - // FILE_OPEN, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); Status = NtCreateFile(&db->file, (write ? FILE_GENERIC_WRITE : FILE_GENERIC_READ )| SYNCHRONIZE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, write ? FILE_SUPERSEDE : FILE_OPEN, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); @@ -454,6 +452,10 @@ if (db->file) NtClose(db->file); + if (db->string_buffer) + SdbCloseDatabase(db->string_buffer); + if (db->string_lookup) + SdbpTableDestroy(&db->string_lookup); SdbFree(db->data); SdbFree(db); } Modified: trunk/reactos/dll/appcompat/apphelp/sdbpapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbp… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbpapi.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbpapi.h [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -68,6 +68,22 @@ DWORD SdbpStrlen(PCWSTR string); DWORD SdbpStrsize(PCWSTR string); +BOOL WINAPI SdbpCheckTagType(TAG tag, WORD type); +BOOL WINAPI SdbpCheckTagIDType(PDB db, TAGID tagid, WORD type); + + +typedef enum _SHIM_LOG_LEVEL { + SHIM_ERR = 1, + SHIM_WARN = 2, + SHIM_INFO = 3, +} SHIM_LOG_LEVEL; + +BOOL WINAPIV ShimDbgPrint(SHIM_LOG_LEVEL Level, PCSTR FunctionName, PCSTR Format, ...); +extern ULONG g_ShimDebugLevel; + +#define SHIM_ERR(fmt, ...) do { if (g_ShimDebugLevel) ShimDbgPrint(SHIM_ERR, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) +#define SHIM_WARN(fmt, ...) do { if (g_ShimDebugLevel) ShimDbgPrint(SHIM_WARN, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) +#define SHIM_INFO(fmt, ...) do { if (g_ShimDebugLevel) ShimDbgPrint(SHIM_INFO, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) #ifdef __cplusplus } // extern "C" Added: trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbs… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c (added) +++ trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -0,0 +1,157 @@ +/* + * Copyright 2016 Mark Jansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if !defined(SDBWRITE_HOSTTOOL) +#define WIN32_NO_STATUS +#include "windows.h" +#include "sdbtypes.h" +#include "sdbpapi.h" +#else /* !defined(SDBWRITE_HOSTTOOL) */ +#include <typedefs.h> +#include "sdbtypes.h" +#include "sdbpapi.h" +#endif /* !defined(SDBWRITE_HOSTTOOL) */ + +#include "sdbstringtable.h" + +#define DEFAULT_TABLE_SIZE 0x100 + +typedef struct SdbHashEntry +{ + struct SdbHashEntry* Next; + TAGID Tagid; + WCHAR Name[1]; +} SdbHashEntry; + +struct SdbStringHashTable +{ + DWORD Size; + struct SdbHashEntry** Entries; +}; + + +static struct SdbStringHashTable* HashCreate(void) +{ + struct SdbStringHashTable* tab = SdbAlloc(sizeof(*tab)); + if (!tab) + { + SHIM_ERR("Failed to allocate 8 bytes.\r\n"); + return tab; + } + tab->Size = DEFAULT_TABLE_SIZE; + tab->Entries = SdbAlloc(tab->Size * sizeof(*tab->Entries)); + return tab; +} + + +void SdbpTableDestroy(struct SdbStringHashTable** pTable) +{ + struct SdbStringHashTable* table = *pTable; + struct SdbHashEntry* entry, *next; + DWORD n, depth = 0, once = 1; + + *pTable = NULL; + for (n = 0; n < table->Size; ++n) + { + depth = 0; + entry = next = table->Entries[n]; + while (entry) + { + next = entry->Next; + SdbFree(entry); + entry = next; + depth++; + } + if (once && depth > 3) + { + // warn + once = 0; + } + } + SdbFree(table->Entries); + SdbFree(table); +} + +/* Based on RtlHashUnicodeString */ +static DWORD StringHash(const WCHAR* str) +{ + DWORD hash = 0; + for (; *str; str++) + { + hash = ((65599 * hash) + (ULONG)(*str)); + } + return hash; +} + +static struct SdbHashEntry** TableFindPtr(struct SdbStringHashTable* table, const WCHAR* str) +{ + DWORD hash = StringHash(str); + struct SdbHashEntry** entry = &table->Entries[hash % table->Size]; + while (*entry) + { + if (!wcscmp((*entry)->Name, str)) + return entry; + entry = &(*entry)->Next; + } + return entry; +} + +static BOOL HashAddString(struct SdbStringHashTable* table, struct SdbHashEntry** position, const WCHAR* str, TAGID tagid) +{ + struct SdbHashEntry* entry; + SIZE_T size; + + if (!position) + position = TableFindPtr(table, str); + + size = offsetof(struct SdbHashEntry, Name[SdbpStrlen(str) + 2]); + entry = (*position) = SdbAlloc(size); + if (!entry) + { + SHIM_ERR("Failed to allocate %u bytes.", size); + return FALSE; + } + entry->Tagid = tagid; + wcscpy(entry->Name, str); + return TRUE; +} + + +BOOL SdbpAddStringToTable(struct SdbStringHashTable** table, const WCHAR* str, TAGID* tagid) +{ + struct SdbHashEntry** entry; + + if (!*table) + { + *table = HashCreate(); + if (!*table) + { + SHIM_ERR("Error creating hash table\n"); + return FALSE; + } + } + + entry = TableFindPtr(*table, str); + if (*entry) + { + *tagid = (*entry)->Tagid; + return FALSE; + } + return HashAddString(*table, entry, str, *tagid); +} + Propchange: trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/appcompat/apphelp/sdbstringtable.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbs… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbstringtable.h (added) +++ trunk/reactos/dll/appcompat/apphelp/sdbstringtable.h [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -0,0 +1,57 @@ +/* + * Copyright 2016 Mark Jansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef SDBSTRINGTABLE_H +#define SDBSTRINGTABLE_H + +#ifdef __cplusplus +extern "C" { +#endif + + +/** + * Destroy the hashtable and release all resources. + * + * @param [in] table Pointer to table pointer, will be cleared after use + * + */ +void SdbpTableDestroy(struct SdbStringHashTable* * table); + +/** + * Find an entry in the stringtable, or allocate it when an entry could not be found. + * - When the string specified does not yet exist, a new entry will be added to the table, + * and the pTagid specified will be associated with this string. + * - When the string specified does already exist, + * the TAGID associated with this string will be returned in pTagid. + * + * + * @param [in] table Pointer to table pointer, will be allocated when needed. + * @param [in] str The string to search for + * @param [in,out] pTagid + * the data written (in bytes) + * + * @return TRUE if the string was added to the table, FALSE if it already existed + */ +BOOL SdbpAddStringToTable(struct SdbStringHashTable* * table, const WCHAR* str, TAGID* pTagid); + + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // SDBSTRINGTABLE_H Propchange: trunk/reactos/dll/appcompat/apphelp/sdbstringtable.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/appcompat/apphelp/sdbtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbt… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbtypes.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbtypes.h [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -39,6 +39,8 @@ TAGID stringtable; DWORD write_iter; GUID database_id; + struct SdbStringHashTable* string_lookup; + struct _DB* string_buffer; } DB, *PDB; typedef enum _PATH_TYPE { Modified: trunk/reactos/dll/appcompat/apphelp/sdbwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbw… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbwrite.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbwrite.c [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -1,6 +1,6 @@ /* - * Copyright 2011 André Hentschel - * Copyright 2013 Mislav Blaevic + * Copyright 2011 AndrÃ© Hentschel + * Copyright 2013 Mislav BlaÅ¾eviÄ * Copyright 2015,2016 Mark Jansen * * This library is free software; you can redistribute it and/or @@ -19,27 +19,28 @@ */ #if !defined(SDBWRITE_HOSTTOOL) - #define WIN32_NO_STATUS #include "windows.h" #include "ntndk.h" -#include "apphelp.h" -#include "wine/unicode.h" - #else - #include <typedefs.h> #include <guiddef.h> +#endif #include "sdbtypes.h" #include "sdbpapi.h" #include "sdbtagid.h" - -#endif - +#include "sdbstringtable.h" + + +/* Local functions */ BOOL WINAPI SdbWriteStringRefTag(PDB db, TAG tag, TAGID tagid); +BOOL WINAPI SdbWriteStringTag(PDB db, TAG tag, LPCWSTR string); TAGID WINAPI SdbBeginWriteListTag(PDB db, TAG tag); BOOL WINAPI SdbEndWriteListTag(PDB db, TAGID tagid); + +/* sdbapi.c */ +void WINAPI SdbCloseDatabase(PDB); static void WINAPI SdbpWrite(PDB db, const void* data, DWORD size) @@ -57,19 +58,35 @@ static BOOL WINAPI SdbpGetOrAddStringRef(PDB db, LPCWSTR string, TAGID* tagid) { - /* TODO: - - Insert or find in stringtable - - return TAGID - */ - - return FALSE; -} - -static void WINAPI SdbpWriteStringtable(PDB db) -{ - TAGID table = SdbBeginWriteListTag(db, TAG_STRINGTABLE); - /* TODO: Write out all strings*/ - SdbEndWriteListTag(db, table); + PDB buf = db->string_buffer; + if (db->string_buffer == NULL) + { + db->string_buffer = buf = SdbpAlloc(sizeof(DB)); + if (buf == NULL) + return FALSE; + buf->size = 128; + buf->data = SdbAlloc(buf->size); + if (buf->data == NULL) + return FALSE; + } + + *tagid = buf->write_iter + sizeof(TAG) + sizeof(DWORD); + if (SdbpAddStringToTable(&db->string_lookup, string, tagid)) + return SdbWriteStringTag(buf, TAG_STRINGTABLE_ITEM, string); + + return db->string_lookup != NULL; +} + +static BOOL WINAPI SdbpWriteStringtable(PDB db) +{ + TAGID table; + PDB buf = db->string_buffer; + if (buf == NULL || db->string_lookup == NULL) + return FALSE; + + table = SdbBeginWriteListTag(db, TAG_STRINGTABLE); + SdbpWrite(db, buf->data, buf->write_iter); + return SdbEndWriteListTag(db, table); } /** Added: trunk/reactos/dll/appcompat/hacking.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/hacking.txt?… ============================================================================== --- trunk/reactos/dll/appcompat/hacking.txt (added) +++ trunk/reactos/dll/appcompat/hacking.txt [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -0,0 +1,23 @@ + +Set the environment variable 'SHIM_DEBUG_LEVEL' to '4' before loading apphelp.dll for debug info related to loading / matching modules. +The environment variable 'SHIMENG_DEBUG_LEVEL' is related to the hooking code. + + +When there is not enough debug output, force memory allocations to fail: + +pSdbCreateDatabase + [Err ][SdbpCreateFile ] Failed to convert DOS path "TEST1.SDB" + [Err ][SdbCreateDatabase ] Failed to create the database. + [Err ][SdbpWriteBufferedData] Failed to allocate 65548 bytes. + +pSdbWriteStringTag + [Err ][SdbpAddStringToTable] Error Gettting temp path 0x8 + [Err ][SdbpCreateFile ] Failed to convert DOS path "C:\Users\MAE67~1.JAN\AppData\Local\Temp\SDBAB16.tmp" + [Err ][SdbpAddStringToTable] Error copying string table temp filename + [Err ][HashCreate ] Failed to allocate 8 bytes. + [Err ][SdbpAddStringToTable] Error creating hash table + [Err ][HashAddString ] Failed to allocate 22 bytes. + +pSdbCloseDatabaseWrite + [Err ][SdbCloseDatabase ] Failed to close the file. + [Err ][SdbpDeleteFile ] Failed to convert DOS path "C:\Users\MAE67~1.JAN\AppData\Local\Temp\SDBAB2D.tmp" Propchange: trunk/reactos/dll/appcompat/hacking.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 71613: [PIFMGR]: Add the PIF icon resource library. By Jared Smudde, Lee Schroeder, Ercan Ersoy, manuel. Icons adapted from Tango Icon set and from public domain OpenClipArt (https://ope...
by hbelusca＠svn.reactos.org 11 Jun '16

11 Jun '16

Author: hbelusca Date: Sat Jun 11 16:16:26 2016 New Revision: 71613 URL: http://svn.reactos.org/svn/reactos?rev=71613&view=rev Log: [PIFMGR]: Add the PIF icon resource library. By Jared Smudde, Lee Schroeder, Ercan Ersoy, manuel. Icons adapted from Tango Icon set and from public domain OpenClipArt (https://openclipart.org/share) Part 1/2 CORE-10253 Added: trunk/reactos/subsystems/mvdm/pifmgr/ trunk/reactos/subsystems/mvdm/pifmgr/CMakeLists.txt (with props) trunk/reactos/subsystems/mvdm/pifmgr/README.txt (with props) trunk/reactos/subsystems/mvdm/pifmgr/pifmgr.rc (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/ trunk/reactos/subsystems/mvdm/pifmgr/res/00.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/01.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/02.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/03.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/04.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/06.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/08.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/09.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/11.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/13.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/14.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/15.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/24.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/25.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/29.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/32.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/33.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/36.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/37.ico (with props) Modified: trunk/reactos/subsystems/mvdm/CMakeLists.txt Modified: trunk/reactos/subsystems/mvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/CMakeLists… ============================================================================== --- trunk/reactos/subsystems/mvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/CMakeLists.txt [iso-8859-1] Sat Jun 11 16:16:26 2016 @@ -5,6 +5,7 @@ add_subdirectory(config) add_subdirectory(dos) add_subdirectory(ntvdm) +add_subdirectory(pifmgr) if(ARCH STREQUAL "i386") add_subdirectory(samples) endif() Added: trunk/reactos/subsystems/mvdm/pifmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/CMa… ============================================================================== --- trunk/reactos/subsystems/mvdm/pifmgr/CMakeLists.txt (added) +++ trunk/reactos/subsystems/mvdm/pifmgr/CMakeLists.txt [iso-8859-1] Sat Jun 11 16:16:26 2016 @@ -0,0 +1,6 @@ + +file(GLOB pifmgr_rc_deps res/*.*) +add_rc_deps(pifmgr.rc ${pifmgr_rc_deps}) +add_library(pifmgr SHARED pifmgr.rc) +set_module_type(pifmgr win32dll UNICODE ENTRYPOINT 0) +add_cd_file(TARGET pifmgr DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/subsystems/mvdm/pifmgr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/mvdm/pifmgr/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/REA… ============================================================================== --- trunk/reactos/subsystems/mvdm/pifmgr/README.txt (added) +++ trunk/reactos/subsystems/mvdm/pifmgr/README.txt [iso-8859-1] Sat Jun 11 16:16:26 2016 @@ -0,0 +1,38 @@ + +Most icons are from the Tango icon set. The other ones come from: + +OpenClipArt license: https://openclipart.org/share + + +DOS icon +https://commons.wikimedia.org/wiki/File:Contrived_MS-DOS_logo.svg + +Umbrella, based on +https://openclipart.org/detail/226065/open-umbrella + +Cube icon, based on +https://openclipart.org/detail/168258/3d-cube-icon + +Beach ball, based on +https://openclipart.org/detail/172888/simple-beach-ball + +Column +https://openclipart.org/detail/25388/architetto-capitello-modanatura + +Domino +https://openclipart.org/detail/3525/domino-set-15 + +Race flag +https://openclipart.org/detail/62779/wavy-checkered-flag + +Semaphore, based on +https://openclipart.org/detail/66427/traffic-semaphore-red-light +https://openclipart.org/detail/66433/traffic-semaphore-yellow-light +https://openclipart.org/detail/66421/traffic-semaphore-green-light + +Crossed swords +https://openclipart.org/detail/3058/crossed-swords + +Shield and sword, based on +Tango shield icon, and +https://openclipart.org/detail/22432/toy-sword Propchange: trunk/reactos/subsystems/mvdm/pifmgr/README.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/mvdm/pifmgr/pifmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/pif… ============================================================================== --- trunk/reactos/subsystems/mvdm/pifmgr/pifmgr.rc (added) +++ trunk/reactos/subsystems/mvdm/pifmgr/pifmgr.rc [iso-8859-1] Sat Jun 11 16:16:26 2016 @@ -0,0 +1,50 @@ +#include <windef.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS PIF Manager Icon Resource Library" +#define REACTOS_STR_INTERNAL_NAME "pifmgr" +#define REACTOS_STR_ORIGINAL_FILENAME "pifmgr.dll" +#include <reactos/version.rc> + +/* Icons */ +1 ICON "res/01.ico" +2 ICON "res/02.ico" +3 ICON "res/03.ico" +4 ICON "res/04.ico" +5 ICON "res/00.ico" +6 ICON "res/06.ico" +7 ICON "res/00.ico" +8 ICON "res/08.ico" +9 ICON "res/09.ico" +/* No icon 10 */ +11 ICON "res/11.ico" +12 ICON "res/00.ico" +13 ICON "res/13.ico" +14 ICON "res/14.ico" +15 ICON "res/15.ico" +16 ICON "res/00.ico" +17 ICON "res/00.ico" +18 ICON "res/00.ico" +19 ICON "res/00.ico" +20 ICON "res/00.ico" +21 ICON "res/00.ico" +22 ICON "res/00.ico" +23 ICON "res/00.ico" +24 ICON "res/24.ico" +25 ICON "res/25.ico" +26 ICON "res/00.ico" +27 ICON "res/00.ico" +28 ICON "res/00.ico" +29 ICON "res/29.ico" +30 ICON "res/00.ico" +31 ICON "res/00.ico" +32 ICON "res/32.ico" +33 ICON "res/33.ico" +34 ICON "res/00.ico" +35 ICON "res/00.ico" +36 ICON "res/36.ico" +37 ICON "res/37.ico" +38 ICON "res/00.ico" +39 ICON "res/00.ico" Propchange: trunk/reactos/subsystems/mvdm/pifmgr/pifmgr.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/mvdm/pifmgr/res/00.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/00.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/01.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/01.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/02.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/02.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/03.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/03.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/04.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/04.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/06.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/06.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/08.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/08.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/09.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/09.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/11.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/11.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/13.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/13.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/14.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/14.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/15.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/15.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/24.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/24.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/25.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/25.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/29.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/29.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/32.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/32.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/33.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/33.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/36.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/36.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/37.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/37.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[ekohl] 71612: [SC] Implement the sdset command.
by ekohl＠svn.reactos.org 11 Jun '16

11 Jun '16

Author: ekohl Date: Sat Jun 11 15:01:01 2016 New Revision: 71612 URL: http://svn.reactos.org/svn/reactos?rev=71612&view=rev Log: [SC] Implement the sdset command. Added: trunk/reactos/base/applications/sc/sdset.c (with props) Modified: trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/sc/sc.c trunk/reactos/base/applications/sc/sc.h trunk/reactos/base/applications/sc/usage.c Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Sat Jun 11 15:01:01 2016 @@ -8,6 +8,7 @@ print.c query.c sc.c + sdset.c sdshow.c start.c usage.c Modified: trunk/reactos/base/applications/sc/sc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.c?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.c [iso-8859-1] Sat Jun 11 15:01:01 2016 @@ -191,6 +191,23 @@ else SdShowUsage(); } + else if (!lstrcmpi(Command, _T("sdset"))) + { + LPCTSTR SecurityDescriptor; + + if (ArgCount > 1) + { + ServiceName = *ServiceArgs++; + ArgCount--; + + SecurityDescriptor = *ServiceArgs++; + ArgCount--; + + SdSet(ServiceName, SecurityDescriptor); + } + else + SdSetUsage(); + } else { MainUsage(); Modified: trunk/reactos/base/applications/sc/sc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.h?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.h [iso-8859-1] Sat Jun 11 15:01:01 2016 @@ -20,6 +20,7 @@ LPSERVICE_STATUS_PROCESS QueryService(LPCTSTR ServiceName); BOOL SdShow(LPCTSTR ServiceName); +BOOL SdSet(LPCTSTR ServiceName, LPCTSTR SecurityDescriptor); /* print and error functions */ VOID PrintService(LPCTSTR ServiceName, LPSERVICE_STATUS_PROCESS pStatus, BOOL bExtended); @@ -38,5 +39,6 @@ VOID CreateUsage(VOID); VOID ControlUsage(VOID); VOID SdShowUsage(VOID); +VOID SdSetUsage(VOID); #endif /* _SC_PCH_ */ Added: trunk/reactos/base/applications/sc/sdset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sdset… ============================================================================== --- trunk/reactos/base/applications/sc/sdset.c (added) +++ trunk/reactos/base/applications/sc/sdset.c [iso-8859-1] Sat Jun 11 15:01:01 2016 @@ -0,0 +1,71 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/sc/sdset.c + * PURPOSE: Set a service security descriptor + * COPYRIGHT: Copyright 2016 Eric Kohl + * + */ + +#include "sc.h" + +BOOL SdSet(LPCTSTR ServiceName, LPCTSTR StringSecurityDescriptor) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + BOOL bResult = TRUE; + ULONG ulSecurityDescriptorSize = 0; + PSECURITY_DESCRIPTOR pSecurityDescriptor = NULL; + +#ifdef SCDBG + _tprintf(_T("service to set sd - %s\n\n"), ServiceName); +#endif + + hManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_CONNECT); + if (hManager == NULL) + { + bResult = FALSE; + goto done; + } + + hService = OpenService(hManager, ServiceName, WRITE_DAC); + if (hService == NULL) + { + bResult = FALSE; + goto done; + } + + if (!ConvertStringSecurityDescriptorToSecurityDescriptor(StringSecurityDescriptor, + SDDL_REVISION_1, + &pSecurityDescriptor, + &ulSecurityDescriptorSize)) + { + bResult = FALSE; + goto done; + } + + if (!SetServiceObjectSecurity(hService, + DACL_SECURITY_INFORMATION, + pSecurityDescriptor)) + { + bResult = FALSE; + goto done; + } + +done: + if (bResult == FALSE) + ReportLastError(); + + if (pSecurityDescriptor != NULL) + LocalFree(pSecurityDescriptor); + + if (hService) + CloseServiceHandle(hService); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} Propchange: trunk/reactos/base/applications/sc/sdset.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sc/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/usage… ============================================================================== --- trunk/reactos/base/applications/sc/usage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/usage.c [iso-8859-1] Sat Jun 11 15:01:01 2016 @@ -42,8 +42,8 @@ _T("\t delete : Deletes a service (from the registry).\n") _T("\t create : Creates a service. (adds it to the registry).\n") _T("\t control : Sends a control to a service.\n") - _T("\t sdshow : Displays a service's security descriptor.\n")); -// "\t sdset : Sets a service's security descriptor.\n") + _T("\t sdshow : Displays a service's security descriptor.\n") + _T("\t sdset : Sets a service's security descriptor.\n")); // "\t GetDisplayName : Gets the DisplayName for a service.\n") // "\t GetKeyName : Gets the ServiceKeyName for a service.\n") // "\t EnumDepend : Enumerates Service Dependencies.\n") @@ -198,3 +198,11 @@ _T("USAGE:\n") _T(" sc <server> sdshow <service name>\n")); } + +VOID SdSetUsage(VOID) +{ + _tprintf(_T("DESCRIPTION:\n") + _T(" Sets a service's security descriptor.\n") + _T("USAGE:\n") + _T(" sc <server> sdset <service name> <SD in SDDL format>\n")); +}

1 0

[ekohl] 71611: [SERVICES] - Read the service security descriptors when the service list is created. - Assign and write the default security descriptor when a service does not have its own security ...
by ekohl＠svn.reactos.org 11 Jun '16

11 Jun '16

Author: ekohl Date: Sat Jun 11 09:41:05 2016 New Revision: 71611 URL: http://svn.reactos.org/svn/reactos?rev=71611&view=rev Log: [SERVICES] - Read the service security descriptors when the service list is created. - Assign and write the default security descriptor when a service does not have its own security desciptor. - Delete a service security desciptor when the service is deleted. Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Sat Jun 11 09:41:05 2016 @@ -586,10 +586,17 @@ _Out_ PSECURITY_DESCRIPTOR *ppSecurityDescriptor) { PSECURITY_DESCRIPTOR pRelativeSD = NULL; + PSECURITY_DESCRIPTOR pResizedBuffer = NULL; HKEY hSecurityKey = NULL; DWORD dwBufferLength = 0; + DWORD dwAbsoluteSDSize = 0; DWORD dwType; DWORD dwError; + NTSTATUS Status; + + DPRINT("ScmReadSecurityDescriptor()\n"); + + *ppSecurityDescriptor = NULL; dwError = RegOpenKeyExW(hServiceKey, L"Security", @@ -598,7 +605,11 @@ &hSecurityKey); if (dwError != ERROR_SUCCESS) { -DPRINT1("\n"); + DPRINT("RegOpenKeyExW() failed (Error %lu)\n", dwError); + + /* Do not fail if the Security key does not exist */ + if (dwError == ERROR_FILE_NOT_FOUND) + dwError = ERROR_SUCCESS; goto done; } @@ -610,19 +621,24 @@ &dwBufferLength); if (dwError != ERROR_SUCCESS) { -DPRINT1("\n"); + DPRINT("RegQueryValueExW() failed (Error %lu)\n", dwError); + + /* Do not fail if the Security value does not exist */ + if (dwError == ERROR_FILE_NOT_FOUND) + dwError = ERROR_SUCCESS; goto done; } + DPRINT("dwBufferLength: %lu\n", dwBufferLength); pRelativeSD = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, dwBufferLength); if (pRelativeSD == NULL) { -DPRINT1("\n"); return ERROR_OUTOFMEMORY; } + DPRINT("pRelativeSD: %lu\n", pRelativeSD); dwError = RegQueryValueExW(hSecurityKey, L"Security", 0, @@ -631,20 +647,48 @@ &dwBufferLength); if (dwError != ERROR_SUCCESS) { -DPRINT1("\n"); goto done; } - + Status = RtlSelfRelativeToAbsoluteSD2(pRelativeSD, + &dwAbsoluteSDSize); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + pResizedBuffer = RtlReAllocateHeap(RtlGetProcessHeap(), + 0, + pRelativeSD, + dwAbsoluteSDSize); + if (pResizedBuffer == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + pRelativeSD = pResizedBuffer; + Status = RtlSelfRelativeToAbsoluteSD2(pRelativeSD, + &dwAbsoluteSDSize); + if (!NT_SUCCESS(Status)) + { + dwError = RtlNtStatusToDosError(Status); + goto done; + } + } + else if (!NT_SUCCESS(Status)) + { + + dwError = RtlNtStatusToDosError(Status); + goto done; + } + + *ppSecurityDescriptor = pRelativeSD; done: - if (pRelativeSD != NULL) + if (dwError != ERROR_SUCCESS && pRelativeSD != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, pRelativeSD); if (hSecurityKey != NULL) RegCloseKey(hSecurityKey); - return dwError; } Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sat Jun 11 09:41:05 2016 @@ -554,8 +554,10 @@ /* Decrement the group reference counter */ ScmSetServiceGroup(lpService, NULL); - /* FIXME: SecurityDescriptor */ - + /* Release the SecurityDescriptor */ + if ((lpService->pSecurityDescriptor != NULL) && + (lpService->pSecurityDescriptor != pDefaultServiceSD)) + HeapFree(GetProcessHeap(), 0, lpService->pSecurityDescriptor); /* Remove the Service from the List */ RemoveEntryList(&lpService->ServiceListEntry); @@ -693,7 +695,27 @@ if (ScmIsDeleteFlagSet(hServiceKey)) lpService->bDeleted = TRUE; -done:; + if (lpService->Status.dwServiceType & SERVICE_WIN32) + { + dwError = ScmReadSecurityDescriptor(hServiceKey, + &lpService->pSecurityDescriptor); + if (dwError != ERROR_SUCCESS) + goto done; + + /* Assing the default security descriptor if the security descriptor cannot be read */ + if (lpService->pSecurityDescriptor == NULL) + { + DPRINT("No security descriptor found! Assign default security descriptor!\n"); + lpService->pSecurityDescriptor = pDefaultServiceSD; + + dwError = ScmWriteSecurityDescriptor(hServiceKey, + lpService->pSecurityDescriptor); + if (dwError != ERROR_SUCCESS) + goto done; + } + } + +done: if (lpGroup != NULL) HeapFree(GetProcessHeap(), 0, lpGroup); Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sat Jun 11 09:41:05 2016 @@ -139,6 +139,11 @@ _In_ HKEY hServiceKey, _In_ PSECURITY_DESCRIPTOR pSecurityDescriptor); +DWORD +ScmReadSecurityDescriptor( + _In_ HKEY hServiceKey, + _Out_ PSECURITY_DESCRIPTOR *ppSecurityDescriptor); + /* controlset.c */

1 0

[pschweitzer] 71610: [FASTFAT] Properly round up 64b values. This fixes reads on 4GB+ volumes. Patch by Wim Hueskes. CORE-10932 #resolve #comment Thanks for the patch! Commited in r71610
by pschweitzer＠svn.reactos.org 11 Jun '16

11 Jun '16

Author: pschweitzer Date: Sat Jun 11 09:32:00 2016 New Revision: 71610 URL: http://svn.reactos.org/svn/reactos?rev=71610&view=rev Log: [FASTFAT] Properly round up 64b values. This fixes reads on 4GB+ volumes. Patch by Wim Hueskes. CORE-10932 #resolve #comment Thanks for the patch! Commited in r71610 Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/fastfat/rw.c trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Sat Jun 11 09:32:00 2016 @@ -668,7 +668,7 @@ } rcFCB->RFCB.FileSize.QuadPart = Size; rcFCB->RFCB.ValidDataLength.QuadPart = Size; - rcFCB->RFCB.AllocationSize.QuadPart = ROUND_UP(Size, vcb->FatInfo.BytesPerCluster); + rcFCB->RFCB.AllocationSize.QuadPart = ROUND_UP_64(Size, vcb->FatInfo.BytesPerCluster); rcFCB->RefCount = 1; if (vfatFCBIsDirectory(rcFCB)) { Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Sat Jun 11 09:32:00 2016 @@ -1114,7 +1114,7 @@ { if (Size > 0) { - Fcb->RFCB.AllocationSize.QuadPart = ROUND_UP(Size, ClusterSize); + Fcb->RFCB.AllocationSize.QuadPart = ROUND_UP_64(Size, ClusterSize); } else { Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sat Jun 11 09:32:00 2016 @@ -576,7 +576,7 @@ } VolumeFcb->Flags = FCB_IS_VOLUME; - VolumeFcb->RFCB.FileSize.QuadPart = DeviceExt->FatInfo.Sectors * DeviceExt->FatInfo.BytesPerSector; + VolumeFcb->RFCB.FileSize.QuadPart = (LONGLONG) DeviceExt->FatInfo.Sectors * DeviceExt->FatInfo.BytesPerSector; VolumeFcb->RFCB.ValidDataLength = VolumeFcb->RFCB.FileSize; VolumeFcb->RFCB.AllocationSize = VolumeFcb->RFCB.FileSize; DeviceExt->VolumeFcb = VolumeFcb; Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Sat Jun 11 09:32:00 2016 @@ -150,7 +150,7 @@ BytesPerSector = DeviceExt->FatInfo.BytesPerSector; BytesPerCluster = DeviceExt->FatInfo.BytesPerCluster; - ASSERT(ReadOffset.QuadPart + Length <= ROUND_UP(Fcb->RFCB.FileSize.QuadPart, BytesPerSector)); + ASSERT(ReadOffset.QuadPart + Length <= ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector)); ASSERT(ReadOffset.u.LowPart % BytesPerSector == 0); ASSERT(Length % BytesPerSector == 0); @@ -711,9 +711,9 @@ else { // non cached read - if (ByteOffset.QuadPart + Length > ROUND_UP(Fcb->RFCB.FileSize.QuadPart, BytesPerSector)) - { - Length = (ULONG)(ROUND_UP(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart); + if (ByteOffset.QuadPart + Length > ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector)) + { + Length = (ULONG)(ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart); } Status = VfatReadFileData(IrpContext, Length, ByteOffset, &ReturnedLength); Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Sat Jun 11 09:32:00 2016 @@ -24,6 +24,12 @@ #define ROUND_UP(n, align) \ ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) + +#define ROUND_DOWN_64(n, align) \ + (((ULONGLONG)n) & ~((align) - 1LL)) + +#define ROUND_UP_64(n, align) \ + ROUND_DOWN_64(((ULONGLONG)n) + (align) - 1LL, (align)) #include <pshpack1.h> struct _BootSector

1 0

[mjansen] 71609: [WIN32SS] Try to load the module before fetching an icon, instead of failing on a module that is not available in the current process. CORE-10292 #resolve
by mjansen＠svn.reactos.org 10 Jun '16

10 Jun '16

Author: mjansen Date: Fri Jun 10 20:57:26 2016 New Revision: 71609 URL: http://svn.reactos.org/svn/reactos?rev=71609&view=rev Log: [WIN32SS] Try to load the module before fetching an icon, instead of failing on a module that is not available in the current process. CORE-10292 #resolve Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon.c Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] Fri Jun 10 20:57:26 2016 @@ -1867,11 +1867,12 @@ TRACE("Got module %wZ, resource %p (%S).\n", &ustrModule, ustrRsrc.Buffer, IS_INTRESOURCE(ustrRsrc.Buffer) ? L"" : ustrRsrc.Buffer); - /* Get the module handle */ - if (!GetModuleHandleExW(0, ustrModule.Buffer, &hModule)) - { - /* This should never happen */ - ERR("Invalid handle? Module='%wZ', error %lu.\n", &ustrModule, GetLastError()); + /* Get the module handle or load the module */ + hModule = LoadLibraryExW(ustrModule.Buffer, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); + if (!hModule) + { + DWORD err = GetLastError(); + ERR("Unable to load/use module '%wZ' in process %lu, error %lu.\n", &ustrModule, GetCurrentProcessId(), err); SetLastError(ERROR_INVALID_PARAMETER); goto leave; }

1 0

[akhaldi] 71608: * Create a branch for Zuodian's work off of trunk to avoid SVN merge issues.
by akhaldi＠svn.reactos.org 10 Jun '16

10 Jun '16

Author: akhaldi Date: Fri Jun 10 17:29:17 2016 New Revision: 71608 URL: http://svn.reactos.org/svn/reactos?rev=71608&view=rev Log: * Create a branch for Zuodian's work off of trunk to avoid SVN merge issues. Added: branches/GSoC_2016/lwIP-tcpip/ (props changed) - copied from r71607, trunk/reactos/ Propchange: branches/GSoC_2016/lwIP-tcpip/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Jun 10 17:29:17 2016 @@ -0,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/GSoC_2016/lwIP-tcpip/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Jun 10 17:29:17 2016 @@ -0,0 +1,22 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/condrv_restructure:63104-65657 +/branches/header-work:45691-47721 +/branches/kd++:58883-58973 +/branches/kernel-fun/reactos:62291,62294,62301-62302,62304,62321-62322,62353,62531-62532,62853,64152,64173-64174,65253 +/branches/ntvdm:59241-63176 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/ros-branch-0_3_15-lt2013:59059 +/branches/ros-csrss:57561-58762 +/branches/shell-experiments:61927-65494 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 +/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 +/branches/wlan-bringup:54809-54998 Propchange: branches/GSoC_2016/lwIP-tcpip/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2016