Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[jmorlan] 40084: - Implement SHIFT /n. - Make prompt code $T and %TIME% have the hours space-padded, not zero-padded. - Allow delayed expansion in the parameter of IF ERRORLEVEL.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Wed Mar 18 06:52:58 2009 New Revision: 40084 URL: http://svn.reactos.org/svn/reactos?rev=40084&view=rev Log: - Implement SHIFT /n. - Make prompt code $T and %TIME% have the hours space-padded, not zero-padded. - Allow delayed expansion in the parameter of IF ERRORLEVEL. Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/if.c trunk/reactos/base/shell/cmd/locale.c trunk/reactos/base/shell/cmd/shift.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Wed Mar 18 06:52:58 2009 @@ -91,7 +91,7 @@ if (n < 0 || n > 9) return NULL; - n += bc->shiftlevel; + n = bc->shiftlevel[n]; *IsParam0 = (n == 0); pp = bc->params; @@ -207,6 +207,7 @@ { BATCH_CONTEXT new; LPFOR_CONTEXT saved_fc; + INT i; HANDLE hFile; SetLastError(0); @@ -260,7 +261,8 @@ bc->hBatchFile = hFile; SetFilePointer (bc->hBatchFile, 0, NULL, FILE_BEGIN); bc->bEcho = bEcho; /* Preserve echo across batch calls */ - bc->shiftlevel = 0; + for (i = 0; i < 10; i++) + bc->shiftlevel[i] = i; bc->params = BatchParams (firstword, param); // Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] Wed Mar 18 06:52:58 2009 @@ -14,7 +14,7 @@ TCHAR BatchFilePath[MAX_PATH]; LPTSTR params; LPTSTR raw_params; /* Holds the raw params given by the input */ - INT shiftlevel; + INT shiftlevel[10]; BOOL bEcho; /* Preserve echo flag across batch calls */ REDIRECTION *RedirList; PARSED_COMMAND *current; Modified: trunk/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/if.c?rev=40… ============================================================================== --- trunk/reactos/base/shell/cmd/if.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/if.c [iso-8859-1] Wed Mar 18 06:52:58 2009 @@ -103,7 +103,7 @@ else if (Cmd->If.Operator == IF_ERRORLEVEL) { /* IF ERRORLEVEL n: check if last exit code is greater or equal to n */ - INT n = _tcstol(Cmd->If.RightArg, &param, 10); + INT n = _tcstol(Right, &param, 10); if (*param != _T('\0')) { error_syntax(Right); Modified: trunk/reactos/base/shell/cmd/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/locale.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/locale.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/locale.c [iso-8859-1] Wed Mar 18 06:52:58 2009 @@ -76,7 +76,7 @@ static TCHAR szTime[12]; SYSTEMTIME t; GetLocalTime(&t); - _stprintf(szTime, _T("%02d%c%02d%c%02d%c%02d"), + _stprintf(szTime, _T("%2d%c%02d%c%02d%c%02d"), t.wHour, cTimeSeparator, t.wMinute, cTimeSeparator, t.wSecond, cDecimalSeparator, t.wMilliseconds / 10); return szTime; Modified: trunk/reactos/base/shell/cmd/shift.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/shift.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/shift.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/shift.c [iso-8859-1] Wed Mar 18 06:52:58 2009 @@ -38,7 +38,7 @@ INT cmd_shift (LPTSTR param) { - + INT i = 0; TRACE ("cmd_shift: (\'%s\')\n", debugstr_aw(param)); if (!_tcsncmp (param, _T("/?"), 2)) @@ -58,11 +58,26 @@ if (!_tcsicmp (param, _T("down"))) { - if (bc->shiftlevel) - bc->shiftlevel--; + if (bc->shiftlevel[0]) + for (; i <= 9; i++) + bc->shiftlevel[i]--; } else /* shift up */ - bc->shiftlevel++; + { + if (*param == _T('/')) + { + if (param[1] < '0' || param[1] > '9') + { + error_invalid_switch(param[1]); + return 1; + } + i = param[1] - '0'; + } + + for (; i < 9; i++) + bc->shiftlevel[i] = bc->shiftlevel[i + 1]; + bc->shiftlevel[i]++; + } return 0; }

15 years, 9 months

[jmorlan] 40083: Fix a typo

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Wed Mar 18 01:53:13 2009 New Revision: 40083 URL: http://svn.reactos.org/svn/reactos?rev=40083&view=rev Log: Fix a typo Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Wed Mar 18 01:53:13 2009 @@ -304,7 +304,7 @@ STRING_MKLINK_HELP, "Creates a filesystem link object.\n\n\ MKLINK [/D | /H | /J] linkname target\n\n\ - /D Indicates that symbolic link target is a directory.\n\ + /D Indicates that the symbolic link target is a directory.\n\ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created."

15 years, 9 months

