Ros-diffs May 2014

ros-diffs@reactos.org

14 participants
437 discussions

[jimtabor] 63493: [Win32k] - Turn on MDI system menus.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed May 28 22:52:38 2014 New Revision: 63493 URL: http://svn.reactos.org/svn/reactos?rev=63493&view=rev Log: [Win32k] - Turn on MDI system menus. Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Wed May 28 22:52:38 2014 @@ -1684,12 +1684,12 @@ if (!Popup) { //hNewMenu = co_IntLoadSysMenuTemplate(); - //if ( Window->ExStyle & WS_EX_MDICHILD ) - //{ - // RtlInitUnicodeString( &MenuName, L"SYSMENUMDI"); - // hNewMenu = co_IntCallLoadMenu( hModClient, &MenuName); - //} - //else + if ( Window->ExStyle & WS_EX_MDICHILD ) + { + RtlInitUnicodeString( &MenuName, L"SYSMENUMDI"); + hNewMenu = co_IntCallLoadMenu( hModClient, &MenuName); + } + else { RtlInitUnicodeString( &MenuName, L"SYSMENU"); hNewMenu = co_IntCallLoadMenu( hModClient, &MenuName);

10 years, 6 months

[jimtabor] 63492: [User32] - Add MDI system menu. If this is inaccurate please open a Jira report.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed May 28 22:48:50 2014 New Revision: 63492 URL: http://svn.reactos.org/svn/reactos?rev=63492&view=rev Log: [User32] - Add MDI system menu. If this is inaccurate please open a Jira report. Modified: trunk/reactos/win32ss/user/user32/lang/bg-BG.rc trunk/reactos/win32ss/user/user32/lang/cs-CZ.rc trunk/reactos/win32ss/user/user32/lang/da-DK.rc trunk/reactos/win32ss/user/user32/lang/de-DE.rc trunk/reactos/win32ss/user/user32/lang/el-GR.rc trunk/reactos/win32ss/user/user32/lang/en-US.rc trunk/reactos/win32ss/user/user32/lang/es-ES.rc trunk/reactos/win32ss/user/user32/lang/fr-FR.rc trunk/reactos/win32ss/user/user32/lang/he-IL.rc trunk/reactos/win32ss/user/user32/lang/hu-HU.rc trunk/reactos/win32ss/user/user32/lang/id-ID.rc trunk/reactos/win32ss/user/user32/lang/it-IT.rc trunk/reactos/win32ss/user/user32/lang/ja-JP.rc trunk/reactos/win32ss/user/user32/lang/lt-LT.rc trunk/reactos/win32ss/user/user32/lang/nl-NL.rc trunk/reactos/win32ss/user/user32/lang/no-NO.rc trunk/reactos/win32ss/user/user32/lang/pl-PL.rc trunk/reactos/win32ss/user/user32/lang/pt-BR.rc trunk/reactos/win32ss/user/user32/lang/ro-RO.rc trunk/reactos/win32ss/user/user32/lang/ru-RU.rc trunk/reactos/win32ss/user/user32/lang/sk-SK.rc trunk/reactos/win32ss/user/user32/lang/sv-SE.rc trunk/reactos/win32ss/user/user32/lang/tr-TR.rc trunk/reactos/win32ss/user/user32/lang/uk-UA.rc trunk/reactos/win32ss/user/user32/lang/zh-CN.rc Modified: trunk/reactos/win32ss/user/user32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/b… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/bg-BG.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -37,7 +37,20 @@ MENUITEM "Ð¡&Ð¼Ð°Ð»ÑÐ²Ð°Ð½Ðµ", SC_MINIMIZE MENUITEM "Ð£&Ð³Ð¾Ð»ÐµÐ¼ÑÐ²Ð°Ð½Ðµ", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&ÐÐ°ÑÐ²Ð°ÑÑÐ½Ðµ\tAlt-F4", SC_CLOSE + MENUITEM "&ÐÐ°ÑÐ²Ð°ÑÑÐ½Ðµ\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&ÐÑÐ·ÑÑÐ°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ", SC_RESTORE + MENUITEM "&ÐÑÐµÐ¼ÐµÑÑÐ²Ð°Ð½Ðµ", SC_MOVE + MENUITEM "&Ð Ð°Ð·Ð¼ÐµÑ", SC_SIZE + MENUITEM "Ð¡&Ð¼Ð°Ð»ÑÐ²Ð°Ð½Ðµ", SC_MINIMIZE + MENUITEM "Ð£&Ð³Ð¾Ð»ÐµÐ¼ÑÐ²Ð°Ð½Ðµ", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&ÐÐ°ÑÐ²Ð°ÑÑÐ½Ðµ\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "ÐÐ°&Ð¿ÑÐµÐ´\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/c… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/cs-CZ.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -42,7 +42,20 @@ MENUITEM "Mi&nimalizovat", SC_MINIMIZE MENUITEM "Ma&ximalizovat", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&ZavÅÃt\tAlt-F4", SC_CLOSE + MENUITEM "&ZavÅÃt\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&Obnovit", SC_RESTORE + MENUITEM "&PÅesunout", SC_MOVE + MENUITEM "&Velikost", SC_SIZE + MENUITEM "Mi&nimalizovat", SC_MINIMIZE + MENUITEM "Ma&ximalizovat", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&ZavÅÃt\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "NÃ¡sledujÃcÃ\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/da-DK.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -37,7 +37,20 @@ MENUITEM "M&inimere", SC_MINIMIZE MENUITEM "Ma&ksimere", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&Luk\tAlt-F4", SC_CLOSE + MENUITEM "&Luk\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&Gendan", SC_RESTORE + MENUITEM "&Flyt", SC_MOVE + MENUITEM "&StÃ¸rrelse", SC_SIZE + MENUITEM "M&inimere", SC_MINIMIZE + MENUITEM "Ma&ksimere", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&Luk\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "NÃ¦s&te\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/de-DE.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -42,6 +42,19 @@ MENUITEM "S&chlieÃen\tAlt+F4", SC_CLOSE END +SYSMENUMDI MENU +BEGIN + MENUITEM "&Wiederherstellen", SC_RESTORE + MENUITEM "&Verschieben", SC_MOVE + MENUITEM "&GrÃ¶Ãe", SC_SIZE + MENUITEM "Mi&nimieren", SC_MINIMIZE + MENUITEM "Ma&ximieren", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "S&chlieÃen\tStrg+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "NÃ¤chs&ter\tStrg+F6", SC_NEXTWINDOW +END + /* Strings */ STRINGTABLE Modified: trunk/reactos/win32ss/user/user32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/el-GR.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -37,7 +37,20 @@ MENUITEM "Î&Î»Î±ÏÎ¹ÏÏÎ¿ÏÎ¿Î¯Î·ÏÎ·", SC_MINIMIZE MENUITEM "ÎÎµ&Î³Î¹ÏÏÎ¿ÏÎ¿Î¯Î·ÏÎ·", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&ÎÎ»ÎµÎ¯ÏÎ·Î¼Î¿\tAlt-F4", SC_CLOSE + MENUITEM "&ÎÎ»ÎµÎ¯ÏÎ·Î¼Î¿\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&ÎÏÎ±Î½Î±ÏÎ¿ÏÎ¬", SC_RESTORE + MENUITEM "&ÎÎµÏÎ±ÎºÎ¯Î½Î·ÏÎ·", SC_MOVE + MENUITEM "ÎÎ&Î³ÎµÎ¸Î¿Ï", SC_SIZE + MENUITEM "Î&Î»Î±ÏÎ¹ÏÏÎ¿ÏÎ¿Î¯Î·ÏÎ·", SC_MINIMIZE + MENUITEM "ÎÎµ&Î³Î¹ÏÏÎ¿ÏÎ¿Î¯Î·ÏÎ·", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&ÎÎ»ÎµÎ¯ÏÎ·Î¼Î¿\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "&ÎÏÏÎ¼ÎµÎ½Î¿\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/en-US.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -40,6 +40,19 @@ MENUITEM "&Close\tAlt+F4", SC_CLOSE END +SYSMENUMDI MENU +{ + MENUITEM "&Restore", SC_RESTORE + MENUITEM "&Move", SC_MOVE + MENUITEM "&Size", SC_SIZE + MENUITEM "Mi&nimize", SC_MINIMIZE + MENUITEM "Ma&ximize", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&Close\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "Nex&t\tCtrl+F6", SC_NEXTWINDOW +} + /* Strings */ STRINGTABLE Modified: trunk/reactos/win32ss/user/user32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/es-ES.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -37,7 +37,20 @@ MENUITEM "Mi&nimizar", SC_MINIMIZE MENUITEM "Ma&ximizar", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&Cerrar\tAlt-F4", SC_CLOSE + MENUITEM "&Cerrar\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&Restaurar", SC_RESTORE + MENUITEM "&Mover", SC_MOVE + MENUITEM "TamaÃ±o", SC_SIZE + MENUITEM "Mi&nimizar", SC_MINIMIZE + MENUITEM "Ma&ximizar", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&Cerrar\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "Siguien&te\t\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/f… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/fr-FR.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -39,7 +39,20 @@ MENUITEM "RÃ©d&uire", SC_MINIMIZE MENUITEM "Agra&ndir", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&Fermer\tAlt-F4", SC_CLOSE + MENUITEM "&Fermer\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&Restaurer", SC_RESTORE + MENUITEM "DÃ©p&lacer", SC_MOVE + MENUITEM "&Taille", SC_SIZE + MENUITEM "RÃ©d&uire", SC_MINIMIZE + MENUITEM "Agra&ndir", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&Fermer\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "Sui&vant\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/h… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/he-IL.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -37,7 +37,20 @@ MENUITEM "&×××¢×¨", SC_MINIMIZE MENUITEM "&××××", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&×¡×××¨\tAlt-F4", SC_CLOSE + MENUITEM "&×¡×××¨\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&×©×××¨", SC_RESTORE + MENUITEM "&×××", SC_MOVE + MENUITEM "&×©× × ××××", SC_SIZE + MENUITEM "&×××¢×¨", SC_MINIMIZE + MENUITEM "&××××", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&×¡×××¨\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "×&××\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/h… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/hu-HU.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -39,7 +39,20 @@ MENUITEM "&Kis mÃ©ret", SC_MINIMIZE MENUITEM "&Nagy mÃ©ret", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&BezÃ¡r\tAlt-F4", SC_CLOSE + MENUITEM "&BezÃ¡r\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&Vissza Ã¡llÃt", SC_RESTORE + MENUITEM "Ãt &helyez", SC_MOVE + MENUITEM "&MÃ©ret", SC_SIZE + MENUITEM "&Kis mÃ©ret", SC_MINIMIZE + MENUITEM "&Nagy mÃ©ret", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&BezÃ¡r\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "&ElÅre\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/i… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/id-ID.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -37,7 +37,20 @@ MENUITEM "Ke&cilkan", SC_MINIMIZE MENUITEM "Maksi&malkan", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&Tutup\tAlt-F4", SC_CLOSE + MENUITEM "&Tutup\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&Kembalikan", SC_RESTORE + MENUITEM "&Pindahkan", SC_MOVE + MENUITEM "&Ukuran", SC_SIZE + MENUITEM "Ke&cilkan", SC_MINIMIZE + MENUITEM "Maksi&malkan", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&Tutup\tCrtl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "&Berikutnya\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/i… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/it-IT.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -37,7 +37,20 @@ MENUITEM "Mi&nimizza", SC_MINIMIZE MENUITEM "Ma&ssimizza", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&Chiudi\tAlt-F4", SC_CLOSE + MENUITEM "&Chiudi\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&Ripristina", SC_RESTORE + MENUITEM "&Muove", SC_MOVE + MENUITEM "&Dimensione", SC_SIZE + MENUITEM "Mi&nimizza", SC_MINIMIZE + MENUITEM "Ma&ssimizza", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&Chiudi\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "&Prossimo\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/j… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/ja-JP.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -37,7 +37,20 @@ MENUITEM "æå°å(&N)", SC_MINIMIZE MENUITEM "æå¤§å(&X)", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "éãã(&C)\tAlt-F4", SC_CLOSE + MENUITEM "éãã(&C)\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "åã®ãµã¤ãºã«æ»ã(&R)", SC_RESTORE + MENUITEM "ç§»å(&M)", SC_MOVE + MENUITEM "ãµã¤ãºå¤æ´(&S)", SC_SIZE + MENUITEM "æå°å(&N)", SC_MINIMIZE + MENUITEM "æå¤§å(&X)", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "éãã(&C)\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "æ¬¡ã®ã¦ã£ã³ãã¦(&T)\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/l… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/lt-LT.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -39,7 +39,20 @@ MENUITEM "Su&skleisti", SC_MINIMIZE MENUITEM "Pa&didint", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&UÃ¾verti\tAlt-F4", SC_CLOSE + MENUITEM "&UÃ¾verti\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "A&tkurti", SC_RESTORE + MENUITEM "Pe&rkelti", SC_MOVE + MENUITEM "D&ydis", SC_SIZE + MENUITEM "Su&skleisti", SC_MINIMIZE + MENUITEM "Pa&didint", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&UÃ¾verti\tVald-F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "Ki&tas\tVald+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/n… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/nl-NL.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -37,7 +37,20 @@ MENUITEM "Mi&nimaliseren", SC_MINIMIZE MENUITEM "Ma&ximaliseren", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&Afsluiten\tAlt-F4", SC_CLOSE + MENUITEM "&Afsluiten\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&Herstellen", SC_RESTORE + MENUITEM "&Verplaatsen", SC_MOVE + MENUITEM "&Grootte", SC_SIZE + MENUITEM "Mi&nimaliseren", SC_MINIMIZE + MENUITEM "Ma&ximaliseren", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&Afsluiten\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "Volgende\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/n… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/no-NO.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -37,7 +37,20 @@ MENUITEM "Mi&nimer", SC_MINIMIZE MENUITEM "&Maksimer", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&Lukk\tAlt-F4", SC_CLOSE + MENUITEM "&Lukk\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&Gjenopprett", SC_RESTORE + MENUITEM "&Flytt", SC_MOVE + MENUITEM "&StÃ¸rrelse", SC_SIZE + MENUITEM "Mi&nimer", SC_MINIMIZE + MENUITEM "&Maksimer", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&Lukk\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "Nes&e\tCtrl + F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/p… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/pl-PL.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -42,7 +42,20 @@ MENUITEM "&Minimalizuj", SC_MINIMIZE MENUITEM "Mak&symalizuj", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "Zam&knij\tAlt-F4", SC_CLOSE + MENUITEM "Zam&knij\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&PrzywrÃ³Ä", SC_RESTORE + MENUITEM "Prz&enieÅ", SC_MOVE + MENUITEM "&Rozmiar", SC_SIZE + MENUITEM "&Minimalizuj", SC_MINIMIZE + MENUITEM "Mak&symalizuj", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "Zam&knij\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "Nas&tÄpny\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/p… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/pt-BR.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -39,7 +39,20 @@ MENUITEM "Mi&nimizar", SC_MINIMIZE MENUITEM "Ma&ximizar", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&Fechar\tAlt-F4", SC_CLOSE + MENUITEM "&Fechar\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&Restaurar", SC_RESTORE + MENUITEM "&Mover", SC_MOVE + MENUITEM "&Tamanho", SC_SIZE + MENUITEM "Mi&nimizar", SC_MINIMIZE + MENUITEM "Ma&ximizar", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&Fechar\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "&PrÃ³ximo\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/r… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/ro-RO.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -39,7 +39,20 @@ MENUITEM "Mi&nimizeazÄ", SC_MINIMIZE MENUITEM "Ma&ximizeazÄ", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "Ãnchid&e\tAlt-F4", SC_CLOSE + MENUITEM "Ãnchid&e\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&RestabileÈte", SC_RESTORE + MENUITEM "&MutÄ", SC_MOVE + MENUITEM "Re&dimensioneazÄ", SC_SIZE + MENUITEM "Mi&nimizeazÄ", SC_MINIMIZE + MENUITEM "Ma&ximizeazÄ", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "Ãnchid&e\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "Ãnain&te\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/r… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/ru-RU.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -37,7 +37,20 @@ MENUITEM "&Ð¡Ð²ÐµÑÐ½ÑÑÑ", SC_MINIMIZE MENUITEM "&Ð Ð°Ð·Ð²ÐµÑÐ½ÑÑÑ", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&ÐÐ°ÐºÑÑÑÑ\tAlt-F4", SC_CLOSE + MENUITEM "&ÐÐ°ÐºÑÑÑÑ\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&ÐÐ¾ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ", SC_RESTORE + MENUITEM "&ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ", SC_MOVE + MENUITEM "Ð &Ð°Ð·Ð¼ÐµÑ", SC_SIZE + MENUITEM "&Ð¡Ð²ÐµÑÐ½ÑÑÑ", SC_MINIMIZE + MENUITEM "&Ð Ð°Ð·Ð²ÐµÑÐ½ÑÑÑ", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&ÐÐ°ÐºÑÑÑÑ\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "Ð¡&Ð»ÐµÐ´ÑÑÑÐµÐµ\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/s… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/sk-SK.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -39,7 +39,20 @@ MENUITEM "&MinimalizovaÅ¥", SC_MINIMIZE MENUITEM "M&aximalizovaÅ¥", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&ZavrieÅ¥\tAlt-F4", SC_CLOSE + MENUITEM "&ZavrieÅ¥\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&ObnoviÅ¥", SC_RESTORE + MENUITEM "&PremiestniÅ¥", SC_MOVE + MENUITEM "&VeÄ¾kosÅ¥", SC_SIZE + MENUITEM "&MinimalizovaÅ¥", SC_MINIMIZE + MENUITEM "M&aximalizovaÅ¥", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&ZavrieÅ¥\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "&Äalej\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/s… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/sv-SE.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -39,7 +39,20 @@ MENUITEM "&Minimera", SC_MINIMIZE MENUITEM "Ma&ximera", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&StÃ¤ng\tAlt-F4", SC_CLOSE + MENUITEM "&StÃ¤ng\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&ÃterstÃ¤ll", SC_RESTORE + MENUITEM "&Flytta", SC_MOVE + MENUITEM "S&torlek", SC_SIZE + MENUITEM "&Minimera", SC_MINIMIZE + MENUITEM "Ma&ximera", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&StÃ¤ng\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "&NÃ¤sta\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/t… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/tr-TR.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -39,7 +39,20 @@ MENUITEM "&Simge Durumuna KÃ¼Ã§Ã¼lt", SC_MINIMIZE MENUITEM "&EkranÄ± Kapla", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&Kapat\tAlt-F4", SC_CLOSE + MENUITEM "&Kapat\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "Ã&nceki Boyut", SC_RESTORE + MENUITEM "&TaÅÄ±", SC_MOVE + MENUITEM "&Boyut", SC_SIZE + MENUITEM "&Simge Durumuna KÃ¼Ã§Ã¼lt", SC_MINIMIZE + MENUITEM "&EkranÄ± Kapla", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&Kapat\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "Ä°le&ri\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/u… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/uk-UA.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -37,7 +37,20 @@ MENUITEM "Ð&Ð³Ð¾ÑÐ½ÑÑÐ¸", SC_MINIMIZE MENUITEM "&Ð Ð¾Ð·Ð³Ð¾ÑÐ½ÑÑÐ¸", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&ÐÐ°ÐºÑÐ¸ÑÐ¸\tAlt-F4", SC_CLOSE + MENUITEM "&ÐÐ°ÐºÑÐ¸ÑÐ¸\tAlt+F4", SC_CLOSE +END + +SYSMENUMDI MENU +BEGIN + MENUITEM "&ÐÑÐ´Ð½Ð¾Ð²Ð¸ÑÐ¸", SC_RESTORE + MENUITEM "Ð&ÐµÑÐµÐ¼ÑÑÑÐ¸ÑÐ¸", SC_MOVE + MENUITEM "Ð Ð¾Ð·&Ð¼ÑÑ", SC_SIZE + MENUITEM "Ð&Ð³Ð¾ÑÐ½ÑÑÐ¸", SC_MINIMIZE + MENUITEM "&Ð Ð¾Ð·Ð³Ð¾ÑÐ½ÑÑÐ¸", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "&ÐÐ°ÐºÑÐ¸ÑÐ¸\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "ÐÐ°Ñ&ÑÑÐ¿Ð½Ð¸Ð¹\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ Modified: trunk/reactos/win32ss/user/user32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/z… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/zh-CN.rc [iso-8859-1] Wed May 28 22:48:50 2014 @@ -40,6 +40,19 @@ MENUITEM "å³é(&C)\tAlt+F4", SC_CLOSE END +SYSMENUMDI MENU +BEGIN + MENUITEM "è¿å(&R)", SC_RESTORE + MENUITEM "ç§»å¨(&M)", SC_MOVE + MENUITEM "å¤§å°(&S)", SC_SIZE + MENUITEM "æå°å(&n)", SC_MINIMIZE + MENUITEM "æå¤§å(&x)", SC_MAXIMIZE + MENUITEM SEPARATOR + MENUITEM "å³é(&C)\tCtrl+F4", SC_CLOSE + MENUITEM SEPARATOR + MENUITEM "ä¸ä¸æ¥(&T)\tCtrl+F6", SC_NEXTWINDOW +END + /* Strings */ STRINGTABLE

