seven-zip 1.4.2 → 1.7.0.rc1

data/ext/p7zip/CPP/Windows/Control/Window2.cpp

@@ -1,211 +0,0 @@
-// Windows/Control/Window2.cpp
-
-#include "StdAfx.h"
-
-#ifndef _UNICODE
-#include "Common/StringConvert.h"
-#endif
-#include "Windows/Control/Window2.h"
-
-// extern HINSTANCE g_hInstance;
-#ifndef _UNICODE
-extern bool g_IsNT;
-#endif
-
-namespace NWindows {
-
-#ifndef _UNICODE
-ATOM MyRegisterClass(CONST WNDCLASSW *wndClass);
-#endif
-
-namespace NControl {
-
-#ifdef _WIN32
-static LRESULT CALLBACK WindowProcedure(HWND aHWND, UINT message,
-    WPARAM wParam, LPARAM lParam)
-{
-  CWindow tempWindow(aHWND);
-  if (message == WM_NCCREATE)
-    tempWindow.SetUserDataLongPtr(
-        LONG_PTR(((LPCREATESTRUCT)lParam)->lpCreateParams));
-  CWindow2 *window = (CWindow2*)(tempWindow.GetUserDataLongPtr());
-  if (window != NULL && message == WM_NCCREATE)
-    window->Attach(aHWND);
-  if (window == 0)
-  {
-    #ifndef _UNICODE
-    if (g_IsNT)
-      return DefWindowProcW(aHWND, message, wParam, lParam);
-    else
-    #endif
-      return DefWindowProc(aHWND, message, wParam, lParam);
-  }
-  return window->OnMessage(message, wParam, lParam);
-}
-
-bool CWindow2::CreateEx(DWORD exStyle, LPCTSTR className,
-      LPCTSTR windowName, DWORD style,
-      int x, int y, int width, int height,
-      HWND parentWindow, HMENU idOrHMenu,
-      HINSTANCE instance)
-{
-  WNDCLASS windowClass;
-  if(!::GetClassInfo(instance, className, &windowClass))
-  {
-    // windowClass.style          = CS_HREDRAW | CS_VREDRAW;
-    windowClass.style          = 0;
-
-    windowClass.lpfnWndProc    = WindowProcedure;
-    windowClass.cbClsExtra     = NULL;
-    windowClass.cbWndExtra     = NULL;
-    windowClass.hInstance      = instance;
-    windowClass.hIcon          = NULL;
-    windowClass.hCursor        = LoadCursor(NULL, IDC_ARROW);
-    windowClass.hbrBackground  = (HBRUSH)(COLOR_WINDOW + 1);
-    windowClass.lpszMenuName   = NULL;
-    windowClass.lpszClassName  = className;
-    if (::RegisterClass(&windowClass) == 0)
-      return false;
-  }
-  return CWindow::CreateEx(exStyle, className, windowName,
-      style, x, y, width, height, parentWindow,
-      idOrHMenu, instance, this);
-}
-
-#ifndef _UNICODE
-
-bool CWindow2::CreateEx(DWORD exStyle, LPCWSTR className,
-      LPCWSTR windowName, DWORD style,
-      int x, int y, int width, int height,
-      HWND parentWindow, HMENU idOrHMenu,
-      HINSTANCE instance)
-{
-  bool needRegister;
-  if(g_IsNT)
-  {
-    WNDCLASSW windowClass;
-    needRegister = ::GetClassInfoW(instance, className, &windowClass) == 0;
-  }
-  else
-  {
-    WNDCLASSA windowClassA;
-    AString classNameA;
-    LPCSTR classNameP;
-    if (IS_INTRESOURCE(className))
-      classNameP = (LPCSTR)className;
-    else
-    {
-      classNameA = GetSystemString(className);
-      classNameP = classNameA;
-    }
-    needRegister = ::GetClassInfoA(instance, classNameP, &windowClassA) == 0;
-  }
-  if (needRegister)
-  {
-    WNDCLASSW windowClass;
-    // windowClass.style          = CS_HREDRAW | CS_VREDRAW;
-    windowClass.style          = 0;
-    windowClass.lpfnWndProc    = WindowProcedure;
-    windowClass.cbClsExtra     = NULL;
-    windowClass.cbWndExtra     = NULL;
-    windowClass.hInstance      = instance;
-    windowClass.hIcon          = NULL;
-    windowClass.hCursor        = LoadCursor(NULL, IDC_ARROW);
-    windowClass.hbrBackground  = (HBRUSH)(COLOR_WINDOW + 1);
-    windowClass.lpszMenuName   = NULL;
-    windowClass.lpszClassName  = className;
-    if (MyRegisterClass(&windowClass) == 0)
-      return false;
-  }
-  return CWindow::CreateEx(exStyle, className, windowName,
-      style, x, y, width, height, parentWindow,
-      idOrHMenu, instance, this);
-
-}
-#endif
-
-LRESULT CWindow2::DefProc(UINT message, WPARAM wParam, LPARAM lParam)
-{
-  #ifndef _UNICODE
-  if (g_IsNT)
-    return DefWindowProcW(_window, message, wParam, lParam);
-  else
-  #endif
-    return DefWindowProc(_window, message, wParam, lParam);
-}
-#endif
-
-LRESULT CWindow2::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
-{
-  LRESULT result;
-  switch (message)
-  {
-    case WM_CREATE:
-      if (!OnCreate((CREATESTRUCT *)lParam))
-        return -1;
-      break;
-    case WM_COMMAND:
-      if (OnCommand(wParam, lParam, result))
-        return result;
-      break;
-    case WM_NOTIFY:
-      if (OnNotify((UINT)wParam, (LPNMHDR) lParam, result))
-        return result;
-      break;
-    case WM_DESTROY:
-      OnDestroy();
-      break;
-    case WM_CLOSE:
-      OnClose();
-      return 0;
-#ifdef _WIN32
-    case WM_SIZE:
-      if (OnSize(wParam, LOWORD(lParam), HIWORD(lParam)))
-        return 0;
-#endif
-  }
-#ifdef _WIN32
-  return DefProc(message, wParam, lParam);
-#else
-  return 0;
-#endif
-}
-
-bool CWindow2::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT &result)
-{
-  return OnCommand(HIWORD(wParam), LOWORD(wParam), lParam, result);
-}
-
-bool CWindow2::OnCommand(int /* code */, int /* itemID */, LPARAM /* lParam */, LRESULT & /* result */)
-{
-  return false;
-  // return DefProc(message, wParam, lParam);
-  /*
-  if (code == BN_CLICKED)
-    return OnButtonClicked(itemID, (HWND)lParam);
-  */
-}
-
-/*
-bool CDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
-{
-  switch(aButtonID)
-  {
-    case IDOK:
-      OnOK();
-      break;
-    case IDCANCEL:
-      OnCancel();
-      break;
-    case IDHELP:
-      OnHelp();
-      break;
-    default:
-      return false;
-  }
-  return true;
-}
-
-*/
-
-}}