[jmorlan] 40082: - Implement MKLINK command. - Remove unused library shell32 from cmd.rbuild.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Wed Mar 18 01:27:33 2009 New Revision: 40082 URL: http://svn.reactos.org/svn/reactos?rev=40082&view=rev Log: - Implement MKLINK command. - Remove unused library shell32 from cmd.rbuild. Added: trunk/reactos/base/shell/cmd/mklink.c (with props) Modified: trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/cmd.rbuild trunk/reactos/base/shell/cmd/cmdtable.c trunk/reactos/base/shell/cmd/config.h trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/resource.h Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -318,6 +318,10 @@ /* Prototypes for MEMORY.C */ INT CommandMemory (LPTSTR); + + +/* Prototypes for MKLINK.C */ +INT cmd_mklink(LPTSTR); /* Prototypes for MISC.C */ Modified: trunk/reactos/base/shell/cmd/cmd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.rbuild [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -9,7 +9,6 @@ <library>wine</library> <library>kernel32</library> <library>advapi32</library> - <library>shell32</library> <library>user32</library> <file>cmd.rc</file> <file>main.c</file> @@ -49,6 +48,7 @@ <file>locale.c</file> <file>memory.c</file> <file>misc.c</file> + <file>mklink.c</file> <file>move.c</file> <file>msgbox.c</file> <file>parser.c</file> Modified: trunk/reactos/base/shell/cmd/cmdtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdtable.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdtable.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmdtable.c [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -137,6 +137,10 @@ #ifdef INCLUDE_CMD_MKDIR {_T("md"), CMD_SPECIAL, cmd_mkdir}, {_T("mkdir"), CMD_SPECIAL, cmd_mkdir}, +#endif + +#ifdef INCLUDE_CMD_MKLINK + {_T("mklink"), 0, cmd_mklink}, #endif #ifdef INCLUDE_CMD_MOVE Modified: trunk/reactos/base/shell/cmd/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/config.h?re… ============================================================================== --- trunk/reactos/base/shell/cmd/config.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/config.h [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -66,6 +66,7 @@ #define INCLUDE_CMD_LABEL #define INCLUDE_CMD_MEMORY #define INCLUDE_CMD_MKDIR +#define INCLUDE_CMD_MKLINK #define INCLUDE_CMD_MOVE #ifdef NT4_INTERNAL_COMMANDS #define INCLUDE_CMD_MSGBOX Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -294,6 +294,13 @@ STRING_MKDIR_HELP, "Erzeugt ein Verzeichnis.\n\n\ MKDIR [Laufwerk:]Pfad\nMD [Laufwerk:]Pfad" +STRING_MKLINK_HELP, "Creates a filesystem link object.\n\n\ +MKLINK [/D | /H | /J] linkname target\n\n\ + /D Indicates that the symbolic link target is a directory.\n\ + /H Create a hard link.\n\ + /J Create a directory junction.\n\n\ +If neither /H or /J is specified, a symbolic link is created." + STRING_MEMMORY_HELP1, "Zeigt die Größe des Systemspeicher an.\n\nMEMORY" STRING_MEMMORY_HELP2, "\n %12s%% Speicher geladen.\n\n\ @@ -576,6 +583,7 @@ LABEL Erstellt, ändert oder löscht die Bezeichnung eines Volumes.\n\ MD Erstellt ein Verzeichnis.\n\ MKDIR Erstellt ein Verzeichnis.\n\ +MKLINK Creates a filesystem link object.\n\ MOVE Verschiebt eine oder mehrere Dateien von einem Verzeichnis in\n\ ein anderes.\n\ PATH Legt den Suchpfad für ausführbare Dateien fest oder zeigt diesen an.\n\ @@ -680,6 +688,9 @@ STRING_SCREEN_COL, "ungültige Spalten-Angabe" STRING_SCREEN_ROW, "ungültige Zeilen-Angabe" STRING_TIMER_TIME "Timer %d ist %s: " +STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" STRING_INVALID_OPERAND, "Ungültiger Operand." STRING_EXPECTED_CLOSE_PAREN, "Erwartet ')'." STRING_EXPECTED_NUMBER_OR_VARIABLE,"Erwartet Nummer oder Variablennamen." Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -301,6 +301,13 @@ STRING_MKDIR_HELP, "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" +STRING_MKLINK_HELP, "Creates a filesystem link object.\n\n\ +MKLINK [/D | /H | /J] linkname target\n\n\ + /D Indicates that the symbolic link target is a directory.\n\ + /H Create a hard link.\n\ + /J Create a directory junction.\n\n\ +If neither /H or /J is specified, a symbolic link is created." + STRING_MEMMORY_HELP1, "Displays the amount of system memory.\n\nMEMORY" STRING_MEMMORY_HELP2, "\n %12s%% memory load.\n\n\ @@ -583,6 +590,7 @@ LABEL Äçìéïõñãåß, áëëÜæåé Þ äéáãñÜöåé ôçí åôéêÝôá ôüìïõ åíüò äßóêïõ.\n\ MD Äçìéïõñãåß Ýíáí êáôÜëïãï.\n\ MKDIR Äçìéïõñãåß Ýíáí êáôÜëïãï.\n\ +MKLINK Creates a filesystem link object.\n\ MOVE Ìåôáêéíåß Ýíá Þ ðåñéóóüôåñá áñ÷åßá áðü Ýíáí êáôÜëïãï óå Ýíáí Üëëï.\n\ PATH Åìöáíßæåé Þ ïñßæåé ìéá äéáäñïìÞ áíáæÞôçóçò ãéá åêôåëÝóéìá áñ÷åßá.\n\ PAUSE ÁíáóôÝëëåé ôçí åêôÝëåóç åíüò ðñïãñÜììáôïò äÝóìçò êáé åìöáíßæåé Ýíá ìÞíõìá.\n\ @@ -697,6 +705,9 @@ STRING_SCREEN_COL, "invalid value for col" STRING_SCREEN_ROW, "invalid value for row" STRING_TIMER_TIME "Timer %d is %s: " +STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" STRING_INVALID_OPERAND, "Invalid operand." STRING_EXPECTED_CLOSE_PAREN, "Áíáìåíüôáí ')'." Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -302,6 +302,13 @@ STRING_MKDIR_HELP, "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" +STRING_MKLINK_HELP, "Creates a filesystem link object.\n\n\ +MKLINK [/D | /H | /J] linkname target\n\n\ + /D Indicates that symbolic link target is a directory.\n\ + /H Create a hard link.\n\ + /J Create a directory junction.\n\n\ +If neither /H or /J is specified, a symbolic link is created." + STRING_MEMMORY_HELP1, "Displays the amount of system memory.\n\nMEMORY" STRING_MEMMORY_HELP2, "\n %12s%% memory load.\n\n\ @@ -584,6 +591,7 @@ LABEL Creates, changes, or deletes the volume label of a disk.\n\ MD Creates a directory.\n\ MKDIR Creates a directory.\n\ +MKLINK Creates a filesystem link object.\n\ MOVE Moves one or more files from one directory to another\n\ directory.\n\ PATH Displays or sets a search path for executable files.\n\ @@ -701,6 +709,9 @@ STRING_SCREEN_COL, "invalid value for col" STRING_SCREEN_ROW, "invalid value for row" STRING_TIMER_TIME "Timer %d is %s: " +STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" STRING_INVALID_OPERAND, "Invalid operand." STRING_EXPECTED_CLOSE_PAREN, "Expected ')'." Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -300,6 +300,13 @@ STRING_MKDIR_HELP, "Crea un directorio.\n\n\ MKDIR [unidad:]ruta\nMD [unidad:]ruta" +STRING_MKLINK_HELP, "Creates a filesystem link object.\n\n\ +MKLINK [/D | /H | /J] linkname target\n\n\ + /D Indicates that the symbolic link target is a directory.\n\ + /H Create a hard link.\n\ + /J Create a directory junction.\n\n\ +If neither /H or /J is specified, a symbolic link is created." + STRING_MEMMORY_HELP1, "Muestra la cantidad de memoria del sistema.\n\nMEMORY" STRING_MEMMORY_HELP2, "\n %12s%% carga de memoria.\n\n\ @@ -543,6 +550,7 @@ LABEL Crea, cambia, o borra la etiqueta de volumen de un disco.\n\ MD Crea un directorio.\n\ MKDIR Crea un directorio.\n\ +MKLINK Creates a filesystem link object.\n\ MOVE Mueve uno o más archivos de un directorio a otro.\n\ PATH Muestra o configura las rutas de búsqueda para archivos ejecutables.\n\ PAUSE Suspende el procesamiento de un archivo por lotes y muestra un mensaje.\n\ @@ -649,6 +657,9 @@ STRING_SCREEN_COL, "Valor inválido de columna" STRING_SCREEN_ROW, "Valor inválido de fila" STRING_TIMER_TIME "El temporizador %d es %s: " +STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" STRING_INVALID_OPERAND, "Operador erróneo.\n" STRING_EXPECTED_CLOSE_PAREN, "Se esperaba ')'.\n" Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -313,6 +313,13 @@ STRING_MKDIR_HELP, "Crée un répertoire.\n\n\ MKDIR [lecteur:]chemin\nMD [lecteur:]chemin" +STRING_MKLINK_HELP, "Creates a filesystem link object.\n\n\ +MKLINK [/D | /H | /J] linkname target\n\n\ + /D Indicates that the symbolic link target is a directory.\n\ + /H Create a hard link.\n\ + /J Create a directory junction.\n\n\ +If neither /H or /J is specified, a symbolic link is created." + STRING_MEMMORY_HELP1, "Affiche la quantité de mémoire système.\n\nMEMORY" STRING_MEMMORY_HELP2, "\n %12s%% de charge mémoire.\n\n\ @@ -597,6 +604,7 @@ LABEL Créé, change, ou supprime le nom de volume d'un disque.\n\ MD Créé un répertoire.\n\ MKDIR Créé un répertoire.\n\ +MKLINK Creates a filesystem link object.\n\ MOVE Déplace un ou plusieurs fichiers d'un répertoire vers un autre\n\ répertoire.\n\ PATH Affiche ou défini un chemin de recherche pour les fichiers exécutables.\n\ @@ -715,6 +723,9 @@ STRING_SCREEN_COL, "valeur invalide pour col" STRING_SCREEN_ROW, "valeur invalide pour lig" STRING_TIMER_TIME "Le timer n°%d est %s : " +STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" STRING_INVALID_OPERAND, "Opérande invalide." STRING_EXPECTED_CLOSE_PAREN, "Attendu ')'." Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -289,6 +289,13 @@ STRING_MKDIR_HELP, "Létrehoz egy új mappát.\n\n\ MKDIR [meghajtó:]path\nMD [meghajtó:]path" +STRING_MKLINK_HELP, "Creates a filesystem link object.\n\n\ +MKLINK [/D | /H | /J] linkname target\n\n\ + /D Indicates that the symbolic link target is a directory.\n\ + /H Create a hard link.\n\ + /J Create a directory junction.\n\n\ +If neither /H or /J is specified, a symbolic link is created." + STRING_MEMMORY_HELP1, "Megjeleníti a memória statisztikát.\n\nMEMORY" STRING_MEMMORY_HELP2, "\n A memória %12s%%-a foglalt.\n\n\ @@ -526,6 +533,7 @@ LABEL Beállítja egy kötet címkéjét.\n\ MD Létrehoz egy új mappát.\n\ MKDIR Létrehoz egy új mappát.\n\ +MKLINK Creates a filesystem link object.\n\ MOVE Áthelyez egy vagy több állományt az egyik mappából a másikba.\n\ PATH Megjeleníti vagy beállítja a keresési útvonalakat.\n\ PAUSE Felfüggeszti a futást, és vár a felhasználóra.\n\ @@ -629,4 +637,7 @@ STRING_SCREEN_COL, "Érvénytelen érték oszlopnak" STRING_SCREEN_ROW, "Érvénytelen érték sornak" STRING_TIMER_TIME "Idõzítõ %d értéke %s: " +STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" END Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -302,6 +302,13 @@ STRING_MKDIR_HELP, "Membuat direktori.\n\n\ MKDIR [drive:]path\nMD [drive:]path" +STRING_MKLINK_HELP, "Creates a filesystem link object.\n\n\ +MKLINK [/D | /H | /J] linkname target\n\n\ + /D Indicates that the symbolic link target is a directory.\n\ + /H Create a hard link.\n\ + /J Create a directory junction.\n\n\ +If neither /H or /J is specified, a symbolic link is created." + STRING_MEMMORY_HELP1, "Menampilkan jumlah memori sistem.\n\nMEMORY" STRING_MEMMORY_HELP2, "\n %12s%% beban memori.\n\n\ @@ -542,6 +549,7 @@ LABEL Membuat, mengubah, atau menghapus label volume disk.\n\ MD Membuat sebuah direktori.\n\ MKDIR Membuat sebuah direktori.\n\ +MKLINK Creates a filesystem link object.\n\ MOVE Memindahkan satu atau lebih file dari satu direktori ke yang lainnya\n\ directory.\n\ PATH Menampilkan atau menyetel path pencarian untuk file executable.\n\ @@ -651,6 +659,9 @@ STRING_SCREEN_COL, "Nilai untuk kolom tidak benar" STRING_SCREEN_ROW, "Nilai untuk baris tidak benar" STRING_TIMER_TIME "Timer %d adalah %s: " +STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" STRING_INVALID_OPERAND, "Operand tidak benar." STRING_EXPECTED_CLOSE_PAREN, "Diharapkan ')'." Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -301,6 +301,13 @@ STRING_MKDIR_HELP, "Crea una cartella.\n\n\ MKDIR [disco:]percorso\nMD [disco:]percorso" +STRING_MKLINK_HELP, "Creates a filesystem link object.\n\n\ +MKLINK [/D | /H | /J] linkname target\n\n\ + /D Indicates that the symbolic link target is a directory.\n\ + /H Create a hard link.\n\ + /J Create a directory junction.\n\n\ +If neither /H or /J is specified, a symbolic link is created." + STRING_MEMMORY_HELP1, "Visualizza la quantità della memoria di sistema.\n\n\ MEMORY" @@ -590,6 +597,7 @@ LABEL Crea, modifica, o cancella l'etichetta di un disco.\n\ MD Crea una cartella.\n\ MKDIR Crea una cartella.\n\ +MKLINK Creates a filesystem link object.\n\ MOVE Muove uno o più file da una cartella a un'altra\n\ PATH Visualizza o imposta i percorsi di ricerca per gli eseguibili.\n\ PAUSE Ferma l'esecuzione di un batch e visualizza un messaggio.\n\ @@ -705,6 +713,9 @@ STRING_SCREEN_COL, "valore non valido per colonna" STRING_SCREEN_ROW, "valore non valido per riga" STRING_TIMER_TIME "Timer %d è %s: " +STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" STRING_INVALID_OPERAND, "Operando non valido." STRING_EXPECTED_CLOSE_PAREN, "Attesa una ')'." Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -310,6 +310,13 @@ MKDIR [hCu:]pX\n\ MD [hCu:]pX" +STRING_MKLINK_HELP, "Creates a filesystem link object.\n\n\ +MKLINK [/D | /H | /J] linkname target\n\n\ + /D Indicates that the symbolic link target is a directory.\n\ + /H Create a hard link.\n\ + /J Create a directory junction.\n\n\ +If neither /H or /J is specified, a symbolic link is created." + STRING_MEMMORY_HELP1, "VXe ÌÊð\\¦µÜ·B\n\nMEMORY" STRING_MEMMORY_HELP2, "\n %12s%% Ìªgp³êÄ¢Ü·B\n\n\ @@ -551,6 +558,7 @@ LABEL fBXNÌ{[ xð\\¦Ü½ÍÏXµÜ·B\n\ MD fBNgðì¬µÜ·B\n\ MKDIR fBNgðì¬µÜ·B\n\ +MKLINK Creates a filesystem link object.\n\ MOVE t@CðÚ®¨æÑt@CÆfBNg¼ðÏXµÜ·B\n\ PATH ÀsÂ\\t@CÌõpXð\\¦Ü½ÍÝèµÜ·B\n\ PAUSE ob` vOÌðêâ~µAbZ[Wð\\¦µÜ·B\n\ @@ -658,6 +666,9 @@ STRING_SCREEN_COL, "sÌlª³øÅ·B" STRING_SCREEN_ROW, "ñÌlª³øÅ·B" STRING_TIMER_TIME "^C}[ %d Í %s Å·B: " +STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" STRING_INVALID_OPERAND, "³øÈIyhÅ·B" STRING_EXPECTED_CLOSE_PAREN, "Expected ')'" Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -294,6 +294,13 @@ STRING_MKDIR_HELP, "Oppretter en mappe.\n\n\ MKDIR [stasjon:]mappe\nMD [stasjon:]mappe" +STRING_MKLINK_HELP, "Creates a filesystem link object.\n\n\ +MKLINK [/D | /H | /J] linkname target\n\n\ + /D Indicates that the symbolic link target is a directory.\n\ + /H Create a hard link.\n\ + /J Create a directory junction.\n\n\ +If neither /H or /J is specified, a symbolic link is created." + STRING_MEMMORY_HELP1, "Vis mengde av system minne.\n\nMEMORY" STRING_MEMMORY_HELP2, "\n %12s%% benyttet minne.\n\n\ @@ -534,6 +541,7 @@ LABEL Oppretter, endrer, eller sletter volumnavnet på en disk.\n\ MD Oppretter en mappe.\n\ MKDIR Oppretter en mappe.\n\ +MKLINK Creates a filesystem link object.\n\ MOVE Flytter en eller flere filer fra en mappe til en annen.\n\ PATH Vis eller sett en søkesti for kjørbare filer.\n\ PAUSE Avbryter behandling av en satsvis fil, og viser en melding.\n\ @@ -643,6 +651,9 @@ STRING_SCREEN_COL, "ugyldig verdi for kolonne" STRING_SCREEN_ROW, "ugyldig verdi for rad" STRING_TIMER_TIME "Stoppeklokke %d er %s: " +STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" STRING_INVALID_OPERAND, "Ugyldig operand." STRING_EXPECTED_CLOSE_PAREN, "Forventet ')'." Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -300,6 +300,13 @@ STRING_MKDIR_HELP, "Tworzy katalog.\n\n\ MKDIR [napêd:]cie¿ka\nMD [napêd:]cie¿ka" +STRING_MKLINK_HELP, "Creates a filesystem link object.\n\n\ +MKLINK [/D | /H | /J] linkname target\n\n\ + /D Indicates that the symbolic link target is a directory.\n\ + /H Create a hard link.\n\ + /J Create a directory junction.\n\n\ +If neither /H or /J is specified, a symbolic link is created." + STRING_MEMMORY_HELP1, "Wywietla iloæ pamiêci systemowej.\n\nMEMORY" STRING_MEMMORY_HELP2, "\n %12s%% pamiêci zajêtej.\n\n\ @@ -541,6 +548,7 @@ LABEL Tworzy, zmienia lub kasuje etykietê woluminu w danym napêdzie.\n\ MD Tworzy katalog.\n\ MKDIR Tworzy katalog.\n\ +MKLINK Creates a filesystem link object.\n\ MOVE Przenosi jeden lub wiêcej plików z jednego katalogu do drugiego.\n\ PATH Wywietla lub ustawia cie¿ki dostêpu dla programów.\n\ PAUSE Zawiesza przetwarzanie programu wsadowego i wywietla komunikat.\n\ @@ -649,6 +657,9 @@ STRING_SCREEN_COL, "nieprawid³owy numer kolumny" STRING_SCREEN_ROW, "nieprawid³owy numer rzêdu" STRING_TIMER_TIME "Stoper %d czas - %s: " +STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" STRING_INVALID_OPERAND, "Nieprawid³owy argument operatora." STRING_EXPECTED_CLOSE_PAREN, "Oczekiwano ')'." Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -307,6 +307,13 @@ STRING_MKDIR_HELP, "Ñîçäàíèå êàòàëîãà.\n\n\ MKDIR [äèñê:]ïóòü\nMD [äèñê:]ïóòü" +STRING_MKLINK_HELP, "Creates a filesystem link object.\n\n\ +MKLINK [/D | /H | /J] linkname target\n\n\ + /D Indicates that the symbolic link target is a directory.\n\ + /H Create a hard link.\n\ + /J Create a directory junction.\n\n\ +If neither /H or /J is specified, a symbolic link is created." + STRING_MEMMORY_HELP1, "Âûâîä îáúåìà ñèñòåìíîé ïàìÿòè.\n\nMEMORY" STRING_MEMMORY_HELP2, "\n %12s%% memory load.\n\n\ @@ -548,6 +555,7 @@ LABEL Ñîçäàíèå, èçìåíåíèå è óäàëåíèå ìåòîê òîìà.\n\ MD Ñîçäàíèå êàòàëîãà.\n\ MKDIR Ñîçäàíèå êàòàëîãà.\n\ +MKLINK Creates a filesystem link object.\n\ MOVE Ïåðåìåùåíèå ôàéëîâ è ïåðåèìåíîâàíèå ôàéëîâ è êàòàëîãîâ\n\ PATH Âûâîä èëè çàäàíèå ïóòè ïîèñêà èñïîëíÿåìûõ ôàéëîâ.\n\ PAUSE Ïðèîñòàíîâêà âûïîëíåíèÿ ïàêåòíîãî ôàéëà.\n\ @@ -656,6 +664,9 @@ STRING_SCREEN_COL, "íåïðàâèëüíîå çíà÷åíèå äëÿ êîë" STRING_SCREEN_ROW, "íåïðàâèëüíîå çíà÷åíèå äëÿ ñòð" STRING_TIMER_TIME "Timer %d is %s: " +STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" STRING_INVALID_OPERAND, "Íåâåðíûé îïåðàíä." STRING_EXPECTED_CLOSE_PAREN, "Îæèäàåòñÿ ')'." Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -306,6 +306,13 @@ STRING_MKDIR_HELP, "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" +STRING_MKLINK_HELP, "Creates a filesystem link object.\n\n\ +MKLINK [/D | /H | /J] linkname target\n\n\ + /D Indicates that the symbolic link target is a directory.\n\ + /H Create a hard link.\n\ + /J Create a directory junction.\n\n\ +If neither /H or /J is specified, a symbolic link is created." + STRING_MEMMORY_HELP1, "Displays the amount of system memory.\n\nMEMORY" STRING_MEMMORY_HELP2, "\n %12s%% memory load.\n\n\ @@ -587,6 +594,7 @@ LABEL Ñòâîðåííÿ, çì³íà, àáî âèäàëåííÿ ì³òîê òîìó äèñêà.\n\ MD Ñòâîðåííÿ ïàïêè.\n\ MKDIR Ñòâîðåííÿ ïàïêè.\n\ +MKLINK Creates a filesystem link object.\n\ MOVE Ïåðåì³ùåííÿ îäíîãî àáî á³ëüøå ôàéë³â ç îäí³º¿ ïàïêè äî ³íøî¿\n\ ïàïêè.\n\ PATH Â³äîáðàæåííÿ àáî âñòàíîâëåííÿ øëÿõó ïîøóêó âèêîíóâàíèõ ôàéë³â.\n\ @@ -705,6 +713,9 @@ STRING_SCREEN_COL, "íåïðàâèëüíå çíà÷åííÿ col" STRING_SCREEN_ROW, "íåïðàâèëüíå çíà÷åííÿ row" STRING_TIMER_TIME "Òàéìåð %d - %s: " +STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" STRING_INVALID_OPERAND, "Íåâ³ðíèé îïåðàíä." STRING_EXPECTED_CLOSE_PAREN, "Î÷³êóºòüñÿ ')'." Added: trunk/reactos/base/shell/cmd/mklink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/mklink.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/mklink.c (added) +++ trunk/reactos/base/shell/cmd/mklink.c [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -1,0 +1,219 @@ +/* + * MKLINK.C - mklink internal command. + */ + +#include <precomp.h> + +#ifdef INCLUDE_CMD_MKLINK + +/* There is no API for creating junctions, so we must do it the hard way */ +static BOOL CreateJunction(LPCTSTR LinkName, LPCTSTR TargetName) +{ + /* Structure for reparse point daya when ReparseTag is one of + * the tags defined by Microsoft. Copied from MinGW winnt.h */ + typedef struct _REPARSE_DATA_BUFFER { + DWORD ReparseTag; + WORD ReparseDataLength; + WORD Reserved; + _ANONYMOUS_UNION union { + struct { + WORD SubstituteNameOffset; + WORD SubstituteNameLength; + WORD PrintNameOffset; + WORD PrintNameLength; + ULONG Flags; + WCHAR PathBuffer[1]; + } SymbolicLinkReparseBuffer; + struct { + WORD SubstituteNameOffset; + WORD SubstituteNameLength; + WORD PrintNameOffset; + WORD PrintNameLength; + WCHAR PathBuffer[1]; + } MountPointReparseBuffer; + struct { + BYTE DataBuffer[1]; + } GenericReparseBuffer; + } DUMMYUNIONNAME; + } REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER; + + HMODULE hNTDLL = GetModuleHandle(_T("NTDLL")); + BOOLEAN (WINAPI *RtlDosPathNameToNtPathName_U)(PCWSTR, PUNICODE_STRING, PCWSTR *, CURDIR *) + = (BOOLEAN (WINAPI *)())GetProcAddress(hNTDLL, "RtlDosPathNameToNtPathName_U"); + VOID (WINAPI *RtlFreeUnicodeString)(PUNICODE_STRING) + = (VOID (WINAPI *)())GetProcAddress(hNTDLL, "RtlFreeUnicodeString"); + + TCHAR TargetFullPath[MAX_PATH]; +#ifdef UNICODE +#define TargetFullPathW TargetFullPath +#else + WCHAR TargetFullPathW[MAX_PATH]; +#endif + UNICODE_STRING TargetNTPath; + HANDLE hJunction; + + /* The data for this kind of reparse point has two strings: + * The first ("SubstituteName") is the full target path in NT format, + * the second ("PrintName") is the full target path in Win32 format. + * Both of these must be wide-character strings. */ + if (!RtlDosPathNameToNtPathName_U || + !RtlFreeUnicodeString || + !GetFullPathName(TargetName, MAX_PATH, TargetFullPath, NULL) || +#ifndef UNICODE + !MultiByteToWideChar(CP_ACP, 0, TargetFullPath, -1, TargetFullPathW, -1) || +#endif + !RtlDosPathNameToNtPathName_U(TargetFullPathW, &TargetNTPath, NULL, NULL)) + { + return FALSE; + } + + /* We have both the names we need, so time to create the junction. + * Start with an empty directory */ + if (!CreateDirectory(LinkName, NULL)) + { + RtlFreeUnicodeString(&TargetNTPath); + return FALSE; + } + + /* Open the directory we just created */ + hJunction = CreateFile(LinkName, GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); + if (hJunction != INVALID_HANDLE_VALUE) + { + /* Allocate a buffer large enough to hold both strings, including trailing NULs */ + DWORD TargetLen = wcslen(TargetFullPathW) * sizeof(WCHAR); + DWORD DataSize = FIELD_OFFSET(REPARSE_DATA_BUFFER, MountPointReparseBuffer.PathBuffer) + + TargetNTPath.Length + sizeof(WCHAR) + + TargetLen + sizeof(WCHAR); + PREPARSE_DATA_BUFFER Data = _alloca(DataSize); + + /* Fill it out and use it to turn the directory into a reparse point */ + Data->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; + Data->ReparseDataLength = DataSize - FIELD_OFFSET(REPARSE_DATA_BUFFER, MountPointReparseBuffer); + Data->Reserved = 0; + Data->MountPointReparseBuffer.SubstituteNameOffset = 0; + Data->MountPointReparseBuffer.SubstituteNameLength = TargetNTPath.Length; + wcscpy(Data->MountPointReparseBuffer.PathBuffer, + TargetNTPath.Buffer); + Data->MountPointReparseBuffer.PrintNameOffset = TargetNTPath.Length + sizeof(WCHAR); + Data->MountPointReparseBuffer.PrintNameLength = TargetLen; + wcscpy((WCHAR *)((BYTE *)Data->MountPointReparseBuffer.PathBuffer + + Data->MountPointReparseBuffer.PrintNameOffset), + TargetFullPathW); + if (DeviceIoControl(hJunction, FSCTL_SET_REPARSE_POINT, + Data, DataSize, NULL, 0, &DataSize, NULL)) + { + /* Success */ + CloseHandle(hJunction); + RtlFreeUnicodeString(&TargetNTPath); + return TRUE; + } + CloseHandle(hJunction); + } + RemoveDirectory(LinkName); + RtlFreeUnicodeString(&TargetNTPath); + return FALSE; +} + +INT +cmd_mklink(LPTSTR param) +{ + HMODULE hKernel32 = GetModuleHandle(_T("KERNEL32")); + DWORD Flags = 0; + enum { SYMBOLIC, HARD, JUNCTION } LinkType = SYMBOLIC; + INT NumFiles = 0; + LPTSTR Name[2]; + INT argc, i; + LPTSTR *arg; + + if (!_tcsncmp(param, _T("/?"), 2)) + { + ConOutResPuts(STRING_MKLINK_HELP); + return 0; + } + + arg = split(param, &argc, FALSE); + for (i = 0; i < argc; i++) + { + if (arg[i][0] == _T('/')) + { + if (!_tcsicmp(arg[i], _T("/D"))) + Flags |= 1; /* SYMBOLIC_LINK_FLAG_DIRECTORY */ + else if (!_tcsicmp(arg[i], _T("/H"))) + LinkType = HARD; + else if (!_tcsicmp(arg[i], _T("/J"))) + LinkType = JUNCTION; + else + { + error_invalid_switch(arg[i][1]); + freep(arg); + return 1; + } + } + else + { + if (NumFiles == 2) + { + error_too_many_parameters(arg[i]); + freep(arg); + return 1; + } + Name[NumFiles++] = arg[i]; + } + } + freep(arg); + + if (NumFiles != 2) + { + error_req_param_missing(); + return 1; + } + + nErrorLevel = 0; + + if (LinkType == SYMBOLIC) + { + /* CreateSymbolicLink doesn't exist in old versions of Windows, + * so load dynamically */ + BOOL (WINAPI *CreateSymbolicLink)(LPCTSTR, LPCTSTR, DWORD) +#ifdef UNICODE + = (BOOL (WINAPI *)())GetProcAddress(hKernel32, "CreateSymbolicLinkW"); +#else + = (BOOL (WINAPI *)())GetProcAddress(hKernel32, "CreateSymbolicLinkA"); +#endif + if (CreateSymbolicLink && CreateSymbolicLink(Name[0], Name[1], Flags)) + { + ConOutResPrintf(STRING_MKLINK_CREATED_SYMBOLIC, Name[0], Name[1]); + return 0; + } + } + else if (LinkType == HARD) + { + /* CreateHardLink doesn't exist in old versions of Windows, + * so load dynamically */ + BOOL (WINAPI *CreateHardLink)(LPCTSTR, LPCTSTR, LPSECURITY_ATTRIBUTES) +#ifdef UNICODE + = (BOOL (WINAPI *)())GetProcAddress(hKernel32, "CreateHardLinkW"); +#else + = (BOOL (WINAPI *)())GetProcAddress(hKernel32, "CreateHardLinkA"); +#endif + if (CreateHardLink && CreateHardLink(Name[0], Name[1], NULL)) + { + ConOutResPrintf(STRING_MKLINK_CREATED_HARD, Name[0], Name[1]); + return 0; + } + } + else + { + if (CreateJunction(Name[0], Name[1])) + { + ConOutResPrintf(STRING_MKLINK_CREATED_JUNCTION, Name[0], Name[1]); + return 0; + } + } + + ErrorMessage(GetLastError(), _T("MKLINK")); + return 1; +} + +#endif /* INCLUDE_CMD_MKLINK */ Propchange: trunk/reactos/base/shell/cmd/mklink.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/resource.h?… ============================================================================== --- trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] Wed Mar 18 01:27:33 2009 @@ -89,6 +89,7 @@ #define STRING_CMD_HELP7 614 #define STRING_CMD_HELP8 615 #define STRING_ASSOC_HELP 616 +#define STRING_MKLINK_HELP 617 #define STRING_CMD_SHELLINFO 624 @@ -242,6 +243,9 @@ #define STRING_REPLACE_HELP10 736 #define STRING_REPLACE_HELP11 737 +#define STRING_MKLINK_CREATED_SYMBOLIC 738 +#define STRING_MKLINK_CREATED_HARD 739 +#define STRING_MKLINK_CREATED_JUNCTION 740 /* These strings are language independent (cmd.rc) */ #define STRING_FREEDOS_DEV 800