10 years, 6 months

[pschweitzer] 63491: [KERNEL32] - Directly call CopyFileExW() from CopyFileA() - ReactOSify CopyFileW()

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed May 28 18:39:51 2014 New Revision: 63491 URL: http://svn.reactos.org/svn/reactos?rev=63491&view=rev Log: [KERNEL32] - Directly call CopyFileExW() from CopyFileA() - ReactOSify CopyFileW() Modified: trunk/reactos/dll/win32/kernel32/client/file/copy.c Modified: trunk/reactos/dll/win32/kernel32/client/file/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/copy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/copy.c [iso-8859-1] Wed May 28 18:39:51 2014 @@ -351,18 +351,33 @@ */ BOOL WINAPI -CopyFileA ( - LPCSTR lpExistingFileName, - LPCSTR lpNewFileName, - BOOL bFailIfExists -) -{ - return CopyFileExA (lpExistingFileName, - lpNewFileName, - NULL, - NULL, - NULL, - bFailIfExists); +CopyFileA(IN LPCSTR lpExistingFileName, + IN LPCSTR lpNewFileName, + IN BOOL bFailIfExists) +{ + BOOL Result = FALSE; + UNICODE_STRING lpNewFileNameW; + PUNICODE_STRING lpExistingFileNameW; + + lpExistingFileNameW = Basep8BitStringToStaticUnicodeString(lpExistingFileName); + if (!lpExistingFileNameW) + { + return FALSE; + } + + if (Basep8BitStringToDynamicUnicodeString(&lpNewFileNameW, lpNewFileName)) + { + Result = CopyFileExW(lpExistingFileNameW->Buffer, + lpNewFileNameW.Buffer, + NULL, + NULL, + NULL, + (bFailIfExists ? COPY_FILE_FAIL_IF_EXISTS : 0)); + + RtlFreeUnicodeString(&lpNewFileNameW); + } + + return Result; } @@ -371,18 +386,16 @@ */ BOOL WINAPI -CopyFileW ( - LPCWSTR lpExistingFileName, - LPCWSTR lpNewFileName, - BOOL bFailIfExists -) -{ - return CopyFileExW (lpExistingFileName, - lpNewFileName, - NULL, - NULL, - NULL, - bFailIfExists); +CopyFileW(IN LPCWSTR lpExistingFileName, + IN LPCWSTR lpNewFileName, + IN BOOL bFailIfExists) +{ + return CopyFileExW(lpExistingFileName, + lpNewFileName, + NULL, + NULL, + NULL, + (bFailIfExists ? COPY_FILE_FAIL_IF_EXISTS : 0)); }