data/ext/p7zip/CPP/Windows/Control/Window2.h

@@ -1,111 +0,0 @@
-// Windows/Control/Window2.h
-
-#ifndef __WINDOWS_CONTROL_WINDOW2_H
-#define __WINDOWS_CONTROL_WINDOW2_H
-
-#include "Windows/Window.h"
-#include "Windows/Defs.h"
-
-#ifndef _WIN32
-typedef void * WNDPROC;
-typedef void * CREATESTRUCT;
-typedef struct
-{
-	HWND  hwndFrom;
-
-	UINT  code;
-#define NM_DBLCLK       1
-#define LVN_ITEMCHANGED 2
-#define LVN_COLUMNCLICK 3	
-#define CBEN_BEGINEDIT  10
-#define CBEN_ENDEDITW   11
-	
-	
-} NMHDR;
-typedef NMHDR * LPNMHDR;
-
-typedef struct tagNMLISTVIEW
-{
-    NMHDR hdr;
-    INT iItem;
-    INT iSubItem;
-    UINT uNewState;
-    UINT uOldState;
-    // UINT uChanged;
-    // POINT ptAction;
-    LPARAM  lParam;
-} NMLISTVIEW, *LPNMLISTVIEW;
-
-typedef void * LPNMITEMACTIVATE;
-
-#define NM_RCLICK 1234 /* FIXME */
-
-// FIXME
-#define WM_CREATE 1
-#define WM_COMMAND 2
-#define WM_NOTIFY 3
-#define WM_DESTROY 4
-#define WM_CLOSE 5
-
-#define HIWORD(l)              ((WORD)((DWORD_PTR)(l) >> 16))
-#define LOWORD(l)              ((WORD)((DWORD_PTR)(l) & 0xFFFF))
-
-
-#endif
-
-namespace NWindows {
-namespace NControl {
-
-class CWindow2 // : public CWindow
-{
-  // LRESULT DefProc(UINT message, WPARAM wParam, LPARAM lParam);
-public:
-  // CWindow2(HWND newWindow = NULL): CWindow(newWindow){};
-  CWindow2() {}
-  virtual ~CWindow2() {}
-
-#ifdef _WIN32
-  bool CreateEx(DWORD exStyle, LPCTSTR className,
-      LPCTSTR windowName, DWORD style,
-      int x, int y, int width, int height,
-      HWND parentWindow, HMENU idOrHMenu,
-      HINSTANCE instance);
-
-  #ifndef _UNICODE
-  bool CreateEx(DWORD exStyle, LPCWSTR className,
-      LPCWSTR windowName, DWORD style,
-      int x, int y, int width, int height,
-      HWND parentWindow, HMENU idOrHMenu,
-      HINSTANCE instance);
-  #endif
-#endif
-
-  virtual LRESULT OnMessage(UINT message, WPARAM wParam, LPARAM lParam);
-  virtual bool OnCreate(CREATESTRUCT * /* createStruct */) { return true; }
-  // virtual LRESULT OnCommand(WPARAM wParam, LPARAM lParam);
-  virtual bool OnCommand(WPARAM wParam, LPARAM lParam, LRESULT &result);
-  virtual bool OnCommand(int code, int itemID, LPARAM lParam, LRESULT &result);
-  virtual bool OnSize(WPARAM /* wParam */, int /* xSize */, int /* ySize */) { return false; }
-  virtual bool OnNotify(UINT /* controlID */, LPNMHDR /* lParam */, LRESULT & /* result */) { return false; }
-  virtual void OnDestroy() { /* FIXME PostQuitMessage(0); */ }
-  virtual void OnClose() { /* FIXME Destroy(); */ }
-  /*
-  virtual LRESULT  OnHelp(LPHELPINFO helpInfo) { OnHelp(); };
-  virtual LRESULT  OnHelp() {};
-  virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
-  virtual void OnOK() {};
-  virtual void OnCancel() {};
-  */
-
-#ifdef _WIN32
-  LONG_PTR SetMsgResult(LONG_PTR newLongPtr )
-    { return SetLongPtr(DWLP_MSGRESULT, newLongPtr); }
-  LONG_PTR GetMsgResult() const
-    { return GetLongPtr(DWLP_MSGRESULT); }
-#endif
-};
-
-}}
-
-#endif
-

