roytam1
/
kmeleon
mirror of https://github.com/roytam1/kmeleon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update for Gecko 38 / MSVC 2013

master
Dorian 7 years ago
parent
e2cf9c739f
commit
5431006e7c
61 changed files with 2117 additions and 4534 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 462
      k-meleon/KMeleon.sln
  2. BIN
      k-meleon/KMeleon10.opensdf
  3. 2
      k-meleon/app/BrowserFrm.cpp
  4. 73
      k-meleon/app/BrowserGlue.cpp
  5. 12
      k-meleon/app/BrowserImpl.cpp
  6. 1
      k-meleon/app/BrowserImplWebPrgrsLstnr.cpp
  7. 2
      k-meleon/app/BrowserViewUtils.cpp
  8. 84
      k-meleon/app/BrowserWindow.cpp
  9. 25
      k-meleon/app/BrowserWindow.h
  10. 1
      k-meleon/app/Components.cpp
  11. 10
      k-meleon/app/FavIconList.cpp
  12. 2
      k-meleon/app/HiddenWnd.cpp
  13. 4
      k-meleon/app/IBrowserFrameGlue.h
  14. 6
      k-meleon/app/KMeleon.vcxproj
  15. 6
      k-meleon/app/KMeleonConst.h
  16. 8
      k-meleon/app/KmAbout.cpp
  17. 39
      k-meleon/app/KmAppInfo.cpp
  18. 2
      k-meleon/app/KmFileLocProvider.cpp
  19. 24
      k-meleon/app/KmImage.cpp
  20. 4
      k-meleon/app/KmImage.h
  21. 2
      k-meleon/app/KmInstaller.h
  22. 118
      k-meleon/app/KmMenu.cpp
  23. 16
      k-meleon/app/MfcEmbed.cpp
  24. 10
      k-meleon/app/MfcEmbed.rc
  25. 4
      k-meleon/app/MostRecentUrls.cpp
  26. 42
      k-meleon/app/MozUtils.cpp
  27. 10
      k-meleon/app/MozUtils.h
  28. 8
      k-meleon/app/NSSDialogs.cpp
  29. 2
      k-meleon/app/Plugins.cpp
  30. 1
      k-meleon/app/PrintProgressDialog.h
  31. 1
      k-meleon/app/ProfileMgr.cpp
  32. 73
      k-meleon/app/PromptService.cpp
  33. 4
      k-meleon/app/PromptService.h
  34. 6
      k-meleon/app/SaveAsHandler.cpp
  35. 102
      k-meleon/app/StdAfx.h
  36. 1
      k-meleon/app/TooltipsProvider.h
  37. 9
      k-meleon/app/UnknownContentTypeHandler.cpp
  38. 1
      k-meleon/app/UnknownContentTypeHandler.h
  39. 734
      k-meleon/app/VisualStylesXP.h
  40. 4
      k-meleon/kplugins/bmpmenu/bmpmenu.vcxproj
  41. 4
      k-meleon/kplugins/bookmarks/bookmarks.vcxproj
  42. 4
      k-meleon/kplugins/favorites/favorites.vcxproj
  43. 8
      k-meleon/kplugins/fullscreen/fullscreen.vcxproj
  44. 4
      k-meleon/kplugins/gestures/gestures.vcxproj
  45. 4
      k-meleon/kplugins/hotlist/hotlist.vcxproj
  46. 4
      k-meleon/kplugins/jsbridge/JSBridge.vcxproj
  47. 9
      k-meleon/kplugins/jsbridge/jscomp.cpp
  48. 8
      k-meleon/kplugins/jsbridge/jscomp.h
  49. 2
      k-meleon/kplugins/jsbridge/jsplugin.cpp
  50. 2
      k-meleon/kplugins/jsbridge/nsGenericFactory.cpp
  51. 4
      k-meleon/kplugins/login/login.vcxproj
  52. 10
      k-meleon/kplugins/login/mozilla.cpp
  53. 10
      k-meleon/kplugins/login/mozilla.h
  54. 4
      k-meleon/kplugins/macros2/macros.vcxproj
  55. 200
      k-meleon/kplugins/privacy/privacy.vcxproj
  56. 4
      k-meleon/kplugins/rebar_menu/rebarmenu.vcxproj
  57. 4
      k-meleon/kplugins/sessions/sessions.vcxproj
  58. 13
      k-meleon/kplugins/spellcheck/spellcheck.cpp
  59. 8
      k-meleon/kplugins/spellcheck/spellcheck.vcxproj
  60. 4
      k-meleon/kplugins/toolbars/toolbars.vcxproj
  61. 4426
      k-meleon/mozilla.patch

462
k-meleon/KMeleon.sln
Unescape View File

