merge from amd-64 branch:

r40992: msconfig: don't use inline functions as case labels [[Timo Kreuzer]]

svn path=/trunk/; revision=43082

diff --git a/reactos/base/applications/msconfig/startuppage.c b/reactos/base/applications/msconfig/startuppage.c
index 47d5673..f5bcd6d 100644 (file)
--- a/reactos/base/applications/msconfig/startuppage.c
+++ b/reactos/base/applications/msconfig/startuppage.c
@@ -185,10 +185,10 @@ GetAutostartEntriesFromRegistry ( HKEY hRootKey, TCHAR* KeyName )
 
                     switch (PtrToLong(hRootKey))
                     {
 
                     switch (PtrToLong(hRootKey))
                     {

-                    case PtrToLong(HKEY_LOCAL_MACHINE):
+                    case (ULONG_PTR)HKEY_LOCAL_MACHINE:

                         _tcscpy(Path, _T("HKLM\\\0"));
                         break;
                         _tcscpy(Path, _T("HKLM\\\0"));
                         break;

-                    case PtrToLong(HKEY_CURRENT_USER):
+                    case (ULONG_PTR)HKEY_CURRENT_USER:

                         _tcscpy(Path, _T("HKCU\\\0"));
                         break;
                     default:
                         _tcscpy(Path, _T("HKCU\\\0"));
                         break;
                     default: