Changeset 3582


Ignore:
Timestamp:
Sep 3, 2007, 12:26:42 AM (18 years ago)
Author:
bird
Message:

WIN* DARWIN and OS2 removal.

Location:
trunk/kStuff
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/kStuff/kHlp/Bare/kHlpBareAssert.c

    r3573 r3582  
    3535# define INCL_ERRORS
    3636# include <os2.h>
     37
    3738#elif  K_OS == K_OS_WINDOWS
    3839# include <Windows.h>
     40
    3941#else
    4042# error "port me"
     
    6365            DosWrite((HFILE)2, pszMsg, cbWritten, &cbWritten);
    6466        DosWrite((HFILE)2, "\r\n", 2, &cbWritten);
    65 #else /* __WIN32__ */
     67#else /* K_OS == K_OS_WINDOWS */
    6668        if (cbWritten)
    6769            WriteFile((HANDLE)STD_ERROR_HANDLE, pszMsg, cbWritten, &cbWritten, NULL);
     
    8284#if K_OS == K_OS_OS2
    8385        DosWrite((HFILE)2, pszMsg, cbWritten, &cbWritten);
    84 #else /* __WIN32__ */
     86#else /* K_OS == K_OS_WINDOWS */
    8587        WriteFile((HANDLE)STD_ERROR_HANDLE, pszMsg, cbWritten, &cbWritten, NULL);
    8688#endif
  • trunk/kStuff/kLdr/kLdrDyldFind.c

    r3579 r3582  
    3030*   Header Files                                                               *
    3131*******************************************************************************/
    32 #ifdef __OS2__
     32#include <k/kLdr.h>
     33#include "kLdrInternal.h"
     34
     35#if K_OS == K_OS_OS2
    3336# define INCL_BASE
    3437# define INCL_ERRORS
     
    4750# define QHINF_MAPSEL        8 /* NE only */
    4851
    49 #elif defined(__WIN__)
     52#elif K_OS == K_OS_WINDOWS
     53# undef IMAGE_DOS_SIGNATURE
     54# undef IMAGE_NT_SIGNATURE
    5055# include <Windows.h>
     56
    5157#endif
    52 
    53 #include <k/kLdr.h>
    54 #include "kLdrInternal.h"
    5558
    5659
     
    236239     * The OS/2 search parameters.
    237240     */
    238 #ifdef __OS2__
     241#if K_OS == K_OS_OS2
    239242    rc = DosQueryHeaderInfo(NULLHANDLE, 0, kLdrDyldOS2Libpath, sizeof(kLdrDyldOS2Libpath), QHINF_LIBPATH);
    240243    if (rc)
     
    266269     * The windows search parameters.
    267270     */
    268 #if defined(__WIN__)
     271#if K_OS == K_OS_WINDOWS
    269272    cch = GetSystemDirectory(kLdrDyldWindowsSystemDir, sizeof(kLdrDyldWindowsSystemDir));
    270273    if (cch >= sizeof(kLdrDyldWindowsSystemDir))
     
    320323
    321324
    322 #elif defined(__WIN__)
     325#elif K_OS == K_OS_WINDOWS
    323326        DWORD dwSize = GetModuleFileName(NULL /* the executable */, kLdrDyldAppDir, sizeof(kLdrDyldAppDir));
    324327        if (dwSize > 0)
     
    665668    psz = &s_szFilename[cchPath];
    666669    if (psz[-1] != '/'
    667 #if defined(__OS2__) || defined(__WIN__)
     670#if K_OS == K_OS_OS2 || K_OS == K_OS_WINDOWS
    668671        && psz[-1] != '\\'
    669672        && psz[-1] != ':'
     
    737740        while (     *pszEnd != '\0'
    738741               &&   *pszEnd != ';'
    739 #if defined(__OS2__) || defined(__WIN__)
     742#if K_OS == K_OS_OS2 || K_OS == K_OS_WINDOWS
    740743               && (     *pszEnd != ':'
    741744                   ||   (   pszEnd - psz == 1
     
    790793#if defined(__OS2__)
    791794        *penmSearch = KLDRDYLD_SEARCH_OS2;
    792 #elif defined(__WIN__)
     795#elif K_OS == K_OS_WINDOWS
    793796        *penmSearch = KLDRDYLD_SEARCH_WINDOWS;
    794797#else
  • trunk/kStuff/kLdr/kLdrDyldMod.c

    r3579 r3582  
    205205    rc = kld
    206206    {
    207 #ifdef __OS2__
     207#if K_OS == K_OS_OS2
    208208    HMODULE hmod = NULLHANDLE;
    209209    APIRET rc = DosQueryModuleHandle(kRdrName(pRdr), &hmod);
    210210    if (!rc)
    211211
    212 #elif defined(__WIN__)
     212#elif K_OS == K_OS_WINDOWS
    213213    HMODULE hmod = NULL;
    214214    if (GetModuleHandle(kRdrName(pRdr))
  • trunk/kStuff/kLdr/kLdrDyldOS.c

    r3573 r3582  
    2929*   Header Files                                                               *
    3030*******************************************************************************/
    31 #ifdef __OS2__
     31#include <k/kLdr.h>
     32#include "kLdrInternal.h"
     33
     34#if K_OS == K_OS_OS2
    3235# define INCL_BASE
    3336# define INCL_ERRORS
    3437# include <os2.h>
    35 #elif defined(__WIN__)
     38
     39#elif K_OS == K_OS_WINDOWS
     40# undef IMAGE_DOS_SIGNATURE
     41# undef IMAGE_NT_SIGNATURE
    3642# include <Windows.h>
     43
    3744#else
    3845# error "port me"
    3946#endif
    40 
    41 #include <k/kLdr.h>
    42 #include "kLdrInternal.h"
    4347
    4448
     
    5256void *kldrDyldOSAllocStack(KSIZE cb)
    5357{
    54 #ifdef __OS2__
     58#if K_OS == K_OS_OS2
    5559    APIRET rc;
    5660    PVOID pv;
     
    6468    return NULL;
    6569
    66 #elif defined(__WIN__)
     70#elif K_OS == K_OS_WINDOWS
    6771
    6872    if (!cb)
     
    9094#if defined(__OS2__)
    9195
    92 #elif defined(__WIN__)
     96#elif K_OS == K_OS_WINDOWS
    9397    /*
    9498     * Invoke the entrypoint on the current stack for now.
  • trunk/kStuff/kLdr/kLdrModNative.c

    r3579 r3582  
    3131#include <k/kLdr.h>
    3232#include "kLdrInternal.h"
    33 #ifdef __OS2__
     33
     34#if K_OS == K_OS_OS2
    3435# define INCL_BASE
    3536# include <os2.h>
     
    4849# define QHINF_MAPSEL        8 /* NE only */
    4950
    50 #elif defined(__WIN__)
     51#elif K_OS == K_OS_WINDOWS
    5152# undef IMAGE_NT_SIGNATURE
    5253# undef IMAGE_DOS_SIGNATURE
     
    5960#include <winnt.h> */
    6061
    61 #elif defined(__DARWIN__)
     62#elif K_OS == K_OS_DARWIN
    6263# include <dlfcn.h>
    6364# include <errno.h>
     
    8586#endif
    8687
    87 #if defined(__WIN__) || defined(__NT__)
     88#if K_OS == K_OS_WINDOWS
    8889/** @def KLDRMODNATIVE_RVA2TYPE
    8990 * Converts a RVA to a pointer of the specified type.
     
    114115     * If ~(KU32)0 this hasn't been determined yet. */
    115116    KU32                        cImportModules;
    116 #ifdef __OS2__
     117#if K_OS == K_OS_OS2
    117118    /** The module handle. */
    118119    HMODULE                     hmod;
    119120
    120 #elif defined(__WIN__)
     121#elif K_OS == K_OS_WINDOWS
    121122    /** The module handle. */
    122123    HANDLE                      hmod;
     
    126127    const IMAGE_SECTION_HEADER *paShdrs;
    127128
    128 #elif defined(__DARWIN__)
     129#elif K_OS == K_OS_DARWIN
    129130    /** The dlopen() handle.*/
    130131    void                       *pvMod;
     
    179180     * Load the image.
    180181     */
    181 #ifdef __OS2__
     182#if K_OS == K_OS_OS2
    182183    HMODULE hmod;
    183184
     
    189190        DosFreeModule(hmod);
    190191
    191 #elif defined(__WIN__)
     192#elif K_OS == K_OS_WINDOWS
    192193    HMODULE hmod;
    193194
     
    199200        FreeLibrary(hmod);
    200201
    201 #elif defined(__DARWIN__)
     202#elif K_OS == K_OS_DARWIN
    202203    void *pvMod;
    203204
     
    238239     * size of the module instance.
    239240     */
    240 #ifdef __OS2__
     241#if K_OS == K_OS_OS2
    241242    char szFilename[CCHMAXPATH];
    242243    int rc;
     
    254255    cSegments = 1;
    255256
    256 #elif defined(__WIN__)
     257#elif K_OS == K_OS_WINDOWS
    257258    DWORD                       dw;
    258259    char                        szFilename[MAX_PATH];
     
    288289    paShdrs = (const IMAGE_SECTION_HEADER *)(pNtHdrs + 1);
    289290
    290 #elif defined(__DARWIN__)
     291#elif K_OS == K_OS_DARWIN
    291292    char    szFilename[1] = "";
    292293    cSegments = 0; /** @todo Figure out the Mac OS X dynamic loader. */
     
    341342     * Set native instance data.
    342343     */
    343 #ifdef __OS2__
     344#if K_OS == K_OS_OS2
    344345    pModNative->hmod = (HMODULE)uHandle;
    345346
     
    358359    pMod->aSegments[0].MapAddress = 0;
    359360
    360 #elif defined(__WIN__)
     361#elif K_OS == K_OS_WINDOWS
    361362    pModNative->hmod = (HMODULE)uHandle;
    362363    pModNative->pNtHdrs = pNtHdrs;
     
    495496    }
    496497
    497 #elif defined(__DARWIN__)
     498#elif K_OS == K_OS_DARWIN
    498499    /** @todo Figure out the Mac OS X dynamic loader. */
    499500
     
    516517    int rc;
    517518
    518 #ifdef __OS2__
     519#if K_OS == K_OS_OS2
    519520    rc = DosFreeModule(pModNative->hmod);
    520521
    521 #elif defined(__WIN__)
     522#elif K_OS == K_OS_WINDOWS
    522523    if (FreeLibrary(pModNative->hmod))
    523524        rc = 0;
     
    525526        rc = GetLastError();
    526527
    527 #elif defined(__DARWIN__)
     528#elif K_OS == K_OS_DARWIN
    528529    dlclose(pModNative->pvMod);
    529530
     
    546547    PKLDRMODNATIVE pModNative = (PKLDRMODNATIVE)pMod->pvData;
    547548    const char *pszSymbol = pchSymbol;
    548 #ifdef __OS2__
     549#if K_OS == K_OS_OS2
    549550    APIRET rc;
    550551    PFN pfn;
    551 #elif defined(__WIN__)
     552#elif K_OS == K_OS_WINDOWS
    552553    FARPROC pfn;
    553 #elif defined(__DARWIN__)
     554#elif K_OS == K_OS_DARWIN
    554555    void *pfn;
    555556#else
     
    566567    }
    567568
    568 #ifdef __OS2__
     569#if K_OS == K_OS_OS2
    569570    if (!pchSymbol && iSymbol >= 0x10000)
    570571        return KLDR_ERR_SYMBOL_NOT_FOUND;
     
    597598    }
    598599
    599 #elif defined(__WIN__)
     600#elif K_OS == K_OS_WINDOWS
    600601    if (!pszSymbol && iSymbol >= 0x10000)
    601602        return KLDR_ERR_SYMBOL_NOT_FOUND;
     
    609610                | KLDRSYMKIND_NO_TYPE;
    610611
    611 #elif defined(__DARWIN__)
     612#elif K_OS == K_OS_DARWIN
    612613    if (!pszSymbol && iSymbol != NIL_KLDRMOD_SYM_ORDINAL)
    613614        return KLDR_ERR_SYMBOL_NOT_FOUND;
     
    635636{
    636637    PKLDRMODNATIVE                  pModNative = (PKLDRMODNATIVE)pMod->pvData;
    637 #ifdef __OS2__
     638#if K_OS == K_OS_OS2
    638639
    639640    /** @todo implement export enumeration on OS/2. */
     
    641642    return ERROR_NOT_SUPPORTED;
    642643
    643 #elif defined(__WIN__) || defined(__NT__)
     644#elif K_OS == K_OS_WINDOWS || defined(__NT__)
    644645    const KU32                     *paFunctions;
    645646    const IMAGE_EXPORT_DIRECTORY   *pExpDir;
     
    713714    return 0;
    714715
    715 #elif defined(__DARWIN__)
     716#elif K_OS == K_OS_DARWIN
    716717    /** @todo implement enumeration on darwin. */
    717718    (void)pModNative;
     
    729730{
    730731    PKLDRMODNATIVE                  pModNative = (PKLDRMODNATIVE)pMod->pvData;
    731 #ifdef __OS2__
     732#if K_OS == K_OS_OS2
    732733
    733734    /** @todo implement import enumeration on OS/2. */
     
    735736    return ERROR_NOT_SUPPORTED;
    736737
    737 #elif defined(__WIN__) || defined(__NT__)
     738#elif K_OS == K_OS_WINDOWS || defined(__NT__)
    738739    const IMAGE_IMPORT_DESCRIPTOR  *pImpDesc;
    739740    const char                     *pszImportName;
     
    771772    return rc;
    772773
    773 #elif defined(__DARWIN__)
     774#elif K_OS == K_OS_DARWIN
    774775    /** @todo Implement import enumeration on darwin. */
    775776    (void)pModNative;
     
    786787{
    787788    PKLDRMODNATIVE pModNative = (PKLDRMODNATIVE)pMod->pvData;
    788 #ifdef __OS2__
     789#if K_OS == K_OS_OS2
    789790
    790791    /** @todo implement import counting on OS/2. */
     
    792793    return -1;
    793794
    794 #elif defined(__WIN__) || defined(__NT__)
     795#elif K_OS == K_OS_WINDOWS || defined(__NT__)
    795796    if (pModNative->cImportModules == ~(KU32)0)
    796797    {
     
    816817    return pModNative->cImportModules;
    817818
    818 #elif defined(__DARWIN__)
     819#elif K_OS == K_OS_DARWIN
    819820    /** @todo Implement import counting on Darwin. */
    820821    (void)pModNative;
     
    831832{
    832833    PKLDRMODNATIVE pModNative = (PKLDRMODNATIVE)pMod->pvData;
    833 #ifdef __OS2__
     834#if K_OS == K_OS_OS2
    834835
    835836    /** @todo implement stack info on OS/2. */
     
    837838    return ERROR_NOT_SUPPORTED;
    838839
    839 #elif defined(__WIN__) || defined(__NT__)
     840#elif K_OS == K_OS_WINDOWS || defined(__NT__)
    840841    pStackInfo->Address = NIL_KLDRADDR;
    841842    pStackInfo->LinkAddress = NIL_KLDRADDR;
     
    844845    return 0;
    845846
    846 #elif defined(__DARWIN__)
     847#elif K_OS == K_OS_DARWIN
    847848    /** @todo Implement stack info on Darwin. */
    848849    (void)pModNative;
     
    859860{
    860861    PKLDRMODNATIVE pModNative = (PKLDRMODNATIVE)pMod->pvData;
    861 #ifdef __OS2__
     862#if K_OS == K_OS_OS2
    862863
    863864    /** @todo implement me on OS/2. */
     
    865866    return ERROR_NOT_SUPPORTED;
    866867
    867 #elif defined(__WIN__) || defined(__NT__)
     868#elif K_OS == K_OS_WINDOWS || defined(__NT__)
    868869    /*
    869870     * Convert the address from the header.
     
    874875    return 0;
    875876
    876 #elif defined(__DARWIN__)
     877#elif K_OS == K_OS_DARWIN
    877878    /** @todo Implement me on Darwin. */
    878879    (void)pModNative;
     
    889890{
    890891    PKLDRMODNATIVE                  pModNative = (PKLDRMODNATIVE)pMod->pvData;
    891 #ifdef __OS2__
     892#if K_OS == K_OS_OS2
    892893
    893894    /** @todo implement me on OS/2. */
     
    895896    return ERROR_NOT_SUPPORTED;
    896897
    897 #elif defined(__WIN__) || defined(__NT__)
     898#elif K_OS == K_OS_WINDOWS || defined(__NT__)
    898899    const IMAGE_DEBUG_DIRECTORY    *pDbgDir;
    899900    KU32                            iDbgInfo;
     
    954955    return rc;
    955956
    956 #elif defined(__DARWIN__)
     957#elif K_OS == K_OS_DARWIN
    957958    /** @todo Implement me on Darwin. */
    958959    (void)pModNative;
     
    969970{
    970971    PKLDRMODNATIVE pModNative = (PKLDRMODNATIVE)pMod->pvData;
    971 #ifdef __OS2__
     972#if K_OS == K_OS_OS2
    972973
    973974    /** @todo implement me on OS/2. */
     
    975976    return KLDR_ERR_NO_DEBUG_INFO;
    976977
    977 #elif defined(__WIN__) || defined(__NT__)
     978#elif K_OS == K_OS_WINDOWS || defined(__NT__)
    978979    /*
    979980     * Base this entirely on the presence of a debug directory.
     
    985986    return 0;
    986987
    987 #elif defined(__DARWIN__)
     988#elif K_OS == K_OS_DARWIN
    988989    /** @todo Implement me on Darwin. */
    989990    (void)pModNative;
     
    10611062static KLDRADDR kldrModNativeSize(PKLDRMOD pMod)
    10621063{
    1063 #ifdef __OS2__
     1064#if K_OS == K_OS_OS2
    10641065    return 0; /* don't bother */
    10651066
    1066 #elif defined(__WIN__) || defined(__NT__)
     1067#elif K_OS == K_OS_WINDOWS || defined(__NT__)
    10671068    /* just because we can. */
    10681069    PKLDRMODNATIVE pModNative = (PKLDRMODNATIVE)pMod->pvData;
    10691070    return pModNative->pNtHdrs->OptionalHeader.SizeOfImage;
    10701071
    1071 #elif defined(__DARWIN__)
     1072#elif K_OS == K_OS_DARWIN
    10721073    /** @todo Implement me on Darwin. */
    10731074    return 0;
     
    10821083static int kldrModNativeGetBits(PKLDRMOD pMod, void *pvBits, KLDRADDR BaseAddress, PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser)
    10831084{
    1084 #ifdef __OS2__
     1085#if K_OS == K_OS_OS2
    10851086    return ERROR_NOT_SUPPORTED; /* don't bother */
    10861087
    1087 #elif defined(__WIN__) || defined(__NT__)
     1088#elif K_OS == K_OS_WINDOWS || defined(__NT__)
    10881089    return ERROR_NOT_SUPPORTED; /* don't bother even if we could implement this. */
    10891090
    1090 #elif defined(__DARWIN__)
     1091#elif K_OS == K_OS_DARWIN
    10911092    return KLDR_ERR_TODO; /* don't bother. */
    10921093
     
    11011102                                     PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser)
    11021103{
    1103 #ifdef __OS2__
     1104#if K_OS == K_OS_OS2
    11041105    return ERROR_NOT_SUPPORTED; /* don't bother */
    11051106
    1106 #elif defined(__WIN__) || defined(__NT__)
     1107#elif K_OS == K_OS_WINDOWS || defined(__NT__)
    11071108    return ERROR_NOT_SUPPORTED; /* don't bother even if we could implement this. */
    11081109
    1109 #elif defined(__DARWIN__)
     1110#elif K_OS == K_OS_DARWIN
    11101111    return KLDR_ERR_TODO; /* don't bother. */
    11111112
  • trunk/kStuff/kRdr/kRdrFile.cpp

    r3578 r3582  
    4141# define WIN32_NO_STATUS
    4242# include <Windows.h>
    43 # ifndef __WIN__
    44 #  define __WIN__
    45 # endif
    4643# include <ntsecapi.h>
    4744# include <ntstatus.h>
Note: See TracChangeset for help on using the changeset viewer.