[dchapyshev] 42872: - Add enumeration user keys

Author: dchapyshev
Date: Sun Aug 23 09:40:23 2009
New Revision: 42872

URL: http://svn.reactos.org/svn/reactos?rev=42872&view=rev
Log:
- Add enumeration user keys

Modified:
    trunk/reactos/base/applications/rapps/installed.c
    trunk/reactos/base/applications/rapps/rapps.h
    trunk/reactos/base/applications/rapps/winmain.c

Modified: trunk/reactos/base/applications/rapps/installed.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in…
==============================================================================
--- trunk/reactos/base/applications/rapps/installed.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/installed.c [iso-8859-1] Sun Aug 23 09:40:23
2009
@@ -172,7 +172,7 @@
 
 
 BOOL
-EnumInstalledApplications(INT EnumType, APPENUMPROC lpEnumProc)
+EnumInstalledApplications(INT EnumType, BOOL IsUserKey, APPENUMPROC lpEnumProc)
 {
     DWORD dwSize = MAX_PATH, dwType, dwValue;
     BOOL bIsSystemComponent, bIsUpdate;
@@ -182,7 +182,7 @@
     HKEY hKey, hSubKey;
     LONG ItemIndex = 0;
 
-    if (RegOpenKeyW(HKEY_LOCAL_MACHINE,
+    if (RegOpenKeyW(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE,
                    
L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall",
                     &hKey) != ERROR_SUCCESS)
     {

Modified: trunk/reactos/base/applications/rapps/rapps.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
==============================================================================
--- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Sun Aug 23 09:40:23 2009
@@ -76,7 +76,7 @@
 
 /* installed.c */
 typedef BOOL (CALLBACK *APPENUMPROC)(INT ItemIndex, LPWSTR lpName, LPWSTR lpKeyName,
LPARAM lParam);
-BOOL EnumInstalledApplications(INT EnumType, APPENUMPROC lpEnumProc);
+BOOL EnumInstalledApplications(INT EnumType, BOOL IsUserKey, APPENUMPROC lpEnumProc);
 BOOL GetApplicationString(HKEY hKey, LPWSTR lpKeyName, LPWSTR lpString);
 BOOL ShowInstalledAppInfo(INT Index);
 BOOL UninstallApplication(INT Index, BOOL bModify);

Modified: trunk/reactos/base/applications/rapps/winmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi…
==============================================================================
--- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Sun Aug 23 09:40:23 2009
@@ -101,7 +101,8 @@
     if (IS_INSTALLED_ENUM(EnumType))
     {
         /* Enum installed applications and updates */
-        EnumInstalledApplications(EnumType, EnumInstalledAppProc);
+        EnumInstalledApplications(EnumType, TRUE, EnumInstalledAppProc);
+        EnumInstalledApplications(EnumType, FALSE, EnumInstalledAppProc);
     }
     else if (IS_AVAILABLE_ENUM(EnumType))
     {