data/ext/p7zip/CPP/Windows/DLL.cpp

@@ -1,193 +0,0 @@
-// Windows/DLL.cpp
-
-#include "StdAfx.h"
-
-#ifdef __APPLE_CC__
-#include <mach-o/dyld.h>
-#elif ENV_BEOS
-#include <kernel/image.h>
-#include <Path.h>
-#else
-#define UINT64 DLL_UINT64 // HP-UX , dlfcn.h defines UINT64 but p7zip also defines UINT64
-#include <dlfcn.h>  // dlopen ...
-#undef UINT64
-#endif
-
-#include "DLL.h"
-#include "Defs.h"
-#ifdef _UNICODE
-#include "../Common/StringConvert.h"
-#endif
-
-#define NEED_NAME_WINDOWS_TO_UNIX
-#include "myPrivate.h"
-
-// #define TRACEN(u) u;
-#define TRACEN(u)  /* */
-
-namespace NWindows {
-namespace NDLL {
-
-CLibrary::~CLibrary()
-{
-  Free();
-}
-
-bool CLibrary::Free()
-{
-TRACEN((printf("CLibrary::Free(%p)\n",(void *)_module)))
-  if (_module == 0)
-    return true;
-
-#ifdef __APPLE_CC__
-  int ret = NSUnLinkModule ((NSModule)_module, 0);
-#elif ENV_BEOS
-  int ret = unload_add_on((image_id)_module);
-#else
-  int ret = dlclose(_module);
-#endif
-TRACEN((printf("CLibrary::Free dlclose(%p)=%d\n",(void *)_module,ret)))
-  if (ret != 0) return false;
-  _module = 0;
-  return true;
-}
-
-static FARPROC local_GetProcAddress(HMODULE module,LPCSTR lpProcName)
-{
-  void *ptr = 0;
-  TRACEN((printf("local_GetProcAddress(%p,%s)\n",(void *)module,lpProcName)))
-  if (module) {
-#ifdef __APPLE_CC__
-    char name[MAX_PATHNAME_LEN];
-    snprintf(name,sizeof(name),"_%s",lpProcName);
-    name[sizeof(name)-1] = 0;
-    TRACEN((printf("NSLookupSymbolInModule(%p,%s)\n",(void *)module,name)))
-    NSSymbol sym;
-    sym = NSLookupSymbolInModule((NSModule)module, name);
-    if (sym) {
-      ptr = NSAddressOfSymbol(sym);
-    } else {
-      ptr = 0;
-    }
-#elif ENV_BEOS
-    if (get_image_symbol((image_id)module, lpProcName, B_SYMBOL_TYPE_TEXT, &ptr) != B_OK)
-      ptr = 0;
-#else
-    ptr = dlsym (module, lpProcName);
-#endif
-	TRACEN((printf("CLibrary::GetProc : dlsym(%p,%s)=%p\n",(void *)module,lpProcName,ptr)))
-  }
-  return (FARPROC)ptr;
-}
-
-FARPROC CLibrary::GetProc(LPCSTR lpProcName) const
-{
-  TRACEN((printf("CLibrary::GetProc(%p,%s)\n",(void *)_module,lpProcName)))
-  return local_GetProcAddress(_module,lpProcName);
-}
-
-bool CLibrary::LoadOperations(HMODULE newModule)
-{
-  if (newModule == NULL)
-    return false;
-  if(!Free())
-    return false;
-  _module = newModule;
-  return true;
-}
-
-bool CLibrary::Load(LPCTSTR lpLibFileName)
-{
-  void *handler = 0;
-  char  name[MAX_PATHNAME_LEN+1];
-#ifdef _UNICODE
-  AString name2 = UnicodeStringToMultiByte(lpLibFileName);
-  strcpy(name,nameWindowToUnix((const char *)name2));
-#else
-  strcpy(name,nameWindowToUnix(lpLibFileName));
-#endif
-  
-  // replace ".dll" with ".so"
-  size_t len = strlen(name);
-  if ((len >=4) && (strcmp(name+len-4,".dll") == 0)) {
-    strcpy(name+len-4,".so");
-  }
-
-  TRACEN((printf("CLibrary::Load(%ls) => %s\n",lpLibFileName,name)))
-
-#ifdef __APPLE_CC__
-  NSObjectFileImage image;
-  NSObjectFileImageReturnCode nsret;
-
-  nsret = NSCreateObjectFileImageFromFile (name, &image);
-  if (nsret == NSObjectFileImageSuccess) {
-     TRACEN((printf("NSCreateObjectFileImageFromFile(%s) : OK\n",name)))
-     handler = (HMODULE)NSLinkModule(image,name,NSLINKMODULE_OPTION_RETURN_ON_ERROR
-           | NSLINKMODULE_OPTION_PRIVATE | NSLINKMODULE_OPTION_BINDNOW);
-  } else {
-     TRACEN((printf("NSCreateObjectFileImageFromFile(%s) : ERROR\n",name)))
-  }
-#elif ENV_BEOS
-  // normalize path (remove things like "./", "..", etc..), otherwise it won't work
-  BPath p(name, NULL, true);
-  status_t err = B_OK;
-  image_id image = load_add_on(p.Path());
-TRACEN((printf("load_add_on(%s)=%d\n",p.Path(),(int)image)))
-  if (image < 0) {
-    err = (image_id)handler;
-    handler = 0;
-  } else {
-    err = 0;
-    handler = (HMODULE)image;
-  }
-#else
-  int options_dlopen = 0;
-#ifdef RTLD_LOCAL
-  options_dlopen |= RTLD_LOCAL;
-#endif
-#ifdef RTLD_NOW
-  options_dlopen |= RTLD_NOW;
-#endif
-#ifdef RTLD_GROUP
-  #if ! (defined(hpux) || defined(__hpux))
-  options_dlopen |= RTLD_GROUP; // mainly for solaris but not for HPUX
-  #endif
-#endif
-  TRACEN((printf("CLibrary::Load - dlopen(%s,0x%d)\n",name,options_dlopen)))
-  handler = dlopen(name,options_dlopen);
-#endif // __APPLE_CC__
-  TRACEN((printf("CLibrary::Load(%s) => %p\n",name,handler)))
-  if (handler) {
-
-    // Call DllMain() like in Windows : useless now
-
-    // Propagate the value of global_use_utf16_conversion into the plugins
-    int *tmp = (int *)local_GetProcAddress(handler,"global_use_utf16_conversion");
-    if (tmp) *tmp = global_use_utf16_conversion;
-
-    tmp = (int *)local_GetProcAddress(handler,"global_use_lstat");
-    if (tmp) *tmp = global_use_lstat;
-
-    // test construtors calls
-    void (*fctTest)(void) = (void (*)(void))local_GetProcAddress(handler,"sync_TestConstructor");
-    if (fctTest) fctTest();
-
-  } else {
-#ifdef __APPLE_CC__
-    NSLinkEditErrors c;
-    int num_err;
-    const char *file,*err;
-    NSLinkEditError(&c,&num_err,&file,&err);
-    printf("Can't load '%ls' (%s)\n", lpLibFileName,err);
-#elif ENV_BEOS
-    printf("Can't load '%ls' (%s)\n", lpLibFileName,strerror(err));
-#else
-    printf("Can't load '%ls' (%s)\n", lpLibFileName,dlerror());
-#endif
-  } 
-
-  return LoadOperations(handler);
-}
-
-}}
-

