Changeset 521 for trunk


Ignore:
Timestamp:
Jul 31, 2016, 9:04:33 PM (5 years ago)
Author:
Gregg Young
Message:

Most of the exceptq changes Ticket [272]

Location:
trunk/Lucide/gui
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Lucide/gui/docViewer.cpp

    r495 r521  
    5353#include "cpconv.h"
    5454
    55 
     55#define INCL_EXCEPTQ_CLASS
     56#define INCL_LOADEXCEPTQ
     57#include "exceptq.h"
    5658// ASYNCH_RENDER_ENABLE, normally must be defined
    5759#define ASYNCH_RENDER_ENABLE
    … …  
    694696void DocumentViewer::searchthread( void *p )
    695697{
     698    ScopedExceptqLoader sel;
    696699    DosSetPriority( PRTYS_THREAD, PRTYC_REGULAR, PRTYD_MINIMUM, 0 );
    697700    DocumentViewer *_this = (DocumentViewer *)p;
    … …  
    10351038void DocumentViewer::drawthread( void *p )
    10361039{
     1040    ScopedExceptqLoader sel;
     1041
    10371042    DosSetPriority( PRTYS_THREAD, PRTYC_REGULAR, PRTYD_MINIMUM, 0 );
    10381043    DocumentViewer *_this = (DocumentViewer *)p;

  • trunk/Lucide/gui/lcd.c

    r469 r521  
    3939#include <process.h>
    4040
     41#define INCL_LOADEXCEPTQ
     42#include "exceptq.h"
    4143//
    4244// Lcd.exe sets BEGINLIBPATH to directory where Lucide resides
    … …  
    5355    HMODULE hmod = NULLHANDLE;
    5456    APIRET rc = 0;
     57    EXCEPTIONREGISTRATIONRECORD exRegRec;
    5558
    5659#ifdef __TEST__
    5760    PPIB pib;
    5861    PTIB tib;
     62    LoadExceptq(&exRegRec, "I", "Lucide "VERSION);
    5963    DosGetInfoBlocks(&tib, &pib);
    6064    pib->pib_ultype = 3;
     65#else
     66    LoadExceptq(&exRegRec, "I", "Lucide "VERSION);
    6167#endif
    6268
    … …  
    6571    if ( ( last_slash = strrchr( buf, '\\' ) ) == NULL )
    6672    {
     73        UninstallExceptq(&exRegRec);
    6774        return 1;
    6875    }
    … …  
    7784    DosSetExtLIBPATH( buf, BEGIN_LIBPATH );
    7885
    79     rc = DosLoadModule( buf, sizeof( buf ), "Lucide", &hmod );
     86    rc = DosLoadModule( buf, sizeof( buf ), "Lucide1", &hmod );
    8087    if ( rc == 0 )
    8188    {
    … …  
    98105
    99106        if ( buf[0] == 0 ) { // No modulename
    100             snprintf( msg, sizeof( msg ), "Error loading Lucide.dll: SYS%04u", rc );
     107            snprintf( msg, sizeof( msg ), "Error loading Lucide1.dll: SYS%04u", rc );
    101108        }
    102109        else {
    103110            snprintf( msg, sizeof( msg ),
    104                       "Error loading Lucide.dll: can't find module '%s' (SYS%04u)",
     111                      "Error loading Lucide1.dll: can't find module '%s' (SYS%04u)",
    105112                      buf, rc );
    106113        }
    … …  
    110117        WinTerminate( hab );
    111118    }
    112 
     119    UninstallExceptq(&exRegRec);
    113120    return result;
    114121}

  • trunk/Lucide/gui/lucide.cpp

    r506 r521  
    7777#include "messages.h"
    7878
     79#define INCL_EXCEPTQ_CLASS
     80#define INCL_LOADEXCEPTQ
     81#include "exceptq.h"
    7982
    8083#define ID_SPLITTER 1
    … …  
    477480void Lucide::loadthread( void* )
    478481{
     482    ScopedExceptqLoader sel;
    479483    HAB thab = WinInitialize( 0 );
    480484    HMQ thmq = WinCreateMsgQueue( thab, 0 );
    … …  
    16321636__declspec(dllexport) _System APIRET APIENTRY LucideMain( int argc, char *argv[] )
    16331637{
     1638    ScopedExceptqLoader sel;
    16341639    HMQ   hmq;
    16351640    QMSG  qmsg;
     1641
    16361642    hab = WinInitialize( 0 );
    16371643    hmq = WinCreateMsgQueue( hab, 0 );

  • trunk/Lucide/gui/pipemon.cpp

    r399 r521  
    4141#include "Lucide_res.h"
    4242
    43 
     43#define INCL_EXCEPTQ_CLASS
     44#define INCL_LOADEXCEPTQ
     45#include "exceptq.h"
    4446static const char *pipeName    = "\\PIPE\\LUCIDE";
    4547
    … …  
    5759static void pipeMonitor( void *p )
    5860{
     61    ScopedExceptqLoader sel;
    5962    HWND hWndFrame = (HWND)p;
    6063

  • trunk/Lucide/gui/pluginman.cpp

    r367 r521  
    7373
    7474    // enum plugins, (LU*.DLL) except for LUDOC.DLL, which is 'null' plugin
    75     // and Lucide.dll, which is not a plugin.
     75    // and Lucide1.dll, which is not a plugin.
    7676    find_t ffblk;
    7777    unsigned done = _dos_findfirst( buffer, _A_RDONLY | _A_NORMAL, &ffblk );

  • trunk/Lucide/gui/print.cpp

    r367 r521  
    5151#include "messages.h"
    5252
     53#define INCL_EXCEPTQ_CLASS
     54#define INCL_LOADEXCEPTQ
     55#include "exceptq.h"
    5356
    5457#ifndef DEVESC_ERROR
    … …  
    472475void LucidePrinting::printthread( void *p )
    473476{
     477    ScopedExceptqLoader();
    474478    DosSetPriority( PRTYS_THREAD, PRTYC_IDLETIME, PRTYD_MAXIMUM, 0 );
    475479    LucidePrinting *_this = (LucidePrinting *)p;
Note: See TracChangeset for help on using the changeset viewer.