Changeset 5974 for trunk/src


Ignore:
Timestamp:
Jun 12, 2001, 7:03:34 PM (24 years ago)
Author:
sandervl
Message:

LoadLibrary change: refuse to load non-Odin OS/2 dlls

Location:
trunk/src/kernel32
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kernel32/misc.cpp

    r5939 r5974  
    1 /* $Id: misc.cpp,v 1.37 2001-06-09 19:46:00 sandervl Exp $ */
     1/* $Id: misc.cpp,v 1.38 2001-06-12 17:03:33 sandervl Exp $ */
    22
    33/*
    … …  
    251251
    252252static BOOL fDisableThread[5] = {0};
     253static BOOL fFlushLines = FALSE;
    253254
    254255//#define CHECK_ODINHEAP
    … …  
    279280    init = TRUE;
    280281
     282    if(getenv("WIN32LOG_FLUSHLINES")) {
     283        fFlushLines = TRUE;
     284    }
    281285#ifdef DEFAULT_LOGGING_OFF
    282286    if(getenv("WIN32LOG_ENABLED")) {
    … …  
    355359    if(tekst[strlen(tekst)-1] != '\n')
    356360      fprintf(flog, "\n");
     361
     362    if(fFlushLines)
     363      fflush(flog);
    357364  }
    358365  SetFS(sel);

  • trunk/src/kernel32/oslibdos.cpp

    r5896 r5974  
    1 /* $Id: oslibdos.cpp,v 1.63 2001-06-03 08:59:48 sandervl Exp $ */
     1/* $Id: oslibdos.cpp,v 1.64 2001-06-12 17:03:33 sandervl Exp $ */
    22/*
    33 * Wrappers for OS/2 Dos* API
    … …  
    24472447  return hModule;
    24482448}
    2449 
     2449//******************************************************************************
     2450//******************************************************************************
     2451void OSLibDosFreeModule(HINSTANCE hinst)
     2452{
     2453  DosFreeModule(hinst);
     2454}
     2455//******************************************************************************
     2456//******************************************************************************
    24502457ULONG OSLibDosQuerySysInfo(ULONG iStart, ULONG iLast, PVOID pBuf, ULONG cbBuf)
    24512458{

  • trunk/src/kernel32/oslibdos.h

    r5587 r5974  
    1 /* $Id: oslibdos.h,v 1.28 2001-04-26 13:22:49 sandervl Exp $ */
     1/* $Id: oslibdos.h,v 1.29 2001-06-12 17:03:34 sandervl Exp $ */
    22
    33/*
    … …  
    298298
    299299HINSTANCE OSLibDosLoadModule(LPSTR szModName);
     300void      OSLibDosFreeModule(HINSTANCE hinst);

  • trunk/src/kernel32/wprocess.cpp

    r5959 r5974  
    1 /* $Id: wprocess.cpp,v 1.123 2001-06-10 22:32:18 sandervl Exp $ */
     1/* $Id: wprocess.cpp,v 1.124 2001-06-12 17:03:34 sandervl Exp $ */
    22
    33/*
    … …  
    826826            }
    827827            else
     828            if(fExeStarted) {
     829                OSLibDosFreeModule(hDll);
     830                SetLastError(ERROR_INVALID_EXE_SIGNATURE);
     831                dprintf(("Dll %s is not an Odin dll; unload & return failure", szModname));
     832                return 0;
     833            }
     834            else
    828835                return hDll; //happens when LoadLibrary is called in kernel32's initterm (nor harmful)
    829836
Note: See TracChangeset for help on using the changeset viewer.