Index: ntoskrnl/inbv/inbv.c
===================================================================
--- ntoskrnl/inbv/inbv.c	(revision 57785)
+++ ntoskrnl/inbv/inbv.c	(working copy)
@@ -555,7 +555,7 @@
     if (ResourceNumber > ResourceCount) return NULL;
 
     /* Return the address */
-    return ResourceList[ResourceNumber--];
+    return ResourceList[ResourceNumber];
 }
 
 NTSTATUS
@@ -637,7 +637,7 @@
         if (!InbvBootDriverInstalled) return;
 
         /* Load the standard boot screen */
-        Screen = InbvGetResourceAddress(IDB_BOOT_LOGO);
+        Screen = InbvGetResourceAddress(IDB_BOOT_SCREEN);
         if (SharedUserData->NtProductType == NtProductWinNt)
         {
             /* Workstation product, display appropriate status bar color */
@@ -659,7 +659,7 @@
             else
             {
                 /* Normal edition */
-                Text = InbvGetResourceAddress(IDB_SERVER_LOGO);
+                Text = NULL;
             }
             
             /* Server product, display appropriate status bar color */
@@ -692,7 +692,7 @@
           }
           
           /* Draw the SKU text if it exits */
-          if (Text) InbvBitBlt(Text, 180, 121);
+          if (Text) InbvBitBlt(Text, 230, 320);
           
           /* Draw the progress bar bit */
 //          if (Bar) InbvBitBlt(Bar, 0, 0);
Index: ntoskrnl/inbv/logo/16.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ntoskrnl/inbv/logo/16.bmp
===================================================================
--- ntoskrnl/inbv/logo/16.bmp	(revision 0)
+++ ntoskrnl/inbv/logo/16.bmp	(working copy)

Property changes on: ntoskrnl/inbv/logo/16.bmp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ntoskrnl/inbv/logo/17.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ntoskrnl/inbv/logo/17.bmp
===================================================================
--- ntoskrnl/inbv/logo/17.bmp	(revision 0)
+++ ntoskrnl/inbv/logo/17.bmp	(working copy)

Property changes on: ntoskrnl/inbv/logo/17.bmp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ntoskrnl/include/resource.h
===================================================================
--- ntoskrnl/include/resource.h	(revision 57785)
+++ ntoskrnl/include/resource.h	(working copy)
@@ -1,8 +1,8 @@
 #pragma once
 
-#define IDB_BOOT_LOGO       1
+#define IDB_BOOT_SCREEN     1
 #define IDB_HIBERNATE_LOGO  2
-#define IDB_SHUTDOWN_LOGO   3
+#define IDB_SHUTDOWN_MSG    3
 #define IDB_LOGO            5
 #define IDB_LOGO_HEADER     6
 #define IDB_LOGO_BAND       7
Index: ntoskrnl/ntoskrnl.rc
===================================================================
--- ntoskrnl/ntoskrnl.rc	(revision 57785)
+++ ntoskrnl/ntoskrnl.rc	(working copy)
@@ -29,9 +29,9 @@
 // Bug Codes and Bitmaps
 //
 #include "bugcodes.rc"
-IDB_BOOT_LOGO       BITMAP DISCARDABLE "inbv/logo/1.bmp"
+IDB_BOOT_SCREEN     BITMAP DISCARDABLE "inbv/logo/1.bmp"
 IDB_HIBERNATE_LOGO  BITMAP DISCARDABLE "inbv/logo/2.bmp"
-IDB_SHUTDOWN_LOGO   BITMAP DISCARDABLE "inbv/logo/3.bmp"
+IDB_SHUTDOWN_MSG    BITMAP DISCARDABLE "inbv/logo/3.bmp"
 IDB_BAR_SERVER      BITMAP DISCARDABLE "inbv/logo/4.bmp"
 IDB_LOGO            BITMAP DISCARDABLE "inbv/logo/5.bmp"
 IDB_LOGO_HEADER     BITMAP DISCARDABLE "inbv/logo/6.bmp"
@@ -40,3 +40,5 @@
 IDB_SERVER_LOGO     BITMAP DISCARDABLE "inbv/logo/5.bmp"
 IDB_SERVER_HEADER   BITMAP DISCARDABLE "inbv/logo/14.bmp"
 IDB_SERVER_BAND     BITMAP DISCARDABLE "inbv/logo/15.bmp"
+IDB_STORAGE_SERVER  BITMAP DISCARDABLE "inbv/logo/16.bmp"
+IDB_CLUSTER_SERVER  BITMAP DISCARDABLE "inbv/logo/17.bmp"
Index: ntoskrnl/po/poshtdwn.c
===================================================================
--- ntoskrnl/po/poshtdwn.c	(revision 57785)
+++ ntoskrnl/po/poshtdwn.c	(working copy)
@@ -43,7 +43,7 @@
         InbvSetScrollRegion(0, 0, 639, 479);
 
         /* Display shutdown logo and message */
-        Logo1 = InbvGetResourceAddress(IDB_SHUTDOWN_LOGO);
+        Logo1 = InbvGetResourceAddress(IDB_SHUTDOWN_MSG);
         Logo2 = InbvGetResourceAddress(IDB_LOGO);
         if ((Logo1) && (Logo2))
         {