system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 17:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

appwiz.cpl: Don't list system components.

Browse source
This commit is contained in:
Hans Leidekker 2011-05-30 09:28:31 +02:00 committed by Alexandre Julliard
parent 4c49cf853d
commit 9432d65b7a
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dlls/appwiz.cpl/appwiz.c
View file

@ -100,6 +100,7 @@ static const WCHAR CommentsW[] = {'C','o','m','m','e','n','t','s',0};
static const WCHAR UninstallCommandlineW[] = {'U','n','i','n','s','t','a','l','l', static const WCHAR UninstallCommandlineW[] = {'U','n','i','n','s','t','a','l','l',
'S','t','r','i','n','g',0}; 'S','t','r','i','n','g',0};
static const WCHAR WindowsInstallerW[] = {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; static const WCHAR WindowsInstallerW[] = {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0};
static const WCHAR SystemComponentW[] = {'S','y','s','t','e','m','C','o','m','p','o','n','e','n','t',0};
static const WCHAR PathUninstallW[] = { static const WCHAR PathUninstallW[] = {
'S','o','f','t','w','a','r','e','\\', 'S','o','f','t','w','a','r','e','\\',
@ -153,7 +154,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root)
HKEY hkeyApp; HKEY hkeyApp;
int i, id = 0; int i, id = 0;
DWORD sizeOfSubKeyName, displen, uninstlen; DWORD sizeOfSubKeyName, displen, uninstlen;
DWORD dwNoModify, dwType, value; DWORD dwNoModify, dwType, value, size;
WCHAR subKeyName[256]; WCHAR subKeyName[256];
WCHAR *command; WCHAR *command;
APPINFO *info = NULL; APPINFO *info = NULL;
@ -165,12 +166,19 @@ static BOOL ReadApplicationsFromRegistry(HKEY root)
NULL, NULL, NULL) != ERROR_NO_MORE_ITEMS; ++i) NULL, NULL, NULL) != ERROR_NO_MORE_ITEMS; ++i)
{ {
RegOpenKeyExW(root, subKeyName, 0, KEY_READ, &hkeyApp); RegOpenKeyExW(root, subKeyName, 0, KEY_READ, &hkeyApp);
size = sizeof(value);
if (!RegQueryValueExW(hkeyApp, SystemComponentW, NULL, &dwType, (LPBYTE)&value, &size)
&& dwType == REG_DWORD && value == 1)
{
RegCloseKey(hkeyApp);
sizeOfSubKeyName = sizeof(subKeyName) / sizeof(subKeyName[0]);
continue;
}
displen = 0; displen = 0;
uninstlen = 0; uninstlen = 0;
if (!RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, NULL, &displen)) if (!RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, NULL, &displen))
{ {
DWORD size = sizeof(value); size = sizeof(value);
if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &dwType, (LPBYTE)&value, &size) if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &dwType, (LPBYTE)&value, &size)
&& dwType == REG_DWORD && value == 1) && dwType == REG_DWORD && value == 1)
{ {