15 years, 9 months

[jimtabor] 40081: - Rename gdi entry flag.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Mar 18 00:50:47 2009 New Revision: 40081 URL: http://svn.reactos.org/svn/reactos?rev=40081&view=rev Log: - Rename gdi entry flag. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Wed Mar 18 00:50:47 2009 @@ -45,7 +45,7 @@ #define GDI_ENTRY_UNDELETABLE 1 /* Mark Object as nonremovable */ #define GDI_ENTRY_DELETING 2 /* Used when deleting Font Objects */ #define GDI_ENTRY_VALIDATE_VIS 4 /* Validating Visible region data */ -#define GDI_ENTRY_ALOC_LAL 0x80 /* Object Allocated with Look aside List */ +#define GDI_ENTRY_ALLOCATE_LAL 0x80 /* Object Allocated with Look aside List */ /*! \defgroup GDI object types *

15 years, 9 months

[tkreuzer] 40080: "same thing in BmfdUnloadFontFile btw :p" Thanks Stefam again.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 18 00:39:17 2009 New Revision: 40080 URL: http://svn.reactos.org/svn/reactos?rev=40080&view=rev Log: "same thing in BmfdUnloadFontFile btw :p" Thanks Stefam again. Modified: trunk/reactos/drivers/video/font/bmfd/font.c Modified: trunk/reactos/drivers/video/font/bmfd/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/bmfd/fo… ============================================================================== --- trunk/reactos/drivers/video/font/bmfd/font.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/bmfd/font.c [iso-8859-1] Wed Mar 18 00:39:17 2009 @@ -302,11 +302,11 @@ DbgPrint("BmfdUnloadFontFile()\n"); + /* Unmap the font file */ + EngUnmapFontFileFD(pfile->iFile); + /* Free the memory that was allocated for the font */ EngFreeMem(pfile); - - /* Unmap the font file */ - EngUnmapFontFileFD(pfile->iFile); return TRUE; }

