Ros-diffs July 2013

ros-diffs@reactos.org

13 participants
199 discussions

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jul 4 01:08:28 2013 New Revision: 59423 URL: http://svn.reactos.org/svn/reactos?rev=59423&view=rev Log: Fix some comments Modified: trunk/reactos/base/shell/cmd/prompt.c Modified: trunk/reactos/base/shell/cmd/prompt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/prompt.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] Thu Jul 4 01:08:28 2013 @@ -64,7 +64,7 @@ /* * Set the PROMPT environment variable if it doesn't exist already. - * You can change the PROMPT environment variable before cmd start. + * You can change the PROMPT environment variable before cmd starts. */ if (GetEnvironmentVariable(_T("PROMPT"), Buffer, sizeof(Buffer) / sizeof(Buffer[0])) == 0) SetEnvironmentVariable(_T("PROMPT"), DefaultPrompt); @@ -261,8 +261,8 @@ * So even if 'param' is null you _must_ still set prompt * to the default. There seems to be some kind of difference * between winxp and 2k in this matter and this way will - * cover both. Do not use fixed size of szParam for param the buffer - * are 8192 bytes and will later change to dynamic buffer. + * cover both. Do not use fixed size of 'szParam' for 'param'; + * the buffers are 8192 bytes and will later change to dynamic buffer. */ /* Set the PROMPT environment variable */

11 years, 5 months

