From b830f0254007ba31ce13afc2d2c2c0006c76ffb9 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sat, 9 Dec 2006 12:01:26 +0000 Subject: [PATCH] *** empty log message *** --- ase/awk/parse.c | 2 +- ase/com/AwkExtio.h | 10 ++- ase/com/Buffer.h | 4 +- ase/com/ase.def | 9 ++ ase/com/ase.dsp | 207 +++++++++++++++++++++++++++++++++++++++++++++ ase/com/ase.rc | 2 +- ase/com/aseps.def | 11 +++ ase/com/aseps.mk | 16 ++++ ase/com/resource.h | 4 +- ase/com/stdafx.cpp | 4 + ase/com/stdafx.h | 12 +-- 11 files changed, 265 insertions(+), 16 deletions(-) create mode 100644 ase/com/ase.def create mode 100644 ase/com/ase.dsp create mode 100644 ase/com/aseps.def create mode 100644 ase/com/aseps.mk diff --git a/ase/awk/parse.c b/ase/awk/parse.c index 67397f02..1301ba15 100644 --- a/ase/awk/parse.c +++ b/ase/awk/parse.c @@ -1,5 +1,5 @@ /* - * $Id: parse.c,v 1.218 2006-12-09 11:49:03 bacon Exp $ + * $Id: parse.c,v 1.219 2006-12-09 11:51:01 bacon Exp $ */ #include diff --git a/ase/com/AwkExtio.h b/ase/com/AwkExtio.h index 7e01f0ad..71fc065b 100644 --- a/ase/com/AwkExtio.h +++ b/ase/com/AwkExtio.h @@ -1,9 +1,11 @@ -// AwkExtio.h : Declaration of the CAwkExtio +/* + * $Id: AwkExtio.h,v 1.2 2006-12-09 12:01:26 bacon Exp $ + */ -#ifndef __AWKEXTIO_H_ -#define __AWKEXTIO_H_ +#ifndef _ASE_COM_AWKEXTIO_H_ +#define _ASE_COM_AWKEXTIO_H_ -#include "resource.h" // main symbols +#include "resource.h" ///////////////////////////////////////////////////////////////////////////// // CAwkExtio diff --git a/ase/com/Buffer.h b/ase/com/Buffer.h index fab37fb6..8d75ff43 100644 --- a/ase/com/Buffer.h +++ b/ase/com/Buffer.h @@ -1,5 +1,5 @@ /* - * $Id: Buffer.h,v 1.1 2006-12-09 11:50:08 bacon Exp $ + * $Id: Buffer.h,v 1.2 2006-12-09 11:57:40 bacon Exp $ */ #ifndef _ASE_COM_BUFFER_H_ @@ -20,7 +20,7 @@ public: CBuffer (); ~CBuffer (); -DECLARE_REGISTRY_RESOURCEID(IDR_AWKBUFFER) +DECLARE_REGISTRY_RESOURCEID(IDR_BUFFER) DECLARE_PROTECT_FINAL_CONSTRUCT() diff --git a/ase/com/ase.def b/ase/com/ase.def new file mode 100644 index 00000000..41fc00cd --- /dev/null +++ b/ase/com/ase.def @@ -0,0 +1,9 @@ +; ase.def : Declares the module parameters. + +LIBRARY "ase.dll" + +EXPORTS + DllCanUnloadNow @1 PRIVATE + DllGetClassObject @2 PRIVATE + DllRegisterServer @3 PRIVATE + DllUnregisterServer @4 PRIVATE diff --git a/ase/com/ase.dsp b/ase/com/ase.dsp new file mode 100644 index 00000000..d03c4999 --- /dev/null +++ b/ase/com/ase.dsp @@ -0,0 +1,207 @@ +# Microsoft Developer Studio Project File - Name="ase.com" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=ase.com - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "ase.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "ase.mak" CFG="ase.com - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "ase.com - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "ase.com - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "ase.com - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "../debug/win32/vs60" +# PROP Intermediate_Dir "debug/win32/vs60" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /Yu"stdafx.h" /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo /o"debug/win32/vs60/ase.bsc" +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 aseawk.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../debug/win32/vs60/ase.dll" /implib:"debug/win32/vs60/ase.lib" /pdbtype:sept /libpath:"$(OutDir)" +# Begin Custom Build - Performing registration +IntDir=.\debug/win32/vs60 +OutDir=.\../debug/win32/vs60 +TargetPath=\projects\ase\debug\win32\vs60\ase.dll +InputPath=\projects\ase\debug\win32\vs60\ase.dll +SOURCE="$(InputPath)" + +"$(IntDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy .\ase.tlb "$(OUTDIR)\ase.tlb" + if "%OS%"=="" goto NOTNT + if not "%OS%"=="Windows_NT" goto NOTNT + regsvr32 /s /c "$(TargetPath)" + echo regsvr32 exec. time > "$(IntDir)\regsvr32.trg" + goto end + :NOTNT + echo Warning : Cannot register DLL on Windows 95 + :end + +# End Custom Build + +!ELSEIF "$(CFG)" == "ase.com - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "../release/win32/vs60" +# PROP Intermediate_Dir "release/win32/vs60" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MT /W3 /O1 /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /Yu"stdafx.h" /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo /o"release/win32/vs60/awk.bsc" +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 +# ADD LINK32 aseawk.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../release/win32/vs60/ase.dll" /implib:"release/win32/vs60/ase.lib" /libpath:"$(OutDir)" +# Begin Custom Build - Performing registration +IntDir=.\release/win32/vs60 +OutDir=.\../release/win32/vs60 +TargetPath=\projects\ase\release\win32\vs60\ase.dll +InputPath=\projects\ase\release\win32\vs60\ase.dll +SOURCE="$(InputPath)" + +"$(IntDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy .\ase.tlb "$(OUTDIR)\ase.tlb" + if "%OS%"=="" goto NOTNT + if not "%OS%"=="Windows_NT" goto NOTNT + regsvr32 /s /c "$(TargetPath)" + echo regsvr32 exec. time > "$(IntDir)\regsvr32.trg" + goto end + :NOTNT + echo Warning : Cannot register DLL on Windows 95 + :end + +# End Custom Build + +!ENDIF + +# Begin Target + +# Name "ase.com - Win32 Debug" +# Name "ase.com - Win32 Release" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\ase.cpp +# End Source File +# Begin Source File + +SOURCE=.\ase.def +# End Source File +# Begin Source File + +SOURCE=.\ase.idl +# ADD MTL /tlb ".\ase.tlb" /h "ase.h" /iid "ase_i.c" /Oicf +# End Source File +# Begin Source File + +SOURCE=.\ase.rc +# End Source File +# Begin Source File + +SOURCE=.\Awk.cpp +# End Source File +# Begin Source File + +SOURCE=.\AwkExtio.cpp +# End Source File +# Begin Source File + +SOURCE=.\Buffer.cpp +# End Source File +# Begin Source File + +SOURCE=.\stdafx.cpp +# ADD CPP /Yc"stdafx.h" +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\Awk.h +# End Source File +# Begin Source File + +SOURCE=.\awk_cp.h +# End Source File +# Begin Source File + +SOURCE=.\AwkExtio.h +# End Source File +# Begin Source File + +SOURCE=.\Buffer.h +# End Source File +# Begin Source File + +SOURCE=.\resource.h +# End Source File +# Begin Source File + +SOURCE=.\stdafx.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# Begin Source File + +SOURCE=.\Awk.rgs +# End Source File +# Begin Source File + +SOURCE=.\AwkExtio.rgs +# End Source File +# Begin Source File + +SOURCE=.\Buffer.rgs +# End Source File +# End Group +# End Target +# End Project diff --git a/ase/com/ase.rc b/ase/com/ase.rc index 64a7dfa4..29564982 100644 --- a/ase/com/ase.rc +++ b/ase/com/ase.rc @@ -96,8 +96,8 @@ END // IDR_AWK REGISTRY DISCARDABLE "Awk.rgs" -IDR_AWKBUFFER REGISTRY DISCARDABLE "Buffer.rgs" IDR_AWKEXTIO REGISTRY DISCARDABLE "AwkExtio.rgs" +IDR_BUFFER REGISTRY DISCARDABLE "Buffer.rgs" ///////////////////////////////////////////////////////////////////////////// // diff --git a/ase/com/aseps.def b/ase/com/aseps.def new file mode 100644 index 00000000..291123a5 --- /dev/null +++ b/ase/com/aseps.def @@ -0,0 +1,11 @@ + +LIBRARY "asePS" + +DESCRIPTION 'Proxy/Stub DLL' + +EXPORTS + DllGetClassObject @1 PRIVATE + DllCanUnloadNow @2 PRIVATE + GetProxyDllInfo @3 PRIVATE + DllRegisterServer @4 PRIVATE + DllUnregisterServer @5 PRIVATE diff --git a/ase/com/aseps.mk b/ase/com/aseps.mk new file mode 100644 index 00000000..5093ad12 --- /dev/null +++ b/ase/com/aseps.mk @@ -0,0 +1,16 @@ + +aseps.dll: dlldata.obj ase_p.obj ase_i.obj + link /dll /out:aseps.dll /def:aseps.def /entry:DllMain dlldata.obj ase_p.obj ase_i.obj \ + kernel32.lib rpcndr.lib rpcns4.lib rpcrt4.lib oleaut32.lib uuid.lib \ + +.c.obj: + cl /c /Ox /DWIN32 /D_WIN32_WINNT=0x0400 /DREGISTER_PROXY_DLL \ + $< + +clean: + @del aseps.dll + @del aseps.lib + @del aseps.exp + @del dlldata.obj + @del ase_p.obj + @del ase_i.obj diff --git a/ase/com/resource.h b/ase/com/resource.h index 90cb19be..0c5f206a 100644 --- a/ase/com/resource.h +++ b/ase/com/resource.h @@ -4,8 +4,8 @@ // #define IDS_PROJNAME 100 #define IDR_AWK 101 -#define IDR_AWKBUFFER 102 -#define IDR_AWKEXTIO 104 +#define IDR_AWKEXTIO 102 +#define IDR_BUFFER 103 // Next default values for new objects // diff --git a/ase/com/stdafx.cpp b/ase/com/stdafx.cpp index a5eea178..28a4bd1d 100644 --- a/ase/com/stdafx.cpp +++ b/ase/com/stdafx.cpp @@ -1,3 +1,7 @@ +/* + * $Id: stdafx.cpp,v 1.2 2006-12-09 12:01:26 bacon Exp $ + */ + // stdafx.cpp : source file that includes just the standard includes // stdafx.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information diff --git a/ase/com/stdafx.h b/ase/com/stdafx.h index c7a5287f..c4a7c8dc 100644 --- a/ase/com/stdafx.h +++ b/ase/com/stdafx.h @@ -1,9 +1,9 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, -// but are changed infrequently +/* + * $Id: stdafx.h,v 1.2 2006-12-09 12:01:26 bacon Exp $ + */ -#if !defined(AFX_STDAFX_H__D5DBF84D_6B4D_4C38_AD19_6B4208C02215__INCLUDED_) -#define AFX_STDAFX_H__D5DBF84D_6B4D_4C38_AD19_6B4208C02215__INCLUDED_ +#ifndef _ASE_COM_STDAFX_H_ +#define _ASE_COM_STDAFX_H_ #if _MSC_VER > 1000 #pragma once @@ -24,4 +24,4 @@ extern CComModule _Module; //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. -#endif // !defined(AFX_STDAFX_H__D5DBF84D_6B4D_4C38_AD19_6B4208C02215__INCLUDED) +#endif