15 years, 9 months

[tkreuzer] 40079: Don't access the font structure after it was freed. Spotted by Stefan.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 18 00:29:17 2009 New Revision: 40079 URL: http://svn.reactos.org/svn/reactos?rev=40079&view=rev Log: Don't access the font structure after it was freed. Spotted by Stefan. Modified: trunk/reactos/drivers/video/font/ftfd/font.c Modified: trunk/reactos/drivers/video/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/fo… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/font.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/font.c [iso-8859-1] Wed Mar 18 00:29:17 2009 @@ -126,11 +126,11 @@ FT_Done_Face(pfile->aftface[i]); } + /* Unmap the font file */ + EngUnmapFontFileFD(pfile->iFile); + /* Free the memory that was allocated for the font */ EngFreeMem(pfile); - - /* Unmap the font file */ - EngUnmapFontFileFD(pfile->iFile); return TRUE; }

15 years, 9 months

[tkreuzer] 40078: C++ comment style -> C comment style See issue #4284 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 17 23:30:16 2009 New Revision: 40078 URL: http://svn.reactos.org/svn/reactos?rev=40078&view=rev Log: C++ comment style -> C comment style See issue #4284 for more details. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Tue Mar 17 23:30:16 2009 @@ -6,25 +6,25 @@ /* Constants ******************************************************************/ -// Get/SetBounds/Rect support. -#define DCB_WINDOWMGR 0x8000 // Queries the Windows bounding rectangle instead of the application's - -// GDIDEVICE flags -#define PDEV_DISPLAY 0x00000001 // Display device -#define PDEV_HARDWARE_POINTER 0x00000002 // Supports hardware cursor +/* Get/SetBounds/Rect support. */ +#define DCB_WINDOWMGR 0x8000 /* Queries the Windows bounding rectangle instead of the application's */ + +/* GDIDEVICE flags */ +#define PDEV_DISPLAY 0x00000001 /* Display device */ +#define PDEV_HARDWARE_POINTER 0x00000002 /* Supports hardware cursor */ #define PDEV_SOFTWARE_POINTER 0x00000004 -#define PDEV_GOTFONTS 0x00000040 // Has font driver +#define PDEV_GOTFONTS 0x00000040 /* Has font driver */ #define PDEV_PRINTER 0x00000080 #define PDEV_ALLOCATEDBRUSHES 0x00000100 #define PDEV_HTPAL_IS_DEVPAL 0x00000200 #define PDEV_DISABLED 0x00000400 #define PDEV_SYNCHRONIZE_ENABLED 0x00000800 -#define PDEV_FONTDRIVER 0x00002000 // Font device +#define PDEV_FONTDRIVER 0x00002000 /* Font device */ #define PDEV_GAMMARAMP_TABLE 0x00004000 #define PDEV_UMPD 0x00008000 #define PDEV_SHARED_DEVLOCK 0x00010000 #define PDEV_META_DEVICE 0x00020000 -#define PDEV_DRIVER_PUNTED_CALL 0x00040000 // Driver calls back to GDI engine +#define PDEV_DRIVER_PUNTED_CALL 0x00040000 /* Driver calls back to GDI engine */ #define PDEV_CLONE_DEVICE 0x00080000 /* Type definitions ***********************************************************/ @@ -39,22 +39,22 @@ BYTE bitsPerPixel; } WIN_DC_INFO; -// EXtended CLip and Window Region Object +/* EXtended CLip and Window Region Object */ typedef struct _XCLIPOBJ { WNDOBJ eClipWnd; - PVOID pClipRgn; // prgnRao_ or (prgnVis_ if (prgnRao_ == z)) + PVOID pClipRgn; /* prgnRao_ or (prgnVis_ if (prgnRao_ == z)) */ DWORD Unknown1[16]; - DWORD nComplexity; // count/mode based on # of rect in regions scan. - PVOID pUnknown; // UnK pointer to a large drawing structure. - // We will use it for CombinedClip ptr. + DWORD nComplexity; /* count/mode based on # of rect in regions scan. */ + PVOID pUnknown; /* UnK pointer to a large drawing structure. */ + /* We will use it for CombinedClip ptr. */ } XCLIPOBJ, *PXCLIPOBJ; typedef struct _DCLEVEL { HPALETTE hpal; struct _PALGDI * ppal; - PVOID pColorSpace; // COLORSPACE* + PVOID pColorSpace; /* COLORSPACE* */ LONG lIcmMode; LONG lSaveDepth; DWORD unk1_00000000; @@ -62,16 +62,16 @@ POINTL ptlBrushOrigin; PGDIBRUSHOBJ pbrFill; PGDIBRUSHOBJ pbrLine; - PVOID plfnt; // LFONTOBJ* (TEXTOBJ*) - HGDIOBJ hPath; // HPATH + PVOID plfnt; /* LFONTOBJ* (TEXTOBJ*) */ + HGDIOBJ hPath; /* HPATH */ FLONG flPath; - LINEATTRS laPath; // 0x20 bytes - PVOID prgnClip; // PROSRGNDATA + LINEATTRS laPath; /* 0x20 bytes */ + PVOID prgnClip; /* PROSRGNDATA */ PVOID prgnMeta; COLORADJUSTMENT ca; FLONG flFontState; UNIVERSAL_FONT_ID ufi; - UNIVERSAL_FONT_ID ufiLoc[4]; // Local List. + UNIVERSAL_FONT_ID ufiLoc[4]; /* Local List. */ UNIVERSAL_FONT_ID *pUFI; ULONG uNumUFIs; BOOL ufiSet; @@ -99,11 +99,11 @@ Do not (re)move this. */ BASEOBJECT BaseObject; - DHPDEV PDev; // <- GDIDEVICE.hPDev DHPDEV for device. + DHPDEV PDev; /* <- GDIDEVICE.hPDev DHPDEV for device. */ INT DC_Type; INT DC_Flags; - PVOID pPDev; // PGDIDEVICE aka PDEVOBJ - PVOID hSem; // PERESOURCE aka HSEMAPHORE + PVOID pPDev; /* PGDIDEVICE aka PDEVOBJ */ + PVOID hSem; /* PERESOURCE aka HSEMAPHORE */ FLONG flGraphics; FLONG flGraphics2; PDC_ATTR pDc_Attr; @@ -116,20 +116,20 @@ RECTL erclWindow; RECTL erclBounds; RECTL erclBoundsApp; - PVOID prgnAPI; // PROSRGNDATA + PVOID prgnAPI; /* PROSRGNDATA */ PVOID prgnVis; PVOID prgnRao; POINTL ptlFillOrigin; - unsigned eboFill_[23]; // EBRUSHOBJ + unsigned eboFill_[23]; /* EBRUSHOBJ */ unsigned eboLine_[23]; unsigned eboText_[23]; unsigned eboBackground_[23]; HFONT hlfntCur; FLONG flSimulationFlags; LONG lEscapement; - PVOID prfnt; // RFONT* - XCLIPOBJ co; // CLIPOBJ - PVOID pPFFList; // PPFF* + PVOID prfnt; /* RFONT* */ + XCLIPOBJ co; /* CLIPOBJ */ + PVOID pPFFList; /* PPFF* */ PVOID ClrxFormLnk; INT ipfdDevMax; ULONG ulCopyCount; @@ -147,10 +147,10 @@ typedef struct _GRAPHICS_DEVICE { - CHAR szNtDeviceName[CCHDEVICENAME]; // Yes char AscII - CHAR szWinDeviceName[CCHDEVICENAME]; // <- chk GetMonitorInfoW MxIxEX.szDevice + CHAR szNtDeviceName[CCHDEVICENAME]; /* Yes char AscII */ + CHAR szWinDeviceName[CCHDEVICENAME]; /* <- chk GetMonitorInfoW MxIxEX.szDevice */ struct _GRAPHICS_DEVICE * pNextGraphicsDevice; - DWORD StateFlags; // See DISPLAY_DEVICE_* + DWORD StateFlags; /* See DISPLAY_DEVICE_* */ } GRAPHICS_DEVICE, *PGRAPHICS_DEVICE; typedef struct _GDIPOINTER /* should stay private to ENG? No, part of GDIDEVICE aka HDEV aka PDEV. */ @@ -180,27 +180,27 @@ INT cPdevOpenRefs; struct _GDIDEVICE *ppdevParent; FLONG flFlags; - PERESOURCE hsemDevLock; // Device lock. - - PVOID pvGammaRamp; // Gamma ramp pointer. + PERESOURCE hsemDevLock; /* Device lock. */ + + PVOID pvGammaRamp; /* Gamma ramp pointer. */ HSURF FillPatterns[HS_DDI_MAX]; ULONG DxDd_nCount; - DHPDEV hPDev; // DHPDEV for device. - PVOID ppalSurf; // PEPALOBJ/PPALGDI for this device. + DHPDEV hPDev; /* DHPDEV for device. */ + PVOID ppalSurf; /* PEPALOBJ/PPALGDI for this device. */ DEVINFO DevInfo; GDIINFO GDIInfo; - HSURF pSurface; // SURFACE for this device. - HANDLE hSpooler; // Handle to spooler, if spooler dev driver. + HSURF pSurface; /* SURFACE for this device. */ + HANDLE hSpooler; /* Handle to spooler, if spooler dev driver. */ ULONG DisplayNumber; - PVOID pGraphicsDev; // PGRAPHICS_DEVICE + PVOID pGraphicsDev; /* PGRAPHICS_DEVICE */ DEVMODEW DMW; - PVOID pdmwDev; // Ptr->DEVMODEW.dmSize + dmDriverExtra == alloc size. - - FLONG DxDd_Flags; // DxDD active status flags. + PVOID pdmwDev; /* Ptr->DEVMODEW.dmSize + dmDriverExtra == alloc size. */ + + FLONG DxDd_Flags; /* DxDD active status flags. */ PFILE_OBJECT VideoFileObject; BOOLEAN PreparedDriver;

