Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 13:53:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DESK.CPL]: Check properly if the StringCbCopy has been copied correctly just by moving the check block to where it belongs.

Browse source 
CID 1322244
Patch by Victor Martinez Calvo
CORE-11212 #resolve

svn path=/trunk/; revision=71493
This commit is contained in:
Hermès Bélusca-Maïto 2016-06-01 21:23:37 +00:00
parent 91c6b947d3
commit 9afc56b93b
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/cpl/desk/background.c
View file

@ -19,7 +19,7 @@
#define PLACEMENT_STRETCH 1 #define PLACEMENT_STRETCH 1
#define PLACEMENT_TILE 2 #define PLACEMENT_TILE 2
/* The values in these macros are dependant on the /* The values in these macros are dependent on the
* layout of the monitor image and they must be adjusted * layout of the monitor image and they must be adjusted
* if that image will be changed. * if that image will be changed.
*/ */
@ -348,14 +348,13 @@ AddListViewItems(HWND hwndDlg, PDATA pData)
if ((result == ERROR_SUCCESS) && (_tcslen(originalWallpaper) > 0)) if ((result == ERROR_SUCCESS) && (_tcslen(originalWallpaper) > 0))
{ {
hr = StringCbCopy(wallpaperFilename, sizeof(wallpaperFilename), originalWallpaper); hr = StringCbCopy(wallpaperFilename, sizeof(wallpaperFilename), originalWallpaper);
}
if (FAILED(hr)) if (FAILED(hr))
{ {
RegCloseKey(regKey); RegCloseKey(regKey);
return; return;
} }
} }
}
/* Allow environment variables in file name */ /* Allow environment variables in file name */
if (ExpandEnvironmentStrings(wallpaperFilename, buffer, MAX_PATH)) if (ExpandEnvironmentStrings(wallpaperFilename, buffer, MAX_PATH))