commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-commons/daemon/src/native/nt/procrun procrun.c procrun.h procrun.rc
Date Thu, 02 Oct 2003 07:22:16 GMT
mturk       2003/10/02 00:22:16

  Modified:    daemon/src/native/nt/procrun procrun.c procrun.h procrun.rc
  Log:
  Add the Registry key for selecting the console display type.
  
  Revision  Changes    Path
  1.7       +11 -3     jakarta-commons/daemon/src/native/nt/procrun/procrun.c
  
  Index: procrun.c
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/daemon/src/native/nt/procrun/procrun.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- procrun.c	1 Oct 2003 18:06:20 -0000	1.6
  +++ procrun.c	2 Oct 2003 07:22:16 -0000	1.7
  @@ -111,7 +111,7 @@
   static int g_is_windows_nt = 0;
   
   #ifdef PROCRUN_WINAPP
  -
  +
   
   #endif
   
  @@ -998,7 +998,15 @@
               sscanf(kval, "%d %d %d %d", &ac_winpos.left, &ac_winpos.right,
                                           &ac_winpos.top, &ac_winpos.bottom);
           }
  +
  +        klen = MAX_PATH;
  +        if ((err = RegQueryValueEx(key, PROCRUN_PARAMS_USELVIEW, NULL, NULL, 
  +                                   (unsigned char *)kval,
  +                                   &klen)) == ERROR_SUCCESS) {
  +            ac_use_lview = atoi(kval);
  +        }
   #endif
  +        klen = MAX_PATH;
           if ((err = RegQueryValueEx(key, PROCRUN_PARAMS_ENVIRONMENT, NULL, NULL, 
                                      NULL,
                                      &klen)) == ERROR_SUCCESS) {
  @@ -1395,7 +1403,7 @@
                   if (ch == '\n' || n >= MAX_PATH) {
                       buff[n] = '\0';
                       DBPRINTF1("RD %s", buff);
  -                    ac_add_list_string(buff, n);
  +                    ac_add_list_string(buff, n, 0);
                       n  = 0;
                   } 
                   else if (ch == '\t' && n < (MAX_PATH - 4)) {
  @@ -1440,7 +1448,7 @@
                   if (ch == '\n' || n >= MAX_PATH) {
                       buff[n] = '\0';
                       DBPRINTF1("RD %s", buff);
  -                    ac_add_list_string(buff, n);
  +                    ac_add_list_string(buff, n, 1);
                       n  = 0;
                   } 
                   else if (ch == '\t' && n < (MAX_PATH - 4)) {
  
  
  
  1.6       +4 -3      jakarta-commons/daemon/src/native/nt/procrun/procrun.h
  
  Index: procrun.h
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/daemon/src/native/nt/procrun/procrun.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- procrun.h	1 Oct 2003 18:06:20 -0000	1.5
  +++ procrun.h	2 Oct 2003 07:22:16 -0000	1.6
  @@ -213,6 +213,7 @@
   #define PROCRUN_PARAMS_WINPOS       "WindowPosition"
   #define PROCRUN_PARAMS_WINCLR       "WindowColor"
   #define PROCRUN_PARAMS_WINBACK      "WindowBackground"
  +#define PROCRUN_PARAMS_USELVIEW     "WindowListView"
   
   
   #define PROCRUN_DEFAULT_CLASS       "Main"
  @@ -359,13 +360,14 @@
   
   extern DWORD WINAPI gui_thread(LPVOID param);
   
  -extern void ac_add_list_string(const char *str, int len);
  +extern void ac_add_list_string(const char *str, int len, int from);
   extern int  ac_use_try;
   extern int  ac_use_dlg;
   extern int  ac_use_show;
   extern int  ac_use_props;
   extern int  ac_use_lview;
   extern int  ac_lview_current;
  +extern int  ac_splash_timeout;
   
   extern  RECT            ac_winpos;
   extern  HINSTANCE       ac_instance;
  @@ -378,13 +380,12 @@
   void    ac_show_try_icon(HWND hwnd, DWORD message, const char *tip, int stop);
   void    ac_center_window(HWND hwnd);
   
  -typedef void (*lv_parse_cb_t)(const char *data);
  +typedef void (*lv_parse_cb_t)(const char *data, int from);
   
   extern lv_parse_cb_t    lv_parser;
   
   #if defined(PROCRUN_EXTENDED)
   
  -void acx_parse_list_string(const char *str);
   void acx_init_extended();
   
   
  
  
  
  1.5       +2 -2      jakarta-commons/daemon/src/native/nt/procrun/procrun.rc
  
  Index: procrun.rc
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/daemon/src/native/nt/procrun/procrun.rc,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- procrun.rc	1 Oct 2003 18:06:20 -0000	1.4
  +++ procrun.rc	2 Oct 2003 07:22:16 -0000	1.5
  @@ -139,7 +139,7 @@
       CONTROL         "",IDC_RICHEDIT21,"RichEdit20A",ES_MULTILINE | 
                       ES_READONLY | WS_BORDER | WS_VSCROLL,0,31,335,115
       CONTROL         117,IDC_STATIC,"Static",SS_BITMAP,0,0,337,30
  -    LTEXT           "Apache Process Runner ver. 1.0.0",IDC_STATIC,2,150,270,12
  +    LTEXT           "Apache Process Runner ver. 1.1.0",IDC_STATIC,2,150,270,12
   END
   #else
   IDD_ABOUTBOX DIALOGEX 0, 0, 337, 167
  @@ -150,7 +150,7 @@
       DEFPUSHBUTTON   "&OK",IDOK,285,150,50,14
       CONTROL         "",IDC_RICHEDIT21,"RichEdit20A",ES_MULTILINE | 
                       ES_READONLY | WS_BORDER | WS_VSCROLL,0,0,335,145
  -    LTEXT           "Apache Process Runner 1.0.1",IDC_STATIC,8,150,270,12
  +    LTEXT           "Apache Process Runner 1.1.0",IDC_STATIC,8,150,270,12
   END
   #endif
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message