10 years, 6 months

[ekohl] 63490: [NET] Implement NET ACCOUNTS command.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed May 28 08:06:10 2014 New Revision: 63490 URL: http://svn.reactos.org/svn/reactos?rev=63490&view=rev Log: [NET] Implement NET ACCOUNTS command. Added: trunk/reactos/base/applications/network/net/cmdAccounts.c (with props) Modified: trunk/reactos/base/applications/network/net/CMakeLists.txt trunk/reactos/base/applications/network/net/main.c trunk/reactos/base/applications/network/net/net.h Modified: trunk/reactos/base/applications/network/net/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/CMakeLists.txt [iso-8859-1] Wed May 28 08:06:10 2014 @@ -3,6 +3,7 @@ list(APPEND SOURCE main.c + cmdAccounts.c cmdStart.c cmdStop.c cmdHelpMsg.c @@ -13,6 +14,6 @@ add_executable(net ${SOURCE}) set_module_type(net win32cui UNICODE) -add_importlibs(net advapi32 msvcrt kernel32) +add_importlibs(net advapi32 netapi32 msvcrt kernel32 ntdll) add_pch(net net.h SOURCE) add_cd_file(TARGET net DESTINATION reactos/system32 FOR all) Added: trunk/reactos/base/applications/network/net/cmdAccounts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdAccounts.c (added) +++ trunk/reactos/base/applications/network/net/cmdAccounts.c [iso-8859-1] Wed May 28 08:06:10 2014 @@ -0,0 +1,192 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: + * PURPOSE: + * + * PROGRAMMERS: Eric Kohl + */ + +#include "net.h" + +INT +cmdAccounts( + INT argc, + WCHAR **argv) +{ + PUSER_MODALS_INFO_0 Info0 = NULL; + PUSER_MODALS_INFO_1 Info1 = NULL; + PUSER_MODALS_INFO_3 Info3 = NULL; + NT_PRODUCT_TYPE ProductType; + LPWSTR p, perr; + DWORD ParamErr; + ULONG value; + INT i; + BOOL Modified = FALSE; +// BOOL Domain = FALSE; + NET_API_STATUS Status; + + for (i = 3; i < argc; i++) + { + if (wcsicmp(argv[i], L"help") == 0) + { + /* Print short syntax help */ + puts("NET ACCOUNTS [/FORCELOGOFF:{Minutes|NO}] [/MINPWLEN:Length]"); + puts(" [/MAXPWAGE:{Days|UNLIMITED}] [/MINPWAGE:Days]"); + puts(" [/UNIQUEPW:Count] [/DOMAIN]"); + return 0; + } + + if (wcsicmp(argv[i], L"/help") == 0) + { + /* FIXME: Print long help text*/ + return 0; + } + +/* + if (wcsicmp(argv[i], L"/domain") == 0) + { + Domain = TRUE; + } +*/ + } + + Status = NetUserModalsGet(NULL, 0, (LPBYTE*)&Info0); + if (Status != NERR_Success) + goto done; + + for (i = 3; i < argc; i++) + { + if (_wcsnicmp(argv[i], L"/forcelogoff:", 13) == 0) + { + p = &argv[i][13]; + if (wcsicmp(p, L"no")) + { + Info0->usrmod0_force_logoff = TIMEQ_FOREVER; + Modified = TRUE; + } + else + { + value = wcstoul(p, &perr, 10); + + Info0->usrmod0_force_logoff = value * 60; + Modified = TRUE; + } + } + else if (_wcsnicmp(argv[i], L"/minpwlen:", 10) == 0) + { + p = &argv[i][10]; + value = wcstoul(p, &perr, 10); + Info0->usrmod0_min_passwd_len = value; + Modified = TRUE; + } + else if (_wcsnicmp(argv[i], L"/maxpwage:", 10) == 0) + { + p = &argv[i][10]; + + if (wcsicmp(p, L"unlimited")) + { + Info0->usrmod0_max_passwd_age = ULONG_MAX; + Modified = TRUE; + } + else + { + value = wcstoul(p, &perr, 10); + + Info0->usrmod0_max_passwd_age = value * 86400; + Modified = TRUE; + } + } + else if (_wcsnicmp(argv[i], L"/minpwage:", 10) == 0) + { + p = &argv[i][10]; + value = wcstoul(p, &perr, 10); + + Info0->usrmod0_min_passwd_age = value * 86400; + Modified = TRUE; + } + else if (_wcsnicmp(argv[i], L"/uniquepw:", 10) == 0) + { + p = &argv[i][10]; + value = wcstoul(p, &perr, 10); + + Info0->usrmod0_password_hist_len = value; + Modified = TRUE; + } + } + + if (Modified == TRUE) + { + Status = NetUserModalsSet(NULL, 0, (LPBYTE)Info0, &ParamErr); + if (Status != NERR_Success) + goto done; + } + else + { + Status = NetUserModalsGet(NULL, 1, (LPBYTE*)&Info1); + if (Status != NERR_Success) + goto done; + + Status = NetUserModalsGet(NULL, 3, (LPBYTE*)&Info3); + if (Status != NERR_Success) + goto done; + + RtlGetNtProductType(&ProductType); + + printf("Force logoff after: "); + if (Info0->usrmod0_force_logoff == TIMEQ_FOREVER) + printf("Never\n"); + else + printf("%lu seconds\n", Info0->usrmod0_force_logoff); + + printf("Minimum password age (in days): %lu\n", Info0->usrmod0_min_passwd_age / 86400); + printf("Maximum password age (in days): %lu\n", Info0->usrmod0_max_passwd_age / 86400); + printf("Minimum password length: %lu\n", Info0->usrmod0_min_passwd_len); + + printf("Password history length: "); + if (Info0->usrmod0_password_hist_len == 0) + printf("None\n"); + else + printf("%lu\n", Info0->usrmod0_password_hist_len); + + printf("Lockout threshold: %lu\n", Info3->usrmod3_lockout_threshold); + printf("Lockout duration (in minutes): %lu\n", Info3->usrmod3_lockout_duration / 60); + printf("Lockout observation window (in minutes): %lu\n", Info3->usrmod3_lockout_observation_window / 60); + + printf("Computer role: "); + + if (Info1->usrmod1_role == UAS_ROLE_PRIMARY) + { + if (ProductType == NtProductLanManNt) + { + printf("Primary server\n"); + } + else if (ProductType == NtProductServer) + { + printf("Standalone server\n"); + } + else + { + printf("Workstation\n"); + } + } + else + { + printf("Backup server\n"); + } + } + +done: + if (Info3 != NULL) + NetApiBufferFree(Info3); + + if (Info1 != NULL) + NetApiBufferFree(Info1); + + if (Info0 != NULL) + NetApiBufferFree(Info0); + + return 0; +} + +/* EOF */ Propchange: trunk/reactos/base/applications/network/net/cmdAccounts.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/main.c [iso-8859-1] Wed May 28 08:06:10 2014 @@ -18,7 +18,7 @@ COMMAND cmds[] = { - {L"accounts", unimplemented}, + {L"accounts", cmdAccounts}, {L"computer", unimplemented}, {L"config", unimplemented}, {L"continue", cmdContinue}, Modified: trunk/reactos/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/net.h [iso-8859-1] Wed May 28 08:06:10 2014 @@ -7,16 +7,23 @@ #ifndef _NET_PCH_ #define _NET_PCH_ +#define WIN32_NO_STATUS + #include <stdarg.h> #include <windef.h> #include <winbase.h> #include <winsvc.h> #include <stdio.h> +#include <stdlib.h> +#include <limits.h> +#include <lm.h> +#include <ndk/rtlfuncs.h> VOID help(VOID); INT unimplemented(INT argc, WCHAR **argv); +INT cmdAccounts(INT argc, WCHAR **argv); INT cmdContinue(INT argc, WCHAR **argv); INT cmdHelp(INT argc, WCHAR **argv); INT cmdHelpMsg(INT argc, WCHAR **argv);

