[Com0com-cvs] com0com/setup setup.cpp,1.22,1.23

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

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

Modified Files:
	setup.cpp 
Log Message:
Added reload command


Index: setup.cpp
===================================================================
RCS file: /cvsroot/com0com/com0com/setup/setup.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** setup.cpp	27 Nov 2007 16:32:54 -0000	1.22
--- setup.cpp	2 Apr 2008 10:28:24 -0000	1.23
***************
*** 2,6 ****
   * $Id$
   *
!  * Copyright (c) 2006-2007 Vyacheslav Frolov
   *
   * This program is free software; you can redistribute it and/or modify
--- 2,6 ----
   * $Id$
   *
!  * Copyright (c) 2006-2008 Vyacheslav Frolov
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 20,23 ****
--- 20,26 ----
   *
   * $Log$
+  * Revision 1.23  2008/04/02 10:28:24  vfrolov
+  * Added reload command
+  *
   * Revision 1.22  2007/11/27 16:32:54  vfrolov
   * Added disable and enable options
***************
*** 496,500 ****
  }
  ///////////////////////////////////////////////////////////////
! int Update(InfFile &infFile)
  {
    Stack stack;
--- 499,503 ----
  }
  ///////////////////////////////////////////////////////////////
! int Reload(InfFile &infFile, BOOL update)
  {
    Stack stack;
***************
*** 510,518 ****
    }
  
!   BOOL rr;
  
!   if (!UpdateDriverForPlugAndPlayDevices(0, C0C_BUS_DEVICE_ID, infFile.Path(), INSTALLFLAG_FORCE, &rr)) {
!     CleanDevPropertiesStack(infFile, stack, TRUE, &rebootRequired);
!     return 1;
    }
  
--- 513,523 ----
    }
  
!   BOOL rr = FALSE;
  
!   if (update) {
!     if (!UpdateDriverForPlugAndPlayDevices(0, C0C_BUS_DEVICE_ID, infFile.Path(), INSTALLFLAG_FORCE, &rr)) {
!       CleanDevPropertiesStack(infFile, stack, TRUE, &rebootRequired);
!       return 1;
!     }
    }
  
***************
*** 969,972 ****
--- 974,978 ----
      "  preinstall                   - preinstall driver\n"
      "  update                       - update driver\n"
+     "  reload                       - reload driver\n"
      "  uninstall                    - uninstall all ports and the driver\n"
      "  quit                         - quit\n"
***************
*** 1123,1127 ****
    if (argc == 2 && !lstrcmpi(argv[1], "update")) {
      SetTitle(C0C_SETUP_TITLE " (UPDATE)");
!     return Update(infFile);
    }
    else
--- 1129,1138 ----
    if (argc == 2 && !lstrcmpi(argv[1], "update")) {
      SetTitle(C0C_SETUP_TITLE " (UPDATE)");
!     return Reload(infFile, TRUE);
!   }
!   else
!   if (argc == 2 && !lstrcmpi(argv[1], "reload")) {
!     SetTitle(C0C_SETUP_TITLE " (RELOAD)");
!     return Reload(infFile, FALSE);
    }
    else