4.45 beta

CPP/7zip/Compress/Copy/Copy.dsp

@@ -97,7 +97,11 @@ SOURCE=..\Codec.def
 # End Source File
 # Begin Source File
 
-SOURCE=.\DllExports.cpp
+SOURCE=..\CodecExports.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\DllExports.cpp
 # End Source File
 # Begin Source File
 
@@ -113,18 +117,6 @@ SOURCE=.\StdAfx.cpp
 SOURCE=.\StdAfx.h
 # End Source File
 # End Group
-# Begin Group "Common"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\Common\Alloc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\Alloc.h
-# End Source File
-# End Group
 # Begin Group "7-Zip Common"
 
 # PROP Default_Filter ""
@@ -137,6 +129,19 @@ SOURCE=..\..\Common\StreamUtils.cpp
 SOURCE=..\..\Common\StreamUtils.h
 # End Source File
 # End Group
+# Begin Group "<22>"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Alloc.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Alloc.h
+# End Source File
+# End Group
 # Begin Source File
 
 SOURCE=.\CopyCoder.cpp
@@ -145,5 +150,9 @@ SOURCE=.\CopyCoder.cpp
 
 SOURCE=.\CopyCoder.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\CopyRegister.cpp
+# End Source File
 # End Target
 # End Project

CPP/7zip/Compress/Copy/CopyCoder.cpp

@@ -2,8 +2,12 @@
 
 #include "StdAfx.h"
 
+extern "C" 
+{ 
+#include "../../../../C/Alloc.h"
+}
+
 #include "CopyCoder.h"
-#include "../../../Common/Alloc.h"
 #include "../../Common/StreamUtils.h"
 
 namespace NCompress {

CPP/7zip/Compress/Copy/CopyRegister.cpp

@@ -0,0 +1,13 @@
+// LZMARegister.cpp
+
+#include "StdAfx.h"
+
+#include "../../Common/RegisterCodec.h"
+
+#include "CopyCoder.h"
+static void *CreateCodec() { return (void *)(ICompressCoder *)(new NCompress::CCopyCoder); }
+
+static CCodecInfo g_CodecInfo =
+{ CreateCodec, CreateCodec, 0x00, L"Copy", 1, false };
+
+REGISTER_CODEC(Copy)

CPP/7zip/Compress/Copy/DllExports.cpp

@@ -1,70 +0,0 @@
-// DLLExports.cpp
-
-#include "StdAfx.h"
-
-#include "../../../Common/MyInitGuid.h"
-#include "../../../Common/ComTry.h"
-
-#include "CopyCoder.h"
-
-// {23170F69-40C1-278B-0000-000000000000}
-DEFINE_GUID(CLSID_CCompressCopyCoder, 
-0x23170F69, 0x40C1, 0x278B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
-
-extern "C"
-BOOL WINAPI DllMain(HINSTANCE /* hInstance */, DWORD /* dwReason */, LPVOID /*lpReserved*/)
-{
-  return TRUE;
-}
-
-STDAPI CreateObject(const GUID *clsid, const GUID *iid, void **outObject)
-{
-  COM_TRY_BEGIN
-  *outObject = 0;
-  if (*clsid != CLSID_CCompressCopyCoder)
-    return CLASS_E_CLASSNOTAVAILABLE;
-  if (*iid != IID_ICompressCoder)
-    return E_NOINTERFACE;
-  CMyComPtr<ICompressCoder> coder = (ICompressCoder *)new NCompress::CCopyCoder();
-  *outObject = coder.Detach();
-  COM_TRY_END
-  return S_OK;
-}
-
-STDAPI GetNumberOfMethods(UINT32 *numMethods)
-{
-  *numMethods = 1;
-  return S_OK;
-}
-
-STDAPI GetMethodProperty(UINT32 index, PROPID propID, PROPVARIANT *value)
-{
-  if (index != 0)
-    return E_INVALIDARG;
-  // ::VariantClear((tagVARIANT *)value);
-  switch(propID)
-  {
-    case NMethodPropID::kID:
-    {
-      const char id[] = { 0x0 };
-      if ((value->bstrVal = ::SysAllocStringByteLen(id, sizeof(id))) != 0)
-        value->vt = VT_BSTR;
-      return S_OK;
-    }
-    case NMethodPropID::kName:
-    {
-      if ((value->bstrVal = ::SysAllocString(L"Copy")) != 0)
-        value->vt = VT_BSTR;
-      return S_OK;
-    }
-    case NMethodPropID::kDecoder:
-    case NMethodPropID::kEncoder:
-    {
-      if ((value->bstrVal = ::SysAllocStringByteLen(
-          (const char *)&CLSID_CCompressCopyCoder, sizeof(GUID))) != 0)
-        value->vt = VT_BSTR;
-      return S_OK;
-    }
-  }
-  return S_OK;
-}

CPP/7zip/Compress/Copy/makefile

@@ -3,28 +3,35 @@ DEF_FILE = ../Codec.def
 CFLAGS = $(CFLAGS) -I ../../../
 LIBS = $(LIBS) oleaut32.lib
 
-COPY_OBJS = \
+COMPRESS_OBJS = \
+  $O\CodecExports.obj \
   $O\DllExports.obj \
-  $O\CopyCoder.obj \
 
-COMMON_OBJS = \
-  $O\Alloc.obj \
+COPY_OBJS = \
+  $O\CopyCoder.obj \
+  $O\CopyRegister.obj \
 
 7ZIP_COMMON_OBJS = \
   $O\StreamUtils.obj \
 
+C_OBJS = \
+  $O\Alloc.obj \
+
 OBJS = \
   $O\StdAfx.obj \
+  $(COMPRESS_OBJS) \
   $(COPY_OBJS) \
-  $(COMMON_OBJS) \
   $(7ZIP_COMMON_OBJS) \
+  $(C_OBJS) \
   $O\resource.res
 
 !include "../../../Build.mak"
 
-$(COPY_OBJS): $(*B).cpp
+$(COMPRESS_OBJS): ../$(*B).cpp
 	$(COMPL)
-$(COMMON_OBJS): ../../../Common/$(*B).cpp
+$(COPY_OBJS): $(*B).cpp
 	$(COMPL)
 $(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp
 	$(COMPL)
+$(C_OBJS): ../../../../C/$(*B).c
+	$(COMPL_O2)