From d2f445dd8c0946886284a9e598726e291fb54205 Mon Sep 17 00:00:00 2001 From: Perry Rapp Date: Wed, 30 Nov 2005 22:49:33 +0000 Subject: [PATCH] BUG: [ 1368755 ] Want comment on format line in 7ZCommon.cpp Cosmetic: adding explanatory comment to Merge7z::Proxy::operator-> Src: 7zCommon.cpp --- Src/7zCommon.cpp | 8 ++++++++ Src/Changes.txt | 3 +++ 2 files changed, 11 insertions(+) diff --git a/Src/7zCommon.cpp b/Src/7zCommon.cpp index 875da67bc..6dee45af9 100644 --- a/Src/7zCommon.cpp +++ b/Src/7zCommon.cpp @@ -675,8 +675,16 @@ BOOL CALLBACK FindNextResLang(HMODULE hModule, LPCTSTR lpType, LPCTSTR lpName, W */ interface Merge7z *Merge7z::Proxy::operator->() { + // As long as the Merge7z*.DLL has not yet been loaded, Merge7z + // [0] points to the name of the DLL (with placeholders for 7- + // Zip major and minor version numbers). Once the DLL has been + // loaded successfully, Merge7z[0] is set to NULL, causing the + // if to fail on subsequent calls. + if (const char *format = Merge7z[0]) { + // Merge7z has not yet been loaded + char name[MAX_PATH]; DWORD flags = ~0; CException *pCause = NULL; diff --git a/Src/Changes.txt b/Src/Changes.txt index 23cdb08e8..106d3f411 100644 --- a/Src/Changes.txt +++ b/Src/Changes.txt @@ -3,6 +3,9 @@ Src: DiffThread.cpp BUG: [ 1369856 ] Crashed when interface language is changed Src: DirDoc.cpp + BUG: [ 1368755 ] Want comment on format line in 7ZCommon.cpp + Cosmetic: adding explanatory comment to Merge7z::Proxy::operator-> + Src: 7zCommon.cpp 2005-11-30 Kimmo PATCH: [ 1369544 ] Catalan translation update -- 2.11.0