Changeset 540


Ignore:
Timestamp:
Dec 10, 2015, 1:56:13 PM (9 years ago)
Author:
pr
Message:

Prevent REXX from running with WIC in -t, -q and -m modes.
Fix crash in WIC -q mode when package not installed.
Correct several options in WIC relating to WirexxShowMessage handling.

Location:
trunk
Files:
35 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/001/wpi_prog/impl_9rebuild.html

    r474 r540  
    88comes with the WarpIN distribution.
    99
    10 <P>The WarpIN source code resides completely on the Netlabs CVS server so
     10<P>The WarpIN source code resides completely on the Netlabs SVN server so
    1111that several programmers can develop at the same time. In order to find
    12 out more about the Netlabs CVS server, which is used by projects other than
     12out more about the Netlabs SVN server, which is used by projects other than
    1313WarpIN too, please visit
    14 <A HREF="http://nosa.netlabs.org">http://nosa.netlabs.org</A>,
    15 which describes the Netlabs Open Source Archive Client (NOSAC). This
     14<A HREF="http://svn.netlabs.org">http://svn.netlabs.org</A>. This
    1615is used by the WarpIN programmers to concurrently work on the WarpIN
    1716source code.

  • TabularUnified trunk/001/wpi_prog/notices_3comments.html

    r474 r540  
    77<BODY>
    88WarpIN is a joint development effort whose source code resides on the
    9 Netlabs CVS server. See
    10 <A HREF="http://nosa.netlabs.org"><CODE>http://nosa.netlabs.org</CODE></A>
     9Netlabs SVN server. See
     10<A HREF="http://svn.netlabs.org"><CODE>http://svn.netlabs.org</CODE></A>
    1111for details.
    1212

  • TabularUnified trunk/001/wpi_prog_old/impl_9rebuild.html

    r474 r540  
    88comes with the WarpIN distribution.
    99
    10 <P>The WarpIN source code resides completely on the Netlabs CVS server so
     10<P>The WarpIN source code resides completely on the Netlabs SVN server so
    1111that several programmers can develop at the same time. In order to find
    12 out more about the Netlabs CVS server, which is used by projects other than
     12out more about the Netlabs SVN server, which is used by projects other than
    1313WarpIN too, please visit
    14 <A HREF="http://nosa.netlabs.org">http://nosa.netlabs.org</A>,
    15 which describes the Netlabs Open Source Archive Client (NOSAC). This
     14<A HREF="http://svn.netlabs.org">http://svn.netlabs.org</A>. This
    1615is used by the WarpIN programmers to concurrently work on the WarpIN
    1716source code.

  • TabularUnified trunk/001/wpi_prog_old/notices_3comments.html

    r474 r540  
    77<BODY>
    88WarpIN is a joint development effort whose source code resides on the
    9 Netlabs CVS server. See
    10 <A HREF="http://nosa.netlabs.org"><CODE>http://nosa.netlabs.org</CODE></A>
     9Netlabs SVN server. See
     10<A HREF="http://svn.netlabs.org"><CODE>http://svn.netlabs.org</CODE></A>
    1111for details.
    1212

  • TabularUnified trunk/001/wpi_user/notices_3comments.html

    r474 r540  
    77<BODY>
    88WarpIN is a joint development effort whose source code resides on the
    9 Netlabs CVS server. See
    10 <A HREF="http://nosa.netlabs.org"><CODE>http://nosa.netlabs.org</CODE></A>
     9Netlabs SVN server. See
     10<A HREF="http://svn.netlabs.org"><CODE>http://svn.netlabs.org</CODE></A>
    1111for details.
    1212

  • TabularUnified trunk/config.in

    r529 r540  
    2020#
    2121
    22 # CVS DIRECTORY SETUP
     22# SVN DIRECTORY SETUP
    2323# -------------------
    2424
    25 # CVS_WORK_ROOT: the root of your CVS tree
     25# SVN_WORK_ROOT: the root of your SVN tree
    2626# (the parent dir of "warpin" and "xwphelpers")
    27 !ifndef CVS_WORK_ROOT
    28 CVS_WORK_ROOT = D:\projects\R_cvs
     27!ifndef SVN_WORK_ROOT
     28SVN_WORK_ROOT = D:\projects\R_svn
    2929!endif
    3030
    3131# WPIDIR: name of the directory this file resides in
    32 # (subdirectory of CVS_WORK_ROOT).
    33 # This will usually be xworkplace (the CVS repository
     32# (subdirectory of SVN_WORK_ROOT).
     33# This will usually be xworkplace (the SVN repository
    3434# name), unless you chose a different name.
    3535!ifndef WPIDIR
    … …  
    3838
    3939# XWPHELPERSDIR: name of the directory the xwphelpers
    40 # resides in (subdirectory of CVS_WORK_ROOT).
    41 # This will usually be xwphelpers (the CVS repository
     40# resides in (subdirectory of SVN_WORK_ROOT).
     41# This will usually be xwphelpers (the SVN repository
    4242# name), unless you chose a different name.
    4343!ifndef XWPHELPERSDIR

  • TabularUnified trunk/history.txt

    r533 r540  
    11WarpIN Release History
    22======================
     3
     4    V1.0.22 (December 10, 2015)
     5    --------------------------
     6
     7    Fixes:
     8
     9    -- Prevent REXX from running with WIC in -t, -q and -m modes.
     10
     11    -- Fix crash in WIC -q mode when package not installed.
     12
     13    -- Correct several options in WIC relating to WirexxShowMessage handling.
     14
    315
    416    V1.0.21 (November 2, 2015)

  • TabularUnified trunk/include/bl_inf2html.h

    r531 r540  
    2424
    2525#define BLDLEVEL_VENDOR         "OS/2 Netlabs"
    26 #define BLDLEVEL_VERSION        "1.0.21"
     26#define BLDLEVEL_VERSION        "1.0.22"
    2727#define BLDLEVEL_INFO           "to be overridden"
    2828

  • TabularUnified trunk/include/bl_wicpm.h

    r531 r540  
    2323
    2424#define BLDLEVEL_VENDOR         "OS/2 Netlabs"
    25 #define BLDLEVEL_VERSION        "1.0.21"
     25#define BLDLEVEL_VERSION        "1.0.22"
    2626#define BLDLEVEL_INFO           "to be overridden"
    2727

  • TabularUnified trunk/include/bl_wpi2exe.h

    r531 r540  
    2929
    3030#define BLDLEVEL_VENDOR         "OS/2 Netlabs"
    31 #define BLDLEVEL_VERSION        "1.0.21"
     31#define BLDLEVEL_VERSION        "1.0.22"
    3232#define BLDLEVEL_INFO           "to be overridden"
    3333

  • TabularUnified trunk/include/bl_xdoc.h

    r531 r540  
    2323
    2424#define BLDLEVEL_VENDOR         "Ulrich M”ller"
    25 #define BLDLEVEL_VERSION        "1.0.21"
     25#define BLDLEVEL_VERSION        "1.0.22"
    2626#define BLDLEVEL_INFO           "to be overridden"
    2727

  • TabularUnified trunk/include/bldlevel.h

    r531 r540  
    2525
    2626#define BLDLEVEL_VENDOR         "OS/2 Netlabs"
    27 #define BLDLEVEL_VERSION        "1.0.21"
     27#define BLDLEVEL_VERSION        "1.0.22"
    2828#define BLDLEVEL_INFO           "to be overridden"
    2929
    3030#define VERSION_MAJOR           1
    3131#define VERSION_MINOR           0
    32 #define VERSION_REVISION        21
     32#define VERSION_REVISION        22
    3333

  • TabularUnified trunk/include/engine/fe_base.h

    r532 r540  
    165165     *@@changed V0.9.18 (2002-03-03) [umoeller]: renamed from FESystem, made class abstract
    166166     *@@changed V1.0.21 (2015-01-31) [pr]: added LogU()
     167     *@@changed V1.0.22 (2015-11-30) [pr]: added _ignoreRexx
    167168     */
    168169
    … …  
    176177            // database
    177178            HAB                 _habThread1;
     179
     180            BOOL                _ignoreRexx;
    178181
    179182            // the following flags are for when a file exists:

  • TabularUnified trunk/include/helpers/readme.txt

    r148 r540  
    33
    44The helpers code has been completely moved into a new
    5 CVS code repository at Netlabs called "xwphelpers".
     5SVN code repository at Netlabs called "xwphelpers".
    66The code is no longer present in the WarpIN code tree.
    77
    … …  
    1010code from now on.
    1111
    12 

  • TabularUnified trunk/make/setup.in

    r524 r540  
    88# set up PROJECT_BASE_DIR, which is required by other
    99# makefiles (and most importantly by xwphelpers)
    10 PROJECT_BASE_DIR = $(CVS_WORK_ROOT)\$(WPIDIR)
    11 # this should give us something like K:\cvs\xworkplace
     10PROJECT_BASE_DIR = $(SVN_WORK_ROOT)\$(WPIDIR)
     11# this should give us something like K:\svn\xworkplace
    1212
    1313
    … …  
    5555# I have developed over time. Since this code is shared with
    5656# WarpIN and other projects might want to use it too, this
    57 # has been extracted to a separate CVS archive. We assume
    58 # it's in the CVS tree also, so we derive this from $(CVS_WORK_ROOT).
     57# has been extracted to a separate SVN archive. We assume
     58# it's in the SVN tree also, so we derive this from $(SVN_WORK_ROOT).
    5959
    6060!ifndef HELPERS_BASE_DIR
    61 HELPERS_BASE_DIR=$(CVS_WORK_ROOT)\$(XWPHELPERSDIR)
     61HELPERS_BASE_DIR=$(SVN_WORK_ROOT)\$(XWPHELPERSDIR)
    6262!endif
    6363
    … …  
    145145RUN_BLDLEVEL = $(PROJECT_BASE_DIR)\BuildLevel.cmd
    146146
    147 RUN_UNLOCK = $(CVS_WORK_ROOT)\$(XWPDIR)\tools\unlock.exe
    148 
    149 RUN_STRRPL = $(CVS_WORK_ROOT)\$(XWPDIR)\tools\strrpl.exe
     147RUN_UNLOCK = $(SVN_WORK_ROOT)\$(XWPDIR)\tools\unlock.exe
     148
     149RUN_STRRPL = $(SVN_WORK_ROOT)\$(XWPDIR)\tools\strrpl.exe
    150150
    151151COPY = copy

  • TabularUnified trunk/makewpi.cmd

    r531 r540  
    11/**/
    2 wpistem = 'warpin-1-0-21'
    3 filetime = '01:21:00'
     2wpistem = 'warpin-1-0-22'
     3filetime = '01:22:00'
    44wisfile = 'warpin.wis'
    55packages.0 = 2

  • TabularUnified trunk/readme.txt

    r534 r540  
    1 WarpIN 1.0.21 README
     1WarpIN 1.0.22 README
    22(W) Ulrich M”ller, Sept 9, 1999
    3 Last updated November 2, 2015
     3Last updated December 10, 2015
    44
    55
    … …  
    4646===============
    4747
    48     Welcome to WarpIN 1.0.21.
     48    Welcome to WarpIN 1.0.22.
    4949
    5050    WarpIN is becoming more and more popular among OS/2 developers
    … …  
    5353    This README contains information not contained in the WarpIN
    5454    INF files. It is distributed with the binary distributions,
    55     but is also in the root directory of the WarpIN CVS tree.
     55    but is also in the root directory of the WarpIN SVN tree.
    5656    As a result, this file contains information both for WarpIN
    5757    users and WarpIN developers. Please read through all of this
    … …  
    5959    marked and may be skipped.
    6060
    61     WarpIN 1.0.21 is the latest "stable" WarpIN release. This does
     61    WarpIN 1.0.22 is the latest "stable" WarpIN release. This does
    6262    not mean that WarpIN is bug-free, but I consider the current
    6363    code useful enough to be recommended as the standard WarpIN
    … …  
    162162    A bugtracker for WarpIN is available at
    163163
    164             http://xtracker.xworkplace.org
     164            http://xtracker.netlabs.org
    165165
    166166    Please use that beast for reporting bugs instead of posting
    … …  
    172172
    173173    This section describes how to compile WarpIN from the Netlabs
    174     CVS archive. If you're reading this file as part of a binary
     174    SVN archive. If you're reading this file as part of a binary
    175175    release (that is, if you already have WARPIN.EXE), you may skip
    176176    this section. Instead, read the WarpIN INF files and check them
    … …  
    182182    -- Download a sources package.
    183183
    184     -- Check out the sources from the Netlabs CVS server.
    185 
    186     If you check out from Netlabs CVS, starting with V0.9.6, you
     184    -- Check out the sources from the Netlabs SVN server.
     185
     186    If you check out from Netlabs SVN, starting with V0.9.6, you
    187187    will need to check out TWO repositories:
    188188
    … …  
    202202
    203203    To check out the most current WarpIN sources from the Netlabs
    204     CVS server, you have again two options. In both cases, you
    205     will need to download CVS 1.12.13 - the latest is here:
    206 
    207       http://hobbes.nmsu.edu/pub/os2/dev/util/cvs11213.zip
    208 
    209     -- Use the Netlabs Open Source Archive Client (NOSAC), which
    210        creates WPS objects for working on the Netlabs sources.
    211 
    212     -- If you prefer using the command line, use the following
    213        environment for WarpIN:
     204    SVN server, use an up to date SVN client.
    214205
    215206       For the WarpIN repository:
    216         SET CVSROOT=:pserver:guest@cvs.netlabs.org:/netlabs.cvs/warpin
     207         mkdir warpin
     208         svn co https://svn.netlabs.org/repos/warpin/trunk warpin
    217209       For the XWPHelpers repository:
    218         SET CVSROOT=:pserver:guest@cvs.netlabs.org:/netlabs.cvs/xwphelpers
    219        For both:
    220         SET USER=guest
    221 
    222        For each, do a "cvs login" with "readonly" as your password.
    223 
    224        Then run "cvs checkout ." (mind the dot).
    225 
    226        For details about how to use CVS, see
    227 
    228             http://www.xworkplace.org/cvs.html
     210         mkdir xwphelpers
     211         svn co https://svn.netlabs.org/repos/xwphelpers/trunk xwphelpers
    229212
    230213
    … …  
    256239
    257240    c)  As said above, with V0.9.6, the helpers code has been put
    258         into a separate CVS repository at Netlabs. Check out the
     241        into a separate SVN repository at Netlabs. Check out the
    259242        "xwphelpers" repository before compiling, this code is
    260243        needed.
    … …  
    266249             by Andrew Pawel Zabolotny. I have included this in
    267250             the 001\ directory. Documentation is available with
    268              the XWorkplace sources (on Netlabs CVS too) in the
     251             the XWorkplace sources (on Netlabs SVN too) in the
    269252             PROGREF.INF file.
    270253
    … …  
    319302    utility, which should be in the root dir of the xwphelpers.
    320303    You should re-run "nmake dep" only after you have updated the
    321     sources from the CVS server because dependencies might change.
     304    sources from the SVN server because dependencies might change.
    322305
    323306    After that, just run "nmake" to compile.
    … …  
    397380    Of course, you can also read the source files directly, if you
    398381    prefer that.
     382

  • TabularUnified trunk/src/engine/fe_base.cpp

    r532 r540  
    102102 *@@changed V0.9.16 (2001-09-20) [umoeller]: adjusted FNSHOWMESSAGE prototype
    103103 *@@changed V0.9.19 (2002-04-14) [umoeller]: fixed DosQueryCp call
     104 *@@changed V1.0.22 (2015-11-30) [pr]: added _ignoreRexx
    104105 */
    105106
    … …  
    110111    : BSRoot(tFELocals),
    111112      _habThread1(habThread1),
     113      _ignoreRexx(FALSE),
    112114      _paEntities(paEntities),
    113115      _cEntities(cEntities),

  • TabularUnified trunk/src/engine/fe_script_old.cpp

    r532 r540  
    230230 *@@changed V0.9.9 (2001-02-28) [umoeller]: moved this here from fe_archive.cpp
    231231 *@@changed V0.9.18 (2002-03-08) [umoeller]: now using const string& for input
     232 *@@changed V1.0.22 (2015-12-03) [pr]: added _ignoreRexx
    232233 */
    233234
    … …  
    282283        free(pszAttribs);
    283284
    284     if (flREXX & GBLREXX_ATTRIBS)
     285    if ((flREXX & GBLREXX_ATTRIBS) && !_Locals._ignoreRexx)  // V1.0.22
    285286    {
    286287        string strRexxMacroName;
    … …  
    301302    }
    302303
    303     if (flREXX & GBLREXX_BLOCK)
     304    if ((flREXX & GBLREXX_BLOCK) && !_Locals._ignoreRexx)  // V1.0.22
    304305    {
    305306        string strRexxMacroName;
    … …  
    546547 *@@changed V0.9.2 (2000-03-10) [cbo]: added REXX support
    547548 *@@changed V0.9.9 (2001-02-28) [umoeller]: moved this here from fe_archive.cpp
     549 *@@changed V1.0.22 (2015-11-30) [pr]: added _ignoreRexx
    548550 */
    549551
    … …  
    575577    // overwrite the stored code from the first time.
    576578    // V0.9.2 (2000-03-10) [cbo]
    577     ULONG cRexxTags;
    578 
    579     if (cRexxTags = ParseRexxTags(strHeadBlock.c_str()))
    580     {
    581         // there are REXX tags, and caller wants confirmation:
    582         // pass script to GUI in unicode
    583         ustring ustrScript(_pCodec, _strScript);
    584         if (!_Locals.ConfirmRexxAllowed(ustrScript))
    585             // confirmation func returned FALSE;
    586             throw(BSCancelExcpt());
    587     }
    588 
    589     ulrc += cRexxTags;
     579    if (!_Locals._ignoreRexx)
     580    {
     581        ULONG cRexxTags;
     582
     583        if (cRexxTags = ParseRexxTags(strHeadBlock.c_str()))
     584        {
     585            // there are REXX tags, and caller wants confirmation:
     586            // pass script to GUI in unicode
     587            ustring ustrScript(_pCodec, _strScript);
     588            if (!_Locals.ConfirmRexxAllowed(ustrScript))
     589                // confirmation func returned FALSE;
     590                throw(BSCancelExcpt());
     591
     592            ulrc += cRexxTags;
     593        }
     594    }
     595
    590596    // check whether a <MSG>...</MSG> block
    591597    // exists in the HEAD block; if so, display

  • TabularUnified trunk/src/engine/wpirtl_base.def

    r531 r540  
    5656CODE LOADONCALL
    5757
    58 Description '@#OS/2 Netlabs:1.0.21#@ WarpIN runtime library (backend, helpers, C runtime)'
     58Description '@#OS/2 Netlabs:1.0.22#@ WarpIN runtime library (backend, helpers, C runtime)'
    5959
    6060IMPORTS

  • TabularUnified trunk/src/frontend/warpin.def

    r531 r540  
    11NAME WARPIN WINDOWAPI
    22
    3 Description '@#OS/2 Netlabs:1.0.21#@ WarpIN installer'
     3Description '@#OS/2 Netlabs:1.0.22#@ WarpIN installer'
    44
    55CODE  MOVEABLE

  • TabularUnified trunk/src/frontend/warpin_emx.def

    r531 r540  
    77NAME WARPIN WINDOWAPI
    88
    9 Description '@#OS/2 Netlabs:1.0.21#@ WarpIN installer (EMX)'
     9Description '@#OS/2 Netlabs:1.0.22#@ WarpIN installer (EMX)'
    1010
    1111STACKSIZE   65536

  • TabularUnified trunk/src/stub/stub.def

    r531 r540  
    11NAME OS2STUB WINDOWAPI
    22
    3 Description '@#OS/2 Netlabs:1.0.21#@ WarpIN self-extracting archive EXE stub'
     3Description '@#OS/2 Netlabs:1.0.22#@ WarpIN self-extracting archive EXE stub'
    44
    55STACKSIZE   196608

  • TabularUnified trunk/src/stub/stub_emx.def

    r531 r540  
    11NAME STUB WINDOWCOMPAT
    22
    3 Description '@#OS/2 Netlabs:1.0.21#@ WarpIN self-extracting archive EXE stub (EMX)'
     3Description '@#OS/2 Netlabs:1.0.22#@ WarpIN self-extracting archive EXE stub (EMX)'
    44
    55STACKSIZE   196608

  • TabularUnified trunk/src/wic/wic.cpp

    r533 r540  
    16971697                                  "'Test' mode (-t) cannot be combined with other modes.");
    16981698
    1699                         G_fRexxAllowed = TRUE; // V1.0.6 (2005-04-11) [pr]: @@fixes 645
    17001699                        ulNextMode = MODE_TESTSCRIPT;
    17011700                    break;
    … …  
    17061705                                  "'Query' mode (-q) cannot be combined with other modes.");
    17071706
    1708                         G_fRexxAllowed = TRUE; // V1.0.7 (2005-05-19) [pr]
    17091707                        ulNextMode = MODE_QUERY_ARC;
    17101708                    break;
    … …  
    17421740                                  "'Make Repository' mode (-m) cannot be combined with other modes.");
    17431741
    1744                         G_fRexxAllowed = TRUE;
    17451742                        ulNextMode = MODE_MAKE_REPOS;
    17461743                    break;

  • TabularUnified trunk/src/wic/wic.def

    r531 r540  
    11NAME WIC WINDOWCOMPAT
    22
    3 Description '@#OS/2 Netlabs:1.0.21#@ WarpIN archive creator'
     3Description '@#OS/2 Netlabs:1.0.22#@ WarpIN archive creator'
    44
    55STACKSIZE   196608

  • TabularUnified trunk/src/wic/wic_emx.def

    r531 r540  
    11NAME WIC WINDOWCOMPAT
    22
    3 Description '@#OS/2 Netlabs:1.0.21#@ WarpIN archive creator (EMX)'
     3Description '@#OS/2 Netlabs:1.0.22#@ WarpIN archive creator (EMX)'
    44
    55STACKSIZE   196608

  • TabularUnified trunk/src/wic/wic_install.cpp

    r533 r540  
    127127                   pcszMessage);
    128128
    129             // V1.0.7 (2005-05-23) [pr]
    130             switch(fl)
    131             {
    132                 case MSG_WARNING_OK:
     129            // V1.0.22 (2015-12-03) [pr]: fix missing options
     130            switch(fl & 0xF)
     131            {
     132                case MB_OK:
     133                case MB_OKCANCEL:
    133134                    return(MBID_OK);
    134135
    135                 case MSG_ERROR_ABORT:
    136                 case MSG_ERROR_RETRYCANCEL:
     136                case MB_RETRYCANCEL:
     137                case MB_CANCEL:
    137138                    return(MBID_CANCEL);
    138139
    139                 case MSG_ERROR_ABORTRETRYIGNORE:
     140                case MB_ABORTRETRYIGNORE:
    140141                    return(MBID_ABORT);
    141142
    142                 case MSG_CONFIRM_YESNOCANCEL_DEFYES:
    143                 case MSG_CONFIRM_YESNO_DEFYES:
    144                     return(MBID_YES);
     143                case MB_YESNO:
     144                case MB_YESNOCANCEL:
     145                     return(MBID_YES);
     146
     147                case MB_ENTER:
     148                case MB_ENTERCANCEL:
     149                     return(MBID_ENTER);
    145150            }
    146151
    … …  
    604609
    605610/*
    606  *@@ WICInstallEngine2:
     611 *@@ WICNoInstallEngine:
    607612 *
    608613 *@@added V1.0.21 (2015-01-24) [pr]
    … …  
    677682 *@@added V0.9.14 (2001-08-25) [umoeller]
    678683 *@@changed V1.0.12 (2006-09-07) [pr]: added error message
     684 *@@changed V1.0.22 (2015-11-30) [pr]: added _ignoreRexx
    679685 */
    680686
    … …  
    693699        WICLocals   Locals(hab,
    694700                           cThousands); // V1.0.7 (2005-05-22) [pr]
     701
     702        Locals._ignoreRexx = TRUE;
    695703        try
    696704        {
    … …  
    856864 *
    857865 *@@added V0.9.16 (2001-01-23) [umoeller]
     866 *@@changed V1.0.22 (2015-11-30) [pr]: added _ignoreRexx
     867 *@@changed V1.0.22 (2015-12-03) [pr]: fix crash when unknown/not installed
    858868 */
    859869
    … …  
    870880    ustrDatabasePath.assignCP(Locals._pCodecProcess, strWICPath);
    871881
     882    Locals._ignoreRexx = TRUE;
    872883    try
    873884    {
    … …  
    901912                ustring ustrSix;
    902913                pJobThis->_ArcPackage._PckID.CreateStringSix(ustrSix);
    903                 const ustring &ustrTargetPath(pJobThis->_pDBPackageInstalled->QueryTargetPath());
    904914
    905915                CONVERT(Locals._, Six, ustr);
    906                 CONVERT(Locals._, TargetPath, ustr);
    907916                printf("%s\n", pcszSix);
    908917                switch (pJobThis->_ulInstallStatus)
    909918                {
    910                     case INSTALLED_UNKNOWN:
    911                         printf("  Unknown install status\n");
    912                     break;
    913 
    914919                    case INSTALLED_NO:
    915920                        printf("  Not installed\n");
    916921                    break;
    917922
     923                    // V1.0.22 (2015-12-03) [pr]: fix crash when unknown/not installed
    918924                    case INSTALLED_IS_OLDER:
    919                         printf("  Installed version in \"%s\" is older (%s)\n",
    920                                pcszTargetPath,
    921                                pJobThis->_pDBPackageInstalled->_PckID._strVersion.c_str());
    922                     break;
    923 
    924925                    case INSTALLED_IS_NEWER:
    925                         printf("  Installed version in \"%s\" is newer (%s)\n",
    926                                pcszTargetPath,
    927                                pJobThis->_pDBPackageInstalled->_PckID._strVersion.c_str());
    928                     break;
    929 
    930926                    case INSTALLED_IS_SAME:
    931                         printf("  Current version installed in \"%s\"\n",
    932                                pcszTargetPath);
     927                    {
     928                        const ustring &ustrTargetPath(pJobThis->_pDBPackageInstalled->QueryTargetPath());
     929
     930                        CONVERT(Locals._, TargetPath, ustr);
     931                        switch (pJobThis->_ulInstallStatus)
     932                        {
     933                            case INSTALLED_IS_OLDER:
     934                                printf("  Installed version in \"%s\" is older (%s)\n",
     935                                       pcszTargetPath,
     936                                       pJobThis->_pDBPackageInstalled->_PckID._strVersion.c_str());
     937                            break;
     938
     939                            case INSTALLED_IS_NEWER:
     940                                printf("  Installed version in \"%s\" is newer (%s)\n",
     941                                       pcszTargetPath,
     942                                       pJobThis->_pDBPackageInstalled->_PckID._strVersion.c_str());
     943                            break;
     944
     945                            case INSTALLED_IS_SAME:
     946                                printf("  Current version installed in \"%s\"\n",
     947                                       pcszTargetPath);
     948                            break;
     949                        }
     950
     951                        break;
     952                    }
     953
     954                    default:
     955                        printf("  Unknown install status\n");
    933956                    break;
    934957                }
    … …  
    11321155 *
    11331156 *@@added V1.0.21 (2015-01-24) [pr]
     1157 *@@changed V1.0.22 (2015-11-30) [pr]: added _ignoreRexx
    11341158 */
    11351159
    … …  
    11431167    FERexx      *pRexx = NULL;
    11441168
     1169    Locals._ignoreRexx = TRUE;
    11451170    if (!strchr(pcszArchive, '*') && !strchr(pcszArchive, '?'))
    11461171        if (doshQueryDirExist(pcszArchive))

  • TabularUnified trunk/src/wicpm/wicpm.def

    r531 r540  
    66NAME   WICPM WINDOWAPI
    77
    8 Description '@#OS/2 Netlabs:1.0.21#@ WarpIN PM archive builder'
     8Description '@#OS/2 Netlabs:1.0.22#@ WarpIN PM archive builder'
    99PROTMODE
    1010STACKSIZE  40480

  • TabularUnified trunk/tools/inf2html/inf2html.def

    r531 r540  
    11NAME INF2HTML WINDOWCOMPAT
    22
    3 Description '@#OS/2 Netlabs:1.0.21#@ INF to HTML converter'
     3Description '@#OS/2 Netlabs:1.0.22#@ INF to HTML converter'
    44
    55CODE  MOVEABLE

  • TabularUnified trunk/tools/strrpl/makefile

    r372 r540  
    3131.SUFFIXES: .c .obj .dll .idl .h .ih .rc .res
    3232
    33 HELPERS_BASE_DIR = $(CVS_WORK_ROOT)\$(XWPHELPERSDIR)
     33HELPERS_BASE_DIR = $(SVN_WORK_ROOT)\$(XWPHELPERSDIR)
    3434# set up helpers directories
    3535HELPERS = $(HELPERS_BASE_DIR)\src\helpers

  • TabularUnified trunk/tools/xdoc/readme.txt

    r234 r540  
    189189        |        |        |          |          |
    190190        |        |        |          |          +-- description
    191         |        |        |          +- author tag (same as CVS login)
     191        |        |        |          +- author tag (same as SVN login)
    192192        |        |        +-- ISO date (year, month, day)
    193193        |        +-- XWorkplace/WarpIN version number

  • TabularUnified trunk/tools/xdoc/xdoc.def

    r531 r540  
    11NAME XDOC WINDOWCOMPAT
    22
    3 Description '@#Ulrich M”ller:1.0.21#@ xdoc source code documenter'
     3Description '@#Ulrich M”ller:1.0.22#@ xdoc source code documenter'
    44
    55STACKSIZE   60000

  • TabularUnified trunk/warpin.tmf

    r533 r540  
    1616
    1717;
    18 ;      This file Copyright (C) 1999-2014 Ulrich M”ller.
     18;      This file Copyright (C) 1999-2015 Ulrich M”ller.
    1919;      This program is free software; you can redistribute it and/or modify
    2020;      it under the terms of the GNU General Public License as published by
    … …  
    3333This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
    3434
    35 WarpIN is a Netlabs project. The full source code is always available (and constantly being worked on) on the Netlabs CVS server. See http://www.netlabs.org for details.
    36 
    37 We recommend using the Netlabs Open Source Archive Client (NOSAC) to access Netlabs source code. See http://nosa.netlabs.org for details.
     35WarpIN is a Netlabs project. The full source code is always available (and constantly being worked on) on the Netlabs SVN server. See http://svn.netlabs.org for details.
    3836<--WPI0102-->: WarpIN: Error
    3937<--WPI0103-->: WarpIN was unable to find an installation script in the given archive.
    … …  
    200198This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
    201199
    202 WarpIN is a Netlabs project. The full source code is always available (and constantly being worked on) on the Netlabs CVS server. See http://www.netlabs.org for details.
    203 
    204 We recommend using the Netlabs Open Source Archive Client (NOSAC) to access Netlabs source code. See http://nosa.netlabs.org for details.
     200WarpIN is a Netlabs project. The full source code is always available (and constantly being worked on) on the Netlabs SVN server. See http://svn.netlabs.org for details.
    205201
    206202<--WPI0157-->: WarpIN was unable to open the Global Database at "%1": Error %2.

  • TabularUnified trunk/warpin.wis

    r531 r540  
    33<HEAD>
    44<PCK INDEX=30000
    5      PACKAGEID="OS/2 Netlabs\WarpIN\Base\1\0\21"
     5     PACKAGEID="OS/2 Netlabs\WarpIN\Base\1\0\22"
    66     TARGET="?:\WarpIN"
    77     TITLE="WarpIN base"
    … …  
    1212
    1313<PCK INDEX=30001
    14      PACKAGEID="OS/2 Netlabs\WarpIN\Extras\1\0\21"
     14     PACKAGEID="OS/2 Netlabs\WarpIN\Extras\1\0\22"
    1515     TARGET="?:\WarpIN"
    1616     TITLE="WarpIN extras"
Note: See TracChangeset for help on using the changeset viewer.