@ -1,293 +1,169 @@
Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "k-meleon", "KMeleon.vcproj", "{A1E2BBD2-452C-41F6-A64A-9476398A17DA}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Layers", "layers\Layers.vcproj", "{A893706A-93AF-4905-B9B9-125F9F961CF2}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmpmenu", "bmp_menu\bmp_menu.vcproj", "{F2E464B0-F87F-4482-B32D-031B63E681E2}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external", "External\external.vcproj", "{802755E1-6059-4C25-BB24-48CC17D12254}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullscreen", "fullscreen\fullscreen.vcproj", "{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "history", "history\history.vcproj", "{9C40A520-37BA-4997-BC72-4EE98E32513A}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loader", "loader\loader.vcproj", "{DF7D017C-AE43-428E-A575-A329D951529F}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "macros", "macros\macros.vcproj", "{8E2AA109-176D-4DCC-81B3-078AFD3A5138}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bookmarks", "ns_bookmarks\ns_bookmarks.vcproj", "{E32EA49A-59D4-4898-805F-1732B2F4D302}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hotlist", "op_hotlist\op_hotlist.vcproj", "{553F5B8A-CB70-4766-9EFC-222748AAA006}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rebarmenu", "rebar_menu\rebar_menu.vcproj", "{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toolbars", "toolbars\toolbars.vcproj", "{97C153A5-A4F6-4AD7-971B-F6C747558AC4}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "privacy", "privacy\privacy.vcproj", "{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gestures", "gestures\gestures.vcproj", "{2E6C70BF-E9CA-416A-B341-2B8550919D9E}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "favorites", "ie_favorites\favorites2.vcproj", "{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sessions", "sessions\sessions.vcproj", "{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "macros2", "macros2\macros2.vcproj", "{CE210F14-2644-487C-86CA-1E2CB2E04490}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSBridge", "JSBridge\JSBridge.vcproj", "{5F7A1684-E791-4F70-A24F-FC6726273512}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Debug Unicode = Debug Unicode
Release = Release
Release MFC Static = Release MFC Static
Release MFC Static Unicode = Release MFC Static Unicode
Release Unicode = Release Unicode
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Debug.ActiveCfg = Debug|Win32
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Debug.Build.0 = Debug|Win32
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Debug Unicode.ActiveCfg = Debug Unicode|Win32
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Debug Unicode.Build.0 = Debug Unicode|Win32
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Release.ActiveCfg = Release|Win32
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Release.Build.0 = Release|Win32
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Release MFC Static.ActiveCfg = Release MFC Static|Win32
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Release MFC Static.Build.0 = Release MFC Static|Win32
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Release MFC Static Unicode.ActiveCfg = Release MFC Static Unicode|Win32
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Release MFC Static Unicode.Build.0 = Release MFC Static Unicode|Win32
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Release Unicode.ActiveCfg = Release Unicode|Win32
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Release Unicode.Build.0 = Release Unicode|Win32
{A893706A-93AF-4905-B9B9-125F9F961CF2}.Debug.ActiveCfg = Debug|Win32
{A893706A-93AF-4905-B9B9-125F9F961CF2}.Debug Unicode.ActiveCfg = Debug|Win32
{A893706A-93AF-4905-B9B9-125F9F961CF2}.Release.ActiveCfg = Release|Win32
{A893706A-93AF-4905-B9B9-125F9F961CF2}.Release MFC Static.ActiveCfg = Release|Win32
{A893706A-93AF-4905-B9B9-125F9F961CF2}.Release MFC Static Unicode.ActiveCfg = Release|Win32
{A893706A-93AF-4905-B9B9-125F9F961CF2}.Release Unicode.ActiveCfg = Release|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Debug.ActiveCfg = Debug|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Debug.Build.0 = Debug|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Debug Unicode.ActiveCfg = Debug|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Debug Unicode.Build.0 = Debug|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Release.ActiveCfg = Release|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Release.Build.0 = Release|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Release MFC Static.ActiveCfg = Release|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Release MFC Static.Build.0 = Release|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Release MFC Static Unicode.ActiveCfg = Release|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Release MFC Static Unicode.Build.0 = Release|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Release Unicode.ActiveCfg = Release|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Release Unicode.Build.0 = Release|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Debug.ActiveCfg = Debug|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Debug.Build.0 = Debug|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Debug Unicode.ActiveCfg = Debug|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Debug Unicode.Build.0 = Debug|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Release.ActiveCfg = Release|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Release.Build.0 = Release|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Release MFC Static.ActiveCfg = Release|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Release MFC Static.Build.0 = Release|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Release MFC Static Unicode.ActiveCfg = Release|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Release MFC Static Unicode.Build.0 = Release|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Release Unicode.ActiveCfg = Release|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Release Unicode.Build.0 = Release|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Debug.ActiveCfg = Debug|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Debug.Build.0 = Debug|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Debug Unicode.ActiveCfg = Debug|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Debug Unicode.Build.0 = Debug|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Release.ActiveCfg = Release|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Release.Build.0 = Release|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Release MFC Static.ActiveCfg = Release|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Release MFC Static.Build.0 = Release|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Release MFC Static Unicode.ActiveCfg = Release|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Release MFC Static Unicode.Build.0 = Release|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Release Unicode.ActiveCfg = Release|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Release Unicode.Build.0 = Release|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Debug.ActiveCfg = Debug|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Debug.Build.0 = Debug|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Debug Unicode.ActiveCfg = Debug|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Debug Unicode.Build.0 = Debug|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Release.ActiveCfg = Release|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Release.Build.0 = Release|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Release MFC Static.ActiveCfg = Release|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Release MFC Static.Build.0 = Release|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Release MFC Static Unicode.ActiveCfg = Release|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Release MFC Static Unicode.Build.0 = Release|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Release Unicode.ActiveCfg = Release|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Release Unicode.Build.0 = Release|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Debug.ActiveCfg = Debug|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Debug.Build.0 = Debug|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Debug Unicode.ActiveCfg = Debug|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Debug Unicode.Build.0 = Debug|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Release.ActiveCfg = Release|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Release.Build.0 = Release|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Release MFC Static.ActiveCfg = Release|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Release MFC Static.Build.0 = Release|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Release MFC Static Unicode.ActiveCfg = Release|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Release MFC Static Unicode.Build.0 = Release|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Release Unicode.ActiveCfg = Release|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Release Unicode.Build.0 = Release|Win32
{8E2AA109-176D-4DCC-81B3-078AFD3A5138}.Debug.ActiveCfg = Debug|Win32
{8E2AA109-176D-4DCC-81B3-078AFD3A5138}.Debug Unicode.ActiveCfg = Debug|Win32
{8E2AA109-176D-4DCC-81B3-078AFD3A5138}.Release.ActiveCfg = Release|Win32
{8E2AA109-176D-4DCC-81B3-078AFD3A5138}.Release MFC Static.ActiveCfg = Release|Win32
{8E2AA109-176D-4DCC-81B3-078AFD3A5138}.Release MFC Static Unicode.ActiveCfg = Release|Win32
{8E2AA109-176D-4DCC-81B3-078AFD3A5138}.Release Unicode.ActiveCfg = Release|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Debug.ActiveCfg = Debug|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Debug.Build.0 = Debug|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Debug Unicode.ActiveCfg = Debug|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Debug Unicode.Build.0 = Debug|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Release.ActiveCfg = Release|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Release.Build.0 = Release|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Release MFC Static.ActiveCfg = Release|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Release MFC Static.Build.0 = Release|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Release MFC Static Unicode.ActiveCfg = Release|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Release MFC Static Unicode.Build.0 = Release|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Release Unicode.ActiveCfg = Release|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Release Unicode.Build.0 = Release|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Debug.ActiveCfg = Debug|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Debug.Build.0 = Debug|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Debug Unicode.ActiveCfg = Debug|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Debug Unicode.Build.0 = Debug|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Release.ActiveCfg = Release|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Release.Build.0 = Release|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Release MFC Static.ActiveCfg = Release|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Release MFC Static.Build.0 = Release|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Release MFC Static Unicode.ActiveCfg = Release|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Release MFC Static Unicode.Build.0 = Release|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Release Unicode.ActiveCfg = Release|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Release Unicode.Build.0 = Release|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Debug.ActiveCfg = Debug|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Debug.Build.0 = Debug|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Debug Unicode.ActiveCfg = Debug|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Debug Unicode.Build.0 = Debug|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Release.ActiveCfg = Release|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Release.Build.0 = Release|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Release MFC Static.ActiveCfg = Release|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Release MFC Static.Build.0 = Release|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Release MFC Static Unicode.ActiveCfg = Release|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Release MFC Static Unicode.Build.0 = Release|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Release Unicode.ActiveCfg = Release|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Release Unicode.Build.0 = Release|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Debug.ActiveCfg = Debug|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Debug.Build.0 = Debug|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Debug Unicode.ActiveCfg = Debug|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Debug Unicode.Build.0 = Debug|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Release.ActiveCfg = Release|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Release.Build.0 = Release|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Release MFC Static.ActiveCfg = Release|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Release MFC Static.Build.0 = Release|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Release MFC Static Unicode.ActiveCfg = Release|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Release MFC Static Unicode.Build.0 = Release|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Release Unicode.ActiveCfg = Release|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Release Unicode.Build.0 = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Debug.ActiveCfg = Debug|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Debug.Build.0 = Debug|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Debug Unicode.ActiveCfg = Debug|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Debug Unicode.Build.0 = Debug|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release.ActiveCfg = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release.Build.0 = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release MFC Static.ActiveCfg = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release MFC Static.Build.0 = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release MFC Static Unicode.ActiveCfg = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release MFC Static Unicode.Build.0 = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release Unicode.ActiveCfg = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release Unicode.Build.0 = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Debug.ActiveCfg = Debug|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Debug.Build.0 = Debug|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Debug Unicode.ActiveCfg = Debug|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Debug Unicode.Build.0 = Debug|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release.ActiveCfg = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release.Build.0 = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release MFC Static.ActiveCfg = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release MFC Static.Build.0 = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release MFC Static Unicode.ActiveCfg = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release MFC Static Unicode.Build.0 = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release Unicode.ActiveCfg = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release Unicode.Build.0 = Release|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Debug.ActiveCfg = Debug|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Debug.Build.0 = Debug|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Debug Unicode.ActiveCfg = Debug|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Debug Unicode.Build.0 = Debug|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Release.ActiveCfg = Release|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Release.Build.0 = Release|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Release MFC Static.ActiveCfg = Release|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Release MFC Static.Build.0 = Release|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Release MFC Static Unicode.ActiveCfg = Release|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Release MFC Static Unicode.Build.0 = Release|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Release Unicode.ActiveCfg = Release|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Release Unicode.Build.0 = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Debug.ActiveCfg = Debug|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Debug.Build.0 = Debug|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Debug Unicode.ActiveCfg = Debug Unicode|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Debug Unicode.Build.0 = Debug Unicode|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release.ActiveCfg = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release.Build.0 = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release MFC Static.ActiveCfg = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release MFC Static.Build.0 = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release MFC Static Unicode.ActiveCfg = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release MFC Static Unicode.Build.0 = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release Unicode.ActiveCfg = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release Unicode.Build.0 = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Debug.ActiveCfg = Debug|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Debug.Build.0 = Debug|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Debug Unicode.ActiveCfg = Debug|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Debug Unicode.Build.0 = Debug|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release.ActiveCfg = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release.Build.0 = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release MFC Static.ActiveCfg = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release MFC Static.Build.0 = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release MFC Static Unicode.ActiveCfg = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release MFC Static Unicode.Build.0 = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release Unicode.ActiveCfg = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release Unicode.Build.0 = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Debug.ActiveCfg = Debug|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Debug.Build.0 = Debug|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Debug Unicode.ActiveCfg = Debug|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Debug Unicode.Build.0 = Debug|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release.ActiveCfg = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release.Build.0 = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release MFC Static.ActiveCfg = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release MFC Static.Build.0 = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release MFC Static Unicode.ActiveCfg = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release MFC Static Unicode.Build.0 = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release Unicode.ActiveCfg = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release Unicode.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection
EndGlobal
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "k-meleon", "KMeleon.vcproj", "{A1E2BBD2-452C-41F6-A64A-9476398A17DA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Layers", "layers\Layers.vcproj", "{A893706A-93AF-4905-B9B9-125F9F961CF2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmpmenu", "bmp_menu\bmp_menu.vcproj", "{F2E464B0-F87F-4482-B32D-031B63E681E2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external", "External\external.vcproj", "{802755E1-6059-4C25-BB24-48CC17D12254}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullscreen", "fullscreen\fullscreen.vcproj", "{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "history", "history\history.vcproj", "{9C40A520-37BA-4997-BC72-4EE98E32513A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loader", "loader\loader.vcxproj", "{DF7D017C-AE43-428E-A575-A329D951529F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "macros", "macros\macros.vcproj", "{8E2AA109-176D-4DCC-81B3-078AFD3A5138}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bookmarks", "ns_bookmarks\ns_bookmarks.vcproj", "{E32EA49A-59D4-4898-805F-1732B2F4D302}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hotlist", "op_hotlist\op_hotlist.vcproj", "{553F5B8A-CB70-4766-9EFC-222748AAA006}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rebarmenu", "rebar_menu\rebar_menu.vcproj", "{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toolbars", "toolbars\toolbars.vcproj", "{97C153A5-A4F6-4AD7-971B-F6C747558AC4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "privacy", "privacy\privacy.vcproj", "{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gestures", "gestures\gestures.vcproj", "{2E6C70BF-E9CA-416A-B341-2B8550919D9E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "favorites", "ie_favorites\favorites2.vcproj", "{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sessions", "sessions\sessions.vcproj", "{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "macros2", "macros2\macros2.vcproj", "{CE210F14-2644-487C-86CA-1E2CB2E04490}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSBridge", "JSBridge\JSBridge.vcproj", "{5F7A1684-E791-4F70-A24F-FC6726273512}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Unicode|Win32 = Debug Unicode|Win32
Debug|Win32 = Debug|Win32
Release MFC Static Unicode|Win32 = Release MFC Static Unicode|Win32
Release MFC Static|Win32 = Release MFC Static|Win32
Release Unicode|Win32 = Release Unicode|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Debug|Win32.ActiveCfg = Debug|Win32
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Release MFC Static Unicode|Win32.ActiveCfg = Release MFC Static Unicode|Win32
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Release MFC Static|Win32.ActiveCfg = Release MFC Static|Win32
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
{A1E2BBD2-452C-41F6-A64A-9476398A17DA}.Release|Win32.ActiveCfg = Release|Win32
{A893706A-93AF-4905-B9B9-125F9F961CF2}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{A893706A-93AF-4905-B9B9-125F9F961CF2}.Debug|Win32.ActiveCfg = Debug|Win32
{A893706A-93AF-4905-B9B9-125F9F961CF2}.Release MFC Static Unicode|Win32.ActiveCfg = Release|Win32
{A893706A-93AF-4905-B9B9-125F9F961CF2}.Release MFC Static|Win32.ActiveCfg = Release|Win32
{A893706A-93AF-4905-B9B9-125F9F961CF2}.Release Unicode|Win32.ActiveCfg = Release|Win32
{A893706A-93AF-4905-B9B9-125F9F961CF2}.Release|Win32.ActiveCfg = Release|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Debug|Win32.ActiveCfg = Debug|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Release MFC Static Unicode|Win32.ActiveCfg = Release|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Release MFC Static|Win32.ActiveCfg = Release|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Release Unicode|Win32.ActiveCfg = Release|Win32
{F2E464B0-F87F-4482-B32D-031B63E681E2}.Release|Win32.ActiveCfg = Release|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Debug|Win32.ActiveCfg = Debug|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Release MFC Static Unicode|Win32.ActiveCfg = Release|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Release MFC Static|Win32.ActiveCfg = Release|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Release Unicode|Win32.ActiveCfg = Release|Win32
{802755E1-6059-4C25-BB24-48CC17D12254}.Release|Win32.ActiveCfg = Release|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Debug|Win32.ActiveCfg = Debug|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Release MFC Static Unicode|Win32.ActiveCfg = Release|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Release MFC Static|Win32.ActiveCfg = Release|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Release Unicode|Win32.ActiveCfg = Release|Win32
{014A6ED5-5295-44BF-97B1-5569A8C2A7F3}.Release|Win32.ActiveCfg = Release|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Debug|Win32.ActiveCfg = Debug|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Release MFC Static Unicode|Win32.ActiveCfg = Release|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Release MFC Static|Win32.ActiveCfg = Release|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Release Unicode|Win32.ActiveCfg = Release|Win32
{9C40A520-37BA-4997-BC72-4EE98E32513A}.Release|Win32.ActiveCfg = Release|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Debug Unicode|Win32.Build.0 = Debug|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Debug|Win32.ActiveCfg = Debug|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Debug|Win32.Build.0 = Debug|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Release MFC Static Unicode|Win32.ActiveCfg = Release|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Release MFC Static Unicode|Win32.Build.0 = Release|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Release MFC Static|Win32.ActiveCfg = Release|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Release MFC Static|Win32.Build.0 = Release|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Release Unicode|Win32.ActiveCfg = Release|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Release Unicode|Win32.Build.0 = Release|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Release|Win32.ActiveCfg = Release|Win32
{DF7D017C-AE43-428E-A575-A329D951529F}.Release|Win32.Build.0 = Release|Win32
{8E2AA109-176D-4DCC-81B3-078AFD3A5138}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{8E2AA109-176D-4DCC-81B3-078AFD3A5138}.Debug|Win32.ActiveCfg = Debug|Win32
{8E2AA109-176D-4DCC-81B3-078AFD3A5138}.Release MFC Static Unicode|Win32.ActiveCfg = Release|Win32
{8E2AA109-176D-4DCC-81B3-078AFD3A5138}.Release MFC Static|Win32.ActiveCfg = Release|Win32
{8E2AA109-176D-4DCC-81B3-078AFD3A5138}.Release Unicode|Win32.ActiveCfg = Release|Win32
{8E2AA109-176D-4DCC-81B3-078AFD3A5138}.Release|Win32.ActiveCfg = Release|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Debug|Win32.ActiveCfg = Debug|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Release MFC Static Unicode|Win32.ActiveCfg = Release|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Release MFC Static|Win32.ActiveCfg = Release|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Release Unicode|Win32.ActiveCfg = Release|Win32
{E32EA49A-59D4-4898-805F-1732B2F4D302}.Release|Win32.ActiveCfg = Release|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Debug|Win32.ActiveCfg = Debug|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Release MFC Static Unicode|Win32.ActiveCfg = Release|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Release MFC Static|Win32.ActiveCfg = Release|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Release Unicode|Win32.ActiveCfg = Release|Win32
{553F5B8A-CB70-4766-9EFC-222748AAA006}.Release|Win32.ActiveCfg = Release|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Debug|Win32.ActiveCfg = Debug|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Release MFC Static Unicode|Win32.ActiveCfg = Release|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Release MFC Static|Win32.ActiveCfg = Release|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Release Unicode|Win32.ActiveCfg = Release|Win32
{839F0F46-8C0A-425D-B70A-40A1D8ACBE90}.Release|Win32.ActiveCfg = Release|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Debug|Win32.ActiveCfg = Debug|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Release MFC Static Unicode|Win32.ActiveCfg = Release|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Release MFC Static|Win32.ActiveCfg = Release|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Release Unicode|Win32.ActiveCfg = Release|Win32
{97C153A5-A4F6-4AD7-971B-F6C747558AC4}.Release|Win32.ActiveCfg = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Debug|Win32.ActiveCfg = Debug|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release MFC Static Unicode|Win32.ActiveCfg = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release MFC Static|Win32.ActiveCfg = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release Unicode|Win32.ActiveCfg = Release|Win32
{F80DCDF9-D001-47F7-97D5-26EF62BF91AF}.Release|Win32.ActiveCfg = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Debug|Win32.ActiveCfg = Debug|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release MFC Static Unicode|Win32.ActiveCfg = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release MFC Static|Win32.ActiveCfg = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release Unicode|Win32.ActiveCfg = Release|Win32
{2E6C70BF-E9CA-416A-B341-2B8550919D9E}.Release|Win32.ActiveCfg = Release|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Debug|Win32.ActiveCfg = Debug|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Release MFC Static Unicode|Win32.ActiveCfg = Release|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Release MFC Static|Win32.ActiveCfg = Release|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Release Unicode|Win32.ActiveCfg = Release|Win32
{3632B1A3-8D3C-468B-8AA7-1BAC8A367ED5}.Release|Win32.ActiveCfg = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Debug|Win32.ActiveCfg = Debug|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release MFC Static Unicode|Win32.ActiveCfg = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release MFC Static|Win32.ActiveCfg = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release Unicode|Win32.ActiveCfg = Release|Win32
{43FF5741-2BA4-4191-A0E3-DB8BC27685CB}.Release|Win32.ActiveCfg = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Debug|Win32.ActiveCfg = Debug|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release MFC Static Unicode|Win32.ActiveCfg = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release MFC Static|Win32.ActiveCfg = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release Unicode|Win32.ActiveCfg = Release|Win32
{CE210F14-2644-487C-86CA-1E2CB2E04490}.Release|Win32.ActiveCfg = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Debug|Win32.ActiveCfg = Debug|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release MFC Static Unicode|Win32.ActiveCfg = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release MFC Static|Win32.ActiveCfg = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release Unicode|Win32.ActiveCfg = Release|Win32
{5F7A1684-E791-4F70-A24F-FC6726273512}.Release|Win32.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

BIN
k-meleon/KMeleon10.opensdf
View File

Binary file not shown.

2
k-meleon/app/BrowserFrm.cpp
Unescape View File

@ -1269,7 +1269,7 @@ void CBrowserFrame::OnUpdateToggleToolbarLock(CCmdUI* pCmdUI)
BOOL CALLBACK EnumToolbar(HWND hwnd, LPARAM lParam)
{
TCHAR pszName[20];
GetClassName(hwnd, pszName, 20);
GetClassNameW(hwnd, pszName, 20);
if ( GetParent(hwnd) == GetParent((HWND)lParam) && _tcscmp(TOOLBARCLASSNAME, pszName) == 0
&& ( (GetWindowLong(hwnd, GWL_STYLE) & CCS_BOTTOM) == CCS_BOTTOM))
{

73
k-meleon/app/BrowserGlue.cpp
Unescape View File

@ -35,7 +35,6 @@
#include "nsIMutableArray.h"
#include "nsISSLStatus.h"
#include "nsIDialogParamBlock.h"
#include "nsICertOverrideService.h"
#include "nsIX509CertDB.h"
#include "nsIDOMEventTarget.h"
@ -239,7 +238,7 @@ void CBrowserGlue::SetVisibility(bool aVisibility)
mpBrowserFrame->ShowWindow(SW_SHOW);
// pThis->SetActiveWindow();
mpBrowserFrame->UpdateWindow();
//mpBrowserFrame->UpdateWindow();
}
else
{
@ -324,9 +323,19 @@ void CBrowserGlue::PopupBlocked(const char* uri)
if (!theApp.preferences.GetBool("browser.popups.showPopupBlocker", PR_TRUE)
|| !mPopupBlockedHost.IsEmpty())
return;
USES_CONVERSION;
mPopupBlockedHost = A2CT(uri);
if (!*uri) {
// XXX Which is obviously not always true
nsCOMPtr<nsIURI> uri;
mpBrowserView->GetBrowserWrapper()->GetCurrentURI(getter_AddRefs(uri));
nsCString host;
uri->GetHost(host);
mPopupBlockedHost = NSCStringToCString(host);
}
else {
USES_CONVERSION;
mPopupBlockedHost = A2CT(uri);
}
if (mpBrowserFrame->GetActiveView() == mpBrowserView)
mpBrowserFrame->UpdatePopupNotification(mPopupBlockedHost);
}
@ -483,18 +492,32 @@ CBrowserWrapper* CBrowserGlue::ReuseWindow(BOOL useCurrent)
#include "nsISSLStatus.h"
#include "nsIDialogParamBlock.h"
#include "nsICertOverrideService.h"
#include "nsIRecentBadCertsService.h"
#include "nsISSLStatusProvider.h"
#include "nsISecureBrowserUI.h"
#include "nsIChannel.h"
bool CBrowserGlue::performXULCommand(LPCWSTR id, LPCTSTR siteUri)
{
if (wcscmp(id, L"addCertificateExceptionButton") == 0)
{
nsCOMPtr<nsIX509CertDB> certDB = do_GetService("@mozilla.org/security/x509certdb;1");
if (!certDB) return false;
nsCOMPtr<nsIURI> uri;
//::NewURI(getter_AddRefs(uri), CStringToNSString(siteUri));
mpBrowserView->GetBrowserWrapper()->GetCurrentURI(getter_AddRefs(uri));
nsCOMPtr<nsIDocShell> docShell = mpBrowserView->GetBrowserWrapper()->GetDocShell();
NS_ENSURE_TRUE(docShell, FALSE);
nsCOMPtr<nsIChannel> channel;
docShell->GetFailedChannel(getter_AddRefs(channel));
NS_ENSURE_TRUE(channel, FALSE);
nsCOMPtr<nsISupports> secinfo;
channel->GetSecurityInfo(getter_AddRefs(secinfo));
nsCOMPtr<nsISSLStatusProvider> SSLProvider = do_QueryInterface(secinfo);
NS_ENSURE_TRUE(SSLProvider, FALSE);
nsCOMPtr<nsISSLStatus> certStatus;
SSLProvider->GetSSLStatus(getter_AddRefs(certStatus));
if (!certStatus) return FALSE;
PRInt32 port;
nsCString host;
@ -505,14 +528,6 @@ bool CBrowserGlue::performXULCommand(LPCWSTR id, LPCTSTR siteUri)
CString hostAndPort;
hostAndPort.Format(_T("%s:%d"), NSCStringToCString(host), port);
nsCOMPtr<nsIRecentBadCerts> recentCertsSvc;
certDB->GetRecentBadCerts(false, getter_AddRefs(recentCertsSvc));
if (!recentCertsSvc) return false;
nsCOMPtr<nsISSLStatus> certStatus;
recentCertsSvc->GetRecentBadCert(CStringToNSString(hostAndPort), getter_AddRefs(certStatus));
if (!certStatus) return false;
int32_t certFailureFlags = 0;
bool isDomainMismatch, isInvalidTime, isUntrusted;
certStatus->GetIsDomainMismatch(&isDomainMismatch);
@ -548,9 +563,6 @@ bool CBrowserGlue::performXULCommand(LPCWSTR id, LPCTSTR siteUri)
if (wcscmp(id, L"vieshit") == 0)
{
nsCOMPtr<nsIX509CertDB> certDB = do_GetService("@mozilla.org/security/x509certdb;1");
if (!certDB) return false;
nsCOMPtr<nsIURI> uri;
mpBrowserView->GetBrowserWrapper()->GetCurrentURI(getter_AddRefs(uri));
@ -564,13 +576,22 @@ bool CBrowserGlue::performXULCommand(LPCWSTR id, LPCTSTR siteUri)
CString hostAndPort;
hostAndPort.Format(_T("%s:%d"), NSCStringToCString(host), port);
nsCOMPtr<nsIRecentBadCerts> recentCertsSvc;
certDB->GetRecentBadCerts(false, getter_AddRefs(recentCertsSvc));
if (!recentCertsSvc) return false;
nsCOMPtr<nsIDocShell> docShell = mpBrowserView->GetBrowserWrapper()->GetDocShell();
NS_ENSURE_TRUE(docShell, FALSE);
nsCOMPtr<nsIChannel> channel;
docShell->GetFailedChannel(getter_AddRefs(channel));
NS_ENSURE_TRUE(channel, FALSE);
nsCOMPtr<nsISupports> secinfo;
channel->GetSecurityInfo(getter_AddRefs(secinfo));
nsCOMPtr<nsISSLStatusProvider> SSLProvider = do_QueryInterface(secinfo);
NS_ENSURE_TRUE(SSLProvider, FALSE);
nsCOMPtr<nsISSLStatus> certStatus;
recentCertsSvc->GetRecentBadCert(CStringToNSString(hostAndPort), getter_AddRefs(certStatus));
if (!certStatus) return false;
SSLProvider->GetSSLStatus(getter_AddRefs(certStatus));
if (!certStatus) return FALSE;
nsCOMPtr<nsIX509Cert> cert;
certStatus->GetServerCert(getter_AddRefs(cert));

12
k-meleon/app/BrowserImpl.cpp
Unescape View File

@ -74,7 +74,6 @@
#include "MozUtils.h"
#include "nsIDOMEvent.h"
#include "nsIDOMPopupBlockedEvent.h"
#include "nsIDOMMouseEvent.h"
#include "nsIDOMKeyEvent.h"
#include "nsIDOMEventTarget.h"
@ -82,14 +81,12 @@
#include "nsIDOMEventTarget.h"
#include "nsIDOMLocation.h"
#include "nsPIDOMWindow.h"
#include "nsIScriptSecurityManager.h"
#include "nsIDOMHTMLDocument.h"
#ifdef USE_WINDOW_PROVIDER
#include "nsIBrowserDOMWindow.h"
#endif
#include "jsapi.h"
#include "BrowserFrm.h" // XXXXX
#include "BrowserView.h"
@ -911,7 +908,8 @@ NS_IMETHODIMP CBrowserImpl::HandleEvent(nsIDOMEvent *aEvent)
if (type.Equals(NS_LITERAL_STRING("DOMPopupBlocked")))
{
nsCOMPtr<nsIDOMPopupBlockedEvent> popupEvent = do_QueryInterface(aEvent);
// Can't include the popup event class anymore
/* nsCOMPtr<PopupBlockedEvent> popupEvent = do_QueryInterface(aEvent);
NS_ENSURE_TRUE (popupEvent, NS_ERROR_FAILURE);
nsCOMPtr<nsIURI> uri;
@ -934,9 +932,9 @@ NS_IMETHODIMP CBrowserImpl::HandleEvent(nsIDOMEvent *aEvent)
nsCString host;
rv = uri->GetHost(host);
NS_ENSURE_SUCCESS (rv, rv);
NS_ENSURE_TRUE (host.Length(), NS_OK);
NS_ENSURE_TRUE (host.Length(), NS_OK);*/
m_pBrowserFrameGlue->PopupBlocked(host.get());
m_pBrowserFrameGlue->PopupBlocked("");
return NS_OK;
}

1
k-meleon/app/BrowserImplWebPrgrsLstnr.cpp
Unescape View File

@ -36,6 +36,7 @@
#include "IBrowserFrameGlue.h"
#include "nsIRequest.h"
#include "nsIChannel.h"
#include "nsIWebProgress.h"
//*****************************************************************************
// CBrowserImpl::nsIWebProgressListener Implementation

2
k-meleon/app/BrowserViewUtils.cpp
Unescape View File

@ -135,7 +135,7 @@ BOOL CBrowserView::OpenViewSourceWindow(BOOL frame)
persist->SetPersistFlags(
nsIWebBrowserPersist::PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION|
nsIWebBrowserPersist::PERSIST_FLAGS_REPLACE_EXISTING_FILES);
rv = persist->SaveURI(srcURI, cacheDescriptor, referrer, nullptr, nullptr, nfile, nullptr);
rv = persist->SaveURI(srcURI, cacheDescriptor, referrer, 0, nullptr, nullptr, nfile, nullptr);
if (NS_FAILED(rv)) {
persist->SetProgressListener(nullptr);
return FALSE;

84
k-meleon/app/BrowserWindow.cpp
Unescape View File

@ -27,20 +27,20 @@
#include "mfcembed.h"
#include "Utils.h"
#include "nsIBaseWindow.h"
#include "nsIWidget.h"
#include "nsISHistory.h"
#include "nsISHEntry.h"
#include "nsIDOMHTMLFrameSetElement.h"
#include "nsIDocShellTreeItem.h"
#include "nsIWebBrowserFocus.h"
#include "nsIContentViewer.h"
#include "nsIMarkupDocumentViewer.h"
#include "nsIDocCharset.h"
#include "nsISelection.h"
#include "nsISHistoryInternal.h"
#include "nsIDOMText.h"
#include "nsIDOMNodeList.h"
#include "nsIDOMHTMLScriptElement.h"
#include "nsIDOMWindowCollection.h"
#include "nsIWebPageDescriptor.h"
#include "nsIDocShell.h"
@ -54,14 +54,17 @@
#include "nsICertificateDialogs.h"
#include "nsIScriptSecurityManager.h"
#include "nsIDOMHTMLDocument.h"
#include "nsIDOMHTMLTextAreaElement.h"
#include "nsIDOMHTMLScriptElement.h"
#include "nsIDOMHTMLInputElement.h"
#include "nsIDOMHTMLEmbedElement.h"
#include "nsIDOMHTMLObjectElement.h"
#include "nsIDOMHTMLButtonElement.h"
#include "nsIDOMHTMLSelectElement.h"
#include "nsITypeAheadFind.h"
#include "nsIWebBrowserFind.h"
//#include "nsIFocusController.h"
//#include "nsIDOMNSHTMLDocument.h"
@ -82,7 +85,9 @@
#include "nsIDOMWindowCollection.h"
#include "nsPIDOMWindow.h"
#include "nsIFocusManager.h"
#include "nsIScriptContext.h"
#include "nsIDocument.h"
#include "nsIPrintSettings.h"
#include "nsIScrollable.h"
static const PRUnichar kSpan[] = L"span";
static const PRUnichar kStyle[] = L"style";
@ -124,6 +129,9 @@ void CBrowserWrapper::SetBrowserFrameGlue(PBROWSERFRAMEGLUE pBrowserFrameGlue)
// mpBrowserImpl->Init(pBrowserFrameGlue, mWebBrowser);
}
#include "nsIXPConnect.h"
#include "jsfriendapi.h"
#include "nsJSPrincipals.h"
BOOL CBrowserWrapper::CreateBrowser(CWnd* parent, uint32_t chromeFlags)
{
mChromeContent = chromeFlags & nsIWebBrowserChrome::CHROME_OPENAS_CHROME;
@ -208,15 +216,23 @@ BOOL CBrowserWrapper::CreateBrowser(CWnd* parent, uint32_t chromeFlags)
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
if (ssm) { // Sometimes this happens really early See bug 793370.
nsCOMPtr<nsIPrincipal> principal;
ssm->GetSubjectPrincipal(getter_AddRefs(principal));
if (!principal) {
nsCOMPtr<nsIXPConnect> xpconnect = do_GetService("@mozilla.org/js/xpc/XPConnect;1");
JSContext* cx = xpconnect->GetCurrentJSContext();
if (cx) {
JSCompartment *compartment = js::GetContextCompartment(cx);
if (compartment) {
JSPrincipals *principals = JS_GetCompartmentPrincipals(compartment);
principal = static_cast<nsJSPrincipals *>(principals);
}
}
if (!principal && chromeFlags & nsIWebBrowserChrome::CHROME_OPENAS_CHROME) {
ssm->GetSystemPrincipal(getter_AddRefs(principal));
}
rv = GetDocShell()->CreateAboutBlankContentViewer(principal);
NS_ENSURE_SUCCESS(rv, FALSE);
//nsCOMPtr<nsIDocument> doc = do_GetInterface(GetDocShell());
//NS_ENSURE_TRUE(!!doc, NS_ERROR_FAILURE);
//doc->SetIsInitialDocument(true);
nsCOMPtr<nsIDocument> doc = do_GetInterface(GetDocShell());
NS_ENSURE_TRUE(!!doc, FALSE);
doc->SetIsInitialDocument(true);
}
}
@ -506,23 +522,19 @@ BOOL CBrowserWrapper::GetCharset(char* aCharset)
if (NS_FAILED(result) || !contentViewer)
return FALSE;
nsCOMPtr<nsIMarkupDocumentViewer> mdv = do_QueryInterface(contentViewer,&result);
if (NS_FAILED(result) || !mdv)
return FALSE;
nsCString mCharset;
result = mdv->GetForceCharacterSet(mCharset);
result = contentViewer->GetForceCharacterSet(mCharset);
if (NS_FAILED(result) || mCharset.IsEmpty() )
{
// If no forced charset look for the document charset
nsCString charset;
DocShell->GetCharset(charset);
if (charset.IsEmpty())
{
// If no document charset use default
result = mdv->GetHintCharacterSet(mCharset);
result = contentViewer->GetHintCharacterSet(mCharset);
}
else
{
@ -546,13 +558,9 @@ BOOL CBrowserWrapper::ForceCharset(const char *aCharSet)
if (NS_FAILED(result) || !contentViewer)
return FALSE;
nsCOMPtr<nsIMarkupDocumentViewer> mdv = do_QueryInterface(contentViewer,&result);
if (NS_FAILED(result) || !mdv)
return FALSE;
nsCString mCharset;
mCharset = aCharSet;
result = mdv->SetForceCharacterSet(mCharset);
result = contentViewer->SetForceCharacterSet(mCharset);
if (NS_SUCCEEDED(result))
mWebNav->Reload(nsIWebNavigation::LOAD_FLAGS_CHARSET_CHANGE);
@ -574,10 +582,10 @@ BOOL CBrowserWrapper::ScrollBy(int32_t dx, int32_t dy)
}
NS_ENSURE_TRUE(dom, FALSE);
return dom->ScrollBy (dx, dy);
return NS_SUCCEEDED(dom->ScrollBy (dx, dy));
}
already_AddRefed<nsIMarkupDocumentViewer> CBrowserWrapper::GetMarkupViewer()
already_AddRefed<nsIContentViewer> CBrowserWrapper::GetContentViewer()
{
nsresult rv;
nsCOMPtr<nsIDocShell> docShell = GetDocShell();
@ -587,15 +595,12 @@ already_AddRefed<nsIMarkupDocumentViewer> CBrowserWrapper::GetMarkupViewer()
rv = docShell->GetContentViewer(getter_AddRefs(contentViewer));
NS_ENSURE_SUCCESS(rv, NULL);
nsCOMPtr<nsIMarkupDocumentViewer> _markupViewer = do_QueryInterface(contentViewer, &rv);
NS_ENSURE_SUCCESS(rv, NULL);
return _markupViewer.forget();
return contentViewer.forget();
}
BOOL CBrowserWrapper::SetFullZoom(float textzoom)
{
nsCOMPtr<nsIMarkupDocumentViewer> markupViewer = GetMarkupViewer();
nsCOMPtr<nsIContentViewer> markupViewer = GetContentViewer();
NS_ENSURE_TRUE(markupViewer, FALSE);
nsresult rv = markupViewer->SetFullZoom(textzoom);
return NS_SUCCEEDED(rv);
@ -603,7 +608,7 @@ BOOL CBrowserWrapper::SetFullZoom(float textzoom)
float CBrowserWrapper::GetFullZoom()
{
nsCOMPtr<nsIMarkupDocumentViewer> markupViewer = GetMarkupViewer();
nsCOMPtr<nsIContentViewer> markupViewer = GetContentViewer();
NS_ENSURE_TRUE(markupViewer, FALSE);
float textzoom;
nsresult rv = markupViewer->GetFullZoom(&textzoom);
@ -970,13 +975,6 @@ BOOL CBrowserWrapper::InjectCSS(const wchar_t* userStyleSheet)
return _InjectCSS(dom, userStyleSheet);
}
#include "nsIXPConnect.h"
#include "nsIScriptObjectPrincipal.h"
#include "mozilla/dom/ScriptSettings.h"
#include "nsIJSContextStack.h"
#include "jsapi.h"
#include "mozilla\dom\ScriptSettings.h"
BOOL CBrowserWrapper::InjectJS(const wchar_t* userScript, CString& result, bool bTopWindow)
{
nsresult rv;
@ -1127,7 +1125,6 @@ BOOL CBrowserWrapper::GetSelection(CString& aSelText)
void CBrowserWrapper::SetVisible(BOOL aVisible)
{
mWebBrowser->SetIsActive(aVisible);
TRACE2("Set Active Browser %u for window %s\n", aVisible, (LPCTSTR)GetTitle());
}
struct PRThread;
@ -1156,16 +1153,17 @@ NS_IMPL_ISUPPORTS(focusActive, nsIRunnable)
return mFocus->Activate();
}
#include "nsIPresShell.h"
//XXX Can't be included anymore, the focus patch can't work.
//#include "nsIPresShell.h"
void CBrowserWrapper::SetActive(BOOL aActive)
{
NS_ENSURE_TRUE(mWebBrowserFocus, );
TRACE2("Set Focus Active Browser %u for window %s\n", aActive, (LPCTSTR)GetTitle());
if (aActive) {
nsCOMPtr<nsIPresShell> presShell;
//nsCOMPtr<nsIPresShell> presShell;
nsCOMPtr<nsIDocShell> docShell = GetDocShell();
if (docShell) presShell = docShell->GetPresShell();
if (!presShell) {
//if (docShell) presShell = docShell->GetPresShell();
if (!docShell) {
// Setting the focus later because this does not work on new tab
// mWebBrowserFocus->Activate();
nsCOMPtr<nsIThreadManager> tm = do_GetService("@mozilla.org/thread-manager;1");
@ -1715,7 +1713,7 @@ BOOL CBrowserWrapper::_Save(nsIURI* aURI,
handler->SetTempFile(file);
persist->SetProgressListener(handler);
rv = persist->SaveURI(aURI, aDescriptor, aReferrer, nullptr, nullptr, file, nullptr);
rv = persist->SaveURI(aURI, aDescriptor, aReferrer, 0, nullptr, nullptr, file, nullptr);
if (NS_FAILED(rv))
persist->SetProgressListener(nullptr);
}

25
k-meleon/app/BrowserWindow.h
Unescape View File

@ -23,14 +23,19 @@ class nsIX509Cert;
#include "IBrowserFrameGlue.h"
#include "nsICommandManager.h"
#include "nsIPrintSettings.h"
#include "nsIWebBrowserFind.h"
#include "nsIClipboardCommands.h"
#include "nsIDocShell.h"
#include "nsIWebNavigation.h"
#include "nsIWebBrowserFocus.h"
#include "nsIWebBrowser.h"
#include "nsIMarkupDocumentViewer.h"
#include "nsIWebBrowserFocus.h"
#include "nsIWebBrowserPrint.h"
#include "nsIBaseWindow.h"
class nsITypeAheadFind;
class nsIDOMKeyEvent;
class nsIPrintSettings;
class nsIWebBrowserFocus;
class CBrowserImpl;
@ -76,7 +81,7 @@ public:
void SetBrowserGlue(PBROWSERGLUE pBrowserGlue);
void SetChromeMask(INT mask) { mChromeMask = mask; }
void SetPositionAndSize(int x, int y, int cx, int cy) {
if (mBaseWindow) mBaseWindow->SetPositionAndSize(0, 0, cx, cy, PR_TRUE);
if (mBaseWindow) mBaseWindow->SetPositionAndSize(0, 0, cx, cy, true);
}
void ShowScrollbars(BOOL visible);
BOOL ScrollBy(int32_t dx, int32_t dy);
@ -84,7 +89,7 @@ public:
void GoBack() { if (mWebNav) mWebNav->GoBack(); }
void GoForward() { if (mWebNav) mWebNav->GoForward(); }
void Stop() { if(mWebNav) mWebNav->Stop(nsIWebNavigation::STOP_ALL); }
bool SetScrollPosition(POINT scroll)
{
nsCOMPtr<nsIDOMWindow> dom;
@ -339,7 +344,7 @@ public:
return isPreview;
}
already_AddRefed<nsIMarkupDocumentViewer> GetMarkupViewer();
already_AddRefed<nsIContentViewer> GetContentViewer();
BOOL SetFullZoom(float textzoom);
float GetFullZoom();
BOOL ChangeFullZoom(int change);
@ -380,6 +385,8 @@ public:
bool TypeAheadFind(nsIDOMKeyEvent* keyEvent);
void EndTypeAheadFind();
nsString mSearchString;
BOOL GetCertificate(nsIX509Cert** certificate);
nsIDocShell* GetDocShell();
/* void SetMatchCase(BOOL);
void SetWrapAround(BOOL);
wchar_t* GetSearchString();
@ -396,11 +403,9 @@ private:
BOOL _GetSelection(nsIDOMWindow* dom, nsAString& aSelText);
BOOL _InjectCSS(nsIDOMWindow* dom, const wchar_t* userStyleSheet);
BOOL _Highlight(nsIDOMWindow* dom, const PRUnichar* backcolor, const PRUnichar* word, BOOL matchCase);
BOOL _Save(nsIURI* aURI, nsIDOMDocument* aDocument, LPCTSTR filename, nsIURI* aReferrer, nsISupports* aDescriptor);
BOOL GetCertificate(nsIX509Cert** certificate);
BOOL _Save(nsIURI* aURI, nsIDOMDocument* aDocument, LPCTSTR filename, nsIURI* aReferrer, nsISupports* aDescriptor);
bool CheckNode(nsIDOMElement* elem);
nsIDocShell* GetDocShell();
#ifndef FINDBAR_USE_TYPEAHEAD
void CollapseSelToStartInFrame(nsIDOMWindow* dom);

1
k-meleon/app/Components.cpp
Unescape View File

@ -58,6 +58,7 @@ static const mozilla::Module::CIDEntry kBrowserAppCIDs[] = {
static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
{NS_PROMPTSERVICE_CONTRACTID, &kNS_PROMPTSERVICE_CID},
{NS_CONTENT_PERMISSION_PROMPT_CONTRACTID, &kNS_PROMPTSERVICE_CID },
{"@mozilla.org/prompter;1", &kNS_PROMPTSERVICE_CID},
//{NS_HELPERAPPLAUNCHERDLG_CONTRACTID, &kNS_UNKNOWNCONTENTTYPEHANDLER_CID},
{"@mozilla.org/uriloader/content-handler;1?type=application/k-skin", &kNS_UNKNOWNCONTENTTYPEHANDLER_CID},

10
k-meleon/app/FavIconList.cpp
Unescape View File

@ -44,10 +44,10 @@ class iconCallback: public nsIFaviconDataCallback {
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIFAVICONDATACALLBACK
NS_DECL_NSIFAVICONDATACALLBACK
iconCallback(CFavIconList* favList, nsIURI* icon, nsIURI* page) :
mFavList(favList), mIconURI(icon), mPageURI(page) {}
iconCallback(CFavIconList* favList, nsIURI* icon, nsIURI* page) :
mFavList(favList), mIconURI(icon), mPageURI(page) {}
private:
~iconCallback() {};
@ -60,7 +60,7 @@ protected:
NS_IMPL_ISUPPORTS(iconCallback, nsIFaviconDataCallback)
NS_IMETHODIMP iconCallback::OnComplete(nsIURI *aFaviconURI, uint32_t aDataLen, const uint8_t *aData, const nsACString & aMimeType)
NS_IMETHODIMP iconCallback::OnComplete(nsIURI *aFaviconURI, uint32_t aDataLen, const uint8_t *aData, const nsACString & aMimeType)
{
if (mPageURI) {
nsCOMPtr<nsIURI> hostUri;
@ -350,7 +350,7 @@ int CFavIconList::GetIcon(nsIURI *aURI, nsIURI* aPageURI, BOOL download)
USES_CONVERSION;
if (download) {
nsRefPtr<iconCallback> ic = new iconCallback(this, aURI, aPageURI);
iconCallback* ic = new iconCallback(this, aURI, aPageURI);
nsCOMPtr<mozIAsyncFavicons> afis = GetIconService();
if (!afis) return FALSE;
nsresult rv = afis->SetAndFetchFaviconForPage(aPageURI, aURI, false, nsIFaviconService::FAVICON_LOAD_NON_PRIVATE, ic);

2
k-meleon/app/HiddenWnd.cpp
Unescape View File

@ -347,6 +347,8 @@ LRESULT CHiddenWnd::OnDeferSaveAs(WPARAM wParam, LPARAM lParam)
return NS_SUCCEEDED(rv);
}
#include "nsXULAppAPI.h"
extern XRE_TermEmbeddingType XRE_TermEmbedding;
void CHiddenWnd::OnEndSession(BOOL bEnding)
{
if (!bEnding) return;

4
k-meleon/app/IBrowserFrameGlue.h
Unescape View File

@ -146,7 +146,7 @@ struct IBrowserFrameGlue {
virtual void GetBrowserFrameVisibility(PRBool *aVisible) = 0;
// ContextMenu Related Methods
virtual void ShowContextMenu(PRUint32 aContextFlags, nsIContextMenuInfo *aInfo) = 0;
virtual void ShowContextMenu(UINT aContextFlags) = 0;
//Prompt Related Methods
virtual HWND GetBrowserFrameNativeWnd() = 0;
@ -185,7 +185,7 @@ struct IBrowserFrameGlue {
virtual void SetFocus(); \
virtual void FocusAvailable(PRBool *aFocusAvail); \
virtual void GetBrowserFrameVisibility(PRBool *aVisible); \
virtual void ShowContextMenu(PRUint32 aContextFlags, nsIContextMenuInfo *aInfo); \
virtual void ShowContextMenu(UINT aContextFlags); \
virtual HWND GetBrowserFrameNativeWnd(); \
virtual void ShowTooltip(PRInt32 x, PRInt32 y, const TCHAR *text); \
virtual BOOL FocusNextElement(); \

6
k-meleon/app/KMeleon.vcxproj
Unescape View File

@ -1,5 +1,5 @@
๏ปฟ<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -23,7 +23,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup>
@ -33,6 +33,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static MFC|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
@ -40,6 +41,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Static</UseOfMfc>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

6
k-meleon/app/KMeleonConst.h
Unescape View File

@ -17,10 +17,10 @@
*/
#define KMELEON_VERSION 0x02020005
#define KMELEON_VERSION 0x02030002
#define MOZILLA_BUILDID 20140105
#define KMELEON_BUILDID 7501
#define KMELEON_UVERSION 75.1
#define KMELEON_BUILDID 7600
#define KMELEON_UVERSION 76.0
#define KMELEON_UUID {944df56f-c0ec-4d7b-94b6-f625c8cc96ea}
#define WM_DEFERSHOW WM_USER + 200

8
k-meleon/app/KmAbout.cpp
Unescape View File

@ -71,7 +71,7 @@ static nsAutoCString
}
NS_IMETHODIMP
KmAbout::NewChannel(nsIURI *aURI, nsIChannel **result)
KmAbout::NewChannel(nsIURI *aURI, nsILoadInfo *aLoadInfo, nsIChannel **result)
{
NS_ENSURE_ARG_POINTER(aURI);
NS_ASSERTION(result, "must not be null");
@ -115,3 +115,9 @@ KmAbout::GetURIFlags(nsIURI *aURI, uint32_t *result)
return NS_ERROR_ILLEGAL_VALUE;
}
NS_IMETHODIMP
KmAbout::GetIndexedDBOriginPostfix(class nsIURI *,class nsAString &)
{
return NS_ERROR_NOT_IMPLEMENTED;
}

39
k-meleon/app/KmAppInfo.cpp
Unescape View File

@ -24,6 +24,7 @@
#include "MfcEmbed.h"
#include "nsAppShellCID.h"
#include "nsIAppShellService.h"
#include "nsXULAppAPI.h"
NS_IMPL_ISUPPORTS(KmAppInfo, nsIXULAppInfo, nsIXULRuntime, nsIAppStartup, nsIAppStartup2)
@ -218,18 +219,36 @@ NS_IMETHODIMP KmAppInfo::GetLastRunCrashID(nsAString & aLastRunCrashID)
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP KmAppInfo::GetBrowserTabsRemote(bool *aBrowserTabsRemote)
NS_IMETHODIMP KmAppInfo::GetBrowserTabsRemoteAutostart(bool *aBrowserTabsRemote)
{
*aBrowserTabsRemote = false;
return NS_OK;
}
/* readonly attribute boolean accessibilityEnabled; */
NS_IMETHODIMP KmAppInfo::GetAccessibilityEnabled(bool *aAccessibilityEnabled)
{
*aAccessibilityEnabled = false;
return NS_OK;
}
NS_IMETHODIMP KmAppInfo::GetDefaultUpdateChannel(nsACString & aDefaultUpdateChannel)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP KmAppInfo::GetDistributionID(nsACString & aDistributionID)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP KmAppInfo::GetKeyboardMayHaveIME(bool *ime)
{
*ime = true;
return NS_OK;
}
NS_IMETHODIMP KmAppInfo::GetIsOfficial(bool *)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
@ -389,4 +408,20 @@ NS_IMETHODIMP KmAppInfo::ProcessNativeEvent(void* aMsg)
::DispatchMessage(msg);
}
return NS_OK;
}
}
#include "nsIAccessibilityService.h"
NS_IMETHODIMP KmAppInfo::GetAccessibilityIsUIA(bool *aAccessibilityIsUIA)
{
*aAccessibilityIsUIA = false;
#if defined(ACCESSIBILITY) && defined(XP_WIN)
nsCOMPtr<nsIAccessibilityService> serv = do_GetService("@mozilla.org/accessibilityService;1");
// This is the same check the a11y service does to identify uia clients.
if (serv != nullptr &&
(::GetModuleHandleW(L"uiautomation") ||
::GetModuleHandleW(L"uiautomationcore"))) {
*aAccessibilityIsUIA = true;
}
#endif
return NS_OK;
}

2
k-meleon/app/KmFileLocProvider.cpp
Unescape View File

@ -40,7 +40,7 @@
#define XP_WIN
#endif
#include "nsAppDirectoryServiceDefs.h"
#include "nsXULAppAPI.h"
#include "nsDirectoryServiceDefs.h"
#include "nsILocalFile.h"
#include "nsIProperties.h"

24
k-meleon/app/KmImage.cpp
Unescape View File

@ -22,16 +22,28 @@
#include "imgILoader.h"
#include "imgIContainer.h"
#include "gfxUtils.h"
#include "MozUtils.h"
#include "kmeleon_plugin.h"
//#include "gfxUtils.h"
bool IsComCtl6() {
static int isv6 = -1;
if (isv6 != -1) return isv6;
DWORD maj,min;
AtlGetCommCtrlVersion(&maj, &min);
isv6 = maj >= 6;
HMODULE hComCtlDll = LoadLibrary(_T("comctl32.dll"));
if (!hComCtlDll) return isv6 = 0;
typedef HRESULT (CALLBACK *PFNDLLGETVERSION)(DLLVERSIONINFO*);
PFNDLLGETVERSION pfnDllGetVersion = (PFNDLLGETVERSION)GetProcAddress(hComCtlDll, "DllGetVersion");
if (!pfnDllGetVersion)
isv6 = 0;
else {
DLLVERSIONINFO dvi = {0};
dvi.cbSize = sizeof(dvi);
HRESULT hRes = (*pfnDllGetVersion)(&dvi);
isv6 = SUCCEEDED(hRes) && dvi.dwMajorVersion >= 6;
}
FreeLibrary(hComCtlDll);
if (!isv6) {
HMODULE hntdll = GetModuleHandle(L"ntdll.dll");
if (hntdll && GetProcAddress(hntdll, "wine_get_version"))

4
k-meleon/app/KmImage.h
Unescape View File

@ -44,9 +44,9 @@ public:
NS_ENSURE_SUCCESS(rv, false);
nsImageObserver* obs = new nsImageObserver(observer);
return NS_SUCCEEDED(loader->LoadImageXPCOM(imgUri, nullptr, nullptr,
return NS_SUCCEEDED(loader->LoadImageXPCOM(imgUri, nullptr, nullptr, NS_LITERAL_STRING(""),
nullptr, nullptr, obs, nullptr, nsIRequest::LOAD_BYPASS_CACHE,
nullptr, nullptr, getter_AddRefs(obs->mRequest)));
nullptr, 0, getter_AddRefs(obs->mRequest)));
}
protected:

2
k-meleon/app/KmInstaller.h
Unescape View File

@ -58,7 +58,7 @@ public:
persist->SetPersistFlags(
nsIWebBrowserPersist::PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION|
nsIWebBrowserPersist::PERSIST_FLAGS_REPLACE_EXISTING_FILES);
nsresult rv = persist->SaveURI(uri, nullptr, nullptr, nullptr, nullptr, mFile, nullptr);
nsresult rv = persist->SaveURI(uri, nullptr, nullptr, 0, nullptr, nullptr, mFile, nullptr);
if (NS_FAILED(rv)) {
persist->SetProgressListener(nullptr);
return rv;