10 years, 7 months

[tkreuzer] 63489: [CRT] Do not mark inp* and outp* as dllimport.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 27 22:58:53 2014 New Revision: 63489 URL: http://svn.reactos.org/svn/reactos?rev=63489&view=rev Log: [CRT] Do not mark inp* and outp* as dllimport. Modified: trunk/reactos/include/crt/conio.h Modified: trunk/reactos/include/crt/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/conio.h?rev=63… ============================================================================== --- trunk/reactos/include/crt/conio.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/conio.h [iso-8859-1] Tue May 27 22:58:53 2014 @@ -416,10 +416,10 @@ int _Ch); #if (defined(_X86_) && !defined(__x86_64)) - _CRT_NONSTDC_DEPRECATE(_inp) _CRTIMP int __cdecl inp(unsigned short); - _CRT_NONSTDC_DEPRECATE(_inpw) _CRTIMP unsigned short __cdecl inpw(unsigned short); - _CRT_NONSTDC_DEPRECATE(_outp) _CRTIMP int __cdecl outp(unsigned short,int); - _CRT_NONSTDC_DEPRECATE(_outpw) _CRTIMP unsigned short __cdecl outpw(unsigned short,unsigned short); + _CRT_NONSTDC_DEPRECATE(_inp) int __cdecl inp(unsigned short); + _CRT_NONSTDC_DEPRECATE(_inpw) unsigned short __cdecl inpw(unsigned short); + _CRT_NONSTDC_DEPRECATE(_outp) int __cdecl outp(unsigned short,int); + _CRT_NONSTDC_DEPRECATE(_outpw) unsigned short __cdecl outpw(unsigned short,unsigned short); #endif #endif /* !NO_OLDNAMES */

10 years, 7 months

[tkreuzer] 63488: [CRT] Hopefully fix build, by specifying minimum MSC versions for some intrinsics

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 27 22:12:15 2014 New Revision: 63488 URL: http://svn.reactos.org/svn/reactos?rev=63488&view=rev Log: [CRT] Hopefully fix build, by specifying minimum MSC versions for some intrinsics Modified: trunk/reactos/include/crt/msc/intrin.h Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Tue May 27 22:12:15 2014 @@ -584,8 +584,10 @@ #pragma intrinsic(__halt) void __ud2(void); #pragma intrinsic(__ud2) +#if (_MSC_VER >= 1700) __declspec(noreturn) void __fastfail(unsigned int Code); #pragma intrinsic(__fastfail) +#endif #endif #if defined(_M_ARM) int __trap(int Arg1, ...); @@ -749,8 +751,10 @@ /** Misc **/ void __nop(void); #pragma intrinsic(__nop) +#if (_MSC_VER >= 1700) void __code_seg(const char *); #pragma intrinsic(__code_seg) +#endif #ifdef _M_ARM int _AddSatInt(int, int); #pragma intrinsic(_AddSatInt)

10 years, 7 months

[tkreuzer] 63487: [CRT] remove __readfsqword, it does not exist.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 27 22:07:29 2014 New Revision: 63487 URL: http://svn.reactos.org/svn/reactos?rev=63487&view=rev Log: [CRT] remove __readfsqword, it does not exist. Modified: trunk/reactos/include/crt/msc/intrin.h Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Tue May 27 22:07:29 2014 @@ -358,8 +358,6 @@ #pragma intrinsic(__readfsword) unsigned long __readfsdword(unsigned long Offset); #pragma intrinsic(__readfsdword) -unsigned __int64 __readfsqword(unsigned long); -#pragma intrinsic(__readfsqword) void __incfsbyte(unsigned long Offset); #pragma intrinsic(__incfsbyte) void __incfsword(unsigned long Offset);

10 years, 7 months

