Changeset 21842 for branches


Ignore:
Timestamp:
Dec 2, 2011, 2:25:06 PM (14 years ago)
Author:
dmik
Message:

Add OdinSimpleDLL template and use it for MCICDA and MCIWAVE.

This template adds a simple DLL entry point which does nothing but
registers the DLL and its resources with Odin. Makes life simpler.

Location:
branches/gcc-kmk
Files:
1 added
3 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • branches/gcc-kmk/Config.kmk

    r21830 r21842  
    135135 $(kb-src-one 2)
    136136endef
     137PROPS_ACCUMULATE_R += WRCFLAGS
    137138
    138139#
    … …  
    144145 $(kb-src-one 2)
    145146endef
     147PROPS_ACCUMULATE_R += $(if $(TOOL_$(tool)_COMPILE_MASM_CMDS),MASM,AS)FLAGS
    146148
    147149#------------------------------------------------------------------------------
    … …  
    154156TOOL_GXX3OMF_WRC                = $(PATH_STAGE_BIN)/winerc.exe
    155157TOOL_GXX3OMF_WRCOBJSUFF         = $(TOOL_GXX3OMF_COBJSUFF)
     158TOOL_GXX3OMF_WRCFLAGS           =
    156159TOOL_GXX3OMF_COMPILE_WRC_OUTPUT = $(outbase).orc.s
    157160TOOL_GXX3OMF_COMPILE_WRC_DEPEND = $(TOOL_GXX3OMF_WRC)
    158161TOOL_GXX3OMF_COMPILE_WRC_DEPORD =
    159162define TOOL_GXX3OMF_COMPILE_WRC_CMDS
    160         $(QUIET)$(TOOL_GXX3OMF_WRC) -s -p _$(target) -I$(subst /,\\,$(abspath $(dir $(source))))\
     163        $(QUIET)$(TOOL_GXX3OMF_WRC) -s -I$(subst /,\\,$(abspath $(dir $(source))))\
    161164                $(flags) $(addprefix -I, $(subst /,\\,$(incs))) $(addprefix -D, $(defs))\
    162165                $(subst /,\\,$(abspath $(source))) \
    163166                -o $(TOOL_GXX3OMF_COMPILE_WRC_OUTPUT)
    164167        $(QUIET)$(TOOL_GXX3OMF_CC) -E -I$(subst /,\\,$(abspath $(dir $(source))))\
    165                 $(flags) $(addprefix -I, $(incs)) -I . $(addprefix -D, $(defs))\
     168                $(addprefix -I, $(incs)) -I . $(addprefix -D, $(defs))\
    166169                -x c $(abspath $(source)) \
    167170                | $(DEP_PRE) -f -s -o $(dep) -t $(obj) -
    168         $(subst $(source),$(TOOL_GXX3OMF_COMPILE_WRC_OUTPUT),$(TOOL_GXX3OMF_COMPILE_AS_CMDS))
     171        $(subst $(source),$(TOOL_GXX3OMF_COMPILE_WRC_OUTPUT),\
     172                $(subst $(flags),,$(TOOL_GXX3OMF_COMPILE_AS_CMDS)))
    169173endef
    170174
    … …  
    208212TEMPLATE_OdinDLL_LIBS       = $(PATH_STAGE_LIB)/odincrt.lib \
    209213                              $(PATH_STAGE_LIB)/initdll.lib
     214TEMPLATE_OdinDLL_WRCFLAGS   = -p_$(target)
     215
     216TEMPLATE_OdinSimpleDLL              = Odin DLL with ordinary entry point
     217TEMPLATE_OdinSimpleDLL_EXTENDS      = OdinDLL
     218TEMPLATE_OdinSimpleDLL_EXTENDS_BY   = overriding
     219TEMPLATE_OdinSimpleDLL_LIBS         = $(PATH_STAGE_LIB)/dllentry.o $(TEMPLATE_OdinDLL_LIBS)
     220TEMPLATE_OdinSimpleDLL_WRCFLAGS     = -p_Resource
    210221
    211222TEMPLATE_OdinCRT            = OdinCRT DLL

  • branches/gcc-kmk/src/Makefile.kmk

    r21840 r21842  
    1010#
    1111include $(PATH_SUB_CURRENT)/initdll/Makefile.kmk
     12include $(PATH_SUB_CURRENT)/dllentry/Makefile.kmk
    1213include $(PATH_SUB_CURRENT)/libwrap/Makefile.kmk
    1314include $(PATH_SUB_CURRENT)/guidlib/Makefile.kmk
    … …  
    2122include $(PATH_SUB_CURRENT)/imm32/Makefile.kmk
    2223include $(PATH_SUB_CURRENT)/comctl32/Makefile.kmk
     24include $(PATH_SUB_CURRENT)/winmm/Makefile.kmk
    2325
    2426include $(FILE_KBUILD_SUB_FOOTER)

  • branches/gcc-kmk/src/dllentry/dllentry.cpp

    r21727 r21842  
    22
    33/*
    4  * DLL entry point
     4 * Ordinary DLL entry point
    55 *
    66 * Copyright 1998 Sander van Leeuwen
    77 * Copyright 1998 Peter Fitzsimmons
    88 *
    9  *
    109 * Project Odin Software License can be found in LICENSE.TXT
    11  *
    1210 */
    1311
    14 /*-------------------------------------------------------------*/
    15 /* INITERM.C -- Source for a custom dynamic link library       */
    16 /*              initialization and termination (_DLL_InitTerm) */
    17 /*              function.                                      */
    18 /*                                                             */
    19 /* When called to perform initialization, this sample function */
    20 /* gets storage for an array of integers, and initializes its  */
    21 /* elements with random integers.  At termination time, it     */
    22 /* frees the array.  Substitute your own special processing.   */
    23 /*-------------------------------------------------------------*/
    24 
    25 
    26 /* Include files */
    2712#define  INCL_DOSMODULEMGR
    2813#define  INCL_DOSPROCESS
    … …  
    3823#include <initdll.h>
    3924
    40 extern "C" {
    41  //Win32 resource table (produced by wrc)
    42  extern DWORD _Resource_PEResTab;
    43 }
     25// Win32 resource table (produced by wrc)
     26extern DWORD Resource_PEResTab;
    4427
    4528static HMODULE dllHandle = 0;
    4629
    47 //******************************************************************************
    48 //******************************************************************************
    49 BOOL WINAPI OdinLibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
     30#if 0
     31
     32// Not currently needed
     33
     34BOOL WINAPI LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
    5035{
    51    switch (fdwReason)
    52    {
    53       case DLL_PROCESS_ATTACH:
    54          return TRUE;
     36    switch (fdwReason)
     37    {
     38    case DLL_PROCESS_ATTACH:
     39        return TRUE;
    5540
    56       case DLL_THREAD_ATTACH:
    57       case DLL_THREAD_DETACH:
    58          return TRUE;
     41    case DLL_THREAD_ATTACH:
     42    case DLL_THREAD_DETACH:
     43        return TRUE;
    5944
    60       case DLL_PROCESS_DETACH:
    61 #ifdef __IBMCPP__
    62          ctordtorTerm();
    63 #endif
    64          return TRUE;
    65    }
    66    return FALSE;
     45    case DLL_PROCESS_DETACH:
     46        return TRUE;
     47    }
     48
     49    return FALSE;
    6750}
    6851
     52#endif
    6953
    70 #ifdef __IBMCPP__
     54ULONG SYSTEM DLL_Init(ULONG hModule)
     55{
     56    if (DLL_InitDefault(hModule) == -1)
     57        return -1;
    7158
    72 /****************************************************************************/
    73 /* _DLL_InitTerm is the function that gets called by the operating system   */
    74 /* loader when it loads and frees this DLL for each process that accesses   */
    75 /* this DLL.  However, it only gets called the first time the DLL is loaded */
    76 /* and the last time it is freed for a particular process.  The system      */
    77 /* linkage convention MUST be used because the operating system loader is   */
    78 /* calling this function.                                                   */
    79 /****************************************************************************/
    80 ULONG SYSTEM _DLL_InitTerm(ULONG hModule, ULONG ulFlag)
    81 {
    82    /*-------------------------------------------------------------------------*/
    83    /* If ulFlag is zero then the DLL is being loaded so initialization should */
    84    /* be performed.  If ulFlag is 1 then the DLL is being freed so            */
    85    /* termination should be performed.                                        */
    86    /*-------------------------------------------------------------------------*/
     59    CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
     60    dllHandle = RegisterLxDll(hModule, NULL, (PVOID)&Resource_PEResTab);
     61    if (dllHandle == 0)
     62        return -1;
    8763
    88    switch (ulFlag)
    89    {
    90       case 0:
    91          ctordtorInit();
    92          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
    93          dllHandle = RegisterLxDll(hModule, OdinLibMain, (PVOID)&_Resource_PEResTab);
    94          if (dllHandle == 0)
    95             return 0UL;
    96          break;
    97 
    98       case 1:
    99          if (dllHandle)
    100             UnregisterLxDll(dllHandle);
    101          break;
    102 
    103       default:
    104          return 0UL;
    105    }
    106 
    107    /***********************************************************/
    108    /* A non-zero value must be returned to indicate success.  */
    109    /***********************************************************/
    110    return 1UL;
    111 }
    112 #elif defined(__WATCOM_CPLUSPLUS__)
    113 /*
    114  * Watcom dll init and term routines.
    115  */
    116 
    117 int __dll_initialize(unsigned long hModule, unsigned long ulFlag)
    118 {
    119     CheckVersionFromHMOD(PE2LX_VERSION, hModule);
    120     dllHandle = RegisterLxDll(hModule, OdinLibMain, (PVOID)&_Resource_PEResTab);
    121     if (dllHandle == 0)
    122         return 0;
    123     return 1;
     64    return 0;
    12465}
    12566
    126 int __dll_terminate(unsigned long hModule, unsigned long ulFlag)
     67void SYSTEM DLL_Term(ULONG hModule)
    12768{
    128     if (dllHandle)
     69    if(dllHandle)
    12970        UnregisterLxDll(dllHandle);
    130     return 1;
     71
     72    DLL_TermDefault(hModule);
    13173}
    132 
    133 #else
    134 #error message("compiler is not supported!\n");
    135 #endif

  • branches/gcc-kmk/src/winmm/mcicda/Makefile.kmk

    r21841 r21842  
    99
    1010DLLS               += mcicda
    11 mcicda_TEMPLATE     = OdinDLL
     11mcicda_TEMPLATE     = OdinSimpleDLL
    1212
    1313mcicda_SOURCES      = \
    … …  
    1515    cdrom.cpp \
    1616    os2cdrom.cpp \
    17     initterm.cpp \
    1817    mcicdarsrc.orc \
    1918    mcicda.def

  • branches/gcc-kmk/src/winmm/mciwave/Makefile.kmk

    r21841 r21842  
    99
    1010DLLS               += mciwave
    11 mciwave_TEMPLATE    = OdinDLL
     11mciwave_TEMPLATE    = OdinSimpleDLL
    1212
    1313mciwave_SOURCES     = \
    1414    mciwave.c \
    15     initterm.cpp \
    1615    mciwaversrc.orc \
    1716    mciwave.def
Note: See TracChangeset for help on using the changeset viewer.