[PATCH 3/3] Don't fill a string with potential garbage
Paul Vriens
Paul.Vriens.Wine at gmail.com
Thu Dec 3 06:33:36 CST 2009
---
dlls/shell32/tests/progman_dde.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c
index c3cb1e7..7e6c874 100644
--- a/dlls/shell32/tests/progman_dde.c
+++ b/dlls/shell32/tests/progman_dde.c
@@ -120,6 +120,14 @@ static void init_strings(void)
LONG res;
/* 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);
size = sizeof(CommonPrograms);
res = RegQueryValueExA(key, "Common Programs", NULL, NULL, (LPBYTE)&CommonPrograms, &size);
@@ -129,14 +137,6 @@ static void init_strings(void)
/* Win9x */
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));
--
1.6.2.5
--------------080400050201080108040402--
More information about the wine-patches
mailing list