Changeset 6412 for trunk/src/kernel32


Ignore:
Timestamp:
Jul 30, 2001, 2:02:45 PM (24 years ago)
Author:
sandervl
Message:

custom build fixes

Location:
trunk/src/kernel32
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kernel32/initterm.cpp

    r6411 r6412  
    147147    HMODULE hModule;
    148148
    149     DosQueryModuleHandle("WGSS50", &hModule);
    150     O32__DLL_InitTerm(hModule, 0);
     149//    DosQueryModuleHandle("WGSS50", &hModule);
     150//    O32__DLL_InitTerm(hModule, 0);
    151151    DosQueryModuleHandle("KERNEL32", &hModule);
    152152    return inittermKernel32(hModule, 0);

  • trunk/src/kernel32/os2heap.cpp

    r6397 r6412  
    1 /* $Id: os2heap.cpp,v 1.22 2001-07-28 18:03:38 sandervl Exp $ */
     1/* $Id: os2heap.cpp,v 1.23 2001-07-30 12:01:24 sandervl Exp $ */
    22
    33/*
    … …  
    6262  this->flOptions     = flOptions;
    6363
    64   dprintf(("KERNEL32:  HeapCreate: initial size %d, max size %d (flags %X) returned %X\n", dwInitialSize, dwMaximumSize, flOptions, hPrimaryHeap));
    65 
    6664  if(!(flOptions & HEAP_NO_SERIALIZE))
    6765  {
    … …  
    9997  }
    10098  hPrimaryHeap = (HANDLE)uheap;
     99  dprintf(("KERNEL32:  HeapCreate: initial size %d, max size %d (flags %X) returned %X\n", dwInitialSize, dwMaximumSize, flOptions, hPrimaryHeap));
    101100}
    102101//******************************************************************************

  • trunk/src/kernel32/windlllx.h

    r6015 r6412  
    1 /* $Id: windlllx.h,v 1.4 2001-06-15 09:42:48 bird Exp $ */
     1/* $Id: windlllx.h,v 1.5 2001-07-30 12:01:25 sandervl Exp $ */
    22
    33/*
    … …  
    4545};
    4646
     47extern char *lpszCustomDllName;
     48
    4749#endif //__WINDLLLX_H__

  • trunk/src/kernel32/winimagebase.cpp

    r5959 r6412  
    1 /* $Id: winimagebase.cpp,v 1.32 2001-06-10 22:32:17 sandervl Exp $ */
     1/* $Id: winimagebase.cpp,v 1.33 2001-07-30 12:01:25 sandervl Exp $ */
    22
    33/*
    … …  
    3030#include <windllbase.h>
    3131#include <winexebase.h>
     32#include <windlllx.h>
    3233#include <pefile.h>
    3334#include <unicode.h>
    … …  
    5051    ulRVAResourceSection(0)
    5152{
     53  char *name;
     54
    5255  magic = MAGIC_WINIMAGE;
    5356
    … …  
    5558    this->hinstance = hInstance;
    5659
    57     char *name = OSLibGetDllName(hinstance);
     60    if(lpszCustomDllName) {
     61         name = lpszCustomDllName;
     62    }
     63    else name = OSLibGetDllName(hinstance);
     64
    5865    strcpy(szFileName, name);
    5966    strupr(szFileName);
    6067
    61     //rename dll (os/2 -> win32) if necessary (i.e. OLE32OS2 -> OLE32)
    62     Win32DllBase::renameDll(szFileName, FALSE);
    63 
    64     name = strrchr(szFileName, '\\')+1;
    65     strcpy(szModule, name);
     68    if(lpszCustomDllName) {
     69        strcpy(szModule, name);
     70    }
     71    else {
     72        //rename dll (os/2 -> win32) if necessary (i.e. OLE32OS2 -> OLE32)
     73        Win32DllBase::renameDll(szFileName, FALSE);
     74        name = strrchr(szFileName, '\\')+1;
     75        strcpy(szModule, name);
     76    }
    6677  }
    6778  else {

  • trunk/src/kernel32/winimagelx.cpp

    r6401 r6412  
    1 /* $Id: winimagelx.cpp,v 1.10 2001-07-29 19:00:32 sandervl Exp $ */
     1/* $Id: winimagelx.cpp,v 1.11 2001-07-30 12:01:25 sandervl Exp $ */
    22
    33/*
    … …  
    3333#include <winexebase.h>
    3434#include <winexelx.h>
     35#include <windlllx.h>
    3536#include <pefile.h>
    3637#include <unicode.h>
    … …  
    4142#define DBG_LOCALLOG    DBG_winimagelx
    4243#include "dbglocal.h"
    43 
    44 extern char *lpszCustomDllName; //windlllx.cpp
    4544
    4645static BYTE dosHeader[] = {
Note: See TracChangeset for help on using the changeset viewer.