sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partially make EdkModulePkg pass intel IPF compiler with /W4 /WX switched on.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2313 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
xli24
2007-01-25 06:15:58 +00:00
parent 582510249f
commit 1cc8ee7861
123 changed files with 1256 additions and 851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Fonts.c
View File

@@ -210,14 +210,17 @@ Returns:
if (Narrow) {
for (Value = 0; Value != Count; Value++) {
*GlyphBuffer[Location + Value] |= GlobalData->NarrowGlyphs[Character].GlyphCol1[Value];
*GlyphBuffer[Location + Value] = (UINT8) (*GlyphBuffer[Location + Value] |
GlobalData->NarrowGlyphs[Character].GlyphCol1[Value]);
}
Attributes = GlobalData->NarrowGlyphs[Character].Attributes & EFI_GLYPH_NON_SPACING;
} else {
for (Value = 0; Value != Count; Value++) {
*GlyphBuffer[Location + Value] |= GlobalData->WideGlyphs[Character].GlyphCol1[Value];
*GlyphBuffer[Location + Value + Count] |= GlobalData->WideGlyphs[Character].GlyphCol2[Value];
*GlyphBuffer[Location + Value] = (UINT8) (*GlyphBuffer[Location + Value] |
GlobalData->WideGlyphs[Character].GlyphCol1[Value]);
*GlyphBuffer[Location + Value + Count] = (UINT8) (*GlyphBuffer[Location + Value + Count] |
GlobalData->WideGlyphs[Character].GlyphCol2[Value]);
}
Attributes = GlobalData->WideGlyphs[Character].Attributes & EFI_GLYPH_NON_SPACING;

11
EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c
View File

@@ -22,6 +22,7 @@ Abstract:
#include "HiiDatabase.h"
STATIC
CHAR16*
Ascii2Unicode (
OUT CHAR16 *UnicodeStr,
@@ -54,6 +55,7 @@ Ascii2Unicode (
}
}
STATIC
CHAR8*
Unicode2Ascii (
OUT CHAR8 *AsciiStr,
@@ -86,6 +88,7 @@ Unicode2Ascii (
}
}
STATIC
VOID
ExtractDevicePathData (
IN EFI_HII_DATA_TABLE *DataTable,
@@ -129,6 +132,7 @@ Returns:
*ExportBufferPtr = ExportBuffer;
}
STATIC
VOID
ExtractVariableData (
IN OUT EFI_HII_DATA_TABLE *DataTable,
@@ -205,6 +209,7 @@ Returns:
&gEfiFormCallbackProtocolGuid,
(VOID *) &FormCallback
);
ASSERT_EFI_ERROR (Status);
}
//
// Since we have a "Setup" variable that wasn't specified by a variable op-code
@@ -240,6 +245,7 @@ Returns:
&TempValue,
ExportBuffer
);
ASSERT_EFI_ERROR (Status);
} else {
Status = gRT->GetVariable (
(CHAR16 *) SETUP_MAP_NAME,
@@ -248,6 +254,7 @@ Returns:
&TempValue,
ExportBuffer
);
ASSERT_EFI_ERROR (Status);
}
ExportBuffer = (UINT8 *) (UINTN) (((UINTN) ExportBuffer) + TempValue);
@@ -306,6 +313,7 @@ Returns:
&TempValue,
ExportBuffer
);
ASSERT_EFI_ERROR (Status);
} else {
Status = gRT->GetVariable (
String,
@@ -314,6 +322,7 @@ Returns:
&TempValue,
ExportBuffer
);
ASSERT_EFI_ERROR (Status);
}
ExportBuffer = (UINT8 *) (UINTN) (((UINTN) ExportBuffer) + TempValue);
@@ -367,7 +376,6 @@ Returns:
UINT8 *ExportBuffer;
EFI_HII_EXPORT_TABLE *ExportTable;
EFI_HII_DATA_TABLE *DataTable;
BOOLEAN InsufficientSize;
BOOLEAN VariableExist;
UINT16 NumberOfHiiDataTables;
UINTN SizeNeeded;
@@ -386,7 +394,6 @@ Returns:
FormPack = NULL;
RawData = NULL;
PackageInstance = NULL;
InsufficientSize = FALSE;
NumberOfHiiDataTables = 0;
VariableSize = 0;
TempValue = 0;