[hbelusca] 59422: [CMD] Features-only commit: - Fix version presentation at startup and when using the "ver" command (in French) - Add to the prompt's command help, the fact that the $S specifier c...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jul 4 01:05:14 2013 New Revision: 59422 URL: http://svn.reactos.org/svn/reactos?rev=59422&view=rev Log: [CMD] Features-only commit: - Fix version presentation at startup and when using the "ver" command (in French) - Add to the prompt's command help, the fact that the $S specifier can be used to add a space. - Implement the $I prompt specifier (see http://www.robvanderwoude.com/prompt.php), which sets an information line on top of the screen (à la OS/2). Use this new setting by default (I'm doing a poll on who loves it / hates it, and how we can improve it). To disable it, use the command: "prompt $p$g" (the default windows' prompt). To enable it, add the $s specifier to the prompt string (e.g. "prompt $i$p$g"). For your information, OS/2 uses "prompt $i[$p]" :) Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.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/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/zh-CN.rc trunk/reactos/base/shell/cmd/prompt.c trunk/reactos/base/shell/cmd/ver.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Thu Jul 4 01:05:14 2013 @@ -1615,7 +1615,6 @@ HMODULE NtDllModule; TCHAR commandline[CMDLINE_LENGTH]; TCHAR ModuleName[_MAX_PATH + 1]; - TCHAR lpBuffer[2]; INT nExitCode; //INT len; @@ -1643,16 +1642,12 @@ hOut = GetStdHandle(STD_OUTPUT_HANDLE); hIn = GetStdHandle(STD_INPUT_HANDLE); - /* Set EnvironmentVariable PROMPT if it does not exists any env value. - for you can change the EnvirommentVariable for prompt before cmd start - this patch are not 100% right, if it does not exists a PROMPT value cmd should use - $P$G as defualt not set EnvirommentVariable PROMPT to $P$G if it does not exists */ - if (GetEnvironmentVariable(_T("PROMPT"),lpBuffer, sizeof(lpBuffer) / sizeof(lpBuffer[0])) == 0) - SetEnvironmentVariable(_T("PROMPT"), _T("$P$G")); + /* Initialize prompt support */ + InitPrompt(); #ifdef FEATURE_DIR_STACK /* initialize directory stack */ - InitDirectoryStack (); + InitDirectoryStack(); #endif #ifdef FEATURE_HISTORY @@ -1750,6 +1745,7 @@ if (!*ptr) { /* If neither /C or /K was given, display a simple version string */ + ConOutChar(_T('\n')); ConOutResPrintf(STRING_REACTOS_VERSION, _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR)); Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Thu Jul 4 01:05:14 2013 @@ -405,6 +405,7 @@ /* Prototypes from PROMPT.C */ +VOID InitPrompt (VOID); VOID PrintPrompt (VOID); INT cmd_prompt (LPTSTR); 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] Thu Jul 4 01:05:14 2013 @@ -361,10 +361,12 @@ $F ) (Klammer zu)\n\ $G > (GrÃ¶Ãer-als-Zeichen)\n\ $H RÃ¼ckschritt (lÃ¶scht vorangehendes Zeichen)\n\ + $I Information line\n\ $L < (Kleiner-als-Zeichen)\n\ $N Aktuelles Laufwerk\n\ $P Aktuelles Laufwerk und Pfad\n\ $Q = (Gleichheitszeichen)\n\ + $S (space)\n\ $T Aktuelle Zeit\n\ $V Betriebssystem-Versionsnummer\n\ $_ WagenrÃ¼cklauf und Zeilenvorschub\n\ 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] Thu Jul 4 01:05:14 2013 @@ -364,10 +364,12 @@ $F ) (Right parenthesis)\n\ $G > (greater-than sign)\n\ $H Backspace (erases previous character)\n\ + $I Information line\n\ $L < (less-than sign)\n\ $N Current drive\n\ $P Current drive and path\n\ $Q = (equal sign)\n\ + $S (space)\n\ $T Current time\n\ $V OS version number\n\ $_ Carriage return and linefeed\n\ 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] Thu Jul 4 01:05:14 2013 @@ -364,10 +364,12 @@ $F ) (Right parenthesis)\n\ $G > (greater-than sign)\n\ $H Backspace (erases previous character)\n\ + $I Information line\n\ $L < (less-than sign)\n\ $N Current drive\n\ $P Current drive and path\n\ $Q = (equal sign)\n\ + $S (space)\n\ $T Current time\n\ $V OS version number\n\ $_ Carriage return and linefeed\n\ 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] Thu Jul 4 01:05:14 2013 @@ -364,10 +364,12 @@ $F ) (ParÃ©ntesis derecho)\n\ $G > (Signo mayor que)\n\ $H Borra el caracter anterior\n\ + $I Information line\n\ $L < (Signo menor que)\n\ $N Unidad actual\n\ $P Unidad y ruta actuales\n\ $Q = (signo igual)\n\ + $S (space)\n\ $T Hora actual\n\ $V NÃºmero de versiÃ³n del SO\n\ $_ Salto de linea\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] Thu Jul 4 01:05:14 2013 @@ -378,10 +378,12 @@ $F ) (parenthÃ¨se fermante)\n\ $G > (signe supÃ©rieur Ã )\n\ $H Backspace (efface le caractÃ¨re prÃ©cÃ©dent)\n\ + $I Ligne d'information\n\ $L < (signe infÃ©rieur Ã )\n\ $N Lecteur courant\n\ $P Lecteur et chemin courants\n\ $Q = (signe Ã©gale)\n\ + $S (espace)\n\ $T Heure courante\n\ $V NumÃ©ro de version de ReactOS\n\ $_ Retour chariot/saut de ligne\n\ @@ -718,7 +720,7 @@ STRING_REPLACE_ERROR7, "Erreur Ã©tendue 32\n" STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" -STRING_CMD_SHELLINFO, "\n InterprÃ©teur de ligne de commandes ReactOS\nVersion %s %s" +STRING_CMD_SHELLINFO, "\nInterprÃ©teur de ligne de commandes ReactOS\nVersion %s %s" STRING_VERSION_RUNVER, " tournant sur %s" STRING_COPY_FILE, " %d fichier(s) copiÃ©(s)\n" STRING_DELETE_WIPE, "effacÃ©(s)" 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] Thu Jul 4 01:05:14 2013 @@ -350,10 +350,12 @@ $F ) (zÃ¡rÃ³ zÃ¡rÃ³jel)\n\ $G > ('nagyobb' jel)\n\ $H TÃ¶rlÃ©s (elÃ¶tte lÃ©vÃµ karaktert tÃ¶rli)\n\ + $I Information line\n\ $L < ('kissebb' jel)\n\ $N AktuÃ¡lis meghajtÃ³\n\ $P AktuÃ¡lis meghajtÃ³ Ã©s mappa\n\ $Q = (egyenlÃµsÃ©g jel)\n\ + $S (space)\n\ $T AktuÃ¡lis idÃµ\n\ $V OS verziÃ³szÃ¡m\n\ $_ Ãjsor\n\ 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] Thu Jul 4 01:05:14 2013 @@ -364,10 +364,12 @@ $F ) (Tanda kurung Kanan)\n\ $G > (Tanda lebih-dari)\n\ $H Backspace (menghapus karakter sebelumnya)\n\ + $I Information line\n\ $L < (tanda kurang-dari)\n\ $N Drive saat ini\n\ $P Drive dan path saat ini\n\ $Q = (tanda sama dengan)\n\ + $S (space)\n\ $T Jam saat ini\n\ $V Nomor versi OS\n\ $_ Carriage return dan linefeed\n\ 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] Thu Jul 4 01:05:14 2013 @@ -368,10 +368,12 @@ $F ) (parentesi destra)\n\ $G > (simbolo di maggiore di)\n\ $H Backspace (cancella il carattere precedente)\n\ + $I Information line\n\ $L < (simbolo di minore di)\n\ $N Disco corrente\n\ $P Disco e percorso corrente\n\ $Q = (simbolo di uguale)\n\ + $S (space)\n\ $T Ora attuale\n\ $V Versione del sistema operativo\n\ $_ CR LF (a capo)\n\ 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] Thu Jul 4 01:05:14 2013 @@ -373,10 +373,12 @@ $F ) (å³ãã£ã)\n\ $G > (ä¸çå· (å¤§ãªã))\n\ $H ããã¯ã¹ãã¼ã¹ (ç´åã®æåãåé¤ãã¾ã)\n\ + $I Information line\n\ $L < (ä¸çå· (å°ãªã))\n\ $N ç¾å¨ã®ãã©ã¤ã\n\ $P ç¾å¨ã®ãã©ã¤ãã¨ãã¹\n\ $Q = (çå·)\n\ + $S (space)\n\ $T ç¾å¨ã®æå»\n\ $V OS ã®ãã¼ã¸ã§ã³çªå·\n\ $_ ãã£ãªãã¸ ãªã¿ã¼ã³ã¨ã©ã¤ã³ãã£ã¼ã\n\ 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] Thu Jul 4 01:05:14 2013 @@ -359,10 +359,12 @@ $F ) (HÃ¸yreparentes)\n\ $G > (stÃ¸rre-enn symbol)\n\ $H Tilbake (sletter forrige tegn)\n\ + $I Information line\n\ $L < (mindre-enn symbol)\n\ $N Gjeldende stasjon\n\ $P Gjeldende stasjon og mappe\n\ $Q = (likhetstegn)\n\ + $S (space)\n\ $T Gjeldende klokkeslett\n\ $V Versjonsnummer for ReactOS\n\ $_ Retur og linjeskift\n\ 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] Thu Jul 4 01:05:14 2013 @@ -366,10 +366,12 @@ $F ) (prawy nawias)\n\ $G > (znak wiÄkszoÅci)\n\ $H (usuwa ostatni znak)\n\ + $I Information line\n\ $L < (znak mniejszoÅci)\n\ $N BieÅ¼Äcy napÄd\n\ $P BieÅ¼Äcy napÄd i ÅcieÅ¼ka\n\ $Q = (znak rÃ³wnoÅci)\n\ + $S (space)\n\ $T BieÅ¼Äcy czas\n\ $V Wersja systemu\n\ $_ Znak CR/LF\n\ Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Thu Jul 4 01:05:14 2013 @@ -401,10 +401,12 @@ $F ) (parantezÄ dreapta)\n\ $G > (semnul mai mare decÃ¢t)\n\ $H Backspace (Ètergerea caracterului precedent)\n\ + $I Information line\n\ $L < (semnul mai mic decÃ¢t)\n\ $N Unitatea de stocare curentÄ\n\ $P Unitatea de stocare Èi calea curentÄ\n\ $Q = (semnul egal)\n\ + $S (space)\n\ $T Ora curentÄ\n\ $V NumÄrul versiunii SO\n\ $_ SfÃ¢rÈit de linie Èi rÃ¢nd nou\n\ 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] Thu Jul 4 01:05:14 2013 @@ -369,10 +369,12 @@ $F ) (Ð¿ÑÐ°Ð²Ð°Ñ ÐºÑÑÐ³Ð»Ð°Ñ ÑÐºÐ¾Ð±ÐºÐ°)\n\ $G > (Ð·Ð½Ð°Ðº ""Ð±Ð¾Ð»ÑÑÐµ"")\n\ $H BACKSPACE (ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿ÑÐµÐ´ÑÐ´ÑÑÐµÐ³Ð¾ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°)\n\ + $I Information line\n\ $L < (Ð·Ð½Ð°Ðº ""Ð¼ÐµÐ½ÑÑÐµ"")\n\ $N Ð¢ÐµÐºÑÑÐ¸Ð¹ Ð´Ð¸ÑÐº\n\ $P Ð¢ÐµÐºÑÑÐ¸Ðµ Ð´Ð¸ÑÐº Ð¸ ÐºÐ°ÑÐ°Ð»Ð¾Ð³\n\ $Q = (Ð·Ð½Ð°Ðº ÑÐ°Ð²ÐµÐ½ÑÑÐ²Ð°)\n\ + $S (space)\n\ $T Ð¢ÐµÐºÑÑÐµÐµ Ð²ÑÐµÐ¼Ñ\n\ $V ÐÐ¾Ð¼ÐµÑ Ð²ÐµÑÑÐ¸Ð¸ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð¾Ð¹ ÑÐ¸ÑÑÐµÐ¼Ñ\n\ $_ ÐÐµÑÐµÐ²Ð¾Ð´ ÑÑÑÐ¾ÐºÐ¸\n\ Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] Thu Jul 4 01:05:14 2013 @@ -368,10 +368,12 @@ $F ) (PravÃ¡ okrÃºhla zÃ¡tvorka)\n\ $G > (greater-than sign)\n\ $H Backspace (erases previous character)\n\ + $I Information line\n\ $L < (less-than sign)\n\ $N Current drive\n\ $P Current drive and path\n\ $Q = (equal sign)\n\ + $S (space)\n\ $T AktuÃ¡lny Äas\n\ $V ÄÃslo verzie OS\n\ $_ Carriage return and linefeed\n\ Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] Thu Jul 4 01:05:14 2013 @@ -359,10 +359,12 @@ $F ) (HÃ¸yreparentes)\n\ $G > (stÃ¸rre-enn symbol)\n\ $H Tilbake (sletter forrige tegn)\n\ + $I Information line\n\ $L < (mindre-enn symbol)\n\ $N aktuell enhet\n\ $P aktuell enhet och mapp\n\ $Q = (likhetstegn)\n\ + $S (space)\n\ $T aktuell klokkeslett\n\ $V Versjonsnummer for ReactOS\n\ $_ Retur och linjeskift\n\ 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] Thu Jul 4 01:05:14 2013 @@ -371,10 +371,12 @@ $F ) (ÐÑÐ°Ð²Ð° ÐºÑÑÐ³Ð»Ð° Ð´ÑÐ¶ÐºÐ°)\n\ $G > (Ð·Ð½Ð°Ðº Ð±ÑÐ»ÑÑÐµ)\n\ $H Backspace (Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ð¿ÐµÑÐµÐ´ÑÐ½Ð¾Ð³Ð¾ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ)\n\ + $I Information line\n\ $L < (Ð·Ð½Ð°Ðº Ð¼ÐµÐ½ÑÑÐµ)\n\ $N ÐÐ¾ÑÐ¾ÑÐ½Ð¸Ð¹ Ð´Ð¸ÑÐº\n\ $P ÐÐ¾ÑÐ¾ÑÐ½Ð¸Ð¹ Ð´Ð¸ÑÐº ÑÐ° ÐºÐ°ÑÐ°Ð»Ð¾Ð³\n\ $Q = (Ð·Ð½Ð°Ðº ÑiÐ²Ð½Ð¾ÑÑi)\n\ + $S (space)\n\ $T ÐÐ¾ÑÐ¾ÑÐ½Ð¸Ð¹ ÑÐ°Ñ\n\ $V ÐÐ¾Ð¼ÐµÑ Ð²ÐµÑÑiÑ Ð¾Ð¿ÐµÑÐ°ÑiÐ¹Ð½Ð¾Ñ ÑÐ¸ÑÑÐµÐ¼Ð¸\n\ $_ ÐÐ¾Ð²ÐµÑÐ½ÐµÐ½Ð½Ñ ÐºÐ°ÑÐµÑÐºÐ¸ ÑÐ° Ð¿ÐµÑÐµÐ²ÐµÐ´ÐµÐ½Ð½Ñ ÑÑÐ´ÐºÐ°\n\ Modified: trunk/reactos/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-CN.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] Thu Jul 4 01:05:14 2013 @@ -346,10 +346,12 @@ $F ) (å³æ¬å·)\n\ $G > (å¤§äºå·)\n\ $H éæ ¼ (æ¦é¤åä¸ä¸ªåç¬¦)\n\ + $I Information line\n\ $L < (å°äºå·)\n\ $N å½åé©±å¨å¨\n\ $P å½åé©±å¨å¨åè·¯å¾\n\ $Q = (çäºå·)\n\ + $S (space)\n\ $T å½åæ¶é´\n\ $V æä½ç³»ç»çæ¬å·\n\ $_ åè½¦åæ¢è¡ç¬¦\n\ Modified: trunk/reactos/base/shell/cmd/prompt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/prompt.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] Thu Jul 4 01:05:14 2013 @@ -48,19 +48,72 @@ */ #include "precomp.h" -/* - * print the command-line prompt +// FIXME: Localize the information line. +static TCHAR InfoLine[] = _T(" ReactOS Command Prompt Type HELP = Help "); + +/* The default prompt */ +static TCHAR DefaultPrompt[] = _T("$I$P$G"); + + +/* + * Initialize prompt support + */ +VOID InitPrompt(VOID) +{ + TCHAR Buffer[2]; + + /* + * Set the PROMPT environment variable if it doesn't exist already. + * You can change the PROMPT environment variable before cmd start. + */ + if (GetEnvironmentVariable(_T("PROMPT"), Buffer, sizeof(Buffer) / sizeof(Buffer[0])) == 0) + SetEnvironmentVariable(_T("PROMPT"), DefaultPrompt); +} + +/* + * Print an information line on top of the screen + */ +VOID PrintInfoLine(VOID) +{ +#define FOREGROUND_WHITE (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY) + + HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE); + CONSOLE_SCREEN_BUFFER_INFO csbi; + COORD coPos; + DWORD dwWritten; + + if (!GetConsoleScreenBufferInfo(hOutput, &csbi)) + { + /* No console */ + return; + } + + coPos.X = 0; + coPos.Y = 0; + FillConsoleOutputAttribute(hOutput, BACKGROUND_BLUE | FOREGROUND_WHITE, + csbi.dwSize.X, + coPos, &dwWritten); + FillConsoleOutputCharacter(hOutput, _T(' '), + csbi.dwSize.X, + coPos, &dwWritten); + + WriteConsoleOutputCharacter(hOutput, InfoLine, + sizeof(InfoLine)/sizeof(TCHAR) - 1, + coPos, &dwWritten); +} + +/* + * Print the command-line prompt */ VOID PrintPrompt(VOID) { - static TCHAR default_pr[] = _T("$P$G"); TCHAR szPrompt[256]; LPTSTR pr; if (GetEnvironmentVariable(_T("PROMPT"), szPrompt, 256)) pr = szPrompt; else - pr = default_pr; + pr = DefaultPrompt; while (*pr) { @@ -108,6 +161,10 @@ ConOutChar(_T('\x08')); break; + case _T('I'): + PrintInfoLine(); + break; + case _T('L'): ConOutChar(_T('<')); break; @@ -185,42 +242,35 @@ #ifdef INCLUDE_CMD_PROMPT -INT cmd_prompt (LPTSTR param) -{ - if (!_tcsncmp (param, _T("/?"), 2)) - { - ConOutResPaging(TRUE,STRING_PROMPT_HELP1); +INT cmd_prompt(LPTSTR param) +{ + if (!_tcsncmp(param, _T("/?"), 2)) + { + ConOutResPaging(TRUE, STRING_PROMPT_HELP1); #ifdef FEATURE_DIRECTORY_STACK - ConOutResPaging(FALSE,STRING_PROMPT_HELP2); + ConOutResPaging(FALSE, STRING_PROMPT_HELP2); #endif - ConOutResPaging(FALSE,STRING_PROMPT_HELP3); + ConOutResPaging(FALSE, STRING_PROMPT_HELP3); return 0; } /* - * if it is null, then it needs to set to default, + * If 'param' is NULL, then we need to set it to default, * because that means the user entered "prompt" only. - * so even if param is null you _must_ still set prompt - * to the default. There seems to be some kinda difference + * So even if 'param' is null you _must_ still set prompt + * to the default. There seems to be some kind of difference * between winxp and 2k in this matter and this way will * cover both. Do not use fixed size of szParam for param the buffer - * are 8192 bytes and will later change to dymatic buffer. + * are 8192 bytes and will later change to dynamic buffer. */ - /* set PROMPT environment variable */ - if (param[0] != _T('\0')) - { - if (!SetEnvironmentVariable (_T("PROMPT"), param)) + /* Set the PROMPT environment variable */ + if (!SetEnvironmentVariable(_T("PROMPT"), + (param[0] != _T('\0') ? param : DefaultPrompt))) + { return 1; } - else - { - TCHAR szParam[5]; - _tcscpy(szParam,_T("$P$G")); - if (!SetEnvironmentVariable (_T("PROMPT"),szParam)) - return 1; - } return 0; } Modified: trunk/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ver.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] Thu Jul 4 01:05:14 2013 @@ -72,8 +72,8 @@ /* Basic copyright notice */ if (param[0] != _T('\0')) { - ConOutPuts (_T("Copyright (C) 1994-1998 Tim Norman and others.")); - ConOutPuts (_T("Copyright (C) 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team")); + ConOutPuts(_T("Copyright (C) 1994-1998 Tim Norman and others.\n")); + ConOutPuts(_T("Copyright (C) 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team\n")); for (i = 0; param[i]; i++) {

11 years, 5 months

[aandrejevic] 59421: [NTVDM] Fix bugs in video memory access emulation. Implement several missing INT 10h functions. Resize the console screen buffer on startup.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Jul 3 23:38:51 2013 New Revision: 59421 URL: http://svn.reactos.org/svn/reactos?rev=59421&view=rev Log: [NTVDM] Fix bugs in video memory access emulation. Implement several missing INT 10h functions. Resize the console screen buffer on startup. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Wed Jul 3 23:38:51 2013 @@ -16,8 +16,6 @@ /* PRIVATE VARIABLES **********************************************************/ -static BYTE CursorRow, CursorCol; -static WORD ConsoleWidth, ConsoleHeight; static BYTE BiosKeyboardMap[256]; static WORD BiosKbdBuffer[BIOS_KBD_BUFFER_SIZE]; static UINT BiosKbdBufferStart = 0, BiosKbdBufferEnd = 0; @@ -30,17 +28,9 @@ static COORD BiosVideoAddressToCoord(ULONG Address) { COORD Result = {0, 0}; - CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo; - HANDLE ConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); - - if (!GetConsoleScreenBufferInfo(ConsoleOutput, &ConsoleInfo)) - { - ASSERT(FALSE); - return Result; - } - - Result.X = ((Address - CONSOLE_VIDEO_MEM_START) >> 1) % ConsoleInfo.dwSize.X; - Result.Y = ((Address - CONSOLE_VIDEO_MEM_START) >> 1) / ConsoleInfo.dwSize.X; + + Result.X = ((Address - CONSOLE_VIDEO_MEM_START) >> 1) % CONSOLE_WIDTH; + Result.Y = ((Address - CONSOLE_VIDEO_MEM_START) >> 1) / CONSOLE_WIDTH; return Result; } @@ -92,9 +82,9 @@ { INT i; WORD Offset = 0; + COORD Size = { CONSOLE_WIDTH, CONSOLE_HEIGHT}; HANDLE ConsoleInput = GetStdHandle(STD_INPUT_HANDLE); HANDLE ConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); - CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo; LPWORD IntVecTable = (LPWORD)((ULONG_PTR)BaseAddress); LPBYTE BiosCode = (LPBYTE)((ULONG_PTR)BaseAddress + TO_LINEAR(BIOS_SEGMENT, 0)); @@ -122,17 +112,8 @@ BiosCode[Offset++] = 0xCF; // iret } - /* Get the console buffer info */ - if (!GetConsoleScreenBufferInfo(ConsoleOutput, &ConsoleInfo)) - { - return FALSE; - } - - /* Set the initial cursor position and console size */ - CursorCol = ConsoleInfo.dwCursorPosition.X; - CursorRow = ConsoleInfo.dwCursorPosition.Y; - ConsoleWidth = ConsoleInfo.dwSize.X; - ConsoleHeight = ConsoleInfo.dwSize.Y; + /* Set the console buffer size */ + if (!SetConsoleScreenBufferSize(ConsoleOutput, Size)) return FALSE; /* Set the console input mode */ SetConsoleMode(ConsoleInput, ENABLE_MOUSE_INPUT | ENABLE_PROCESSED_INPUT); @@ -168,34 +149,31 @@ { ULONG i; COORD Coordinates; - DWORD CharsWritten; + COORD Origin = { 0, 0 }; + COORD UnitSize = { 1, 1 }; + CHAR_INFO Character; + SMALL_RECT Rect; HANDLE ConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); + /* Start from the character address */ + StartAddress &= ~1; + /* Loop through all the addresses */ - for (i = StartAddress; i < EndAddress; i++) + for (i = StartAddress; i < EndAddress; i += 2) { /* Get the coordinates */ Coordinates = BiosVideoAddressToCoord(i); - /* Check if this is a character byte or an attribute byte */ - if ((i - CONSOLE_VIDEO_MEM_START) % 2 == 0) - { - /* This is a regular character */ - FillConsoleOutputCharacterA(ConsoleOutput, - *(PCHAR)((ULONG_PTR)BaseAddress + i), - sizeof(CHAR), - Coordinates, - &CharsWritten); - } - else - { - /* This is an attribute */ - FillConsoleOutputAttribute(ConsoleOutput, - *(PCHAR)((ULONG_PTR)BaseAddress + i), - sizeof(CHAR), - Coordinates, - &CharsWritten); - } + /* Fill the rectangle structure */ + Rect.Left = Coordinates.X; + Rect.Top = Coordinates.Y; + + /* Fill the character data */ + Character.Char.AsciiChar = *((PCHAR)((ULONG_PTR)BaseAddress + i)); + Character.Attributes = *((PBYTE)((ULONG_PTR)BaseAddress + i + 1)); + + /* Write the character */ + WriteConsoleOutputA(ConsoleOutput, &Character, UnitSize, Origin, &Rect); } } @@ -294,6 +272,7 @@ BOOLEAN Invisible = FALSE; COORD Position; CONSOLE_CURSOR_INFO CursorInfo; + CONSOLE_SCREEN_BUFFER_INFO ScreenBufferInfo; CHAR_INFO Character; SMALL_RECT Rect; DWORD Eax = EmulatorGetRegister(EMULATOR_REG_AX); @@ -327,6 +306,27 @@ Position.Y = HIBYTE(Edx); SetConsoleCursorPosition(ConsoleOutput, Position); + break; + } + + /* Get Cursor Position */ + case 0x03: + { + INT StartLine; + + /* Retrieve the data */ + GetConsoleCursorInfo(ConsoleOutput, &CursorInfo); + GetConsoleScreenBufferInfo(ConsoleOutput, &ScreenBufferInfo); + + /* Find the first line */ + StartLine = 32 - ((CursorInfo.dwSize * 32) / 100); + + /* Return the result */ + EmulatorSetRegister(EMULATOR_REG_AX, 0); + EmulatorSetRegister(EMULATOR_REG_CX, (StartLine << 8) | 0x1F); + EmulatorSetRegister(EMULATOR_REG_DX, + LOWORD(ScreenBufferInfo.dwCursorPosition.Y) << 8 + || LOWORD(ScreenBufferInfo.dwCursorPosition.X)); break; } @@ -355,18 +355,75 @@ /* Read Character And Attribute At Cursor Position */ case 0x08: { + COORD BufferSize = { 1, 1 }, Origin = { 0, 0 }; + + /* Get the cursor position */ + GetConsoleScreenBufferInfo(ConsoleOutput, &ScreenBufferInfo); + + /* Read at cursor position */ + Rect.Left = ScreenBufferInfo.dwCursorPosition.X; + Rect.Top = ScreenBufferInfo.dwCursorPosition.Y; + + /* Read the console output */ + ReadConsoleOutput(ConsoleOutput, &Character, BufferSize, Origin, &Rect); + + /* Return the result */ + EmulatorSetRegister(EMULATOR_REG_AX, + (LOBYTE(Character.Attributes) << 8) + | Character.Char.AsciiChar); + break; } /* Write Character And Attribute At Cursor Position */ case 0x09: { + DWORD CharsWritten; + + /* Get the cursor position */ + GetConsoleScreenBufferInfo(ConsoleOutput, &ScreenBufferInfo); + + /* Write the attribute to the output */ + FillConsoleOutputAttribute(ConsoleOutput, + LOBYTE(Ebx), + LOWORD(Ecx), + ScreenBufferInfo.dwCursorPosition, + &CharsWritten); + + /* Write the character to the output */ + FillConsoleOutputCharacterA(ConsoleOutput, + LOBYTE(Eax), + LOWORD(Ecx), + ScreenBufferInfo.dwCursorPosition, + &CharsWritten); + break; } /* Write Character Only At Cursor Position */ case 0x0A: { + DWORD CharsWritten; + + /* Get the cursor position */ + GetConsoleScreenBufferInfo(ConsoleOutput, &ScreenBufferInfo); + + /* Write the character to the output */ + FillConsoleOutputCharacterA(ConsoleOutput, + LOBYTE(Eax), + LOWORD(Ecx), + ScreenBufferInfo.dwCursorPosition, + &CharsWritten); + + break; + } + + case 0x0F: + { + /* Return just text mode information, for now */ + EmulatorSetRegister(EMULATOR_REG_AX, 0x5003); + EmulatorSetRegister(EMULATOR_REG_BX, 0x0000); + break; } Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Wed Jul 3 23:38:51 2013 @@ -26,6 +26,8 @@ #define BIOS_EQUIPMENT_INTERRUPT 0x11 #define BIOS_KBD_INTERRUPT 0x16 #define BIOS_TIME_INTERRUPT 0x1A +#define CONSOLE_WIDTH 80 +#define CONSOLE_HEIGHT 25 #define CONSOLE_FONT_HEIGHT 8 #define BIOS_KBD_BUFFER_SIZE 256 #define BIOS_EQUIPMENT_LIST 0x3C // HACK: Disable FPU for now Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Wed Jul 3 23:38:51 2013 @@ -943,6 +943,7 @@ } /* Read Character Without Echo */ + case 0x07: case 0x08: { EmulatorSetRegister(EMULATOR_REG_AX, Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Wed Jul 3 23:38:51 2013 @@ -36,8 +36,8 @@ && (Address < CONSOLE_VIDEO_MEM_END)) { /* Call the VDM BIOS to update the video memory */ - BiosUpdateConsole(max(Address, CONSOLE_VIDEO_MEM_START), - min(Address + Size, CONSOLE_VIDEO_MEM_END)); + BiosUpdateVideoMemory(max(Address, CONSOLE_VIDEO_MEM_START), + min(Address + Size, CONSOLE_VIDEO_MEM_END)); } /* Read the data from the virtual address space and store it in the buffer */ Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Wed Jul 3 23:38:51 2013 @@ -47,7 +47,7 @@ EMULATOR_EXCEPTION_NO_FPU }; -typedef enum +enum { EMULATOR_REG_AX, EMULATOR_REG_CX, @@ -61,7 +61,7 @@ EMULATOR_REG_CS, EMULATOR_REG_SS, EMULATOR_REG_DS, -} EMULATOR_REGISTER; +}; /* FUNCTIONS ******************************************************************/

11 years, 5 months

[hbelusca] 59420: [CONSRV] - Move SrvSetConsoleWindowInfo to a better place. - When enlarging the console buffer, use the attributes of the last cell of each line to fill the new cells for each lin...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jul 3 22:40:58 2013 New Revision: 59420 URL: http://svn.reactos.org/svn/reactos?rev=59420&view=rev Log: [CONSRV] - Move SrvSetConsoleWindowInfo to a better place. - When enlarging the console buffer, use the attributes of the last cell of each line to fill the new cells for each line. - Remove usage of HAVE_WMEMSET / wmemset for resizing the buffer (NOTE: maybe it will be needed again later on...) Modified: trunk/reactos/win32ss/user/consrv/condrv/text.c trunk/reactos/win32ss/user/consrv/conoutput.c trunk/reactos/win32ss/user/consrv/frontendctl.c Modified: trunk/reactos/win32ss/user/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/condrv… ============================================================================== --- trunk/reactos/win32ss/user/consrv/condrv/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/condrv/text.c [iso-8859-1] Wed Jul 3 22:40:58 2013 @@ -17,12 +17,6 @@ #define NDEBUG #include <debug.h> - -/* -// Define wmemset(...) -#include <wchar.h> -#define HAVE_WMEMSET -*/ /* GLOBALS ********************************************************************/ @@ -323,13 +317,10 @@ PCHAR_INFO Buffer; DWORD Offset = 0; PCHAR_INFO ptr; + WORD CurrentAttribute; USHORT CurrentY; PCHAR_INFO OldBuffer; -#ifdef HAVE_WMEMSET - USHORT value = MAKEWORD(' ', ScreenBuffer->ScreenDefaultAttrib); -#else DWORD i; -#endif DWORD diff; /* Buffer size is not allowed to be smaller than the view size */ @@ -374,28 +365,29 @@ RtlCopyMemory(Buffer + Offset, ptr, ScreenBuffer->ScreenBufferSize.X * sizeof(CHAR_INFO)); Offset += ScreenBuffer->ScreenBufferSize.X; + /* The attribute to be used is the one of the last cell of the current line */ + CurrentAttribute = ConioCoordToPointer(ScreenBuffer, + ScreenBuffer->ScreenBufferSize.X - 1, + CurrentY)->Attributes; + diff = Size.X - ScreenBuffer->ScreenBufferSize.X; - /* Zero new part of it */ -#ifdef HAVE_WMEMSET - wmemset((PWCHAR)&Buffer[Offset], value, diff); -#else + + /* Zero-out the new part of the buffer */ for (i = 0; i < diff; i++) { ptr = Buffer + Offset; ptr->Char.UnicodeChar = L' '; - ptr->Attributes = ScreenBuffer->ScreenDefaultAttrib; + ptr->Attributes = CurrentAttribute; ++Offset; } -#endif } } if (Size.Y > ScreenBuffer->ScreenBufferSize.Y) { diff = Size.X * (Size.Y - ScreenBuffer->ScreenBufferSize.Y); -#ifdef HAVE_WMEMSET - wmemset((PWCHAR)&Buffer[Offset], value, diff); -#else + + /* Zero-out the new part of the buffer */ for (i = 0; i < diff; i++) { ptr = Buffer + Offset; @@ -403,7 +395,6 @@ ptr->Attributes = ScreenBuffer->ScreenDefaultAttrib; ++Offset; } -#endif } (void)InterlockedExchangePointer((PVOID volatile*)&ScreenBuffer->Buffer, Buffer); Modified: trunk/reactos/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conout… ============================================================================== --- trunk/reactos/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/conoutput.c [iso-8859-1] Wed Jul 3 22:40:58 2013 @@ -756,4 +756,56 @@ return Status; } + + + + +CSR_API(SrvSetConsoleWindowInfo) +{ + NTSTATUS Status; + PCONSOLE_SETWINDOWINFO SetWindowInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetWindowInfoRequest; + PCONSOLE_SCREEN_BUFFER Buff; + SMALL_RECT WindowRect = SetWindowInfoRequest->WindowRect; + + DPRINT("SrvSetConsoleWindowInfo(0x%08x, %d, {L%d, T%d, R%d, B%d}) called\n", + SetWindowInfoRequest->OutputHandle, SetWindowInfoRequest->Absolute, + WindowRect.Left, WindowRect.Top, WindowRect.Right, WindowRect.Bottom); + + Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + SetWindowInfoRequest->OutputHandle, + &Buff, + GENERIC_READ, + TRUE); + if (!NT_SUCCESS(Status)) return Status; + + if (SetWindowInfoRequest->Absolute == FALSE) + { + /* Relative positions given. Transform them to absolute ones */ + WindowRect.Left += Buff->ViewOrigin.X; + WindowRect.Top += Buff->ViewOrigin.Y; + WindowRect.Right += Buff->ViewOrigin.X + Buff->ViewSize.X - 1; + WindowRect.Bottom += Buff->ViewOrigin.Y + Buff->ViewSize.Y - 1; + } + + /* See MSDN documentation on SetConsoleWindowInfo about the performed checks */ + if ( (WindowRect.Left < 0) || (WindowRect.Top < 0) || + (WindowRect.Right >= Buff->ScreenBufferSize.X) || + (WindowRect.Bottom >= Buff->ScreenBufferSize.Y) || + (WindowRect.Right <= WindowRect.Left) || + (WindowRect.Bottom <= WindowRect.Top) ) + { + ConSrvReleaseScreenBuffer(Buff, TRUE); + return STATUS_INVALID_PARAMETER; + } + + Buff->ViewOrigin.X = WindowRect.Left; + Buff->ViewOrigin.Y = WindowRect.Top; + + Buff->ViewSize.X = WindowRect.Right - WindowRect.Left + 1; + Buff->ViewSize.Y = WindowRect.Bottom - WindowRect.Top + 1; + + ConSrvReleaseScreenBuffer(Buff, TRUE); + return STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/win32ss/user/consrv/frontendctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… ============================================================================== --- trunk/reactos/win32ss/user/consrv/frontendctl.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/frontendctl.c [iso-8859-1] Wed Jul 3 22:40:58 2013 @@ -278,54 +278,6 @@ return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); } -CSR_API(SrvSetConsoleWindowInfo) -{ - NTSTATUS Status; - PCONSOLE_SETWINDOWINFO SetWindowInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetWindowInfoRequest; - PCONSOLE_SCREEN_BUFFER Buff; - SMALL_RECT WindowRect = SetWindowInfoRequest->WindowRect; - - DPRINT("SrvSetConsoleWindowInfo(0x%08x, %d, {L%d, T%d, R%d, B%d}) called\n", - SetWindowInfoRequest->OutputHandle, SetWindowInfoRequest->Absolute, - WindowRect.Left, WindowRect.Top, WindowRect.Right, WindowRect.Bottom); - - Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), - SetWindowInfoRequest->OutputHandle, - &Buff, - GENERIC_READ, - TRUE); - if (!NT_SUCCESS(Status)) return Status; - - if (SetWindowInfoRequest->Absolute == FALSE) - { - /* Relative positions given. Transform them to absolute ones */ - WindowRect.Left += Buff->ViewOrigin.X; - WindowRect.Top += Buff->ViewOrigin.Y; - WindowRect.Right += Buff->ViewOrigin.X + Buff->ViewSize.X - 1; - WindowRect.Bottom += Buff->ViewOrigin.Y + Buff->ViewSize.Y - 1; - } - - /* See MSDN documentation on SetConsoleWindowInfo about the performed checks */ - if ( (WindowRect.Left < 0) || (WindowRect.Top < 0) || - (WindowRect.Right >= Buff->ScreenBufferSize.X) || - (WindowRect.Bottom >= Buff->ScreenBufferSize.Y) || - (WindowRect.Right <= WindowRect.Left) || - (WindowRect.Bottom <= WindowRect.Top) ) - { - ConSrvReleaseScreenBuffer(Buff, TRUE); - return STATUS_INVALID_PARAMETER; - } - - Buff->ViewOrigin.X = WindowRect.Left; - Buff->ViewOrigin.Y = WindowRect.Top; - - Buff->ViewSize.X = WindowRect.Right - WindowRect.Left + 1; - Buff->ViewSize.Y = WindowRect.Bottom - WindowRect.Top + 1; - - ConSrvReleaseScreenBuffer(Buff, TRUE); - return STATUS_SUCCESS; -} - CSR_API(SrvGetConsoleWindow) { NTSTATUS Status;

11 years, 5 months

[jjones] 59419: Add Visual Studio support for build of Live CD, courtesy of Mr. Wang.

by jjones＠svn.reactos.org

Author: jjones Date: Wed Jul 3 18:27:36 2013 New Revision: 59419 URL: http://svn.reactos.org/svn/reactos?rev=59419&view=rev Log: Add Visual Studio support for build of Live CD, courtesy of Mr. Wang. Modified: branches/vs_jc/reactos/ReactOS.sln branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/vs_jc/reactos/ReactOS.sln URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ReactOS.sln?rev=5… Modified: branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/_IMAGES/CD_Live/C…

11 years, 5 months

[jjones] 59418: Add Visual Studio for acpica, courtesy of Mr. Wang.

by jjones＠svn.reactos.org

Author: jjones Date: Wed Jul 3 18:26:26 2013 New Revision: 59418 URL: http://svn.reactos.org/svn/reactos?rev=59418&view=rev Log: Add Visual Studio for acpica, courtesy of Mr. Wang. Added: branches/vs_jc/reactos/drivers/bus/acpi/acpica/acpica.vcxproj branches/vs_jc/reactos/drivers/bus/acpi/acpica/acpica.vcxproj.filters Added: branches/vs_jc/reactos/drivers/bus/acpi/acpica/acpica.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/bus/acpi/… ============================================================================== --- branches/vs_jc/reactos/drivers/bus/acpi/acpica/acpica.vcxproj (added) +++ branches/vs_jc/reactos/drivers/bus/acpi/acpica/acpica.vcxproj [iso-8859-1] Wed Jul 3 18:26:26 2013 @@ -0,0 +1,214 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{7ABE6839-E69A-49BB-9EBA-C394D28E836D}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>acpica</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <OutDir>build\x86_32\$(Configuration)\</OutDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <IntDir>build\x86_32\$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <OutDir>build\x86_32\$(Configuration)\</OutDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <IntDir>build\x86_32\$(Configuration)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;ACPI_USE_LOCAL_CACHE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>include;include\platform;..\..\..\..\include\ddk;..\..\..\..\include\crt;..\..\..\..\include\psdk;..\..\..\..\include\crt\msc;..\..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS</AdditionalIncludeDirectories> + <IgnoreStandardIncludePath>true</IgnoreStandardIncludePath> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="dispatcher\dsargs.c" /> + <ClCompile Include="dispatcher\dscontrol.c" /> + <ClCompile Include="dispatcher\dsfield.c" /> + <ClCompile Include="dispatcher\dsinit.c" /> + <ClCompile Include="dispatcher\dsmethod.c" /> + <ClCompile Include="dispatcher\dsmthdat.c" /> + <ClCompile Include="dispatcher\dsobject.c" /> + <ClCompile Include="dispatcher\dsopcode.c" /> + <ClCompile Include="dispatcher\dsutils.c" /> + <ClCompile Include="dispatcher\dswexec.c" /> + <ClCompile Include="dispatcher\dswload.c" /> + <ClCompile Include="dispatcher\dswload2.c" /> + <ClCompile Include="dispatcher\dswscope.c" /> + <ClCompile Include="dispatcher\dswstate.c" /> + <ClCompile Include="events\evevent.c" /> + <ClCompile Include="events\evglock.c" /> + <ClCompile Include="events\evgpe.c" /> + <ClCompile Include="events\evgpeblk.c" /> + <ClCompile Include="events\evgpeinit.c" /> + <ClCompile Include="events\evgpeutil.c" /> + <ClCompile Include="events\evmisc.c" /> + <ClCompile Include="events\evregion.c" /> + <ClCompile Include="events\evrgnini.c" /> + <ClCompile Include="events\evsci.c" /> + <ClCompile Include="events\evxface.c" /> + <ClCompile Include="events\evxfevnt.c" /> + <ClCompile Include="events\evxfgpe.c" /> + <ClCompile Include="events\evxfregn.c" /> + <ClCompile Include="executer\exconfig.c" /> + <ClCompile Include="executer\exconvrt.c" /> + <ClCompile Include="executer\excreate.c" /> + <ClCompile Include="executer\exdebug.c" /> + <ClCompile Include="executer\exdump.c" /> + <ClCompile Include="executer\exfield.c" /> + <ClCompile Include="executer\exfldio.c" /> + <ClCompile Include="executer\exmisc.c" /> + <ClCompile Include="executer\exmutex.c" /> + <ClCompile Include="executer\exnames.c" /> + <ClCompile Include="executer\exoparg1.c" /> + <ClCompile Include="executer\exoparg2.c" /> + <ClCompile Include="executer\exoparg3.c" /> + <ClCompile Include="executer\exoparg6.c" /> + <ClCompile Include="executer\exprep.c" /> + <ClCompile Include="executer\exregion.c" /> + <ClCompile Include="executer\exresnte.c" /> + <ClCompile Include="executer\exresolv.c" /> + <ClCompile Include="executer\exresop.c" /> + <ClCompile Include="executer\exstore.c" /> + <ClCompile Include="executer\exstoren.c" /> + <ClCompile Include="executer\exstorob.c" /> + <ClCompile Include="executer\exsystem.c" /> + <ClCompile Include="executer\exutils.c" /> + <ClCompile Include="hardware\hwacpi.c" /> + <ClCompile Include="hardware\hwgpe.c" /> + <ClCompile Include="hardware\hwpci.c" /> + <ClCompile Include="hardware\hwregs.c" /> + <ClCompile Include="hardware\hwsleep.c" /> + <ClCompile Include="hardware\hwtimer.c" /> + <ClCompile Include="hardware\hwvalid.c" /> + <ClCompile Include="hardware\hwxface.c" /> + <ClCompile Include="namespace\nsaccess.c" /> + <ClCompile Include="namespace\nsalloc.c" /> + <ClCompile Include="namespace\nsdump.c" /> + <ClCompile Include="namespace\nsdumpdv.c" /> + <ClCompile Include="namespace\nseval.c" /> + <ClCompile Include="namespace\nsinit.c" /> + <ClCompile Include="namespace\nsload.c" /> + <ClCompile Include="namespace\nsnames.c" /> + <ClCompile Include="namespace\nsobject.c" /> + <ClCompile Include="namespace\nsparse.c" /> + <ClCompile Include="namespace\nspredef.c" /> + <ClCompile Include="namespace\nsrepair.c" /> + <ClCompile Include="namespace\nsrepair2.c" /> + <ClCompile Include="namespace\nssearch.c" /> + <ClCompile Include="namespace\nsutils.c" /> + <ClCompile Include="namespace\nswalk.c" /> + <ClCompile Include="namespace\nsxfeval.c" /> + <ClCompile Include="namespace\nsxfname.c" /> + <ClCompile Include="namespace\nsxfobj.c" /> + <ClCompile Include="parser\psargs.c" /> + <ClCompile Include="parser\psloop.c" /> + <ClCompile Include="parser\psopcode.c" /> + <ClCompile Include="parser\psparse.c" /> + <ClCompile Include="parser\psscope.c" /> + <ClCompile Include="parser\pstree.c" /> + <ClCompile Include="parser\psutils.c" /> + <ClCompile Include="parser\pswalk.c" /> + <ClCompile Include="parser\psxface.c" /> + <ClCompile Include="resources\rsaddr.c" /> + <ClCompile Include="resources\rscalc.c" /> + <ClCompile Include="resources\rscreate.c" /> + <ClCompile Include="resources\rsdump.c" /> + <ClCompile Include="resources\rsinfo.c" /> + <ClCompile Include="resources\rsio.c" /> + <ClCompile Include="resources\rsirq.c" /> + <ClCompile Include="resources\rslist.c" /> + <ClCompile Include="resources\rsmemory.c" /> + <ClCompile Include="resources\rsmisc.c" /> + <ClCompile Include="resources\rsutils.c" /> + <ClCompile Include="resources\rsxface.c" /> + <ClCompile Include="tables\tbconvrt.c" /> + <ClCompile Include="tables\tbfadt.c" /> + <ClCompile Include="tables\tbfind.c" /> + <ClCompile Include="tables\tbget.c" /> + <ClCompile Include="tables\tbinstal.c" /> + <ClCompile Include="tables\tbutils.c" /> + <ClCompile Include="tables\tbxface.c" /> + <ClCompile Include="tables\tbxfroot.c" /> + <ClCompile Include="utilities\utalloc.c" /> + <ClCompile Include="utilities\utcache.c" /> + <ClCompile Include="utilities\utclib.c" /> + <ClCompile Include="utilities\utcopy.c" /> + <ClCompile Include="utilities\utdebug.c" /> + <ClCompile Include="utilities\utdecode.c" /> + <ClCompile Include="utilities\utdelete.c" /> + <ClCompile Include="utilities\uteval.c" /> + <ClCompile Include="utilities\utglobal.c" /> + <ClCompile Include="utilities\utids.c" /> + <ClCompile Include="utilities\utinit.c" /> + <ClCompile Include="utilities\utlock.c" /> + <ClCompile Include="utilities\utmath.c" /> + <ClCompile Include="utilities\utmisc.c" /> + <ClCompile Include="utilities\utmutex.c" /> + <ClCompile Include="utilities\utobject.c" /> + <ClCompile Include="utilities\utosi.c" /> + <ClCompile Include="utilities\utresrc.c" /> + <ClCompile Include="utilities\utstate.c" /> + <ClCompile Include="utilities\uttrack.c" /> + <ClCompile Include="utilities\utxface.c" /> + <ClCompile Include="utilities\utxferror.c" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> Added: branches/vs_jc/reactos/drivers/bus/acpi/acpica/acpica.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/bus/acpi/… ============================================================================== --- branches/vs_jc/reactos/drivers/bus/acpi/acpica/acpica.vcxproj.filters (added) +++ branches/vs_jc/reactos/drivers/bus/acpi/acpica/acpica.vcxproj.filters [iso-8859-1] Wed Jul 3 18:26:26 2013 @@ -0,0 +1,436 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> + </Filter> + <Filter Include="Resource Files"> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + </Filter> + <Filter Include="dispatcher"> + <UniqueIdentifier>{be9657de-7e3d-482e-aacb-0aca0eca0f3e}</UniqueIdentifier> + </Filter> + <Filter Include="events"> + <UniqueIdentifier>{5a38e6e4-fabf-4c51-9a54-d28be9edc8f8}</UniqueIdentifier> + </Filter> + <Filter Include="executer"> + <UniqueIdentifier>{423facb5-a09b-4e2a-9c9d-626c91d9507e}</UniqueIdentifier> + </Filter> + <Filter Include="hardware"> + <UniqueIdentifier>{91461c13-5c6b-49f5-a37a-3da755dcfd00}</UniqueIdentifier> + </Filter> + <Filter Include="namespace"> + <UniqueIdentifier>{d7403ef9-0545-4f42-ab2e-19302679d833}</UniqueIdentifier> + </Filter> + <Filter Include="parser"> + <UniqueIdentifier>{a097498d-7a9a-4250-a54a-a8f12a3bc831}</UniqueIdentifier> + </Filter> + <Filter Include="resources"> + <UniqueIdentifier>{dcb78d46-4bf9-4ded-8021-807284280160}</UniqueIdentifier> + </Filter> + <Filter Include="utilities"> + <UniqueIdentifier>{6ebc516e-7551-437b-936b-dba982bceca4}</UniqueIdentifier> + </Filter> + <Filter Include="tables"> + <UniqueIdentifier>{3c449f4f-55a3-449d-bce9-bfa6d4fc091e}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="dispatcher\dsargs.c"> + <Filter>dispatcher</Filter> + </ClCompile> + <ClCompile Include="dispatcher\dscontrol.c"> + <Filter>dispatcher</Filter> + </ClCompile> + <ClCompile Include="dispatcher\dsfield.c"> + <Filter>dispatcher</Filter> + </ClCompile> + <ClCompile Include="dispatcher\dsinit.c"> + <Filter>dispatcher</Filter> + </ClCompile> + <ClCompile Include="dispatcher\dsmethod.c"> + <Filter>dispatcher</Filter> + </ClCompile> + <ClCompile Include="dispatcher\dsmthdat.c"> + <Filter>dispatcher</Filter> + </ClCompile> + <ClCompile Include="dispatcher\dsobject.c"> + <Filter>dispatcher</Filter> + </ClCompile> + <ClCompile Include="dispatcher\dsopcode.c"> + <Filter>dispatcher</Filter> + </ClCompile> + <ClCompile Include="dispatcher\dsutils.c"> + <Filter>dispatcher</Filter> + </ClCompile> + <ClCompile Include="dispatcher\dswexec.c"> + <Filter>dispatcher</Filter> + </ClCompile> + <ClCompile Include="dispatcher\dswload.c"> + <Filter>dispatcher</Filter> + </ClCompile> + <ClCompile Include="dispatcher\dswload2.c"> + <Filter>dispatcher</Filter> + </ClCompile> + <ClCompile Include="dispatcher\dswscope.c"> + <Filter>dispatcher</Filter> + </ClCompile> + <ClCompile Include="dispatcher\dswstate.c"> + <Filter>dispatcher</Filter> + </ClCompile> + <ClCompile Include="events\evevent.c"> + <Filter>events</Filter> + </ClCompile> + <ClCompile Include="events\evglock.c"> + <Filter>events</Filter> + </ClCompile> + <ClCompile Include="events\evgpe.c"> + <Filter>events</Filter> + </ClCompile> + <ClCompile Include="events\evgpeblk.c"> + <Filter>events</Filter> + </ClCompile> + <ClCompile Include="events\evgpeinit.c"> + <Filter>events</Filter> + </ClCompile> + <ClCompile Include="events\evgpeutil.c"> + <Filter>events</Filter> + </ClCompile> + <ClCompile Include="events\evmisc.c"> + <Filter>events</Filter> + </ClCompile> + <ClCompile Include="events\evregion.c"> + <Filter>events</Filter> + </ClCompile> + <ClCompile Include="events\evrgnini.c"> + <Filter>events</Filter> + </ClCompile> + <ClCompile Include="events\evsci.c"> + <Filter>events</Filter> + </ClCompile> + <ClCompile Include="events\evxface.c"> + <Filter>events</Filter> + </ClCompile> + <ClCompile Include="events\evxfevnt.c"> + <Filter>events</Filter> + </ClCompile> + <ClCompile Include="events\evxfgpe.c"> + <Filter>events</Filter> + </ClCompile> + <ClCompile Include="events\evxfregn.c"> + <Filter>events</Filter> + </ClCompile> + <ClCompile Include="executer\exconfig.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exconvrt.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\excreate.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exdebug.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exdump.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exfield.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exfldio.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exmisc.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exmutex.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exnames.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exoparg1.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exoparg2.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exoparg3.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exoparg6.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exprep.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exregion.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exresnte.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exresolv.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exresop.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exstore.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exstoren.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exstorob.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exsystem.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="executer\exutils.c"> + <Filter>executer</Filter> + </ClCompile> + <ClCompile Include="hardware\hwacpi.c"> + <Filter>hardware</Filter> + </ClCompile> + <ClCompile Include="hardware\hwgpe.c"> + <Filter>hardware</Filter> + </ClCompile> + <ClCompile Include="hardware\hwpci.c"> + <Filter>hardware</Filter> + </ClCompile> + <ClCompile Include="hardware\hwregs.c"> + <Filter>hardware</Filter> + </ClCompile> + <ClCompile Include="hardware\hwsleep.c"> + <Filter>hardware</Filter> + </ClCompile> + <ClCompile Include="hardware\hwtimer.c"> + <Filter>hardware</Filter> + </ClCompile> + <ClCompile Include="hardware\hwvalid.c"> + <Filter>hardware</Filter> + </ClCompile> + <ClCompile Include="hardware\hwxface.c"> + <Filter>hardware</Filter> + </ClCompile> + <ClCompile Include="namespace\nsaccess.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nsalloc.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nsdump.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nsdumpdv.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nseval.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nsinit.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nsload.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nsnames.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nsobject.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nsparse.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nspredef.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nsrepair.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nsrepair2.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nssearch.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nsutils.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nswalk.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nsxfeval.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nsxfname.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="namespace\nsxfobj.c"> + <Filter>namespace</Filter> + </ClCompile> + <ClCompile Include="parser\psargs.c"> + <Filter>parser</Filter> + </ClCompile> + <ClCompile Include="parser\psloop.c"> + <Filter>parser</Filter> + </ClCompile> + <ClCompile Include="parser\psopcode.c"> + <Filter>parser</Filter> + </ClCompile> + <ClCompile Include="parser\psparse.c"> + <Filter>parser</Filter> + </ClCompile> + <ClCompile Include="parser\psscope.c"> + <Filter>parser</Filter> + </ClCompile> + <ClCompile Include="parser\pstree.c"> + <Filter>parser</Filter> + </ClCompile> + <ClCompile Include="parser\psutils.c"> + <Filter>parser</Filter> + </ClCompile> + <ClCompile Include="parser\pswalk.c"> + <Filter>parser</Filter> + </ClCompile> + <ClCompile Include="parser\psxface.c"> + <Filter>parser</Filter> + </ClCompile> + <ClCompile Include="resources\rsaddr.c"> + <Filter>resources</Filter> + </ClCompile> + <ClCompile Include="resources\rscalc.c"> + <Filter>resources</Filter> + </ClCompile> + <ClCompile Include="resources\rscreate.c"> + <Filter>resources</Filter> + </ClCompile> + <ClCompile Include="resources\rsdump.c"> + <Filter>resources</Filter> + </ClCompile> + <ClCompile Include="resources\rsinfo.c"> + <Filter>resources</Filter> + </ClCompile> + <ClCompile Include="resources\rsio.c"> + <Filter>resources</Filter> + </ClCompile> + <ClCompile Include="resources\rsirq.c"> + <Filter>resources</Filter> + </ClCompile> + <ClCompile Include="resources\rslist.c"> + <Filter>resources</Filter> + </ClCompile> + <ClCompile Include="resources\rsmemory.c"> + <Filter>resources</Filter> + </ClCompile> + <ClCompile Include="resources\rsmisc.c"> + <Filter>resources</Filter> + </ClCompile> + <ClCompile Include="resources\rsutils.c"> + <Filter>resources</Filter> + </ClCompile> + <ClCompile Include="resources\rsxface.c"> + <Filter>resources</Filter> + </ClCompile> + <ClCompile Include="utilities\utalloc.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utcache.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utclib.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utcopy.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utdebug.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utdecode.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utdelete.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\uteval.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utglobal.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utids.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utinit.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utlock.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utmath.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utmisc.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utmutex.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utobject.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utosi.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utresrc.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utstate.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\uttrack.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utxface.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="utilities\utxferror.c"> + <Filter>utilities</Filter> + </ClCompile> + <ClCompile Include="tables\tbconvrt.c"> + <Filter>tables</Filter> + </ClCompile> + <ClCompile Include="tables\tbfadt.c"> + <Filter>tables</Filter> + </ClCompile> + <ClCompile Include="tables\tbfind.c"> + <Filter>tables</Filter> + </ClCompile> + <ClCompile Include="tables\tbget.c"> + <Filter>tables</Filter> + </ClCompile> + <ClCompile Include="tables\tbinstal.c"> + <Filter>tables</Filter> + </ClCompile> + <ClCompile Include="tables\tbutils.c"> + <Filter>tables</Filter> + </ClCompile> + <ClCompile Include="tables\tbxface.c"> + <Filter>tables</Filter> + </ClCompile> + <ClCompile Include="tables\tbxfroot.c"> + <Filter>tables</Filter> + </ClCompile> + </ItemGroup> +</Project>

11 years, 5 months

[jjones] 59417: Add Visual Studio support for usbhub, courtesy of Mr. Wang.

by jjones＠svn.reactos.org

Author: jjones Date: Wed Jul 3 18:15:57 2013 New Revision: 59417 URL: http://svn.reactos.org/svn/reactos?rev=59417&view=rev Log: Add Visual Studio support for usbhub, courtesy of Mr. Wang. Added: branches/vs_jc/reactos/drivers/usb/usbhub/usbhub.vcxproj branches/vs_jc/reactos/drivers/usb/usbhub/usbhub.vcxproj.filters Added: branches/vs_jc/reactos/drivers/usb/usbhub/usbhub.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/usb/usbhu… ============================================================================== --- branches/vs_jc/reactos/drivers/usb/usbhub/usbhub.vcxproj (added) +++ branches/vs_jc/reactos/drivers/usb/usbhub/usbhub.vcxproj [iso-8859-1] Wed Jul 3 18:15:57 2013 @@ -0,0 +1,146 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{53DB47D8-29A6-49E9-A741-967A5546376E}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>usbhub</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + <OutDir>build\x86_32\$(Configuration)\</OutDir> + <IntDir>build\x86_32\$(Configuration)\</IntDir> + <GenerateManifest>false</GenerateManifest> + <TargetExt>.sys</TargetExt> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + <OutDir>build\x86_32\$(Configuration)\</OutDir> + <IntDir>build\x86_32\$(Configuration)\</IntDir> + <GenerateManifest>false</GenerateManifest> + <TargetExt>.sys</TargetExt> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>.\;..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS;..\..\..\include\crt;..\..\..\include\crt\msc;..\..\..\include\reactos\libs;..\..\..\include\reactos;..\..\..\include;..\..\..\include\ndk</AdditionalIncludeDirectories> + <BasicRuntimeChecks>Default</BasicRuntimeChecks> + <BufferSecurityCheck>false</BufferSecurityCheck> + <ExceptionHandling>false</ExceptionHandling> + <RuntimeTypeInfo>false</RuntimeTypeInfo> + <IgnoreStandardIncludePath>true</IgnoreStandardIncludePath> + </ClCompile> + <Link> + <SubSystem>Native</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalOptions> + </AdditionalOptions> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <Driver>Driver</Driver> + <EntryPointSymbol>DriverEntry@8</EntryPointSymbol> + <BaseAddress>0x00010000</BaseAddress> + <FixedBaseAddress> + </FixedBaseAddress> + <RandomizedBaseAddress> + </RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>.\;..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS;..\..\..\include\crt;..\..\..\include\crt\msc;..\..\..\include\reactos\libs\pseh;..\..\..\include\reactos;..\..\..\include;..\..\..\include\ndk</AdditionalIncludeDirectories> + <BasicRuntimeChecks>Default</BasicRuntimeChecks> + <BufferSecurityCheck>false</BufferSecurityCheck> + <IgnoreStandardIncludePath>true</IgnoreStandardIncludePath> + </ClCompile> + <Link> + <SubSystem>Native</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <Driver>Driver</Driver> + <EntryPointSymbol>DriverEntry@8</EntryPointSymbol> + <BaseAddress>0x00010000</BaseAddress> + <FixedBaseAddress> + </FixedBaseAddress> + <RandomizedBaseAddress> + </RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <None Include="CMakeLists.txt" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="fdo.c" /> + <ClCompile Include="hub_fdo.c" /> + <ClCompile Include="misc.c" /> + <ClCompile Include="pdo.c" /> + <ClCompile Include="usbhub.c" /> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="usbhub.rc"> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\include;..\..\..\include\psdk</AdditionalIncludeDirectories> + <IgnoreStandardIncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreStandardIncludePath> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\include;..\..\..\include\psdk</AdditionalIncludeDirectories> + <IgnoreStandardIncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreStandardIncludePath> + </ResourceCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="usbhub.h" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\..\lib\import\HAL\HAL.vcxproj"> + <Project>{19d0d0aa-c065-4101-9f74-e45a87d35ba7}</Project> + </ProjectReference> + <ProjectReference Include="..\..\..\lib\import\ntoskrnl\ntoskrnl.vcxproj"> + <Project>{315ae91a-d723-485c-abd0-1378a1ead8e5}</Project> + </ProjectReference> + <ProjectReference Include="..\usbd\usbd.vcxproj"> + <Project>{17786c00-926d-45ff-a031-3800821afc7a}</Project> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> Added: branches/vs_jc/reactos/drivers/usb/usbhub/usbhub.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/usb/usbhu… ============================================================================== --- branches/vs_jc/reactos/drivers/usb/usbhub/usbhub.vcxproj.filters (added) +++ branches/vs_jc/reactos/drivers/usb/usbhub/usbhub.vcxproj.filters [iso-8859-1] Wed Jul 3 18:15:57 2013 @@ -0,0 +1,47 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> + </Filter> + <Filter Include="Resource Files"> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <None Include="CMakeLists.txt" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="fdo.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="hub_fdo.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="misc.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="pdo.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="usbhub.c"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="usbhub.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="usbhub.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> +</Project>

11 years, 5 months

[jjones] 59416: Add Visual Studio support for usbehci, courtesy of Mr. Wang.

by jjones＠svn.reactos.org

Author: jjones Date: Wed Jul 3 18:12:13 2013 New Revision: 59416 URL: http://svn.reactos.org/svn/reactos?rev=59416&view=rev Log: Add Visual Studio support for usbehci, courtesy of Mr. Wang. Added: branches/vs_jc/reactos/drivers/usb/usbehci/usbehci.vcxproj branches/vs_jc/reactos/drivers/usb/usbehci/usbehci.vcxproj.filters Added: branches/vs_jc/reactos/drivers/usb/usbehci/usbehci.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/usb/usbeh… ============================================================================== --- branches/vs_jc/reactos/drivers/usb/usbehci/usbehci.vcxproj (added) +++ branches/vs_jc/reactos/drivers/usb/usbehci/usbehci.vcxproj [iso-8859-1] Wed Jul 3 18:12:13 2013 @@ -0,0 +1,155 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{5C2B3A8C-7ADA-4A5C-9CD6-D6BFA856D42E}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>usbehci</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + <OutDir>build\x86_32\$(Configuration)\</OutDir> + <IntDir>build\x86_32\$(Configuration)\</IntDir> + <GenerateManifest>false</GenerateManifest> + <TargetExt>.sys</TargetExt> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + <OutDir>build\x86_32\$(Configuration)\</OutDir> + <IntDir>build\x86_32\$(Configuration)\</IntDir> + <GenerateManifest>false</GenerateManifest> + <TargetExt>.sys</TargetExt> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>.\;..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS;..\..\..\include\crt;..\..\..\include\crt\msc;..\..\..\include\reactos;..\..\..\include;..\..\..\include\ndk;..\..\..\lib\drivers\libusb</AdditionalIncludeDirectories> + <BasicRuntimeChecks>Default</BasicRuntimeChecks> + <BufferSecurityCheck>false</BufferSecurityCheck> + <IgnoreStandardIncludePath>true</IgnoreStandardIncludePath> + <RuntimeTypeInfo>false</RuntimeTypeInfo> + </ClCompile> + <Link> + <SubSystem>Native</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalOptions> + </AdditionalOptions> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <Driver>Driver</Driver> + <EntryPointSymbol>DriverEntry@8</EntryPointSymbol> + <BaseAddress>0x00010000</BaseAddress> + <FixedBaseAddress> + </FixedBaseAddress> + <RandomizedBaseAddress> + </RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>.\;..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS;..\..\..\include\crt;..\..\..\include\crt\msc;..\..\..\include\reactos;..\..\..\include;..\..\..\include\ndk;..\..\..\lib\drivers\libusb</AdditionalIncludeDirectories> + <BasicRuntimeChecks>Default</BasicRuntimeChecks> + <BufferSecurityCheck>false</BufferSecurityCheck> + <IgnoreStandardIncludePath>true</IgnoreStandardIncludePath> + <RuntimeTypeInfo>false</RuntimeTypeInfo> + </ClCompile> + <Link> + <SubSystem>Native</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <Driver>Driver</Driver> + <EntryPointSymbol>DriverEntry@8</EntryPointSymbol> + <BaseAddress>0x00010000</BaseAddress> + <FixedBaseAddress> + </FixedBaseAddress> + <RandomizedBaseAddress> + </RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="hardware.h" /> + <ClInclude Include="interfaces.h" /> + <ClInclude Include="usbehci.h" /> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="usbehci.rc"> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\include;..\..\..\include\psdk</AdditionalIncludeDirectories> + <IgnoreStandardIncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreStandardIncludePath> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\include;..\..\..\include\psdk</AdditionalIncludeDirectories> + <IgnoreStandardIncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreStandardIncludePath> + </ResourceCompile> + </ItemGroup> + <ItemGroup> + <ClCompile Include="hardware.cpp" /> + <ClCompile Include="usbehci.cpp" /> + <ClCompile Include="usb_queue.cpp" /> + <ClCompile Include="usb_request.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\..\lib\drivers\libusb\libusb.vcxproj"> + <Project>{721cd5ef-a6f1-432b-a6e0-2f578ab2dd97}</Project> + </ProjectReference> + <ProjectReference Include="..\..\..\lib\import\HAL\HAL.vcxproj"> + <Project>{19d0d0aa-c065-4101-9f74-e45a87d35ba7}</Project> + </ProjectReference> + <ProjectReference Include="..\..\..\lib\import\ntoskrnl\ntoskrnl.vcxproj"> + <Project>{315ae91a-d723-485c-abd0-1378a1ead8e5}</Project> + </ProjectReference> + <ProjectReference Include="..\..\..\lib\sdk\crt\libcntpr\libcntpr.vcxproj"> + <Project>{271006d5-01b2-4f33-8699-9909a41e0707}</Project> + </ProjectReference> + <ProjectReference Include="..\usbd\usbd.vcxproj"> + <Project>{17786c00-926d-45ff-a031-3800821afc7a}</Project> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <None Include="CMakeLists.txt" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> Added: branches/vs_jc/reactos/drivers/usb/usbehci/usbehci.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/usb/usbeh… ============================================================================== --- branches/vs_jc/reactos/drivers/usb/usbehci/usbehci.vcxproj.filters (added) +++ branches/vs_jc/reactos/drivers/usb/usbehci/usbehci.vcxproj.filters [iso-8859-1] Wed Jul 3 18:12:13 2013 @@ -0,0 +1,50 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> + </Filter> + <Filter Include="Resource Files"> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClInclude Include="hardware.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="interfaces.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="usbehci.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="usbehci.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> + </ItemGroup> + <ItemGroup> + <ClCompile Include="hardware.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="usb_queue.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="usb_request.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="usbehci.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <None Include="CMakeLists.txt" /> + </ItemGroup> +</Project>

11 years, 5 months

[jjones] 59415: Add Visual Studio support for usbccgp, courtesy of Mr. Wang.

by jjones＠svn.reactos.org

Author: jjones Date: Wed Jul 3 18:04:11 2013 New Revision: 59415 URL: http://svn.reactos.org/svn/reactos?rev=59415&view=rev Log: Add Visual Studio support for usbccgp, courtesy of Mr. Wang. Added: branches/vs_jc/reactos/drivers/usb/usbccgp/usbccgp.vcxproj branches/vs_jc/reactos/drivers/usb/usbccgp/usbccgp.vcxproj.filters Added: branches/vs_jc/reactos/drivers/usb/usbccgp/usbccgp.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/usb/usbcc… ============================================================================== --- branches/vs_jc/reactos/drivers/usb/usbccgp/usbccgp.vcxproj (added) +++ branches/vs_jc/reactos/drivers/usb/usbccgp/usbccgp.vcxproj [iso-8859-1] Wed Jul 3 18:04:11 2013 @@ -0,0 +1,152 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{5C8B332E-B51E-4DFA-A6EE-1338C1075160}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>usbccgp</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + <OutDir>build\x86_32\$(Configuration)\</OutDir> + <IntDir>build\x86_32\$(Configuration)\</IntDir> + <GenerateManifest>false</GenerateManifest> + <TargetExt>.sys</TargetExt> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + <OutDir>build\x86_32\$(Configuration)\</OutDir> + <IntDir>build\x86_32\$(Configuration)\</IntDir> + <GenerateManifest>false</GenerateManifest> + <TargetExt>.sys</TargetExt> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>.\;..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS;..\..\..\include\crt;..\..\..\include\crt\msc;..\..\..\include\reactos;..\..\..\include;..\..\..\include\ndk</AdditionalIncludeDirectories> + <BasicRuntimeChecks>Default</BasicRuntimeChecks> + <BufferSecurityCheck>false</BufferSecurityCheck> + <IgnoreStandardIncludePath>true</IgnoreStandardIncludePath> + </ClCompile> + <Link> + <SubSystem>Native</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalOptions> + </AdditionalOptions> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <Driver>Driver</Driver> + <EntryPointSymbol>DriverEntry@8</EntryPointSymbol> + <BaseAddress>0x00010000</BaseAddress> + <FixedBaseAddress> + </FixedBaseAddress> + <RandomizedBaseAddress> + </RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <AdditionalDependencies> + </AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>.\;..\..\..\include\psdk;..\..\..\include\ddk;..\..\..\include\reactos\mc\build\x86_32\$(Configuration)\ReactOS;..\..\..\include\crt;..\..\..\include\crt\msc;..\..\..\include\reactos;..\..\..\include;..\..\..\include\ndk</AdditionalIncludeDirectories> + <BasicRuntimeChecks>Default</BasicRuntimeChecks> + <BufferSecurityCheck>false</BufferSecurityCheck> + <IgnoreStandardIncludePath>true</IgnoreStandardIncludePath> + </ClCompile> + <Link> + <SubSystem>Native</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <Driver>Driver</Driver> + <EntryPointSymbol>DriverEntry@8</EntryPointSymbol> + <BaseAddress>0x00010000</BaseAddress> + <FixedBaseAddress> + </FixedBaseAddress> + <RandomizedBaseAddress> + </RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <AdditionalDependencies> + </AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="usbccgp.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="descriptor.c" /> + <ClCompile Include="fdo.c" /> + <ClCompile Include="function.c" /> + <ClCompile Include="misc.c" /> + <ClCompile Include="pdo.c" /> + <ClCompile Include="usbccgp.c" /> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="usbccgp.rc"> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\include;..\..\..\include\psdk</AdditionalIncludeDirectories> + <IgnoreStandardIncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreStandardIncludePath> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\include;..\..\..\include\psdk</AdditionalIncludeDirectories> + <IgnoreStandardIncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreStandardIncludePath> + </ResourceCompile> + </ItemGroup> + <ItemGroup> + <None Include="CMakeLists.txt" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\..\lib\import\HAL\HAL.vcxproj"> + <Project>{19d0d0aa-c065-4101-9f74-e45a87d35ba7}</Project> + </ProjectReference> + <ProjectReference Include="..\..\..\lib\import\ntoskrnl\ntoskrnl.vcxproj"> + <Project>{315ae91a-d723-485c-abd0-1378a1ead8e5}</Project> + </ProjectReference> + <ProjectReference Include="..\usbd\usbd.vcxproj"> + <Project>{17786c00-926d-45ff-a031-3800821afc7a}</Project> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> Added: branches/vs_jc/reactos/drivers/usb/usbccgp/usbccgp.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/usb/usbcc… ============================================================================== --- branches/vs_jc/reactos/drivers/usb/usbccgp/usbccgp.vcxproj.filters (added) +++ branches/vs_jc/reactos/drivers/usb/usbccgp/usbccgp.vcxproj.filters [iso-8859-1] Wed Jul 3 18:04:11 2013 @@ -0,0 +1,50 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> + </Filter> + <Filter Include="Resource Files"> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClInclude Include="usbccgp.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClCompile Include="descriptor.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="fdo.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="function.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="misc.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="pdo.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="usbccgp.c"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="usbccgp.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> + </ItemGroup> + <ItemGroup> + <None Include="CMakeLists.txt" /> + </ItemGroup> +</Project>

11 years, 5 months

[cgutman] 59414: [LWIP] - Don't leak PCBs for connections that were not accepted

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Jul 3 10:22:11 2013 New Revision: 59414 URL: http://svn.reactos.org/svn/reactos?rev=59414&view=rev Log: [LWIP] - Don't leak PCBs for connections that were not accepted Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rostc… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Wed Jul 3 10:22:11 2013 @@ -248,13 +248,15 @@ return ERR_OK; } +/* This function MUST return an error value that is not ERR_ABRT or ERR_OK if the connection + * is not accepted to avoid leaking the new PCB */ static err_t InternalAcceptEventHandler(void *arg, PTCP_PCB newpcb, const err_t err) { /* Make sure the socket didn't get closed */ if (!arg) - return ERR_ABRT; + return ERR_CLSD; TCPAcceptEventHandler(arg, newpcb); @@ -262,7 +264,7 @@ if (newpcb->callback_arg) return ERR_OK; else - return ERR_ABRT; + return ERR_CLSD; } static

11 years, 5 months

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 July 2013