15 years, 9 months

[cfinck] 40077: Sync CRT initialization code with mingw-w64 r690 - Fixed initialization for Console apps with Unicode entry point. Now stuff like "cout" in <iostream> doesn't lead to instant crashes. - Unified the name of the entry point for ANSI and Unicode. The difference is just in the library now ("mingw_main" vs. "mingw_wmain") RBuild was changed appropriately to support this - No more ReactOS-specific changes inside the initialization code

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Mar 17 23:17:02 2009 New Revision: 40077 URL: http://svn.reactos.org/svn/reactos?rev=40077&view=rev Log: Sync CRT initialization code with mingw-w64 r690 - Fixed initialization for Console apps with Unicode entry point. Now stuff like "cout" in <iostream> doesn't lead to instant crashes. - Unified the name of the entry point for ANSI and Unicode. The difference is just in the library now ("mingw_main" vs. "mingw_wmain") RBuild was changed appropriately to support this - No more ReactOS-specific changes inside the initialization code Modified: trunk/reactos/lib/3rdparty/mingw/crt0_w.c trunk/reactos/lib/3rdparty/mingw/crtdll.c trunk/reactos/lib/3rdparty/mingw/crtexe.c trunk/reactos/lib/3rdparty/mingw/mingw_helpers.c trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/lib/3rdparty/mingw/crt0_w.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt0_w.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crt0_w.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crt0_w.c [iso-8859-1] Tue Mar 17 23:17:02 2009 @@ -12,10 +12,5 @@ int wmain (int flags, wchar_t **cmdline, wchar_t **inst) { -#ifdef __GNUC__ - /* C++ initialization. - gcc inserts this call automatically for a function called main , but not for wmain. */ - __main(); -#endif return (int) wWinMain ((HINSTANCE) inst, NULL, (LPWSTR) cmdline,(DWORD) flags); } Modified: trunk/reactos/lib/3rdparty/mingw/crtdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtdll.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crtdll.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crtdll.c [iso-8859-1] Tue Mar 17 23:17:02 2009 @@ -6,7 +6,9 @@ #ifdef CRTDLL #undef CRTDLL +#ifndef _DLL #define _DLL +#endif #include <oscalls.h> #include <internal.h> Modified: trunk/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtexe.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Tue Mar 17 23:17:02 2009 @@ -5,7 +5,9 @@ */ #undef CRTDLL -//#define _DLL +#ifndef _DLL +#define _DLL +#endif #define SPECIAL_CRTEXE @@ -69,6 +71,7 @@ static int argc; #ifdef WPRFLAG +extern void __main(void); static wchar_t **argv; static wchar_t **envp; #else @@ -144,22 +147,14 @@ static int __tmainCRTStartup (void); -#ifdef WPRFLAG -int wWinMainCRTStartup (void) -#else int WinMainCRTStartup (void) -#endif { mingw_app_type = 1; __security_init_cookie (); return __tmainCRTStartup (); } -#ifdef WPRFLAG -int wmainCRTStartup (void) -#else int mainCRTStartup (void) -#endif { mingw_app_type = 0; __security_init_cookie (); @@ -236,8 +231,6 @@ if (mingw_app_type) { #ifdef WPRFLAG - if (_wcmdln == NULL) - return 255; lpszCommandLine = (_TCHAR *) _wcmdln; #else lpszCommandLine = (char *) _acmdln; @@ -259,6 +252,9 @@ lpszCommandLine++; #ifdef WPRFLAG + /* C++ initialization. + gcc inserts this call automatically for a function called main, but not for wmain. */ + __main (); mainret = wmain ( (int) (StartupInfo.dwFlags & STARTF_USESHOWWINDOW ? StartupInfo.wShowWindow : SW_SHOWDEFAULT), (wchar_t **) lpszCommandLine, (wchar_t **) (HINSTANCE) &__ImageBase); @@ -273,6 +269,9 @@ duplicate_ppstrings (argc, &argv); #ifdef WPRFLAG __winitenv = envp; + /* C++ initialization. + gcc inserts this call automatically for a function called main, but not for wmain. */ + __main (); mainret = wmain (argc, argv, envp); #else __initenv = envp; Modified: trunk/reactos/lib/3rdparty/mingw/mingw_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw_h… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/mingw_helpers.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/mingw_helpers.c [iso-8859-1] Tue Mar 17 23:17:02 2009 @@ -12,9 +12,6 @@ #include <tchar.h> #include <sect_attribs.h> #include <locale.h> -#if 0 -#include "../revstamp.h" -#endif const PIMAGE_TLS_CALLBACK __dyn_tls_init_callback; @@ -32,12 +29,3 @@ /* 0:console, 1:windows. */ int mingw_app_type = 0; - -#if 0 -const char *__mingw_get_crt_info (void) -{ - return "MinGW-W64 Runtime " __MINGW64_VERSION " (" - __MINGW64_VERSION_STATE " - " - "rev. " __MINGW_W64_REV ") " __MINGW_W64_REV_STAMP; -} -#endif Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Tue Mar 17 23:17:02 2009 @@ -1090,16 +1090,10 @@ return "DllMain@12"; case Win32CUI: case Test: - if ( isUnicode ) - return "wmainCRTStartup"; - else - return "mainCRTStartup"; + return "mainCRTStartup"; case Win32SCR: case Win32GUI: - if ( isUnicode ) - return "wWinMainCRTStartup"; - else - return "WinMainCRTStartup"; + return "WinMainCRTStartup"; case BuildTool: case StaticLibrary: case HostStaticLibrary:

