[ros-diffs] [tkreuzer] 61596: [FREELDR/CMLIB] Update Copyright year and fix GCC build

Author: tkreuzer
Date: Sun Jan 12 21:55:20 2014
New Revision: 61596

URL: http://svn.reactos.org/svn/reactos?rev=61596&view=rev
Log:
[FREELDR/CMLIB]
Update Copyright year and fix GCC build

Modified:
    trunk/reactos/boot/freeldr/freeldr/reactos/registry.c
    trunk/reactos/lib/cmlib/cmlib.h
    trunk/reactos/lib/cmlib/cmtools.c

Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/reacto...
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c	[iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c	[iso-8859-1] Sun Jan 12 21:55:20 2014
@@ -1,7 +1,7 @@
 /*
  *  FreeLoader
  *
- *  Copyright (C) 2001, 2002  Timo Kreuzer [e-mail]
+ *  Copyright (C) 2014  Timo Kreuzer [e-mail]
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -53,13 +53,13 @@
                           NULL);
     if (!NT_SUCCESS(Status))
     {
-        CmpFree(CmHive, 0);
+        FrLdrTempFree(CmHive, 'eviH');
         ERR("Invalid hive Signature!\n");
         return FALSE;
     }

/* Save the root key node */
-    RootKeyNode = HvGetCell(&CmHive->Hive, Hive->BaseBlock->RootCell);
+    RootKeyNode = HvGetCell(&CmHive->Hive, CmHive->Hive.BaseBlock->RootCell);

TRACE("RegImportBinaryHive done\n");
     return TRUE;
@@ -316,7 +316,6 @@
     _Out_ PFRLDRHKEY Key)
 {
     UNICODE_STRING RemainingPath, SubKeyName;
-    UNICODE_STRING RegistryStartPath = RTL_CONSTANT_STRING(L"\Registry\MACHINE\SYSTEM");
     UNICODE_STRING CurrentControlSet = RTL_CONSTANT_STRING(L"CurrentControlSet");
     PHHIVE Hive = &CmHive->Hive;
     PCM_KEY_NODE KeyNode;

Modified: trunk/reactos/lib/cmlib/cmlib.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=61596...
==============================================================================
--- trunk/reactos/lib/cmlib/cmlib.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/cmlib/cmlib.h	[iso-8859-1] Sun Jan 12 21:55:20 2014
@@ -19,6 +19,16 @@
     #define strncasecmp _strnicmp
     #define strcasecmp _stricmp
     #endif//_WIN32
+
+    #ifndef _MSC_VER
+    #define _In_
+    #define _Out_
+    #define _Inout_
+    #endif
+
+    #ifndef min
+    #define min(a, b)  (((a) < (b)) ? (a) : (b))
+    #endif

// Definitions copied from <ntstatus.h>
     // We only want to include host headers, so we define them manually
@@ -350,7 +360,7 @@
 ULONG
 NTAPI
 CmCopyKeyName(
-    IN PCM_KEY_NODE KeyNode,
+    _In_ PCM_KEY_NODE KeyNode,
     _Out_ PWCHAR KeyNameBuffer,
     _Inout_ ULONG BufferLength);

Modified: trunk/reactos/lib/cmlib/cmtools.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmtools.c?rev=615...
==============================================================================
--- trunk/reactos/lib/cmlib/cmtools.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/cmlib/cmtools.c	[iso-8859-1] Sun Jan 12 21:55:20 2014
@@ -183,7 +183,7 @@
         }
     }

-    if (BufferLength >= NameLength + sizeof(UNICODE_NULL))
+    if (BufferLength >= NameLength + sizeof(WCHAR))
     {
         Buffer[NameLength / sizeof(WCHAR)] = '\0';
     }
@@ -194,7 +194,7 @@
 ULONG
 NTAPI
 CmCopyKeyName(
-    IN PCM_KEY_NODE KeyNode,
+    _In_ PCM_KEY_NODE KeyNode,
     _Out_ PWCHAR KeyNameBuffer,
     _Inout_ ULONG BufferLength)
 {