shell32/tests: Don't fill a string with potential garbage.

This commit is contained in:
Paul Vriens 2009-12-03 13:33:36 +01:00 committed by Alexandre Julliard
parent eaee84f4db
commit 1c582d2ac5
1 changed files with 8 additions and 8 deletions

View File

@ -120,6 +120,14 @@ static void init_strings(void)
LONG res; LONG res;
/* Older Win9x and NT4 */ /* Older Win9x and NT4 */
RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key);
size = sizeof(Programs);
RegQueryValueExA(key, "Programs", NULL, NULL, (LPBYTE)&Programs, &size);
size = sizeof(startup);
RegQueryValueExA(key, "Startup", NULL, NULL, (LPBYTE)&startup, &size);
lstrcpyA(Startup, (strrchr(startup, '\\') + 1));
RegCloseKey(key);
RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key);
size = sizeof(CommonPrograms); size = sizeof(CommonPrograms);
res = RegQueryValueExA(key, "Common Programs", NULL, NULL, (LPBYTE)&CommonPrograms, &size); res = RegQueryValueExA(key, "Common Programs", NULL, NULL, (LPBYTE)&CommonPrograms, &size);
@ -129,14 +137,6 @@ static void init_strings(void)
/* Win9x */ /* Win9x */
lstrcpyA(CommonPrograms, Programs); lstrcpyA(CommonPrograms, Programs);
} }
RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key);
size = sizeof(Programs);
RegQueryValueExA(key, "Programs", NULL, NULL, (LPBYTE)&Programs, &size);
size = sizeof(startup);
RegQueryValueExA(key, "Startup", NULL, NULL, (LPBYTE)&startup, &size);
lstrcpyA(Startup, (strrchr(startup, '\\') + 1));
RegCloseKey(key);
} }
memset(&cs, 0, sizeof(cs)); memset(&cs, 0, sizeof(cs));