You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2017/11/07 20:34:15 UTC
svn commit: r1814536 - in
/commons/proper/daemon/trunk/src/native/windows/apps/prunmgr: prunmgr.c
prunmgr.h prunmgr.rc
Author: markt
Date: Tue Nov 7 20:34:15 2017
New Revision: 1814536
URL: http://svn.apache.org/viewvc?rev=1814536&view=rev
Log:
Add the Java 9 options to the GUI manager interface and hook it up to the registry
Modified:
commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c
commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.h
commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.rc
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c?rev=1814536&r1=1814535&r2=1814536&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c Tue Nov 7 20:34:15 2017
@@ -428,6 +428,16 @@ BOOL __generalJvmSave(HWND hDlg)
if (!GetDlgItemTextW(hDlg, IDC_PPJMS, szB, SIZ_HUGMAX))
szB[0] = L'\0';
+ l = GetWindowTextLength(GetDlgItem(hDlg, IDC_PPJOPTIONS9));
+ p = apxPoolAlloc(hPool, (l + 2) * sizeof(WCHAR));
+ GetDlgItemTextW(hDlg, IDC_PPJOPTIONS9, p, l + 1);
+ s = apxCRLFToMszW(hPool, p, &l);
+ apxFree(p);
+ apxRegistrySetMzStrW(hRegserv, APXREG_PARAMSOFTWARE,
+ _s_java, L"Options9", s, l);
+ if (!GetDlgItemTextW(hDlg, IDC_PPJMS, szB, SIZ_HUGMAX))
+ szB[0] = L'\0';
+
apxRegistrySetNumW(hRegserv, APXREG_PARAMSOFTWARE, _s_java, L"JvmMs",
apxAtoulW(szB));
if (!GetDlgItemTextW(hDlg, IDC_PPJMX, szB, SIZ_DESMAX))
@@ -1043,6 +1053,13 @@ LRESULT CALLBACK __jvmProperty(HWND hDlg
apxFree(lpBuf);
apxFree(p);
}
+ if ((lpBuf = apxRegistryGetMzStrW(hRegserv, APXREG_PARAMSOFTWARE,
+ _s_java, L"Options9", NULL, NULL)) != NULL) {
+ LPWSTR p = apxMszToCRLFW(hPool, lpBuf);
+ SetDlgItemTextW(hDlg, IDC_PPJOPTIONS9, p);
+ apxFree(lpBuf);
+ apxFree(p);
+ }
v = apxRegistryGetNumberW(hRegserv, APXREG_PARAMSOFTWARE,
_s_java, L"JvmMs");
if (v && v != 0xFFFFFFFF) {
@@ -1100,7 +1117,8 @@ LRESULT CALLBACK __jvmProperty(HWND hDlg
case IDC_PPJJVM:
case IDC_PPJCLASSPATH:
case IDC_PPJOPTIONS:
- case IDC_PPJMX:
+ case IDC_PPJOPTIONS9:
+ case IDC_PPJMX:
case IDC_PPJMS:
case IDC_PPJSS:
if (HIWORD(wParam) == EN_CHANGE) {
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.h
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.h?rev=1814536&r1=1814535&r2=1814536&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.h (original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.h Tue Nov 7 20:34:15 2017
@@ -85,9 +85,10 @@
#define IDC_PPJBJVM 2663
#define IDC_PPJCLASSPATH 2664
#define IDC_PPJOPTIONS 2665
-#define IDC_PPJMS 2666
-#define IDC_PPJMX 2667
-#define IDC_PPJSS 2668
+#define IDC_PPJOPTIONS9 2666
+#define IDC_PPJMS 2667
+#define IDC_PPJMX 2668
+#define IDC_PPJSS 2669
#define IDD_PROPPAGE_START 2680
#define IDC_PPRCLASS 2681
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.rc
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.rc?rev=1814536&r1=1814535&r2=1814536&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.rc (original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.rc Tue Nov 7 20:34:15 2017
@@ -79,7 +79,7 @@ BEGIN
WS_VSCROLL | WS_TABSTOP,47,6,260,80
END
-IDD_PROPPAGE_SGENERAL DIALOGEX 0, 0, 260, 186
+IDD_PROPPAGE_SGENERAL DIALOGEX 0, 0, 260, 243
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
@@ -103,7 +103,7 @@ BEGIN
PUSHBUTTON "&Restart",IDC_PPSGRESTART,193,160,55,14,WS_DISABLED
END
-IDD_PROPPAGE_LOGON DIALOGEX 0, 0, 260, 186
+IDD_PROPPAGE_LOGON DIALOGEX 0, 0, 260, 243
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
@@ -122,7 +122,7 @@ BEGIN
EDITTEXT IDC_PPSLCPASS,86,92,114,12,ES_PASSWORD | ES_AUTOHSCROLL
END
-IDD_PROPPAGE_LOGGING DIALOGEX 0, 0, 260, 186
+IDD_PROPPAGE_LOGGING DIALOGEX 0, 0, 260, 243
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
@@ -130,52 +130,55 @@ BEGIN
COMBOBOX IDC_PPLGLEVEL,70,17,180,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
LTEXT "Log &path: ",IDC_STATIC,10,33,50,8
- EDITTEXT IDC_PPLGPATH,10,45,218,12,ES_AUTOHSCROLL
- PUSHBUTTON "...",IDC_PPLGBPATH,232,44,18,14
- LTEXT "Log prefix: ",IDC_STATIC,10,63,50,8
- EDITTEXT IDC_PPLGPREFIX,70,62,158,12,ES_AUTOHSCROLL
-
- LTEXT "Pid file: ",IDC_STATIC,10,81,50,8
- EDITTEXT IDC_PPLGPIDFILE,70,82,158,12,ES_AUTOHSCROLL
-
- LTEXT "Redirect Stdout: ",IDC_STATIC,10,105,80,8
- EDITTEXT IDC_PPLGSTDOUT,10,117,218,12,ES_AUTOHSCROLL
- PUSHBUTTON "...",IDC_PPLGBSTDOUT,232,116,18,14
- LTEXT "Redirect Stderror: ",IDC_STATIC,10,135,80,8
- EDITTEXT IDC_PPLGSTDERR,10,147,218,12,ES_AUTOHSCROLL
- PUSHBUTTON "...",IDC_PPLGBSTDERR,232,146,18,14
-END
-
-IDD_PROPPAGE_JVM DIALOGEX 0, 0, 260, 186
+EDITTEXT IDC_PPLGPATH,10,45,218,12,ES_AUTOHSCROLL
+PUSHBUTTON "...",IDC_PPLGBPATH,232,44,18,14
+LTEXT "Log prefix: ",IDC_STATIC,10,63,50,8
+EDITTEXT IDC_PPLGPREFIX,70,62,158,12,ES_AUTOHSCROLL
+
+LTEXT "Pid file: ",IDC_STATIC,10,81,50,8
+EDITTEXT IDC_PPLGPIDFILE,70,82,158,12,ES_AUTOHSCROLL
+
+LTEXT "Redirect Stdout: ",IDC_STATIC,10,105,80,8
+EDITTEXT IDC_PPLGSTDOUT,10,117,218,12,ES_AUTOHSCROLL
+PUSHBUTTON "...",IDC_PPLGBSTDOUT,232,116,18,14
+LTEXT "Redirect Stderror: ",IDC_STATIC,10,135,80,8
+EDITTEXT IDC_PPLGSTDERR,10,147,218,12,ES_AUTOHSCROLL
+PUSHBUTTON "...",IDC_PPLGBSTDERR,232,146,18,14
+END
+
+IDD_PROPPAGE_JVM DIALOGEX 0, 0, 260, 243
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- CONTROL " Use default",IDC_PPJAUTO,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,10,8,72,12
- LTEXT "Java Virtual Machine: ",IDC_STATIC,10,23,80,8
- EDITTEXT IDC_PPJJVM,10,35,218,12,ES_AUTOHSCROLL
- PUSHBUTTON "...",IDC_PPJBJVM,232,34,18,14
- LTEXT "Java Classpath:",IDC_STATIC,10,53,66,8
- EDITTEXT IDC_PPJCLASSPATH,10,65,240,12,ES_AUTOHSCROLL
- LTEXT "Java Options:",IDC_STATIC,10,83,66,8
- EDITTEXT IDC_PPJOPTIONS,10,95,240,40,ES_MULTILINE | ES_AUTOHSCROLL |
- ES_WANTRETURN | WS_VSCROLL
- LTEXT "Initial memory pool:",IDC_STATIC,10,140,80,8
- EDITTEXT IDC_PPJMS,90,139,100,12,ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "MB",IDC_STATIC,195,140,25,8
- LTEXT "Maximum memory pool:",IDC_STATIC,10,156,80,8
- EDITTEXT IDC_PPJMX,90,155,100,12,ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "MB",IDC_STATIC,195,156,25,8
- LTEXT "Thread stack size:",IDC_STATIC,10,172,80,8
- EDITTEXT IDC_PPJSS,90,171,100,12,ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "KB",IDC_STATIC,195,172,25,8
+CONTROL " Use default",IDC_PPJAUTO,"Button",BS_AUTOCHECKBOX |
+WS_TABSTOP,10,8,72,12
+LTEXT "Java Virtual Machine: ",IDC_STATIC,10,23,80,8
+EDITTEXT IDC_PPJJVM,10,35,218,12,ES_AUTOHSCROLL
+PUSHBUTTON "...",IDC_PPJBJVM,232,34,18,14
+LTEXT "Java Classpath:",IDC_STATIC,10,53,66,8
+EDITTEXT IDC_PPJCLASSPATH,10,65,240,12,ES_AUTOHSCROLL
+LTEXT "Java Options:",IDC_STATIC,10,83,66,8
+EDITTEXT IDC_PPJOPTIONS,10,95,240,40,ES_MULTILINE | ES_AUTOHSCROLL |
+ES_WANTRETURN | WS_VSCROLL
+LTEXT "Java 9 Options:",IDC_STATIC,10,140,66,8
+EDITTEXT IDC_PPJOPTIONS9,10,152,240,40,ES_MULTILINE | ES_AUTOHSCROLL |
+ES_WANTRETURN | WS_VSCROLL
+LTEXT "Initial memory pool:",IDC_STATIC,10,197,80,8
+EDITTEXT IDC_PPJMS,90,196,100,12,ES_AUTOHSCROLL | ES_NUMBER
+LTEXT "MB",IDC_STATIC,195,197,25,8
+LTEXT "Maximum memory pool:",IDC_STATIC,10,213,80,8
+EDITTEXT IDC_PPJMX,90,212,100,12,ES_AUTOHSCROLL | ES_NUMBER
+LTEXT "MB",IDC_STATIC,195,213,25,8
+LTEXT "Thread stack size:",IDC_STATIC,10,229,80,8
+EDITTEXT IDC_PPJSS,90,228,100,12,ES_AUTOHSCROLL | ES_NUMBER
+LTEXT "KB",IDC_STATIC,195,229,25,8
END
-IDD_PROPPAGE_START DIALOGEX 0, 0, 260, 186
+IDD_PROPPAGE_START DIALOGEX 0, 0, 260, 243
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- LTEXT "&Class: ",IDC_STATIC,10,8,50,8
+LTEXT "&Class: ",IDC_STATIC,10,8,50,8
EDITTEXT IDC_PPRCLASS,10,20,240,12,ES_AUTOHSCROLL
LTEXT "Image: ",IDC_STATIC,10,38,80,8
EDITTEXT IDC_PPRIMAGE,10,50,218,12,ES_AUTOHSCROLL | WS_DISABLED
@@ -196,7 +199,7 @@ BEGIN
WS_TABSTOP
END
-IDD_PROPPAGE_STOP DIALOGEX 0, 0, 260, 186
+IDD_PROPPAGE_STOP DIALOGEX 0, 0, 260, 243
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN