cmd.exe: Add basic support for && and (...) syntax.

programs/cmd/Cs.rc

@@ -267,4 +267,5 @@ Zadejte HELP <pkaz> pro podrobnj informace o nkterm z ve uvedench pk
   WCMD_ANYKEY,"Press Return key to continue: "
   WCMD_CONSTITLE,"Wine Command Prompt"
   WCMD_VERSION,"CMD Version %s\n\n"
+  WCMD_MOREPROMPT, "More? "
 }

programs/cmd/De.rc

@@ -291,4 +291,5 @@ obigen Befehle erhalten.\n"
   WCMD_ANYKEY,"Press Return key to continue: "
   WCMD_CONSTITLE,"Wine Command Prompt"
   WCMD_VERSION,"CMD Version %s\n\n"
+  WCMD_MOREPROMPT, "More? "
 }

programs/cmd/En.rc

@@ -271,4 +271,5 @@ Enter HELP <command> for further information on any of the above commands\n"
   WCMD_ANYKEY,"Press Return key to continue: "
   WCMD_CONSTITLE,"Wine Command Prompt"
   WCMD_VERSION,"CMD Version %s\n\n"
+  WCMD_MOREPROMPT, "More? "
 }

programs/cmd/Es.rc

@@ -288,4 +288,5 @@ Introduzca HELP <comando> para ms informacin sobre cualquiera de los comandos\
   WCMD_ANYKEY,"Press Return key to continue: "
   WCMD_CONSTITLE,"Wine Command Prompt"
   WCMD_VERSION,"CMD Version %s\n\n"
+  WCMD_MOREPROMPT, "More? "
 }

programs/cmd/Fr.rc

@@ -261,4 +261,5 @@ Entrez HELP <commande> pour plus d'informations sur les commandes ci-dessus\n"
   WCMD_ANYKEY,"Press Return key to continue: "
   WCMD_CONSTITLE,"Wine Command Prompt"
   WCMD_VERSION,"CMD Version %s\n\n"
+  WCMD_MOREPROMPT, "More? "
 }

programs/cmd/Ja.rc

@@ -265,4 +265,5 @@ EXIT\t\tCMDI\n\n\
   WCMD_ANYKEY,"Press Return key to continue: "
   WCMD_CONSTITLE,"Wine Command Prompt"
   WCMD_VERSION,"CMD Version %s\n\n"
+  WCMD_MOREPROMPT, "More? "
 }

programs/cmd/Ko.rc

@@ -263,4 +263,5 @@ HELP <명령>을 치면 그 명령의 상세한 정보를 보여줌\n"
   WCMD_ANYKEY,"Press Return key to continue: "
   WCMD_CONSTITLE,"Wine Command Prompt"
   WCMD_VERSION,"CMD Version %s\n\n"
+  WCMD_MOREPROMPT, "More? "
 }

programs/cmd/Nl.rc

@@ -264,4 +264,5 @@ type HELP <opdracht> voor meer informatie over bovengenoemde opdrachten\n"
   WCMD_ANYKEY,"Press Return key to continue: "
   WCMD_CONSTITLE,"Wine Command Prompt"
   WCMD_VERSION,"CMD Version %s\n\n"
+  WCMD_MOREPROMPT, "More? "
 }

programs/cmd/No.rc

@@ -269,4 +269,5 @@ Skriv HELP <kommando> for mer informasjon om kommandoene ovenfor\n"
   WCMD_ANYKEY,"Press Return key to continue: "
   WCMD_CONSTITLE,"Wine Command Prompt"
   WCMD_VERSION,"CMD Version %s\n\n"
+  WCMD_MOREPROMPT, "More? "
 }

programs/cmd/Pl.rc

@@ -266,4 +266,5 @@ Wpisz HELP <komenda> dla dokadniejszych informacji o komendzie\n"
   WCMD_ANYKEY,"Press Return key to continue: "
   WCMD_CONSTITLE,"Wine Command Prompt"
   WCMD_VERSION,"CMD Version %s\n\n"
+  WCMD_MOREPROMPT, "More? "
 }

programs/cmd/Pt.rc