15 years, 9 months

[tkreuzer] 40076: Don't use C++ comment style in C headers. See issue #4284 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 17 23:08:53 2009 New Revision: 40076 URL: http://svn.reactos.org/svn/reactos?rev=40076&view=rev Log: Don't use C++ comment style in C headers. See issue #4284 for more details. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Tue Mar 17 23:08:53 2009 @@ -42,10 +42,10 @@ #define GDI_ENTRY_UPPER_SHIFT 16 /* GDI Entry Flags */ -#define GDI_ENTRY_UNDELETABLE 1 // Mark Object as nonremovable -#define GDI_ENTRY_DELETING 2 // Used when deleting Font Objects -#define GDI_ENTRY_VALIDATE_VIS 4 // Validating Visible region data -#define GDI_ENTRY_ALOC_LAL 0x80 // Object Allocated with Look aside List +#define GDI_ENTRY_UNDELETABLE 1 /* Mark Object as nonremovable */ +#define GDI_ENTRY_DELETING 2 /* Used when deleting Font Objects */ +#define GDI_ENTRY_VALIDATE_VIS 4 /* Validating Visible region data */ +#define GDI_ENTRY_ALOC_LAL 0x80 /* Object Allocated with Look aside List */ /*! \defgroup GDI object types * @@ -123,16 +123,16 @@ /* Gdi Object Handle Managment Pid lock masking sets. */ /* Ref: used with DxEngSetDCOwner */ -#define GDI_OBJ_HMGR_PUBLIC 0 // Public owner, Open access? -#define GDI_OBJ_HMGR_POWNED 0x80000002 // Set to current owner. -#define GDI_OBJ_HMGR_NONE 0x80000012 // No owner, Open access? -#define GDI_OBJ_HMGR_RESTRICTED 0x80000022 // Restricted? +#define GDI_OBJ_HMGR_PUBLIC 0 /* Public owner, Open access? */ +#define GDI_OBJ_HMGR_POWNED 0x80000002 /* Set to current owner. */ +#define GDI_OBJ_HMGR_NONE 0x80000012 /* No owner, Open access? */ +#define GDI_OBJ_HMGR_RESTRICTED 0x80000022 /* Restricted? */ /* DC OBJ Types */ -#define DC_TYPE_DIRECT 0 // normal device context -#define DC_TYPE_MEMORY 1 // memory device context -#define DC_TYPE_INFO 2 // information context +#define DC_TYPE_DIRECT 0 /* normal device context */ +#define DC_TYPE_MEMORY 1 /* memory device context */ +#define DC_TYPE_INFO 2 /* information context */ /* DC OBJ Flags */ #define DC_FLAG_DISPLAY 0x0001 @@ -173,8 +173,8 @@ #define DC_FONTTEXT_DIRTY 0x00400000 /* DC_ATTR LCD Flags */ -#define LDC_LDC 0x00000001 // (init) local DC other than a normal DC -#define LDC_EMFLDC 0x00000002 // Enhance Meta File local DC +#define LDC_LDC 0x00000001 /* (init) local DC other than a normal DC */ +#define LDC_EMFLDC 0x00000002 /* Enhance Meta File local DC */ #define LDC_SAPCALLBACK 0x00000020 #define LDC_INIT_DOCUMENT 0x00000040 #define LDC_INIT_PAGE 0x00000080 @@ -216,37 +216,37 @@ { PVOID KernelData; /* Points to the kernel mode structure */ DWORD ProcessId; /* process id that created the object, 0 for stock objects */ - union{ // temp union structure. + union{ /* temp union structure. */ LONG Type; /* the first 16 bit is the object type including the stock obj flag, the last 16 bits is just the object type */ struct{ - SHORT FullUnique; // unique - CHAR ObjectType; // objt - CHAR Flags; // Flags + SHORT FullUnique; /* unique */ + CHAR ObjectType; /* objt */ + CHAR Flags; /* Flags */ };}; PVOID UserData; /* pUser Points to the user mode structure, usually NULL though */ } GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY; -// -// User space only structure! -// -typedef struct __GDI_SHARED_HANDLE_TABLE // Must match win32k/include/gdiobj.h -{ - GDI_TABLE_ENTRY Entries[GDI_HANDLE_COUNT]; // Handle table. - DEVCAPS DevCaps; // Shared device capabilities. - FLONG flDeviceUniq; // Device settings uniqueness. - PVOID pvLangPack; // Lanuage Pack. - CFONT cfPublic[GDI_CFONT_MAX]; // Public Fonts. +/* + * User space only structure! + */ +typedef struct __GDI_SHARED_HANDLE_TABLE /* Must match win32k/include/gdiobj.h */ +{ + GDI_TABLE_ENTRY Entries[GDI_HANDLE_COUNT]; /* Handle table. */ + DEVCAPS DevCaps; /* Shared device capabilities. */ + FLONG flDeviceUniq; /* Device settings uniqueness. */ + PVOID pvLangPack; /* Lanuage Pack. */ + CFONT cfPublic[GDI_CFONT_MAX]; /* Public Fonts. */ DWORD dwCFCount; } GDI_SHARED_HANDLE_TABLE, *PGDI_SHARED_HANDLE_TABLE; typedef struct _RGN_ATTR { ULONG AttrFlags; - ULONG Flags; // Clipping region's complexity. NULL, SIMPLE & COMPLEXREGION + ULONG Flags; /* Clipping region's complexity. NULL, SIMPLE & COMPLEXREGION */ RECTL Rect; } RGN_ATTR,*PRGN_ATTR; -// Local DC structure (_DC_ATTR) PVOID pvLDC; +/* Local DC structure (_DC_ATTR) PVOID pvLDC; */ typedef struct _LDC { HDC hDC; @@ -326,7 +326,7 @@ RGN_ATTR VisRectRegion; } DC_ATTR, *PDC_ATTR; -typedef struct _BRUSH_ATTR // Used with pen too. +typedef struct _BRUSH_ATTR /* Used with pen too. */ { FLONG AttrFlags; COLORREF lbColor;

15 years, 9 months

[jimtabor] 40075: - Added one more gdi entry flag with notes.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Mar 17 21:18:20 2009 New Revision: 40075 URL: http://svn.reactos.org/svn/reactos?rev=40075&view=rev Log: - Added one more gdi entry flag with notes. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Tue Mar 17 21:18:20 2009 @@ -42,9 +42,10 @@ #define GDI_ENTRY_UPPER_SHIFT 16 /* GDI Entry Flags */ -#define GDI_ENTRY_UNDELETABLE 1 -#define GDI_ENTRY_DELETING 2 -#define GDI_ENTRY_VALIDATE_VIS 4 +#define GDI_ENTRY_UNDELETABLE 1 // Mark Object as nonremovable +#define GDI_ENTRY_DELETING 2 // Used when deleting Font Objects +#define GDI_ENTRY_VALIDATE_VIS 4 // Validating Visible region data +#define GDI_ENTRY_ALOC_LAL 0x80 // Object Allocated with Look aside List /*! \defgroup GDI object types *

15 years, 9 months

← Newer
1
...
20
21
22
23
24
25
26
...
49
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 March 2009