. 修正bug

chenall · Jul 14, 2015 · c2296f3 · c2296f3
1 parent 35b9e34
commit c2296f3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/stage2/graphics.c b/stage2/graphics.c
@@ -920,12 +920,16 @@ static int read_image_bmp(int type)
 		for(x=0;x<bmih.biWidth;++x)
 		{
 			grub_read((unsigned long long)(unsigned int)(char*)&bftmp,bfbit, GRUB_READ);
-			bmp = (unsigned char *)SPLASH_IMAGE+x*current_bytes_per_pixel+y*current_bytes_per_scanline;
-			if(current_bits_per_pixel == 24 || current_bits_per_pixel == 32)
-//				bmp[x] = bftmp;
-				*(unsigned long *)bmp = bftmp;
-			else
-				*(unsigned short *)bmp = (unsigned short)pixel_shift(bftmp);
+			if(y < SPLASH_H && x < SPLASH_W)
+				if(y < current_y_resolution && x < current_x_resolution)
+				{
+					bmp = (unsigned char *)SPLASH_IMAGE+x*current_bytes_per_pixel+y*current_bytes_per_scanline;
+					if(current_bits_per_pixel == 24 || current_bits_per_pixel == 32)
+//				bmp[x] = bftmp;		//
+						*(unsigned long *)bmp = bftmp;
+					else
+						*(unsigned short *)bmp = (unsigned short)pixel_shift(bftmp);
+				}
 		}
 	}
 	return 2;

diff --git a/stage2/stage2.c b/stage2/stage2.c
@@ -334,10 +334,14 @@ print_entry (int y, int highlight,int entryno, char *config_entries)
 	}
       else
 	{
-		if((splashimage_loaded & 0xf)!=2 || graphics_mode < 0xff)
+		unsigned long long clo = current_color_64bit;
+		if(splashimage_loaded & 2)
+			current_color_64bit = 0;
+		else
 			if (current_term->setcolorstate)
 				current_term->setcolorstate (COLOR_STATE_NORMAL);
 		ret = grub_putchar (' ', ret);
+		current_color_64bit = clo;
 		if ((long)ret < 0)
 			break;
 		//grub_putchar (' ', ret);