6
EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.c
View File

@@ -154,7 +154,6 @@ Returns:
--*/
{
EFI_HII_GLOBAL_DATA *GlobalData;
EFI_HII_HANDLE_DATABASE *Database;
EFI_HII_DATA *HiiData;
UINTN HandleCount;
@@ -165,8 +164,6 @@ Returns:
HiiData = EFI_HII_DATA_FROM_THIS (This);
GlobalData = HiiData->GlobalData;
Database = HiiData->DatabaseHead;
if (Database == NULL) {
@@ -333,7 +330,6 @@ Returns:
EFI_HII_DATA *HiiData;
EFI_HII_HANDLE_DATABASE *HandleDatabase;
EFI_HII_STRING_PACK *StringPack;
EFI_HII_STRING_PACK *Location;
RELOFST Token;
UINT32 Length;
@@ -376,8 +372,6 @@ Returns:
StringPack = (EFI_HII_STRING_PACK *) (&StringPackageInstance->IfrData);
}
Location = StringPack;
//
// Remember that the string packages are formed into contiguous blocks of language data.
//

8
EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c
View File

@@ -264,7 +264,6 @@ Returns:
UINT32 TotalTokenNumber;
UINT8 *Local;
EFI_NARROW_GLYPH *NarrowGlyph;
EFI_WIDE_GLYPH *WideGlyph;
if (Packages->NumberOfPackages == 0 || This == NULL) {
return EFI_INVALID_PARAMETER;
@@ -439,7 +438,7 @@ Returns:
// we go down one level deeper, increment the handle value that will be passed back.
//
if (Database->Handle >= *Handle) {
*Handle = Database->Handle + 1;
*Handle = (EFI_HII_HANDLE) (Database->Handle + 1);
}
}
@@ -518,7 +517,6 @@ Returns:
Local = (UINT8 *) (&FontPack->NumberOfWideGlyphs + sizeof (UINT8)) +
(sizeof (EFI_NARROW_GLYPH)) *
NumNarrowGlyphs;
WideGlyph = (EFI_WIDE_GLYPH *) Local;
CopyMem (
&Member,
(UINTN *) (Local + sizeof (EFI_WIDE_GLYPH) * Count),
@@ -530,7 +528,6 @@ Returns:
CopyMem (&Unicode, &GlobalData->WideGlyphs[Member].UnicodeWeight, sizeof (UINT16));
if (Unicode == 0) {
Local = (UINT8*)(&FontPack->NumberOfWideGlyphs + sizeof(UINT8)) + (sizeof(EFI_NARROW_GLYPH)) * NumNarrowGlyphs;
WideGlyph = (EFI_WIDE_GLYPH *) Local;
CopyMem (
&GlobalData->WideGlyphs[Member],
(UINTN *) (Local + sizeof (EFI_WIDE_GLYPH) * Count),
@@ -619,7 +616,6 @@ Returns:
EFI_HII_DATA *HiiData;
EFI_HII_HANDLE_DATABASE *HandleDatabase;
EFI_HII_HANDLE_DATABASE *PreviousHandleDatabase;
UINTN Count;
if (This == NULL || Handle == 0) {
return EFI_INVALID_PARAMETER;
@@ -635,7 +631,7 @@ Returns:
//
PreviousHandleDatabase = HandleDatabase;
for (Count = 0; HandleDatabase != NULL; HandleDatabase = HandleDatabase->NextHandleDatabase) {
for (; HandleDatabase != NULL; HandleDatabase = HandleDatabase->NextHandleDatabase) {
//
// Match the numeric value with the database entry - if matched,
// free the package instance and apply fix-up to database linked list

4
EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Strings.c
View File

@@ -22,6 +22,7 @@ Abstract:
#include "HiiDatabase.h"
STATIC
VOID
AsciiToUnicode (
IN UINT8 *Lang,
@@ -138,6 +139,7 @@ Returns:
return EFI_SUCCESS;
}
STATIC
EFI_STATUS
HiiNewString2 (
IN EFI_HII_PROTOCOL *This,
@@ -766,7 +768,7 @@ Returns:
&NewString,
TRUE
);
ASSERT_EFI_ERROR (Status);
}
gBS->FreePool (LangCodes);