1 diff --git a/DeviceTree/devicetree.c b/DeviceTree/devicetree.c
2 index 147e2cb..8b0645d 100644
3 --- a/DeviceTree/devicetree.c
4 +++ b/DeviceTree/devicetree.c
5 @@ -36,7 +36,7 @@ extern UINT8 STRING_ARRAY_NAME[];
9 -EFI_HII_HANDLE HiiHandle;
10 +STATIC EFI_HII_HANDLE HiiHandle;
11 EFI_GUID EfiDevicetreeGuid = EFI_DEVICETREE_GUID;
12 SHELL_VAR_CHECK_ITEM DevicetreeCheckList[] = {
14 diff --git a/DeviceTree/devicetree.inf b/DeviceTree/devicetree.inf
15 index a86a1a0..2132c62 100644
16 --- a/DeviceTree/devicetree.inf
17 +++ b/DeviceTree/devicetree.inf
18 @@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
22 - ..\ShCommonStrings.uni
23 + ../ShCommonStrings.uni
32 - $(EDK_SOURCE)\Foundation
33 - $(EDK_SOURCE)\Foundation\Include
34 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
35 - $(EDK_SOURCE)\Foundation\Efi
36 - $(EDK_SOURCE)\Foundation\Efi\Include
37 - $(EDK_SOURCE)\Foundation\FrameWork
38 - $(EDK_SOURCE)\Foundation\FrameWork\Include
39 - $(EDK_SOURCE)\Foundation\Core\Dxe
43 + $(EDK_SOURCE)/Foundation
44 + $(EDK_SOURCE)/Foundation/Include
45 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
46 + $(EDK_SOURCE)/Foundation/Efi
47 + $(EDK_SOURCE)/Foundation/Efi/Include
48 + $(EDK_SOURCE)/Foundation/FrameWork
49 + $(EDK_SOURCE)/Foundation/FrameWork/Include
50 + $(EDK_SOURCE)/Foundation/Core/Dxe
55 diff --git a/EfiCompress/compress.c b/EfiCompress/compress.c
56 index e21c1f6..012bbef 100644
57 --- a/EfiCompress/compress.c
58 +++ b/EfiCompress/compress.c
59 @@ -262,7 +262,7 @@ STATIC UINT32 mBufSiz = 0, mOutputPos, mOutputMask, mSubBitBuf, mCrc;
60 STATIC UINT32 mCompSize, mOrigSize;
62 STATIC UINT16 *mFreq, *mSortPtr, mLenCnt[17], mLeft[2 * NC - 1], mRight[2 * NC - 1],
63 - mCrcTable[UINT8_MAX + 1], mCFreq[2 * NC - 1], mCTable[4096], mCCode[NC],
64 + mCrcTable[UINT8_MAX + 1], mCFreq[2 * NC - 1], mCCode[NC],
65 mPFreq[2 * NP - 1], mPTCode[NPT], mTFreq[2 * NT - 1];
67 STATIC NODE mPos, mMatchPos, mAvail, *mPosition, *mParent, *mPrev, *mNext = NULL;
68 diff --git a/EfiCompress/compress.inf b/EfiCompress/compress.inf
69 index 2e62fbf..c8cb415 100644
70 --- a/EfiCompress/compress.inf
71 +++ b/EfiCompress/compress.inf
72 @@ -25,7 +25,7 @@ FILE_GUID = A6A236DB-F3FB-4f7f-93BC-0AF7DAA583B9
73 COMPONENT_TYPE = APPLICATION
76 -..\ShCommonStrings.uni
77 +../ShCommonStrings.uni
81 @@ -34,17 +34,17 @@ compress.h
87 - $(EDK_SOURCE)\Foundation
88 - $(EDK_SOURCE)\Foundation\Include
89 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
90 - $(EDK_SOURCE)\Foundation\Efi
91 - $(EDK_SOURCE)\Foundation\Efi\Include
92 - $(EDK_SOURCE)\Foundation\FrameWork
93 - $(EDK_SOURCE)\Foundation\FrameWork\Include
94 - $(EDK_SOURCE)\Foundation\Core\Dxe
98 + $(EDK_SOURCE)/Foundation
99 + $(EDK_SOURCE)/Foundation/Include
100 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
101 + $(EDK_SOURCE)/Foundation/Efi
102 + $(EDK_SOURCE)/Foundation/Efi/Include
103 + $(EDK_SOURCE)/Foundation/FrameWork
104 + $(EDK_SOURCE)/Foundation/FrameWork/Include
105 + $(EDK_SOURCE)/Foundation/Core/Dxe
110 diff --git a/EfiDecompress/Decompress.c b/EfiDecompress/Decompress.c
111 index 918f673..a1490a1 100644
112 --- a/EfiDecompress/Decompress.c
113 +++ b/EfiDecompress/Decompress.c
114 @@ -22,7 +22,7 @@ Revision History
117 #include "EfiShellLib.h"
118 -#include "decompress.h"
119 +#include "Decompress.h"
121 extern UINT8 STRING_ARRAY_NAME[];
123 @@ -31,7 +31,7 @@ extern UINT8 STRING_ARRAY_NAME[];
125 #include STRING_DEFINES_FILE
127 -#include EFI_PROTOCOL_DEFINITION (decompress)
128 +#include EFI_PROTOCOL_DEFINITION (Decompress)
130 EFI_HII_HANDLE HiiDecompressHandle;
131 EFI_GUID EfiDecompressGuid = EFI_DECOMPRESS_GUID;
132 @@ -192,7 +192,7 @@ Returns:
136 - Status = LibLocateProtocol (&gEfiDecompressProtocolGuid, &Decompress);
137 + Status = LibLocateProtocol (&gEfiDecompressProtocolGuid, (VOID**)&Decompress);
138 if (EFI_ERROR (Status)) {
139 PrintToken (STRING_TOKEN (STR_DECOMPRESS_PROTOCOL_NOT_FOUND), HiiDecompressHandle, L"efidecompress");
140 Status = EFI_UNSUPPORTED;
141 diff --git a/EfiDecompress/Decompress.inf b/EfiDecompress/Decompress.inf
142 index f955220..6d1e70c 100644
143 --- a/EfiDecompress/Decompress.inf
144 +++ b/EfiDecompress/Decompress.inf
145 @@ -25,7 +25,7 @@ FILE_GUID = D9D42564-071C-4d73-8DB0-43C55C62DC4C
146 COMPONENT_TYPE = APPLICATION
149 -..\ShCommonStrings.uni
150 +../ShCommonStrings.uni
151 DecompressStrings.uni
154 @@ -33,17 +33,17 @@ decompress.h
160 - $(EDK_SOURCE)\Foundation
161 - $(EDK_SOURCE)\Foundation\Include
162 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
163 - $(EDK_SOURCE)\Foundation\Efi
164 - $(EDK_SOURCE)\Foundation\Efi\Include
165 - $(EDK_SOURCE)\Foundation\FrameWork
166 - $(EDK_SOURCE)\Foundation\FrameWork\Include
167 - $(EDK_SOURCE)\Foundation\Core\Dxe
171 + $(EDK_SOURCE)/Foundation
172 + $(EDK_SOURCE)/Foundation/Include
173 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
174 + $(EDK_SOURCE)/Foundation/Efi
175 + $(EDK_SOURCE)/Foundation/Efi/Include
176 + $(EDK_SOURCE)/Foundation/FrameWork
177 + $(EDK_SOURCE)/Foundation/FrameWork/Include
178 + $(EDK_SOURCE)/Foundation/Core/Dxe
183 diff --git a/IfConfig/IfConfig.c b/IfConfig/IfConfig.c
184 index 07cedc2..0e17081 100644
185 --- a/IfConfig/IfConfig.c
186 +++ b/IfConfig/IfConfig.c
187 @@ -29,7 +29,7 @@ extern UINT8 STRING_ARRAY_NAME[];
189 #define NIC_ITEM_CONFIG_SIZE sizeof (NIC_IP4_CONFIG_INFO) + sizeof (EFI_IP4_ROUTE_TABLE) * 16
191 -EFI_HII_HANDLE HiiHandle;
192 +STATIC EFI_HII_HANDLE HiiHandle;
194 EFI_GUID EfiIfConfigGuid = EFI_IFCONFIG_GUID;
196 @@ -669,7 +669,7 @@ Returns:
197 Status = BS->LocateProtocol (
198 &gEfiHiiConfigRoutingProtocolGuid,
201 + (VOID**)&mHiiConfigRouting
203 if (EFI_ERROR (Status)) {
204 return EFI_NOT_FOUND;
205 diff --git a/IfConfig/IfConfig.inf b/IfConfig/IfConfig.inf
206 index b2e4964..e55dc32 100644
207 --- a/IfConfig/IfConfig.inf
208 +++ b/IfConfig/IfConfig.inf
209 @@ -25,7 +25,7 @@ FILE_GUID = 6394CF3D-D3DC-4f69-926D-AF9FFE59F922
210 COMPONENT_TYPE = APPLICATION
213 - ..\ShCommonStrings.uni
214 + ../ShCommonStrings.uni
218 @@ -33,25 +33,24 @@ COMPONENT_TYPE = APPLICATION
224 - $(EDK_SOURCE)\Foundation\Efi
225 - $(EDK_SOURCE)\Foundation
226 - $(EDK_SOURCE)\Foundation\Efi\Include
227 - $(EDK_SOURCE)\Foundation\Include
228 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
229 - $(EDK_SOURCE)\Foundation\FrameWork
230 - $(EDK_SOURCE)\Foundation\FrameWork\Include
231 - $(EDK_SOURCE)\Foundation\Core\Dxe
232 - $(EDK_SOURCE)\Foundation\Library\Dxe\Include
236 + $(EDK_SOURCE)/Foundation/Efi
237 + $(EDK_SOURCE)/Foundation
238 + $(EDK_SOURCE)/Foundation/Efi/Include
239 + $(EDK_SOURCE)/Foundation/Include
240 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
241 + $(EDK_SOURCE)/Foundation/FrameWork
242 + $(EDK_SOURCE)/Foundation/FrameWork/Include
243 + $(EDK_SOURCE)/Foundation/Core/Dxe
244 + $(EDK_SOURCE)/Foundation/Library/Dxe/Include
255 C_PROJ_FLAGS = $(C_PROJ_FLAGS)
256 diff --git a/IpConfig/IpConfig.c b/IpConfig/IpConfig.c
257 index 0c3e4c3..b2154aa 100644
258 --- a/IpConfig/IpConfig.c
259 +++ b/IpConfig/IpConfig.c
260 @@ -39,7 +39,7 @@ extern UINT8 STRING_ARRAY_NAME[];
264 -EFI_HII_HANDLE HiiHandle;
265 +STATIC EFI_HII_HANDLE HiiHandle;
266 EFI_GUID EfiIpConfigGuid = EFI_IPCONFIG_GUID;
267 SHELL_VAR_CHECK_ITEM IpconfigCheckList[] = {
269 diff --git a/IpConfig/IpConfig.inf b/IpConfig/IpConfig.inf
270 index bc8271c..46d4f52 100644
271 --- a/IpConfig/IpConfig.inf
272 +++ b/IpConfig/IpConfig.inf
273 @@ -25,24 +25,24 @@ FILE_GUID = 1D73AC03-AF05-44b3-B21E-93A174893FA6
274 COMPONENT_TYPE = APPLICATION
277 - ..\ShCommonStrings.uni
278 + ../ShCommonStrings.uni
287 - $(EDK_SOURCE)\Foundation
288 - $(EDK_SOURCE)\Foundation\Include
289 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
290 - $(EDK_SOURCE)\Foundation\Efi
291 - $(EDK_SOURCE)\Foundation\Efi\Include
292 - $(EDK_SOURCE)\Foundation\FrameWork
293 - $(EDK_SOURCE)\Foundation\FrameWork\Include
294 - $(EDK_SOURCE)\Foundation\Core\Dxe
298 + $(EDK_SOURCE)/Foundation
299 + $(EDK_SOURCE)/Foundation/Include
300 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
301 + $(EDK_SOURCE)/Foundation/Efi
302 + $(EDK_SOURCE)/Foundation/Efi/Include
303 + $(EDK_SOURCE)/Foundation/FrameWork
304 + $(EDK_SOURCE)/Foundation/FrameWork/Include
305 + $(EDK_SOURCE)/Foundation/Core/Dxe
310 diff --git a/Library/Arm/efilibplat.h b/Library/Arm/efilibplat.h
312 index 0000000..3b284fe
314 +++ b/Library/Arm/efilibplat.h
318 +Copyright (c) 2005, Intel Corporation
319 +All rights reserved. This program and the accompanying materials
320 +are licensed and made available under the terms and conditions of the BSD License
321 +which accompanies this distribution. The full text of the license may be found at
322 +http://opensource.org/licenses/bsd-license.php
324 +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
325 +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
333 + EFI to compile bindings
341 +#ifndef _EFI_LIB_PLAT_H_
342 +#define _EFI_LIB_PLAT_H_
345 +InitializeLibPlatform (
346 + IN EFI_HANDLE ImageHandle,
347 + IN EFI_SYSTEM_TABLE *SystemTable
350 +#define MIN_ALIGNMENT_SIZE 4
354 diff --git a/Library/CRC.c b/Library/CRC.c
355 index ce5387b..ebbdf70 100644
358 @@ -21,7 +21,7 @@ Revision History
362 -#include "EfiShelllib.h"
363 +#include "EfiShellLib.h"
365 UINT32 CRCTable[256] = {
367 diff --git a/Library/CRC.h b/Library/CRC.h
368 index 326a5e1..b25a275 100644
371 @@ -53,4 +53,5 @@ CalculateCrc (
376 \ No newline at end of file
379 diff --git a/Library/ConsistMapping.c b/Library/ConsistMapping.c
380 index b70fa06..61eda8b 100644
381 --- a/Library/ConsistMapping.c
382 +++ b/Library/ConsistMapping.c
383 @@ -21,7 +21,7 @@ Revision History
387 -#include "EfiShelllib.h"
388 +#include "EfiShellLib.h"
390 MTD_NAME mMTDName[] = {
392 diff --git a/Library/ConsistMapping.h b/Library/ConsistMapping.h
393 index bc8d6f0..2efad28 100644
394 --- a/Library/ConsistMapping.h
395 +++ b/Library/ConsistMapping.h
396 @@ -79,4 +79,5 @@ DevicePathConsistMappingCompare (
401 \ No newline at end of file
404 diff --git a/Library/DPath.c b/Library/DPath.c
405 index f0974ac..73086d7 100644
406 --- a/Library/DPath.c
407 +++ b/Library/DPath.c
408 @@ -20,7 +20,7 @@ Revision History
412 -#include "EfiShelllib.h"
413 +#include "EfiShellLib.h"
415 EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid = DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL;
417 @@ -1468,7 +1468,7 @@ Returns:
419 Status = LibLocateProtocol (
420 &gEfiDevicePathToTextProtocolGuid,
422 + (VOID**)&DevPathToText
424 if (!EFI_ERROR (Status)) {
425 ToText = DevPathToText->ConvertDevicePathToText (
426 @@ -1766,7 +1766,7 @@ Returns:
427 Status = BS->HandleProtocol (
435 diff --git a/Library/DPath.h b/Library/DPath.h
436 index 68da82b..bb7dd93 100644
437 --- a/Library/DPath.h
438 +++ b/Library/DPath.h
439 @@ -24,7 +24,7 @@ Revision History
443 -#define NextStrA(a) ((UINT8 *) (((UINT8 *) (a)) + strlena (a) + 1))
444 +#define NextStrA(a) (CHAR8*)((UINT8 *) (((UINT8 *) (a)) + strlena (a) + 1))
446 #include EFI_GUID_DEFINITION (PcAnsi)
448 diff --git a/Library/Data.c b/Library/Data.c
449 index d2ffe4a..979b3dd 100644
452 @@ -21,7 +21,7 @@ Revision History
456 -#include "EfiShelllib.h"
457 +#include "EfiShellLib.h"
460 // ShellLibInitialized - TRUE once InitializeShellLib() is called for the first time
461 diff --git a/Library/EfiShellLib.h b/Library/EfiShellLib.h
462 index 6243d1d..a174758 100644
463 --- a/Library/EfiShellLib.h
464 +++ b/Library/EfiShellLib.h
465 @@ -25,7 +25,7 @@ Revision History
466 #define _EFI_SHELL_LIB_INCLUDE_
469 -#include "ShellEnv.h"
470 +#include "shellenv.h"
473 #include EFI_ARCH_PROTOCOL_DEFINITION (Bds)
474 @@ -51,7 +51,7 @@ Revision History
475 #include EFI_GUID_DEFINITION (PrimaryConsoleOutDevice)
476 #include EFI_GUID_DEFINITION (PrimaryStandardErrorDevice)
477 #include EFI_GUID_DEFINITION (SalSystemTable)
478 -#include EFI_GUID_DEFINITION (Smbios)
479 +#include EFI_GUID_DEFINITION (SmBios)
480 #include EFI_GUID_DEFINITION (StandardErrorDevice)
481 #include EFI_GUID_DEFINITION (FrameworkDevicePath)
482 #include EFI_PROTOCOL_DEFINITION (AbsolutePointer)
483 @@ -67,7 +67,7 @@ Revision History
484 #include EFI_PROTOCOL_DEFINITION (DebugPort)
485 #include EFI_PROTOCOL_DEFINITION (DebugSupport)
486 #include EFI_PROTOCOL_DEFINITION (Decompress)
487 -#include EFI_PROTOCOL_DEFINITION (DeviceIO)
488 +#include EFI_PROTOCOL_DEFINITION (DeviceIo)
489 #include EFI_PROTOCOL_DEFINITION (DevicePath)
490 #include EFI_PROTOCOL_DEFINITION (DevicePathFromText)
491 #include EFI_PROTOCOL_DEFINITION (DevicePathToText)
492 @@ -111,7 +111,7 @@ Revision History
493 #include EFI_PROTOCOL_DEFINITION (PciRootBridgeIo)
494 #include EFI_PROTOCOL_DEFINITION (PlatformDriverOverride)
495 #include EFI_PROTOCOL_DEFINITION (PxeBaseCode)
496 -#include EFI_PROTOCOL_DEFINITION (PxeBaseCodeCallback)
497 +#include EFI_PROTOCOL_DEFINITION (PxeBaseCodeCallBack)
498 #include EFI_PROTOCOL_DEFINITION (ScsiIo)
499 #include EFI_PROTOCOL_DEFINITION (ScsiPassThru)
500 #include EFI_PROTOCOL_DEFINITION (SectionExtraction)
501 @@ -152,7 +152,7 @@ Revision History
502 #include EFI_PROTOCOL_DEFINITION (PlatformToDriverConfiguration)
504 #include "efilibplat.h"
505 -#include "efipart.h"
506 +#include "EfiPart.h"
507 #include "ShellDebug.h"
510 diff --git a/Library/EfiShellLib.inf b/Library/EfiShellLib.inf
511 index d450f9d..2093115 100644
512 --- a/Library/EfiShellLib.inf
513 +++ b/Library/EfiShellLib.inf
514 @@ -45,34 +45,38 @@ COMPONENT_TYPE = LIBRARY
552 - $(EDK_SOURCE)\Foundation
553 - $(EDK_SOURCE)\Foundation\Include
554 - $(EDK_SOURCE)\Foundation\Efi
555 - $(EDK_SOURCE)\Foundation\Efi\Include
556 - $(EDK_SOURCE)\Foundation\FrameWork
557 - $(EDK_SOURCE)\Foundation\FrameWork\Include
558 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
559 - $(EDK_SOURCE)\Foundation\Core\Dxe
561 + $(EDK_SOURCE)/Foundation
562 + $(EDK_SOURCE)/Foundation/Include
563 + $(EDK_SOURCE)/Foundation/Efi
564 + $(EDK_SOURCE)/Foundation/Efi/Include
565 + $(EDK_SOURCE)/Foundation/FrameWork
566 + $(EDK_SOURCE)/Foundation/FrameWork/Include
567 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
568 + $(EDK_SOURCE)/Foundation/Core/Dxe
571 EdkFrameworkProtocolLib
572 diff --git a/Library/Event.c b/Library/Event.c
573 index 4929e4b..a0cbdc2 100644
574 --- a/Library/Event.c
575 +++ b/Library/Event.c
576 @@ -21,7 +21,7 @@ Revision History
580 -#include "EfiShelllib.h"
581 +#include "EfiShellLib.h"
584 LibCreateProtocolNotifyEvent (
585 diff --git a/Library/Event.h b/Library/Event.h
586 index b8df801..5de49b4 100644
587 --- a/Library/Event.h
588 +++ b/Library/Event.h
589 @@ -50,4 +50,5 @@ WaitForEventWithTimeout (
590 OUT EFI_INPUT_KEY *Key
594 \ No newline at end of file
597 diff --git a/Library/FileIO.c b/Library/FileIO.c
598 index 40c67d1..8820c52 100644
599 --- a/Library/FileIO.c
600 +++ b/Library/FileIO.c
601 @@ -21,7 +21,7 @@ Revision History
605 -#include "EfiShelllib.h"
606 +#include "EfiShellLib.h"
608 typedef struct _PATH_COMPONENTS {
610 @@ -719,7 +719,6 @@ LibSplitFsAndPath (
618 @@ -728,7 +727,6 @@ LibSplitFsAndPath (
622 - Status = EFI_SUCCESS;
626 @@ -1017,13 +1015,11 @@ Return:
627 EFI_LIST_ENTRY SrcList;
628 EFI_LIST_ENTRY DstList;
630 - EFI_LIST_ENTRY *Link;
631 SHELL_FILE_ARG *SrcArg;
632 SHELL_FILE_ARG *DstArg;
634 ASSERT (IsSame != NULL);
639 InitializeListHead (&SrcList);
640 diff --git a/Library/FileIO.h b/Library/FileIO.h
641 index bb07d91..54fd6d5 100644
642 --- a/Library/FileIO.h
643 +++ b/Library/FileIO.h
644 @@ -208,4 +208,5 @@ CloseSimpleReadFile (
645 IN SIMPLE_READ_FILE SimpleReadHandle
649 \ No newline at end of file
652 diff --git a/Library/Handle.c b/Library/Handle.c
653 index 33f925d..f406d5a 100644
654 --- a/Library/Handle.c
655 +++ b/Library/Handle.c
656 @@ -21,7 +21,7 @@ Revision History
660 -#include "EfiShelllib.h"
661 +#include "EfiShellLib.h"
665 @@ -131,7 +131,6 @@ Returns:
666 EFI_HANDLE *BlockIoBuffer;
667 EFI_DEVICE_PATH_PROTOCOL *DevicePath;
669 - EFI_DEVICE_PATH_PROTOCOL *Start;
670 EFI_DEVICE_PATH_PROTOCOL *Next;
671 EFI_DEVICE_PATH_PROTOCOL *DevPath;
672 HARDDRIVE_DEVICE_PATH *HardDriveDevicePath;
673 @@ -204,7 +203,6 @@ Returns:
674 PreviousNodeIsHardDriveDevicePath = FALSE;
676 DevPath = DevicePath;
679 // Check for end of device path type
681 @@ -796,14 +794,12 @@ LibScanHandleDatabase (
684 BOOLEAN DriverBindingHandleIndexValid;
685 - BOOLEAN ControllerHandleIndexValid;
687 DriverBindingHandleIndexValid = FALSE;
688 if (DriverBindingHandleIndex != NULL) {
689 *DriverBindingHandleIndex = 0xffffffff;
692 - ControllerHandleIndexValid = FALSE;
693 if (ControllerHandleIndex != NULL) {
694 *ControllerHandleIndex = 0xffffffff;
696 @@ -847,7 +843,6 @@ LibScanHandleDatabase (
698 if (ControllerHandle != NULL && ControllerHandleIndex != NULL && (*HandleBuffer)[HandleIndex] == ControllerHandle) {
699 *ControllerHandleIndex = (UINT32) HandleIndex;
700 - ControllerHandleIndexValid = TRUE;
704 @@ -1286,7 +1281,7 @@ Returns:
705 Status = BS->HandleProtocol (
712 if (!EFI_ERROR (Status)) {
713 diff --git a/Library/HiiSupport.c b/Library/HiiSupport.c
714 index bce645b..5f70712 100644
715 --- a/Library/HiiSupport.c
716 +++ b/Library/HiiSupport.c
717 @@ -21,7 +21,7 @@ Revision History
721 -#include "EfiShelllib.h"
722 +#include "EfiShellLib.h"
724 #if (EFI_SPECIFICATION_VERSION >= 0x0002000A)
726 @@ -56,11 +56,11 @@ Returns:
730 - Status = LibLocateProtocol (&gEfiHiiDatabaseProtocolGuid, &gLibHiiDatabase);
731 + Status = LibLocateProtocol (&gEfiHiiDatabaseProtocolGuid, (VOID**)&gLibHiiDatabase);
732 if (EFI_ERROR (Status)) {
735 - Status = LibLocateProtocol (&gEfiHiiStringProtocolGuid, &gLibHiiString);
736 + Status = LibLocateProtocol (&gEfiHiiStringProtocolGuid, (VOID**)&gLibHiiString);
737 if (EFI_ERROR (Status)) {
740 diff --git a/Library/IO.c b/Library/IO.c
741 index 81f26fd..749aacb 100644
744 @@ -21,7 +21,7 @@ Revision History
748 -#include "EfiShelllib.h"
749 +#include "EfiShellLib.h"
751 #define PRINT_STRING_LEN 1024
752 #define PRINT_ITEM_BUFFER_LEN 100
753 @@ -86,8 +86,8 @@ typedef struct _pstate {
764 @@ -1575,7 +1575,7 @@ Returns:
773 @@ -1928,8 +1928,8 @@ LibGetPageBreak (
774 return mPrintMode.PageBreak;
783 @@ -1937,6 +1937,7 @@ GetOutputPause (
785 return mPrintMode.OutputPause;
791 diff --git a/Library/IO.h b/Library/IO.h
792 index 7469c32..5d13e17 100644
795 @@ -157,4 +157,5 @@ LibGetPageBreak (
800 \ No newline at end of file
803 diff --git a/Library/Init.c b/Library/Init.c
804 index 80dc3a3..37d555f 100644
807 @@ -20,7 +20,7 @@ Revision History
811 -#include "EfiShelllib.h"
812 +#include "EfiShellLib.h"
814 extern EFI_UNICODE_COLLATION_PROTOCOL LibStubUnicodeInterface;
816 diff --git a/Library/Lock.c b/Library/Lock.c
817 index 8a40db5..b3f9bad 100644
820 @@ -21,7 +21,7 @@ Revision History
824 -#include "EfiShelllib.h"
825 +#include "EfiShellLib.h"
829 diff --git a/Library/Lock.h b/Library/Lock.h
830 index 9e35b92..275a221 100644
833 @@ -45,4 +45,5 @@ ReleaseLock (
838 \ No newline at end of file
841 diff --git a/Library/Mem.c b/Library/Mem.c
842 index f82cb52..9675b52 100644
845 @@ -21,7 +21,7 @@ Revision History
849 -#include "EfiShelllib.h"
850 +#include "EfiShellLib.h"
854 diff --git a/Library/Mem.h b/Library/Mem.h
855 index bca1e1d..b3d222d 100644
858 @@ -73,4 +73,5 @@ ZeroMem (
863 \ No newline at end of file
866 diff --git a/Library/Misc.c b/Library/Misc.c
867 index c778236..b476d08 100644
870 @@ -21,7 +21,7 @@ Revision History
874 -#include "EfiShelllib.h"
875 +#include "EfiShellLib.h"
877 #if (PLATFORM == NT32)
878 #define LOCAL_EFI_WIN_NT_THUNK_PROTOCOL_GUID \
879 @@ -348,7 +348,7 @@ Returns:
880 ASSERT (Buffer != NULL);
882 if (mShellEnv == NULL) {
883 - Status = LibLocateProtocol (&ShellEnvProtocol, &mShellEnv);
884 + Status = LibLocateProtocol (&ShellEnvProtocol, (VOID**)&mShellEnv);
885 if (EFI_ERROR (Status)) {
888 @@ -1171,7 +1171,7 @@ Returns:
889 Status = BS->HandleProtocol (
891 &gEfiFirmwareVolumeProtocolGuid,
895 if (!EFI_ERROR (Status)) {
896 Status = FV->ReadSection (
897 @@ -1192,7 +1192,7 @@ Returns:
898 Status = BS->HandleProtocol (
900 &gEfiFirmwareVolume2ProtocolGuid,
904 if (!EFI_ERROR (Status)) {
905 Status = FV2->ReadSection (
906 @@ -1339,7 +1339,7 @@ LibCmdGetStringByToken (
910 - EFI_HII_HANDLE HiiHandle;
911 + STATIC EFI_HII_HANDLE HiiHandle;
915 diff --git a/Library/Perf.c b/Library/Perf.c
916 index 43e09ea..87c4113 100644
919 @@ -19,7 +19,7 @@ Abstract:
923 -#include "EfiShelllib.h"
924 +#include "EfiShellLib.h"
926 #include EFI_PROTOCOL_DEFINITION (Performance)
928 diff --git a/Library/RtData.c b/Library/RtData.c
929 index af55cb4..145e933 100644
930 --- a/Library/RtData.c
931 +++ b/Library/RtData.c
932 @@ -21,7 +21,7 @@ Revision History
936 -#include "EfiShelllib.h"
937 +#include "EfiShellLib.h"
940 // RT - pointer to the runtime table
941 diff --git a/Library/ShellDebug.c b/Library/ShellDebug.c
942 index b31ef06..c8b93d5 100644
943 --- a/Library/ShellDebug.c
944 +++ b/Library/ShellDebug.c
945 @@ -19,7 +19,7 @@ Abstract:
949 -#include "EfiShelllib.h"
950 +#include "EfiShellLib.h"
951 #include EFI_PROTOCOL_DEFINITION (DebugAssert)
953 EFI_DEBUG_ASSERT_PROTOCOL *mDebugAssert = NULL;
954 diff --git a/Library/ShellEnvInt.c b/Library/ShellEnvInt.c
955 index b99d973..53de481 100644
956 --- a/Library/ShellEnvInt.c
957 +++ b/Library/ShellEnvInt.c
958 @@ -21,7 +21,7 @@ Revision History
962 -#include "EfiShelllib.h"
963 +#include "EfiShellLib.h"
967 diff --git a/Library/ShellEnvInt.h b/Library/ShellEnvInt.h
968 index 4182dff..7eef19a 100644
969 --- a/Library/ShellEnvInt.h
970 +++ b/Library/ShellEnvInt.h
971 @@ -196,4 +196,5 @@ ShellGetHandleNum (
976 \ No newline at end of file
979 diff --git a/Library/Str.c b/Library/Str.c
980 index ca0c76b..d881dae 100644
983 @@ -22,7 +22,7 @@ Revision History
987 -#include "EfiShelllib.h"
988 +#include "EfiShellLib.h"
992 @@ -421,7 +421,7 @@ Returns:
996 - u = u << 4 | c - (c >= 'A' ? 'A' - 10 : '0');
997 + u = (u << 4) | (c - (c >= 'A' ? 'A' - 10 : '0'));
1001 @@ -472,7 +472,7 @@ Returns:
1004 if (c >= '0' && c <= '9') {
1005 - if (u > m || u == m && c - '0' > (INTN) n) {
1006 + if ((u > m) || ((u == m) && (c - '0' > (INTN) n))) {
1010 diff --git a/Library/VarCheck.c b/Library/VarCheck.c
1011 index 53597ff..1abec9d 100644
1012 --- a/Library/VarCheck.c
1013 +++ b/Library/VarCheck.c
1014 @@ -21,7 +21,7 @@ Revision History
1018 -#include "EfiShelllib.h"
1019 +#include "EfiShellLib.h"
1022 LibCheckVarFreeVarList (
1023 diff --git a/Library/VarCheck.h b/Library/VarCheck.h
1024 index bc1f412..45aba2c 100644
1025 --- a/Library/VarCheck.h
1026 +++ b/Library/VarCheck.h
1027 @@ -41,7 +41,7 @@ typedef enum {
1028 ARG_PARTIALLY_QUOTED = 0x2,
1029 ARG_FIRST_HALF_QUOTED = 0x4,
1030 ARG_FIRST_CHAR_IS_ESC = 0x8
1036 diff --git a/LoadPciRom/LoadPciRom.c b/LoadPciRom/LoadPciRom.c
1037 index f8854b7..7afcefd 100644
1038 --- a/LoadPciRom/LoadPciRom.c
1039 +++ b/LoadPciRom/LoadPciRom.c
1040 @@ -24,7 +24,7 @@ Revision History
1042 #include "EfiShellLib.h"
1043 #include "LoadPciRom.h"
1047 extern UINT8 STRING_ARRAY_NAME[];
1049 @@ -56,7 +56,7 @@ LoadEfiDriversFromRomImage (
1052 EFI_HANDLE gMyImageHandle;
1053 -EFI_HII_HANDLE HiiHandle;
1054 +STATIC EFI_HII_HANDLE HiiHandle;
1055 EFI_GUID EfiLoadPciRomGuid = EFI_LOADPCIROM_GUID;
1056 SHELL_VAR_CHECK_ITEM LPRCheckList[] = {
1058 @@ -377,7 +377,7 @@ Returns:
1061 if (EfiRomHeader->CompressionType == EFI_PCI_EXPANSION_ROM_HEADER_COMPRESSED) {
1062 - Status = BS->LocateProtocol (&gEfiDecompressProtocolGuid, NULL, &Decompress);
1063 + Status = BS->LocateProtocol (&gEfiDecompressProtocolGuid, NULL, (VOID**)&Decompress);
1064 if (EFI_ERROR (Status)) {
1065 PrintToken (STRING_TOKEN (STR_LOADPCIROM_DECOMP_NOT_FOUND), HiiHandle);
1067 diff --git a/LoadPciRom/LoadPciRom.inf b/LoadPciRom/LoadPciRom.inf
1068 index 8e79af7..943a148 100644
1069 --- a/LoadPciRom/LoadPciRom.inf
1070 +++ b/LoadPciRom/LoadPciRom.inf
1071 @@ -41,23 +41,23 @@ COMPONENT_TYPE = APPLICATION
1074 LoadPciRomStrings.uni
1075 - ..\ShCommonStrings.uni
1076 + ../ShCommonStrings.uni
1084 - $(EDK_SOURCE)\Foundation
1085 - $(EDK_SOURCE)\Foundation\Include
1086 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1087 - $(EDK_SOURCE)\Foundation\Efi
1088 - $(EDK_SOURCE)\Foundation\Efi\Include
1089 - $(EDK_SOURCE)\Foundation\FrameWork
1090 - $(EDK_SOURCE)\Foundation\FrameWork\Include
1091 - $(EDK_SOURCE)\Foundation\Core\Dxe
1095 + $(EDK_SOURCE)/Foundation
1096 + $(EDK_SOURCE)/Foundation/Include
1097 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1098 + $(EDK_SOURCE)/Foundation/Efi
1099 + $(EDK_SOURCE)/Foundation/Efi/Include
1100 + $(EDK_SOURCE)/Foundation/FrameWork
1101 + $(EDK_SOURCE)/Foundation/FrameWork/Include
1102 + $(EDK_SOURCE)/Foundation/Core/Dxe
1107 diff --git a/Ping/Ping.c b/Ping/Ping.c
1108 index 7d92881..16b9b4b 100644
1111 @@ -20,14 +20,14 @@ Abstract:
1114 #include "EfiShellLib.h"
1115 -#include "CpuFuncs.h"
1116 +//#include "CpuFuncs.h"
1117 #include EFI_ARCH_PROTOCOL_DEFINITION (Cpu)
1118 #include EFI_PROTOCOL_DEFINITION (Ip4)
1120 #include STRING_DEFINES_FILE
1121 extern UINT8 STRING_ARRAY_NAME[];
1123 -EFI_HII_HANDLE HiiHandle;
1124 +STATIC EFI_HII_HANDLE HiiHandle;
1126 EFI_GUID EfiPingGuid = EFI_PING_GUID;
1127 SHELL_VAR_CHECK_ITEM PingCheckList[] = {
1128 @@ -114,6 +114,8 @@ UINT32 RttSum;
1132 +EFI_CPU_ARCH_PROTOCOL *gCpu = NULL;
1137 @@ -135,7 +137,22 @@ Returns:
1141 - return EfiReadTsc ();
1142 + static UINT64 CurrentTick = 0;
1143 + UINT64 TimerPeriod;
1144 + EFI_STATUS Status;
1146 + ASSERT (gCpu != NULL);
1148 + Status = gCpu->GetTimerValue (gCpu, 0, &CurrentTick, &TimerPeriod);
1149 + if (EFI_ERROR (Status)) {
1151 + // The WinntGetTimerValue will return EFI_UNSUPPORTED. Set the
1152 + // TimerPeriod by ourselves.
1154 + CurrentTick += 1000000;
1157 + return CurrentTick;
1161 @@ -168,7 +185,7 @@ Returns:
1163 // Locate the Cpu Arch Protocol.
1165 - Status = BS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, &Cpu);
1166 + Status = BS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID**)&Cpu);
1167 if (EFI_ERROR (Status)) {
1170 diff --git a/Ping/Ping.inf b/Ping/Ping.inf
1171 index 64dec5c..1052418 100644
1174 @@ -25,24 +25,24 @@ FILE_GUID = FAAA94BA-7095-4c0f-8D69-8E00C8328863
1175 COMPONENT_TYPE = APPLICATION
1178 - ..\ShCommonStrings.uni
1179 + ../ShCommonStrings.uni
1187 - $(EDK_SOURCE)\Foundation\Efi
1188 - $(EDK_SOURCE)\Foundation
1189 - $(EDK_SOURCE)\Foundation\Efi\Include
1190 - $(EDK_SOURCE)\Foundation\Include
1191 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1192 - $(EDK_SOURCE)\Foundation\FrameWork
1193 - $(EDK_SOURCE)\Foundation\FrameWork\Include
1194 - $(EDK_SOURCE)\Foundation\Core\Dxe
1195 - $(EDK_SOURCE)\Foundation\Library\Dxe\Include
1199 + $(EDK_SOURCE)/Foundation/Efi
1200 + $(EDK_SOURCE)/Foundation
1201 + $(EDK_SOURCE)/Foundation/Efi/Include
1202 + $(EDK_SOURCE)/Foundation/Include
1203 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1204 + $(EDK_SOURCE)/Foundation/FrameWork
1205 + $(EDK_SOURCE)/Foundation/FrameWork/Include
1206 + $(EDK_SOURCE)/Foundation/Core/Dxe
1207 + $(EDK_SOURCE)/Foundation/Library/Dxe/Include
1212 @@ -52,7 +52,6 @@ COMPONENT_TYPE = APPLICATION
1220 diff --git a/Shell.inf b/Shell.inf
1221 index fee3558..363e165 100644
1224 @@ -25,179 +25,184 @@ FILE_GUID = c57ad6b7-0515-40a8-9d21-551652854e37
1225 COMPONENT_TYPE = APPLICATION
1228 - Library\ShellDebug.c
1238 - Library\ShellEnvInt.c
1241 - Library\ConsistMapping.c
1245 - Library\VarCheck.c
1246 - Library\HiiSupport.c
1248 - newshell\NshellStrings.uni
1251 - newshell\fakehii.c
1252 + Library/ShellDebug.c
1262 + Library/ShellEnvInt.c
1265 + Library/ConsistMapping.c
1269 + Library/VarCheck.c
1270 + Library/HiiSupport.c
1272 + newshell/NshellStrings.uni
1275 + newshell/fakehii.c
1278 - shellenv\ShellenvHelpStrings.uni
1279 - shellenv\ShellenvStrings.uni
1280 - shellenv\ScriptCmdStrings.uni
1281 - shellenv\ConnectStrings.uni
1282 - shellenv\EchoStrings.uni
1283 - shellenv\HelpStrings.uni
1284 - shellenv\MapStrings.uni
1285 - shellenv\CdStrings.uni
1286 - shellenv\DhStrings.uni
1287 + shellenv/ShellenvHelpStrings.uni
1288 + shellenv/ShellenvStrings.uni
1289 + shellenv/ScriptCmdStrings.uni
1290 + shellenv/ConnectStrings.uni
1291 + shellenv/EchoStrings.uni
1292 + shellenv/HelpStrings.uni
1293 + shellenv/MapStrings.uni
1294 + shellenv/CdStrings.uni
1295 + shellenv/DhStrings.uni
1297 - shellenv\cmddisp.c
1298 - shellenv\connect.c
1305 - shellenv\consoleproxy.c
1319 - shellenv\shellenvguid.h
1320 - shellenv\parsecmd.c
1322 + shellenv/cmddisp.c
1323 + shellenv/connect.c
1330 + shellenv/consoleproxy.c
1344 + shellenv/shellenvguid.h
1345 + shellenv/parsecmd.c
1348 - unload\UnloadStrings.uni
1350 + unload/UnloadStrings.uni
1353 - attrib\AttribStrings.uni
1356 + attrib/AttribStrings.uni
1360 - cls\clsstrings.uni
1362 + cls/clsstrings.uni
1372 - date\DateStrings.uni
1375 + date/DateStrings.uni
1379 - load\LoadStrings.uni
1382 + load/LoadStrings.uni
1393 - mkdir\MkdirStrings.uni
1396 + mkdir/MkdirStrings.uni
1407 - reset\ResetStrings.uni
1410 + reset/ResetStrings.uni
1421 - type\TypeStrings.uni
1424 - time\TimeStrings.uni
1428 - touch\TouchStrings.uni
1432 - vol\VolStrings.uni
1436 - ver\VerStrings.uni
1439 + type/TypeStrings.uni
1442 + time/TimeStrings.uni
1446 + touch/TouchStrings.uni
1450 + vol/VolStrings.uni
1454 + ver/VerStrings.uni
1458 - drivers\driversStrings.uni
1461 + drivers/driversStrings.uni
1465 - drvcfg\DrvcfgStrings.uni
1468 + drvcfg/DrvcfgStrings.uni
1472 - drvdiag\DrvdiagStrings.uni
1475 + drvdiag/DrvdiagStrings.uni
1483 - Library\ia32\math.c
1484 - Library\ia32\initplat.c
1486 + Library/IA32/math.c
1487 + Library/IA32/initplat.c
1492 - Library\ipf\math.c
1493 - Library\ipf\initplat.c
1494 - Library\ipf\palproc.s
1495 - Library\ipf\salpal.c
1497 + Library/IPF/math.c
1498 + Library/IPF/initplat.c
1499 + Library/IPF/palproc.s
1500 + Library/IPF/salpal.c
1504 - Library\EBC\math.c
1505 - Library\EBC\initplat.c
1507 + Library/Ebc/math.c
1508 + Library/Ebc/initplat.c
1512 - Library\ipf\math.c
1513 - Library\ia32\initplat.c
1515 + Library/IPF/math.c
1516 + Library/IA32/initplat.c
1520 + Library/IPF/math.c
1521 + Library/IA32/initplat.c
1528 - $(EDK_SOURCE)\Foundation
1529 - $(EDK_SOURCE)\Foundation\Include
1530 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
1531 - $(EDK_SOURCE)\Foundation\Efi
1532 - $(EDK_SOURCE)\Foundation\Efi\Include
1533 - $(EDK_SOURCE)\Foundation\FrameWork
1534 - $(EDK_SOURCE)\Foundation\FrameWork\Include
1535 - $(EDK_SOURCE)\Foundation\Core\Dxe
1539 + $(EDK_SOURCE)/Foundation
1540 + $(EDK_SOURCE)/Foundation/Include
1541 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
1542 + $(EDK_SOURCE)/Foundation/Efi
1543 + $(EDK_SOURCE)/Foundation/Efi/Include
1544 + $(EDK_SOURCE)/Foundation/FrameWork
1545 + $(EDK_SOURCE)/Foundation/FrameWork/Include
1546 + $(EDK_SOURCE)/Foundation/Core/Dxe
1550 @@ -229,4 +234,4 @@ COMPONENT_TYPE = APPLICATION
1555 \ No newline at end of file
1557 diff --git a/ShellFull.inf b/ShellFull.inf
1558 index 832dc79..6cca7df 100644
1561 @@ -20,300 +20,305 @@
1566 -FILE_GUID = c57ad6b7-0515-40a8-9d21-551652854e37
1567 +BASE_NAME = ShellFull
1568 +FILE_GUID = 1903FB23-E526-4BDA-85E4-D68F2EEF0C20
1569 COMPONENT_TYPE = APPLICATION
1572 - Library\ShellDebug.c
1582 - Library\ShellEnvInt.c
1585 - Library\ConsistMapping.c
1589 - Library\VarCheck.c
1590 - Library\HiiSupport.c
1592 - newshell\NshellStrings.uni
1595 - newshell\fakehii.c
1596 + Library/ShellDebug.c
1606 + Library/ShellEnvInt.c
1609 + Library/ConsistMapping.c
1613 + Library/VarCheck.c
1614 + Library/HiiSupport.c
1616 + newshell/NshellStrings.uni
1619 + newshell/fakehii.c
1622 - shellenv\ShellenvHelpStrings.uni
1623 - shellenv\ShellenvStrings.uni
1624 - shellenv\ScriptCmdStrings.uni
1625 - shellenv\ConnectStrings.uni
1626 - shellenv\EchoStrings.uni
1627 - shellenv\HelpStrings.uni
1628 - shellenv\MapStrings.uni
1629 - shellenv\CdStrings.uni
1630 - shellenv\DhStrings.uni
1631 + shellenv/ShellenvHelpStrings.uni
1632 + shellenv/ShellenvStrings.uni
1633 + shellenv/ScriptCmdStrings.uni
1634 + shellenv/ConnectStrings.uni
1635 + shellenv/EchoStrings.uni
1636 + shellenv/HelpStrings.uni
1637 + shellenv/MapStrings.uni
1638 + shellenv/CdStrings.uni
1639 + shellenv/DhStrings.uni
1641 - shellenv\cmddisp.c
1642 - shellenv\connect.c
1649 - shellenv\consoleproxy.c
1663 - shellenv\shellenvguid.h
1664 - shellenv\parsecmd.c
1666 + shellenv/cmddisp.c
1667 + shellenv/connect.c
1674 + shellenv/consoleproxy.c
1688 + shellenv/shellenvguid.h
1689 + shellenv/parsecmd.c
1692 - unload\UnloadStrings.uni
1694 + unload/UnloadStrings.uni
1697 - attrib\AttribStrings.uni
1700 + attrib/AttribStrings.uni
1704 - cls\clsstrings.uni
1706 + cls/clsstrings.uni
1716 - date\DateStrings.uni
1719 + date/DateStrings.uni
1723 - load\LoadStrings.uni
1726 + load/LoadStrings.uni
1737 - mkdir\MkdirStrings.uni
1740 + mkdir/MkdirStrings.uni
1751 - reset\ResetStrings.uni
1754 + reset/ResetStrings.uni
1765 - type\TypeStrings.uni
1768 - time\TimeStrings.uni
1772 - touch\TouchStrings.uni
1776 - vol\VolStrings.uni
1780 - ver\VerStrings.uni
1783 + type/TypeStrings.uni
1786 + time/TimeStrings.uni
1790 + touch/TouchStrings.uni
1794 + vol/VolStrings.uni
1798 + ver/VerStrings.uni
1802 - drivers\driversStrings.uni
1805 + drivers/driversStrings.uni
1809 - drvcfg\DrvcfgStrings.uni
1812 + drvcfg/DrvcfgStrings.uni
1816 - drvdiag\DrvdiagStrings.uni
1819 + drvdiag/DrvdiagStrings.uni
1823 - comp\CompStrings.uni
1825 + comp/CompStrings.uni
1828 - dblk\dblkStrings.uni
1831 + dblk/dblkStrings.uni
1835 - devices\DevicesStrings.uni
1837 + devices/DevicesStrings.uni
1840 - devicetree\DevicetreeStrings.uni
1841 - devicetree\devicetree.c
1842 + devicetree/DevicetreeStrings.uni
1843 + devicetree/devicetree.c
1845 - dmem\MemStrings.uni
1846 - dmem\DebugStrings.uni
1848 - dmem\MemCommonPart.c
1850 + dmem/MemStrings.uni
1851 + dmem/DebugStrings.uni
1853 + dmem/MemCommonPart.c
1856 - dmpstore\DmpstoreStrings.uni
1857 - dmpstore\dmpstore.c
1858 + dmpstore/DmpstoreStrings.uni
1859 + dmpstore/dmpstore.c
1861 - edit\EditStrings.uni
1863 - edit\libFileBuffer.c
1865 - edit\libTitleBar.c
1866 - edit\libStatusBar.c
1867 - edit\libInputBar.c
1870 + edit/EditStrings.uni
1872 + edit/libFileBuffer.c
1874 + edit/libTitleBar.c
1875 + edit/libStatusBar.c
1876 + edit/libInputBar.c
1880 - eficompress\CompressStrings.uni
1881 - eficompress\compressMain.c
1882 - eficompress\compress.c
1883 + eficompress/CompressStrings.uni
1884 + eficompress/compressMain.c
1885 + eficompress/compress.c
1887 - efidecompress\DecompressStrings.uni
1888 - efidecompress\decompress.c
1889 + efidecompress/DecompressStrings.uni
1890 + efidecompress/decompress.c
1892 - err\ErrStrings.uni
1894 + err/ErrStrings.uni
1897 - guid\GuidStrings.uni
1899 + guid/GuidStrings.uni
1902 - hexedit\HexeditStrings.uni
1904 - hexedit\libBufferImage.c
1905 - hexedit\libFileImage.c
1906 - hexedit\libDiskImage.c
1907 - hexedit\libMemImage.c
1908 - hexedit\libEditor.c
1909 - hexedit\libTitleBar.c
1910 - hexedit\libStatusBar.c
1911 - hexedit\libInputBar.c
1912 - hexedit\libMenuBar.c
1913 - hexedit\libClipBoard.c
1916 - IfConfig\IfConfigStrings.uni
1917 - IfConfig\IfConfig.c
1918 - IfConfig\IfConfig.h
1919 - IfConfig\ShellNetHelper.c
1921 - ipconfig\IpConfigStrings.uni
1922 - ipconfig\IpConfig.c
1923 + hexedit/HexeditStrings.uni
1925 + hexedit/libBufferImage.c
1926 + hexedit/libFileImage.c
1927 + hexedit/libDiskImage.c
1928 + hexedit/libMemImage.c
1929 + hexedit/libEditor.c
1930 + hexedit/libTitleBar.c
1931 + hexedit/libStatusBar.c
1932 + hexedit/libInputBar.c
1933 + hexedit/libMenuBar.c
1934 + hexedit/libClipBoard.c
1937 + IfConfig/IfConfigStrings.uni
1938 + IfConfig/IfConfig.c
1939 + IfConfig/IfConfig.h
1940 + IfConfig/ShellNetHelper.c
1942 + IpConfig/IpConfigStrings.uni
1943 + IpConfig/IpConfig.c
1945 - loadpcirom\LoadPciRomStrings.uni
1946 - loadpcirom\LoadPciRom.c
1947 + loadpcirom/LoadPciRomStrings.uni
1948 + loadpcirom/LoadPciRom.c
1950 - mem\MemStrings.uni
1951 - mem\DebugStrings.uni
1953 - mem\MemCommonPart.c
1955 + mem/MemStrings.uni
1956 + mem/DebugStrings.uni
1958 + mem/MemCommonPart.c
1961 - memmap\memmapStrings.uni
1963 + memmap/memmapStrings.uni
1971 - mode\ModeStrings.uni
1973 + mode/ModeStrings.uni
1976 - mount\MountStrings.uni
1978 + mount/MountStrings.uni
1981 - openinfo\OPeninfoStrings.uni
1982 - openinfo\openinfo.c
1983 + openinfo/OPeninfoStrings.uni
1984 + openinfo/openinfo.c
1986 - Ping\PingStrings.uni
1988 + Ping/PingStrings.uni
1991 - pci\PciStrings.uni
1994 + pci/PciStrings.uni
1998 - sermode\SermodeStrings.uni
2000 + sermode/SermodeStrings.uni
2003 - smbiosview\SmBiosViewStrings.uni
2004 - smbiosview\QueryTable.c
2005 - smbiosview\EventLogInfo.c
2006 - smbiosview\PrintInfo.c
2007 - smbiosview\LibSmbiosView.c
2008 - smbiosview\smbiosview.c
2009 - smbiosview\smbios.c
2010 + smbiosview/SmBiosViewStrings.uni
2011 + smbiosview/QueryTable.c
2012 + smbiosview/EventLogInfo.c
2013 + smbiosview/PrintInfo.c
2014 + smbiosview/LibSmbiosView.c
2015 + smbiosview/smbiosview.c
2016 + smbiosview/smbios.c
2018 - stall\stallStrings.uni
2020 + stall/stallStrings.uni
2023 - telnetmgmt\TelnetMgmtStrings.uni
2024 - telnetmgmt\TelnetMgmt.c
2025 + telnetmgmt/TelnetMgmtStrings.uni
2026 + telnetmgmt/TelnetMgmt.c
2028 - tzone\TZoneStrings.uni
2030 + tzone/TZoneStrings.uni
2035 - Library\ia32\math.c
2036 - Library\ia32\initplat.c
2038 + Library/IA32/math.c
2039 + Library/IA32/initplat.c
2043 - Library\ipf\math.c
2044 - Library\ipf\initplat.c
2045 - Library\ipf\palproc.s
2046 - Library\ipf\salpal.c
2048 + Library/IPF/math.c
2049 + Library/IPF/initplat.c
2050 + Library/IPF/palproc.s
2051 + Library/IPF/salpal.c
2055 - Library\EBC\math.c
2056 - Library\EBC\initplat.c
2058 + Library/Ebc/math.c
2059 + Library/Ebc/initplat.c
2063 - Library\ipf\math.c
2064 - Library\ia32\initplat.c
2066 + Library/IPF/math.c
2067 + Library/IA32/initplat.c
2071 + Library/IPF/math.c
2072 + Library/IA32/initplat.c
2079 - $(EDK_SOURCE)\Foundation
2080 - $(EDK_SOURCE)\Foundation\Include
2081 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2082 - $(EDK_SOURCE)\Foundation\Efi
2083 - $(EDK_SOURCE)\Foundation\Efi\Include
2084 - $(EDK_SOURCE)\Foundation\FrameWork
2085 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2086 - $(EDK_SOURCE)\Foundation\Core\Dxe
2087 - $(EDK_SOURCE)\Foundation\Library\Dxe\Include
2091 + $(EDK_SOURCE)/Foundation
2092 + $(EDK_SOURCE)/Foundation/Include
2093 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2094 + $(EDK_SOURCE)/Foundation/Efi
2095 + $(EDK_SOURCE)/Foundation/Efi/Include
2096 + $(EDK_SOURCE)/Foundation/FrameWork
2097 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2098 + $(EDK_SOURCE)/Foundation/Core/Dxe
2099 + $(EDK_SOURCE)/Foundation/Library/Dxe/Include
2103 @@ -353,4 +358,4 @@ COMPONENT_TYPE = APPLICATION
2104 EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
2108 \ No newline at end of file
2110 diff --git a/SmbiosView/EventLogInfo.c b/SmbiosView/EventLogInfo.c
2111 index 7f9b726..33e3549 100644
2112 --- a/SmbiosView/EventLogInfo.c
2113 +++ b/SmbiosView/EventLogInfo.c
2114 @@ -25,7 +25,7 @@ Revision History
2115 #include "PrintInfo.h"
2116 #include "QueryTable.h"
2117 #include "EventLogInfo.h"
2118 -#include "smbios.h"
2119 +#include "Smbios.h"
2120 #include STRING_DEFINES_FILE
2123 diff --git a/SmbiosView/LibSmbiosView.c b/SmbiosView/LibSmbiosView.c
2124 index d31ed01..0fb51d5 100644
2125 --- a/SmbiosView/LibSmbiosView.c
2126 +++ b/SmbiosView/LibSmbiosView.c
2127 @@ -22,10 +22,10 @@ Revision History
2130 #include "EfiShellLib.h"
2131 -#include "LIbSmbios.h"
2132 +#include "LibSmbios.h"
2133 #include "LibSmbiosView.h"
2134 #include "smbiosview.h"
2135 -#include "smbios.h"
2136 +#include "Smbios.h"
2137 #include STRING_DEFINES_FILE
2139 STATIC UINT8 mInit = 0;
2140 @@ -62,7 +62,7 @@ Returns:
2142 // Get SMBIOS table from System Configure table
2144 - Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &mSmbiosTable);
2145 + Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, (VOID**)&mSmbiosTable);
2147 if (mSmbiosTable == NULL) {
2148 PrintToken (STRING_TOKEN (STR_SMBIOSVIEW_LIBSMBIOSVIEW_CANNOT_GET_TABLE), HiiHandle);
2149 diff --git a/SmbiosView/PrintInfo.c b/SmbiosView/PrintInfo.c
2150 index ff1f63c..1789ef6 100644
2151 --- a/SmbiosView/PrintInfo.c
2152 +++ b/SmbiosView/PrintInfo.c
2153 @@ -26,7 +26,7 @@ Revision History
2154 #include "LibSmbiosView.h"
2155 #include "QueryTable.h"
2156 #include "EventLogInfo.h"
2157 -#include "smbios.h"
2158 +#include "Smbios.h"
2159 #include STRING_DEFINES_FILE
2162 diff --git a/SmbiosView/QueryTable.c b/SmbiosView/QueryTable.c
2163 index 4570938..1d9d60f 100644
2164 --- a/SmbiosView/QueryTable.c
2165 +++ b/SmbiosView/QueryTable.c
2166 @@ -23,7 +23,7 @@ Revision History
2167 #include "EfiShellLib.h"
2168 #include "QueryTable.h"
2169 #include "PrintInfo.h"
2170 -#include "smbios.h"
2171 +#include "Smbios.h"
2173 #include STRING_DEFINES_FILE
2175 diff --git a/SmbiosView/Smbiosview.inf b/SmbiosView/Smbiosview.inf
2176 index f9e8c0b..d65b676 100644
2177 --- a/SmbiosView/Smbiosview.inf
2178 +++ b/SmbiosView/Smbiosview.inf
2179 @@ -25,7 +25,7 @@ FILE_GUID = 0F4C0280-B581-4940-AF19-D0CB5559CC95
2180 COMPONENT_TYPE = APPLICATION
2183 - ..\ShCommonStrings.uni
2184 + ../ShCommonStrings.uni
2185 SmBiosViewStrings.uni
2188 @@ -43,19 +43,19 @@ COMPONENT_TYPE = APPLICATION
2194 - $(EDK_SOURCE)\Foundation
2195 - $(EDK_SOURCE)\Foundation\Include
2196 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2197 - $(EDK_SOURCE)\Foundation\Efi
2198 - $(EDK_SOURCE)\Foundation\Efi\Include
2199 - $(EDK_SOURCE)\Foundation\FrameWork
2200 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2201 - $(EDK_SOURCE)\Foundation\Core\Dxe
2203 - $(EFI_SOURCE)\Application\Shell\Inc
2204 - $(EFI_SOURCE)\Application\Shell\Library
2207 + $(EDK_SOURCE)/Foundation
2208 + $(EDK_SOURCE)/Foundation/Include
2209 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2210 + $(EDK_SOURCE)/Foundation/Efi
2211 + $(EDK_SOURCE)/Foundation/Efi/Include
2212 + $(EDK_SOURCE)/Foundation/FrameWork
2213 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2214 + $(EDK_SOURCE)/Foundation/Core/Dxe
2216 + $(EFI_SOURCE)/Applicatio./Shels/Inc
2217 + $(EFI_SOURCE)/Applicatio./Shels/Library
2221 diff --git a/SmbiosView/smbiosview.c b/SmbiosView/smbiosview.c
2222 index 13b4fb7..397ed04 100644
2223 --- a/SmbiosView/smbiosview.c
2224 +++ b/SmbiosView/smbiosview.c
2225 @@ -26,7 +26,7 @@ Revision History
2226 #include "smbiosview.h"
2227 #include "PrintInfo.h"
2228 #include "QueryTable.h"
2229 -#include "smbios.h"
2230 +#include "Smbios.h"
2232 extern UINT8 STRING_ARRAY_NAME[];
2234 diff --git a/TelnetMgmt/TelnetMgmt.c b/TelnetMgmt/TelnetMgmt.c
2235 index 9d779df..5e097c9 100644
2236 --- a/TelnetMgmt/TelnetMgmt.c
2237 +++ b/TelnetMgmt/TelnetMgmt.c
2238 @@ -32,7 +32,7 @@ extern UINT8 STRING_ARRAY_NAME[];
2240 #include STRING_DEFINES_FILE
2242 -EFI_HII_HANDLE HiiHandle;
2243 +STATIC EFI_HII_HANDLE HiiHandle;
2244 EFI_GUID EfiTelnetMgmtGuid = EFI_TELNETMGMT_GUID;
2245 EFI_GUID mEfiTelnetServerGuid = EFI_TELNET_SERVER_PROTOCOL_GUID;
2246 SHELL_VAR_CHECK_ITEM TelnetmgmtCheckList[] = {
2247 diff --git a/TelnetMgmt/TelnetMgmt.inf b/TelnetMgmt/TelnetMgmt.inf
2248 index ad8b8bd..6b0b571 100644
2249 --- a/TelnetMgmt/TelnetMgmt.inf
2250 +++ b/TelnetMgmt/TelnetMgmt.inf
2251 @@ -25,23 +25,23 @@ FILE_GUID = 0C6282F4-F575-469d-BD55-7693AAC9D812
2252 COMPONENT_TYPE = APPLICATION
2255 - ..\ShCommonStrings.uni
2256 + ../ShCommonStrings.uni
2257 TelnetMgmtStrings.uni
2264 - $(EDK_SOURCE)\Foundation
2265 - $(EDK_SOURCE)\Foundation\Include
2266 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2267 - $(EDK_SOURCE)\Foundation\Efi
2268 - $(EDK_SOURCE)\Foundation\Efi\Include
2269 - $(EDK_SOURCE)\Foundation\FrameWork
2270 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2271 - $(EDK_SOURCE)\Foundation\Core\Dxe
2275 + $(EDK_SOURCE)/Foundation
2276 + $(EDK_SOURCE)/Foundation/Include
2277 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2278 + $(EDK_SOURCE)/Foundation/Efi
2279 + $(EDK_SOURCE)/Foundation/Efi/Include
2280 + $(EDK_SOURCE)/Foundation/FrameWork
2281 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2282 + $(EDK_SOURCE)/Foundation/Core/Dxe
2287 diff --git a/attrib/attrib.c b/attrib/attrib.c
2288 index 3599d6d..a597d9c 100644
2289 --- a/attrib/attrib.c
2290 +++ b/attrib/attrib.c
2291 @@ -57,7 +57,7 @@ AttribFile (
2295 -EFI_HII_HANDLE HiiHandle;
2296 +STATIC EFI_HII_HANDLE HiiHandle;
2297 EFI_GUID EfiAttribGuid = EFI_ATTRIB_GUID;
2298 SHELL_VAR_CHECK_ITEM AttribCheckList[] = {
2300 @@ -438,7 +438,7 @@ Returns:
2303 if (Add || Remove) {
2304 - Info->Attribute = Info->Attribute & (~Remove) | Add;
2305 + Info->Attribute = (Info->Attribute & (~Remove)) | Add;
2306 Status = Arg->Handle->SetInfo (
2309 diff --git a/attrib/attrib.inf b/attrib/attrib.inf
2310 index 38cc094..a96ae55 100644
2311 --- a/attrib/attrib.inf
2312 +++ b/attrib/attrib.inf
2313 @@ -41,24 +41,24 @@ COMPONENT_TYPE = APPLICATION
2317 - ..\ShCommonStrings.uni
2318 + ../ShCommonStrings.uni
2327 - $(EDK_SOURCE)\Foundation
2328 - $(EDK_SOURCE)\Foundation\Include
2329 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2330 - $(EDK_SOURCE)\Foundation\Efi
2331 - $(EDK_SOURCE)\Foundation\Efi\Include
2332 - $(EDK_SOURCE)\Foundation\FrameWork
2333 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2334 - $(EDK_SOURCE)\Foundation\Core\Dxe
2338 + $(EDK_SOURCE)/Foundation
2339 + $(EDK_SOURCE)/Foundation/Include
2340 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2341 + $(EDK_SOURCE)/Foundation/Efi
2342 + $(EDK_SOURCE)/Foundation/Efi/Include
2343 + $(EDK_SOURCE)/Foundation/FrameWork
2344 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2345 + $(EDK_SOURCE)/Foundation/Core/Dxe
2350 diff --git a/cls/cls.c b/cls/cls.c
2351 index 572cc82..c1f4440 100644
2354 @@ -30,7 +30,7 @@ extern UINT8 STRING_ARRAY_NAME[];
2356 #include STRING_DEFINES_FILE
2358 -EFI_HII_HANDLE HiiHandle;
2359 +STATIC EFI_HII_HANDLE HiiHandle;
2360 EFI_GUID EfiClsGuid = EFI_CLS_GUID;
2361 SHELL_VAR_CHECK_ITEM ClsCheckList[] = {
2363 diff --git a/cls/cls.inf b/cls/cls.inf
2364 index 1e5ef66..7d9e924 100644
2367 @@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
2371 - ..\ShCommonStrings.uni
2372 + ../ShCommonStrings.uni
2381 - $(EDK_SOURCE)\Foundation
2382 - $(EDK_SOURCE)\Foundation\Include
2383 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2384 - $(EDK_SOURCE)\Foundation\Efi
2385 - $(EDK_SOURCE)\Foundation\Efi\Include
2386 - $(EDK_SOURCE)\Foundation\FrameWork
2387 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2388 - $(EDK_SOURCE)\Foundation\Core\Dxe
2392 + $(EDK_SOURCE)/Foundation
2393 + $(EDK_SOURCE)/Foundation/Include
2394 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2395 + $(EDK_SOURCE)/Foundation/Efi
2396 + $(EDK_SOURCE)/Foundation/Efi/Include
2397 + $(EDK_SOURCE)/Foundation/FrameWork
2398 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2399 + $(EDK_SOURCE)/Foundation/Core/Dxe
2404 diff --git a/comp/comp.inf b/comp/comp.inf
2405 index 7a525e4..1da14bc 100644
2408 @@ -28,21 +28,21 @@ COMPONENT_TYPE = APPLICATION
2412 -..\ShCommonStrings.uni
2413 +../ShCommonStrings.uni
2419 - $(EDK_SOURCE)\Foundation
2420 - $(EDK_SOURCE)\Foundation\Include
2421 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2422 - $(EDK_SOURCE)\Foundation\Efi
2423 - $(EDK_SOURCE)\Foundation\Efi\Include
2424 - $(EDK_SOURCE)\Foundation\FrameWork
2425 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2426 - $(EDK_SOURCE)\Foundation\Core\Dxe
2430 + $(EDK_SOURCE)/Foundation
2431 + $(EDK_SOURCE)/Foundation/Include
2432 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2433 + $(EDK_SOURCE)/Foundation/Efi
2434 + $(EDK_SOURCE)/Foundation/Efi/Include
2435 + $(EDK_SOURCE)/Foundation/FrameWork
2436 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2437 + $(EDK_SOURCE)/Foundation/Core/Dxe
2442 diff --git a/cp/cp.c b/cp/cp.c
2443 index 25ac3cf..d79ed13 100644
2446 @@ -578,7 +578,7 @@ Returns:
2448 if (SrcArg->Status == EFI_SUCCESS &&
2449 (SrcArg->Info->Attribute & EFI_FILE_DIRECTORY) &&
2450 - (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstMustDir && DstHandle)
2451 + (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstMustDir && DstHandle)))
2453 if (StrCmp (SrcFilePath, DstFilePath) == 0) {
2454 PrintToken (STRING_TOKEN (STR_CP_CANNOT_COPY_ITSELF), HiiCpyHandle, L"cp/copy", SrcArg->FullName);
2455 @@ -592,7 +592,7 @@ Returns:
2456 // we need to compose a full name of dir\file for the source
2458 if (SrcArg->Status == EFI_SUCCESS &&
2459 - (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstMustDir && DstHandle)) {
2460 + (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstMustDir && DstHandle)))) {
2462 FreePool (DstFullName);
2464 @@ -1789,7 +1789,7 @@ Returns:
2466 if (SrcArg->Status == EFI_SUCCESS &&
2467 !(SrcArg->Info->Attribute & EFI_FILE_DIRECTORY) &&
2468 - (DstArg->Status == EFI_SUCCESS && (DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || DstDir && DstHandle)
2469 + (DstArg->Status == EFI_SUCCESS && ((DstArg->Info->Attribute & EFI_FILE_DIRECTORY) || (DstDir && DstHandle)))
2472 FreePool (DstFullName);
2473 diff --git a/cp/cp.inf b/cp/cp.inf
2474 index 714c7bb..7303b2f 100644
2477 @@ -41,23 +41,23 @@ COMPONENT_TYPE = APPLICATION
2481 - ..\ShCommonStrings.uni
2482 + ../ShCommonStrings.uni
2490 - $(EDK_SOURCE)\Foundation
2491 - $(EDK_SOURCE)\Foundation\Include
2492 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2493 - $(EDK_SOURCE)\Foundation\Efi
2494 - $(EDK_SOURCE)\Foundation\Efi\Include
2495 - $(EDK_SOURCE)\Foundation\FrameWork
2496 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2497 - $(EDK_SOURCE)\Foundation\Core\Dxe
2501 + $(EDK_SOURCE)/Foundation
2502 + $(EDK_SOURCE)/Foundation/Include
2503 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2504 + $(EDK_SOURCE)/Foundation/Efi
2505 + $(EDK_SOURCE)/Foundation/Efi/Include
2506 + $(EDK_SOURCE)/Foundation/FrameWork
2507 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2508 + $(EDK_SOURCE)/Foundation/Core/Dxe
2513 diff --git a/date/date.c b/date/date.c
2514 index fb2f765..ff44740 100644
2517 @@ -53,8 +53,8 @@ STATIC
2521 - IN OUT INTN *Position,
2522 - IN OUT INTN *Number,
2523 + IN OUT UINTN *Position,
2524 + IN OUT UINTN *Number,
2528 @@ -330,8 +330,8 @@ STATIC
2532 - IN OUT INTN *Position,
2533 - IN OUT INTN *Number,
2534 + IN OUT UINTN *Position,
2535 + IN OUT UINTN *Number,
2539 diff --git a/date/date.inf b/date/date.inf
2540 index 2c40f72..18cf117 100644
2543 @@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
2547 - ..\ShCommonStrings.uni
2548 + ../ShCommonStrings.uni
2557 - $(EDK_SOURCE)\Foundation
2558 - $(EDK_SOURCE)\Foundation\Include
2559 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2560 - $(EDK_SOURCE)\Foundation\Efi
2561 - $(EDK_SOURCE)\Foundation\Efi\Include
2562 - $(EDK_SOURCE)\Foundation\FrameWork
2563 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2564 - $(EDK_SOURCE)\Foundation\Core\Dxe
2568 + $(EDK_SOURCE)/Foundation
2569 + $(EDK_SOURCE)/Foundation/Include
2570 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2571 + $(EDK_SOURCE)/Foundation/Efi
2572 + $(EDK_SOURCE)/Foundation/Efi/Include
2573 + $(EDK_SOURCE)/Foundation/FrameWork
2574 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2575 + $(EDK_SOURCE)/Foundation/Core/Dxe
2580 diff --git a/dblk/dblk.inf b/dblk/dblk.inf
2581 index f15392c..3324eb7 100644
2584 @@ -26,23 +26,23 @@ COMPONENT_TYPE = APPLICATION
2588 - ..\ShCommonStrings.uni
2589 + ../ShCommonStrings.uni
2597 - $(EDK_SOURCE)\Foundation
2598 - $(EDK_SOURCE)\Foundation\Include
2599 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2600 - $(EDK_SOURCE)\Foundation\Efi
2601 - $(EDK_SOURCE)\Foundation\Efi\Include
2602 - $(EDK_SOURCE)\Foundation\FrameWork
2603 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2604 - $(EDK_SOURCE)\Foundation\Core\Dxe
2608 + $(EDK_SOURCE)/Foundation
2609 + $(EDK_SOURCE)/Foundation/Include
2610 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2611 + $(EDK_SOURCE)/Foundation/Efi
2612 + $(EDK_SOURCE)/Foundation/Efi/Include
2613 + $(EDK_SOURCE)/Foundation/FrameWork
2614 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2615 + $(EDK_SOURCE)/Foundation/Core/Dxe
2620 diff --git a/dblk/efidump.c b/dblk/efidump.c
2621 index 7fc0337..758326e 100644
2622 --- a/dblk/efidump.c
2623 +++ b/dblk/efidump.c
2624 @@ -24,7 +24,7 @@ Revision History
2628 -#include "Efipart.h"
2629 +#include "EfiPart.h"
2630 #include "EfiShellLib.h"
2632 #include STRING_DEFINES_FILE
2633 @@ -352,8 +352,8 @@ DblkDumpSystemTable (
2634 PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiDblkHandle, LibDevicePathToStr (DevicePath));
2637 - PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDblkHandle, (UINT64) Tbl.Sys->RuntimeServices);
2638 - PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDblkHandle, (UINT64) Tbl.Sys->BootServices);
2639 + PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDblkHandle, (UINT64)(UINTN) Tbl.Sys->RuntimeServices);
2640 + PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDblkHandle, (UINT64)(UINTN) Tbl.Sys->BootServices);
2643 Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
2644 @@ -364,22 +364,22 @@ DblkDumpSystemTable (
2646 Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable);
2647 if (!EFI_ERROR (Status)) {
2648 - PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDblkHandle, (UINT64) AcpiTable);
2649 + PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDblkHandle, (UINT64)(UINTN) AcpiTable);
2652 Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table);
2653 if (!EFI_ERROR (Status)) {
2654 - PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDblkHandle, (UINT64) Acpi20Table);
2655 + PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDblkHandle, (UINT64)(UINTN) Acpi20Table);
2658 Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable);
2659 if (!EFI_ERROR (Status)) {
2660 - PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDblkHandle, (UINT64) MpsTable);
2661 + PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDblkHandle, (UINT64)(UINTN) MpsTable);
2664 Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable);
2665 if (!EFI_ERROR (Status)) {
2666 - PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDblkHandle, (UINT64) SMBIOSTable);
2667 + PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDblkHandle, (UINT64)(UINTN) SMBIOSTable);
2671 diff --git a/devices/devices.c b/devices/devices.c
2672 index bcc8beb..56808a4 100644
2673 --- a/devices/devices.c
2674 +++ b/devices/devices.c
2675 @@ -36,7 +36,7 @@ extern UINT8 STRING_ARRAY_NAME[];
2679 -EFI_HII_HANDLE HiiHandle;
2680 +STATIC EFI_HII_HANDLE HiiHandle;
2681 EFI_GUID EfiDevicesGuid = EFI_DEVICES_GUID;
2682 SHELL_VAR_CHECK_ITEM DevicesCheckList[] = {
2684 diff --git a/devices/devices.inf b/devices/devices.inf
2685 index c380f7d..d25b7ab 100644
2686 --- a/devices/devices.inf
2687 +++ b/devices/devices.inf
2688 @@ -41,23 +41,23 @@ COMPONENT_TYPE = APPLICATION
2692 - ..\ShCommonStrings.uni
2693 + ../ShCommonStrings.uni
2701 - $(EDK_SOURCE)\Foundation
2702 - $(EDK_SOURCE)\Foundation\Include
2703 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2704 - $(EDK_SOURCE)\Foundation\Efi
2705 - $(EDK_SOURCE)\Foundation\Efi\Include
2706 - $(EDK_SOURCE)\Foundation\FrameWork
2707 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2708 - $(EDK_SOURCE)\Foundation\Core\Dxe
2712 + $(EDK_SOURCE)/Foundation
2713 + $(EDK_SOURCE)/Foundation/Include
2714 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2715 + $(EDK_SOURCE)/Foundation/Efi
2716 + $(EDK_SOURCE)/Foundation/Efi/Include
2717 + $(EDK_SOURCE)/Foundation/FrameWork
2718 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2719 + $(EDK_SOURCE)/Foundation/Core/Dxe
2724 diff --git a/dmem/MemCommonPart.c b/dmem/MemCommonPart.c
2725 index 377da17..0b56a02 100644
2726 --- a/dmem/MemCommonPart.c
2727 +++ b/dmem/MemCommonPart.c
2728 @@ -148,7 +148,7 @@ Return:
2732 - Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64) SystemTable;
2733 + Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64)(UINTN) SystemTable;
2734 Size = (SizeStr) ? Xtoi (SizeStr) : 512;
2737 @@ -156,7 +156,7 @@ Return:
2739 PrintToken (STRING_TOKEN (STR_DMEM_MEMORY_ADDR), HiiDmemHandle, 2 * sizeof (UINTN), Address, Size);
2741 - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
2742 + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
2743 if (EFI_ERROR (Status)) {
2744 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiDmemHandle, L"dmem", L"PciRootBridgeIo");
2746 @@ -233,7 +233,7 @@ Return:
2749 AddressStr = SizeStr = NULL;
2750 - Address = (UINT64) SystemTable;
2751 + Address = (UINT64)(UINTN) SystemTable;
2753 RetCode = LibCheckVariables (SI, DmemCheckList, &ChkPck, &Useful);
2754 if (VarCheckOk != RetCode) {
2755 @@ -316,7 +316,7 @@ Return:
2757 PrintToken (STRING_TOKEN (STR_DMEM_NEW_MEMORY_ADDR), HiiDmemHandle, 2 * sizeof (UINTN), Address, Size);
2759 - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
2760 + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
2761 if (EFI_ERROR (Status)) {
2762 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiDmemHandle, L"dmem", L"PciRootBridgeIo");
2764 diff --git a/dmem/dmem.inf b/dmem/dmem.inf
2765 index ca0dcaf..3360314 100644
2768 @@ -25,7 +25,7 @@ FILE_GUID = 644E259E-FF88-4d31-8092-B99D8777F1C4
2769 COMPONENT_TYPE = APPLICATION
2772 - ..\ShCommonStrings.uni
2773 + ../ShCommonStrings.uni
2777 @@ -34,17 +34,17 @@ COMPONENT_TYPE = APPLICATION
2783 - $(EDK_SOURCE)\Foundation
2784 - $(EDK_SOURCE)\Foundation\Include
2785 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2786 - $(EDK_SOURCE)\Foundation\Efi
2787 - $(EDK_SOURCE)\Foundation\Efi\Include
2788 - $(EDK_SOURCE)\Foundation\FrameWork
2789 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2790 - $(EDK_SOURCE)\Foundation\Core\Dxe
2794 + $(EDK_SOURCE)/Foundation
2795 + $(EDK_SOURCE)/Foundation/Include
2796 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2797 + $(EDK_SOURCE)/Foundation/Efi
2798 + $(EDK_SOURCE)/Foundation/Efi/Include
2799 + $(EDK_SOURCE)/Foundation/FrameWork
2800 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2801 + $(EDK_SOURCE)/Foundation/Core/Dxe
2806 diff --git a/dmem/efidump.c b/dmem/efidump.c
2807 index 051f6a0..25bd880 100644
2808 --- a/dmem/efidump.c
2809 +++ b/dmem/efidump.c
2810 @@ -24,7 +24,7 @@ Revision History
2814 -#include "Efipart.h"
2815 +#include "EfiPart.h"
2816 #include "EfiShellLib.h"
2818 #include STRING_DEFINES_FILE
2819 @@ -352,8 +352,8 @@ DumpSystemTable (
2820 PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiDmemHandle, LibDevicePathToStr (DevicePath));
2823 - PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDmemHandle, (UINT64) Tbl.Sys->RuntimeServices);
2824 - PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDmemHandle, (UINT64) Tbl.Sys->BootServices);
2825 + PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiDmemHandle, (UINT64)(UINTN) Tbl.Sys->RuntimeServices);
2826 + PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiDmemHandle, (UINT64)(UINTN) Tbl.Sys->BootServices);
2829 Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
2830 @@ -364,22 +364,22 @@ DumpSystemTable (
2832 Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable);
2833 if (!EFI_ERROR (Status)) {
2834 - PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDmemHandle, (UINT64) AcpiTable);
2835 + PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiDmemHandle, (UINT64)(UINTN) AcpiTable);
2838 Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table);
2839 if (!EFI_ERROR (Status)) {
2840 - PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDmemHandle, (UINT64) Acpi20Table);
2841 + PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiDmemHandle, (UINT64)(UINTN) Acpi20Table);
2844 Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable);
2845 if (!EFI_ERROR (Status)) {
2846 - PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDmemHandle, (UINT64) MpsTable);
2847 + PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiDmemHandle, (UINT64)(UINTN) MpsTable);
2850 Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable);
2851 if (!EFI_ERROR (Status)) {
2852 - PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDmemHandle, (UINT64) SMBIOSTable);
2853 + PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiDmemHandle, (UINT64)(UINTN) SMBIOSTable);
2857 diff --git a/dmpstore/dmpstore.c b/dmpstore/dmpstore.c
2858 index 403e190..4cf7386 100644
2859 --- a/dmpstore/dmpstore.c
2860 +++ b/dmpstore/dmpstore.c
2861 @@ -102,7 +102,7 @@ SetFileVariable (
2865 -EFI_HII_HANDLE HiiHandle;
2866 +STATIC EFI_HII_HANDLE HiiHandle;
2867 EFI_GUID EfiDmpstoreGuid = EFI_DMPSTORE_GUID;
2868 SHELL_VAR_CHECK_ITEM DmpstoreCheckList[] = {
2870 diff --git a/dmpstore/dmpstore.inf b/dmpstore/dmpstore.inf
2871 index f380759..923c24a 100644
2872 --- a/dmpstore/dmpstore.inf
2873 +++ b/dmpstore/dmpstore.inf
2874 @@ -25,24 +25,24 @@ FILE_GUID = 7185D15A-A0AE-4dd1-A58F-C6EAD28EC9A8
2875 COMPONENT_TYPE = APPLICATION
2878 - ..\ShCommonStrings.uni
2879 + ../ShCommonStrings.uni
2888 - $(EDK_SOURCE)\Foundation
2889 - $(EDK_SOURCE)\Foundation\Include
2890 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2891 - $(EDK_SOURCE)\Foundation\Efi
2892 - $(EDK_SOURCE)\Foundation\Efi\Include
2893 - $(EDK_SOURCE)\Foundation\FrameWork
2894 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2895 - $(EDK_SOURCE)\Foundation\Core\Dxe
2899 + $(EDK_SOURCE)/Foundation
2900 + $(EDK_SOURCE)/Foundation/Include
2901 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2902 + $(EDK_SOURCE)/Foundation/Efi
2903 + $(EDK_SOURCE)/Foundation/Efi/Include
2904 + $(EDK_SOURCE)/Foundation/FrameWork
2905 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2906 + $(EDK_SOURCE)/Foundation/Core/Dxe
2911 diff --git a/drivers/drivers.c b/drivers/drivers.c
2912 index 0c6cfc0..50629ab 100644
2913 --- a/drivers/drivers.c
2914 +++ b/drivers/drivers.c
2915 @@ -43,7 +43,7 @@ extern UINT8 STRING_ARRAY_NAME[];
2919 -EFI_HII_HANDLE HiiHandle;
2920 +STATIC EFI_HII_HANDLE HiiHandle;
2921 EFI_GUID EfiDriversGuid = EFI_DRIVERS_GUID;
2922 SHELL_VAR_CHECK_ITEM DriversCheckList[] = {
2924 diff --git a/drivers/drivers.inf b/drivers/drivers.inf
2925 index befa6cd..e4331cf 100644
2926 --- a/drivers/drivers.inf
2927 +++ b/drivers/drivers.inf
2928 @@ -40,7 +40,7 @@ COMPONENT_TYPE = APPLICATION
2932 - ..\ShCommonStrings.uni
2933 + ../ShCommonStrings.uni
2937 @@ -48,17 +48,17 @@ COMPONENT_TYPE = APPLICATION
2943 - $(EDK_SOURCE)\Foundation
2944 - $(EDK_SOURCE)\Foundation\Include
2945 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
2946 - $(EDK_SOURCE)\Foundation\Efi
2947 - $(EDK_SOURCE)\Foundation\Efi\Include
2948 - $(EDK_SOURCE)\Foundation\FrameWork
2949 - $(EDK_SOURCE)\Foundation\FrameWork\Include
2950 - $(EDK_SOURCE)\Foundation\Core\Dxe
2954 + $(EDK_SOURCE)/Foundation
2955 + $(EDK_SOURCE)/Foundation/Include
2956 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
2957 + $(EDK_SOURCE)/Foundation/Efi
2958 + $(EDK_SOURCE)/Foundation/Efi/Include
2959 + $(EDK_SOURCE)/Foundation/FrameWork
2960 + $(EDK_SOURCE)/Foundation/FrameWork/Include
2961 + $(EDK_SOURCE)/Foundation/Core/Dxe
2966 diff --git a/drvcfg/drvcfg.c b/drvcfg/drvcfg.c
2967 index b604432..1190081 100644
2968 --- a/drvcfg/drvcfg.c
2969 +++ b/drvcfg/drvcfg.c
2970 @@ -38,7 +38,7 @@ extern UINT8 STRING_ARRAY_NAME[];
2974 -EFI_HII_HANDLE HiiHandle;
2975 +STATIC EFI_HII_HANDLE HiiHandle;
2976 EFI_GUID EfiDrvcfgGuid = EFI_DRVCFG_GUID;
2977 SHELL_VAR_CHECK_ITEM DrvcfgCheckList[] = {
2979 diff --git a/drvcfg/drvcfg.inf b/drvcfg/drvcfg.inf
2980 index 71b2778..86e80dc 100644
2981 --- a/drvcfg/drvcfg.inf
2982 +++ b/drvcfg/drvcfg.inf
2983 @@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
2987 - ..\ShCommonStrings.uni
2988 + ../ShCommonStrings.uni
2997 - $(EDK_SOURCE)\Foundation
2998 - $(EDK_SOURCE)\Foundation\Include
2999 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3000 - $(EDK_SOURCE)\Foundation\Efi
3001 - $(EDK_SOURCE)\Foundation\Efi\Include
3002 - $(EDK_SOURCE)\Foundation\FrameWork
3003 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3004 - $(EDK_SOURCE)\Foundation\Core\Dxe
3008 + $(EDK_SOURCE)/Foundation
3009 + $(EDK_SOURCE)/Foundation/Include
3010 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3011 + $(EDK_SOURCE)/Foundation/Efi
3012 + $(EDK_SOURCE)/Foundation/Efi/Include
3013 + $(EDK_SOURCE)/Foundation/FrameWork
3014 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3015 + $(EDK_SOURCE)/Foundation/Core/Dxe
3020 diff --git a/drvdiag/drvdiag.c b/drvdiag/drvdiag.c
3021 index 3a9435c..4c20f09 100644
3022 --- a/drvdiag/drvdiag.c
3023 +++ b/drvdiag/drvdiag.c
3024 @@ -41,7 +41,7 @@ extern UINT8 STRING_ARRAY_NAME[];
3028 -EFI_HII_HANDLE HiiHandle;
3029 +STATIC EFI_HII_HANDLE HiiHandle;
3030 EFI_GUID EfiDrvdiagGuid = EFI_DRVDIAG_GUID;
3031 SHELL_VAR_CHECK_ITEM DrvdiagCheckList[] = {
3033 diff --git a/drvdiag/drvdiag.inf b/drvdiag/drvdiag.inf
3034 index f27c238..493de6e 100644
3035 --- a/drvdiag/drvdiag.inf
3036 +++ b/drvdiag/drvdiag.inf
3037 @@ -40,7 +40,7 @@ COMPONENT_TYPE = APPLICATION
3041 - ..\ShCommonStrings.uni
3042 + ../ShCommonStrings.uni
3046 @@ -48,17 +48,17 @@ COMPONENT_TYPE = APPLICATION
3052 - $(EDK_SOURCE)\Foundation
3053 - $(EDK_SOURCE)\Foundation\Include
3054 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3055 - $(EDK_SOURCE)\Foundation\Efi
3056 - $(EDK_SOURCE)\Foundation\Efi\Include
3057 - $(EDK_SOURCE)\Foundation\FrameWork
3058 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3059 - $(EDK_SOURCE)\Foundation\Core\Dxe
3063 + $(EDK_SOURCE)/Foundation
3064 + $(EDK_SOURCE)/Foundation/Include
3065 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3066 + $(EDK_SOURCE)/Foundation/Efi
3067 + $(EDK_SOURCE)/Foundation/Efi/Include
3068 + $(EDK_SOURCE)/Foundation/FrameWork
3069 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3070 + $(EDK_SOURCE)/Foundation/Core/Dxe
3075 diff --git a/edit/edit.inf b/edit/edit.inf
3076 index 0a48e87..5eba5a4 100644
3079 @@ -25,7 +25,7 @@ FILE_GUID = 51A60577-F1F6-444a-A372-244BED272023
3080 COMPONENT_TYPE = APPLICATION
3083 - ..\ShCommonStrings.uni
3084 + ../ShCommonStrings.uni
3088 @@ -41,17 +41,17 @@ COMPONENT_TYPE = APPLICATION
3094 - $(EDK_SOURCE)\Foundation
3095 - $(EDK_SOURCE)\Foundation\Include
3096 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3097 - $(EDK_SOURCE)\Foundation\Efi
3098 - $(EDK_SOURCE)\Foundation\Efi\Include
3099 - $(EDK_SOURCE)\Foundation\FrameWork
3100 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3101 - $(EDK_SOURCE)\Foundation\Core\Dxe
3105 + $(EDK_SOURCE)/Foundation
3106 + $(EDK_SOURCE)/Foundation/Include
3107 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3108 + $(EDK_SOURCE)/Foundation/Efi
3109 + $(EDK_SOURCE)/Foundation/Efi/Include
3110 + $(EDK_SOURCE)/Foundation/FrameWork
3111 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3112 + $(EDK_SOURCE)/Foundation/Core/Dxe
3117 diff --git a/edit/editor.h b/edit/editor.h
3118 index c18db6a..2dd106b 100644
3121 @@ -33,7 +33,7 @@ Abstract:
3122 #include "libstatusbar.h"
3123 #include "libinputbar.h"
3124 #include "libmenubar.h"
3125 -#include "libmisc.h"
3126 +#include "libMisc.h"
3128 // This is the generated header file which includes whatever needs to be exported (strings + IFR)
3130 @@ -43,7 +43,7 @@ extern EFI_EDITOR_GLOBAL_EDITOR MainEditor;
3131 extern BOOLEAN EditorFirst;
3132 extern BOOLEAN EditorExit;
3134 -extern EFI_HII_HANDLE HiiHandle;
3135 +extern EFI_HII_HANDLE gEditHiiHandle;
3136 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
3137 extern EFI_HII_PROTOCOL *Hii;
3139 diff --git a/edit/editortype.h b/edit/editortype.h
3140 index 674f120..df800dc 100644
3141 --- a/edit/editortype.h
3142 +++ b/edit/editortype.h
3143 @@ -28,7 +28,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
3144 #define EDITOR_NAME L"EFI Editor\0"
3145 #define EDITOR_VERSION L"0.99\0"
3147 -#define EFI_EDITOR_LINE_LIST 'eell'
3148 +#define EFI_EDITOR_LINE_LIST EFI_SIGNATURE_32 ('e','e','l','l')
3150 #define INSERT_MODE_STR L"INS"
3151 #define OVERWR_MODE_STR L"OVR"
3152 diff --git a/edit/libEditor.c b/edit/libEditor.c
3153 index b39a2f0..7f32ce1 100644
3154 --- a/edit/libEditor.c
3155 +++ b/edit/libEditor.c
3156 @@ -123,7 +123,7 @@ MainEditorInit (
3157 Status = BS->HandleProtocol (
3159 &gEfiSimplePointerProtocolGuid,
3160 - &MainEditor.MouseInterface
3161 + (VOID**)&MainEditor.MouseInterface
3163 if (EFI_ERROR (Status)) {
3165 @@ -146,7 +146,7 @@ MainEditorInit (
3166 Status = BS->HandleProtocol (
3167 HandleBuffer[Index],
3168 &gEfiSimplePointerProtocolGuid,
3169 - &MainEditor.MouseInterface
3170 + (VOID**)&MainEditor.MouseInterface
3172 if (!EFI_ERROR (Status)) {
3174 @@ -169,31 +169,31 @@ MainEditorInit (
3176 Status = MainTitleBarInit ();
3177 if (EFI_ERROR (Status)) {
3178 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TITLEBAR), HiiHandle);
3179 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TITLEBAR), gEditHiiHandle);
3180 return EFI_LOAD_ERROR;
3183 Status = MainMenuBarInit ();
3184 if (EFI_ERROR (Status)) {
3185 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MAINMENU), HiiHandle);
3186 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MAINMENU), gEditHiiHandle);
3187 return EFI_LOAD_ERROR;
3190 Status = MainStatusBarInit ();
3191 if (EFI_ERROR (Status)) {
3192 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR), HiiHandle);
3193 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR), gEditHiiHandle);
3194 return EFI_LOAD_ERROR;
3197 Status = MainInputBarInit ();
3198 if (EFI_ERROR (Status)) {
3199 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR), HiiHandle);
3200 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR), gEditHiiHandle);
3201 return EFI_LOAD_ERROR;
3204 Status = FileBufferInit ();
3205 if (EFI_ERROR (Status)) {
3206 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER), HiiHandle);
3207 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER), gEditHiiHandle);
3208 return EFI_LOAD_ERROR;
3211 @@ -234,27 +234,27 @@ MainEditorCleanup (
3213 Status = MainTitleBarCleanup ();
3214 if (EFI_ERROR (Status)) {
3215 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TILEBAR_CLEANUP), HiiHandle);
3216 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_TILEBAR_CLEANUP), gEditHiiHandle);
3219 Status = MainMenuBarCleanup ();
3220 if (EFI_ERROR (Status)) {
3221 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MENUBAR_CLEANUP), HiiHandle);
3222 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_MENUBAR_CLEANUP), gEditHiiHandle);
3225 Status = MainStatusBarCleanup ();
3226 if (EFI_ERROR (Status)) {
3227 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR_CLEANUP), HiiHandle);
3228 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_STATUSBAR_CLEANUP), gEditHiiHandle);
3231 Status = MainInputBarCleanup ();
3232 if (EFI_ERROR (Status)) {
3233 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR_CLEANUP), HiiHandle);
3234 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_INPUTBAR_CLEANUP), gEditHiiHandle);
3237 Status = FileBufferCleanup ();
3238 if (EFI_ERROR (Status)) {
3239 - PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER_CLEANUP), HiiHandle);
3240 + PrintToken (STRING_TOKEN (STR_EDIT_LIBEDITOR_FILEBUFFER_CLEANUP), gEditHiiHandle);
3244 diff --git a/edit/libInputBar.c b/edit/libInputBar.c
3245 index 0ec6858..ebd3864 100644
3246 --- a/edit/libInputBar.c
3247 +++ b/edit/libInputBar.c
3248 @@ -173,7 +173,7 @@ Returns:
3249 EditorClearLine (INPUT_BAR_LOCATION);
3251 Out->SetCursorPosition (Out, 0, INPUT_BAR_LOCATION - 1);
3252 - PrintToken (STRING_TOKEN (STR_EDIT_LIBINPUTBAR_MAININPUTBAR), HiiHandle, MainInputBar.Prompt);
3253 + PrintToken (STRING_TOKEN (STR_EDIT_LIBINPUTBAR_MAININPUTBAR), gEditHiiHandle, MainInputBar.Prompt);
3256 // that's the maximum input length that can be displayed on screen
3257 diff --git a/edit/libMenuBar.c b/edit/libMenuBar.c
3258 index 32fef4e..f536d76 100644
3259 --- a/edit/libMenuBar.c
3260 +++ b/edit/libMenuBar.c
3261 @@ -220,9 +220,9 @@ MainMenuBarRefresh (
3262 FunctionKeyString = AllocatePool (BufferSize);
3264 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
3265 - Status = Hii->GetString (Hii, HiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
3266 + Status = Hii->GetString (Hii, gEditHiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
3268 - Status = LibGetString (HiiHandle, Item->NameToken, NameString, &BufferSize);
3269 + Status = LibGetString (gEditHiiHandle, Item->NameToken, NameString, &BufferSize);
3272 Width = max ((StrLen (NameString) + 6), 20);
3273 @@ -232,9 +232,9 @@ MainMenuBarRefresh (
3276 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
3277 - Status = Hii->GetString (Hii, HiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
3278 + Status = Hii->GetString (Hii, gEditHiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
3280 - Status = LibGetString (HiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
3281 + Status = LibGetString (gEditHiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
3283 PrintAt (Col - 1, Row - 1, L"%E%s%N %H%s%N ", FunctionKeyString, NameString);
3285 diff --git a/edit/main.c b/edit/main.c
3286 index 9f1c987..0d92c7a 100644
3289 @@ -34,7 +34,7 @@ EFI_BOOTSHELL_CODE(
3293 -EFI_HII_HANDLE HiiHandle;
3294 +EFI_HII_HANDLE gEditHiiHandle;
3295 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
3296 EFI_HII_PROTOCOL *Hii;
3298 @@ -121,13 +121,13 @@ Returns:
3300 // There should only be one HII protocol
3302 - Status = LibLocateProtocol (&gEfiHiiProtocolGuid, &Hii);
3303 + Status = LibLocateProtocol (&gEfiHiiProtocolGuid, (VOID**)&Hii);
3304 if (EFI_ERROR (Status) || NULL == Hii) {
3309 - Status = LibInitializeStrings (&HiiHandle, STRING_ARRAY_NAME, &EfiEditGuid);
3310 + Status = LibInitializeStrings (&gEditHiiHandle, STRING_ARRAY_NAME, &EfiEditGuid);
3312 if (EFI_ERROR (Status)) {
3314 @@ -137,7 +137,7 @@ Returns:
3315 if (VarCheckOk != RetCode) {
3317 case VarCheckUnknown:
3318 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), HiiHandle, L"edit", Useful);
3319 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), gEditHiiHandle, L"edit", Useful);
3323 @@ -161,10 +161,10 @@ Returns:
3324 ChkPck.FlagCount > 2 ||
3325 (ChkPck.FlagCount == 2 && LibCheckVarGetFlag (&ChkPck, L"-b") == NULL)
3327 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"edit");
3328 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gEditHiiHandle, L"edit");
3329 Status = EFI_INVALID_PARAMETER;
3331 - PrintToken (STRING_TOKEN (STR_EDIT_VERBOSE_HELP), HiiHandle);
3332 + PrintToken (STRING_TOKEN (STR_EDIT_VERBOSE_HELP), gEditHiiHandle);
3333 Status = EFI_SUCCESS;
3336 @@ -172,21 +172,21 @@ Returns:
3339 if (ChkPck.ValueCount > 1) {
3340 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"edit");
3341 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gEditHiiHandle, L"edit");
3342 Status = EFI_INVALID_PARAMETER;
3346 if (ChkPck.ValueCount == 1) {
3347 if (!IsValidFileName (ChkPck.VarList->VarStr)) {
3348 - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INVALID_FILE_NAME), HiiHandle);
3349 + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INVALID_FILE_NAME), gEditHiiHandle);
3350 Status = EFI_INVALID_PARAMETER;
3355 if (SI->RedirArgc != 0) {
3356 - PrintToken (STRING_TOKEN (STR_EDIT_NOREDIRECT), HiiHandle);
3357 + PrintToken (STRING_TOKEN (STR_EDIT_NOREDIRECT), gEditHiiHandle);
3358 Status = EFI_INVALID_PARAMETER;
3361 @@ -195,7 +195,7 @@ Returns:
3362 if (EFI_ERROR (Status)) {
3363 Out->ClearScreen (Out);
3364 Out->EnableCursor (Out, TRUE);
3365 - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INIT_FAILED), HiiHandle);
3366 + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_INIT_FAILED), gEditHiiHandle);
3370 @@ -240,19 +240,19 @@ Returns:
3372 if (Status == EFI_SUCCESS) {
3373 } else if (Status == EFI_OUT_OF_RESOURCES) {
3374 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), HiiHandle, L"edit");
3375 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), gEditHiiHandle, L"edit");
3377 if (Buffer != NULL) {
3378 if (StrCmp (Buffer, L"") != 0) {
3380 // print out the status string
3382 - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_BUFFER), HiiHandle, Buffer);
3383 + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_BUFFER), gEditHiiHandle, Buffer);
3385 - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), HiiHandle);
3386 + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), gEditHiiHandle);
3389 - PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), HiiHandle);
3390 + PrintToken (STRING_TOKEN (STR_EDIT_MAIN_UNKNOWN_EDITOR_ERR), gEditHiiHandle);
3394 diff --git a/err/err.c b/err/err.c
3395 index e41a9d6..95db9bc 100644
3398 @@ -35,7 +35,7 @@ extern UINTN EFIDebug;
3402 -EFI_HII_HANDLE HiiHandle;
3403 +STATIC EFI_HII_HANDLE HiiHandle;
3404 EFI_GUID EfiErrGuid = EFI_ERR_GUID;
3405 SHELL_VAR_CHECK_ITEM ErrCheckList[] = {
3407 @@ -149,7 +149,7 @@ _DumpHandleMask (
3408 EFI_DEBUG_MASK_PROTOCOL *dmp;
3411 - Status = BS->HandleProtocol (Handle, &gEfiDebugMaskProtocolGuid, &dmp);
3412 + Status = BS->HandleProtocol (Handle, &gEfiDebugMaskProtocolGuid, (VOID**)&dmp);
3413 if (!EFI_ERROR (Status)) {
3414 Status = dmp->GetDebugMask (dmp, &Mask);
3415 if (!EFI_ERROR (Status)) {
3416 @@ -278,7 +278,7 @@ _SetDriverMask (
3420 - Status = BS->HandleProtocol (RealHandle, &gEfiDebugMaskProtocolGuid, &dmp);
3421 + Status = BS->HandleProtocol (RealHandle, &gEfiDebugMaskProtocolGuid, (VOID**)&dmp);
3422 if (EFI_ERROR (Status)) {
3423 PrintToken (STRING_TOKEN (STR_ERR_HANDLE_NOT_FOUND), HiiHandle, DrvHandle + 1);
3425 @@ -336,7 +336,7 @@ _SetAllDriverMask (
3428 for (Index = 0; Index < BufferSize / sizeof(EFI_HANDLE); Index ++) {
3429 - Status = BS->HandleProtocol (Buffer[Index], &gEfiDebugMaskProtocolGuid, &dmp);
3430 + Status = BS->HandleProtocol (Buffer[Index], &gEfiDebugMaskProtocolGuid, (VOID**)&dmp);
3431 Status = dmp->SetDebugMask (dmp, Msk);
3434 diff --git a/err/err.inf b/err/err.inf
3435 index 467e734..f1a830b 100644
3438 @@ -25,7 +25,7 @@ FILE_GUID = 7ED86F56-5558-4d4f-A972-9307909AE9BA
3439 COMPONENT_TYPE = APPLICATION
3442 -..\ShCommonStrings.uni
3443 +../ShCommonStrings.uni
3447 @@ -33,17 +33,17 @@ err.h
3453 - $(EDK_SOURCE)\Foundation
3454 - $(EDK_SOURCE)\Foundation\Include
3455 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3456 - $(EDK_SOURCE)\Foundation\Efi
3457 - $(EDK_SOURCE)\Foundation\Efi\Include
3458 - $(EDK_SOURCE)\Foundation\FrameWork
3459 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3460 - $(EDK_SOURCE)\Foundation\Core\Dxe
3464 + $(EDK_SOURCE)/Foundation
3465 + $(EDK_SOURCE)/Foundation/Include
3466 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3467 + $(EDK_SOURCE)/Foundation/Efi
3468 + $(EDK_SOURCE)/Foundation/Efi/Include
3469 + $(EDK_SOURCE)/Foundation/FrameWork
3470 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3471 + $(EDK_SOURCE)/Foundation/Core/Dxe
3476 diff --git a/guid/guid.c b/guid/guid.c
3477 index 7f26e7d..ce86444 100644
3480 @@ -36,7 +36,7 @@ extern UINT8 STRING_ARRAY_NAME[];
3484 -EFI_HII_HANDLE HiiHandle;
3485 +STATIC EFI_HII_HANDLE HiiHandle;
3486 EFI_GUID EfiGuidGuid = EFI_GUID_GUID;
3487 SHELL_VAR_CHECK_ITEM GuidCheckList[] = {
3489 diff --git a/guid/guid.inf b/guid/guid.inf
3490 index 60639d2..8b593b9 100644
3494 FILE_GUID = CBEB01F8-0912-4d87-8A6B-45D02847A405
3495 COMPONENT_TYPE = APPLICATION
3497 - ..\ShCommonStrings.uni
3498 + ../ShCommonStrings.uni
3506 - $(EDK_SOURCE)\Foundation
3507 - $(EDK_SOURCE)\Foundation\Include
3508 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3509 - $(EDK_SOURCE)\Foundation\Efi
3510 - $(EDK_SOURCE)\Foundation\Efi\Include
3511 - $(EDK_SOURCE)\Foundation\FrameWork
3512 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3513 - $(EDK_SOURCE)\Foundation\Core\Dxe
3517 + $(EDK_SOURCE)/Foundation
3518 + $(EDK_SOURCE)/Foundation/Include
3519 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3520 + $(EDK_SOURCE)/Foundation/Efi
3521 + $(EDK_SOURCE)/Foundation/Efi/Include
3522 + $(EDK_SOURCE)/Foundation/FrameWork
3523 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3524 + $(EDK_SOURCE)/Foundation/Core/Dxe
3529 diff --git a/hexedit/heditor.h b/hexedit/heditor.h
3530 index 09196d6..3cd4d84 100644
3531 --- a/hexedit/heditor.h
3532 +++ b/hexedit/heditor.h
3533 @@ -39,7 +39,7 @@ Abstract:
3534 #include "libinputbar.h"
3535 #include "libmenubar.h"
3537 -#include "libmisc.h"
3538 +#include "libMisc.h"
3540 #include "libclipboard.h"
3542 @@ -52,7 +52,7 @@ extern HEFI_EDITOR_GLOBAL_EDITOR HMainEditor;
3543 extern BOOLEAN HEditorFirst;
3544 extern BOOLEAN HEditorExit;
3546 -extern EFI_HII_HANDLE HiiHandle;
3547 +extern EFI_HII_HANDLE gHexEditHiiHandle;
3548 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
3549 extern EFI_HII_PROTOCOL *Hii;
3551 diff --git a/hexedit/heditortype.h b/hexedit/heditortype.h
3552 index 59317a9..0b4e4e2 100644
3553 --- a/hexedit/heditortype.h
3554 +++ b/hexedit/heditortype.h
3555 @@ -30,7 +30,7 @@ Abstract:
3556 #define EDITOR_NAME L"EFI Hex Editor\0"
3557 #define EDITOR_VERSION L"0.99\0"
3559 -#define EFI_EDITOR_LINE_LIST 'eell'
3560 +#define EFI_EDITOR_LINE_LIST EFI_SIGNATURE_32 ('e','e','l','l')
3562 #define FILE_ATTRIBUTES EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE | EFI_FILE_MODE_CREATE
3563 #define FILE_READ_WRITE EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE
3564 diff --git a/hexedit/hexedit.inf b/hexedit/hexedit.inf
3565 index cf89b9e..0239cb6 100644
3566 --- a/hexedit/hexedit.inf
3567 +++ b/hexedit/hexedit.inf
3568 @@ -25,7 +25,7 @@ FILE_GUID = A5A41A42-5B2B-4de6-9556-DDC6DC31231C
3569 COMPONENT_TYPE = APPLICATION
3572 - ..\ShCommonStrings.uni
3573 + ../ShCommonStrings.uni
3577 @@ -45,17 +45,17 @@ COMPONENT_TYPE = APPLICATION
3583 - $(EDK_SOURCE)\Foundation
3584 - $(EDK_SOURCE)\Foundation\Include
3585 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
3586 - $(EDK_SOURCE)\Foundation\Efi
3587 - $(EDK_SOURCE)\Foundation\Efi\Include
3588 - $(EDK_SOURCE)\Foundation\FrameWork
3589 - $(EDK_SOURCE)\Foundation\FrameWork\Include
3590 - $(EDK_SOURCE)\Foundation\Core\Dxe
3594 + $(EDK_SOURCE)/Foundation
3595 + $(EDK_SOURCE)/Foundation/Include
3596 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
3597 + $(EDK_SOURCE)/Foundation/Efi
3598 + $(EDK_SOURCE)/Foundation/Efi/Include
3599 + $(EDK_SOURCE)/Foundation/FrameWork
3600 + $(EDK_SOURCE)/Foundation/FrameWork/Include
3601 + $(EDK_SOURCE)/Foundation/Core/Dxe
3606 diff --git a/hexedit/libEditor.c b/hexedit/libEditor.c
3607 index f511020..1e0128f 100644
3608 --- a/hexedit/libEditor.c
3609 +++ b/hexedit/libEditor.c
3610 @@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
3614 -#include "Heditor.h"
3615 +#include "heditor.h"
3617 HEFI_EDITOR_COLOR_ATTRIBUTES HOriginalColors;
3619 @@ -136,7 +136,7 @@ Returns:
3620 Status = BS->HandleProtocol (
3622 &gEfiSimplePointerProtocolGuid,
3623 - &HMainEditor.MouseInterface
3624 + (VOID**)&HMainEditor.MouseInterface
3626 if (EFI_ERROR (Status)) {
3628 @@ -159,7 +159,7 @@ Returns:
3629 Status = BS->HandleProtocol (
3630 HandleBuffer[Index],
3631 &gEfiSimplePointerProtocolGuid,
3632 - &HMainEditor.MouseInterface
3633 + (VOID**)&HMainEditor.MouseInterface
3635 if (!EFI_ERROR (Status)) {
3637 @@ -182,37 +182,37 @@ Returns:
3639 Status = HMainTitleBarInit ();
3640 if (EFI_ERROR (Status)) {
3641 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_TITLE), HiiHandle);
3642 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_TITLE), gHexEditHiiHandle);
3643 return EFI_LOAD_ERROR;
3646 Status = HMainMenuBarInit ();
3647 if (EFI_ERROR (Status)) {
3648 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), HiiHandle);
3649 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), gHexEditHiiHandle);
3650 return EFI_LOAD_ERROR;
3653 Status = HMainStatusBarInit ();
3654 if (EFI_ERROR (Status)) {
3655 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_STATUS), HiiHandle);
3656 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_STATUS), gHexEditHiiHandle);
3657 return EFI_LOAD_ERROR;
3660 Status = HMainInputBarInit ();
3661 if (EFI_ERROR (Status)) {
3662 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_INPUTBAR), HiiHandle);
3663 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_INPUTBAR), gHexEditHiiHandle);
3664 return EFI_LOAD_ERROR;
3667 Status = HBufferImageInit ();
3668 if (EFI_ERROR (Status)) {
3669 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_BUFFERIMAGE), HiiHandle);
3670 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_BUFFERIMAGE), gHexEditHiiHandle);
3671 return EFI_LOAD_ERROR;
3674 Status = HClipBoardInit ();
3675 if (EFI_ERROR (Status)) {
3676 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_CLIPBOARD), HiiHandle);
3677 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_CLIPBOARD), gHexEditHiiHandle);
3678 return EFI_LOAD_ERROR;
3681 @@ -259,32 +259,32 @@ Returns:
3683 Status = HMainTitleBarCleanup ();
3684 if (EFI_ERROR (Status)) {
3685 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_TITLEBAR_CLEAN), HiiHandle);
3686 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_TITLEBAR_CLEAN), gHexEditHiiHandle);
3689 Status = HMainMenuBarCleanup ();
3690 if (EFI_ERROR (Status)) {
3691 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MENUBAR_CLEAN), HiiHandle);
3692 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MENUBAR_CLEAN), gHexEditHiiHandle);
3695 Status = HMainStatusBarCleanup ();
3696 if (EFI_ERROR (Status)) {
3697 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_STATUSBAR_CLEAN), HiiHandle);
3698 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_STATUSBAR_CLEAN), gHexEditHiiHandle);
3701 Status = HMainInputBarCleanup ();
3702 if (EFI_ERROR (Status)) {
3703 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_INPUTBAR_CLEAN), HiiHandle);
3704 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_INPUTBAR_CLEAN), gHexEditHiiHandle);
3707 Status = HBufferImageCleanup ();
3708 if (EFI_ERROR (Status)) {
3709 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_BUFFERIMAGE_CLEAN), HiiHandle);
3710 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_BUFFERIMAGE_CLEAN), gHexEditHiiHandle);
3713 Status = HClipBoardCleanup ();
3714 if (EFI_ERROR (Status)) {
3715 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_CLIPBOARD_CLEAN), HiiHandle);
3716 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_CLIPBOARD_CLEAN), gHexEditHiiHandle);
3720 diff --git a/hexedit/libInputBar.c b/hexedit/libInputBar.c
3721 index 3a4cc7e..caa1ddc 100644
3722 --- a/hexedit/libInputBar.c
3723 +++ b/hexedit/libInputBar.c
3724 @@ -201,7 +201,7 @@ Returns:
3725 HEditorClearLine (INPUT_BAR_LOCATION);
3727 Out->SetCursorPosition (Out, 0, INPUT_BAR_LOCATION - 1);
3728 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBINPUTBAR_MAININPUTBAR), HiiHandle, HMainInputBar.Prompt);
3729 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBINPUTBAR_MAININPUTBAR), gHexEditHiiHandle, HMainInputBar.Prompt);
3732 // that's the maximum input length that can be displayed on screen
3733 diff --git a/hexedit/libMemImage.c b/hexedit/libMemImage.c
3734 index 407bb2e..d7dbbe8 100644
3735 --- a/hexedit/libMemImage.c
3736 +++ b/hexedit/libMemImage.c
3737 @@ -91,7 +91,7 @@ Returns:
3738 Status = BS->LocateProtocol (
3739 &gEfiPciRootBridgeIoProtocolGuid,
3742 + (VOID**)&HMemImage.IoFncs
3744 if (Status == EFI_NOT_FOUND) {
3746 diff --git a/hexedit/libMenuBar.c b/hexedit/libMenuBar.c
3747 index 5ecb694..d77a1a0 100644
3748 --- a/hexedit/libMenuBar.c
3749 +++ b/hexedit/libMenuBar.c
3750 @@ -255,9 +255,9 @@ Returns:
3751 FunctionKeyString = AllocatePool (BufferSize);
3753 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
3754 - Status = Hii->GetString (Hii, HiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
3755 + Status = Hii->GetString (Hii, gHexEditHiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
3757 - Status = LibGetString (HiiHandle, Item->NameToken, NameString, &BufferSize);
3758 + Status = LibGetString (gHexEditHiiHandle, Item->NameToken, NameString, &BufferSize);
3761 Width = max ((StrLen (NameString) + 6), 18);
3762 @@ -267,9 +267,9 @@ Returns:
3765 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
3766 - Status = Hii->GetString (Hii, HiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
3767 + Status = Hii->GetString (Hii, gHexEditHiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
3769 - Status = LibGetString (HiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
3770 + Status = LibGetString (gHexEditHiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
3773 PrintAt (Col - 1, Row - 1, L"%E%s%N %H%s%N ", FunctionKeyString, NameString);
3774 diff --git a/hexedit/libMisc.h b/hexedit/libMisc.h
3775 index 979a7f0..cbf58a8 100644
3776 --- a/hexedit/libMisc.h
3777 +++ b/hexedit/libMisc.h
3778 @@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
3779 #ifndef _LIB_MISC_H_
3780 #define _LIB_MISC_H_
3782 -#include "Heditortype.h"
3783 +#include "heditortype.h"
3787 diff --git a/hexedit/libTitleBar.c b/hexedit/libTitleBar.c
3788 index 9e7b9e9..09d068e 100644
3789 --- a/hexedit/libTitleBar.c
3790 +++ b/hexedit/libTitleBar.c
3791 @@ -212,7 +212,7 @@ Returns:
3792 // the space for file name is 35 characters
3794 if (StrLen (FileNameTmp) <= 35) {
3795 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR), HiiHandle, FileNameTmp);
3796 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR), gHexEditHiiHandle, FileNameTmp);
3798 for (Index = StrLen (FileNameTmp); Index < 35; Index++) {
3800 @@ -220,7 +220,7 @@ Returns:
3803 for (Index = 0; Index < 32; Index++) {
3804 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C), HiiHandle, FileNameTmp[Index]);
3805 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C), gHexEditHiiHandle, FileNameTmp[Index]);
3809 @@ -234,14 +234,14 @@ Returns:
3810 if (StrLen (HMainEditor.BufferImage->DiskImage->Name) <= 9) {
3812 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR),
3814 + gHexEditHiiHandle,
3815 HMainEditor.BufferImage->DiskImage->Name
3818 for (Index = 0; Index < 6; Index++) {
3820 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_C),
3822 + gHexEditHiiHandle,
3823 HMainEditor.BufferImage->DiskImage->Name[Index]
3826 @@ -253,7 +253,7 @@ Returns:
3829 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_TWOVARS),
3831 + gHexEditHiiHandle,
3832 HMainEditor.BufferImage->DiskImage->Offset,
3833 HMainEditor.BufferImage->DiskImage->Offset + HMainEditor.BufferImage->DiskImage->Size - 1
3835 @@ -269,7 +269,7 @@ Returns:
3838 STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MAINEDITOR_TWOVARS),
3840 + gHexEditHiiHandle,
3841 HMainEditor.BufferImage->MemImage->Offset,
3842 HMainEditor.BufferImage->MemImage->Offset + HMainEditor.BufferImage->MemImage->Size - 1
3844 @@ -286,15 +286,15 @@ Returns:
3846 switch (HMainEditor.BufferImage->BufferType) {
3848 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_FILE), HiiHandle);
3849 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_FILE), gHexEditHiiHandle);
3853 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_DISK), HiiHandle);
3854 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_DISK), gHexEditHiiHandle);
3858 - PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MEM), HiiHandle);
3859 + PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBTITLEBAR_MEM), gHexEditHiiHandle);
3863 diff --git a/hexedit/libdiskimage.c b/hexedit/libdiskimage.c
3864 index 7e11ad0..52f177b 100644
3865 --- a/hexedit/libdiskimage.c
3866 +++ b/hexedit/libdiskimage.c
3867 @@ -246,7 +246,7 @@ Returns:
3868 Status = LibDevicePathToInterface (
3869 &gEfiBlockIoProtocolGuid,
3874 if (EFI_ERROR (Status)) {
3875 HMainStatusBarSetStatusString (L"Read Disk Failed");
3876 @@ -427,7 +427,7 @@ Returns:
3877 Status = LibDevicePathToInterface (
3878 &gEfiBlockIoProtocolGuid,
3883 if (EFI_ERROR (Status)) {
3885 diff --git a/hexedit/libmenubar.h b/hexedit/libmenubar.h
3886 index e3766e2..2c4cff1 100644
3887 --- a/hexedit/libmenubar.h
3888 +++ b/hexedit/libmenubar.h
3889 @@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
3890 #ifndef _LIB_MENU_BAR_H_
3891 #define _LIB_MENU_BAR_H_
3893 -#include "Heditortype.h"
3894 +#include "heditortype.h"
3898 diff --git a/hexedit/main.c b/hexedit/main.c
3899 index 9c2a032..0f0dc21 100644
3900 --- a/hexedit/main.c
3901 +++ b/hexedit/main.c
3902 @@ -27,7 +27,7 @@ extern UINT8 STRING_ARRAY_NAME[];
3906 -EFI_HII_HANDLE HiiHandle;
3907 +EFI_HII_HANDLE gHexEditHiiHandle;
3908 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
3909 EFI_HII_PROTOCOL *Hii;
3911 @@ -93,10 +93,10 @@ PrintUsage (
3915 - PrintToken (STRING_TOKEN (STR_HEXEDIT_USAGE), HiiHandle);
3916 - PrintToken (STRING_TOKEN (STR_HEXEDIT_FILENAME), HiiHandle);
3917 - PrintToken (STRING_TOKEN (STR_HEXEDIT_DISKNAME), HiiHandle);
3918 - PrintToken (STRING_TOKEN (STR_HEXEDIT_OFFSET_SIZE), HiiHandle);
3919 + PrintToken (STRING_TOKEN (STR_HEXEDIT_USAGE), gHexEditHiiHandle);
3920 + PrintToken (STRING_TOKEN (STR_HEXEDIT_FILENAME), gHexEditHiiHandle);
3921 + PrintToken (STRING_TOKEN (STR_HEXEDIT_DISKNAME), gHexEditHiiHandle);
3922 + PrintToken (STRING_TOKEN (STR_HEXEDIT_OFFSET_SIZE), gHexEditHiiHandle);
3926 @@ -147,7 +147,7 @@ Returns:
3927 EFI_SHELL_APP_INIT (ImageHandle, SystemTable);
3929 #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
3930 - Status = LibLocateProtocol (&gEfiHiiProtocolGuid, &Hii);
3931 + Status = LibLocateProtocol (&gEfiHiiProtocolGuid, (VOID**)&Hii);
3932 if (EFI_ERROR (Status)) {
3935 @@ -158,12 +158,12 @@ Returns:
3936 // Register our string package with HII and return the handle to it.
3937 // If previously registered we will simply receive the handle
3939 - EFI_SHELL_STR_INIT (HiiHandle, STRING_ARRAY_NAME, EfiHexeditGuid);
3940 + EFI_SHELL_STR_INIT (gHexEditHiiHandle, STRING_ARRAY_NAME, EfiHexeditGuid);
3942 if (!EFI_PROPER_VERSION (1, 10)) {
3944 STRING_TOKEN (STR_SHELLENV_GNC_COMMAND_NOT_SUPPORT),
3946 + gHexEditHiiHandle,
3950 @@ -187,17 +187,17 @@ Returns:
3952 case VarCheckConflict:
3954 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_FLAG_CONFLICT), HiiHandle, L"hexedit", Useful);
3955 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_FLAG_CONFLICT), gHexEditHiiHandle, L"hexedit", Useful);
3958 case VarCheckDuplicate:
3960 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_DUP_FLAG), HiiHandle, L"hexedit", Useful);
3961 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_DUP_FLAG), gHexEditHiiHandle, L"hexedit", Useful);
3964 case VarCheckUnknown:
3966 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), HiiHandle, L"hexedit", Useful);
3967 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_UNKNOWN_FLAG), gHexEditHiiHandle, L"hexedit", Useful);
3971 @@ -220,10 +220,10 @@ Returns:
3972 ChkPck.FlagCount > 2 ||
3973 (ChkPck.FlagCount == 2 && LibCheckVarGetFlag (&ChkPck, L"-b") == NULL)
3975 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
3976 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
3977 Status = EFI_INVALID_PARAMETER;
3979 - PrintToken (STRING_TOKEN (STR_HEXEDIT_VERBOSE_HELP), HiiHandle);
3980 + PrintToken (STRING_TOKEN (STR_HEXEDIT_VERBOSE_HELP), gHexEditHiiHandle);
3981 Status = EFI_SUCCESS;
3984 @@ -233,13 +233,13 @@ Returns:
3985 Item = LibCheckVarGetFlag (&ChkPck, L"-d");
3987 if (3 < ChkPck.ValueCount) {
3988 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
3989 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
3990 Status = EFI_INVALID_PARAMETER;
3994 if (3 > ChkPck.ValueCount) {
3995 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit");
3996 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit");
3997 Status = EFI_INVALID_PARAMETER;
4000 @@ -249,7 +249,7 @@ Returns:
4002 Result = HXtoi (Item->VarStr, &Offset);
4003 if (EFI_ERROR (Result)) {
4004 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
4005 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
4006 Status = EFI_INVALID_PARAMETER;
4009 @@ -257,13 +257,13 @@ Returns:
4011 Result = HXtoi (Item->VarStr, &Size);
4012 if (EFI_ERROR (Result)) {
4013 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
4014 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
4015 Status = EFI_INVALID_PARAMETER;
4019 if (Offset < 0 || Size <= 0) {
4020 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
4021 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
4022 Status = EFI_INVALID_PARAMETER;
4025 @@ -274,13 +274,13 @@ Returns:
4026 Item = LibCheckVarGetFlag (&ChkPck, L"-m");
4028 if (2 < ChkPck.ValueCount) {
4029 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
4030 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
4031 Status = EFI_INVALID_PARAMETER;
4035 if (2 > ChkPck.ValueCount) {
4036 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit");
4037 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit");
4038 Status = EFI_INVALID_PARAMETER;
4041 @@ -288,7 +288,7 @@ Returns:
4042 Item = ChkPck.VarList;
4043 Result = HXtoi (Item->VarStr, &Offset);
4044 if (EFI_ERROR (Result)) {
4045 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
4046 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
4047 Status = EFI_INVALID_PARAMETER;
4050 @@ -296,20 +296,20 @@ Returns:
4052 Result = HXtoi (Item->VarStr, &Size);
4053 if (EFI_ERROR (Result)) {
4054 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
4055 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
4056 Status = EFI_INVALID_PARAMETER;
4060 if (Offset < 0 || Size <= 0) {
4061 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
4062 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
4063 Status = EFI_INVALID_PARAMETER;
4067 LastOffset = (UINT64) Offset + (UINT64) Size - (UINT64) 1;
4068 if (LastOffset > 0xffffffff) {
4069 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), HiiHandle, L"hexedit", Item->VarStr);
4070 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_INVALID_ARG), gHexEditHiiHandle, L"hexedit", Item->VarStr);
4074 @@ -319,13 +319,13 @@ Returns:
4075 Item = LibCheckVarGetFlag (&ChkPck, L"-f");
4077 if (1 < ChkPck.ValueCount) {
4078 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
4079 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
4080 Status = EFI_INVALID_PARAMETER;
4084 if (1 > ChkPck.ValueCount) {
4085 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), HiiHandle, L"hexedit");
4086 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_FEW), gHexEditHiiHandle, L"hexedit");
4087 Status = EFI_INVALID_PARAMETER;
4090 @@ -333,7 +333,7 @@ Returns:
4091 Item = ChkPck.VarList;
4092 Name = Item->VarStr;
4093 if (!HIsValidFileName (Name)) {
4094 - PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), HiiHandle);
4095 + PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), gHexEditHiiHandle);
4096 Status = EFI_INVALID_PARAMETER;
4099 @@ -345,20 +345,20 @@ Returns:
4103 - PrintToken(STRING_TOKEN (STR_HEXEDIT_INVALID_DIRECTORY), HiiHandle, L"hexedit");
4104 + PrintToken(STRING_TOKEN (STR_HEXEDIT_INVALID_DIRECTORY), gHexEditHiiHandle, L"hexedit");
4105 Status = EFI_INVALID_PARAMETER;
4108 } else if (1 == ChkPck.ValueCount) {
4109 Name = ChkPck.VarList->VarStr;
4111 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), HiiHandle, L"hexedit");
4112 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_TOO_MANY), gHexEditHiiHandle, L"hexedit");
4113 Status = EFI_INVALID_PARAMETER;
4117 if (!HIsValidFileName (Name)) {
4118 - PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), HiiHandle);
4119 + PrintToken (STRING_TOKEN (STR_HEXEDIT_FILE_NAME), gHexEditHiiHandle);
4120 Status = EFI_INVALID_PARAMETER;
4123 @@ -367,7 +367,7 @@ Returns:
4126 if (SI->RedirArgc != 0) {
4127 - PrintToken (STRING_TOKEN (STR_HEXEDIT_NOREDIRECT), HiiHandle);
4128 + PrintToken (STRING_TOKEN (STR_HEXEDIT_NOREDIRECT), gHexEditHiiHandle);
4129 Status = EFI_INVALID_PARAMETER;
4132 @@ -376,7 +376,7 @@ Returns:
4133 if (EFI_ERROR (Status)) {
4134 Out->ClearScreen (Out);
4135 Out->EnableCursor (Out, TRUE);
4136 - PrintToken (STRING_TOKEN (STR_HEXEDIT_INIT_FAILED), HiiHandle);
4137 + PrintToken (STRING_TOKEN (STR_HEXEDIT_INIT_FAILED), gHexEditHiiHandle);
4141 @@ -453,19 +453,19 @@ Returns:
4143 if (Status == EFI_SUCCESS) {
4144 } else if (Status == EFI_OUT_OF_RESOURCES) {
4145 - PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), HiiHandle, L"hexedit");
4146 + PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_OUT_RESOURCE), gHexEditHiiHandle, L"hexedit");
4148 if (Buffer != NULL) {
4149 if (StrCmp (Buffer, L"") != 0) {
4151 // print out the status string
4153 - PrintToken (STRING_TOKEN (STR_HEXEDIT_ONE_VAR), HiiHandle, Buffer);
4154 + PrintToken (STRING_TOKEN (STR_HEXEDIT_ONE_VAR), gHexEditHiiHandle, Buffer);
4156 - PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), HiiHandle);
4157 + PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), gHexEditHiiHandle);
4160 - PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), HiiHandle);
4161 + PrintToken (STRING_TOKEN (STR_HEXEDIT_UNKNOWN_EDITOR), gHexEditHiiHandle);
4165 diff --git a/inc/shelltypes.h b/inc/shelltypes.h
4166 index 1b6cc38..222d165 100644
4167 --- a/inc/shelltypes.h
4168 +++ b/inc/shelltypes.h
4169 @@ -36,7 +36,7 @@ extern "C"
4173 -#include "linkedlist.h"
4174 +#include "LinkedList.h"
4176 #include EFI_PROTOCOL_DEFINITION (FileInfo)
4177 #include EFI_PROTOCOL_DEFINITION (SimpleFileSystem)
4178 diff --git a/load/load.inf b/load/load.inf
4179 index 3ba1dbf..6ce3aae 100644
4182 @@ -39,23 +39,23 @@ FILE_GUID = 5B93B225-2E47-4a61-8EE5-B8EA42EE3EA8
4183 COMPONENT_TYPE = APPLICATION
4186 - ..\ShCommonStrings.uni
4187 + ../ShCommonStrings.uni
4195 - $(EDK_SOURCE)\Foundation
4196 - $(EDK_SOURCE)\Foundation\Include
4197 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4198 - $(EDK_SOURCE)\Foundation\Efi
4199 - $(EDK_SOURCE)\Foundation\Efi\Include
4200 - $(EDK_SOURCE)\Foundation\FrameWork
4201 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4202 - $(EDK_SOURCE)\Foundation\Core\Dxe
4206 + $(EDK_SOURCE)/Foundation
4207 + $(EDK_SOURCE)/Foundation/Include
4208 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4209 + $(EDK_SOURCE)/Foundation/Efi
4210 + $(EDK_SOURCE)/Foundation/Efi/Include
4211 + $(EDK_SOURCE)/Foundation/FrameWork
4212 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4213 + $(EDK_SOURCE)/Foundation/Core/Dxe
4218 diff --git a/ls/ls.c b/ls/ls.c
4219 index bfb4f9c..bc0cb7c 100644
4222 @@ -917,14 +917,14 @@ IsMatch (
4224 if ((IsMatch && mIgnoreAttribute) ||
4225 (IsMatch && !mAttributes && !(Info->Attribute & EFI_FILE_HIDDEN) && !(Info->Attribute & EFI_FILE_SYSTEM)) ||
4230 (mAttribA ? (Info->Attribute & EFI_FILE_ARCHIVE ? TRUE : FALSE) : TRUE) &&
4231 (mAttribH ? (Info->Attribute & EFI_FILE_HIDDEN ? TRUE : FALSE) : TRUE) &&
4232 (mAttribR ? (Info->Attribute & EFI_FILE_READ_ONLY ? TRUE : FALSE) : TRUE) &&
4233 (mAttribS ? (Info->Attribute & EFI_FILE_SYSTEM ? TRUE : FALSE) : TRUE) &&
4234 - (mAttribD ? (Info->Attribute & EFI_FILE_DIRECTORY ? TRUE : FALSE) : TRUE)
4235 + (mAttribD ? (Info->Attribute & EFI_FILE_DIRECTORY ? TRUE : FALSE) : TRUE))
4239 diff --git a/ls/ls.inf b/ls/ls.inf
4240 index 854a5b1..6717ff9 100644
4243 @@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
4247 - ..\ShCommonStrings.uni
4248 + ../ShCommonStrings.uni
4257 - $(EDK_SOURCE)\Foundation
4258 - $(EDK_SOURCE)\Foundation\Include
4259 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4260 - $(EDK_SOURCE)\Foundation\Efi
4261 - $(EDK_SOURCE)\Foundation\Efi\Include
4262 - $(EDK_SOURCE)\Foundation\FrameWork
4263 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4264 - $(EDK_SOURCE)\Foundation\Core\Dxe
4268 + $(EDK_SOURCE)/Foundation
4269 + $(EDK_SOURCE)/Foundation/Include
4270 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4271 + $(EDK_SOURCE)/Foundation/Efi
4272 + $(EDK_SOURCE)/Foundation/Efi/Include
4273 + $(EDK_SOURCE)/Foundation/FrameWork
4274 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4275 + $(EDK_SOURCE)/Foundation/Core/Dxe
4280 diff --git a/mem/MemCommonPart.c b/mem/MemCommonPart.c
4281 index 54af027..5e2582c 100644
4282 --- a/mem/MemCommonPart.c
4283 +++ b/mem/MemCommonPart.c
4284 @@ -149,7 +149,7 @@ Returns:
4288 - Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64) SystemTable;
4289 + Address = (AddressStr) ? Xtoi (AddressStr) : (UINT64)(UINTN) SystemTable;
4290 Size = (SizeStr) ? Xtoi (SizeStr) : 512;
4293 @@ -157,7 +157,7 @@ Returns:
4295 PrintToken (STRING_TOKEN (STR_MEM_MEMORY_ADDR), HiiMemHandle, 2 * sizeof (UINTN), Address, Size);
4297 - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
4298 + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
4299 if (EFI_ERROR (Status)) {
4300 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiMemHandle, L"mem", L"PciRootBridgeIo");
4302 @@ -233,7 +233,7 @@ Returns:
4306 - Address = (UINT64) SystemTable;
4307 + Address = (UINT64)(UINTN) SystemTable;
4309 RetCode = LibCheckVariables (SI, MemCheckList, &ChkPck, &Useful);
4310 if (VarCheckOk != RetCode) {
4311 @@ -312,7 +312,7 @@ Returns:
4313 PrintToken (STRING_TOKEN (STR_MEM_NEW_MEMORY_ADDR), HiiMemHandle, 2 * sizeof (UINTN), Address, Size);
4315 - Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &PciRootBridgeIo);
4316 + Status = BS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRootBridgeIo);
4317 if (EFI_ERROR (Status)) {
4318 PrintToken (STRING_TOKEN (STR_SHELLENV_GNC_LOC_PROT_ERR_EX), HiiMemHandle, L"mem", L"PciRootBridgeIo");
4320 diff --git a/mem/efidump.c b/mem/efidump.c
4321 index d7b22cb..50ba236 100644
4324 @@ -24,7 +24,7 @@ Revision History
4328 -#include "Efipart.h"
4329 +#include "EfiPart.h"
4330 #include "EfiShellLib.h"
4332 #include STRING_DEFINES_FILE
4333 @@ -352,8 +352,8 @@ DumpMemSystemTable (
4334 PrintToken (STRING_TOKEN (STR_DEBUG_STD_ERROR_ON), HiiMemHandle, LibDevicePathToStr (DevicePath));
4337 - PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiMemHandle, (UINT64) Tbl.Sys->RuntimeServices);
4338 - PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiMemHandle, (UINT64) Tbl.Sys->BootServices);
4339 + PrintToken (STRING_TOKEN (STR_DEBUG_RUNTIME_SERVICES), HiiMemHandle, (UINT64)(UINTN) Tbl.Sys->RuntimeServices);
4340 + PrintToken (STRING_TOKEN (STR_DEBUG_BOOT_SERVICES), HiiMemHandle, (UINT64)(UINTN) Tbl.Sys->BootServices);
4343 Status = LibGetSystemConfigurationTable(&gEfiSalSystemTableGuid, &SalSystemTable);
4344 @@ -364,22 +364,22 @@ DumpMemSystemTable (
4346 Status = LibGetSystemConfigurationTable (&gEfiAcpiTableGuid, &AcpiTable);
4347 if (!EFI_ERROR (Status)) {
4348 - PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiMemHandle, (UINT64) AcpiTable);
4349 + PrintToken (STRING_TOKEN (STR_DEBUG_ACPI_TABLE), HiiMemHandle, (UINT64)(UINTN) AcpiTable);
4352 Status = LibGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Acpi20Table);
4353 if (!EFI_ERROR (Status)) {
4354 - PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiMemHandle, (UINT64) Acpi20Table);
4355 + PrintToken (STRING_TOKEN (STR_DEBUG_APCI_2_TABLE), HiiMemHandle, (UINT64)(UINTN) Acpi20Table);
4358 Status = LibGetSystemConfigurationTable (&gEfiMpsTableGuid, &MpsTable);
4359 if (!EFI_ERROR (Status)) {
4360 - PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiMemHandle, (UINT64) MpsTable);
4361 + PrintToken (STRING_TOKEN (STR_DEBUG_MPS_TABLE), HiiMemHandle, (UINT64)(UINTN) MpsTable);
4364 Status = LibGetSystemConfigurationTable (&gEfiSmbiosTableGuid, &SMBIOSTable);
4365 if (!EFI_ERROR (Status)) {
4366 - PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiMemHandle, (UINT64) SMBIOSTable);
4367 + PrintToken (STRING_TOKEN (STR_DEBUG_SMBIOS_TABLE), HiiMemHandle, (UINT64)(UINTN) SMBIOSTable);
4371 diff --git a/mem/mem.inf b/mem/mem.inf
4372 index 0561176..88090e5 100644
4375 @@ -25,7 +25,7 @@ FILE_GUID = 1B0B8206-74DC-4681-AA0D-039A9699EA56
4376 COMPONENT_TYPE = APPLICATION
4379 - ..\ShCommonStrings.uni
4380 + ../ShCommonStrings.uni
4384 @@ -34,17 +34,17 @@ COMPONENT_TYPE = APPLICATION
4390 - $(EDK_SOURCE)\Foundation
4391 - $(EDK_SOURCE)\Foundation\Include
4392 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4393 - $(EDK_SOURCE)\Foundation\Efi
4394 - $(EDK_SOURCE)\Foundation\Efi\Include
4395 - $(EDK_SOURCE)\Foundation\FrameWork
4396 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4397 - $(EDK_SOURCE)\Foundation\Core\Dxe
4401 + $(EDK_SOURCE)/Foundation
4402 + $(EDK_SOURCE)/Foundation/Include
4403 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4404 + $(EDK_SOURCE)/Foundation/Efi
4405 + $(EDK_SOURCE)/Foundation/Efi/Include
4406 + $(EDK_SOURCE)/Foundation/FrameWork
4407 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4408 + $(EDK_SOURCE)/Foundation/Core/Dxe
4413 diff --git a/memmap/memmap.c b/memmap/memmap.c
4414 index f7353ff..7b0e893 100644
4415 --- a/memmap/memmap.c
4416 +++ b/memmap/memmap.c
4417 @@ -35,7 +35,7 @@ extern UINT8 STRING_ARRAY_NAME[];
4421 -EFI_HII_HANDLE HiiHandle;
4422 +STATIC EFI_HII_HANDLE HiiHandle;
4423 EFI_GUID EfiMemmapGuid = EFI_MEMMAP_GUID;
4424 SHELL_VAR_CHECK_ITEM MemmapCheckList[] = {
4426 diff --git a/memmap/memmap.inf b/memmap/memmap.inf
4427 index 1d68c61..fcbcfc7 100644
4428 --- a/memmap/memmap.inf
4429 +++ b/memmap/memmap.inf
4430 @@ -40,7 +40,7 @@ COMPONENT_TYPE = APPLICATION
4434 - ..\ShCommonStrings.uni
4435 + ../ShCommonStrings.uni
4439 @@ -48,17 +48,17 @@ COMPONENT_TYPE = APPLICATION
4445 - $(EDK_SOURCE)\Foundation
4446 - $(EDK_SOURCE)\Foundation\Include
4447 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4448 - $(EDK_SOURCE)\Foundation\Efi
4449 - $(EDK_SOURCE)\Foundation\Efi\Include
4450 - $(EDK_SOURCE)\Foundation\FrameWork
4451 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4452 - $(EDK_SOURCE)\Foundation\Core\Dxe
4456 + $(EDK_SOURCE)/Foundation
4457 + $(EDK_SOURCE)/Foundation/Include
4458 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4459 + $(EDK_SOURCE)/Foundation/Efi
4460 + $(EDK_SOURCE)/Foundation/Efi/Include
4461 + $(EDK_SOURCE)/Foundation/FrameWork
4462 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4463 + $(EDK_SOURCE)/Foundation/Core/Dxe
4468 diff --git a/mkdir/mkdir.c b/mkdir/mkdir.c
4469 index 79a08ca..c105726 100644
4472 @@ -49,7 +49,7 @@ MkDir (
4476 -EFI_HII_HANDLE HiiHandle;
4477 +STATIC EFI_HII_HANDLE HiiHandle;
4478 EFI_GUID EfiMkdirGuid = EFI_MKDIR_GUID;
4479 SHELL_VAR_CHECK_ITEM MkdirCheckList[] = {
4481 diff --git a/mkdir/mkdir.inf b/mkdir/mkdir.inf
4482 index e49daac..efbc4ab 100644
4483 --- a/mkdir/mkdir.inf
4484 +++ b/mkdir/mkdir.inf
4485 @@ -41,23 +41,23 @@ COMPONENT_TYPE = APPLICATION
4489 - ..\ShCommonStrings.uni
4490 + ../ShCommonStrings.uni
4498 - $(EDK_SOURCE)\Foundation
4499 - $(EDK_SOURCE)\Foundation\Include
4500 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4501 - $(EDK_SOURCE)\Foundation\Efi
4502 - $(EDK_SOURCE)\Foundation\Efi\Include
4503 - $(EDK_SOURCE)\Foundation\FrameWork
4504 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4505 - $(EDK_SOURCE)\Foundation\Core\Dxe
4509 + $(EDK_SOURCE)/Foundation
4510 + $(EDK_SOURCE)/Foundation/Include
4511 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4512 + $(EDK_SOURCE)/Foundation/Efi
4513 + $(EDK_SOURCE)/Foundation/Efi/Include
4514 + $(EDK_SOURCE)/Foundation/FrameWork
4515 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4516 + $(EDK_SOURCE)/Foundation/Core/Dxe
4521 diff --git a/mm/mm.c b/mm/mm.c
4522 index 033849b..1c8c51b 100644
4525 @@ -73,7 +73,7 @@ GetHex (
4529 -EFI_HII_HANDLE HiiHandle;
4530 +STATIC EFI_HII_HANDLE HiiHandle;
4531 EFI_GUID EfiIomodGuid = EFI_IOMOD_GUID;
4532 SHELL_VAR_CHECK_ITEM IomodCheckList[] = {
4534 @@ -750,7 +750,7 @@ GetHex (
4537 if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F')) {
4538 - u = u << 4 | c - (c >= 'A' ? 'A' - 10 : '0');
4539 + u = (u << 4) | (c - (c >= 'A' ? 'A' - 10 : '0'));
4543 diff --git a/mm/mm.inf b/mm/mm.inf
4544 index 4857d9e..fa84147 100644
4547 @@ -41,23 +41,23 @@ COMPONENT_TYPE = APPLICATION
4551 - ..\ShCommonStrings.uni
4552 + ../ShCommonStrings.uni
4560 - $(EDK_SOURCE)\Foundation
4561 - $(EDK_SOURCE)\Foundation\Include
4562 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4563 - $(EDK_SOURCE)\Foundation\Efi
4564 - $(EDK_SOURCE)\Foundation\Efi\Include
4565 - $(EDK_SOURCE)\Foundation\FrameWork
4566 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4567 - $(EDK_SOURCE)\Foundation\Core\Dxe
4571 + $(EDK_SOURCE)/Foundation
4572 + $(EDK_SOURCE)/Foundation/Include
4573 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4574 + $(EDK_SOURCE)/Foundation/Efi
4575 + $(EDK_SOURCE)/Foundation/Efi/Include
4576 + $(EDK_SOURCE)/Foundation/FrameWork
4577 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4578 + $(EDK_SOURCE)/Foundation/Core/Dxe
4583 diff --git a/mode/mode.inf b/mode/mode.inf
4584 index 47e5c80..beee5dc 100644
4587 @@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
4591 - ..\ShCommonStrings.uni
4592 + ../ShCommonStrings.uni
4601 - $(EDK_SOURCE)\Foundation
4602 - $(EDK_SOURCE)\Foundation\Include
4603 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4604 - $(EDK_SOURCE)\Foundation\Efi
4605 - $(EDK_SOURCE)\Foundation\Efi\Include
4606 - $(EDK_SOURCE)\Foundation\FrameWork
4607 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4608 - $(EDK_SOURCE)\Foundation\Core\Dxe
4612 + $(EDK_SOURCE)/Foundation
4613 + $(EDK_SOURCE)/Foundation/Include
4614 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4615 + $(EDK_SOURCE)/Foundation/Efi
4616 + $(EDK_SOURCE)/Foundation/Efi/Include
4617 + $(EDK_SOURCE)/Foundation/FrameWork
4618 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4619 + $(EDK_SOURCE)/Foundation/Core/Dxe
4624 diff --git a/mount/mount.c b/mount/mount.c
4625 index fa32b1f..fd34238 100644
4628 @@ -36,7 +36,7 @@ extern UINT8 STRING_ARRAY_NAME[];
4632 -EFI_HII_HANDLE HiiHandle;
4633 +STATIC EFI_HII_HANDLE HiiHandle;
4634 EFI_GUID EfiMountGuid = EFI_MOUNT_GUID;
4635 SHELL_VAR_CHECK_ITEM MountCheckList[] = {
4637 diff --git a/mount/mount.inf b/mount/mount.inf
4638 index 922c490..71144af 100644
4639 --- a/mount/mount.inf
4640 +++ b/mount/mount.inf
4641 @@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
4645 - ..\ShCommonStrings.uni
4646 + ../ShCommonStrings.uni
4655 - $(EDK_SOURCE)\Foundation
4656 - $(EDK_SOURCE)\Foundation\Include
4657 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4658 - $(EDK_SOURCE)\Foundation\Efi
4659 - $(EDK_SOURCE)\Foundation\Efi\Include
4660 - $(EDK_SOURCE)\Foundation\FrameWork
4661 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4662 - $(EDK_SOURCE)\Foundation\Core\Dxe
4666 + $(EDK_SOURCE)/Foundation
4667 + $(EDK_SOURCE)/Foundation/Include
4668 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4669 + $(EDK_SOURCE)/Foundation/Efi
4670 + $(EDK_SOURCE)/Foundation/Efi/Include
4671 + $(EDK_SOURCE)/Foundation/FrameWork
4672 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4673 + $(EDK_SOURCE)/Foundation/Core/Dxe
4678 diff --git a/mv/mv.c b/mv/mv.c
4679 index 3b04021..47617e5 100644
4682 @@ -36,7 +36,7 @@ extern UINT8 STRING_ARRAY_NAME[];
4686 -EFI_HII_HANDLE HiiHandle;
4687 +STATIC EFI_HII_HANDLE HiiHandle;
4688 EFI_GUID EfiMvGuid = EFI_MV_GUID;
4689 SHELL_VAR_CHECK_ITEM MvCheckList[] = {
4691 diff --git a/mv/mv.inf b/mv/mv.inf
4692 index b52e28d..0a4a326 100644
4695 @@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
4699 - ..\ShCommonStrings.uni
4700 + ../ShCommonStrings.uni
4709 - $(EDK_SOURCE)\Foundation
4710 - $(EDK_SOURCE)\Foundation\Include
4711 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4712 - $(EDK_SOURCE)\Foundation\Efi
4713 - $(EDK_SOURCE)\Foundation\Efi\Include
4714 - $(EDK_SOURCE)\Foundation\FrameWork
4715 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4716 - $(EDK_SOURCE)\Foundation\Core\Dxe
4720 + $(EDK_SOURCE)/Foundation
4721 + $(EDK_SOURCE)/Foundation/Include
4722 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4723 + $(EDK_SOURCE)/Foundation/Efi
4724 + $(EDK_SOURCE)/Foundation/Efi/Include
4725 + $(EDK_SOURCE)/Foundation/FrameWork
4726 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4727 + $(EDK_SOURCE)/Foundation/Core/Dxe
4732 diff --git a/newshell/FakeHii.c b/newshell/FakeHii.c
4733 index c187b47..5dff3ad 100644
4734 --- a/newshell/FakeHii.c
4735 +++ b/newshell/FakeHii.c
4736 @@ -196,7 +196,7 @@ FakeUninstallHiiDatabase (
4737 Status = BS->HandleProtocol (
4739 &gEfiHiiProtocolGuid,
4743 Status = BS->UninstallProtocolInterface (
4745 @@ -320,7 +320,7 @@ InsertStringPackage (
4746 if (Language == NULL) {
4747 return EFI_OUT_OF_RESOURCES;
4749 - strcpya (Language, (UINT8 *) PackageHdr + HeaderSize - LanguageSize);
4750 + strcpya (Language, (CHAR8*) ((UINT8 *) PackageHdr + HeaderSize - LanguageSize));
4751 for (Link = PackageList->StringPkgHdr.Flink; Link != &PackageList->StringPkgHdr; Link = Link->Flink) {
4752 StringPackage = CR (Link, FAKE_HII_STRING_PACKAGE, Entry, FAKE_HII_STRING_PACKAGE_SIGNATURE);
4753 if (CompareLanguage (Language, StringPackage->StringPkgHdr->Language)) {
4754 @@ -770,7 +770,7 @@ FakeHiiGetString (
4755 StringPackage = NULL;
4756 for (Link = DatabaseRecord->StringPkgHdr.Flink; Link != &DatabaseRecord->StringPkgHdr; Link = Link->Flink) {
4757 StringPackage = CR (Link, FAKE_HII_STRING_PACKAGE, Entry, FAKE_HII_STRING_PACKAGE_SIGNATURE);
4758 - if (CompareLanguage (StringPackage->StringPkgHdr->Language, (UINT8 *) Language)) {
4759 + if (CompareLanguage (StringPackage->StringPkgHdr->Language, (CHAR8 *) Language)) {
4763 diff --git a/newshell/init.c b/newshell/init.c
4764 index fd4adf6..33fec86 100644
4765 --- a/newshell/init.c
4766 +++ b/newshell/init.c
4767 @@ -23,7 +23,7 @@ Abstract:
4770 extern UINT8 STRING_ARRAY_NAME[];
4771 -extern BOOLEAN gHiiInitialized = FALSE;
4772 +BOOLEAN gHiiInitialized = FALSE;
4775 // This is the generated header file which includes whatever needs to be exported (strings + IFR)
4776 @@ -99,13 +99,13 @@ _GetFsDpOfImg (
4777 Status = BS->HandleProtocol (
4779 &gEfiLoadedImageProtocolGuid,
4783 if (!EFI_ERROR (Status)) {
4784 Status = BS->HandleProtocol (
4786 &gEfiDevicePathProtocolGuid,
4790 if (!EFI_ERROR (Status)) {
4791 *DevPath = DuplicateDevicePath (dp);
4792 @@ -220,7 +220,7 @@ _DoInit (
4794 Status = LibLocateProtocol (
4795 &gEfiConsoleControlProtocolGuid,
4797 + (VOID**)&ConsoleControl
4799 if (!EFI_ERROR (Status)) {
4800 Status = ConsoleControl->GetMode (ConsoleControl, &mOldCurrentMode, NULL, NULL);
4801 @@ -342,7 +342,7 @@ _EnableShellEnv (
4802 Status = _ShellLoadEnvDriver (ImageHandle);
4804 if (EFI_ERROR (Status)) {
4805 - Status = LibLocateProtocol (&ShellEnvProtocol, &SE);
4806 + Status = LibLocateProtocol (&ShellEnvProtocol, (VOID**)&SE);
4807 if (EFI_ERROR (Status)) {
4808 PrintToken (STRING_TOKEN (STR_NSHELL_ENV_DRIVER), HiiNewshellHandle);
4810 @@ -372,7 +372,7 @@ _InstallShellInterface (
4811 *IsRootInstance = TRUE;
4814 - Status = LibLocateProtocol (&ShellEnvProtocol, &SE);
4815 + Status = LibLocateProtocol (&ShellEnvProtocol, (VOID**)&SE);
4816 ASSERT (!EFI_ERROR (Status));
4817 SI = SE->NewShell (ImageHandle);
4819 @@ -543,7 +543,7 @@ _CleanUpOnExit (
4821 ConsoleControlStatus = LibLocateProtocol (
4822 &gEfiConsoleControlProtocolGuid,
4824 + (VOID**)&ConsoleControl
4826 if (!EFI_ERROR (ConsoleControlStatus)) {
4827 ConsoleControlStatus = ConsoleControl->GetMode (ConsoleControl, &CurrentMode, NULL, NULL);
4828 @@ -723,7 +723,7 @@ Returns:
4829 Status = BS->HandleProtocol (
4831 &ShellInterfaceProtocol,
4835 ASSERT (!EFI_ERROR (Status));
4837 diff --git a/newshell/nshell.inf b/newshell/nshell.inf
4838 index 22479b0..b69f1a1 100644
4839 --- a/newshell/nshell.inf
4840 +++ b/newshell/nshell.inf
4841 @@ -26,24 +26,24 @@ COMPONENT_TYPE = APPLICATION
4845 - ..\ShCommonStrings.uni
4846 + ../ShCommonStrings.uni
4855 - $(EDK_SOURCE)\Foundation
4856 - $(EDK_SOURCE)\Foundation\Include
4857 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4858 - $(EDK_SOURCE)\Foundation\Efi
4859 - $(EDK_SOURCE)\Foundation\Efi\Include
4860 - $(EDK_SOURCE)\Foundation\FrameWork
4861 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4862 - $(EDK_SOURCE)\Foundation\Core\Dxe
4866 + $(EDK_SOURCE)/Foundation
4867 + $(EDK_SOURCE)/Foundation/Include
4868 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4869 + $(EDK_SOURCE)/Foundation/Efi
4870 + $(EDK_SOURCE)/Foundation/Efi/Include
4871 + $(EDK_SOURCE)/Foundation/FrameWork
4872 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4873 + $(EDK_SOURCE)/Foundation/Core/Dxe
4878 diff --git a/openinfo/openinfo.c b/openinfo/openinfo.c
4879 index 9b3356c..c7dfb9e 100644
4880 --- a/openinfo/openinfo.c
4881 +++ b/openinfo/openinfo.c
4882 @@ -36,7 +36,7 @@ extern UINT8 STRING_ARRAY_NAME[];
4886 -EFI_HII_HANDLE HiiHandle;
4887 +STATIC EFI_HII_HANDLE HiiHandle;
4888 EFI_GUID EfiOpeninfoGuid = EFI_OPENINFO_GUID;
4889 SHELL_VAR_CHECK_ITEM OpeninfoCheckList[] = {
4891 diff --git a/openinfo/openinfo.inf b/openinfo/openinfo.inf
4892 index 638462d..383d58a 100644
4893 --- a/openinfo/openinfo.inf
4894 +++ b/openinfo/openinfo.inf
4895 @@ -41,24 +41,24 @@ COMPONENT_TYPE = APPLICATION
4899 - ..\ShCommonStrings.uni
4900 + ../ShCommonStrings.uni
4909 - $(EDK_SOURCE)\Foundation
4910 - $(EDK_SOURCE)\Foundation\Include
4911 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
4912 - $(EDK_SOURCE)\Foundation\Efi
4913 - $(EDK_SOURCE)\Foundation\Efi\Include
4914 - $(EDK_SOURCE)\Foundation\FrameWork
4915 - $(EDK_SOURCE)\Foundation\FrameWork\Include
4916 - $(EDK_SOURCE)\Foundation\Core\Dxe
4920 + $(EDK_SOURCE)/Foundation
4921 + $(EDK_SOURCE)/Foundation/Include
4922 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
4923 + $(EDK_SOURCE)/Foundation/Efi
4924 + $(EDK_SOURCE)/Foundation/Efi/Include
4925 + $(EDK_SOURCE)/Foundation/FrameWork
4926 + $(EDK_SOURCE)/Foundation/FrameWork/Include
4927 + $(EDK_SOURCE)/Foundation/Core/Dxe
4932 diff --git a/pci/pci.c b/pci/pci.c
4933 index 8dc0dba..b0e5da6 100644
4936 @@ -344,7 +344,7 @@ PCIE_EXPLAIN_STRUCT PcieExplainList[] = {
4939 PCI_CONFIG_SPACE *mConfigSpace;
4940 -EFI_HII_HANDLE HiiHandle;
4941 +STATIC EFI_HII_HANDLE HiiHandle;
4942 EFI_GUID EfiPciGuid = EFI_PCI_GUID;
4943 SHELL_VAR_CHECK_ITEM PciCheckList[] = {
4945 @@ -1034,7 +1034,7 @@ Returns:
4946 Status = BS->HandleProtocol (
4948 &gEfiPciRootBridgeIoProtocolGuid,
4953 if (EFI_ERROR (Status)) {
4954 @@ -1043,7 +1043,7 @@ Returns:
4956 // Call Configuration() to get address space descriptors
4958 - Status = (*IoDev)->Configuration (*IoDev, Descriptors);
4959 + Status = (*IoDev)->Configuration (*IoDev, (VOID**)Descriptors);
4960 if (Status == EFI_UNSUPPORTED) {
4961 *Descriptors = NULL;
4963 @@ -1956,7 +1956,7 @@ Returns:
4964 INDEX_OF (&(CardBus->IoBase0)),
4965 Io32Bit ? L" 32 bit" : L" 16 bit",
4966 CardBus->IoBase0 & (Io32Bit ? 0xfffffffc : 0x0000fffc),
4967 - CardBus->IoLimit0 & (Io32Bit ? 0xffffffff : 0x0000ffff) | 0x00000003
4968 + (CardBus->IoLimit0 & (Io32Bit ? 0xffffffff : 0x0000ffff)) | 0x00000003
4971 Io32Bit = (BOOLEAN) (CardBus->IoBase1 & PCI_BIT_0);
4972 @@ -1966,7 +1966,7 @@ Returns:
4973 INDEX_OF (&(CardBus->IoBase1)),
4974 Io32Bit ? L" 32 bit" : L" 16 bit",
4975 CardBus->IoBase1 & (Io32Bit ? 0xfffffffc : 0x0000fffc),
4976 - CardBus->IoLimit1 & (Io32Bit ? 0xffffffff : 0x0000ffff) | 0x00000003
4977 + (CardBus->IoLimit1 & (Io32Bit ? 0xffffffff : 0x0000ffff)) | 0x00000003
4981 diff --git a/pci/pci.h b/pci/pci.h
4982 index 0716bee..6a3ef76 100644
4985 @@ -30,7 +30,7 @@ Revision History
4986 0x388da6c3, 0x3447, 0x4b1f, 0xa0, 0xba, 0xa9, 0xe8, 0xa2, 0x87, 0xf1, 0x76 \
4994 diff --git a/pci/pci.inf b/pci/pci.inf
4995 index d4499d6..4691013 100644
4998 @@ -41,7 +41,7 @@ COMPONENT_TYPE = APPLICATION
5002 - ..\ShCommonStrings.uni
5003 + ../ShCommonStrings.uni
5007 @@ -49,17 +49,17 @@ COMPONENT_TYPE = APPLICATION
5013 - $(EDK_SOURCE)\Foundation
5014 - $(EDK_SOURCE)\Foundation\Include
5015 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5016 - $(EDK_SOURCE)\Foundation\Efi
5017 - $(EDK_SOURCE)\Foundation\Efi\Include
5018 - $(EDK_SOURCE)\Foundation\FrameWork
5019 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5020 - $(EDK_SOURCE)\Foundation\Core\Dxe
5024 + $(EDK_SOURCE)/Foundation
5025 + $(EDK_SOURCE)/Foundation/Include
5026 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5027 + $(EDK_SOURCE)/Foundation/Efi
5028 + $(EDK_SOURCE)/Foundation/Efi/Include
5029 + $(EDK_SOURCE)/Foundation/FrameWork
5030 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5031 + $(EDK_SOURCE)/Foundation/Core/Dxe
5036 diff --git a/pci/pci_class.c b/pci/pci_class.c
5037 index caffe6d..14aa88d 100644
5038 --- a/pci/pci_class.c
5039 +++ b/pci/pci_class.c
5040 @@ -30,7 +30,7 @@ Revision History
5044 -EFI_HII_HANDLE HiiHandle;
5045 +STATIC EFI_HII_HANDLE HiiHandle;
5047 PCI_CLASS_ENTRY gClassStringList[];
5049 diff --git a/pci/pci_class.h b/pci/pci_class.h
5050 index c7fff0c..ebaa9f6 100644
5051 --- a/pci/pci_class.h
5052 +++ b/pci/pci_class.h
5053 @@ -24,7 +24,7 @@ Revision History
5054 #ifndef _PCI_CLASS_H_
5055 #define _PCI_CLASS_H_
5057 -#include "TIANO.h" // for UINT32 etc.
5058 +#include "Tiano.h" // for UINT32 etc.
5059 #define PCI_CLASS_STRING_LIMIT 54
5061 // Printable strings for Pci class code
5062 diff --git a/reset/reset.inf b/reset/reset.inf
5063 index 3af6b2c..b89ae85 100644
5064 --- a/reset/reset.inf
5065 +++ b/reset/reset.inf
5066 @@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
5070 - ..\ShCommonStrings.uni
5071 + ../ShCommonStrings.uni
5080 - $(EDK_SOURCE)\Foundation
5081 - $(EDK_SOURCE)\Foundation\Include
5082 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5083 - $(EDK_SOURCE)\Foundation\Efi
5084 - $(EDK_SOURCE)\Foundation\Efi\Include
5085 - $(EDK_SOURCE)\Foundation\FrameWork
5086 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5087 - $(EDK_SOURCE)\Foundation\Core\Dxe
5091 + $(EDK_SOURCE)/Foundation
5092 + $(EDK_SOURCE)/Foundation/Include
5093 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5094 + $(EDK_SOURCE)/Foundation/Efi
5095 + $(EDK_SOURCE)/Foundation/Efi/Include
5096 + $(EDK_SOURCE)/Foundation/FrameWork
5097 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5098 + $(EDK_SOURCE)/Foundation/Core/Dxe
5103 diff --git a/rm/rm.inf b/rm/rm.inf
5104 index 0da05e0..bc7449f 100644
5107 @@ -41,23 +41,23 @@ COMPONENT_TYPE = APPLICATION
5111 - ..\ShCommonStrings.uni
5112 + ../ShCommonStrings.uni
5120 - $(EDK_SOURCE)\Foundation
5121 - $(EDK_SOURCE)\Foundation\Include
5122 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5123 - $(EDK_SOURCE)\Foundation\Efi
5124 - $(EDK_SOURCE)\Foundation\Efi\Include
5125 - $(EDK_SOURCE)\Foundation\FrameWork
5126 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5127 - $(EDK_SOURCE)\Foundation\Core\Dxe
5131 + $(EDK_SOURCE)/Foundation
5132 + $(EDK_SOURCE)/Foundation/Include
5133 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5134 + $(EDK_SOURCE)/Foundation/Efi
5135 + $(EDK_SOURCE)/Foundation/Efi/Include
5136 + $(EDK_SOURCE)/Foundation/FrameWork
5137 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5138 + $(EDK_SOURCE)/Foundation/Core/Dxe
5143 diff --git a/sermode/sermode.c b/sermode/sermode.c
5144 index b59e801..3340352 100644
5145 --- a/sermode/sermode.c
5146 +++ b/sermode/sermode.c
5147 @@ -35,7 +35,7 @@ extern UINT8 STRING_ARRAY_NAME[];
5149 #include EFI_PROTOCOL_DEFINITION (SerialIo)
5151 -EFI_HII_HANDLE HiiHandle;
5152 +STATIC EFI_HII_HANDLE HiiHandle;
5153 EFI_GUID EfiSermodeGuid = EFI_SERMODEB_GUID;
5154 SHELL_VAR_CHECK_ITEM SermodeCheckList[] = {
5156 @@ -104,7 +104,7 @@ iDisplaySettings (
5160 - Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, &SerialIo);
5161 + Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, (VOID**)&SerialIo);
5162 if (!EFI_ERROR (Status)) {
5163 switch (SerialIo->Mode->Parity) {
5165 @@ -454,7 +454,7 @@ Returns:
5169 - Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, &SerialIo);
5170 + Status = BS->HandleProtocol (Handles[Index], &gEfiSerialIoProtocolGuid, (VOID**)&SerialIo);
5171 if (!EFI_ERROR (Status)) {
5172 Status = SerialIo->SetAttributes (
5174 diff --git a/sermode/sermode.inf b/sermode/sermode.inf
5175 index 71f3c66..47ac581 100644
5176 --- a/sermode/sermode.inf
5177 +++ b/sermode/sermode.inf
5178 @@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
5182 - ..\ShCommonStrings.uni
5183 + ../ShCommonStrings.uni
5192 - $(EDK_SOURCE)\Foundation
5193 - $(EDK_SOURCE)\Foundation\Include
5194 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5195 - $(EDK_SOURCE)\Foundation\Efi
5196 - $(EDK_SOURCE)\Foundation\Efi\Include
5197 - $(EDK_SOURCE)\Foundation\FrameWork
5198 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5199 - $(EDK_SOURCE)\Foundation\Core\Dxe
5203 + $(EDK_SOURCE)/Foundation
5204 + $(EDK_SOURCE)/Foundation/Include
5205 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5206 + $(EDK_SOURCE)/Foundation/Efi
5207 + $(EDK_SOURCE)/Foundation/Efi/Include
5208 + $(EDK_SOURCE)/Foundation/FrameWork
5209 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5210 + $(EDK_SOURCE)/Foundation/Core/Dxe
5215 diff --git a/shellenv/Connect.c b/shellenv/Connect.c
5216 index 71ecf0b..6b26bfe 100644
5217 --- a/shellenv/Connect.c
5218 +++ b/shellenv/Connect.c
5219 @@ -333,7 +333,7 @@ Returns:
5220 Status = BS->HandleProtocol (
5222 &gEfiDevicePathProtocolGuid,
5226 if (EFI_ERROR (Status)) {
5227 DriverBindingHandleCount = 1;
5228 @@ -349,7 +349,7 @@ Returns:
5229 Status = BS->HandleProtocol (
5231 &gEfiDevicePathProtocolGuid,
5235 if (EFI_ERROR (Status)) {
5237 @@ -368,7 +368,7 @@ Returns:
5238 Status = BS->HandleProtocol (
5240 &gEfiDriverBindingProtocolGuid,
5244 if (EFI_ERROR (Status)) {
5246 @@ -407,7 +407,7 @@ Returns:
5247 Status = BS->HandleProtocol (
5248 AllHandleBuffer[Index],
5249 &gEfiDriverBindingProtocolGuid,
5253 if (EFI_ERROR (Status)) {
5254 DeviceHandleBuffer[DeviceHandleCount++] = AllHandleBuffer[Index];
5255 @@ -1052,7 +1052,7 @@ SEnvConnectConsole (
5256 Status = BS->HandleProtocol (
5260 + (VOID**)&Interface
5264 @@ -1079,7 +1079,7 @@ SEnvConnectConsole (
5265 Status = BS->HandleProtocol (
5266 AllHandleBuffer[Index],
5267 &gEfiDevicePathProtocolGuid,
5269 + (VOID**)&Interface
5271 if (!EFI_ERROR (Status)) {
5272 ConsoleIndex = Index;
5273 @@ -1095,7 +1095,7 @@ SEnvConnectConsole (
5274 BS->HandleProtocol (
5278 + (VOID**)ConsoleInterface
5282 diff --git a/shellenv/dprot.c b/shellenv/dprot.c
5283 index 91faa50..c5078c9 100644
5284 --- a/shellenv/dprot.c
5285 +++ b/shellenv/dprot.c
5286 @@ -23,7 +23,7 @@ Revision History
5289 #include "shellenvguid.h"
5293 STATIC CHAR16 *SEnvDP_IlleagalStr[] = { L"Illegal" };
5295 diff --git a/shellenv/exec.c b/shellenv/exec.c
5296 index a6c1b73..f825588 100644
5297 --- a/shellenv/exec.c
5298 +++ b/shellenv/exec.c
5299 @@ -1872,7 +1872,7 @@ Returns:
5303 - // Processing foo: or foo:\
5304 + // Processing foo:\ or foo:
5306 if (PathPos != -1 && Ptr1 == NULL) {
5308 diff --git a/shellenv/for.c b/shellenv/for.c
5309 index 99664ad..93ab1f2 100644
5310 --- a/shellenv/for.c
5311 +++ b/shellenv/for.c
5312 @@ -24,7 +24,7 @@ Revision History
5314 #include "shellenvguid.h"
5320 IN CHAR16 *wszValueStr,
5321 @@ -190,7 +190,7 @@ Arguments:
5323 EFI_SUCCESS The function finished sucessfully
5328 EFI_BATCH_STATEMENT *Stmt;
5329 EFI_LIST_ENTRY FileList;
5330 @@ -326,7 +326,8 @@ Done:
5339 IN EFI_HANDLE hImageHandle,
5340 diff --git a/shellenv/init.c b/shellenv/init.c
5341 index dad9002..458c6eb 100644
5342 --- a/shellenv/init.c
5343 +++ b/shellenv/init.c
5344 @@ -143,7 +143,7 @@ Returns:
5345 Status = BS->HandleProtocol (
5348 - &(mOldSEnv->Interface)
5349 + (VOID**)&(mOldSEnv->Interface)
5351 ASSERT (!EFI_ERROR (Status));
5352 Status = BS->ReinstallProtocolInterface (
5353 diff --git a/shellenv/map.c b/shellenv/map.c
5354 index 3ebf2b4..297f689 100644
5355 --- a/shellenv/map.c
5356 +++ b/shellenv/map.c
5357 @@ -2038,13 +2038,13 @@ Returns:
5361 - Status = BS->HandleProtocol (Handle, &gEfiBlockIoProtocolGuid, &BlockIo);
5362 + Status = BS->HandleProtocol (Handle, &gEfiBlockIoProtocolGuid, (VOID**)&BlockIo);
5364 // This is just for NT32, because fsntx has no block io protocol installed
5365 // but fsntx has installed simple file system protocol
5367 if (EFI_ERROR (Status)) {
5368 - Status = BS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, &BlockIo);
5369 + Status = BS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, (VOID**)&BlockIo);
5372 if (EFI_ERROR (Status)) {
5373 diff --git a/shellenv/protid.c b/shellenv/protid.c
5374 index 3edca2c..a9401e7 100644
5375 --- a/shellenv/protid.c
5376 +++ b/shellenv/protid.c
5377 @@ -1183,7 +1183,7 @@ GetDriverName (
5378 *DriverName = LibDevicePathToStr (Image->FilePath);
5381 - LibGetDriverName (DriverBindingHandle, Language, DriverName);
5382 + LibGetDriverName (DriverBindingHandle, (CHAR8*)Language, DriverName);
5386 @@ -1539,7 +1539,7 @@ Returns:
5389 BestDeviceName = NULL;
5390 - Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, &DevicePath);
5391 + Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID**)&DevicePath);
5394 PrintToken (STRING_TOKEN (STR_SHELLENV_PROTID_CONTROLLER_NAME), HiiEnvHandle);
5395 @@ -1598,14 +1598,14 @@ Returns:
5397 Status = GetDriverName (
5398 DriverBindingHandleBuffer[Index],
5404 if (DriverName == NULL) {
5405 Status = GetDriverName (
5406 DriverBindingHandleBuffer[Index],
5412 @@ -1792,7 +1792,7 @@ Returns:
5414 Status = GetDriverName (
5421 @@ -1806,7 +1806,7 @@ Returns:
5423 Status = GetDriverName (
5430 @@ -1979,7 +1979,7 @@ Returns:
5432 if (Prot->Handles[Index] == Handle) {
5433 Dump = Verbose ? Prot->DumpInfo : Prot->DumpToken;
5434 - Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, &Interface);
5435 + Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, (VOID**)&Interface);
5436 if (!EFI_ERROR (Status)) {
5438 for (Index1 = 0; Index1 < ProtocolBufferCount; Index1++) {
5439 @@ -2027,7 +2027,7 @@ Returns:
5443 - Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], &Interface);
5444 + Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], (VOID**)&Interface);
5445 if (!EFI_ERROR (Status)) {
5447 STRING_TOKEN (STR_SHELLENV_PROTID_TWO_VARS_HG_NEW),
5448 diff --git a/stall/stall.inf b/stall/stall.inf
5449 index 58545a5..0c50120 100644
5450 --- a/stall/stall.inf
5451 +++ b/stall/stall.inf
5452 @@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
5456 - ..\ShCommonStrings.uni
5457 + ../ShCommonStrings.uni
5466 - $(EDK_SOURCE)\Foundation
5467 - $(EDK_SOURCE)\Foundation\Include
5468 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5469 - $(EDK_SOURCE)\Foundation\Efi
5470 - $(EDK_SOURCE)\Foundation\Efi\Include
5471 - $(EDK_SOURCE)\Foundation\FrameWork
5472 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5473 - $(EDK_SOURCE)\Foundation\Core\Dxe
5477 + $(EDK_SOURCE)/Foundation
5478 + $(EDK_SOURCE)/Foundation/Include
5479 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5480 + $(EDK_SOURCE)/Foundation/Efi
5481 + $(EDK_SOURCE)/Foundation/Efi/Include
5482 + $(EDK_SOURCE)/Foundation/FrameWork
5483 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5484 + $(EDK_SOURCE)/Foundation/Core/Dxe
5489 diff --git a/time/time.c b/time/time.c
5490 index 00dd586..a0adbfe 100644
5493 @@ -64,8 +64,8 @@ STATIC
5497 - IN OUT INTN *Offset,
5498 - IN OUT INTN *number,
5499 + IN OUT UINTN *Offset,
5500 + IN OUT UINTN *number,
5501 IN BOOLEAN GetSecond
5504 @@ -296,8 +296,8 @@ STATIC
5508 - IN OUT INTN *Offset,
5509 - IN OUT INTN *Number,
5510 + IN OUT UINTN *Offset,
5511 + IN OUT UINTN *Number,
5512 IN BOOLEAN GetSecond
5515 diff --git a/time/time.inf b/time/time.inf
5516 index 5181280..5b65e49 100644
5519 @@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
5523 - ..\ShCommonStrings.uni
5524 + ../ShCommonStrings.uni
5533 - $(EDK_SOURCE)\Foundation
5534 - $(EDK_SOURCE)\Foundation\Include
5535 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5536 - $(EDK_SOURCE)\Foundation\Efi
5537 - $(EDK_SOURCE)\Foundation\Efi\Include
5538 - $(EDK_SOURCE)\Foundation\FrameWork
5539 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5540 - $(EDK_SOURCE)\Foundation\Core\Dxe
5544 + $(EDK_SOURCE)/Foundation
5545 + $(EDK_SOURCE)/Foundation/Include
5546 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5547 + $(EDK_SOURCE)/Foundation/Efi
5548 + $(EDK_SOURCE)/Foundation/Efi/Include
5549 + $(EDK_SOURCE)/Foundation/FrameWork
5550 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5551 + $(EDK_SOURCE)/Foundation/Core/Dxe
5556 diff --git a/touch/touch.c b/touch/touch.c
5557 index 0938d34..a5f61b8 100644
5560 @@ -64,7 +64,7 @@ TouchFreeFileArg (
5564 -EFI_HII_HANDLE HiiHandle;
5565 +STATIC EFI_HII_HANDLE HiiHandle;
5566 EFI_GUID EfiTouchGuid = EFI_TOUCH_GUID;
5567 SHELL_VAR_CHECK_ITEM TouchCheckList[] = {
5569 diff --git a/touch/touch.inf b/touch/touch.inf
5570 index 5382ff6..1a89a90 100644
5571 --- a/touch/touch.inf
5572 +++ b/touch/touch.inf
5573 @@ -39,23 +39,23 @@ FILE_GUID = 2EBB94E8-3792-47bb-8843-4D5ED5B98F28
5574 COMPONENT_TYPE = APPLICATION
5577 - ..\ShCommonStrings.uni
5578 + ../ShCommonStrings.uni
5586 - $(EDK_SOURCE)\Foundation
5587 - $(EDK_SOURCE)\Foundation\Include
5588 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5589 - $(EDK_SOURCE)\Foundation\Efi
5590 - $(EDK_SOURCE)\Foundation\Efi\Include
5591 - $(EDK_SOURCE)\Foundation\FrameWork
5592 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5593 - $(EDK_SOURCE)\Foundation\Core\Dxe
5597 + $(EDK_SOURCE)/Foundation
5598 + $(EDK_SOURCE)/Foundation/Include
5599 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5600 + $(EDK_SOURCE)/Foundation/Efi
5601 + $(EDK_SOURCE)/Foundation/Efi/Include
5602 + $(EDK_SOURCE)/Foundation/FrameWork
5603 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5604 + $(EDK_SOURCE)/Foundation/Core/Dxe
5609 diff --git a/type/type.c b/type/type.c
5610 index 129f911..c3855ef 100644
5613 @@ -59,7 +59,7 @@ BOOLEAN TypeAscii;
5614 BOOLEAN TypeUnicode;
5617 -EFI_HII_HANDLE HiiHandle;
5618 +STATIC EFI_HII_HANDLE HiiHandle;
5619 EFI_GUID EfiTypeGuid = EFI_TYPE_GUID;
5620 SHELL_VAR_CHECK_ITEM TypeCheckList[] = {
5622 diff --git a/type/type.inf b/type/type.inf
5623 index efb0a82..23138c6 100644
5626 @@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
5630 - ..\ShCommonStrings.uni
5631 + ../ShCommonStrings.uni
5640 - $(EDK_SOURCE)\Foundation
5641 - $(EDK_SOURCE)\Foundation\Include
5642 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5643 - $(EDK_SOURCE)\Foundation\Efi
5644 - $(EDK_SOURCE)\Foundation\Efi\Include
5645 - $(EDK_SOURCE)\Foundation\FrameWork
5646 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5647 - $(EDK_SOURCE)\Foundation\Core\Dxe
5651 + $(EDK_SOURCE)/Foundation
5652 + $(EDK_SOURCE)/Foundation/Include
5653 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5654 + $(EDK_SOURCE)/Foundation/Efi
5655 + $(EDK_SOURCE)/Foundation/Efi/Include
5656 + $(EDK_SOURCE)/Foundation/FrameWork
5657 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5658 + $(EDK_SOURCE)/Foundation/Core/Dxe
5663 diff --git a/tzone/timezone.inf b/tzone/timezone.inf
5664 index 57834c6..525a9cb 100644
5665 --- a/tzone/timezone.inf
5666 +++ b/tzone/timezone.inf
5667 @@ -25,24 +25,24 @@ FILE_GUID = E27B12B9-2647-4af3-ADBC-B5AB5FB50421
5668 COMPONENT_TYPE = APPLICATION
5671 - ..\ShCommonStrings.uni
5672 + ../ShCommonStrings.uni
5681 - $(EDK_SOURCE)\Foundation
5682 - $(EDK_SOURCE)\Foundation\Include
5683 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5684 - $(EDK_SOURCE)\Foundation\Efi
5685 - $(EDK_SOURCE)\Foundation\Efi\Include
5686 - $(EDK_SOURCE)\Foundation\FrameWork
5687 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5688 - $(EDK_SOURCE)\Foundation\Core\Dxe
5692 + $(EDK_SOURCE)/Foundation
5693 + $(EDK_SOURCE)/Foundation/Include
5694 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5695 + $(EDK_SOURCE)/Foundation/Efi
5696 + $(EDK_SOURCE)/Foundation/Efi/Include
5697 + $(EDK_SOURCE)/Foundation/FrameWork
5698 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5699 + $(EDK_SOURCE)/Foundation/Core/Dxe
5704 diff --git a/unload/unload.c b/unload/unload.c
5705 index 100f16b..daeaf05 100644
5706 --- a/unload/unload.c
5707 +++ b/unload/unload.c
5708 @@ -110,7 +110,7 @@ _UnloadGetDriverName (
5709 *DriverName = LibDevicePathToStr (Image->FilePath);
5712 - LibGetDriverName(DriverBindingHandle, Language, DriverName);
5713 + LibGetDriverName(DriverBindingHandle, (CHAR8*)Language, DriverName);
5717 @@ -184,7 +184,7 @@ Returns:
5720 BestDeviceName = NULL;
5721 - Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, &DevicePath);
5722 + Status = BS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID**)&DevicePath);
5725 PrintToken (STRING_TOKEN (STR_UNLOAD_CONTROLLER_NAME), HiiUnloadHandle);
5726 @@ -242,14 +242,14 @@ Returns:
5728 Status = _UnloadGetDriverName (
5729 DriverBindingHandleBuffer[Index],
5735 if (DriverName == NULL) {
5736 Status = _UnloadGetDriverName (
5737 DriverBindingHandleBuffer[Index],
5743 @@ -436,7 +436,7 @@ Returns:
5745 Status = _UnloadGetDriverName (
5752 @@ -450,7 +450,7 @@ Returns:
5754 Status = _UnloadGetDriverName (
5761 @@ -628,7 +628,7 @@ Returns:
5763 if (Prot->Handles[Index] == Handle) {
5764 Dump = Verbose ? Prot->DumpInfo : Prot->DumpToken;
5765 - Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, &Interface);
5766 + Status = BS->HandleProtocol (Handle, &Prot->ProtocolId, (VOID**)&Interface);
5767 if (!EFI_ERROR (Status)) {
5769 for (Index1 = 0; Index1 < ProtocolBufferCount; Index1++) {
5770 @@ -676,7 +676,7 @@ Returns:
5774 - Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], &Interface);
5775 + Status = BS->HandleProtocol (Handle, ProtocolBuffer[Index1], (VOID**)&Interface);
5776 if (!EFI_ERROR (Status)) {
5777 PrintToken (STRING_TOKEN (STR_UNLOAD_TWO_VARS_HG_NEW), HiiUnloadHandle, ProtocolBuffer[Index1], Interface);
5779 diff --git a/unload/unload.inf b/unload/unload.inf
5780 index e91869e..d3475e0 100644
5781 --- a/unload/unload.inf
5782 +++ b/unload/unload.inf
5783 @@ -39,23 +39,23 @@ FILE_GUID = 409060F4-3E7B-44cc-9DFD-A8E807474888
5784 COMPONENT_TYPE = APPLICATION
5787 - ..\ShCommonStrings.uni
5788 + ../ShCommonStrings.uni
5796 - $(EDK_SOURCE)\Foundation
5797 - $(EDK_SOURCE)\Foundation\Include
5798 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5799 - $(EDK_SOURCE)\Foundation\Efi
5800 - $(EDK_SOURCE)\Foundation\Efi\Include
5801 - $(EDK_SOURCE)\Foundation\FrameWork
5802 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5803 - $(EDK_SOURCE)\Foundation\Core\Dxe
5807 + $(EDK_SOURCE)/Foundation
5808 + $(EDK_SOURCE)/Foundation/Include
5809 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5810 + $(EDK_SOURCE)/Foundation/Efi
5811 + $(EDK_SOURCE)/Foundation/Efi/Include
5812 + $(EDK_SOURCE)/Foundation/FrameWork
5813 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5814 + $(EDK_SOURCE)/Foundation/Core/Dxe
5819 diff --git a/ver/Ebc/verEbc.c b/ver/Ebc/verEbc.c
5820 index 1d7368d..9518e14 100644
5821 --- a/ver/Ebc/verEbc.c
5822 +++ b/ver/Ebc/verEbc.c
5823 @@ -45,7 +45,7 @@ DisplayExtendedVersionInfo (
5824 Status = BS->LocateProtocol (
5825 &gEfiEbcProtocolGuid,
5830 if (EFI_ERROR (Status)) {
5832 diff --git a/ver/Ver.inf b/ver/Ver.inf
5833 index 56a135d..574a297 100644
5836 @@ -40,33 +40,33 @@ COMPONENT_TYPE = APPLICATION
5840 - ..\ShCommonStrings.uni
5841 + ../ShCommonStrings.uni
5846 -[sources.ia32,sources.x64]
5848 +[sources.ia32,sources.x64,sources.ARM]
5863 - $(EDK_SOURCE)\Foundation
5864 - $(EDK_SOURCE)\Foundation\Include
5865 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5866 - $(EDK_SOURCE)\Foundation\Efi
5867 - $(EDK_SOURCE)\Foundation\Efi\Include
5868 - $(EDK_SOURCE)\Foundation\FrameWork
5869 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5870 - $(EDK_SOURCE)\Foundation\Core\Dxe
5874 + $(EDK_SOURCE)/Foundation
5875 + $(EDK_SOURCE)/Foundation/Include
5876 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5877 + $(EDK_SOURCE)/Foundation/Efi
5878 + $(EDK_SOURCE)/Foundation/Efi/Include
5879 + $(EDK_SOURCE)/Foundation/FrameWork
5880 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5881 + $(EDK_SOURCE)/Foundation/Core/Dxe
5886 diff --git a/vol/Vol.inf b/vol/Vol.inf
5887 index 71d2cb5..c05ddaf 100644
5890 @@ -40,24 +40,24 @@ COMPONENT_TYPE = APPLICATION
5894 - ..\ShCommonStrings.uni
5895 + ../ShCommonStrings.uni
5904 - $(EDK_SOURCE)\Foundation
5905 - $(EDK_SOURCE)\Foundation\Include
5906 - $(EDK_SOURCE)\Foundation\Include\IndustryStandard
5907 - $(EDK_SOURCE)\Foundation\Efi
5908 - $(EDK_SOURCE)\Foundation\Efi\Include
5909 - $(EDK_SOURCE)\Foundation\FrameWork
5910 - $(EDK_SOURCE)\Foundation\FrameWork\Include
5911 - $(EDK_SOURCE)\Foundation\Core\Dxe
5915 + $(EDK_SOURCE)/Foundation
5916 + $(EDK_SOURCE)/Foundation/Include
5917 + $(EDK_SOURCE)/Foundation/Include/IndustryStandard
5918 + $(EDK_SOURCE)/Foundation/Efi
5919 + $(EDK_SOURCE)/Foundation/Efi/Include
5920 + $(EDK_SOURCE)/Foundation/FrameWork
5921 + $(EDK_SOURCE)/Foundation/FrameWork/Include
5922 + $(EDK_SOURCE)/Foundation/Core/Dxe
5927 diff --git a/vol/vol.c b/vol/vol.c
5928 index 47a4de0..13be9fb 100644
5931 @@ -32,7 +32,7 @@ extern UINT8 STRING_ARRAY_NAME[];
5933 #include STRING_DEFINES_FILE
5935 -EFI_HII_HANDLE HiiHandle;
5936 +STATIC EFI_HII_HANDLE HiiHandle;
5937 EFI_GUID EfiVolGuid = EFI_VOL_GUID;
5938 SHELL_VAR_CHECK_ITEM VolCheckList[] = {