[ros-diffs] [cwittich] 25314: * handle REG_EXPAND_SZ in GetAutostartEntriesFromRegistry * changed license to LGPL

Author: cwittich
Date: Fri Jan  5 23:15:07 2007
New Revision: 25314

URL: http://svn.reactos.org/svn/reactos?rev=25314&view=rev
Log:
* handle REG_EXPAND_SZ in GetAutostartEntriesFromRegistry
* changed license to LGPL

Modified:
    trunk/reactos/base/applications/msconfig/freeldrpage.c
    trunk/reactos/base/applications/msconfig/generalpage.c
    trunk/reactos/base/applications/msconfig/msconfig.c
    trunk/reactos/base/applications/msconfig/srvpage.c
    trunk/reactos/base/applications/msconfig/startuppage.c
    trunk/reactos/base/applications/msconfig/systempage.c
    trunk/reactos/base/applications/msconfig/toolspage.c

Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
==============================================================================
--- trunk/reactos/base/applications/msconfig/freeldrpage.c (original)
+++ trunk/reactos/base/applications/msconfig/freeldrpage.c Fri Jan  5 23:15:07 2007
@@ -1,6 +1,6 @@
 /*
  * PROJECT:     ReactOS Applications
- * LICENSE:     GPL - See COPYING in the top level directory
+ * LICENSE:     LGPL - See COPYING in the top level directory
  * FILE:        base/applications/freeldrpage.c
  * PURPOSE:     Freeloader configuration page message handler
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de>

Modified: trunk/reactos/base/applications/msconfig/generalpage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
==============================================================================
--- trunk/reactos/base/applications/msconfig/generalpage.c (original)
+++ trunk/reactos/base/applications/msconfig/generalpage.c Fri Jan  5 23:15:07 2007
@@ -1,6 +1,6 @@
 /*
  * PROJECT:     ReactOS Applications
- * LICENSE:     GPL - See COPYING in the top level directory
+ * LICENSE:     LGPL - See COPYING in the top level directory
  * FILE:        base/applications/generalpage.c
  * PURPOSE:     General page message handler
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de>

Modified: trunk/reactos/base/applications/msconfig/msconfig.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
==============================================================================
--- trunk/reactos/base/applications/msconfig/msconfig.c (original)
+++ trunk/reactos/base/applications/msconfig/msconfig.c Fri Jan  5 23:15:07 2007
@@ -1,6 +1,6 @@
 /*
  * PROJECT:     ReactOS Applications
- * LICENSE:     GPL - See COPYING in the top level directory
+ * LICENSE:     LGPL - See COPYING in the top level directory
  * FILE:        base/applications/msconfig.c
  * PURPOSE:     msconfig main dialog
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de>

Modified: trunk/reactos/base/applications/msconfig/srvpage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
==============================================================================
--- trunk/reactos/base/applications/msconfig/srvpage.c (original)
+++ trunk/reactos/base/applications/msconfig/srvpage.c Fri Jan  5 23:15:07 2007
@@ -1,6 +1,6 @@
 /*
  * PROJECT:     ReactOS Applications
- * LICENSE:     GPL - See COPYING in the top level directory
+ * LICENSE:     LGPL - See COPYING in the top level directory
  * FILE:        base/applications/srvpage.c
  * PURPOSE:     Services page message handler
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de>

Modified: trunk/reactos/base/applications/msconfig/startuppage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
==============================================================================
--- trunk/reactos/base/applications/msconfig/startuppage.c (original)
+++ trunk/reactos/base/applications/msconfig/startuppage.c Fri Jan  5 23:15:07 2007
@@ -1,6 +1,6 @@
 /*
  * PROJECT:     ReactOS Applications
- * LICENSE:     GPL - See COPYING in the top level directory
+ * LICENSE:     LGPL - See COPYING in the top level directory
  * FILE:        base/applications/startuppage.c
  * PURPOSE:     Startup page message handler
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de>
@@ -116,25 +116,17 @@
                             dwDataLength = MAX_VALUE_NAME;
                             if(RegEnumValue(hSubKey, SubIndex, szSubValueName,
&dwValueLength, NULL, NULL, (LPBYTE)Data, &dwDataLength) == ERROR_SUCCESS)
                             {
+                                item.iSubItem = -1;
                                 if (!_tcscmp(szSubValueName, _T("command")))
-                                {
+                                    item.iSubItem = 1;
+                                else if (!_tcscmp(szSubValueName, _T("key")) ||
!_tcscmp(szSubValueName, _T("location")))
+                                    item.iSubItem = 2;
+                                else if (!_tcscmp(szSubValueName, _T("item")))
+                                    item.iSubItem = 0;
+                                if (item.iSubItem != -1)
+								{
                                     GetLongPathName(Data, Data, (DWORD) _tcsclen(Data));
                                     item.pszText = Data;
-                                    item.iSubItem = 1;
-                                    SendMessage(hStartupListCtrl, LVM_SETITEMTEXT,
item.iItem, (LPARAM) &item);
-                                }
-                                else if (!_tcscmp(szSubValueName, _T("key")) ||
!_tcscmp(szSubValueName, _T("location")))
-                                {
-                                    GetLongPathName(Data, Data, (DWORD) _tcsclen(Data));
-                                    item.pszText = Data;
-                                    item.iSubItem = 2;
-                                    SendMessage(hStartupListCtrl, LVM_SETITEMTEXT,
item.iItem, (LPARAM) &item);
-                                }
-                                else if (!_tcscmp(szSubValueName, _T("item")))
-                                {
-                                    GetLongPathName(Data, Data, (DWORD) _tcsclen(Data));
-                                    item.pszText = Data;
-                                    item.iSubItem = 0;
                                     SendMessage(hStartupListCtrl, LVM_SETITEMTEXT,
item.iItem, (LPARAM) &item);
                                 }
                             }
@@ -183,7 +175,7 @@
                     (void)ListView_InsertItem(hStartupListCtrl, &item);
                     ListView_SetCheckState(hStartupListCtrl, item.iItem, TRUE);
 
-                    if (dwType == REG_SZ)
+                    if ((dwType == REG_SZ) || (dwType == REG_EXPAND_SZ))
                     {
                         GetLongPathName(Data, Data, (DWORD) _tcsclen(Data));
                         item.pszText = Data;

Modified: trunk/reactos/base/applications/msconfig/systempage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
==============================================================================
--- trunk/reactos/base/applications/msconfig/systempage.c (original)
+++ trunk/reactos/base/applications/msconfig/systempage.c Fri Jan  5 23:15:07 2007
@@ -1,6 +1,6 @@
 /*
  * PROJECT:     ReactOS Applications
- * LICENSE:     GPL - See COPYING in the top level directory
+ * LICENSE:     LGPL - See COPYING in the top level directory
  * FILE:        base/applications/systempage.c
  * PURPOSE:     System page message handler
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de>

Modified: trunk/reactos/base/applications/msconfig/toolspage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
==============================================================================
--- trunk/reactos/base/applications/msconfig/toolspage.c (original)
+++ trunk/reactos/base/applications/msconfig/toolspage.c Fri Jan  5 23:15:07 2007
@@ -1,6 +1,6 @@
 /*
  * PROJECT:     ReactOS Applications
- * LICENSE:     GPL - See COPYING in the top level directory
+ * LICENSE:     LGPL - See COPYING in the top level directory
  * FILE:        base/applications/toolspage.c
  * PURPOSE:     Tools page message handler
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de>