diff -ur G:\FGCVS\tidywrap\tidyatl\Test\TestTidyCOM.vbp tidyatl\Test\TestTidyCOM.vbp --- G:\FGCVS\tidywrap\tidyatl\Test\TestTidyCOM.vbp Tue Jan 06 03:35:16 2004 +++ tidyatl\Test\TestTidyCOM.vbp Thu Sep 20 18:37:08 2007 @@ -1,6 +1,6 @@ Type=Exe -Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINNT\System32\Stdole2.tlb#OLE Automation -Reference=*\G{B5CF687E-9F77-4290-B864-B6348402085A}#1.0#0#..\Debug\TidyATL.dll#Tidy 1.0 Type Library +Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINDOWS\system32\STDOLE2.TLB#OLE Automation +Reference=*\G{B5CF687E-9F77-4290-B864-B6348402085A}#1.0#0#..\ReleaseUMinSize\TidyATL.dll#Tidy 1.0 Type Library Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX Form=TidyInputForm.frm IconForm="TidyInputForm" diff -ur G:\FGCVS\tidywrap\tidyatl\Test\TestTidyCOM.vbw tidyatl\Test\TestTidyCOM.vbw --- G:\FGCVS\tidywrap\tidyatl\Test\TestTidyCOM.vbw Tue Jan 06 03:35:16 2004 +++ tidyatl\Test\TestTidyCOM.vbw Thu Sep 20 18:54:30 2007 @@ -1 +1 @@ -TidyInputForm = 3, 5, 716, 732, C, 24, 64, 631, 797, C +TidyInputForm = 3, 5, 716, 732, Z, 24, 64, 631, 797, C diff -ur G:\FGCVS\tidywrap\tidyatl\Test\TidyInputForm.frm tidyatl\Test\TidyInputForm.frm --- G:\FGCVS\tidywrap\tidyatl\Test\TidyInputForm.frm Tue Jan 06 03:35:16 2004 +++ tidyatl\Test\TidyInputForm.frm Thu Sep 20 16:14:57 2007 @@ -2,12 +2,12 @@ Object = "{F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0"; "COMDLG32.OCX" Begin VB.Form TidyInputForm Caption = "TidyInputForm" - ClientHeight = 6216 - ClientLeft = 48 - ClientTop = 336 - ClientWidth = 5952 - ScaleHeight = 6216 - ScaleWidth = 5952 + ClientHeight = 6225 + ClientLeft = 45 + ClientTop = 330 + ClientWidth = 5955 + ScaleHeight = 6225 + ScaleWidth = 5955 StartUpPosition = 3 'Windows Default Begin VB.TextBox MarkupInput Height = 1212 @@ -70,8 +70,8 @@ Begin MSComDlg.CommonDialog OpenConfigDlg Left = 360 Top = 180 - _ExtentX = 677 - _ExtentY = 677 + _ExtentX = 688 + _ExtentY = 688 _Version = 393216 DialogTitle = "Open Tidy Configuration File" Filter = "Tidy Config(*.tidy)|*.tidy|Text Files (*.txt)|*.txt|Config Files (*.cfg)|*.cfg|All Files (*.*)|*.*" @@ -133,18 +133,18 @@ Begin MSComDlg.CommonDialog OpenInputDlg Left = 360 Top = 660 - _ExtentX = 677 - _ExtentY = 677 + _ExtentX = 688 + _ExtentY = 688 _Version = 393216 DialogTitle = "Open Markup File" - Filter = "HTML File (*.html;*.htm)|*.html,*.htm|XML Files (*.xml;*.xsd;*.xsl)|*.xml;*.xsd;*.xsl|All Files (*.*)|*.*" + Filter = "HTML File (*.html,*.htm)|*.html;*.htm|XML Files (*.xml,*.xsd,*.xsl)|*.xml;*.xsd;*.xsl|All Files (*.*)|*.*" Flags = 4096 End Begin MSComDlg.CommonDialog ChooseOutputDlg Left = 360 Top = 1080 - _ExtentX = 677 - _ExtentY = 677 + _ExtentX = 688 + _ExtentY = 688 _Version = 393216 DialogTitle = "Choose Markup Output File" Filter = "HTML File (*.html;*.htm)|*.html,*.htm|XML Files (*.xml;*.xsd;*.xsl)|*.xml;*.xsd;*.xsl|All Files (*.*)|*.*" @@ -153,8 +153,8 @@ Begin MSComDlg.CommonDialog ChooseErrorDlg Left = 360 Top = 1500 - _ExtentX = 677 - _ExtentY = 677 + _ExtentX = 688 + _ExtentY = 688 _Version = 393216 DialogTitle = "Choose Error File" FileName = "tidyerr.txt" @@ -316,7 +316,7 @@ If stat >= 0 And Len(ErrorFile) > 0 Then stat = tdoc.SetErrorFile(ErrorFile) End If - If stat >= 0 Then + If stat >= 0 And Len(ConfigFile) > 0 Then stat = tdoc.LoadConfig(ConfigFile) End If If stat >= 0 Then @@ -353,11 +353,15 @@ If Len(ErrorFile) > 0 Then stat = tdoc.SetErrorFile(ErrorFile) End If - If stat >= 0 Then + If ((stat >= 0) And Len(ConfigFile)) Then stat = tdoc.LoadConfig(ConfigFile) End If If stat >= 0 Then - stat = tdoc.ParseFile(InputFile) + If Len(InputFile) > 0 Then + stat = tdoc.ParseFile(InputFile) + Else + stat = -1 + End If End If If stat >= 0 Then stat = tdoc.CleanAndRepair() @@ -369,7 +373,9 @@ ok = tdoc.SetOptBool(TidyForceOutput, True) End If If stat >= 0 Then - stat = tdoc.SaveFile(OutputFile) + If Len(OutputFile) > 0 Then + stat = tdoc.SaveFile(OutputFile) + End If End If GoTo Done @@ -435,8 +441,10 @@ lvl = "Config: " ElseIf level = TidyError Then lvl = "Error: " - ElseIf level = TidySystem Then + ElseIf level = TidyBadDocument Then lvl = "Doc: " + ElseIf level = TidyFatal Then + lvl = "Fatal: " Else lvl = "???: " End If diff -ur G:\FGCVS\tidywrap\tidyatl\Tidy.cpp tidyatl\Tidy.cpp --- G:\FGCVS\tidywrap\tidyatl\Tidy.cpp Tue Jan 06 03:35:16 2004 +++ tidyatl\Tidy.cpp Thu Sep 20 16:24:23 2007 @@ -8,9 +8,9 @@ #include "stdafx.h" #include "resource.h" #include -#include "TidyATL.h" +#include "TidyCOM.h" -#include "TidyATL_i.c" +#include "Tidy_i.c" #include "TidyDocument.h" @@ -23,7 +23,7 @@ ///////////////////////////////////////////////////////////////////////////// // DLL Entry Point -void main() +void __cdecl main() { } diff -ur G:\FGCVS\tidywrap\tidyatl\Tidy.dsp tidyatl\Tidy.dsp --- G:\FGCVS\tidywrap\tidyatl\Tidy.dsp Tue Jan 06 03:35:15 2004 +++ tidyatl\Tidy.dsp Thu Sep 20 19:01:25 2007 @@ -47,8 +47,8 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "d:\code\tidy\include" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D SUPPORT_UTF16_ENCODINGS=1 /Yu"stdafx.h" /FD /GZ /c -# ADD MTL /I "d:\tidytag\include" +# ADD CPP /nologo /Gz /MTd /W3 /Gm /ZI /Od /I "..\tidycom\include" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D SUPPORT_UTF16_ENCODINGS=1 /Yu"stdafx.h" /FD /GZ /c +# ADD MTL /I "d:\tidytag\include" /I "..\tidycom\include" # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -56,7 +56,7 @@ # ADD BSC32 /nologo /o"Debug/TidyATL.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 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/TidyATL.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 libtidy.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/TidyATL.dll" /pdbtype:sept # Begin Custom Build - Performing registration OutDir=.\Debug TargetPath=.\Debug\TidyATL.dll @@ -83,8 +83,8 @@ # 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 /MDd /W3 /Gm /ZI /Od /I "d:\tidytag\include" /I "d:\code\tidy\include" /D "_DEBUG" /D "_UNICODE" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D SUPPORT_UTF16_ENCODINGS=1 /Yu"stdafx.h" /FD /GZ /c -# ADD MTL /I "d:\tidytag\include" +# ADD CPP /nologo /Gz /MTd /W3 /Gm /ZI /Od /I "..\tidycom\include" /D "_DEBUG" /D "_UNICODE" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D SUPPORT_UTF16_ENCODINGS=1 /Yu"stdafx.h" /FD /GZ /c +# ADD MTL /I "..\tidycom\include" # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -92,11 +92,11 @@ # ADD BSC32 /nologo 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 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 /libpath:"d:\tidytag\debug" +# ADD LINK32 libtidy.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:"DebugU/TidyATL.dll" /pdbtype:sept /libpath:"..\tidycom\build\msvc\release" # Begin Custom Build - Performing registration OutDir=.\DebugU -TargetPath=.\DebugU\Tidy.dll -InputPath=.\DebugU\Tidy.dll +TargetPath=.\DebugU\TidyATL.dll +InputPath=.\DebugU\TidyATL.dll SOURCE="$(InputPath)" "$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" @@ -125,8 +125,8 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MT /W3 /O1 /I "d:\tidytag\include" /I "d:\code\tidy\include" /D "NDEBUG" /D "_MBCS" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D SUPPORT_UTF16_ENCODINGS=1 /Yu"stdafx.h" /FD /c -# ADD MTL /I "d:\code\tidy\include" +# ADD CPP /nologo /Gz /MT /W3 /O1 /I "..\tidycom\include" /D "NDEBUG" /D "_MBCS" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D SUPPORT_UTF16_ENCODINGS=1 /Yu"stdafx.h" /FD /c +# ADD MTL /I "..\tidycom\include" # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -134,7 +134,7 @@ # ADD BSC32 /nologo 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 libtidy.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:"ReleaseMinSize/TidyATL.dll" /libpath:"d:\code\tidy\build\msvc\Release" +# ADD LINK32 libtidy.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:"ReleaseMinSize/TidyATL.dll" /libpath:"..\tidycom\build\msvc\Release" # Begin Custom Build - Performing registration OutDir=.\ReleaseMinSize TargetPath=.\ReleaseMinSize\TidyATL.dll @@ -161,8 +161,8 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MT /W3 /O1 /I "d:\tidy\include" /I "d:\code\tidy\include" /D "NDEBUG" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D SUPPORT_UTF16_ENCODINGS=1 /Yu"stdafx.h" /FD /c -# ADD MTL /I "d:\code\tidy\include" +# ADD CPP /nologo /Gz /MT /W3 /O1 /I "..\tidycom\include" /D "NDEBUG" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D SUPPORT_UTF16_ENCODINGS=1 /Yu"stdafx.h" /FD /c +# ADD MTL /I "..\tidycom\include" # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -170,7 +170,7 @@ # ADD BSC32 /nologo 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 libtidy.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:"ReleaseMinDependency/TidyATL.dll" /libpath:"d:\code\tidy\build\msvc\Release" /FORCE:MULTIPLE +# ADD LINK32 libtidy.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:"ReleaseMinDependency/TidyATL.dll" /libpath:"..\tidycom\build\msvc\Release" /FORCE:MULTIPLE # SUBTRACT LINK32 /pdb:none # Begin Custom Build - Performing registration OutDir=.\ReleaseMinDependency @@ -198,8 +198,8 @@ # 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_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MT /W3 /O1 /I "d:\tidytag\include" /I "d:\code\tidy\include" /D "NDEBUG" /D "_UNICODE" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D SUPPORT_UTF16_ENCODINGS=1 /Yu"stdafx.h" /FD /c -# ADD MTL /I "d:\code\tidy\include" +# ADD CPP /nologo /Gz /MT /W3 /O1 /I "..\tidycom\include" /D "NDEBUG" /D "_UNICODE" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D SUPPORT_UTF16_ENCODINGS=1 /Yu"stdafx.h" /FD /c +# ADD MTL /I "..\tidycom\include" # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -207,11 +207,11 @@ # ADD BSC32 /nologo 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 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 /libpath:"d:\tidytag\release" +# ADD LINK32 libtidy.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 libtidy.lib /nologo /subsystem:windows /dll /machine:I386 /out:"ReleaseUMinSize/TidyATL.dll" /libpath:"..\tidycom\build\msvc\release" # Begin Custom Build - Performing registration OutDir=.\ReleaseUMinSize -TargetPath=.\ReleaseUMinSize\Tidy.dll -InputPath=.\ReleaseUMinSize\Tidy.dll +TargetPath=.\ReleaseUMinSize\TidyATL.dll +InputPath=.\ReleaseUMinSize\TidyATL.dll SOURCE="$(InputPath)" "$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" @@ -240,8 +240,8 @@ # 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:\tidytag\include" /I "d:\code\tidy\include" /D "NDEBUG" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D SUPPORT_UTF16_ENCODINGS=1 /Yu"stdafx.h" /FD /c -# ADD MTL /I "d:\code\tidy\include" +# ADD CPP /nologo /Gz /MT /W3 /O1 /I "..\tidycom\include" /D "NDEBUG" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D SUPPORT_UTF16_ENCODINGS=1 /Yu"stdafx.h" /FD /c +# ADD MTL /I "..\tidycom\include" # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -249,11 +249,11 @@ # ADD BSC32 /nologo 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 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 /libpath:"d:\tidytag\release" +# ADD LINK32 libtidy.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:"ReleaseUMinDependency/TidyATL.dll" /libpath:"..\tidycom\build\msvc\release" # Begin Custom Build - Performing registration OutDir=.\ReleaseUMinDependency -TargetPath=.\ReleaseUMinDependency\Tidy.dll -InputPath=.\ReleaseUMinDependency\Tidy.dll +TargetPath=.\ReleaseUMinDependency\TidyATL.dll +InputPath=.\ReleaseUMinDependency\TidyATL.dll SOURCE="$(InputPath)" "$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" @@ -309,11 +309,11 @@ !ELSEIF "$(CFG)" == "Tidy - Win32 Release MinSize" -# ADD MTL /I "d:\code\tidy\include" /tlb ".\TidyCOM.tlb" /h "TidyCOM.h" /iid "Tidy_i.c" /Oicf +# ADD MTL /tlb ".\TidyCOM.tlb" /h "TidyCOM.h" /iid "Tidy_i.c" /Oicf !ELSEIF "$(CFG)" == "Tidy - Win32 Release MinDependency" -# ADD MTL /I "d:\code\tidy\include" /tlb ".\TidyATL.tlb" /h "TidyATL.h" /iid "TidyATL_i.c" /Oicf +# ADD MTL /tlb ".\TidyATL.tlb" /h "TidyATL.h" /iid "TidyATL_i.c" /Oicf !ELSEIF "$(CFG)" == "Tidy - Win32 Unicode Release MinSize" diff -ur G:\FGCVS\tidywrap\tidyatl\Tidy.rc tidyatl\Tidy.rc --- G:\FGCVS\tidywrap\tidyatl\Tidy.rc Tue Jan 06 03:35:16 2004 +++ tidyatl\Tidy.rc Thu Sep 20 12:45:54 2007 @@ -40,7 +40,7 @@ 3 TEXTINCLUDE DISCARDABLE BEGIN - "1 TYPELIB ""TidyATL.tlb""\r\n" + "1 TYPELIB ""TidyCOM.tlb""\r\n" "\0" END @@ -117,7 +117,7 @@ // // Generated from the TEXTINCLUDE 3 resource. // -1 TYPELIB "TidyATL.tlb" +1 TYPELIB "TidyCOM.tlb" ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED diff -ur G:\FGCVS\tidywrap\tidyatl\TidyCOMCP.h tidyatl\TidyCOMCP.h --- G:\FGCVS\tidywrap\tidyatl\TidyCOMCP.h Tue Jan 06 03:35:15 2004 +++ tidyatl\TidyCOMCP.h Thu Sep 20 12:47:35 2007 @@ -2,7 +2,7 @@ #define _TIDYCOMCP_H_ // #import "D:\code\tidyx\tidy.atl\TidyATL.tlb" raw_interfaces_only, raw_native_types, no_namespace, named_guids //"Import typelib" -#include "TidyATL.h" +#include "TidyCOM.h" template class CProxy_ITidyDocumentEvents : public IConnectionPointImpl diff -ur G:\FGCVS\tidywrap\tidyatl\TidyDocument.cpp tidyatl\TidyDocument.cpp --- G:\FGCVS\tidywrap\tidyatl\TidyDocument.cpp Tue Jan 06 03:35:16 2004 +++ tidyatl\TidyDocument.cpp Thu Sep 20 13:42:25 2007 @@ -1,6 +1,6 @@ // TidyDocument.cpp : Implementation of CTidyDocument #include "stdafx.h" -#include "TidyATL.h" +#include "TidyCOM.h" #include "TidyDocument.h" #include @@ -17,7 +17,7 @@ }; for (int i=0; i < sizeof(arr) / sizeof(arr[0]); i++) { - if (InlineIsEqualGUID(*arr[i],riid)) + if (IsEqualGUID(*arr[i],riid)) return S_OK; } return S_FALSE; @@ -26,8 +26,8 @@ HRESULT CTidyDocument::FinalConstruct() { _tdoc = tidyCreate(); - tidySetAppData( _tdoc, (uint) this ); - tidySetReportFilter( _tdoc, ReportFilter ); + tidySetAppData( _tdoc, (void *) this ); + tidySetReportFilter( _tdoc, (TidyReportFilter)ReportFilter ); // tidySetErrorSink( _tdoc, NULL ); return CoCreateFreeThreadedMarshaler( @@ -88,9 +88,16 @@ TidyBuffer buf = {0}; assert( _tdoc != NULL ); ctmbstr saveEnc = tidyOptGetCurrPick( _tdoc, TidyCharEncoding ); +#if defined(UNICODE) + USES_CONVERSION; + BSTR wEnc = _T("UTF16LE"); + ctmbstr charStg = W2CA(wEnc); + tidySetCharEncoding( _tdoc, charStg ); +#else tidySetCharEncoding( _tdoc, _T("UTF16LE") ); +#endif - tidyBufAttach( &buf, content, ::SysStringByteLen(content) ); + tidyBufAttach( &buf, (byte *)content, ::SysStringByteLen(content) ); *status = tidyParseBuffer( _tdoc, &buf ); tidySetCharEncoding( _tdoc, saveEnc ); return ( *status < 0 ? S_FALSE : S_OK ); @@ -101,7 +108,14 @@ TidyBuffer outbuf = {0}; assert( _tdoc != NULL ); ctmbstr saveEnc = tidyOptGetCurrPick( _tdoc, TidyCharEncoding ); +#if defined(UNICODE) + USES_CONVERSION; + BSTR wEnc = _T("UTF16LE"); + ctmbstr charStg = W2CA(wEnc); + tidySetCharEncoding( _tdoc, charStg ); +#else tidySetCharEncoding( _tdoc, _T("UTF16LE") ); +#endif int status = tidySaveBuffer( _tdoc, &outbuf ); if ( status >= 0 ) {