[tkreuzer] 63486: [CRT] Add many missing intrinsics to the MSVC intrin.h, including x86, x64 and ARM

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 27 22:01:55 2014 New Revision: 63486 URL: http://svn.reactos.org/svn/reactos?rev=63486&view=rev Log: [CRT] Add many missing intrinsics to the MSVC intrin.h, including x86, x64 and ARM Modified: trunk/reactos/include/crt/msc/intrin.h Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Tue May 27 22:01:55 2014 @@ -29,52 +29,84 @@ #pragma intrinsic(_mm_lfence) void _mm_sfence(void); #pragma intrinsic(_mm_sfence) -#endif -#ifdef _M_AMD64 +void __nvreg_restore_fence(void); +void __nvreg_save_fence(void); +#endif +#if defined(_M_AMD64) void __faststorefence(void); #pragma intrinsic(__faststorefence) +#elif defined(_M_ARM) +__int16 __iso_volatile_load16(const volatile __int16 *); +#pragma intrinsic(__iso_volatile_load16) +__int32 __iso_volatile_load32(const volatile __int32 *); +#pragma intrinsic(__iso_volatile_load32) +__int64 __iso_volatile_load64(const volatile __int64 *); +#pragma intrinsic(__iso_volatile_load64) +__int8 __iso_volatile_load8(const volatile __int8 *); +#pragma intrinsic(__iso_volatile_load8) +void __iso_volatile_store16(volatile __int16 *, __int16); +#pragma intrinsic(__iso_volatile_store16) +void __iso_volatile_store32(volatile __int32 *, __int32); +#pragma intrinsic(__iso_volatile_store32) +void __iso_volatile_store64(volatile __int64 *, __int64); +#pragma intrinsic(__iso_volatile_store64) +void __iso_volatile_store8(volatile __int8 *, __int8); +#pragma intrinsic(__iso_volatile_store8) #endif /*** Atomic operations ***/ -long _InterlockedCompareExchange(volatile long * Destination, long Exchange, long Comperand); +long _InterlockedCompareExchange(_Interlocked_operand_ volatile long * Destination, long Exchange, long Comperand); #pragma intrinsic(_InterlockedCompareExchange) -long _InterlockedExchange(volatile long * Target, long Value); +char _InterlockedCompareExchange8(_Interlocked_operand_ char volatile * Destination, char Exchange, char Comparand); +#pragma intrinsic(_InterlockedCompareExchange8) +short _InterlockedCompareExchange16(_Interlocked_operand_ short volatile * Destination, short Exchange, short Comparand); +#pragma intrinsic(_InterlockedCompareExchange16) +__int64 _InterlockedCompareExchange64(_Interlocked_operand_ volatile __int64 * Destination, __int64 Exchange, __int64 Comperand); +#pragma intrinsic(_InterlockedCompareExchange64) +long _InterlockedExchange(_Interlocked_operand_ volatile long * Target, long Value); #pragma intrinsic(_InterlockedExchange) -long _InterlockedExchangeAdd(volatile long * Addend, long Value); +char _InterlockedExchange8(_Interlocked_operand_ char volatile * Target, char Value); +#pragma intrinsic(_InterlockedExchange8) +short _InterlockedExchange16(_Interlocked_operand_ short volatile * Target, short Value); +#pragma intrinsic(_InterlockedExchange16) +long _InterlockedExchangeAdd(_Interlocked_operand_ volatile long * Addend, long Value); #pragma intrinsic(_InterlockedExchangeAdd) -char _InterlockedAnd8(volatile char * value, char mask); +char _InterlockedExchangeAdd8(_Interlocked_operand_ char volatile * Addend, char Value); +#pragma intrinsic(_InterlockedExchangeAdd8) +short _InterlockedExchangeAdd16(_Interlocked_operand_ short volatile * Addend, short Value); +#pragma intrinsic(_InterlockedExchangeAdd16) +char _InterlockedAnd8(_Interlocked_operand_ volatile char * value, char mask); #pragma intrinsic(_InterlockedAnd8) -short _InterlockedAnd16(volatile short * value, short mask); +short _InterlockedAnd16(_Interlocked_operand_ volatile short * value, short mask); #pragma intrinsic(_InterlockedAnd16) -long _InterlockedAnd(volatile long * value, long mask); +long _InterlockedAnd(_Interlocked_operand_ volatile long * value, long mask); #pragma intrinsic(_InterlockedAnd) -char _InterlockedOr8(volatile char * value, char mask); +char _InterlockedOr8(_Interlocked_operand_ volatile char * value, char mask); #pragma intrinsic(_InterlockedOr8) -short _InterlockedOr16(volatile short * value, short mask); +short _InterlockedOr16(_Interlocked_operand_ volatile short * value, short mask); #pragma intrinsic(_InterlockedOr16) -long _InterlockedOr(volatile long * value, long mask); +long _InterlockedOr(_Interlocked_operand_ volatile long * value, long mask); #pragma intrinsic(_InterlockedOr) -char _InterlockedXor8(volatile char * value, char mask); +char _InterlockedXor8(_Interlocked_operand_ volatile char * value, char mask); #pragma intrinsic(_InterlockedXor8) -short _InterlockedXor16(volatile short * value, short mask); +short _InterlockedXor16(_Interlocked_operand_ volatile short * value, short mask); #pragma intrinsic(_InterlockedXor16) -long _InterlockedXor(volatile long * value, long mask); +long _InterlockedXor(_Interlocked_operand_ volatile long * value, long mask); #pragma intrinsic(_InterlockedXor) -long _InterlockedDecrement(volatile long * lpAddend); +long _InterlockedDecrement(_Interlocked_operand_ volatile long * lpAddend); #pragma intrinsic(_InterlockedDecrement) -long _InterlockedIncrement(volatile long * lpAddend); +long _InterlockedIncrement(_Interlocked_operand_ volatile long * lpAddend); #pragma intrinsic(_InterlockedIncrement) -short _InterlockedDecrement16(volatile short * lpAddend); +short _InterlockedDecrement16(_Interlocked_operand_ volatile short * lpAddend); #pragma intrinsic(_InterlockedDecrement16) -short _InterlockedIncrement16(volatile short * lpAddend); +short _InterlockedIncrement16(_Interlocked_operand_ volatile short * lpAddend); #pragma intrinsic(_InterlockedIncrement16) unsigned char _interlockedbittestandreset(volatile long * a, long b); #pragma intrinsic(_interlockedbittestandreset) unsigned char _interlockedbittestandset(volatile long * a, long b); #pragma intrinsic(_interlockedbittestandset) - #if defined(_M_IX86) -long _InterlockedAddLargeStatistic(volatile __int64 * Addend, long Value); +long _InterlockedAddLargeStatistic(_Interlocked_operand_ volatile __int64 * Addend, long Value); #pragma intrinsic(_InterlockedAddLargeStatistic) #elif defined(_M_AMD64) __int64 _InterlockedExchange64(volatile __int64 * Target, __int64 Value); @@ -85,12 +117,12 @@ #pragma intrinsic(_InterlockedCompareExchangePointer) void * _InterlockedExchangePointer(void * volatile * Target, void * Value); #pragma intrinsic(_InterlockedExchangePointer) +unsigned char _InterlockedCompareExchange128(_Interlocked_operand_ volatile __int64 * Destination, __int64 ExchangeHigh, __int64 ExchangeLow, __int64 * ComparandResult); +#pragma intrinsic(_InterlockedCompareExchange128) __int64 _InterlockedAnd64(volatile __int64 * value, __int64 mask); #pragma intrinsic(_InterlockedAnd64) __int64 _InterlockedOr64(volatile __int64 * value, __int64 mask); #pragma intrinsic(_InterlockedOr64) -__int64 _InterlockedCompareExchange64(volatile __int64 * Destination, __int64 Exchange, __int64 Comperand); -#pragma intrinsic(_InterlockedCompareExchange64) __int64 _InterlockedDecrement64(volatile __int64 * lpAddend); #pragma intrinsic(_InterlockedDecrement64) __int64 _InterlockedIncrement64(volatile __int64 * lpAddend); @@ -99,10 +131,161 @@ #pragma intrinsic(_interlockedbittestandreset64) unsigned char _interlockedbittestandset64(volatile __int64 * a, __int64 b); #pragma intrinsic(_interlockedbittestandset64) -#endif - -#if defined(_M_IX86) || defined(_M_AMD64) +long _InterlockedAnd_np(volatile long * Value, long Mask); +#pragma intrinsic(_InterlockedAnd_np) +char _InterlockedAnd8_np(volatile char * Value, char Mask); +#pragma intrinsic(_InterlockedAnd8_np) +short _InterlockedAnd16_np(volatile short * Value, short Mask); +#pragma intrinsic(_InterlockedAnd16_np) +__int64 _InterlockedAnd64_np(volatile __int64 * Value, __int64 Mask); +#pragma intrinsic(_InterlockedAnd64_np) +short _InterlockedCompareExchange16_np(volatile short * Destination, short Exchange, short Comparand); +#pragma intrinsic(_InterlockedCompareExchange16_np) +__int64 _InterlockedCompareExchange64_np(volatile __int64 * Destination, __int64 Exchange, __int64 Comparand); +#pragma intrinsic(_InterlockedCompareExchange64_np) +unsigned char _InterlockedCompareExchange128_np(volatile __int64 * Destination, __int64 ExchangeHigh, __int64 ExchangeLow, __int64 * ComparandResult); +#pragma intrinsic(_InterlockedCompareExchange128_np) +void * _InterlockedCompareExchangePointer_np(void * volatile * Destination, void * Exchange, void * Comparand); +#pragma intrinsic(_InterlockedCompareExchangePointer_np) +long _InterlockedCompareExchange_np(volatile long * Destination, long Exchange, long Comparand); +#pragma intrinsic(_InterlockedCompareExchange_np) +short _InterlockedOr16_np(volatile short * Value, short Mask); +#pragma intrinsic(_InterlockedOr16_np) +char _InterlockedOr8_np(volatile char * Value, char Mask); +#pragma intrinsic(_InterlockedOr8_np) +long _InterlockedOr_np(volatile long * Value, long Mask); +#pragma intrinsic(_InterlockedOr_np) +short _InterlockedXor16_np(volatile short * Value, short Mask); +#pragma intrinsic(_InterlockedXor16_np) +__int64 _InterlockedXor64_np(volatile __int64 * Value, __int64 Mask); +#pragma intrinsic(_InterlockedXor64_np) +char _InterlockedXor8_np(volatile char * Value, char Mask); +#pragma intrinsic(_InterlockedXor8_np) +long _InterlockedXor_np(volatile long * Value, long Mask); +#pragma intrinsic(_InterlockedXor_np) +__int64 _InterlockedOr64_np(volatile __int64 * Value, __int64 Mask); +#pragma intrinsic(_InterlockedOr64_np) +#elif defined(_M_ARM) +long _InterlockedAdd(_Interlocked_operand_ long volatile * Addend, long Value); +__int64 _InterlockedAdd64(_Interlocked_operand_ __int64 volatile * Addend, __int64 Value); +__int64 _InterlockedAdd64_acq(__int64 volatile * Addend, __int64 Value); +__int64 _InterlockedAdd64_nf(__int64 volatile * Addend, __int64 Value); +__int64 _InterlockedAdd64_rel(__int64 volatile * Addend, __int64 Value); +long _InterlockedAdd_acq(long volatile * Addend, long Value); +long _InterlockedAdd_nf(long volatile * Addend, long Value); +long _InterlockedAdd_rel(long volatile * Addend, long Value); +short _InterlockedAnd16_acq(short volatile * Value, short Mask); +short _InterlockedAnd16_nf(short volatile * Value, short Mask); +short _InterlockedAnd16_rel(short volatile * Value, short Mask); +__int64 _InterlockedAnd64_acq(__int64 volatile * Value, __int64 Mask); +__int64 _InterlockedAnd64_nf(__int64 volatile * Value, __int64 Mask); +__int64 _InterlockedAnd64_rel(__int64 volatile * Value, __int64 Mask); +char _InterlockedAnd8_acq(char volatile * Value, char Mask); +char _InterlockedAnd8_nf(char volatile * Value, char Mask); +char _InterlockedAnd8_rel(char volatile * Value, char Mask); +long _InterlockedAnd_acq(long volatile * Value, long Mask); +long _InterlockedAnd_nf(long volatile * Value, long Mask); +long _InterlockedAnd_rel(long volatile * Value, long Mask); +short _InterlockedCompareExchange16_acq(short volatile * Destination, short Exchange, short Comparand); +short _InterlockedCompareExchange16_nf(short volatile * Destination, short Exchange, short Comparand); +short _InterlockedCompareExchange16_rel(short volatile * Destination, short Exchange, short Comparand); +__int64 _InterlockedCompareExchange64_acq(__int64 volatile * Destination, __int64 Exchange, __int64 Comparand); +__int64 _InterlockedCompareExchange64_nf(__int64 volatile * Destination, __int64 Exchange, __int64 Comparand); +__int64 _InterlockedCompareExchange64_rel(__int64 volatile * Destination, __int64 Exchange, __int64 Comparand); +char _InterlockedCompareExchange8_acq(char volatile * Destination, char Exchange, char Comparand); +char _InterlockedCompareExchange8_nf(char volatile * Destination, char Exchange, char Comparand); +char _InterlockedCompareExchange8_rel(char volatile * Destination, char Exchange, char Comparand); +void * _InterlockedCompareExchangePointer_acq(void * volatile * Destination, void * Exchange, void * Comparand); +void * _InterlockedCompareExchangePointer_nf(void * volatile * Destination, void * Exchange, void * Comparand); +void * _InterlockedCompareExchangePointer_rel(void * volatile * Destination, void * Exchange, void * Comparand); +long _InterlockedCompareExchange_acq(long volatile * Destination, long Exchange, long Comparand); +long _InterlockedCompareExchange_nf(long volatile * Destination, long Exchange, long Comparand); +long _InterlockedCompareExchange_rel(long volatile * Destination, long Exchange, long Comparand); +short _InterlockedDecrement16_acq(short volatile * Addend); +short _InterlockedDecrement16_nf(short volatile * Addend); +short _InterlockedDecrement16_rel(short volatile * Addend); +__int64 _InterlockedDecrement64_acq(__int64 volatile * Addend); +__int64 _InterlockedDecrement64_nf(__int64 volatile * Addend); +__int64 _InterlockedDecrement64_rel(__int64 volatile * Addend); +long _InterlockedDecrement_acq(long volatile * Addend); +long _InterlockedDecrement_nf(long volatile * Addend); +long _InterlockedDecrement_rel(long volatile * Addend); +short _InterlockedExchange16_acq(short volatile * Target, short Value); +short _InterlockedExchange16_nf(short volatile * Target, short Value); +__int64 _InterlockedExchange64_acq(__int64 volatile * Target, __int64 Value); +__int64 _InterlockedExchange64_nf(__int64 volatile * Target, __int64 Value); +char _InterlockedExchange8_acq(char volatile * Target, char Value); +char _InterlockedExchange8_nf(char volatile * Target, char Value); +short _InterlockedExchangeAdd16_acq(short volatile * Addend, short Value); +short _InterlockedExchangeAdd16_nf(short volatile * Addend, short Value); +short _InterlockedExchangeAdd16_rel(short volatile * Addend, short Value); +__int64 _InterlockedExchangeAdd64_acq(__int64 volatile * Addend, __int64 Value); +__int64 _InterlockedExchangeAdd64_nf(__int64 volatile * Addend, __int64 Value); +__int64 _InterlockedExchangeAdd64_rel(__int64 volatile * Addend, __int64 Value); +char _InterlockedExchangeAdd8_acq(char volatile * Addend, char Value); +char _InterlockedExchangeAdd8_nf(char volatile * Addend, char Value); +char _InterlockedExchangeAdd8_rel(char volatile * Addend, char Value); +long _InterlockedExchangeAdd_acq(long volatile * Addend, long Value); +long _InterlockedExchangeAdd_nf(long volatile * Addend, long Value); +long _InterlockedExchangeAdd_rel(long volatile * Addend, long Value); +void * _InterlockedExchangePointer_acq(void * volatile * Target, void * Value); +void * _InterlockedExchangePointer_nf(void * volatile * Target, void * Value); +long _InterlockedExchange_acq(long volatile * Target, long Value); +long _InterlockedExchange_nf(long volatile * Target, long Value); +short _InterlockedIncrement16_acq(short volatile * Addend); +short _InterlockedIncrement16_nf(short volatile * Addend); +short _InterlockedIncrement16_rel(short volatile * Addend); +__int64 _InterlockedIncrement64_acq(__int64 volatile * Addend); +__int64 _InterlockedIncrement64_nf(__int64 volatile * Addend); +__int64 _InterlockedIncrement64_rel(__int64 volatile * Addend); +long _InterlockedIncrement_acq(long volatile * Addend); +long _InterlockedIncrement_nf(long volatile * Addend); +long _InterlockedIncrement_rel(long volatile * Addend); +short _InterlockedOr16_acq(short volatile * Value, short Mask); +short _InterlockedOr16_nf(short volatile * Value, short Mask); +short _InterlockedOr16_rel(short volatile * Value, short Mask); +__int64 _InterlockedOr64_acq(__int64 volatile * Value, __int64 Mask); +__int64 _InterlockedOr64_nf(__int64 volatile * Value, __int64 Mask); +__int64 _InterlockedOr64_rel(__int64 volatile * Value, __int64 Mask); +char _InterlockedOr8_acq(char volatile * Value, char Mask); +char _InterlockedOr8_nf(char volatile * Value, char Mask); +char _InterlockedOr8_rel(char volatile * Value, char Mask); +long _InterlockedOr_acq(long volatile * Value, long Mask); +long _InterlockedOr_nf(long volatile * Value, long Mask); +long _InterlockedOr_rel(long volatile * Value, long Mask); +short _InterlockedXor16_acq(short volatile * Value, short Mask); +short _InterlockedXor16_nf(short volatile * Value, short Mask); +short _InterlockedXor16_rel(short volatile * Value, short Mask); +__int64 _InterlockedXor64_acq(__int64 volatile * Value, __int64 Mask); +__int64 _InterlockedXor64_nf(__int64 volatile * Value, __int64 Mask); +__int64 _InterlockedXor64_rel(_Interlocked_operand_ __int64 volatile * Value, __int64 Mask); +char _InterlockedXor8_acq(char volatile * Value, char Mask); +char _InterlockedXor8_nf(char volatile * Value, char Mask); +char _InterlockedXor8_rel(char volatile * Value, char Mask); +long _InterlockedXor_acq(long volatile * Value, long Mask); +long _InterlockedXor_nf(long volatile * Value, long Mask); +long _InterlockedXor_rel(long volatile * Value, long Mask); +unsigned char _interlockedbittestandreset_acq(long volatile *, long); +unsigned char _interlockedbittestandreset_nf(long volatile *, long); +unsigned char _interlockedbittestandreset_rel(long volatile *, long); +unsigned char _interlockedbittestandset_acq(long volatile *, long); +unsigned char _interlockedbittestandset_nf(long volatile *, long); +unsigned char _interlockedbittestandset_rel(long volatile *, long); +#endif +#if defined(_M_AMD64) || defined(_M_ARM) +__int64 _InterlockedAnd64(_Interlocked_operand_ __int64 volatile * Value, __int64 Mask); +void * _InterlockedCompareExchangePointer(_Interlocked_operand_ void * volatile * Destination, void * Exchange, void * Comparand); +__int64 _InterlockedDecrement64(_Interlocked_operand_ __int64 volatile * Addend); +__int64 _InterlockedExchange64(_Interlocked_operand_ __int64 volatile * Target, __int64 Value); +__int64 _InterlockedExchangeAdd64(_Interlocked_operand_ __int64 volatile * Addend, __int64 Value); +void * _InterlockedExchangePointer(_Interlocked_operand_ void * volatile * Target, void * Value); +__int64 _InterlockedIncrement64(_Interlocked_operand_ __int64 volatile * Addend); +__int64 _InterlockedOr64(_Interlocked_operand_ __int64 volatile * Value, __int64 Mask); +__int64 _InterlockedXor64(_Interlocked_operand_ __int64 volatile * Value, __int64 Mask); +#endif + /*** String operations ***/ +#if defined(_M_IX86) || defined(_M_AMD64) void __stosb(unsigned char * Dest, unsigned char Data, size_t Count); #pragma intrinsic(__stosb) void __stosw(unsigned short * Dest, unsigned short Data, size_t Count); @@ -123,8 +306,8 @@ #pragma intrinsic(__movsq) #endif +/*** GS segment addressing ***/ #if defined(_M_AMD64) -/*** GS segment addressing ***/ void __writegsbyte(unsigned long Offset, unsigned char Data); #pragma intrinsic(__writegsbyte) void __writegsword(unsigned long Offset, unsigned short Data); @@ -147,23 +330,27 @@ #pragma intrinsic(__incgsword) void __incgsdword(unsigned long Offset); #pragma intrinsic(__incgsdword) +void __incgsqword(unsigned long); +#pragma intrinsic(__incgsqword) void __addgsbyte(unsigned long Offset, unsigned char Data); #pragma intrinsic(__addgsbyte) void __addgsword(unsigned long Offset, unsigned short Data); #pragma intrinsic(__addgsword) -void __addgsdword(unsigned long Offset, unsigned int Data); +void __addgsdword(unsigned long Offset, unsigned long Data); #pragma intrinsic(__addgsdword) void __addgsqword(unsigned long Offset, unsigned __int64 Data); #pragma intrinsic(__addgsqword) #endif +/*** FS segment addressing ***/ #if defined(_M_IX86) -/*** FS segment addressing ***/ void __writefsbyte(unsigned long Offset, unsigned char Data); #pragma intrinsic(__writefsbyte) void __writefsword(unsigned long Offset, unsigned short Data); #pragma intrinsic(__writefsword) void __writefsdword(unsigned long Offset, unsigned long Data); +#pragma intrinsic(__writefsdword) +void __writefsqword(unsigned long Offset, unsigned __int64 Data); #pragma intrinsic(__writefsdword) unsigned char __readfsbyte(unsigned long Offset); #pragma intrinsic(__readfsbyte) @@ -171,6 +358,8 @@ #pragma intrinsic(__readfsword) unsigned long __readfsdword(unsigned long Offset); #pragma intrinsic(__readfsdword) +unsigned __int64 __readfsqword(unsigned long); +#pragma intrinsic(__readfsqword) void __incfsbyte(unsigned long Offset); #pragma intrinsic(__incfsbyte) void __incfsword(unsigned long Offset); @@ -181,10 +370,9 @@ #pragma intrinsic(__addfsbyte) void __addfsword(unsigned long Offset, unsigned short Data); #pragma intrinsic(__addfsword) -void __addfsdword(unsigned long Offset, unsigned int Data); +void __addfsdword(unsigned long Offset, unsigned long Data); #pragma intrinsic(__addfsdword) #endif - /*** Bit manipulation ***/ unsigned char _BitScanForward(unsigned long * Index, unsigned long Mask); @@ -209,14 +397,22 @@ #pragma intrinsic(_rotl8) unsigned short _rotl16(unsigned short value, unsigned char shift); #pragma intrinsic(_rotl16) -unsigned int _rotl(unsigned int value, int shift); +_Check_return_ unsigned int _rotl(unsigned int value, int shift); #pragma intrinsic(_rotl) -unsigned int _rotr(unsigned int value, int shift); -#pragma intrinsic(_rotr) +_Check_return_ unsigned __int64 __cdecl _rotl64(_In_ unsigned __int64 Value, _In_ int Shift); +#pragma intrinsic(_rotl64) +_Check_return_ unsigned long __cdecl _lrotl(_In_ unsigned long, _In_ int); +#pragma intrinsic(_lrotl) unsigned char _rotr8(unsigned char value, unsigned char shift); #pragma intrinsic(_rotr8) unsigned short _rotr16(unsigned short value, unsigned char shift); #pragma intrinsic(_rotr16) +_Check_return_ unsigned int _rotr(unsigned int value, int shift); +#pragma intrinsic(_rotr) +_Check_return_ unsigned __int64 __cdecl _rotr64(_In_ unsigned __int64 Value, _In_ int Shift); +#pragma intrinsic(_rotr64) +_Check_return_ unsigned long __cdecl _lrotr(_In_ unsigned long, _In_ int); +#pragma intrinsic(_lrotr) unsigned short _byteswap_ushort(unsigned short value); #pragma intrinsic(_byteswap_ushort) unsigned long _byteswap_ulong(unsigned long value); @@ -230,26 +426,86 @@ #pragma intrinsic(__ll_rshift) unsigned __int64 __ull_rshift(unsigned __int64 Mask, int Bit); #pragma intrinsic(__ull_rshift) +unsigned int __lzcnt(unsigned int Value); +#pragma intrinsic(__lzcnt) +unsigned short __lzcnt16(unsigned short Value); +#pragma intrinsic(__lzcnt16) +unsigned int __popcnt(unsigned int Value); +#pragma intrinsic(__popcnt) +unsigned short __popcnt16(unsigned short Value); +#pragma intrinsic(__popcnt16) #endif #ifdef _M_AMD64 +unsigned __int64 __shiftleft128(unsigned __int64 LowPart, unsigned __int64 HighPart, unsigned char Shift); +#pragma intrinsic(__shiftleft128) +unsigned __int64 __shiftright128(unsigned __int64 LowPart, unsigned __int64 HighPart, unsigned char Shift); +#pragma intrinsic(__shiftright128) unsigned char _bittest64(__int64 const *a, __int64 b); #pragma intrinsic(_bittest64) -#endif - -#if defined(_M_IX86) || defined(_M_AMD64) -/*** 64-bit math ***/ +unsigned char _bittestandcomplement64(__int64 *a, __int64 b); +#pragma intrinsic(_bittestandcomplement64) +unsigned char _bittestandreset64(__int64 *a, __int64 b); +#pragma intrinsic(_bittestandreset64) +unsigned char _bittestandset64(__int64 *a, __int64 b); +#pragma intrinsic(_bittestandset64) +unsigned __int64 __lzcnt64(unsigned __int64 Value); +#pragma intrinsic(__lzcnt64) +unsigned __int64 __popcnt64(unsigned __int64 Value); +#pragma intrinsic(__popcnt64) +#elif defined(_M_ARM) +unsigned int _CountLeadingOnes(unsigned long Value); +unsigned int _CountLeadingOnes64(unsigned __int64 Value); +unsigned int _CountLeadingSigns(long Value); +unsigned int _CountLeadingSigns64(__int64 Value); +unsigned int _CountLeadingZeros(unsigned long Value); +unsigned int _CountLeadingZeros64(unsigned __int64 Value); +unsigned int _CountOneBits(unsigned long Value); +unsigned int _CountOneBits64(unsigned __int64 Value); +#endif + +/*** 64/128-bit math ***/ +__int64 __cdecl _abs64(__int64); +#pragma intrinsic(_abs64) +#if defined(_M_IX86) || defined(_M_AMD64) __int64 __emul(int a, int b); #pragma intrinsic(__emul) unsigned __int64 __emulu(unsigned int a, unsigned int b); #pragma intrinsic(__emulu) #endif #ifdef _M_AMD64 +__int64 __mulh(__int64 a, __int64 b); +#pragma intrinsic(__mulh) unsigned __int64 __umulh(unsigned __int64 a, unsigned __int64 b); #pragma intrinsic(__umulh) -#endif - -#if defined(_M_IX86) || defined(_M_AMD64) +__int64 _mul128(__int64 Multiplier, __int64 Multiplicand, __int64 * HighProduct); +#pragma intrinsic(_mul128) +unsigned __int64 _umul128(unsigned __int64 Multiplier, unsigned __int64 Multiplicand, unsigned __int64 * HighProduct); +#pragma intrinsic(_umul128) +#elif defined(_M_ARM) +long _MulHigh(long Multiplier, long Multiplicand); +#pragma intrinsic(_MulHigh) +unsigned long _MulUnsignedHigh(unsigned long Multiplier, unsigned long Multiplicand); +#pragma intrinsic(_MulUnsignedHigh) +#endif + +/** Floating point stuff **/ +#if defined(_M_ARM) +int _isunordered(double arg1, double arg2); +#pragma intrinsic(_isunordered) +int _isunorderedf(float arg1, float arg2); +#pragma intrinsic(_isunorderedf) +double _CopyDoubleFromInt64(__int64); +#pragma intrinsic(_CopyDoubleFromInt64) +float _CopyFloatFromInt32(__int32); +#pragma intrinsic(_CopyFloatFromInt32) +__int32 _CopyInt32FromFloat(float); +#pragma intrinsic(_CopyInt32FromFloat) +__int64 _CopyInt64FromDouble(double); +#pragma intrinsic(_CopyInt64FromDouble) +#endif + /*** Port I/O ***/ +#if defined(_M_IX86) || defined(_M_AMD64) unsigned char __inbyte(unsigned short Port); #pragma intrinsic(__inbyte) unsigned short __inword(unsigned short Port); @@ -274,21 +530,49 @@ #pragma intrinsic(__outwordstring) void __outdwordstring(unsigned short Port, unsigned long * Buffer, unsigned long Count); #pragma intrinsic(__outdwordstring) -#endif - -#if defined(_M_IX86) || defined(_M_AMD64) +int __cdecl _inp(unsigned short Port); +#pragma intrinsic(_inp) +unsigned long __cdecl _inpd(unsigned short Port); +#pragma intrinsic(_inpd) +unsigned short __cdecl _inpw(unsigned short Port); +#pragma intrinsic(_inpw) +int __cdecl inp(unsigned short Port); +#pragma intrinsic(inp) +unsigned long __cdecl inpd(unsigned short Port); +#pragma intrinsic(inpd) +unsigned short __cdecl inpw(unsigned short Port); +#pragma intrinsic(inpw) +int __cdecl _outp(unsigned short Port, int Value); +#pragma intrinsic(_outp) +unsigned long __cdecl _outpd(unsigned short Port, unsigned long Value); +#pragma intrinsic(_outpd) +unsigned short __cdecl _outpw(unsigned short Port, unsigned short Value); +#pragma intrinsic(_outpw) +int __cdecl outp(unsigned short Port, int Value); +#pragma intrinsic(outp) +unsigned long __cdecl outpd(unsigned short Port, unsigned long Value); +#pragma intrinsic(outpd) +unsigned short __cdecl outpw(unsigned short Port, unsigned short Value); +#pragma intrinsic(outpw) +#endif + /*** System information ***/ -void __cpuid(int CPUInfo[], int InfoType); +#if defined(_M_IX86) || defined(_M_AMD64) +void __cpuid(int CPUInfo[4], int InfoType); #pragma intrinsic(__cpuid) +void __cpuidex(int CPUInfo[4], int InfoType, int ECXValue); +#pragma intrinsic(__cpuidex) unsigned __int64 __rdtsc(void); #pragma intrinsic(__rdtsc) +unsigned __int64 __rdtscp(unsigned int *); +#pragma intrinsic(__rdtscp) void __writeeflags(uintptr_t Value); #pragma intrinsic(__writeeflags) uintptr_t __readeflags(void); #pragma intrinsic(__readeflags) #endif -/*** Interrupts ***/ +/*** Interrupts and traps ***/ void __debugbreak(void); #pragma intrinsic(__debugbreak) void _disable(void); @@ -300,49 +584,44 @@ #pragma intrinsic(__int2c) void __halt(void); #pragma intrinsic(__halt) +void __ud2(void); +#pragma intrinsic(__ud2) +__declspec(noreturn) void __fastfail(unsigned int Code); +#pragma intrinsic(__fastfail) +#endif +#if defined(_M_ARM) +int __trap(int Arg1, ...); #endif /*** Protected memory management ***/ #if defined(_M_IX86) || defined(_M_AMD64) -void __writecr0(unsigned __int64 Data); +void __writecr0(uintptr_t Data); #pragma intrinsic(__writecr0) -void __writecr3(unsigned __int64 Data); +void __writecr3(uintptr_t Data); #pragma intrinsic(__writecr3) -void __writecr4(unsigned __int64 Data); +void __writecr4(uintptr_t Data); #pragma intrinsic(__writecr4) -#endif -#ifdef _M_AMD64 -void __writecr8(unsigned __int64 Data); +void __writecr8(uintptr_t Data); #pragma intrinsic(__writecr8) -unsigned __int64 __readcr0(void); +#endif +#if defined(_M_IX86) +unsigned long __readcr0(void); #pragma intrinsic(__readcr0) -unsigned __int64 __readcr2(void); +unsigned long __readcr2(void); #pragma intrinsic(__readcr2) -unsigned __int64 __readcr3(void); +unsigned long __readcr3(void); #pragma intrinsic(__readcr3) -unsigned __int64 __readcr4(void); -#pragma intrinsic(__readcr4) -unsigned __int64 __readcr8(void); -#pragma intrinsic(__readcr8) -unsigned __int64 __readdr(unsigned int reg); -#pragma intrinsic(__readdr) -void __writedr(unsigned reg, unsigned __int64 value); -#pragma intrinsic(__writedr) -#elif defined(_M_IX86) -unsigned long __readcr0(void); -unsigned long __readcr2(void); -unsigned long __readcr3(void); //unsigned long __readcr4(void); //#pragma intrinsic(__readcr4) // HACK: MSVC is broken unsigned long ___readcr4(void); #define __readcr4 ___readcr4 - +unsigned long __readcr8(void); +#pragma intrinsic(__readcr8) unsigned int __readdr(unsigned int reg); +#pragma intrinsic(__readdr) void __writedr(unsigned reg, unsigned int value); -#endif - -#ifdef _M_IX86 +#pragma intrinsic(__writedr) // This intrinsic is broken and generates wrong opcodes, // when optimization is enabled! #pragma warning(push) @@ -362,15 +641,33 @@ #elif defined(_M_AMD64) void __invlpg(void * Address); #pragma intrinsic(__invlpg) +#elif defined(_M_AMD64) +unsigned __int64 __readcr0(void); +#pragma intrinsic(__readcr0) +unsigned __int64 __readcr2(void); +#pragma intrinsic(__readcr2) +unsigned __int64 __readcr3(void); +#pragma intrinsic(__readcr3) +unsigned __int64 __readcr4(void); +#pragma intrinsic(__readcr4) +unsigned __int64 __readcr8(void); +#pragma intrinsic(__readcr8) +unsigned __int64 __readdr(unsigned int reg); +#pragma intrinsic(__readdr) +void __writedr(unsigned reg, unsigned __int64 value); +#pragma intrinsic(__writedr) +#elif defined(_M_ARM) +void __cdecl __prefetch(const void *); +#pragma intrinsic(__prefetch) #endif /*** System operations ***/ #if defined(_M_IX86) || defined(_M_AMD64) -unsigned __int64 __readmsr(int reg); +unsigned __int64 __readmsr(unsigned long reg); #pragma intrinsic(__readmsr) void __writemsr(unsigned long Register, unsigned __int64 Value); #pragma intrinsic(__writemsr) -unsigned __int64 __readpmc(int counter); +unsigned __int64 __readpmc(unsigned long counter); #pragma intrinsic(__readpmc) unsigned long __segmentlimit(unsigned long a); #pragma intrinsic(__segmentlimit) @@ -383,6 +680,93 @@ void _mm_pause(void); #pragma intrinsic(_mm_pause) #endif +#if defined(_M_ARM) +unsigned int _MoveFromCoprocessor(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int); +#pragma intrinsic(_MoveFromCoprocessor) +unsigned int _MoveFromCoprocessor2(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int); +#pragma intrinsic(_MoveFromCoprocessor2) +unsigned __int64 _MoveFromCoprocessor64(unsigned int, unsigned int, unsigned int); +#pragma intrinsic(_MoveFromCoprocessor64) +void _MoveToCoprocessor(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int); +#pragma intrinsic(_MoveToCoprocessor) +void _MoveToCoprocessor2(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int); +#pragma intrinsic(_MoveToCoprocessor2) +void _MoveToCoprocessor64(unsigned __int64, unsigned int, unsigned int, unsigned int); +#pragma intrinsic(_MoveToCoprocessor64) +int _ReadStatusReg(int); +#pragma intrinsic(_ReadStatusReg) +void _WriteStatusReg(int, int, int); +#pragma intrinsic(_WriteStatusReg) +void __yield(void); +#pragma intrinsic(__yield) +void __wfe(void); +#pragma intrinsic(__wfe) +void __wfi(void); +#pragma intrinsic(__wfi) +unsigned int __swi(unsigned int, ...); +#pragma intrinsic(__swi) +unsigned int __hvc(unsigned int, ...); +#pragma intrinsic(__hvc) +__int64 __ldrexd(__int64 volatile *); +#pragma intrinsic(__ldrexd) +unsigned __int64 __rdpmccntr64(void); +#pragma intrinsic(__rdpmccntr64) +void __sev(void); +#pragma intrinsic(__sev) +#endif + +/** Secure virtual machine **/ +#if defined(_M_IX86) || defined(_M_AMD64) +void __svm_clgi(void); +#pragma intrinsic(__svm_clgi) +void __svm_invlpga(void * Va, int Asid); +#pragma intrinsic(__svm_invlpga) +void __svm_skinit(int Slb); +#pragma intrinsic(__svm_skinit) +void __svm_stgi(void); +#pragma intrinsic(__svm_stgi) +void __svm_vmload(uintptr_t VmcbPhysicalAddress); +#pragma intrinsic(__svm_vmload) +void __svm_vmrun(uintptr_t VmcbPhysicalAddress); +#pragma intrinsic(__svm_vmrun) +void __svm_vmsave(uintptr_t VmcbPhysicalAddress); +#pragma intrinsic(__svm_vmsave) +#endif + +/** Virtual machine extension **/ +#if defined(_M_IX86) || defined(_M_AMD64) +void __vmx_off(void); +void __vmx_vmptrst(unsigned __int64 * VmcsPhysicalAddress ); +#endif +#if defined(_M_AMD64) +unsigned char __vmx_on(unsigned __int64 * VmsSupportPhysicalAddress); +unsigned char __vmx_vmclear(unsigned __int64 * VmcsPhysicalAddress); +unsigned char __vmx_vmlaunch(void); +unsigned char __vmx_vmptrld(unsigned __int64 *VmcsPhysicalAddress ); +unsigned char __vmx_vmread(size_t Field, size_t *FieldValue); +unsigned char __vmx_vmresume(void); +unsigned char __vmx_vmwrite(size_t Field, size_t FieldValue); +#endif + +/** Misc **/ +void __nop(void); +#pragma intrinsic(__nop) +void __code_seg(const char *); +#pragma intrinsic(__code_seg) +#ifdef _M_ARM +int _AddSatInt(int, int); +#pragma intrinsic(_AddSatInt) +int _DAddSatInt(int, int); +#pragma intrinsic(_DAddSatInt) +int _DSubSatInt(int, int); +#pragma intrinsic(_DSubSatInt) +int _SubSatInt(int, int); +#pragma intrinsic(_SubSatInt) +void __emit(unsigned __int32); +#pragma intrinsic(__emit) +void __static_assert(int, const char *); +#pragma intrinsic(__static_assert) +#endif #ifdef __cplusplus }

