httpd-win32-msi-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-win32-msi/src real_features.c
Date Wed, 28 Feb 2001 06:47:13 GMT
wrowe       01/02/27 22:47:13

  Modified:    src      real_features.c
  Log:
    A few cleanups ... still no success displaying the message box.
  
  Revision  Changes    Path
  1.4       +4 -3      httpd-win32-msi/src/real_features.c
  
  Index: real_features.c
  ===================================================================
  RCS file: /home/cvs/httpd-win32-msi/src/real_features.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- real_features.c	2001/02/28 04:25:53	1.3
  +++ real_features.c	2001/02/28 06:47:13	1.4
  @@ -79,8 +79,7 @@
       MsiRecordSetString(hrec, 0, NULL);
       MsiRecordSetInteger(hrec, 1, errcode);
       MsiRecordSetString(hrec, 2, szPass);
  -    rv = MsiProcessMessage(hInstall, INSTALLMESSAGE_WARNING
  -                                   + MB_OKCANCEL, hrec);
  +    rv = MsiProcessMessage(hInstall, INSTALLMESSAGE_ERROR|MB_OKCANCEL|MB_ICONSTOP, hrec);
       MsiCloseHandle(hrec);
       return rv == IDOK ? ERROR_SUCCESS : ERROR_INSTALL_USEREXIT;
   }
  @@ -249,8 +248,10 @@
       }
       /* Validate the Email addr contains the appropriate '@' sign
        */
  -    if (!strchr(dstr, '@'))
  +    if (!strchr(dstr, '@')) {
  +        MsiSetPropertyA(hInstall, "FIELDINVALID", "SERVERADMIN");
           return warn_user(hInstall, 20033, ch);;
  +    }
   
       /* Reset to assure we can leave the Server Information panel
        */
  
  
  

Mime
View raw message