Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 05:00:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MAIN]

Browse source 
- fix a memory leak
CID #716340

- initialize the new cursor scheme name so it doesn't show garbage in the save dialog

The previous commit fixed:
CID #716120
CID #715936 
CID #515183

svn path=/trunk/; revision=62667
This commit is contained in:
Kamil Hornicek 2014-04-06 17:09:47 +00:00
parent 3cf4d36849
commit 0bd2bad093
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/dll/cpl/main/mouse.c
View file

@ -718,6 +718,7 @@ SaveCursorScheme(HWND hwndDlg)
if (nSel == 0) if (nSel == 0)
{ {
szSchemeName[0] = 0; szSchemeName[0] = 0;
szNewSchemeName[0] = 0;
} }
else else
{ {
@ -775,6 +776,9 @@ SaveCursorScheme(HWND hwndDlg)
lpSchemeData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nLength * sizeof(TCHAR)); lpSchemeData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nLength * sizeof(TCHAR));
if(!lpSchemeData)
return FALSE;
for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++)
{ {
CompressPath(szTempPath, g_CursorData[i].szCursorPath); CompressPath(szTempPath, g_CursorData[i].szCursorPath);
@ -784,11 +788,15 @@ SaveCursorScheme(HWND hwndDlg)
} }
if (RegOpenCurrentUser(KEY_READ | KEY_SET_VALUE, &hCuKey) != ERROR_SUCCESS) if (RegOpenCurrentUser(KEY_READ | KEY_SET_VALUE, &hCuKey) != ERROR_SUCCESS)
{
HeapFree(GetProcessHeap(), 0, lpSchemeData);
return FALSE; return FALSE;
}
if (RegOpenKeyEx(hCuKey, _T("Control Panel\\Cursors\\Schemes"), 0, KEY_READ | KEY_SET_VALUE, &hCuCursorKey) != ERROR_SUCCESS) if (RegOpenKeyEx(hCuKey, _T("Control Panel\\Cursors\\Schemes"), 0, KEY_READ | KEY_SET_VALUE, &hCuCursorKey) != ERROR_SUCCESS)
{ {
RegCloseKey(hCuKey); RegCloseKey(hCuKey);
HeapFree(GetProcessHeap(), 0, lpSchemeData);
return FALSE; return FALSE;
} }