@@ -474,4 +474,5 @@ Digite HELP <comando> para mais informaes sobre alguns dos comandos acima\n"
   WCMD_ANYKEY,"Press Return key to continue: "
   WCMD_CONSTITLE,"Wine Command Prompt"
   WCMD_VERSION,"CMD Version %s\n\n"
+  WCMD_MOREPROMPT, "More? "
 }

programs/cmd/Ru.rc

@@ -277,4 +277,5 @@ EXIT\t\t  CMD\n\n\
   WCMD_ANYKEY,"   : "
   WCMD_CONSTITLE,"   Wine"
   WCMD_VERSION," CMD %s\n\n"
+  WCMD_MOREPROMPT, "More? "
 }

programs/cmd/Si.rc

@@ -263,4 +263,5 @@ Enter HELP <command> for further information on any of the above commands\n"
   WCMD_ANYKEY,"Press Return key to continue: "
   WCMD_CONSTITLE,"Wine Command Prompt"
   WCMD_VERSION,"CMD Version %s\n\n"
+  WCMD_MOREPROMPT, "More? "
 }

programs/cmd/Tr.rc

@@ -265,4 +265,5 @@ Yukardaki komutlar hakknda daha fazla bilgi iin HELP <komut> girin\n"
   WCMD_ANYKEY,"Press Return key to continue: "
   WCMD_CONSTITLE,"Wine Command Prompt"
   WCMD_VERSION,"CMD Version %s\n\n"
+  WCMD_MOREPROMPT, "More? "
 }

programs/cmd/batch.c

@@ -105,15 +105,13 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN
  * 	the rest are handled by the main command processor.
  */
 
-  while (context -> skip_rest == FALSE && WCMD_fgets (string, sizeof(string), h)) {
-      if (strlenW(string) == MAXSTRING -1) {
-          WCMD_output_asis( WCMD_LoadMessage(WCMD_TRUNCATEDLINE));
-          WCMD_output_asis( string);
-          WCMD_output_asis( newline);
-      }
-      if (string[0] != ':') {                      /* Skip over labels */
-          WCMD_process_command (string);
-      }
+  while (context -> skip_rest == FALSE) {
+      CMD_LIST *toExecute = NULL;         /* Commands left to be executed */
+      if (WCMD_ReadAndParseLine(NULL, &toExecute, h) == NULL)
+        break;
+      WCMD_process_commands(toExecute);
+      WCMD_free_commands(toExecute);
+      toExecute = NULL;
   }
   CloseHandle (h);
 

programs/cmd/wcmd.h

@@ -92,6 +92,19 @@ WCHAR *WCMD_strdupW(WCHAR *input);
 BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars,
                    LPDWORD charsRead, const LPOVERLAPPED unused);
 
+/*	Data structure to hold commands to be processed */
+
+typedef struct _CMD_LIST {
+  WCHAR              *command;     /* Command string to execute                */
+  struct _CMD_LIST   *nextcommand; /* Next command string to execute           */
+  BOOL                isAmphersand;/* Whether follows &&                       */
+  int                 bracketDepth;/* How deep bracketing have we got to       */
+} CMD_LIST;
+
+WCHAR *WCMD_ReadAndParseLine(WCHAR *initialcmd, CMD_LIST **output, HANDLE readFrom);
+void   WCMD_process_commands(CMD_LIST *thisCmd);
+void   WCMD_free_commands(CMD_LIST *cmds);
+
 /*	Data structure to hold context when executing batch files */
 
 typedef struct {
@@ -100,6 +113,7 @@ typedef struct {
   int shift_count[10];	/* Offset in terms of shifts for %0 - %9 */
   void *prev_context;	/* Pointer to the previous context block */
   BOOL  skip_rest;      /* Skip the rest of the batch program and exit */
+  CMD_LIST *toExecute;  /* Commands left to be executed */
 } BATCH_CONTEXT;
 
 /* Data structure to save setlocal and pushd information */
@@ -223,7 +237,7 @@ extern WCHAR version_string[];
 #define WCMD_ANYKEY           1031
 #define WCMD_CONSTITLE        1032
 #define WCMD_VERSION          1033
-
+#define WCMD_MOREPROMPT       1034
 
 /* msdn specified max for Win XP */
 #define MAXSTRING 8192