Memory settings

7 years ago · ba613f79a3
17 changed files with 28 additions and 15 deletions
--- a/k-meleon/Dialogs.cpp
+++ b/k-meleon/Dialogs.cpp
@ -549,7 +549,7 @@ void CSelectDialog::OnLbnDblclkListSelect()
 }

 #include "MfcEmbed.h"
-
+/*
 extern CMfcEmbedApp theApp;
 int CDialogEx2::RunModalLoop(DWORD dwFlags)
 {
@ -662,4 +662,4 @@ int CDialogEx2::RunModalLoop(DWORD dwFlags)
 ExitModal:
 	m_nFlags &= ~(WF_MODALLOOP|WF_CONTINUEMODAL);
 	return m_nModalResult;
-}
+}*/
--- a/k-meleon/Dialogs.h
+++ b/k-meleon/Dialogs.h
@ -163,7 +163,7 @@ public:
 	inline int GetChoice() {return m_iChoice;}
 	void AddChoice(LPCTSTR);

-// Données de boîte de dialogue
+// Données de boû‘e de dialogue
 	enum { IDD = IDD_PROMPT_SELECT };

 protected:
--- a/k-meleon/KMeleon.vcxproj
+++ b/k-meleon/KMeleon.vcxproj
@ -24,7 +24,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>Dynamic</UseOfMfc>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization>true</WholeProgramOptimization>
  </PropertyGroup>
@ -36,7 +36,7 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
+    <UseOfMfc>Static</UseOfMfc>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@ -78,6 +78,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
    <LinkIncremental>
    </LinkIncremental>
+    <OutDir>..\release\</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static MFC|Win32'">
    <LinkIncremental />
@ -109,6 +110,7 @@
      <AdditionalLibraryDirectories>../xulrunner-sdk/lib_dbg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <GenerateMapFile>true</GenerateMapFile>
+      <AdditionalOptions>/HEAP:0x40000 %(AdditionalOptions)</AdditionalOptions>
    </Link>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -121,7 +123,7 @@
      <AdditionalIncludeDirectories>../xulrunner-sdk/include;../xulrunner-sdk/include/nspr;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
@ -147,7 +149,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static MFC|Win32'">
    <ClCompile>
      <Optimization>MinSpace</Optimization>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@ -161,12 +163,12 @@
    <Link>
      <OutputFile>..\release\$(ProjectName).exe</OutputFile>
      <AdditionalLibraryDirectories>../xulrunner-sdk/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <LargeAddressAware>true</LargeAddressAware>
+      <HeapReserveSize>0x40000</HeapReserveSize>
    </Link>
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--- a/k-meleon/KMeleonConst.h
+++ b/k-meleon/KMeleonConst.h
@ -17,7 +17,7 @@
 */


-#define KMELEON_VERSION	               0x02010006
+#define KMELEON_VERSION	               0x02010007
 #define MOZILLA_BUILDID 20140105
 #define KMELEON_BUILDID 7500
 #define KMELEON_UVERSION 75.0
--- a/k-meleon/bmp_menu/bmp_menu.vcxproj
+++ b/k-meleon/bmp_menu/bmp_menu.vcxproj
@ -109,6 +109,7 @@
      <ImportLibrary>.\Release/bmpmenu.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <LargeAddressAware>true</LargeAddressAware>
    </Link>
    <Midl>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--- a/k-meleon/fullscreen/fullscreen.vcxproj
+++ b/k-meleon/fullscreen/fullscreen.vcxproj
@ -118,6 +118,7 @@
      <TargetMachine>MachineX86</TargetMachine>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalLibraryDirectories>../../xulrunner-sdk/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <LargeAddressAware>true</LargeAddressAware>
    </Link>
    <Midl>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--- a/k-meleon/gestures/gestures.vcxproj
+++ b/k-meleon/gestures/gestures.vcxproj
@ -83,6 +83,7 @@
      <ImportLibrary>$(OutDir)gestures.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <LargeAddressAware>true</LargeAddressAware>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/k-meleon/ie_favorites/favorites2.vcxproj
+++ b/k-meleon/ie_favorites/favorites2.vcxproj
@ -89,6 +89,7 @@
      <ImportLibrary>$(OutDir)favorites2.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <LargeAddressAware>true</LargeAddressAware>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/k-meleon/login/login.vcxproj
+++ b/k-meleon/login/login.vcxproj
@ -66,7 +66,7 @@
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>MinSpace</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>XP_WIN;XP_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LOGIN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -80,6 +80,7 @@
      <AdditionalDependencies>xul.lib;mozalloc.lib;nss3.lib;xpcomglue_s.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;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>../../xulrunner-sdk/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>..\..\release\kplugins\$(TargetName)$(TargetExt)</OutputFile>
+      <LargeAddressAware>true</LargeAddressAware>
    </Link>
    <PreBuildEvent>
      <Command>$(ProjectDir)genidl.cmd</Command>
--- a/k-meleon/macros2/macros2.vcxproj
+++ b/k-meleon/macros2/macros2.vcxproj
@ -50,7 +50,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <Optimization>MinSpace</Optimization>
+      <Optimization>MaxSpeed</Optimization>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;macros_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -74,6 +74,7 @@
      <ImportLibrary>.\Release/macros.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <GenerateDebugInformation>Yes</GenerateDebugInformation>
+      <LargeAddressAware>true</LargeAddressAware>
    </Link>
    <Midl>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--- a/k-meleon/ns_bookmarks/ns_bookmarks.vcxproj
+++ b/k-meleon/ns_bookmarks/ns_bookmarks.vcxproj
@ -163,8 +163,6 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NS_BOOKMARKS_EXPORTS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -190,6 +188,7 @@
      <ProgramDatabaseFile>.\Release/bookmarks.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\Release/bookmarks.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
+      <LargeAddressAware>true</LargeAddressAware>
    </Link>
    <Midl>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--- a/k-meleon/op_hotlist/op_hotlist.vcxproj
+++ b/k-meleon/op_hotlist/op_hotlist.vcxproj
@ -47,7 +47,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <Optimization>MinSpace</Optimization>
+      <Optimization>MaxSpeed</Optimization>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;OP_HOTLIST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -72,6 +72,7 @@
      <ImportLibrary>.\Release/op_hotlist.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <LargeAddressAware>true</LargeAddressAware>
    </Link>
    <Midl>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--- a/k-meleon/privacy/privacy.vcxproj
+++ b/k-meleon/privacy/privacy.vcxproj
@ -89,6 +89,7 @@
      <ImportLibrary>$(OutDir)privacy.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <GenerateDebugInformation>Yes</GenerateDebugInformation>
+      <LargeAddressAware>true</LargeAddressAware>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/k-meleon/rebar_menu/rebar_menu.vcxproj
+++ b/k-meleon/rebar_menu/rebar_menu.vcxproj
@ -113,6 +113,7 @@
      <ImportLibrary>.\Release/rebarmenu.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <GenerateDebugInformation>Yes</GenerateDebugInformation>
+      <LargeAddressAware>true</LargeAddressAware>
    </Link>
    <Midl>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--- a/k-meleon/sessions/sessions.vcxproj
+++ b/k-meleon/sessions/sessions.vcxproj
@ -110,6 +110,7 @@
      <ImportLibrary>$(OutDir)sessions.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <GenerateDebugInformation>Yes</GenerateDebugInformation>
+      <LargeAddressAware>true</LargeAddressAware>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">
--- a/k-meleon/spellcheck/spellcheck.vcxproj
+++ b/k-meleon/spellcheck/spellcheck.vcxproj
@ -56,7 +56,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>MinSpace</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <AdditionalIncludeDirectories>../../xulrunner-sdk/include;../../xulrunner-sdk/include/nspr;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -70,6 +70,7 @@
      <AdditionalDependencies>Ws2_32.lib ;xul.lib;mozalloc.lib;nss3.lib;xpcomglue_s.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;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>../../xulrunner-sdk/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>..\..\release\kplugins\$(ProjectName).dll</OutputFile>
+      <LargeAddressAware>true</LargeAddressAware>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/k-meleon/toolbars/toolbars.vcxproj
+++ b/k-meleon/toolbars/toolbars.vcxproj
@ -110,6 +110,7 @@
      <ImportLibrary>.\Release/toolbars.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <GenerateDebugInformation>Yes</GenerateDebugInformation>
+      <LargeAddressAware>true</LargeAddressAware>
    </Link>
    <Midl>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>