[Winmerge-svn] SF.net SVN: winmerge: [4278] branches/R2_6/Plugins
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
Menu
▾
▴
[Winmerge-svn] SF.net SVN: winmerge: [4278] branches/R2_6/Plugins
|
From: <ge...@us...> - 2007-05-12 11:30:04
|
Revision: 4278
http://svn.sourceforge.net/winmerge/?rev=4278&view=rev
Author: gerundt
Date: 2007-05-12 04:29:16 -0700 (Sat, 12 May 2007)
Log Message:
-----------
PATCH: [ 1717461 ] Use DisplayBinaryFiles plugin from WinMergeX
Modified Paths:
--------------
branches/R2_6/Plugins/Changes.txt
branches/R2_6/Plugins/dlls/DisplayBinaryFiles.dll
branches/R2_6/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.dsp
branches/R2_6/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.rc
branches/R2_6/Plugins/src_VCPP/DisplayBinaryFiles/WinMergeScript.cpp
branches/R2_6/Plugins/src_VCPP/DisplayBinaryFiles/typeinfoex.h
Modified: branches/R2_6/Plugins/Changes.txt
===================================================================
--- branches/R2_6/Plugins/Changes.txt 2007-05-12 11:27:48 UTC (rev 4277)
+++ branches/R2_6/Plugins/Changes.txt 2007-05-12 11:29:16 UTC (rev 4278)
@@ -2,6 +2,13 @@
Add new items to top
(This summarizes all changes to all plugins.)
+2007-05-12 Tim
+ PATCH: [ 1717461 ] Use DisplayBinaryFiles plugin from WinMergeX
+ Plugins\dlls:
+ DisplayBinaryFiles.dll
+ Plugins\src_VCPP\DisplayBinaryFiles:
+ DisplayBinaryFiles.dsp DisplayBinaryFiles.rc typeinfoex.h WinMergeScript.cpp
+
2007-01-14 Tim
PATCH: [ 1633944 ] Fix VB example plugin "IgnoreTwoFirstCharsOrder"
Plugins\src_VB\IgnoreTwoFirstCharsOrder:
Modified: branches/R2_6/Plugins/dlls/DisplayBinaryFiles.dll
===================================================================
(Binary files differ)
Modified: branches/R2_6/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.dsp
===================================================================
--- branches/R2_6/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.dsp 2007-05-12 11:27:48 UTC (rev 4277)
+++ branches/R2_6/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.dsp 2007-05-12 11:29:16 UTC (rev 4278)
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=xilink6.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 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:"..\..\..\Build\MergeDebug/DisplayBinaryFiles.dll" /pdbtype:sept
+# ADD 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 /out:"..\..\..\Build\MergeDebug\MergePlugins/DisplayBinaryFiles.dll" /pdbtype:sept
!ELSEIF "$(CFG)" == "DisplayBinaryFiles - Win32 Unicode Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=xilink6.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 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:"..\..\..\Build\MergeUnicodeDebug/DisplayBinaryFiles.dll" /pdbtype:sept
+# ADD 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 /out:"..\..\..\Build\MergeUnicodeDebug\MergePlugins/DisplayBinaryFiles.dll" /pdbtype:sept
!ELSEIF "$(CFG)" == "DisplayBinaryFiles - Win32 Release MinSize"
@@ -102,7 +102,7 @@
# ADD BSC32 /nologo
LINK32=xilink6.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 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:"..\..\..\Build\MergeReleaseMinSize/DisplayBinaryFiles.dll"
+# ADD 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 /out:"..\..\..\Build\MergeReleaseMinSize\MergePlugins/DisplayBinaryFiles.dll"
!ELSEIF "$(CFG)" == "DisplayBinaryFiles - Win32 Release MinDependency"
@@ -126,7 +126,7 @@
# ADD BSC32 /nologo
LINK32=xilink6.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 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:"..\..\..\Build\MergeRelease/DisplayBinaryFiles.dll"
+# ADD 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 /out:"..\..\..\Build\MergeRelease\MergePlugins/DisplayBinaryFiles.dll"
!ELSEIF "$(CFG)" == "DisplayBinaryFiles - Win32 Unicode Release MinSize"
@@ -150,7 +150,7 @@
# ADD BSC32 /nologo
LINK32=xilink6.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 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:"..\..\..\Build\MergeUnicodeReleaseMinSize/DisplayBinaryFiles.dll"
+# ADD 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 /out:"..\..\..\Build\MergeUnicodeReleaseMinSize\MergePlugins/DisplayBinaryFiles.dll"
!ELSEIF "$(CFG)" == "DisplayBinaryFiles - Win32 Unicode Release MinDependency"
@@ -174,7 +174,7 @@
# ADD BSC32 /nologo
LINK32=xilink6.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 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:"..\..\..\Build\MergeUnicodeRelease/DisplayBinaryFiles.dll"
+# ADD 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 /out:"..\..\..\Build\MergeUnicodeRelease\MergePlugins/DisplayBinaryFiles.dll"
!ENDIF
Modified: branches/R2_6/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.rc
===================================================================
--- branches/R2_6/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.rc 2007-05-12 11:27:48 UTC (rev 4277)
+++ branches/R2_6/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.rc 2007-05-12 11:29:16 UTC (rev 4278)
@@ -54,8 +54,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,4,0
- PRODUCTVERSION 1,0,4,0
+ FILEVERSION 1,0,5,17115
+ PRODUCTVERSION 1,0,5,17115
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -72,12 +72,12 @@
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DisplayBinaryFiles Module\0"
- VALUE "FileVersion", "1, 0, 4, 0\0"
+ VALUE "FileVersion", "1, 0, 5, 17115\0"
VALUE "InternalName", "DisplayBinaryFiles\0"
- VALUE "LegalCopyright", "Copyright 2003-2006\0"
+ VALUE "LegalCopyright", "Copyright 2003-2007\0"
VALUE "OriginalFilename", "DisplayBinaryFiles.DLL\0"
VALUE "ProductName", "DisplayBinaryFiles Module\0"
- VALUE "ProductVersion", "1, 0, 4, 0\0"
+ VALUE "ProductVersion", "1, 0, 5, 17115\0"
VALUE "OLESelfRegister", "\0"
END
END
Modified: branches/R2_6/Plugins/src_VCPP/DisplayBinaryFiles/WinMergeScript.cpp
===================================================================
--- branches/R2_6/Plugins/src_VCPP/DisplayBinaryFiles/WinMergeScript.cpp 2007-05-12 11:27:48 UTC (rev 4277)
+++ branches/R2_6/Plugins/src_VCPP/DisplayBinaryFiles/WinMergeScript.cpp 2007-05-12 11:29:16 UTC (rev 4278)
@@ -78,17 +78,35 @@
if (beginning)
{
if (CheckForBom(buffer, curlen, &uninfo))
- i += uninfo.bom_width;
+ i += uninfo.bom_width;
beginning = false;
}
+ char * p1 = (char *)buffer;
+ short * p2 = (short *)buffer;
+ int * p4 = (int *)buffer;
for ( ; i < curlen ; i += uninfo.char_width)
{
- int index = i+uninfo.low_byte;
- if (i+index < curlen && buffer[index] == 0)
+ if (i + (uninfo.char_width-1) < curlen)
{
- buffer[index] = 0x20;
+ int index = i/uninfo.char_width;
+ if (uninfo.char_width == 1)
+ {
+ if (p1[index] == 0)
+ p1[index] = 0x20;
+ }
+ else if (uninfo.char_width == 2)
+ {
+ if (p2[index] == 0)
+ p2[index] = 0x20;
+ }
+ else // uninfo.char_width == 4
+ {
+ if (p4[index] == 0)
+ p4[index] = 0x20;
+ }
}
}
+
output.write(buffer, curlen);
len -= curlen;
}
Modified: branches/R2_6/Plugins/src_VCPP/DisplayBinaryFiles/typeinfoex.h
===================================================================
--- branches/R2_6/Plugins/src_VCPP/DisplayBinaryFiles/typeinfoex.h 2007-05-12 11:27:48 UTC (rev 4277)
+++ branches/R2_6/Plugins/src_VCPP/DisplayBinaryFiles/typeinfoex.h 2007-05-12 11:29:16 UTC (rev 4278)
@@ -89,7 +89,8 @@
for (int i=0; i<(int)cNames; i++)
{
int n = ocslen(rgszNames[i]);
- for (int j=m_nCount-1; j>=0; j--)
+ int j=0;
+ for (j=m_nCount-1; j>=0; j--)
{
if ((n == m_pMap[j].nLen) &&
(memcmp(m_pMap[j].bstr, rgszNames[i], m_pMap[j].nLen * sizeof(OLECHAR)) == 0))
@@ -153,7 +154,7 @@
USES_CONVERSION;
//If this assert occurs then most likely didn't initialize properly
ATLASSERT(m_plibid != NULL && m_pguid != NULL);
- ATLASSERT(!::InlineIsEqualGUID(*m_plibid, GUID_NULL) && "Did you forget to pass the LIBID to CComModule::Init?");
+ ATLASSERT(!InlineIsEqualGUID(*m_plibid, GUID_NULL) && "Did you forget to pass the LIBID to CComModule::Init?");
if (m_pInfo != NULL)
return S_OK;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|