Changeset 6588


Ignore:
Timestamp:
Aug 25, 2001, 3:37:44 PM (24 years ago)
Author:
sandervl
Message:

updates for custombuild

Location:
trunk/src/riched32
Files:
3 added
2 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/src/riched32/initterm.cpp

    r5135 r6588  
    3434#include <odinlx.h>
    3535#include <misc.h>       /*PLF Wed  98-03-18 23:18:15*/
    36 #include <twain.h>
    3736#include <initdll.h>
    3837
    39 extern "C" {
    40 //Win32 resource table (produced by wrc)
    41 extern DWORD _Resource_PEResTab;
    42 
    43 BOOL WINAPI RICHED32_LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
    44 }
    45 static HMODULE dllHandle = 0;
    46 
    47 //******************************************************************************
    48 //******************************************************************************
    49 BOOL WINAPI LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
    50 {
    51  BOOL ret;
    52 
    53    switch (fdwReason)
    54    {
    55    case DLL_PROCESS_ATTACH:
    56         return RICHED32_LibMain(hinstDLL, fdwReason, fImpLoad);
    57 
    58    case DLL_THREAD_ATTACH:
    59    case DLL_THREAD_DETACH:
    60         return RICHED32_LibMain(hinstDLL, fdwReason, fImpLoad);
    61 
    62    case DLL_PROCESS_DETACH:
    63         ret = RICHED32_LibMain(hinstDLL, fdwReason, fImpLoad);
    64         ctordtorTerm();
    65         return ret;
    66    }
    67    return FALSE;
    68 }
    6938/****************************************************************************/
    7039/* _DLL_InitTerm is the function that gets called by the operating system   */
    … …  
    7544/* calling this function.                                                   */
    7645/****************************************************************************/
    77 unsigned long SYSTEM _DLL_InitTerm(unsigned long hModule, unsigned long
    78                                    ulFlag)
     46ULONG DLLENTRYPOINT_CCONV DLLENTRYPOINT_NAME(ULONG hModule, ULONG ulFlag)
    7947{
    80    size_t i;
    8148   APIRET rc;
    82    ULONG  twaintype;
    8349
    8450   /*-------------------------------------------------------------------------*/
    … …  
    9460         CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
    9561
    96          dllHandle = RegisterLxDll(hModule, LibMain, (PVOID)&_Resource_PEResTab);
    97          if(dllHandle == 0)
    98                 return 0UL;
     62         return inittermRiched32(hModule, ulFlag);
    9963
    100          break;
    10164      case 1 :
    102          if(dllHandle) {
    103                 UnregisterLxDll(dllHandle);
    104          }
    105          break;
     65         return inittermRiched32(hModule, ulFlag);
    10666
    10767      default  :

  • TabularUnified trunk/src/riched32/makefile

    r4719 r6588  
    1 # $Id: makefile,v 1.4 2000-12-02 23:57:35 bird Exp $
     1# $Id: makefile,v 1.5 2001-08-25 13:37:12 sandervl Exp $
    22
    33#
    … …  
    2626$(OBJDIR)\reader.obj \
    2727$(OBJDIR)\charlist.obj \
    28 $(OBJDIR)\text-writer.obj \
     28$(OBJDIR)\textwriter.obj \
    2929$(OBJDIR)\richedit.obj \
    3030$(OBJDIR)\initterm.obj \
     31$(OBJDIR)\initriched32.obj \
    3132$(OBJDIR)\riched32rsrc.obj
    3233
Note: See TracChangeset for help on using the changeset viewer.