[ros-diffs] [tkreuzer] 58276: [MKHIVE] Fix build, but remove support for architecture specific inf sections. This means livecd cannot have those until someone implements this. I give up...

Author: tkreuzer
Date: Sat Feb  2 22:36:31 2013
New Revision: 58276

URL: http://svn.reactos.org/svn/reactos?rev=58276&view=rev
Log:
[MKHIVE]
Fix build, but remove support for architecture specific inf sections. This means livecd cannot have those until someone implements this. I give up...

Modified:
    trunk/reactos/tools/mkhive/reginf.c

Modified: trunk/reactos/tools/mkhive/reginf.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=5...
==============================================================================
--- trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] (original)
+++ trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] Sat Feb  2 22:36:31 2013
@@ -47,17 +47,6 @@
 #define FLG_ADDREG_TYPE_NONE             (0x00020000 | FLG_ADDREG_BINVALUETYPE)
 #define FLG_ADDREG_TYPE_MASK             (0xFFFF0000 | FLG_ADDREG_BINVALUETYPE)

-#if defined(_M_IX86) || defined(__i386__)
-static const WCHAR Architecture[] = {'x','8','6',0};
-#elif defined(_M_AMD64) || defined(__x86_64__)
-static const WCHAR Architecture[] = {'a','m','d','6','4'0};
-#elif defined(_M_IA64)
-static const WCHAR Architecture[] = {'i','a','6','4',0};
-#elif defined(_M_ARM)
-static const WCHAR Architecture[] = {'a','r','m',0};
-#elif defined(_M_PPC)
-static const WCHAR Architecture[] = {'p','p','c',0};
-#endif

static const WCHAR HKCR[] = {'H','K','C','R',0};
 static const WCHAR HKCU[] = {'H','K','C','U',0};
@@ -492,7 +481,6 @@
 {
    HINF hInf;
    ULONG ErrorLine;
-	WCHAR SectionName[40];

/* Load inf file from install media. */
    if (InfHostOpenFile(&hInf, FileName, 0, &ErrorLine) != 0)
@@ -506,23 +494,9 @@
    	DPRINT1 ("registry_callback() for DelReg failed\n");
    }

-	wcsncpy(SectionName, DelReg, sizeof(SectionName) / sizeof(WCHAR));
-	wcsncat(SectionName, Architecture, sizeof(SectionName) / sizeof(WCHAR));
-	if (!registry_callback (hInf, SectionName, TRUE))
-	{
-		DPRINT1 ("registry_callback() for DelReg.NT* failed\n");
-	}
-
    if (!registry_callback (hInf, (PWCHAR)AddReg, FALSE))
    {
    	DPRINT1 ("registry_callback() for AddReg failed\n");
-	}
-
-	wcsncpy(SectionName, AddReg, sizeof(SectionName) / sizeof(WCHAR));
-	wcsncat(SectionName, Architecture, sizeof(SectionName) / sizeof(WCHAR));
-	if (!registry_callback (hInf, SectionName, FALSE))
-	{
-		DPRINT1 ("registry_callback() for AddReg.NT* failed\n");
    }

InfHostCloseFile (hInf);