OSDN > Finden Software > MUtilities > SCM > git > MUtilities > Commit

MUtilities
Fork

MUtilities: Commit

MUtilities development repository

Fixed a memory leak + fixed check condition.

--- a/MUtilities_VS2013.vcxproj

+++ b/MUtilities_VS2013.vcxproj

		@@ -164,7 +164,7 @@
164	164	<SubSystem>Windows</SubSystem>
165	165	<GenerateDebugInformation>true</GenerateDebugInformation>
166	166	<AdditionalLibraryDirectories>$(SolutionDir)\..\Prerequisites\Qt4\MSVC-2013\Debug\lib;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32</AdditionalLibraryDirectories>
167		- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;Winmm.lib;Psapi.lib;Sensapi.lib;PowrProf.lib;%(AdditionalDependencies)</AdditionalDependencies>
	167	+ <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;Winmm.lib;Psapi.lib;Sensapi.lib;PowrProf.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
168	168	</Link>
169	169	</ItemDefinitionGroup>
170	170	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">

		@@ -193,7 +193,7 @@
193	193	<EnableCOMDATFolding>true</EnableCOMDATFolding>
194	194	<OptimizeReferences>true</OptimizeReferences>
195	195	<AdditionalLibraryDirectories>$(SolutionDir)\..\Prerequisites\Qt4\MSVC-2013\Shared\lib;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32</AdditionalLibraryDirectories>
196		- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;Winmm.lib;Psapi.lib;Sensapi.lib;PowrProf.lib;%(AdditionalDependencies)</AdditionalDependencies>
	196	+ <AdditionalDependencies>QtCore4.lib;QtGui4.lib;Winmm.lib;Psapi.lib;Sensapi.lib;PowrProf.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
197	197	<GenerateDebugInformation>false</GenerateDebugInformation>
198	198	</Link>
199	199	</ItemDefinitionGroup>

--- a/src/Registry_Win32.cpp

+++ b/src/Registry_Win32.cpp

		@@ -106,6 +106,7 @@ MUtils::Registry::RegistryKey::~RegistryKey(void)
106	106	p->m_hKey = NULL;
107	107	p->m_isOpen = false;
108	108	}
	109	+ delete p;
109	110	}
110	111
111	112	inline bool MUtils::Registry::RegistryKey::isOpen(void)

		@@ -128,7 +129,7 @@ bool MUtils::Registry::RegistryKey::value_write(const QString &valueName, const
128	129	bool MUtils::Registry::RegistryKey::value_read(const QString &valueName, quint32 &value) const
129	130	{
130	131	DWORD size = sizeof(quint32), type = -1;
131		- CHECK_STATUS(false);
	132	+ CHECK_STATUS(true);
132	133	return (RegQueryValueEx(p->m_hKey, valueName.isEmpty() ? NULL : MUTILS_WCHR(valueName), 0, &type, reinterpret_cast<BYTE*>(&value), &size) == ERROR_SUCCESS) && (type == REG_DWORD);
133	134	}
134	135

		@@ -136,7 +137,7 @@ bool MUtils::Registry::RegistryKey::value_read(const QString &valueName, QString
136	137	{
137	138	wchar_t buffer[2048];
138	139	DWORD size = sizeof(wchar_t) * 2048, type = -1;
139		- CHECK_STATUS(false);
	140	+ CHECK_STATUS(true);
140	141	if((RegQueryValueEx(p->m_hKey, valueName.isEmpty() ? NULL : MUTILS_WCHR(valueName), 0, &type, reinterpret_cast<BYTE*>(&value), &size) == ERROR_SUCCESS) && ((type == REG_SZ) \|\| (type == REG_EXPAND_SZ)))
141	142	{
142	143	value = QString::fromUtf16(reinterpret_cast<const ushort*>(buffer));