Merge pull request #730 from zowe/chore/v3-sync

Sync v3 with v2 staging

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to the ZSS package will be documented in this file.
 
 ## `3.0.0`
 - Enhancement: if no `zowe.logDirectory` is defined in config, logging is disabled. (#726)
+- Bugfix: Support cross-memory server parameters longer than 128 characters (#684)
+- Enhancement: Expose new cross-memory server's functions in dynlink (#684)
 
 ## `2.18.0`
 - Change log level for setting default value of 'httpRequestHeapMaxBlocks' to DEBUG instead of INFO.(#719)

c/zis/stubinit.c

@@ -229,6 +229,8 @@
     stubVector[ZIS_STUB_CMGETLOG] = (void*)cmsGetPCLogLevel;
     stubVector[ZIS_STUB_CMGETSTS] = (void*)cmsGetStatus;
     stubVector[ZIS_STUB_CMMKSNAM] = (void*)cmsMakeServerName;
+    stubVector[ZIS_STUB_CMGETPRX] = (void*)cmsGetConfigParmExt;
+    stubVector[ZIS_STUB_CMGETPUX] = (void*)cmsGetConfigParmExtUnchecked;
     stubVector[ZIS_STUB_DYNASTXU] = (void*)createSimpleTextUnit;
     stubVector[ZIS_STUB_DYNASTX2] = (void*)createSimpleTextUnit2;
     stubVector[ZIS_STUB_DYNACTXU] = (void*)createCharTextUnit;

h/zis/zisstubs.h

@@ -20,7 +20,7 @@
    FULL BACKWARD COMPATIBILITY MUST BE MAINTAINED
    */
 
-#define ZIS_STUBS_VERSION 3
+#define ZIS_STUBS_VERSION 4
 
 /*
   How does a user check for compatibility?
@@ -310,6 +310,8 @@
 /* #define ZIS_STUB_CMECSAFR 382 cmsFreeECSAStorage - not in CMS_CLIENT */
 /* #define ZIS_STUB_CMECSAA2 383 cmsAllocateECSAStorage2 - not in CMS_CLIENT */
 /* #define ZIS_STUB_CMECSAF2 384 cmsFreeECSAStorage2 - not in CMS_CLIENT */
+#define ZIS_STUB_CMGETPRX 385 /* cmsGetConfigParmExt */
+#define ZIS_STUB_CMGETPUX 386 /* cmsGetConfigParmExtUnchecked */
 
 /* dynalloc, 400-429 */
 #define ZIS_STUB_DYNASTXU 400 /* createSimpleTextUnit mapped */