10 years, 7 months

[tkreuzer] 63485: [CMAKE] Revert r63470 and add a comment, that this is not a typo.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 27 21:32:42 2014 New Revision: 63485 URL: http://svn.reactos.org/svn/reactos?rev=63485&view=rev Log: [CMAKE] Revert r63470 and add a comment, that this is not a typo. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=63485… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue May 27 21:32:42 2014 @@ -291,7 +291,9 @@ endfunction() if(ARCH STREQUAL "amd64") - add_definitions(/D__x86_64__) + # This is NOT a typo. + # See https://software.intel.com/en-us/forums/topic/404643 + add_definitions(/D__x86_64) set(SPEC2DEF_ARCH x86_64) elseif(ARCH STREQUAL "arm") add_definitions(/D__arm__)

10 years, 7 months

[aandrejevic] 63484: [NTVDM] Fix the previous fix. Use LOBYTE/HIBYTE not LOWORD/HIWORD.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue May 27 21:29:36 2014 New Revision: 63484 URL: http://svn.reactos.org/svn/reactos?rev=63484&view=rev Log: [NTVDM] Fix the previous fix. Use LOBYTE/HIBYTE not LOWORD/HIWORD. Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Tue May 27 21:29:36 2014 @@ -443,8 +443,8 @@ *(DestBuffer++) = 0; /* Store the special program name tag */ - *(DestBuffer++) = LOWORD(DOS_PROGRAM_NAME_TAG); - *(DestBuffer++) = HIWORD(DOS_PROGRAM_NAME_TAG); + *(DestBuffer++) = LOBYTE(DOS_PROGRAM_NAME_TAG); + *(DestBuffer++) = HIBYTE(DOS_PROGRAM_NAME_TAG); /* Copy the program name after the environment block */ strcpy(DestBuffer, ProgramName);

10 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2014