git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8616
6f19259b-4bc3-4df7-8a09-
765794883524
PDB_NAME_TO_MOD_HANDLE *Array;\r
UINTN PreviousSize;\r
PDB_NAME_TO_MOD_HANDLE *TempArray;\r
PDB_NAME_TO_MOD_HANDLE *Array;\r
UINTN PreviousSize;\r
PDB_NAME_TO_MOD_HANDLE *TempArray;\r
\r
Array = mPdbNameModHandleArray;\r
for (Index = 0; Index < mPdbNameModHandleArraySize; Index++, Array++) {\r
\r
Array = mPdbNameModHandleArray;\r
for (Index = 0; Index < mPdbNameModHandleArraySize; Index++, Array++) {\r
//\r
// Make a copy of the stirng and store the ModHandle\r
//\r
//\r
// Make a copy of the stirng and store the ModHandle\r
//\r
- Array->PdbPointer = mWinNt->HeapAlloc ( mWinNt->GetProcessHeap (),\r
+ Handle = mWinNt->GetProcessHeap ();\r
+ Array->PdbPointer = mWinNt->HeapAlloc ( Handle,\r
HEAP_ZERO_MEMORY,\r
AsciiStrLen (ImageContext->PdbPointer) + 1\r
); \r
HEAP_ZERO_MEMORY,\r
AsciiStrLen (ImageContext->PdbPointer) + 1\r
); \r
IN EFI_RESET_TYPE ResetType,\r
IN EFI_STATUS ResetStatus,\r
IN UINTN DataSize,\r
IN EFI_RESET_TYPE ResetType,\r
IN EFI_STATUS ResetStatus,\r
IN UINTN DataSize,\r
- IN CHAR16 *ResetData OPTIONAL\r
+ IN VOID *ResetData OPTIONAL\r
IN EFI_RESET_TYPE ResetType,\r
IN EFI_STATUS ResetStatus,\r
IN UINTN DataSize,\r
IN EFI_RESET_TYPE ResetType,\r
IN EFI_STATUS ResetStatus,\r
IN UINTN DataSize,\r
- IN CHAR16 *ResetData OPTIONAL\r
+ IN VOID *ResetData OPTIONAL\r
}, // Lock\r
//\r
// Private functions\r
}, // Lock\r
//\r
// Private functions\r
//\r
// Get the WinNT thunk\r
//\r
//\r
// Get the WinNT thunk\r
//\r
- Status = gBS->LocateProtocol (&gEfiWinNtThunkProtocolGuid, NULL, &This->WinNtThunk);\r
+ Status = gBS->LocateProtocol (&gEfiWinNtThunkProtocolGuid, NULL, (VOID **)&This->WinNtThunk);\r
\r
if (EFI_ERROR (Status)) {\r
return Status;\r
\r
if (EFI_ERROR (Status)) {\r
return Status;\r
//\r
#define SNP_NT32_DRIVER_SIGNATURE SIGNATURE_32 ('W', 'S', 'N', 'P')\r
\r
//\r
#define SNP_NT32_DRIVER_SIGNATURE SIGNATURE_32 ('W', 'S', 'N', 'P')\r
\r
-typedef struct _SNPNT32_GLOBAL_DATA {\r
+struct _SNPNT32_GLOBAL_DATA {\r
UINT32 Signature;\r
\r
//\r
UINT32 Signature;\r
\r
//\r
SNPNT32_INITIALIZE_GLOBAL_DATA InitializeGlobalData;\r
SNPNT32_INITIALIZE_INSTANCE_DATA InitializeInstanceData;\r
SNPNT32_CLOSE_INSTANCE CloseInstance;\r
SNPNT32_INITIALIZE_GLOBAL_DATA InitializeGlobalData;\r
SNPNT32_INITIALIZE_INSTANCE_DATA InitializeInstanceData;\r
SNPNT32_CLOSE_INSTANCE CloseInstance;\r
-} SNPNT32_GLOBAL_DATA;\r
\r
//\r
// Instance data for each fake SNP instance\r
//\r
#define SNP_NT32_INSTANCE_SIGNATURE SIGNATURE_32 ('w', 'S', 'N', 'P')\r
\r
\r
//\r
// Instance data for each fake SNP instance\r
//\r
#define SNP_NT32_INSTANCE_SIGNATURE SIGNATURE_32 ('w', 'S', 'N', 'P')\r
\r
-typedef struct _SNPNT32_INSTANCE_DATA {\r
+struct _SNPNT32_INSTANCE_DATA {\r
UINT32 Signature;\r
\r
//\r
UINT32 Signature;\r
\r
//\r
//\r
// Private functions\r
//\r
//\r
// Private functions\r
//\r
-} SNPNT32_INSTANCE_DATA;\r
\r
#define SNP_NT32_INSTANCE_DATA_FROM_SNP_THIS(a) \\r
CR ( \\r
\r
#define SNP_NT32_INSTANCE_DATA_FROM_SNP_THIS(a) \\r
CR ( \\r
{\r
EFI_STATUS Status;\r
LARGE_INTEGER LargeInt;\r
{\r
EFI_STATUS Status;\r
LARGE_INTEGER LargeInt;\r
\r
LargeInt.QuadPart = DistanceToMove;\r
Status = EFI_SUCCESS;\r
\r
LargeInt.QuadPart = DistanceToMove;\r
Status = EFI_SUCCESS;\r
- if (LargeInt.LowPart == -1 &&\r
- (ErrorCode = Private->WinNtThunk->GetLastError ()) != NO_ERROR) {\r
+ if (LargeInt.LowPart == -1 && Private->WinNtThunk->GetLastError () != NO_ERROR) {\r
Status = EFI_INVALID_PARAMETER;\r
}\r
\r
Status = EFI_INVALID_PARAMETER;\r
}\r
\r
// Set toggle state\r
// \r
case VK_NUMLOCK: \r
// Set toggle state\r
// \r
case VK_NUMLOCK: \r
- Private->NumLock = !Private->NumLock;\r
+ Private->NumLock = (BOOLEAN)(!Private->NumLock);\r
break;\r
case VK_SCROLL:\r
break;\r
case VK_SCROLL:\r
- Private->ScrollLock = !Private->ScrollLock;\r
+ Private->ScrollLock = (BOOLEAN)(!Private->ScrollLock);\r
break; \r
case VK_CAPITAL:\r
break; \r
case VK_CAPITAL:\r
- Private->CapsLock = !Private->CapsLock;\r
+ Private->CapsLock = (BOOLEAN)(!Private->CapsLock);\r
{\r
MSG Message;\r
GOP_PRIVATE_DATA *Private;\r
{\r
MSG Message;\r
GOP_PRIVATE_DATA *Private;\r
RECT Rect;\r
\r
Private = (GOP_PRIVATE_DATA *) lpParameter;\r
RECT Rect;\r
\r
Private = (GOP_PRIVATE_DATA *) lpParameter;\r
// Class, including the callback function, unless the Class is unregistered and\r
// successfully registered again.\r
//\r
// Class, including the callback function, unless the Class is unregistered and\r
// successfully registered again.\r
//\r
- Atom = Private->WinNtThunk->RegisterClassEx (&Private->WindowsClass);\r
+ Private->WinNtThunk->RegisterClassEx (&Private->WindowsClass);\r
\r
//\r
// Setting Rect values to allow for the AdjustWindowRect to provide\r
\r
//\r
// Setting Rect values to allow for the AdjustWindowRect to provide\r
GOP_PRIVATE_DATA *Private\r
)\r
{\r
GOP_PRIVATE_DATA *Private\r
)\r
{\r
- UINT32 UnregisterReturn;\r
-\r
if (!Private->HardwareNeedsStarting) {\r
//\r
// BugBug: Shutdown GOP Hardware and any child devices.\r
if (!Private->HardwareNeedsStarting) {\r
//\r
// BugBug: Shutdown GOP Hardware and any child devices.\r
Private->WinNtThunk->TlsFree (mTlsIndex);\r
mTlsIndex = TLS_OUT_OF_INDEXES;\r
\r
Private->WinNtThunk->TlsFree (mTlsIndex);\r
mTlsIndex = TLS_OUT_OF_INDEXES;\r
\r
- UnregisterReturn = Private->WinNtThunk->UnregisterClass (\r
- Private->WindowsClass.lpszClassName,\r
- Private->WindowsClass.hInstance\r
- );\r
+ Private->WinNtThunk->UnregisterClass (\r
+ Private->WindowsClass.lpszClassName,\r
+ Private->WindowsClass.hInstance\r
+ );\r
}\r
\r
WinNtGopDestroySimpleTextInForWindow (Private);\r
}\r
\r
WinNtGopDestroySimpleTextInForWindow (Private);\r
IN VOID *Context\r
)\r
{\r
IN VOID *Context\r
)\r
{\r
- EFI_STATUS Status;\r
- Status = WinNtGopDestructor (Context);\r
+ WinNtGopDestructor (Context);\r
DevicePathNodeLength((EFI_DEVICE_PATH_PROTOCOL *)UartNode) != sizeof(UART_DEVICE_PATH)) {\r
goto Error;\r
}\r
DevicePathNodeLength((EFI_DEVICE_PATH_PROTOCOL *)UartNode) != sizeof(UART_DEVICE_PATH)) {\r
goto Error;\r
}\r
- if (UartNode->BaudRate < 0 || UartNode->BaudRate > SERIAL_PORT_MAX_BAUD_RATE) {\r
+ if ( UartNode->BaudRate > SERIAL_PORT_MAX_BAUD_RATE) {\r
goto Error;\r
}\r
if (UartNode->Parity < NoParity || UartNode->Parity > SpaceParity) {\r
goto Error;\r
}\r
if (UartNode->Parity < NoParity || UartNode->Parity > SpaceParity) {\r
Node.BaudRate,\r
SerialIo->Mode->ReceiveFifoDepth,\r
SerialIo->Mode->Timeout,\r
Node.BaudRate,\r
SerialIo->Mode->ReceiveFifoDepth,\r
SerialIo->Mode->Timeout,\r
+ (EFI_PARITY_TYPE)Node.Parity,\r
+ (EFI_STOP_BITS_TYPE)Node.StopBits\r
This->Mode->BaudRate,\r
This->Mode->ReceiveFifoDepth,\r
This->Mode->Timeout,\r
This->Mode->BaudRate,\r
This->Mode->ReceiveFifoDepth,\r
This->Mode->Timeout,\r
+ (EFI_PARITY_TYPE)This->Mode->Parity,\r
(UINT8) This->Mode->DataBits,\r
(UINT8) This->Mode->DataBits,\r
+ (EFI_STOP_BITS_TYPE)This->Mode->StopBits\r
}\r
\r
if (Parity == DefaultParity) {\r
}\r
\r
if (Parity == DefaultParity) {\r
- Parity = FixedPcdGet8 (PcdUartDefaultParity);\r
+ Parity = (EFI_PARITY_TYPE) (FixedPcdGet8 (PcdUartDefaultParity));\r
}\r
\r
if (DataBits == 0) {\r
}\r
\r
if (DataBits == 0) {\r
BOOLEAN LoopFinish;\r
UINTN InfoSize;\r
EFI_FILE_INFO *Info;\r
BOOLEAN LoopFinish;\r
UINTN InfoSize;\r
EFI_FILE_INFO *Info;\r
\r
//\r
// Check for obvious invalid parameters.\r
\r
//\r
// Check for obvious invalid parameters.\r
StrCpy (NewPrivateFile->FilePath, PrivateFile->FilePath);\r
}\r
\r
StrCpy (NewPrivateFile->FilePath, PrivateFile->FilePath);\r
}\r
\r
- NewPrivateFile->FileName = AllocatePool (StrSize (NewPrivateFile->FilePath) + StrSize (L"\\") + StrSize (FileName));\r
+ Size = StrSize (NewPrivateFile->FilePath);\r
+ Size += StrSize (L"\\");\r
+ Size += StrSize (FileName);\r
+ NewPrivateFile->FileName = AllocatePool (Size);\r
if (NewPrivateFile->FileName == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Done;\r
if (NewPrivateFile->FileName == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Done;\r
//\r
if (NewPrivateFile->IsDirectoryPath) {\r
\r
//\r
if (NewPrivateFile->IsDirectoryPath) {\r
\r
- TempFileName = AllocatePool (StrSize (NewPrivateFile->FileName) + StrSize (L"\\*"));\r
+ Size = StrSize (NewPrivateFile->FileName);\r
+ Size += StrSize (L"\\*");\r
+ TempFileName = AllocatePool (Size);\r
if (TempFileName == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Done;\r
if (TempFileName == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Done;\r
}\r
\r
Status = PrivateFile->WinNtThunk->ReadFile (\r
}\r
\r
Status = PrivateFile->WinNtThunk->ReadFile (\r
- PrivateFile->LHandle,\r
- Buffer,\r
- *BufferSize,\r
- BufferSize,\r
- NULL\r
- ) ? EFI_SUCCESS : EFI_DEVICE_ERROR;\r
+ PrivateFile->LHandle,\r
+ Buffer,\r
+ *BufferSize,\r
+ (LPDWORD)BufferSize,\r
+ NULL\r
+ ) ? EFI_SUCCESS : EFI_DEVICE_ERROR;\r
}\r
\r
Status = PrivateFile->WinNtThunk->WriteFile (\r
}\r
\r
Status = PrivateFile->WinNtThunk->WriteFile (\r
- PrivateFile->LHandle,\r
- Buffer,\r
- *BufferSize,\r
- BufferSize,\r
- NULL\r
- ) ? EFI_SUCCESS : EFI_DEVICE_ERROR;\r
+ PrivateFile->LHandle,\r
+ Buffer,\r
+ *BufferSize,\r
+ (LPDWORD)BufferSize,\r
+ NULL\r
+ ) ? EFI_SUCCESS : EFI_DEVICE_ERROR;\r
\r
Done:\r
gBS->RestoreTPL (OldTpl);\r
\r
Done:\r
gBS->RestoreTPL (OldTpl);\r
UINT32 PosHigh;\r
CHAR16 *FileName;\r
EFI_TPL OldTpl;\r
UINT32 PosHigh;\r
CHAR16 *FileName;\r
EFI_TPL OldTpl;\r
\r
if (This == NULL) {\r
return EFI_INVALID_PARAMETER;\r
\r
if (This == NULL) {\r
return EFI_INVALID_PARAMETER;\r
- FileName = AllocatePool (StrSize (PrivateFile->FileName) + StrSize (L"\\*"));\r
+ Size = StrSize (PrivateFile->FileName);\r
+ Size += StrSize (L"\\*");\r
+ FileName = AllocatePool (Size);\r
if (FileName == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Done;\r
if (FileName == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Done;\r
} else {\r
PosHigh = (UINT32) RShiftU64 (Position, 32);\r
\r
} else {\r
PosHigh = (UINT32) RShiftU64 (Position, 32);\r
\r
- PosLow = PrivateFile->WinNtThunk->SetFilePointer (PrivateFile->LHandle, (ULONG) Position, &PosHigh, FILE_BEGIN);\r
+ PosLow = PrivateFile->WinNtThunk->SetFilePointer (PrivateFile->LHandle, (ULONG) Position, (PLONG)&PosHigh, FILE_BEGIN);\r
}\r
\r
Status = (PosLow == 0xFFFFFFFF) ? EFI_DEVICE_ERROR : EFI_SUCCESS;\r
}\r
\r
Status = (PosLow == 0xFFFFFFFF) ? EFI_DEVICE_ERROR : EFI_SUCCESS;\r
\r
PositionHigh = 0;\r
*Position = PrivateFile->WinNtThunk->SetFilePointer (\r
\r
PositionHigh = 0;\r
*Position = PrivateFile->WinNtThunk->SetFilePointer (\r
- PrivateFile->LHandle,\r
- 0,\r
- &PositionHigh,\r
- FILE_CURRENT\r
- );\r
+ PrivateFile->LHandle,\r
+ 0,\r
+ (PLONG)&PositionHigh,\r
+ FILE_CURRENT\r
+ );\r
\r
Status = *Position == 0xffffffff ? EFI_DEVICE_ERROR : EFI_SUCCESS;\r
if (EFI_ERROR (Status)) {\r
\r
Status = *Position == 0xffffffff ? EFI_DEVICE_ERROR : EFI_SUCCESS;\r
if (EFI_ERROR (Status)) {\r
//\r
NtStatus = PrivateFile->WinNtThunk->GetDiskFreeSpace (\r
DriveNameFound ? DriveName : NULL,\r
//\r
NtStatus = PrivateFile->WinNtThunk->GetDiskFreeSpace (\r
DriveNameFound ? DriveName : NULL,\r
- &SectorsPerCluster,\r
- &BytesPerSector,\r
- &FreeClusters,\r
- &TotalClusters\r
+ (LPDWORD)&SectorsPerCluster,\r
+ (LPDWORD)&BytesPerSector,\r
+ (LPDWORD)&FreeClusters,\r
+ (LPDWORD)&TotalClusters\r
);\r
if (DriveName) {\r
FreePool (DriveName);\r
);\r
if (DriveName) {\r
FreePool (DriveName);\r
WIN32_FIND_DATA FindBuf;\r
EFI_FILE_SYSTEM_INFO *NewFileSystemInfo;\r
EFI_TPL OldTpl;\r
WIN32_FIND_DATA FindBuf;\r
EFI_FILE_SYSTEM_INFO *NewFileSystemInfo;\r
EFI_TPL OldTpl;\r
\r
//\r
// Check for invalid parameters.\r
\r
//\r
// Check for invalid parameters.\r
//\r
// Make full pathname from new filename and rootpath.\r
//\r
//\r
// Make full pathname from new filename and rootpath.\r
//\r
- if (NewFileInfo->FileName[0] == '\\') {\r
- NewFileName = AllocatePool (StrSize (PrivateRoot->FilePath) + StrSize (L"\\") + StrSize (NewFileInfo->FileName));\r
- if (NewFileName == NULL) {\r
- Status = EFI_OUT_OF_RESOURCES;\r
- goto Done;\r
- }\r
+ Size = StrSize (PrivateRoot->FilePath);\r
+ Size += StrSize (L"\\");\r
+ Size += StrSize (NewFileInfo->FileName);\r
+ NewFileName = AllocatePool (Size);\r
+ if (NewFileName == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ goto Done;\r
+ }\r
- StrCpy (NewFileName, PrivateRoot->FilePath);\r
- StrCat (NewFileName, L"\\");\r
+ StrCpy (NewFileName, PrivateRoot->FilePath);\r
+ StrCat (NewFileName, L"\\");\r
+ if (NewFileInfo->FileName[0] == '\\') {\r
StrCat (NewFileName, NewFileInfo->FileName + 1);\r
} else {\r
StrCat (NewFileName, NewFileInfo->FileName + 1);\r
} else {\r
- NewFileName = AllocatePool (StrSize (PrivateFile->FilePath) + StrSize (L"\\") + StrSize (NewFileInfo->FileName));\r
- if (NewFileName == NULL) {\r
- Status = EFI_OUT_OF_RESOURCES;\r
- goto Done;\r
- }\r
-\r
- StrCpy (NewFileName, PrivateFile->FilePath);\r
- StrCat (NewFileName, L"\\");\r
StrCat (NewFileName, NewFileInfo->FileName);\r
}\r
\r
StrCat (NewFileName, NewFileInfo->FileName);\r
}\r
\r
\r
StrCpy (PrivateFile->FileName, NewFileName);\r
\r
\r
StrCpy (PrivateFile->FileName, NewFileName);\r
\r
- TempFileName = AllocatePool (StrSize (NewFileName) + StrSize (L"\\*"));\r
+ Size = StrSize (NewFileName);\r
+ Size += StrSize (L"\\*");\r
+ TempFileName = AllocatePool (Size);\r
\r
StrCpy (TempFileName, NewFileName);\r
\r
\r
StrCpy (TempFileName, NewFileName);\r
\r
- TempFileName = AllocatePool (StrSize (OldFileName) + StrSize (L"\\*"));\r
+ Size = StrSize (OldFileName);\r
+ Size += StrSize (L"\\*");\r
+ TempFileName = AllocatePool (Size);\r
\r
StrCpy (TempFileName, OldFileName);\r
\r
\r
StrCpy (TempFileName, OldFileName);\r
\r