data/ext/p7zip/CPP/Windows/DLL.h

@@ -1,48 +0,0 @@
-// Windows/DLL.h
-
-#ifndef __WINDOWS_DLL_H
-#define __WINDOWS_DLL_H
-
-#include "../Common/MyString.h"
-
-typedef void * HMODULE;
-
-typedef int (*FARPROC)();
-
-namespace NWindows {
-namespace NDLL {
-
-class CLibrary
-{
-  bool LoadOperations(HMODULE newModule);
-  HMODULE _module;
-public:
-  operator HMODULE() const { return _module; }
-  HMODULE* operator&() { return &_module; }
-
-
-  CLibrary():_module(NULL) {};
-  ~CLibrary();
-
-  bool Free();
-
-  void Attach(HMODULE m)
-  {
-    Free();
-    _module = m;
-  }
-  HMODULE Detach()
-  {
-    HMODULE m = _module;
-    _module = NULL;
-    return m;
-  }
-
-
-  bool Load(LPCTSTR fileName);
-  FARPROC GetProc(LPCSTR procName) const;
-};
-
-}}
-
-#endif

data/ext/p7zip/CPP/Windows/Error.cpp

@@ -1,58 +0,0 @@
-// Windows/Error.h
-
-#include "StdAfx.h"
-
-#include "Windows/Error.h"
-#include "Common/StringConvert.h"
-
-namespace NWindows {
-namespace NError {
-
-bool MyFormatMessage(DWORD messageID, CSysString &message)
-{
-  const char * txt = 0;
-  AString msg;
-
-  switch(messageID) {
-    case ERROR_NO_MORE_FILES   : txt = "No more files"; break ;
-    case E_NOTIMPL             : txt = "E_NOTIMPL"; break ;
-    case E_NOINTERFACE         : txt = "E_NOINTERFACE"; break ;
-    case E_ABORT               : txt = "E_ABORT"; break ;
-    case E_FAIL                : txt = "E_FAIL"; break ;
-    case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ;
-    case E_OUTOFMEMORY         : txt = "E_OUTOFMEMORY"; break ;
-    case E_INVALIDARG          : txt = "E_INVALIDARG"; break ;
-    default:
-      txt = strerror(messageID);
-  }
-  if (txt) {
-    msg = txt;
-  } else {
-    char msgBuf[256];
-    snprintf(msgBuf,sizeof(msgBuf),"error #%x",(unsigned)messageID);
-    msgBuf[sizeof(msgBuf)-1] = 0;
-    msg = msgBuf;
-  }
-  
-  msg += "                ";
-
-#ifdef _UNICODE
-  message = MultiByteToUnicodeString(msg);
-#else
-  message = msg;
-#endif
-  return true;
-}
-
-#ifndef _UNICODE
-bool MyFormatMessage(DWORD messageID, UString &message)
-{
-    CSysString messageSys;
-    bool result = MyFormatMessage(messageID, messageSys);
-    message = GetUnicodeString(messageSys);
-    return result;
-}
-#endif
-
-}}
-

data/ext/p7zip/CPP/Windows/Error.h

@@ -1,33 +0,0 @@
-// Windows/Error.h
-
-#ifndef __WINDOWS_ERROR_H
-#define __WINDOWS_ERROR_H
-
-#include "Common/MyString.h"
-
-namespace NWindows {
-namespace NError {
-
-bool MyFormatMessage(DWORD messageID, CSysString &message);
-inline CSysString MyFormatMessage(DWORD messageID)
-{
-  CSysString message;
-  MyFormatMessage(messageID, message);
-  return message;
-}
-#ifdef _UNICODE
-inline UString MyFormatMessageW(DWORD messageID)
-  { return MyFormatMessage(messageID); }
-#else
-bool MyFormatMessage(DWORD messageID, UString &message);
-inline UString MyFormatMessageW(DWORD messageID)
-{
-  UString message;
-  MyFormatMessage(messageID, message);
-  return message;
-}
-#endif
-
-}}
-
-#endif

data/ext/p7zip/CPP/Windows/Menu.h

@@ -1,4 +0,0 @@
-
-/* TODO */
-
-