com0com-cvs

[Vyacheslav F. <vf...@us...>]

Update of /cvsroot/com0com/com0com/setup
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10230

Modified Files:
	setup.def setup.cpp 
Log Message:
Added entry point MainA


Index: setup.def
===================================================================
RCS file: /cvsroot/com0com/com0com/setup/setup.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** setup.def	1 Oct 2007 15:03:19 -0000	1.2
--- setup.def	15 Oct 2007 13:49:04 -0000	1.3
***************
*** 2,4 ****
--- 2,5 ----
  
  EXPORTS
+    MainA
     RunDllA

Index: setup.cpp
===================================================================
RCS file: /cvsroot/com0com/com0com/setup/setup.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** setup.cpp	5 Oct 2007 07:28:26 -0000	1.19
--- setup.cpp	15 Oct 2007 13:49:04 -0000	1.20
***************
*** 20,23 ****
--- 20,26 ----
   *
   * $Log$
+  * Revision 1.20  2007/10/15 13:49:04  vfrolov
+  * Added entry point MainA
+  *
   * Revision 1.19  2007/10/05 07:28:26  vfrolov
   * Added listing pairs w/o PortNum
***************
*** 887,891 ****
  }
  ///////////////////////////////////////////////////////////////
! int Help(const char *pCmdPref)
  {
    SetTitle(C0C_SETUP_TITLE " (HELP)");
--- 890,894 ----
  }
  ///////////////////////////////////////////////////////////////
! int Help(const char *pProgName)
  {
    SetTitle(C0C_SETUP_TITLE " (HELP)");
***************
*** 896,901 ****
    ConsoleWrite(
      "Usage:\n"
!     "  %s [options] <command>\n"
!     , pCmdPref);
    ConsoleWrite(
      "\n"
--- 899,904 ----
    ConsoleWrite(
      "Usage:\n"
!     "  %s%s[options] <command>\n"
!     , pProgName, (pProgName && *pProgName) ? " " : "");
    ConsoleWrite(
      "\n"
***************
*** 943,969 ****
      );
    ConsoleWrite(
!     "  %sinstall - -\n"
!     , pCmdPref);
    ConsoleWrite(
!     "  %sinstall 5 * *\n"
!     , pCmdPref);
    ConsoleWrite(
!     "  %sremove 0\n"
!     , pCmdPref);
    ConsoleWrite(
!     "  %sinstall PortName=COM2 PortName=COM4\n"
!     , pCmdPref);
    ConsoleWrite(
!     "  %sinstall PortName=COM5,EmuBR=yes,EmuOverrun=yes -\n"
!     , pCmdPref);
    ConsoleWrite(
!     "  %schange " C0C_PREF_PORT_NAME_A "0 EmuBR=yes,EmuOverrun=yes\n"
!     , pCmdPref);
    ConsoleWrite(
!     "  %slist\n"
!     , pCmdPref);
    ConsoleWrite(
!     "  %suninstall\n"
!     , pCmdPref);
    ConsoleWrite(
      "\n");
--- 946,972 ----
      );
    ConsoleWrite(
!     "  %s%sinstall - -\n"
!     , pProgName, (pProgName && *pProgName) ? " " : "");
    ConsoleWrite(
!     "  %s%sinstall 5 * *\n"
!     , pProgName, (pProgName && *pProgName) ? " " : "");
    ConsoleWrite(
!     "  %s%sremove 0\n"
!     , pProgName, (pProgName && *pProgName) ? " " : "");
    ConsoleWrite(
!     "  %s%sinstall PortName=COM2 PortName=COM4\n"
!     , pProgName, (pProgName && *pProgName) ? " " : "");
    ConsoleWrite(
!     "  %s%sinstall PortName=COM5,EmuBR=yes,EmuOverrun=yes -\n"
!     , pProgName, (pProgName && *pProgName) ? " " : "");
    ConsoleWrite(
!     "  %s%schange " C0C_PREF_PORT_NAME_A "0 EmuBR=yes,EmuOverrun=yes\n"
!     , pProgName, (pProgName && *pProgName) ? " " : "");
    ConsoleWrite(
!     "  %s%slist\n"
!     , pProgName, (pProgName && *pProgName) ? " " : "");
    ConsoleWrite(
!     "  %s%suninstall\n"
!     , pProgName, (pProgName && *pProgName) ? " " : "");
    ConsoleWrite(
      "\n");
***************
*** 1092,1096 ****
  }
  ///////////////////////////////////////////////////////////////
! int CALLBACK RunDllA(HWND /*hWnd*/, HINSTANCE /*hInst*/, LPSTR pCmdLine, int /*nCmdShow*/)
  {
    SetTitle(C0C_SETUP_TITLE);
--- 1095,1099 ----
  }
  ///////////////////////////////////////////////////////////////
! int CALLBACK MainA(const char *pProgName, const char *pCmdLine)
  {
    SetTitle(C0C_SETUP_TITLE);
***************
*** 1124,1133 ****
    }
  
!   argv[0] = "rundll32 setup,RunDll ";
  
!   int res = Main(argc, argv);
  
!   if (!GetOutputFile())
!     ConsoleWriteRead(cmd, sizeof(cmd)/sizeof(cmd[0]), "\nPress <RETURN> to continue\n");
  
    return res;
--- 1127,1144 ----
    }
  
!   argv[0] = pProgName;
  
!   return Main(argc, argv);
! }
! ///////////////////////////////////////////////////////////////
! int CALLBACK RunDllA(HWND /*hWnd*/, HINSTANCE /*hInst*/, LPSTR pCmdLine, int /*nCmdShow*/)
! {
!   int res = MainA("rundll32 setup,RunDll", pCmdLine);
  
!   if (!GetOutputFile()) {
!     char buf[10];
! 
!     ConsoleWriteRead(buf, sizeof(buf)/sizeof(buf[0]), "\nPress <RETURN> to continue\n");
!   }
  
    return res;