Ros-diffs August 2019

ros-diffs@reactos.org

36 participants
281 discussions

[reactos] 01/02: [REACTOS] Fix MSVC printf format warnings

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58588b76e2bd464ebed4c… commit 58588b76e2bd464ebed4c04791135ae3ad6f3205 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 20 17:42:27 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 15:24:12 2019 +0200 [REACTOS] Fix MSVC printf format warnings --- base/applications/cmdutils/fsutil/fsinfo.c | 2 +- dll/cpl/timedate/timedate.c | 4 ++-- drivers/storage/class/disk_new/pnp.c | 12 ++++++------ drivers/wdm/audio/backpln/audio_test/audio_test.c | 2 +- modules/rosapps/applications/cmdutils/vcdcli/vcdcli.c | 2 +- .../applications/devutils/shlextdbg/shlextdbg.cpp | 2 +- modules/rosapps/applications/net/netreg/netreg.cpp | 2 +- modules/rosapps/applications/rosinternals/nfi/nfi.c | 2 +- .../applications/rosinternals/ntfsinfo/ntfsinfo.c | 6 +++--- .../applications/sysutils/utils/driver/load/load.c | 2 +- .../applications/sysutils/utils/driver/unload/unload.c | 2 +- modules/rosapps/lib/win32err/win32err.c | 2 +- .../apitests/ntdll/RtlDosPathNameToNtPathName_U.c | 18 +++++++++--------- modules/rostests/apitests/user32/CreateDialog.c | 2 +- modules/rostests/apitests/user32/LoadImage.c | 4 ++-- modules/rostests/tests/mmixer_test/test.c | 4 ++-- sdk/lib/rtl/actctx.c | 2 +- 17 files changed, 35 insertions(+), 35 deletions(-) diff --git a/base/applications/cmdutils/fsutil/fsinfo.c b/base/applications/cmdutils/fsutil/fsinfo.c index 2e5edd9a5e5..65bae0fde32 100644 --- a/base/applications/cmdutils/fsutil/fsinfo.c +++ b/base/applications/cmdutils/fsutil/fsinfo.c @@ -352,7 +352,7 @@ ValidateSizes(ULONG Length, DWORD ProcCount, DWORD BytesRead, DWORD SpecificSize /* Check whether this covers a specific entry and a generic entry for every processor */ if ((sizeof(FILESYSTEM_STATISTICS) + SpecificSize) * ProcCount > BytesRead) { - _ftprintf(stderr, _T("Only performed a partial read: %lu (expected: %lu)\n"), BytesRead, (sizeof(FILESYSTEM_STATISTICS) + SpecificSize)); + _ftprintf(stderr, _T("Only performed a partial read: %lu (expected: %Iu)\n"), BytesRead, (sizeof(FILESYSTEM_STATISTICS) + SpecificSize)); return 1; } diff --git a/dll/cpl/timedate/timedate.c b/dll/cpl/timedate/timedate.c index 52a03f41feb..5557a95f5b9 100644 --- a/dll/cpl/timedate/timedate.c +++ b/dll/cpl/timedate/timedate.c @@ -28,7 +28,7 @@ VOID DisplayWin32ErrorDbg(DWORD dwErrorCode, const char *file, int line) VOID DisplayWin32Error(DWORD dwErrorCode) #endif { - LPVOID lpMsgBuf; + PWSTR lpMsgBuf; #if DBG WCHAR szMsg[255]; #endif @@ -44,7 +44,7 @@ VOID DisplayWin32Error(DWORD dwErrorCode) NULL ); #if DBG - if (swprintf(szMsg, L"%hs:%d: %s", file, line, lpMsgBuf)) + if (swprintf(szMsg, L"%hs:%d: %s", file, line, (PWSTR)lpMsgBuf)) { MessageBoxW(NULL, szMsg, NULL, MB_OK | MB_ICONERROR); } diff --git a/drivers/storage/class/disk_new/pnp.c b/drivers/storage/class/disk_new/pnp.c index 84f7f0f55c0..ecccc515b3f 100644 --- a/drivers/storage/class/disk_new/pnp.c +++ b/drivers/storage/class/disk_new/pnp.c @@ -724,13 +724,13 @@ Return Value: if((Pdo->Characteristics & FILE_REMOVABLE_MEDIA) == 0) { if (diskData->PartitionStyle == PARTITION_STYLE_MBR) { - sprintf(string, "S%08lx_O%I64lx_L%I64lx", + sprintf(string, "S%08lx_O%I64x_L%I64x", diskData->Mbr.Signature, - commonExtension->StartingOffset, - commonExtension->PartitionLength); + commonExtension->StartingOffset.QuadPart, + commonExtension->PartitionLength.QuadPart); } else { sprintf(string, - "S%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02xS_O%I64lx_L%I64lx", + "S%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02xS_O%I64x_L%I64x", diskData->Efi.DiskId.Data1, diskData->Efi.DiskId.Data2, diskData->Efi.DiskId.Data3, @@ -742,8 +742,8 @@ Return Value: diskData->Efi.DiskId.Data4[5], diskData->Efi.DiskId.Data4[6], diskData->Efi.DiskId.Data4[7], - commonExtension->StartingOffset, - commonExtension->PartitionLength); + commonExtension->StartingOffset.QuadPart, + commonExtension->PartitionLength.QuadPart); } } else { sprintf(string, "RM"); diff --git a/drivers/wdm/audio/backpln/audio_test/audio_test.c b/drivers/wdm/audio/backpln/audio_test/audio_test.c index da71a08dc06..cd2fc11a8d8 100644 --- a/drivers/wdm/audio/backpln/audio_test/audio_test.c +++ b/drivers/wdm/audio/backpln/audio_test/audio_test.c @@ -110,7 +110,7 @@ TestKs() // Allocate a KS Pin Connection Request Structure // Length = sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX); - printf("Length %ld KSPIN %u DATAFORMAT %u\n", Length, sizeof(KSPIN_CONNECT), sizeof(KSDATAFORMAT_WAVEFORMATEX)); + printf("Length %ld KSPIN %Iu DATAFORMAT %Iu\n", Length, sizeof(KSPIN_CONNECT), sizeof(KSDATAFORMAT_WAVEFORMATEX)); PinConnect = (PKSPIN_CONNECT)HeapAlloc(GetProcessHeap(), 0, Length); DataFormat = (PKSDATAFORMAT_WAVEFORMATEX)(PinConnect + 1); diff --git a/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.c b/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.c index db13566cb3a..f01b13265f7 100644 --- a/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.c +++ b/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.c @@ -362,7 +362,7 @@ _tmain(int argc, const TCHAR *argv[]) hFile = CreateFile(argv[3], FILE_READ_DATA, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { - _ftprintf(stderr, _T("Failed to open file: %s\n"), GetLastError()); + _ftprintf(stderr, _T("Failed to open file: %lu\n"), GetLastError()); return 1; } diff --git a/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp b/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp index b4d24a397a9..3e1a29feea2 100644 --- a/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp +++ b/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp @@ -164,7 +164,7 @@ static BOOL CALLBACK cb_AddPage(HPROPSHEETPAGE page, LPARAM lParam) g_Pages.Add(page); if (lParam != (LPARAM)&g_Pages) { - wprintf(L"Propsheet failed to pass lParam, got: 0x%x\n", lParam); + wprintf(L"Propsheet failed to pass lParam, got: 0x%Ix\n", lParam); } return TRUE; } diff --git a/modules/rosapps/applications/net/netreg/netreg.cpp b/modules/rosapps/applications/net/netreg/netreg.cpp index f7f5105761e..de836c972b1 100644 --- a/modules/rosapps/applications/net/netreg/netreg.cpp +++ b/modules/rosapps/applications/net/netreg/netreg.cpp @@ -417,7 +417,7 @@ SOCKET make_listening_socket( int port ) { fprintf( stderr, "Creating the listener\n" ); SOCKET l = socket( PF_INET, SOCK_STREAM, 0 ); - fprintf( stderr, "Socket %x\n", l ); + fprintf( stderr, "Socket %I64x\n", l ); if( l == INVALID_SOCKET ) return l; if( bind( l, (struct sockaddr *)&sa, sizeof( sa ) ) < 0 ) { diff --git a/modules/rosapps/applications/rosinternals/nfi/nfi.c b/modules/rosapps/applications/rosinternals/nfi/nfi.c index 377826b4375..aa0767effd6 100644 --- a/modules/rosapps/applications/rosinternals/nfi/nfi.c +++ b/modules/rosapps/applications/rosinternals/nfi/nfi.c @@ -618,7 +618,7 @@ _tmain(int argc, const TCHAR *argv[]) OutputBuffer = HeapAlloc(GetProcessHeap(), 0, VolumeInfo.BytesPerFileRecordSegment + sizeof(NTFS_FILE_RECORD_OUTPUT_BUFFER)); if (OutputBuffer == NULL) { - _ftprintf(stderr, _T("Failed to allocate %x bytes\n"), VolumeInfo.BytesPerFileRecordSegment + sizeof(NTFS_FILE_RECORD_OUTPUT_BUFFER)); + _ftprintf(stderr, _T("Failed to allocate %Ix bytes\n"), VolumeInfo.BytesPerFileRecordSegment + sizeof(NTFS_FILE_RECORD_OUTPUT_BUFFER)); CloseHandle(VolumeHandle); return 1; } diff --git a/modules/rosapps/applications/rosinternals/ntfsinfo/ntfsinfo.c b/modules/rosapps/applications/rosinternals/ntfsinfo/ntfsinfo.c index c7022505c89..7db72c5f9c4 100644 --- a/modules/rosapps/applications/rosinternals/ntfsinfo/ntfsinfo.c +++ b/modules/rosapps/applications/rosinternals/ntfsinfo/ntfsinfo.c @@ -135,7 +135,7 @@ _tmain(int argc, const TCHAR *argv[]) _tprintf(_T("Total sectors\t\t: %I64u\n"), VolumeInfo.NumberSectors.QuadPart); _tprintf(_T("Total clusters\t\t: %I64u\n"), VolumeInfo.TotalClusters.QuadPart); _tprintf(_T("Free clusters\t\t: %I64u\n"), VolumeInfo.FreeClusters.QuadPart); - _tprintf(_T("Free space\t\t: %I64u MB (%u%% of drive)\n"), (VolumeInfo.FreeClusters.QuadPart * VolumeInfo.BytesPerCluster) >> 20, (VolumeInfo.FreeClusters.QuadPart * 100) / VolumeInfo.TotalClusters.QuadPart); + _tprintf(_T("Free space\t\t: %I64u MB (%I64u%% of drive)\n"), (VolumeInfo.FreeClusters.QuadPart * VolumeInfo.BytesPerCluster) >> 20, (VolumeInfo.FreeClusters.QuadPart * 100) / VolumeInfo.TotalClusters.QuadPart); _tprintf(_T("\nAllocation Size\n---------------\n")); _tprintf(_T("Bytes per sector\t: %lu\n"), VolumeInfo.BytesPerSector); @@ -144,11 +144,11 @@ _tmain(int argc, const TCHAR *argv[]) _tprintf(_T("Clusters per MFT record\t: %lu\n"), VolumeInfo.ClustersPerFileRecordSegment); _tprintf(_T("\nMFT Information\n---------------\n")); - _tprintf(_T("MFT size\t\t: %I64u MB (%u%% of drive)\n"), VolumeInfo.MftValidDataLength.QuadPart >> 20, (VolumeInfo.MftValidDataLength.QuadPart * 100) / VolumeSize); + _tprintf(_T("MFT size\t\t: %I64u MB (%I64u%% of drive)\n"), VolumeInfo.MftValidDataLength.QuadPart >> 20, (VolumeInfo.MftValidDataLength.QuadPart * 100) / VolumeSize); _tprintf(_T("MFT start cluster\t: %I64u\n"), VolumeInfo.MftStartLcn.QuadPart); _tprintf(_T("MFT zone clusters\t: %I64u - %I64u\n"), VolumeInfo.MftZoneStart.QuadPart, VolumeInfo.MftZoneEnd.QuadPart); MftClusters = VolumeInfo.MftZoneEnd.QuadPart - VolumeInfo.MftZoneStart.QuadPart; - _tprintf(_T("MFT zone size\t\t: %I64u MB (%u%% of drive)\n"), (MftClusters * VolumeInfo.BytesPerCluster) >> 20, (MftClusters * 100) / VolumeInfo.TotalClusters.QuadPart); + _tprintf(_T("MFT zone size\t\t: %I64u MB (%I64u%% of drive)\n"), (MftClusters * VolumeInfo.BytesPerCluster) >> 20, (MftClusters * 100) / VolumeInfo.TotalClusters.QuadPart); _tprintf(_T("MFT mirror start\t: %I64u\n"), VolumeInfo.Mft2StartLcn.QuadPart); _tprintf(_T("\nMeta-Data files\n---------------\n")); diff --git a/modules/rosapps/applications/sysutils/utils/driver/load/load.c b/modules/rosapps/applications/sysutils/utils/driver/load/load.c index 3ec87d32f46..557815adf4a 100644 --- a/modules/rosapps/applications/sysutils/utils/driver/load/load.c +++ b/modules/rosapps/applications/sysutils/utils/driver/load/load.c @@ -21,7 +21,7 @@ int wmain(int argc, WCHAR * argv[]) wsprintf(ServiceName.Buffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\%S", argv[1]); - wprintf(L"%s %u %d\n", ServiceName.Buffer, ServiceName.Length, wcslen(ServiceName.Buffer)); + wprintf(L"%s %u %Id\n", ServiceName.Buffer, ServiceName.Length, wcslen(ServiceName.Buffer)); Status = NtLoadDriver(&ServiceName); free(ServiceName.Buffer); if (!NT_SUCCESS(Status)) diff --git a/modules/rosapps/applications/sysutils/utils/driver/unload/unload.c b/modules/rosapps/applications/sysutils/utils/driver/unload/unload.c index 8f6e655b251..6bc68c1890d 100644 --- a/modules/rosapps/applications/sysutils/utils/driver/unload/unload.c +++ b/modules/rosapps/applications/sysutils/utils/driver/unload/unload.c @@ -21,7 +21,7 @@ int wmain(int argc, WCHAR * argv[]) wsprintf(ServiceName.Buffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\%S", argv[1]); - wprintf(L"%s %d %d\n", ServiceName.Buffer, ServiceName.Length, wcslen(ServiceName.Buffer)); + wprintf(L"%s %d %Ud\n", ServiceName.Buffer, ServiceName.Length, wcslen(ServiceName.Buffer)); Status = NtUnloadDriver(&ServiceName); free(ServiceName.Buffer); if (!NT_SUCCESS(Status)) diff --git a/modules/rosapps/lib/win32err/win32err.c b/modules/rosapps/lib/win32err/win32err.c index c68a20f3582..f05fbc6bef5 100644 --- a/modules/rosapps/lib/win32err/win32err.c +++ b/modules/rosapps/lib/win32err/win32err.c @@ -46,7 +46,7 @@ PrintWin32Error( DWORD ErrorCode ) { - PVOID lpMsgBuf; + LPWSTR lpMsgBuf; FormatMessageW( (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM), diff --git a/modules/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c b/modules/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c index 915b460bdcc..59a15523c1b 100644 --- a/modules/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c +++ b/modules/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c @@ -146,8 +146,8 @@ static void test2(LPCWSTR pwsz, LPCWSTR pwszExpected, LPCWSTR pwszExpectedPartNa if (!bOK) { printf("input: : %2Iu chars \"%S\"\n", wcslen(pwsz), pwsz); - printf("Expected: %2u chars \"%S\"\n", lenExp, pwszExpected); - printf("Actual : %2u chars \"%S\"\n", lenAct, lenAct ? pwszActual : L"(null)"); + printf("Expected: %2Iu chars \"%S\"\n", lenExp, pwszExpected); + printf("Actual : %2Iu chars \"%S\"\n", lenAct, lenAct ? pwszActual : L"(null)"); return; } } else @@ -156,8 +156,8 @@ static void test2(LPCWSTR pwsz, LPCWSTR pwszExpected, LPCWSTR pwszExpectedPartNa PWSTR pwszActual = NtName.Buffer + 4; const size_t lenAct = (NtName.Length - 8) / 2; check_result(FALSE, "Unexpected NtName (expected NULL)"); - printf("input: : %2u chars \"%S\"\n", wcslen(pwsz), pwsz); - printf("Actual : %2u chars \"%S\"\n", lenAct, pwszActual); + printf("input: : %2Iu chars \"%S\"\n", wcslen(pwsz), pwsz); + printf("Actual : %2Iu chars \"%S\"\n", lenAct, pwszActual); } if (pwszExpectedPartName) { @@ -167,17 +167,17 @@ static void test2(LPCWSTR pwsz, LPCWSTR pwszExpected, LPCWSTR pwszExpectedPartNa wcscmp(PartName, pwszExpectedPartName) == 0; check_result(bOK, "PartName does not match expected"); if (!bOK) { - printf("input: : %2u chars \"%S\"\n", wcslen(pwsz), pwsz); - printf("Expected: %2u chars \"%S\"\n", lenExp, pwszExpectedPartName); - printf("Actual : %2u chars \"%S\"\n", lenAct, lenAct ? PartName : L"(null)"); + printf("input: : %2Iu chars \"%S\"\n", wcslen(pwsz), pwsz); + printf("Expected: %2Iu chars \"%S\"\n", lenExp, pwszExpectedPartName); + printf("Actual : %2Iu chars \"%S\"\n", lenAct, lenAct ? PartName : L"(null)"); return; } } else if (PartName) { check_result(FALSE, "Unexpected PartName (expected NULL)."); - printf("input: : %2u chars \"%S\"\n", wcslen(pwsz), pwsz); - printf("Actual : %2u chars %S\n", wcslen(PartName), PartName); + printf("input: : %2Iu chars \"%S\"\n", wcslen(pwsz), pwsz); + printf("Actual : %2Iu chars %S\n", wcslen(PartName), PartName); } } diff --git a/modules/rostests/apitests/user32/CreateDialog.c b/modules/rostests/apitests/user32/CreateDialog.c index 0d7d718cc0c..136439ef655 100644 --- a/modules/rostests/apitests/user32/CreateDialog.c +++ b/modules/rostests/apitests/user32/CreateDialog.c @@ -60,7 +60,7 @@ void DumpMsgList(const char* lstName, const tagMsgList *ml) for (i1 = 0; i1 < ml->msgCount; i1++) { dlgProcName = (ml->msgList[i1].DlgProc) ? "DlgProc" : "WndProc"; - printf("#%.3d %s, msg 0x%x, wParam 0x%x, lParam 0x%Ix, result %d\n", + printf("#%.3d %s, msg 0x%x, wParam 0x%Ix, lParam 0x%Ix, result %d\n", i1, dlgProcName, ml->msgList[i1].msg, diff --git a/modules/rostests/apitests/user32/LoadImage.c b/modules/rostests/apitests/user32/LoadImage.c index 586e86988ad..0c0feaf4785 100644 --- a/modules/rostests/apitests/user32/LoadImage.c +++ b/modules/rostests/apitests/user32/LoadImage.c @@ -23,7 +23,7 @@ START_TEST(LoadImage) HDC hdc, hdcScreen; ICONINFO ii; - sscanf (test_argv[2], "%lu", (ULONG_PTR*) &arg); + sscanf (test_argv[2], "%Iu", (ULONG_PTR*) &arg); ok(handle != arg, "Got same handles\n"); @@ -81,7 +81,7 @@ START_TEST(LoadImage) } /* Start child process */ - sprintf( path, "%s LoadImage %lu", test_argv[0], (ULONG_PTR)handle ); + sprintf( path, "%s LoadImage %Iu", test_argv[0], (ULONG_PTR)handle ); memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); CreateProcessA( NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi ); diff --git a/modules/rostests/tests/mmixer_test/test.c b/modules/rostests/tests/mmixer_test/test.c index b44feeba94a..cb5338fc9b1 100644 --- a/modules/rostests/tests/mmixer_test/test.c +++ b/modules/rostests/tests/mmixer_test/test.c @@ -23,9 +23,9 @@ MixerThread(LPVOID Parameter) while(GetMessage(&msg, NULL, 0, 0)) { if (msg.message == MM_MIXM_CONTROL_CHANGE) - printf("got MM_MIXM_CONTROL_CHANGE wParam %x lParam %lx\n", msg.wParam, msg.lParam); + printf("got MM_MIXM_CONTROL_CHANGE wParam %Ix lParam %Ix\n", msg.wParam, msg.lParam); else if (msg.message == MM_MIXM_LINE_CHANGE) - printf("got MM_MIXM_LINE_CHANGE wParam %x lParam %lx\n", msg.wParam, msg.lParam); + printf("got MM_MIXM_LINE_CHANGE wParam %Ix lParam %Ix\n", msg.wParam, msg.lParam); } return 1; } diff --git a/sdk/lib/rtl/actctx.c b/sdk/lib/rtl/actctx.c index 8df2af46fc9..62a6af88c8d 100644 --- a/sdk/lib/rtl/actctx.c +++ b/sdk/lib/rtl/actctx.c @@ -3022,7 +3022,7 @@ static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assem if ((!((ULONG_PTR)resname >> 16))) { - sprintfW(resnameBuf, L"#%u", (ULONG_PTR)resname); + sprintfW(resnameBuf, L"#%u", PtrToUlong(resname)); resptr = resnameBuf; }

5 years, 2 months

[reactos] 01/01: [DBGHELP_APITEST] Add rsym+pdb tests on loaded modules Also reorder some stuff to make the tests more alike

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b8a1a612b2d428a31a89d… commit b8a1a612b2d428a31a89d2f72b31000563c93c30 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Mar 27 23:09:36 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 15 15:21:55 2019 +0200 [DBGHELP_APITEST] Add rsym+pdb tests on loaded modules Also reorder some stuff to make the tests more alike --- modules/rostests/apitests/dbghelp/data.c | 17 +-- modules/rostests/apitests/dbghelp/pdb.c | 139 +++++++++++++------------ modules/rostests/apitests/dbghelp/rsym.c | 172 +++++++++++++++---------------- 3 files changed, 167 insertions(+), 161 deletions(-) diff --git a/modules/rostests/apitests/dbghelp/data.c b/modules/rostests/apitests/dbghelp/data.c index 13c823df490..48985517700 100644 --- a/modules/rostests/apitests/dbghelp/data.c +++ b/modules/rostests/apitests/dbghelp/data.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS api tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Support functions for dbghelp api test - * PROGRAMMER: Mark Jansen + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Support functions for dbghelp api test + * COPYRIGHT: Copyright 2017-2019 Mark Jansen (mark.jansen(a)reactos.org) */ #include <windows.h> @@ -69,7 +69,7 @@ static int extract_one(const char* filename, const char* resid) } -int extract_msvc_exe(char szFile[MAX_PATH]) +int extract_msvc_dll(char szFile[MAX_PATH], char szPath[MAX_PATH]) { const char* dir = tmpdir(); BOOL ret = CreateDirectoryA(dir, NULL); @@ -83,10 +83,11 @@ int extract_msvc_exe(char szFile[MAX_PATH]) if (!extract_one(szFile, "msvc_uffs.dll")) return 0; + strcpy(szPath, dir); return 1; } -void cleanup_msvc_exe() +void cleanup_msvc_dll() { char szFile[MAX_PATH]; BOOL ret; @@ -103,7 +104,7 @@ void cleanup_msvc_exe() ok(ret, "RemoveDirectoryA failed(%d)\n", GetLastError()); } -int extract_gcc_exe(char szFile[MAX_PATH]) +int extract_gcc_dll(char szFile[MAX_PATH]) { const char* dir = tmpdir(); BOOL ret = CreateDirectoryA(dir, NULL); @@ -116,7 +117,7 @@ int extract_gcc_exe(char szFile[MAX_PATH]) return 1; } -void cleanup_gcc_exe() +void cleanup_gcc_dll() { char szFile[MAX_PATH]; BOOL ret; diff --git a/modules/rostests/apitests/dbghelp/pdb.c b/modules/rostests/apitests/dbghelp/pdb.c index 8f4988ac0c7..dc56ae74b08 100644 --- a/modules/rostests/apitests/dbghelp/pdb.c +++ b/modules/rostests/apitests/dbghelp/pdb.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS api tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Test for dbghelp PDB functions - * PROGRAMMER: Mark Jansen + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for dbghelp PDB functions + * COPYRIGHT: Copyright 2017-2019 Mark Jansen (mark.jansen(a)reactos.org) */ #include <ntstatus.h> @@ -26,17 +26,17 @@ // data.c void create_compressed_files(); -int extract_msvc_exe(char szFile[MAX_PATH]); -void cleanup_msvc_exe(); +int extract_msvc_dll(char szFile[MAX_PATH], char szPath[MAX_PATH]); +void cleanup_msvc_dll(); static HANDLE proc() { return GetCurrentProcess(); } -static BOOL init_sym_imp(const char* file, int line) +static BOOL init_sym_imp(BOOL fInvadeProcess, const char* file, int line) { - if (!SymInitialize(proc(), NULL, FALSE)) + if (!SymInitialize(proc(), NULL, fInvadeProcess)) { DWORD err = GetLastError(); ok_(file, line)(0, "Failed to init: 0x%x\n", err); @@ -50,7 +50,7 @@ static void deinit_sym() SymCleanup(proc()); } -#define init_sym() init_sym_imp(__FILE__, __LINE__) +#define init_sym(fInvadeProcess) init_sym_imp(fInvadeProcess, __FILE__, __LINE__) #define INIT_PSYM(buff) do { \ memset((buff), 0, sizeof((buff))); \ @@ -222,7 +222,7 @@ PfnDliHook __pfnDliFailureHook2 = DliFailHook; /* Maybe our dbghelp.dll is too old? */ -static BOOL can_enumerate(HANDLE hProc, DWORD64 BaseAddress) +static BOOL supports_pdb(HANDLE hProc, DWORD64 BaseAddress) { IMAGEHLP_MODULE64 ModuleInfo; BOOL Ret; @@ -235,26 +235,13 @@ static BOOL can_enumerate(HANDLE hProc, DWORD64 BaseAddress) } -static void test_SymFromName(HANDLE hProc, const char* szModuleName) +static void test_SymFromName(HANDLE hProc, DWORD64 BaseAddress) { BOOL Ret; char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(TCHAR)]; PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)buffer; - DWORD64 BaseAddress; - DWORD dwErr; - - if (!init_sym()) - return; - - SetLastError(ERROR_SUCCESS); - BaseAddress = SymLoadModule64(hProc, NULL, szModuleName, NULL, 0x600000, 0); - dwErr = GetLastError(); - - ok_ulonglong(BaseAddress, 0x600000); - ok_hex(dwErr, ERROR_SUCCESS); - - if (!can_enumerate(hProc, BaseAddress)) + if (!supports_pdb(hProc, BaseAddress)) { skip("dbghelp.dll too old or cannot enumerate symbols!\n"); } @@ -314,29 +301,17 @@ static void test_SymFromName(HANDLE hProc, const char* szModuleName) ok_hex(pSymbol->Tag, SymTagPublicSymbol); ok_str(pSymbol->Name, "_FfsFormat@24"); } - - deinit_sym(); } -static void test_SymFromAddr(HANDLE hProc, const char* szModuleName) +static void test_SymFromAddr(HANDLE hProc, DWORD64 BaseAddress) { BOOL Ret; char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(TCHAR)]; PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)buffer; - DWORD64 BaseAddress, Displacement; + DWORD64 Displacement; DWORD dwErr; - if (!init_sym()) - return; - - SetLastError(ERROR_SUCCESS); - BaseAddress = SymLoadModule64(hProc, NULL, szModuleName, NULL, 0x600000, 0); - dwErr = GetLastError(); - - ok_ulonglong(BaseAddress, 0x600000); - ok_hex(dwErr, ERROR_SUCCESS); - /* No address found before load address of module */ Displacement = 0; INIT_PSYM(buffer); @@ -417,7 +392,7 @@ static void test_SymFromAddr(HANDLE hProc, const char* szModuleName) ok_hex(pSymbol->Tag, SymTagFunction); ok_str(pSymbol->Name, "FfsChkdsk"); - if (!can_enumerate(hProc, BaseAddress)) + if (!supports_pdb(hProc, BaseAddress)) { skip("dbghelp.dll too old or cannot read this symbol!\n"); } @@ -435,8 +410,6 @@ static void test_SymFromAddr(HANDLE hProc, const char* szModuleName) ok_hex(pSymbol->Tag, SymTagPublicSymbol); ok_str(pSymbol->Name, "__imp__DbgPrint"); } - - deinit_sym(); } typedef struct _test_context @@ -484,25 +457,15 @@ static BOOL CALLBACK EnumSymProc(PSYMBOL_INFO pSymInfo, ULONG SymbolSize, PVOID return TRUE; } -static void test_SymEnumSymbols(HANDLE hProc, const char* szModuleName) +static void test_SymEnumSymbols(HANDLE hProc, DWORD64 BaseAddress) { BOOL Ret; - DWORD dwErr; - test_context ctx; - if (!init_sym()) - return; - ctx.Index = 0; - SetLastError(ERROR_SUCCESS); - ctx.BaseAddress = SymLoadModule64(hProc, NULL, szModuleName, NULL, 0x600000, 0); - dwErr = GetLastError(); - - ok_ulonglong(ctx.BaseAddress, 0x600000); - ok_hex(dwErr, ERROR_SUCCESS); + ctx.BaseAddress = BaseAddress; - if (!can_enumerate(hProc, ctx.BaseAddress)) + if (!supports_pdb(hProc, ctx.BaseAddress)) { skip("dbghelp.dll too old or cannot enumerate symbols!\n"); } @@ -512,8 +475,6 @@ static void test_SymEnumSymbols(HANDLE hProc, const char* szModuleName) ok_int(Ret, TRUE); ok_int(ctx.Index, ARRAYSIZE(test_data)); } - - deinit_sym(); } typedef struct _symregcallback_context @@ -524,7 +485,6 @@ typedef struct _symregcallback_context static struct _symregcallback_test_data { ULONG ActionCode; - const char* Name; } symregcallback_test_data[] = { { CBA_DEFERRED_SYMBOL_LOAD_CANCEL }, { CBA_DEFERRED_SYMBOL_LOAD_START }, @@ -567,7 +527,7 @@ static void test_SymRegCallback(HANDLE hProc, const char* szModuleName, BOOL tes ctx.idx = 0; ctx.isANSI = testANSI; - if (!init_sym()) + if (!init_sym(FALSE)) return; if (testANSI) @@ -604,14 +564,19 @@ static void test_SymRegCallback(HANDLE hProc, const char* szModuleName, BOOL tes START_TEST(pdb) { char szDllName[MAX_PATH]; - //create_compressed_files(); + char szDllPath[MAX_PATH], szOldDir[MAX_PATH]; +#ifdef _M_IX86 + HMODULE hMod; +#endif + DWORD64 BaseAddress; + DWORD dwErr, Options; - DWORD Options = SymGetOptions(); + Options = SymGetOptions(); Options &= ~(SYMOPT_UNDNAME); //Options |= SYMOPT_DEBUG; SymSetOptions(Options); - if (!extract_msvc_exe(szDllName)) + if (!extract_msvc_dll(szDllName, szDllPath)) { ok(0, "Failed extracting files\n"); return; @@ -619,12 +584,54 @@ START_TEST(pdb) init_dbghelp_version(); - test_SymFromName(proc(), szDllName); - test_SymFromAddr(proc(), szDllName); - test_SymEnumSymbols(proc(), szDllName); + if (init_sym(FALSE)) + { + SetLastError(ERROR_SUCCESS); + BaseAddress = SymLoadModule64(proc(), NULL, szDllName, NULL, 0x600000, 0); + dwErr = GetLastError(); + + ok_ulonglong(BaseAddress, 0x600000); + ok_hex(dwErr, ERROR_SUCCESS); + + if (BaseAddress == 0x600000) + { + trace("Module loaded by SymLoadModule64\n"); + test_SymFromName(proc(), BaseAddress); + test_SymFromAddr(proc(), BaseAddress); + test_SymEnumSymbols(proc(), BaseAddress); + } + + deinit_sym(); + } + + /* This needs to load the module by itself */ test_SymRegCallback(proc(), szDllName, TRUE); test_SymRegCallback(proc(), szDllName, FALSE); - cleanup_msvc_exe(); +#ifdef _M_IX86 + hMod = LoadLibraryA(szDllName); + if (hMod) + { + BaseAddress = (DWORD64)(DWORD_PTR)hMod; + /* Make sure we can find the pdb */ + GetCurrentDirectoryA(_countof(szOldDir), szOldDir); + SetCurrentDirectoryA(szDllPath); + /* Invade process */ + if (init_sym(TRUE)) + { + trace("Module loaded by LoadLibraryA\n"); + test_SymFromName(proc(), BaseAddress); + test_SymFromAddr(proc(), BaseAddress); + test_SymEnumSymbols(proc(), BaseAddress); + + deinit_sym(); + } + /* Restore working dir */ + SetCurrentDirectoryA(szOldDir); + + FreeLibrary(hMod); + } +#endif + cleanup_msvc_dll(); } diff --git a/modules/rostests/apitests/dbghelp/rsym.c b/modules/rostests/apitests/dbghelp/rsym.c index b471849e4ad..16b759c9418 100644 --- a/modules/rostests/apitests/dbghelp/rsym.c +++ b/modules/rostests/apitests/dbghelp/rsym.c @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS api tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Test for dbghelp rsym functions - * PROGRAMMER: Mark Jansen - * - * These tests are based on the PDB tests. + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for dbghelp rsym functions + * COPYRIGHT: Copyright 2017-2019 Mark Jansen (mark.jansen(a)reactos.org) + * + * These tests are based on the PDB tests. */ #include <ntstatus.h> @@ -45,17 +45,17 @@ // data.c void dump_rsym(const char* filename); -int extract_gcc_exe(char szFile[MAX_PATH]); -void cleanup_gcc_exe(); +int extract_gcc_dll(char szFile[MAX_PATH]); +void cleanup_gcc_dll(); static HANDLE proc() { return GetCurrentProcess(); } -static BOOL init_sym_imp(const char* file, int line) +static BOOL init_sym_imp(BOOL fInvadeProcess, const char* file, int line) { - if (!SymInitialize(proc(), NULL, FALSE)) + if (!SymInitialize(proc(), NULL, fInvadeProcess)) { DWORD err = GetLastError(); ok_(file, line)(0, "Failed to init: 0x%x\n", err); @@ -69,6 +69,14 @@ static void deinit_sym() SymCleanup(proc()); } +#define init_sym(fInvadeProcess) init_sym_imp(fInvadeProcess, __FILE__, __LINE__) + +#define INIT_PSYM(buff) do { \ + memset((buff), 0, sizeof((buff))); \ + ((PSYMBOL_INFO)(buff))->SizeOfStruct = sizeof(SYMBOL_INFO); \ + ((PSYMBOL_INFO)(buff))->MaxNameLen = MAX_SYM_NAME; \ +} while (0) + static BOOL supports_rsym(HANDLE hProc, DWORD64 BaseAddress) { IMAGEHLP_MODULE64 ModuleInfo; @@ -83,36 +91,19 @@ static BOOL supports_rsym(HANDLE hProc, DWORD64 BaseAddress) ModuleInfo.CVSig == ('R' | ('S' << 8) | ('Y' << 16) | ('M' << 24)); } -#define init_sym() init_sym_imp(__FILE__, __LINE__) -#define INIT_PSYM(buff) do { \ - memset((buff), 0, sizeof((buff))); \ - ((PSYMBOL_INFO)(buff))->SizeOfStruct = sizeof(SYMBOL_INFO); \ - ((PSYMBOL_INFO)(buff))->MaxNameLen = MAX_SYM_NAME; \ -} while (0) - - -static void test_SymFromName(HANDLE hProc, const char* szModuleName) +static void test_SymFromName(HANDLE hProc, DWORD64 BaseAddress) { BOOL Ret; char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(TCHAR)]; PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)buffer; - DWORD64 BaseAddress; - DWORD dwErr; - - if (!init_sym()) - return; - - SetLastError(ERROR_SUCCESS); - BaseAddress = SymLoadModule64(hProc, NULL, szModuleName, NULL, 0x600000, 0); - dwErr = GetLastError(); - - if (supports_rsym(hProc, BaseAddress)) + if (!supports_rsym(hProc, BaseAddress)) + { + skip("dbghelp.dll cannot parse rsym\n"); + } + else { - ok_ulonglong(BaseAddress, 0x600000); - ok_hex(dwErr, ERROR_SUCCESS); - INIT_PSYM(buffer); Ret = SymFromName(hProc, "DllMain", pSymbol); ok_int(Ret, TRUE); @@ -140,35 +131,23 @@ static void test_SymFromName(HANDLE hProc, const char* szModuleName) ok_hex(pSymbol->Tag, SymTagFunction); ok_str(pSymbol->Name, "FfsFormat"); } - else - { - skip("dbghelp.dll cannot parse rsym\n"); - } - - deinit_sym(); } -static void test_SymFromAddr(HANDLE hProc, const char* szModuleName) +static void test_SymFromAddr(HANDLE hProc, DWORD64 BaseAddress) { BOOL Ret; char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(TCHAR)]; PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)buffer; - DWORD64 BaseAddress, Displacement; + DWORD64 Displacement; DWORD dwErr; - if (!init_sym()) - return; - - SetLastError(ERROR_SUCCESS); - BaseAddress = SymLoadModule64(hProc, NULL, szModuleName, NULL, 0x600000, 0); - dwErr = GetLastError(); - - if (supports_rsym(hProc, BaseAddress)) + if (!supports_rsym(hProc, BaseAddress)) + { + skip("dbghelp.dll cannot parse rsym\n"); + } + else { - ok_ulonglong(BaseAddress, 0x600000); - ok_hex(dwErr, ERROR_SUCCESS); - /* No address found before load address of module */ Displacement = 0; INIT_PSYM(buffer); @@ -241,12 +220,6 @@ static void test_SymFromAddr(HANDLE hProc, const char* szModuleName) ok_hex(pSymbol->Tag, SymTagPublicSymbol); ok_str(pSymbol->Name, "_head_dll_ntdll_libntdll_a"); } - else - { - skip("dbghelp.dll cannot parse rsym\n"); - } - - deinit_sym(); } typedef struct _test_context @@ -286,7 +259,7 @@ static struct _test_data { { 0x4000, 0, SymTagPublicSymbol, "_head_dll_ntdll_libntdll_a", __LINE__ }, }; -BOOL CALLBACK EnumSymProc(PSYMBOL_INFO pSymInfo, ULONG SymbolSize, PVOID UserContext) +static BOOL CALLBACK EnumSymProc(PSYMBOL_INFO pSymInfo, ULONG SymbolSize, PVOID UserContext) { test_context* ctx = UserContext; @@ -310,60 +283,85 @@ BOOL CALLBACK EnumSymProc(PSYMBOL_INFO pSymInfo, ULONG SymbolSize, PVOID UserCon return TRUE; } -static void test_SymEnumSymbols(HANDLE hProc, const char* szModuleName) +static void test_SymEnumSymbols(HANDLE hProc, DWORD64 BaseAddress) { BOOL Ret; - DWORD dwErr; - test_context ctx; - if (!init_sym()) - return; - ctx.Index = 0; - SetLastError(ERROR_SUCCESS); - ctx.BaseAddress = SymLoadModule64(hProc, NULL, szModuleName, NULL, 0x600000, 0); - dwErr = GetLastError(); + ctx.BaseAddress = BaseAddress; - if (supports_rsym(hProc, ctx.BaseAddress)) + if (!supports_rsym(hProc, ctx.BaseAddress)) { - ok_ulonglong(ctx.BaseAddress, 0x600000); - ok_hex(dwErr, ERROR_SUCCESS); - - Ret = SymEnumSymbols(hProc, ctx.BaseAddress, NULL, EnumSymProc, &ctx); - ok_int(Ret, TRUE); - ok_int(ctx.Index, ARRAYSIZE(test_data)); + skip("dbghelp.dll cannot parse rsym\n"); } else { - skip("dbghelp.dll cannot parse rsym\n"); + Ret = SymEnumSymbols(hProc, ctx.BaseAddress, NULL, EnumSymProc, &ctx); + ok_int(Ret, TRUE); + ok_int(ctx.Index, ARRAYSIZE(test_data)); } - - deinit_sym(); } - - START_TEST(rsym) { char szDllName[MAX_PATH]; - //dump_rsym("R:\\src\\trunk\\reactos\\modules\\rostests\\apitests\\dbghelp\\testdata\\gcc_uffs.dll"); +#ifdef _M_IX86 + HMODULE hMod; +#endif + DWORD64 BaseAddress; + DWORD dwErr, Options; - DWORD Options = SymGetOptions(); + Options = SymGetOptions(); Options &= ~(SYMOPT_UNDNAME); //Options |= SYMOPT_DEBUG; SymSetOptions(Options); - if (!extract_gcc_exe(szDllName)) + if (!extract_gcc_dll(szDllName)) { ok(0, "Failed extracting files\n"); return; } - test_SymFromName(proc(), szDllName); - test_SymFromAddr(proc(), szDllName); - test_SymEnumSymbols(proc(), szDllName); + if (init_sym(FALSE)) + { + SetLastError(ERROR_SUCCESS); + BaseAddress = SymLoadModule64(proc(), NULL, szDllName, NULL, 0x600000, 0); + dwErr = GetLastError(); + + ok_ulonglong(BaseAddress, 0x600000); + ok_hex(dwErr, ERROR_SUCCESS); + + if (BaseAddress == 0x600000) + { + trace("Module loaded by SymLoadModule64\n"); + test_SymFromName(proc(), BaseAddress); + test_SymFromAddr(proc(), BaseAddress); + test_SymEnumSymbols(proc(), BaseAddress); + } + + deinit_sym(); + } + +#ifdef _M_IX86 + hMod = LoadLibraryA(szDllName); + if (hMod) + { + BaseAddress = (DWORD64)(DWORD_PTR)hMod; + /* Invade process */ + if (init_sym(TRUE)) + { + trace("Module loaded by LoadLibraryA\n"); + test_SymFromName(proc(), BaseAddress); + test_SymFromAddr(proc(), BaseAddress); + test_SymEnumSymbols(proc(), BaseAddress); - cleanup_gcc_exe(); + deinit_sym(); + } + + FreeLibrary(hMod); + } +#endif + cleanup_gcc_dll(); }

5 years, 2 months

[reactos] 01/01: [REACTOS] Fix SIZE_T related warnings

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7611cc2b12fa875729f11… commit 7611cc2b12fa875729f119b8febc6bc5b419d61c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun May 26 15:00:21 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 14:20:00 2019 +0200 [REACTOS] Fix SIZE_T related warnings --- base/applications/atactl/atactl.cpp | 2 +- base/applications/calc/winmain.c | 2 +- base/applications/msconfig/startuppage.c | 2 +- base/applications/msconfig_new/fileutils.c | 4 +-- base/applications/msconfig_new/utils.c | 2 +- base/applications/msconfig_new/utils.h | 2 +- base/applications/mscutils/eventvwr/eventvwr.c | 28 +++++++++------- base/applications/mstsc/connectdialog.c | 2 +- base/applications/mstsc/settings.c | 3 +- base/services/dhcpcsvc/dhcp/adapter.c | 2 +- base/services/dhcpcsvc/dhcp/socket.c | 18 ++++++++--- base/setup/lib/utils/arcname.c | 44 ++++++++++++++++++++++---- dll/ntdll/csr/connect.c | 20 +++++++++--- dll/ntdll/ldr/ldrinit.c | 2 +- dll/ntdll/ldr/ldrutils.c | 2 +- dll/ntdll/rtl/version.c | 2 +- ntoskrnl/mm/pagefile.c | 2 +- sdk/include/reactos/shellutils.h | 2 +- sdk/lib/rtl/network.c | 4 +-- sdk/lib/rtl/path.c | 2 +- win32ss/drivers/videoprt/videoprt.c | 2 +- 21 files changed, 103 insertions(+), 46 deletions(-) diff --git a/base/applications/atactl/atactl.cpp b/base/applications/atactl/atactl.cpp index 3eac17a1e9a..48a10944714 100644 --- a/base/applications/atactl/atactl.cpp +++ b/base/applications/atactl/atactl.cpp @@ -1688,7 +1688,7 @@ main ( ) { //ULONG Flags = 0; - int i; + intptr_t i; uintptr_t j; char a; int bus_id = -1; diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index 4d9376bdf91..222dff44faf 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -894,7 +894,7 @@ static void delete_stat_item(int n) static char *ReadConversion(const char *formula) { - int len = strlen(formula); + intptr_t len = strlen(formula); char *str = (char *)malloc(len+3); if (str == NULL) diff --git a/base/applications/msconfig/startuppage.c b/base/applications/msconfig/startuppage.c index 2eb5817d795..2d06cdc5e64 100644 --- a/base/applications/msconfig/startuppage.c +++ b/base/applications/msconfig/startuppage.c @@ -187,7 +187,7 @@ GetAutostartEntriesFromRegistry ( HKEY hRootKey, TCHAR* KeyName ) SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } - switch (PtrToLong(hRootKey)) + switch ((ULONG_PTR)hRootKey) { case (ULONG_PTR)HKEY_LOCAL_MACHINE: _tcscpy(Path, _T("HKLM\\\0")); diff --git a/base/applications/msconfig_new/fileutils.c b/base/applications/msconfig_new/fileutils.c index 8164a586356..45296d8a6d0 100644 --- a/base/applications/msconfig_new/fileutils.c +++ b/base/applications/msconfig_new/fileutils.c @@ -52,7 +52,7 @@ FileQueryFiles(IN LPCWSTR Path, WIN32_FIND_DATAW find_data; LPWSTR lpszQuery; - DWORD dwNumOfChars; + SIZE_T dwNumOfChars; LPWSTR lpszExpandedQuery; HANDLE search; @@ -93,7 +93,7 @@ FileQueryFiles(IN LPCWSTR Path, BOOL BackupIniFile(IN LPCWSTR lpszIniFile) { BOOL Success = FALSE; - DWORD dwNumOfChars = 0; + SIZE_T dwNumOfChars = 0; LPWSTR SourceFile, DestFile; LPWSTR lpName, lpPath; diff --git a/base/applications/msconfig_new/utils.c b/base/applications/msconfig_new/utils.c index 104081f78c5..3715fcf0da3 100644 --- a/base/applications/msconfig_new/utils.c +++ b/base/applications/msconfig_new/utils.c @@ -31,7 +31,7 @@ MemFree(IN PVOID lpMem) PVOID MemAlloc(IN DWORD dwFlags, - IN DWORD dwBytes) + IN SIZE_T dwBytes) { /* Allocate memory from the heap */ return HeapAlloc(g_hHeap, dwFlags, dwBytes); diff --git a/base/applications/msconfig_new/utils.h b/base/applications/msconfig_new/utils.h index 873cd06d755..9fb97011ef2 100644 --- a/base/applications/msconfig_new/utils.h +++ b/base/applications/msconfig_new/utils.h @@ -25,7 +25,7 @@ MemFree(IN PVOID lpMem); PVOID MemAlloc(IN DWORD dwFlags, - IN DWORD dwBytes); + IN SIZE_T dwBytes); LPWSTR FormatDateTime(IN LPSYSTEMTIME pDateTime); diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index 01c416e1a68..db6a9cf7ced 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -560,7 +560,7 @@ SaveSettings(VOID) Settings.wpPos.rcNormalPosition.bottom, Settings.wpPos.showCmd); - dwSize = wcslen(buffer) * sizeof(WCHAR); + dwSize = (DWORD)(wcslen(buffer) * sizeof(WCHAR)); RegSetValueExW(hKeyEventVwr, L"Window", 0, REG_SZ, (LPBYTE)buffer, dwSize); Quit: @@ -1173,9 +1173,9 @@ FormatInteger(LONGLONG Num, LPWSTR pwszResult, UINT cchResultMax) UINT FormatByteSize(LONGLONG cbSize, LPWSTR pwszResult, UINT cchResultMax) { - INT cchWritten; + UINT cchWritten, cchRemaining; LPWSTR pwszEnd; - size_t cchRemaining; + size_t cchStringRemaining; /* Write formated bytes count */ cchWritten = FormatInteger(cbSize, pwszResult, cchResultMax); @@ -1185,7 +1185,8 @@ FormatByteSize(LONGLONG cbSize, LPWSTR pwszResult, UINT cchResultMax) /* Copy " bytes" to buffer */ pwszEnd = pwszResult + cchWritten; cchRemaining = cchResultMax - cchWritten; - StringCchCopyExW(pwszEnd, cchRemaining, L" ", &pwszEnd, &cchRemaining, 0); + StringCchCopyExW(pwszEnd, cchRemaining, L" ", &pwszEnd, &cchStringRemaining, 0); + cchRemaining = (UINT)cchStringRemaining; cchWritten = LoadStringW(hInst, IDS_BYTES_FORMAT, pwszEnd, cchRemaining); cchRemaining -= cchWritten; @@ -1195,9 +1196,9 @@ FormatByteSize(LONGLONG cbSize, LPWSTR pwszResult, UINT cchResultMax) LPWSTR FormatFileSizeWithBytes(const PULARGE_INTEGER lpQwSize, LPWSTR pwszResult, UINT cchResultMax) { - UINT cchWritten; + UINT cchWritten, cchRemaining; LPWSTR pwszEnd; - size_t cchRemaining; + size_t cchCopyRemaining; /* Format bytes in KBs, MBs etc */ if (StrFormatByteSizeW(lpQwSize->QuadPart, pwszResult, cchResultMax) == NULL) @@ -1208,10 +1209,11 @@ FormatFileSizeWithBytes(const PULARGE_INTEGER lpQwSize, LPWSTR pwszResult, UINT return pwszResult; /* Concatenate " (" */ - cchWritten = wcslen(pwszResult); + cchWritten = (UINT)wcslen(pwszResult); pwszEnd = pwszResult + cchWritten; cchRemaining = cchResultMax - cchWritten; - StringCchCopyExW(pwszEnd, cchRemaining, L" (", &pwszEnd, &cchRemaining, 0); + StringCchCopyExW(pwszEnd, cchRemaining, L" (", &pwszEnd, &cchCopyRemaining, 0); + cchRemaining = (UINT)cchCopyRemaining; /* Write formated bytes count */ cchWritten = FormatByteSize(lpQwSize->QuadPart, pwszEnd, cchRemaining); @@ -1231,7 +1233,8 @@ GetFileTimeString(LPFILETIME lpFileTime, LPWSTR pwszResult, UINT cchResult) FILETIME ft; SYSTEMTIME st; int cchWritten; - size_t cchRemaining = cchResult; + UINT cchRemaining = cchResult; + size_t cchCopyRemaining; LPWSTR pwszEnd = pwszResult; if (!FileTimeToLocalFileTime(lpFileTime, &ft) || !FileTimeToSystemTime(&ft, &st)) @@ -1246,7 +1249,8 @@ GetFileTimeString(LPFILETIME lpFileTime, LPWSTR pwszResult, UINT cchResult) cchRemaining -= cchWritten; pwszEnd += cchWritten; - StringCchCopyExW(pwszEnd, cchRemaining, L", ", &pwszEnd, &cchRemaining, 0); + StringCchCopyExW(pwszEnd, cchRemaining, L", ", &pwszEnd, &cchCopyRemaining, 0); + cchRemaining = (UINT)cchCopyRemaining; cchWritten = GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, pwszEnd, cchRemaining); if (cchWritten) @@ -1294,7 +1298,7 @@ AllocEventLog(IN PCWSTR ComputerName OPTIONAL, IN BOOL Permanent) { PEVENTLOG EventLog; - UINT cchName; + SIZE_T cchName; /* Allocate a new event log entry */ EventLog = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*EventLog)); @@ -1467,7 +1471,7 @@ GetExpandedFilePathName( OUT LPWSTR lpFullFileName OPTIONAL, IN DWORD nSize) { - DWORD dwLength; + SIZE_T dwLength; /* Determine the needed size after expansion of any environment strings */ dwLength = ExpandEnvironmentStringsW(lpFileName, NULL, 0); diff --git a/base/applications/mstsc/connectdialog.c b/base/applications/mstsc/connectdialog.c index 67f0966d7e1..5e3d2720f69 100644 --- a/base/applications/mstsc/connectdialog.c +++ b/base/applications/mstsc/connectdialog.c @@ -505,7 +505,7 @@ AddDisplayDevice(PINFO pInfo, PDISPLAY_DEVICEW DisplayDevice) LPWSTR name = NULL; LPWSTR key = NULL; LPWSTR devid = NULL; - DWORD descriptionSize, nameSize, keySize, devidSize; + SIZE_T descriptionSize, nameSize, keySize, devidSize; PSETTINGS_ENTRY Current; DWORD ResolutionsCount = 1; DWORD i; diff --git a/base/applications/mstsc/settings.c b/base/applications/mstsc/settings.c index 6a68282d556..a38ba4d4a1a 100644 --- a/base/applications/mstsc/settings.c +++ b/base/applications/mstsc/settings.c @@ -199,7 +199,8 @@ WriteRdpFile(HANDLE hFile, PRDPSETTINGS pRdpSettings) { WCHAR line[MAXKEY + MAXVALUE + 4]; - DWORD BytesToWrite, BytesWritten; + SIZE_T BytesToWrite; + ULONG BytesWritten; BOOL bRet; INT i, k; diff --git a/base/services/dhcpcsvc/dhcp/adapter.c b/base/services/dhcpcsvc/dhcp/adapter.c index 91edf74dfd0..b2ff127285f 100644 --- a/base/services/dhcpcsvc/dhcp/adapter.c +++ b/base/services/dhcpcsvc/dhcp/adapter.c @@ -9,7 +9,7 @@ PCHAR *GetSubkeyNames( PCHAR MainKeyName, PCHAR Append ) { DWORD Error; HKEY MainKey; PCHAR *Out, OutKeyName; - DWORD CharTotal = 0, AppendLen = 1 + strlen(Append); + SIZE_T CharTotal = 0, AppendLen = 1 + strlen(Append); DWORD MaxSubKeyLen = 0, MaxSubKeys = 0; Error = RegOpenKey( HKEY_LOCAL_MACHINE, MainKeyName, &MainKey ); diff --git a/base/services/dhcpcsvc/dhcp/socket.c b/base/services/dhcpcsvc/dhcp/socket.c index 4b406f51cce..007e082d2db 100644 --- a/base/services/dhcpcsvc/dhcp/socket.c +++ b/base/services/dhcpcsvc/dhcp/socket.c @@ -12,8 +12,13 @@ ssize_t send_packet( struct interface_info *ip, struct in_addr addr, struct sockaddr_in *broadcast, struct hardware *hardware ) { - int result = - sendto( ip->wfdesc, (char *)p, size, 0, + int result; + + if (size > INT_MAX) + return WSAEMSGSIZE; + + result = + sendto( ip->wfdesc, (char *)p, (int)size, 0, (struct sockaddr *)broadcast, sizeof(*broadcast) ); if (result < 0) { @@ -32,8 +37,13 @@ ssize_t receive_packet(struct interface_info *ip, struct sockaddr_in *dest, struct hardware *hardware ) { int recv_addr_size = sizeof(*dest); - int result = - recvfrom (ip -> rfdesc, (char *)packet_data, packet_len, 0, + int result; + + if (packet_len > INT_MAX) + return WSAEMSGSIZE; + + result = + recvfrom (ip -> rfdesc, (char *)packet_data, (int)packet_len, 0, (struct sockaddr *)dest, &recv_addr_size ); return result; } diff --git a/base/setup/lib/utils/arcname.c b/base/setup/lib/utils/arcname.c index 5d63dd02b34..77e7b579c58 100644 --- a/base/setup/lib/utils/arcname.c +++ b/base/setup/lib/utils/arcname.c @@ -119,7 +119,7 @@ ArcGetNextTokenA( { NTSTATUS Status; PCSTR p = ArcPath; - ULONG SpecifierLength; + SIZE_T SpecifierLength; ULONG KeyValue; /* @@ -133,6 +133,10 @@ ArcGetNextTokenA( return NULL; /* Path starts with '(' and is thus invalid */ SpecifierLength = (p - ArcPath) * sizeof(CHAR); + if (SpecifierLength > MAXUSHORT) + { + return NULL; + } /* * The strtoul function skips any leading whitespace. @@ -163,7 +167,7 @@ ArcGetNextTokenA( if (!NT_SUCCESS(Status)) return NULL; - TokenSpecifier->Length = strlen(TokenSpecifier->Buffer) * sizeof(CHAR); + TokenSpecifier->Length = (USHORT)SpecifierLength; /* We succeeded, return the token key value */ *Key = KeyValue; @@ -180,7 +184,7 @@ ArcGetNextTokenU( { NTSTATUS Status; PCWSTR p = ArcPath; - ULONG SpecifierLength; + SIZE_T SpecifierLength; ULONG KeyValue; /* @@ -194,6 +198,10 @@ ArcGetNextTokenU( return NULL; /* Path starts with '(' and is thus invalid */ SpecifierLength = (p - ArcPath) * sizeof(WCHAR); + if (SpecifierLength > UNICODE_STRING_MAX_BYTES) + { + return NULL; + } ++p; @@ -226,7 +234,7 @@ ArcGetNextTokenU( if (!NT_SUCCESS(Status)) return NULL; - TokenSpecifier->Length = wcslen(TokenSpecifier->Buffer) * sizeof(WCHAR); + TokenSpecifier->Length = (USHORT)SpecifierLength; /* We succeeded, return the token key value */ *Key = KeyValue; @@ -308,6 +316,7 @@ ArcPathNormalize( NTSTATUS Status; PCWSTR EndOfArcName; PCWSTR p; + SIZE_T PathLength; if (NormalizedArcPath->MaximumLength < sizeof(UNICODE_NULL)) return FALSE; @@ -350,7 +359,13 @@ ArcPathNormalize( if (!NT_SUCCESS(Status)) return FALSE; - NormalizedArcPath->Length = wcslen(NormalizedArcPath->Buffer) * sizeof(WCHAR); + PathLength = wcslen(NormalizedArcPath->Buffer); + if (PathLength > UNICODE_STRING_MAX_CHARS) + { + return FALSE; + } + + NormalizedArcPath->Length = (USHORT)PathLength * sizeof(WCHAR); return TRUE; } @@ -685,6 +700,7 @@ ResolveArcNameManually( CONTROLLER_TYPE ControllerType; PERIPHERAL_TYPE PeripheralType; BOOLEAN UseSignature; + SIZE_T NameLength; PDISKENTRY DiskEntry; PPARTENTRY PartEntry = NULL; @@ -787,7 +803,13 @@ ResolveArcNameManually( } /* Update NtName length */ - NtName->Length = wcslen(NtName->Buffer) * sizeof(WCHAR); + NameLength = wcslen(NtName->Buffer); + if (NameLength > UNICODE_STRING_MAX_CHARS) + { + return STATUS_NAME_TOO_LONG; + } + + NtName->Length = (USHORT)NameLength * sizeof(WCHAR); return STATUS_SUCCESS; } @@ -802,6 +824,7 @@ ArcPathToNtPath( NTSTATUS Status; PCWSTR BeginOfPath; UNICODE_STRING ArcName; + SIZE_T PathLength; /* TODO: We should "normalize" the path, i.e. expand all the xxx() into xxx(0) */ @@ -877,7 +900,14 @@ ArcPathToNtPath( return FALSE; } } - NtPath->Length = wcslen(NtPath->Buffer) * sizeof(WCHAR); + + PathLength = wcslen(NtPath->Buffer); + if (PathLength > UNICODE_STRING_MAX_CHARS) + { + return FALSE; + } + + NtPath->Length = (USHORT)PathLength * sizeof(WCHAR); return TRUE; } diff --git a/dll/ntdll/csr/connect.c b/dll/ntdll/csr/connect.c index a1a95096e37..213b48b9457 100644 --- a/dll/ntdll/csr/connect.c +++ b/dll/ntdll/csr/connect.c @@ -39,7 +39,7 @@ NTAPI CsrpConnectToServer(IN PWSTR ObjectDirectory) { NTSTATUS Status; - ULONG PortNameLength; + SIZE_T PortNameLength; UNICODE_STRING PortName; LARGE_INTEGER CsrSectionViewSize; HANDLE CsrSectionHandle; @@ -62,10 +62,15 @@ CsrpConnectToServer(IN PWSTR ObjectDirectory) /* Calculate the total port name size */ PortNameLength = ((wcslen(ObjectDirectory) + 1) * sizeof(WCHAR)) + sizeof(CSR_PORT_NAME); + if (PortNameLength > UNICODE_STRING_MAX_BYTES) + { + DPRINT1("PortNameLength too big: %Iu", PortNameLength); + return STATUS_NAME_TOO_LONG; + } /* Set the port name */ PortName.Length = 0; - PortName.MaximumLength = PortNameLength; + PortName.MaximumLength = (USHORT)PortNameLength; /* Allocate a buffer for it */ PortName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, PortNameLength); @@ -366,11 +371,18 @@ CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, ULONG PointerCount; PULONG_PTR OffsetPointer; + /* Make sure the length is valid */ + if (DataLength > (MAXSHORT - sizeof(CSR_API_MESSAGE))) + { + DPRINT1("DataLength too big: %lu", DataLength); + return STATUS_INVALID_PARAMETER; + } + /* Fill out the Port Message Header */ ApiMessage->Header.u2.ZeroInit = 0; - ApiMessage->Header.u1.s1.TotalLength = DataLength + + ApiMessage->Header.u1.s1.TotalLength = (CSHORT)DataLength + sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data); // FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; - ApiMessage->Header.u1.s1.DataLength = DataLength + + ApiMessage->Header.u1.s1.DataLength = (CSHORT)DataLength + FIELD_OFFSET(CSR_API_MESSAGE, Data) - sizeof(ApiMessage->Header); // ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); /* Fill out the CSR Header */ diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index 39567578d91..16a3361421a 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -2365,7 +2365,7 @@ LdrpInitializeProcess(IN PCONTEXT Context, { WCHAR szCSDVersion[128]; LONG i; - ULONG Length = ARRAYSIZE(szCSDVersion) - 1; + USHORT Length = (USHORT)ARRAYSIZE(szCSDVersion) - 1; i = _snwprintf(szCSDVersion, Length, L"Service Pack %d", ((Peb->OSCSDVersion >> 8) & 0xFF)); diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 1011a850468..4c1adbf7810 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -67,7 +67,7 @@ LdrpAllocateUnicodeString(IN OUT PUNICODE_STRING StringOut, if (Length != UNICODE_STRING_MAX_BYTES) { /* It's not, so set the maximum length to be one char more */ - StringOut->MaximumLength = Length + sizeof(UNICODE_NULL); + StringOut->MaximumLength = (USHORT)Length + sizeof(UNICODE_NULL); } else { diff --git a/dll/ntdll/rtl/version.c b/dll/ntdll/rtl/version.c index ac59adab139..37f0960ec66 100644 --- a/dll/ntdll/rtl/version.c +++ b/dll/ntdll/rtl/version.c @@ -157,7 +157,7 @@ RtlGetNtVersionNumbers(OUT PULONG pMajorVersion, NTSTATUS NTAPI RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation) { - ULONG Length; + SIZE_T Length; PPEB Peb = NtCurrentPeb(); if (lpVersionInformation->dwOSVersionInfoSize != sizeof(RTL_OSVERSIONINFOW) && diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 54af15974a8..f94b65a60aa 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -357,7 +357,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, IO_STATUS_BLOCK IoStatus; PFILE_OBJECT FileObject; PMMPAGING_FILE PagingFile; - ULONG AllocMapSize; + SIZE_T AllocMapSize; ULONG Count; KPROCESSOR_MODE PreviousMode; UNICODE_STRING PageFileName; diff --git a/sdk/include/reactos/shellutils.h b/sdk/include/reactos/shellutils.h index 1e8aa314ad4..f7f6bd03353 100644 --- a/sdk/include/reactos/shellutils.h +++ b/sdk/include/reactos/shellutils.h @@ -351,7 +351,7 @@ HRESULT inline SHSetStrRet(LPSTRRET pStrRet, LPCSTR pstrValue) HRESULT inline SHSetStrRet(LPSTRRET pStrRet, LPCWSTR pwstrValue) { - ULONG cchr = wcslen(pwstrValue); + SIZE_T cchr = wcslen(pwstrValue); LPWSTR buffer = static_cast<LPWSTR>(CoTaskMemAlloc((cchr + 1) * sizeof(WCHAR))); if (buffer == NULL) return E_OUTOFMEMORY; diff --git a/sdk/lib/rtl/network.c b/sdk/lib/rtl/network.c index 025cd9ea472..44151e42b5e 100644 --- a/sdk/lib/rtl/network.c +++ b/sdk/lib/rtl/network.c @@ -515,7 +515,7 @@ RtlIpv6AddressToStringA( ASSERT(Result >= Buffer); ASSERT(Result < Buffer + RTL_NUMBER_OF(Buffer)); - Status = RtlUnicodeToMultiByteN(S, RTLIPV6A2S_MAX_LEN, NULL, Buffer, (wcslen(Buffer) + 1) * sizeof(WCHAR)); + Status = RtlUnicodeToMultiByteN(S, RTLIPV6A2S_MAX_LEN, NULL, Buffer, (ULONG)(wcslen(Buffer) + 1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) return (PSTR)~0; @@ -544,7 +544,7 @@ RtlIpv6AddressToStringExA( if (!NT_SUCCESS(Status)) return Status; - Status = RtlUnicodeToMultiByteN(AddressString, RTLIPV6A2SEX_MAX_LEN, NULL, Buffer, (wcslen(Buffer) + 1) * sizeof(WCHAR)); + Status = RtlUnicodeToMultiByteN(AddressString, RTLIPV6A2SEX_MAX_LEN, NULL, Buffer, (*AddressStringLength + 1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) return STATUS_INVALID_PARAMETER; diff --git a/sdk/lib/rtl/path.c b/sdk/lib/rtl/path.c index dd183b6801f..6031ae32087 100644 --- a/sdk/lib/rtl/path.c +++ b/sdk/lib/rtl/path.c @@ -309,7 +309,7 @@ RtlpCollapsePath(PWSTR Path, /* ULONG PathBufferSize, ULONG PathLength, */ ULONG // FIXME: Do not suppose NULL-terminated strings!! - ULONG PathLength = wcslen(Path); + SIZE_T PathLength = wcslen(Path); PWSTR EndBuffer = Path + PathLength; // Path + PathBufferSize / sizeof(WCHAR); PWSTR EndPath; diff --git a/win32ss/drivers/videoprt/videoprt.c b/win32ss/drivers/videoprt/videoprt.c index e840593be98..812f55ad6af 100644 --- a/win32ss/drivers/videoprt/videoprt.c +++ b/win32ss/drivers/videoprt/videoprt.c @@ -905,7 +905,7 @@ VideoPortScanRom( IN ULONG RomLength, IN PUCHAR String) { - ULONG StringLength; + SIZE_T StringLength; BOOLEAN Found; PUCHAR SearchLocation;

5 years, 2 months

[reactos] 06/06: [VIDEOPRT] Implement support for INT10 on x64 using the newly implemented HAL functions.

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=826704ba6b1ea46795097… commit 826704ba6b1ea46795097a1917e96f8fba4d7468 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 11 19:22:30 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 14:13:54 2019 +0200 [VIDEOPRT] Implement support for INT10 on x64 using the newly implemented HAL functions. --- win32ss/drivers/videoprt/dispatch.c | 8 +++++- win32ss/drivers/videoprt/int10.c | 49 ++++++++++++++++++++++++++----------- win32ss/drivers/videoprt/services.c | 3 +-- 3 files changed, 43 insertions(+), 17 deletions(-) diff --git a/win32ss/drivers/videoprt/dispatch.c b/win32ss/drivers/videoprt/dispatch.c index 34ae1074626..d1682549185 100644 --- a/win32ss/drivers/videoprt/dispatch.c +++ b/win32ss/drivers/videoprt/dispatch.c @@ -103,6 +103,7 @@ IntVideoPortDispatchOpen( { PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; + NTSTATUS Status; TRACE_(VIDEOPRT, "IntVideoPortDispatchOpen\n"); @@ -117,7 +118,12 @@ IntVideoPortDispatchOpen( Csrss = (PKPROCESS)PsGetCurrentProcess(); INFO_(VIDEOPRT, "Csrss %p\n", Csrss); - IntInitializeVideoAddressSpace(); + Status = IntInitializeVideoAddressSpace(); + if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "IntInitializeVideoAddressSpace() failed: 0x%lx\n", Status); + return Status; + } CsrssInitialized = TRUE; } diff --git a/win32ss/drivers/videoprt/int10.c b/win32ss/drivers/videoprt/int10.c index 8b35709fbdb..35452501421 100644 --- a/win32ss/drivers/videoprt/int10.c +++ b/win32ss/drivers/videoprt/int10.c @@ -22,6 +22,7 @@ #include "videoprt.h" #include <ndk/kefuncs.h> +#include <ndk/halfuncs.h> #define NDEBUG #include <debug.h> @@ -158,8 +159,9 @@ IntInt10AllocateBuffer( OUT PUSHORT Off, IN OUT PULONG Length) { - PVOID MemoryAddress; NTSTATUS Status; +#ifdef _M_IX86 + PVOID MemoryAddress; PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); KAPC_STATE ApcState; SIZE_T Size; @@ -205,6 +207,10 @@ IntInt10AllocateBuffer( IntDetachFromCSRSS(&CallingProcess, &ApcState); return NO_ERROR; +#else + Status = x86BiosAllocateBuffer(Length, Seg, Off); + return NT_SUCCESS(Status) ? NO_ERROR : ERROR_NOT_ENOUGH_MEMORY; +#endif } VP_STATUS @@ -214,8 +220,9 @@ IntInt10FreeBuffer( IN USHORT Seg, IN USHORT Off) { - PVOID MemoryAddress = (PVOID)((ULONG_PTR)(Seg << 4) | Off); NTSTATUS Status; +#ifdef _M_IX86 + PVOID MemoryAddress = (PVOID)((ULONG_PTR)(Seg << 4) | Off); PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); KAPC_STATE ApcState; SIZE_T Size = 0; @@ -233,6 +240,10 @@ IntInt10FreeBuffer( IntDetachFromCSRSS(&CallingProcess, &ApcState); return Status; +#else + Status = x86BiosFreeBuffer(Seg, Off); + return NT_SUCCESS(Status) ? NO_ERROR : ERROR_INVALID_PARAMETER; +#endif } VP_STATUS @@ -244,6 +255,7 @@ IntInt10ReadMemory( OUT PVOID Buffer, IN ULONG Length) { +#ifdef _M_IX86 PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); KAPC_STATE ApcState; @@ -258,6 +270,12 @@ IntInt10ReadMemory( IntDetachFromCSRSS(&CallingProcess, &ApcState); return NO_ERROR; +#else + NTSTATUS Status; + + Status = x86BiosReadMemory(Seg, Off, Buffer, Length); + return NT_SUCCESS(Status) ? NO_ERROR : ERROR_INVALID_PARAMETER; +#endif } VP_STATUS @@ -269,6 +287,7 @@ IntInt10WriteMemory( IN PVOID Buffer, IN ULONG Length) { +#ifdef _M_IX86 PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); KAPC_STATE ApcState; @@ -283,16 +302,25 @@ IntInt10WriteMemory( IntDetachFromCSRSS(&CallingProcess, &ApcState); return NO_ERROR; +#else + NTSTATUS Status; + + Status = x86BiosWriteMemory(Seg, Off, Buffer, Length); + return NT_SUCCESS(Status) ? NO_ERROR : ERROR_INVALID_PARAMETER; +#endif } -#if defined(_M_IX86) VP_STATUS NTAPI IntInt10CallBios( IN PVOID Context, IN OUT PINT10_BIOS_ARGUMENTS BiosArguments) { +#ifdef _M_AMD64 + X86_BIOS_REGISTERS BiosContext; +#else CONTEXT BiosContext; +#endif NTSTATUS Status; PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); KAPC_STATE ApcState; @@ -321,7 +349,11 @@ IntInt10CallBios( FALSE, NULL); +#ifdef _M_AMD64 + Status = x86BiosCall(0x10, &BiosContext) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; +#else Status = Ke386CallBios(0x10, &BiosContext); +#endif KeReleaseMutex(&VideoPortInt10Mutex, FALSE); @@ -346,17 +378,6 @@ IntInt10CallBios( return ERROR_INVALID_PARAMETER; } -#else -VP_STATUS -NTAPI -IntInt10CallBios( - IN PVOID Context, - IN OUT PINT10_BIOS_ARGUMENTS BiosArguments) -{ - DPRINT1("Int10 not available on non-x86!\n"); - return ERROR_INVALID_FUNCTION; -} -#endif /* PUBLIC FUNCTIONS ***********************************************************/ diff --git a/win32ss/drivers/videoprt/services.c b/win32ss/drivers/videoprt/services.c index 18290c08d26..93a7a8fc6c8 100644 --- a/win32ss/drivers/videoprt/services.c +++ b/win32ss/drivers/videoprt/services.c @@ -46,7 +46,6 @@ VideoPortQueryServices( switch (ServicesType) { -#if defined(_M_IX86) case VideoPortServicesInt10: if (Interface->Version >= VIDEO_PORT_INT10_INTERFACE_VERSION_1 || Interface->Size >= sizeof(VIDEO_PORT_INT10_INTERFACE)) @@ -64,7 +63,7 @@ VideoPortQueryServices( return NO_ERROR; } break; -#endif + case VideoPortServicesAGP: if ((Interface->Version == VIDEO_PORT_AGP_INTERFACE_VERSION_2 && Interface->Size >= sizeof(VIDEO_PORT_AGP_INTERFACE_2)) ||

5 years, 2 months

[reactos] 05/06: [VIDEOPRT] Fixes for x64

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eba27d5856367e813f13b… commit eba27d5856367e813f13b129024f4b91ae44b6e0 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 11 14:01:43 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 14:13:54 2019 +0200 [VIDEOPRT] Fixes for x64 --- win32ss/drivers/videoprt/int10.c | 46 +++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/win32ss/drivers/videoprt/int10.c b/win32ss/drivers/videoprt/int10.c index dd6526a7898..8b35709fbdb 100644 --- a/win32ss/drivers/videoprt/int10.c +++ b/win32ss/drivers/videoprt/int10.c @@ -150,7 +150,6 @@ IntInitializeVideoAddressSpace(VOID) } #endif -#if defined(_M_IX86) VP_STATUS NTAPI IntInt10AllocateBuffer( @@ -163,16 +162,18 @@ IntInt10AllocateBuffer( NTSTATUS Status; PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); KAPC_STATE ApcState; + SIZE_T Size; TRACE_(VIDEOPRT, "IntInt10AllocateBuffer\n"); IntAttachToCSRSS(&CallingProcess, &ApcState); + Size = *Length; MemoryAddress = (PVOID)0x20000; Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &MemoryAddress, 0, - Length, + &Size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); if (!NT_SUCCESS(Status)) @@ -182,20 +183,23 @@ IntInt10AllocateBuffer( return ERROR_NOT_ENOUGH_MEMORY; } - if (MemoryAddress > (PVOID)(0x100000 - *Length)) + if (MemoryAddress > (PVOID)(0x100000 - Size)) { - ZwFreeVirtualMemory(NtCurrentProcess(), &MemoryAddress, Length, - MEM_RELEASE); + ZwFreeVirtualMemory(NtCurrentProcess(), + &MemoryAddress, + &Size, + MEM_RELEASE); WARN_(VIDEOPRT, "- Unacceptable memory allocated\n"); IntDetachFromCSRSS(&CallingProcess, &ApcState); return ERROR_NOT_ENOUGH_MEMORY; } - *Seg = (USHORT)((ULONG)MemoryAddress >> 4); - *Off = (USHORT)((ULONG)MemoryAddress & 0xF); + *Length = (ULONG)Size; + *Seg = (USHORT)((ULONG_PTR)MemoryAddress >> 4); + *Off = (USHORT)((ULONG_PTR)MemoryAddress & 0xF); - INFO_(VIDEOPRT, "- Segment: %x\n", (ULONG)MemoryAddress >> 4); - INFO_(VIDEOPRT, "- Offset: %x\n", (ULONG)MemoryAddress & 0xF); + INFO_(VIDEOPRT, "- Segment: %x\n", (ULONG_PTR)MemoryAddress >> 4); + INFO_(VIDEOPRT, "- Offset: %x\n", (ULONG_PTR)MemoryAddress & 0xF); INFO_(VIDEOPRT, "- Length: %x\n", *Length); IntDetachFromCSRSS(&CallingProcess, &ApcState); @@ -210,7 +214,7 @@ IntInt10FreeBuffer( IN USHORT Seg, IN USHORT Off) { - PVOID MemoryAddress = (PVOID)((Seg << 4) | Off); + PVOID MemoryAddress = (PVOID)((ULONG_PTR)(Seg << 4) | Off); NTSTATUS Status; PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); KAPC_STATE ApcState; @@ -250,7 +254,7 @@ IntInt10ReadMemory( INFO_(VIDEOPRT, "- Length: %x\n", Length); IntAttachToCSRSS(&CallingProcess, &ApcState); - RtlCopyMemory(Buffer, (PVOID)((Seg << 4) | Off), Length); + RtlCopyMemory(Buffer, (PVOID)((ULONG_PTR)(Seg << 4) | Off), Length); IntDetachFromCSRSS(&CallingProcess, &ApcState); return NO_ERROR; @@ -275,12 +279,13 @@ IntInt10WriteMemory( INFO_(VIDEOPRT, "- Length: %x\n", Length); IntAttachToCSRSS(&CallingProcess, &ApcState); - RtlCopyMemory((PVOID)((Seg << 4) | Off), Buffer, Length); + RtlCopyMemory((PVOID)((ULONG_PTR)(Seg << 4) | Off), Buffer, Length); IntDetachFromCSRSS(&CallingProcess, &ApcState); return NO_ERROR; } +#if defined(_M_IX86) VP_STATUS NTAPI IntInt10CallBios( @@ -341,6 +346,16 @@ IntInt10CallBios( return ERROR_INVALID_PARAMETER; } +#else +VP_STATUS +NTAPI +IntInt10CallBios( + IN PVOID Context, + IN OUT PINT10_BIOS_ARGUMENTS BiosArguments) +{ + DPRINT1("Int10 not available on non-x86!\n"); + return ERROR_INVALID_FUNCTION; +} #endif /* PUBLIC FUNCTIONS ***********************************************************/ @@ -348,14 +363,12 @@ IntInt10CallBios( /* * @implemented */ - VP_STATUS NTAPI VideoPortInt10( IN PVOID HwDeviceExtension, IN PVIDEO_X86_BIOS_ARGUMENTS BiosArguments) { -#if defined(_M_IX86) INT10_BIOS_ARGUMENTS Int10BiosArguments; VP_STATUS Status; @@ -376,9 +389,4 @@ VideoPortInt10( RtlCopyMemory(BiosArguments, &Int10BiosArguments, sizeof(BiosArguments)); return Status; -#else - /* Not implemented for anything else than X86*/ - DPRINT1("Int10 not available on non-x86!\n"); - return ERROR_INVALID_FUNCTION; -#endif }

5 years, 2 months

[reactos] 04/06: [VIDEOPRT] Call IntInt10CallBios from VideoPortInt10, instead of code duplication

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=832f8863beca681d12eb7… commit 832f8863beca681d12eb7a3fba22b5a440728e6e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 11 13:49:14 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 14:13:54 2019 +0200 [VIDEOPRT] Call IntInt10CallBios from VideoPortInt10, instead of code duplication --- win32ss/drivers/videoprt/int10.c | 54 ++++++++-------------------------------- 1 file changed, 11 insertions(+), 43 deletions(-) diff --git a/win32ss/drivers/videoprt/int10.c b/win32ss/drivers/videoprt/int10.c index 82f3774067f..dd6526a7898 100644 --- a/win32ss/drivers/videoprt/int10.c +++ b/win32ss/drivers/videoprt/int10.c @@ -356,58 +356,26 @@ VideoPortInt10( IN PVIDEO_X86_BIOS_ARGUMENTS BiosArguments) { #if defined(_M_IX86) - CONTEXT BiosContext; - NTSTATUS Status; - PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); - KAPC_STATE ApcState; + INT10_BIOS_ARGUMENTS Int10BiosArguments; + VP_STATUS Status; if (!CsrssInitialized) { return ERROR_INVALID_PARAMETER; } - /* Attach to CSRSS */ - IntAttachToCSRSS(&CallingProcess, &ApcState); - - /* Clear the context */ - RtlZeroMemory(&BiosContext, sizeof(CONTEXT)); - - /* Fill out the bios arguments */ - BiosContext.Eax = BiosArguments->Eax; - BiosContext.Ebx = BiosArguments->Ebx; - BiosContext.Ecx = BiosArguments->Ecx; - BiosContext.Edx = BiosArguments->Edx; - BiosContext.Esi = BiosArguments->Esi; - BiosContext.Edi = BiosArguments->Edi; - BiosContext.Ebp = BiosArguments->Ebp; - - /* Do the ROM BIOS call */ - (void)KeWaitForMutexObject(&VideoPortInt10Mutex, - Executive, - KernelMode, - FALSE, - NULL); - Status = Ke386CallBios(0x10, &BiosContext); - KeReleaseMutex(&VideoPortInt10Mutex, FALSE); - - /* Return the arguments */ - BiosArguments->Eax = BiosContext.Eax; - BiosArguments->Ebx = BiosContext.Ebx; - BiosArguments->Ecx = BiosContext.Ecx; - BiosArguments->Edx = BiosContext.Edx; - BiosArguments->Esi = BiosContext.Esi; - BiosArguments->Edi = BiosContext.Edi; - BiosArguments->Ebp = BiosContext.Ebp; + /* Copy arguments to other format */ + RtlCopyMemory(&Int10BiosArguments, BiosArguments, sizeof(BiosArguments)); + Int10BiosArguments.SegDs = 0; + Int10BiosArguments.SegEs = 0; - /* Detach from CSRSS */ - IntDetachFromCSRSS(&CallingProcess, &ApcState); + /* Do the BIOS call */ + Status = IntInt10CallBios(NULL, &Int10BiosArguments); - if (NT_SUCCESS(Status)) - { - return NO_ERROR; - } + /* Copy results back */ + RtlCopyMemory(BiosArguments, &Int10BiosArguments, sizeof(BiosArguments)); - return ERROR_INVALID_PARAMETER; + return Status; #else /* Not implemented for anything else than X86*/ DPRINT1("Int10 not available on non-x86!\n");

5 years, 2 months

[reactos] 03/06: [VIDEOPRT] [FORMATTING] No code change

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7b3c66a42188f645f3f3… commit e7b3c66a42188f645f3f31a96e4ed2e79144a916 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 11 13:43:05 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 14:13:54 2019 +0200 [VIDEOPRT] [FORMATTING] No code change --- win32ss/drivers/videoprt/int10.c | 227 ++++++++++++++++++++++----------------- 1 file changed, 129 insertions(+), 98 deletions(-) diff --git a/win32ss/drivers/videoprt/int10.c b/win32ss/drivers/videoprt/int10.c index b8eebfa49e8..82f3774067f 100644 --- a/win32ss/drivers/videoprt/int10.c +++ b/win32ss/drivers/videoprt/int10.c @@ -41,7 +41,7 @@ IntInitializeVideoAddressSpace(VOID) LARGE_INTEGER Offset; SIZE_T ViewSize; #ifdef _M_IX86 - CHAR IVTAndBda[1024+256]; + CHAR IVTAndBda[1024 + 256]; #endif // _M_IX86 /* Free the 1MB pre-reserved region. In reality, ReactOS should simply support us mapping the view into the reserved area, but it doesn't. */ @@ -151,124 +151,134 @@ IntInitializeVideoAddressSpace(VOID) #endif #if defined(_M_IX86) -VP_STATUS NTAPI +VP_STATUS +NTAPI IntInt10AllocateBuffer( - IN PVOID Context, - OUT PUSHORT Seg, - OUT PUSHORT Off, - IN OUT PULONG Length) + IN PVOID Context, + OUT PUSHORT Seg, + OUT PUSHORT Off, + IN OUT PULONG Length) { - PVOID MemoryAddress; - NTSTATUS Status; - PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); - KAPC_STATE ApcState; - - TRACE_(VIDEOPRT, "IntInt10AllocateBuffer\n"); + PVOID MemoryAddress; + NTSTATUS Status; + PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); + KAPC_STATE ApcState; - IntAttachToCSRSS(&CallingProcess, &ApcState); + TRACE_(VIDEOPRT, "IntInt10AllocateBuffer\n"); - MemoryAddress = (PVOID)0x20000; - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &MemoryAddress, 0, - Length, MEM_COMMIT, PAGE_EXECUTE_READWRITE); + IntAttachToCSRSS(&CallingProcess, &ApcState); - if (!NT_SUCCESS(Status)) - { - WARN_(VIDEOPRT, "- ZwAllocateVirtualMemory failed\n"); - IntDetachFromCSRSS(&CallingProcess, &ApcState); - return ERROR_NOT_ENOUGH_MEMORY; - } + MemoryAddress = (PVOID)0x20000; + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + &MemoryAddress, + 0, + Length, + MEM_COMMIT, + PAGE_EXECUTE_READWRITE); + if (!NT_SUCCESS(Status)) + { + WARN_(VIDEOPRT, "- ZwAllocateVirtualMemory failed\n"); + IntDetachFromCSRSS(&CallingProcess, &ApcState); + return ERROR_NOT_ENOUGH_MEMORY; + } - if (MemoryAddress > (PVOID)(0x100000 - *Length)) - { - ZwFreeVirtualMemory(NtCurrentProcess(), &MemoryAddress, Length, - MEM_RELEASE); - WARN_(VIDEOPRT, "- Unacceptable memory allocated\n"); - IntDetachFromCSRSS(&CallingProcess, &ApcState); - return ERROR_NOT_ENOUGH_MEMORY; - } + if (MemoryAddress > (PVOID)(0x100000 - *Length)) + { + ZwFreeVirtualMemory(NtCurrentProcess(), &MemoryAddress, Length, + MEM_RELEASE); + WARN_(VIDEOPRT, "- Unacceptable memory allocated\n"); + IntDetachFromCSRSS(&CallingProcess, &ApcState); + return ERROR_NOT_ENOUGH_MEMORY; + } - *Seg = (USHORT)((ULONG)MemoryAddress >> 4); - *Off = (USHORT)((ULONG)MemoryAddress & 0xF); + *Seg = (USHORT)((ULONG)MemoryAddress >> 4); + *Off = (USHORT)((ULONG)MemoryAddress & 0xF); - INFO_(VIDEOPRT, "- Segment: %x\n", (ULONG)MemoryAddress >> 4); - INFO_(VIDEOPRT, "- Offset: %x\n", (ULONG)MemoryAddress & 0xF); - INFO_(VIDEOPRT, "- Length: %x\n", *Length); + INFO_(VIDEOPRT, "- Segment: %x\n", (ULONG)MemoryAddress >> 4); + INFO_(VIDEOPRT, "- Offset: %x\n", (ULONG)MemoryAddress & 0xF); + INFO_(VIDEOPRT, "- Length: %x\n", *Length); - IntDetachFromCSRSS(&CallingProcess, &ApcState); + IntDetachFromCSRSS(&CallingProcess, &ApcState); - return NO_ERROR; + return NO_ERROR; } -VP_STATUS NTAPI +VP_STATUS +NTAPI IntInt10FreeBuffer( - IN PVOID Context, - IN USHORT Seg, - IN USHORT Off) + IN PVOID Context, + IN USHORT Seg, + IN USHORT Off) { - PVOID MemoryAddress = (PVOID)((Seg << 4) | Off); - NTSTATUS Status; - PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); - KAPC_STATE ApcState; - SIZE_T Size = 0; - - TRACE_(VIDEOPRT, "IntInt10FreeBuffer\n"); - INFO_(VIDEOPRT, "- Segment: %x\n", Seg); - INFO_(VIDEOPRT, "- Offset: %x\n", Off); - - IntAttachToCSRSS(&CallingProcess, &ApcState); - Status = ZwFreeVirtualMemory(NtCurrentProcess(), &MemoryAddress, &Size, - MEM_RELEASE); - IntDetachFromCSRSS(&CallingProcess, &ApcState); - - return Status; + PVOID MemoryAddress = (PVOID)((Seg << 4) | Off); + NTSTATUS Status; + PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); + KAPC_STATE ApcState; + SIZE_T Size = 0; + + TRACE_(VIDEOPRT, "IntInt10FreeBuffer\n"); + INFO_(VIDEOPRT, "- Segment: %x\n", Seg); + INFO_(VIDEOPRT, "- Offset: %x\n", Off); + + IntAttachToCSRSS(&CallingProcess, &ApcState); + Status = ZwFreeVirtualMemory(NtCurrentProcess(), + &MemoryAddress, + &Size, + MEM_RELEASE); + + IntDetachFromCSRSS(&CallingProcess, &ApcState); + + return Status; } -VP_STATUS NTAPI +VP_STATUS +NTAPI IntInt10ReadMemory( - IN PVOID Context, - IN USHORT Seg, - IN USHORT Off, - OUT PVOID Buffer, - IN ULONG Length) + IN PVOID Context, + IN USHORT Seg, + IN USHORT Off, + OUT PVOID Buffer, + IN ULONG Length) { - PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); - KAPC_STATE ApcState; + PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); + KAPC_STATE ApcState; - TRACE_(VIDEOPRT, "IntInt10ReadMemory\n"); - INFO_(VIDEOPRT, "- Segment: %x\n", Seg); - INFO_(VIDEOPRT, "- Offset: %x\n", Off); - INFO_(VIDEOPRT, "- Buffer: %x\n", Buffer); - INFO_(VIDEOPRT, "- Length: %x\n", Length); + TRACE_(VIDEOPRT, "IntInt10ReadMemory\n"); + INFO_(VIDEOPRT, "- Segment: %x\n", Seg); + INFO_(VIDEOPRT, "- Offset: %x\n", Off); + INFO_(VIDEOPRT, "- Buffer: %x\n", Buffer); + INFO_(VIDEOPRT, "- Length: %x\n", Length); - IntAttachToCSRSS(&CallingProcess, &ApcState); - RtlCopyMemory(Buffer, (PVOID)((Seg << 4) | Off), Length); - IntDetachFromCSRSS(&CallingProcess, &ApcState); + IntAttachToCSRSS(&CallingProcess, &ApcState); + RtlCopyMemory(Buffer, (PVOID)((Seg << 4) | Off), Length); + IntDetachFromCSRSS(&CallingProcess, &ApcState); - return NO_ERROR; + return NO_ERROR; } -VP_STATUS NTAPI +VP_STATUS +NTAPI IntInt10WriteMemory( - IN PVOID Context, - IN USHORT Seg, - IN USHORT Off, - IN PVOID Buffer, - IN ULONG Length) + IN PVOID Context, + IN USHORT Seg, + IN USHORT Off, + IN PVOID Buffer, + IN ULONG Length) { - PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); - KAPC_STATE ApcState; + PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); + KAPC_STATE ApcState; - TRACE_(VIDEOPRT, "IntInt10WriteMemory\n"); - INFO_(VIDEOPRT, "- Segment: %x\n", Seg); - INFO_(VIDEOPRT, "- Offset: %x\n", Off); - INFO_(VIDEOPRT, "- Buffer: %x\n", Buffer); - INFO_(VIDEOPRT, "- Length: %x\n", Length); + TRACE_(VIDEOPRT, "IntInt10WriteMemory\n"); + INFO_(VIDEOPRT, "- Segment: %x\n", Seg); + INFO_(VIDEOPRT, "- Offset: %x\n", Off); + INFO_(VIDEOPRT, "- Buffer: %x\n", Buffer); + INFO_(VIDEOPRT, "- Length: %x\n", Length); - IntAttachToCSRSS(&CallingProcess, &ApcState); - RtlCopyMemory((PVOID)((Seg << 4) | Off), Buffer, Length); - IntDetachFromCSRSS(&CallingProcess, &ApcState); + IntAttachToCSRSS(&CallingProcess, &ApcState); + RtlCopyMemory((PVOID)((Seg << 4) | Off), Buffer, Length); + IntDetachFromCSRSS(&CallingProcess, &ApcState); - return NO_ERROR; + return NO_ERROR; } VP_STATUS @@ -286,7 +296,7 @@ IntInt10CallBios( IntAttachToCSRSS(&CallingProcess, &ApcState); /* Clear the context */ - RtlZeroMemory(&BiosContext, sizeof(CONTEXT)); + RtlZeroMemory(&BiosContext, sizeof(BiosContext)); /* Fill out the bios arguments */ BiosContext.Eax = BiosArguments->Eax; @@ -300,8 +310,14 @@ IntInt10CallBios( BiosContext.SegEs = BiosArguments->SegEs; /* Do the ROM BIOS call */ - (void)KeWaitForMutexObject(&VideoPortInt10Mutex, Executive, KernelMode, FALSE, NULL); + (void)KeWaitForMutexObject(&VideoPortInt10Mutex, + Executive, + KernelMode, + FALSE, + NULL); + Status = Ke386CallBios(0x10, &BiosContext); + KeReleaseMutex(&VideoPortInt10Mutex, FALSE); /* Return the arguments */ @@ -317,7 +333,12 @@ IntInt10CallBios( /* Detach and return status */ IntDetachFromCSRSS(&CallingProcess, &ApcState); - if (NT_SUCCESS(Status)) return NO_ERROR; + + if (NT_SUCCESS(Status)) + { + return NO_ERROR; + } + return ERROR_INVALID_PARAMETER; } #endif @@ -328,7 +349,8 @@ IntInt10CallBios( * @implemented */ -VP_STATUS NTAPI +VP_STATUS +NTAPI VideoPortInt10( IN PVOID HwDeviceExtension, IN PVIDEO_X86_BIOS_ARGUMENTS BiosArguments) @@ -341,7 +363,7 @@ VideoPortInt10( if (!CsrssInitialized) { - return ERROR_INVALID_PARAMETER; + return ERROR_INVALID_PARAMETER; } /* Attach to CSRSS */ @@ -360,7 +382,11 @@ VideoPortInt10( BiosContext.Ebp = BiosArguments->Ebp; /* Do the ROM BIOS call */ - (void)KeWaitForMutexObject(&VideoPortInt10Mutex, Executive, KernelMode, FALSE, NULL); + (void)KeWaitForMutexObject(&VideoPortInt10Mutex, + Executive, + KernelMode, + FALSE, + NULL); Status = Ke386CallBios(0x10, &BiosContext); KeReleaseMutex(&VideoPortInt10Mutex, FALSE); @@ -375,7 +401,12 @@ VideoPortInt10( /* Detach from CSRSS */ IntDetachFromCSRSS(&CallingProcess, &ApcState); - if (NT_SUCCESS(Status)) return NO_ERROR; + + if (NT_SUCCESS(Status)) + { + return NO_ERROR; + } + return ERROR_INVALID_PARAMETER; #else /* Not implemented for anything else than X86*/

5 years, 2 months

[reactos] 02/06: [HAL] Implement amd64 BIOS call support

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ab3246d4368eb8498ccb… commit 9ab3246d4368eb8498ccb01a4359161e4c36ef7a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 11 19:21:01 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 14:13:54 2019 +0200 [HAL] Implement amd64 BIOS call support The code uses FAST486 to emulate the BIOS code. --- hal/hal.spec | 14 +-- hal/halx86/CMakeLists.txt | 4 +- hal/halx86/amd64/x86bios.c | 280 +++++++++++++++++++++++++++++++++++-------- hal/halx86/generic/halinit.c | 4 + hal/halx86/include/halp.h | 8 ++ 5 files changed, 255 insertions(+), 55 deletions(-) diff --git a/hal/hal.spec b/hal/hal.spec index bfe55fa6b8e..4f8e0bec939 100644 --- a/hal/hal.spec +++ b/hal/hal.spec @@ -6,10 +6,10 @@ @ fastcall -arch=i386 ExTryToAcquireFastMutex(ptr) ntoskrnl.ExiTryToAcquireFastMutex @ stdcall HalAcquireDisplayOwnership(ptr) @ stdcall HalAdjustResourceList(ptr) +@ stdcall HalAllProcessorsStarted() @ stdcall HalAllocateAdapterChannel(ptr ptr long ptr) @ stdcall HalAllocateCommonBuffer(ptr long ptr long) @ stdcall HalAllocateCrashDumpRegisters(ptr ptr) -@ stdcall HalAllProcessorsStarted() @ stdcall HalAssignSlotResources(ptr ptr ptr ptr long long long ptr) @ stdcall -arch=i386,arm HalBeginSystemInterrupt(long long ptr) @ stdcall HalCalibratePerformanceCounter(ptr long long) @@ -29,8 +29,8 @@ @ stdcall HalGetInterruptVector(long long long long ptr ptr) ;@ stdcall -arch=x86_64 HalHandleMcheck() @ stdcall -arch=i386,x86_64 HalHandleNMI(ptr) -@ stdcall HalInitializeProcessor(long ptr) @ stdcall HalInitSystem(long ptr) +@ stdcall HalInitializeProcessor(long ptr) ;@ stdcall -arch=x86_64 HalIsHyperThreadingEnabled() @ stdcall HalMakeBeep(long) @ stdcall HalProcessorIdle() @@ -56,7 +56,6 @@ @ fastcall -arch=arm HalSweepIcache() @ fastcall -arch=arm HalSweepDcache() @ fastcall HalSystemVectorDispatchEntry(long long long) -;@ stdcall -arch=x86_64 HalSystemVectorDispatchEntry() @ stdcall HalTranslateBusAddress(long long long long ptr ptr) @ stdcall -arch=i386,x86_64 IoAssignDriveLetters(ptr str ptr ptr) HalpAssignDriveLetters @ stdcall IoFlushAdapterBuffers(ptr ptr ptr ptr long long) @@ -102,7 +101,8 @@ @ stdcall -arch=i386,arm WRITE_PORT_UCHAR(ptr long) @ stdcall -arch=i386,arm WRITE_PORT_ULONG(ptr long) @ stdcall -arch=i386,arm WRITE_PORT_USHORT(ptr long) -@ stdcall -arch=x86_64 HalInitializeBios(long ptr) -;@ stdcall -arch=x86_64 x86BiosExecuteInterrupt() -;@ stdcall -arch=x86_64 x86BiosInitializeBiosEx() -;@ stdcall -arch=x86_64 x86BiosTranslateAddress() +@ stdcall -arch=x86_64 x86BiosAllocateBuffer() +@ stdcall -arch=x86_64 x86BiosCall() +@ stdcall -arch=x86_64 x86BiosFreeBuffer() +@ stdcall -arch=x86_64 x86BiosReadMemory() +@ stdcall -arch=x86_64 x86BiosWriteMemory() diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt index 831131494ec..f4148eb5ec0 100644 --- a/hal/halx86/CMakeLists.txt +++ b/hal/halx86/CMakeLists.txt @@ -5,7 +5,8 @@ add_definitions( include_directories( include - ${REACTOS_SOURCE_DIR}/ntoskrnl/include) + ${REACTOS_SOURCE_DIR}/ntoskrnl/include + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/fast486) function(add_hal _halname) cmake_parse_arguments(_haldata "" "" "SOURCES;COMPONENTS" ${ARGN}) @@ -76,5 +77,6 @@ elseif(ARCH STREQUAL "amd64") amd64/processor.c) add_hal(hal SOURCES ${HAL_SOURCE} COMPONENTS generic acpi apic) + target_link_libraries(hal fast486) endif() diff --git a/hal/halx86/amd64/x86bios.c b/hal/halx86/amd64/x86bios.c index 88f52421b7b..a8b7d94bc6c 100644 --- a/hal/halx86/amd64/x86bios.c +++ b/hal/halx86/amd64/x86bios.c @@ -12,7 +12,7 @@ //#define NDEBUG #include <debug.h> -//#include "x86emu.h" +#include <fast486.h> /* This page serves as fallback for pages used by Mm */ #define DEFAULT_PAGE 0x21 @@ -43,7 +43,9 @@ DbgDumpPage(PUCHAR MemBuffer, USHORT Segment) VOID NTAPI -HalInitializeBios(ULONG Unknown, PLOADER_PARAMETER_BLOCK LoaderBlock) +HalInitializeBios( + _In_ ULONG Unknown, + _In_ PLOADER_PARAMETER_BLOCK LoaderBlock) { PPFN_NUMBER PfnArray; PFN_NUMBER Pfn, Last; @@ -112,12 +114,12 @@ HalInitializeBios(ULONG Unknown, PLOADER_PARAMETER_BLOCK LoaderBlock) NTSTATUS NTAPI x86BiosAllocateBuffer( - ULONG *Size, - USHORT *Segment, - USHORT *Offset) + _In_ ULONG *Size, + _In_ USHORT *Segment, + _In_ USHORT *Offset) { /* Check if the system is initialized and the buffer is large enough */ - if (!x86BiosIsInitialized || *Size > PAGE_SIZE) + if (!x86BiosIsInitialized || (*Size > PAGE_SIZE)) { /* Something was wrong, fail! */ return STATUS_INSUFFICIENT_RESOURCES; @@ -141,11 +143,11 @@ x86BiosAllocateBuffer( NTSTATUS NTAPI x86BiosFreeBuffer( - USHORT Segment, - USHORT Offset) + _In_ USHORT Segment, + _In_ USHORT Offset) { /* Check if the system is initialized and if the address matches */ - if (!x86BiosIsInitialized || Segment != 0x2000 || Offset != 0) + if (!x86BiosIsInitialized || (Segment != 0x2000) || (Offset != 0)) { /* Something was wrong, fail */ return STATUS_INVALID_PARAMETER; @@ -165,10 +167,10 @@ x86BiosFreeBuffer( NTSTATUS NTAPI x86BiosReadMemory( - USHORT Segment, - USHORT Offset, - PVOID Buffer, - ULONG Size) + _In_ USHORT Segment, + _In_ USHORT Offset, + _Out_writes_bytes_(Size) PVOID Buffer, + _In_ ULONG Size) { ULONG_PTR Address; @@ -176,7 +178,7 @@ x86BiosReadMemory( Address = (Segment << 4) + Offset; /* Check if it's valid */ - if (!x86BiosIsInitialized || Address + Size > 0x100000) + if (!x86BiosIsInitialized || ((Address + Size) > 0x100000)) { /* Invalid */ return STATUS_INVALID_PARAMETER; @@ -192,10 +194,10 @@ x86BiosReadMemory( NTSTATUS NTAPI x86BiosWriteMemory( - USHORT Segment, - USHORT Offset, - PVOID Buffer, - ULONG Size) + _In_ USHORT Segment, + _In_ USHORT Offset, + _In_reads_bytes_(Size) PVOID Buffer, + _In_ ULONG Size) { ULONG_PTR Address; @@ -203,7 +205,7 @@ x86BiosWriteMemory( Address = (Segment << 4) + Offset; /* Check if it's valid */ - if (!x86BiosIsInitialized || Address + Size > 0x100000) + if (!x86BiosIsInitialized || ((Address + Size) > 0x100000)) { /* Invalid */ return STATUS_INVALID_PARAMETER; @@ -216,53 +218,237 @@ x86BiosWriteMemory( return STATUS_SUCCESS; } -#if 0 +static +VOID +FASTCALL +x86MemRead( + PFAST486_STATE State, + ULONG Address, + PVOID Buffer, + ULONG Size) +{ + /* Validate the address range */ + if (((ULONG64)Address + Size) < 0x100000) + { + RtlCopyMemory(Buffer, x86BiosMemoryMapping + Address, Size); + } + else + { + RtlFillMemory(Buffer, Size, 0xCC); + DPRINT1("x86MemRead: invalid read at 0x%lx (size 0x%lx)", Address, Size); + } +} + +static +VOID +FASTCALL +x86MemWrite( + PFAST486_STATE State, + ULONG Address, + PVOID Buffer, + ULONG Size) +{ + /* Validate the address range */ + if (((ULONG64)Address + Size) < 0x100000) + { + RtlCopyMemory(x86BiosMemoryMapping + Address, Buffer, Size); + } + else + { + DPRINT1("x86MemWrite: invalid write at 0x%lx (size 0x%lx)", Address, Size); + } +} + +static +BOOLEAN +ValidatePort( + USHORT Port, + UCHAR Size, + BOOLEAN IsWrite) +{ + switch (Port) + { + // VGA: https://wiki.osdev.org/VGA_Hardware#Port_0x3C0 + case 0x3C0: return (Size == 1) && IsWrite; + case 0x3C1: return (Size == 1) && !IsWrite; + case 0x3C2: return (Size == 1) && IsWrite; + case 0x3C4: return IsWrite; + case 0x3C5: return (Size <= 2); + case 0x3C7: return (Size == 1) && IsWrite; + case 0x3CC: return (Size == 1) && !IsWrite; + case 0x3CE: return IsWrite; + case 0x3CF: return (Size <= 2); + case 0x3D4: return IsWrite; + case 0x3D5: return (Size <= 2); + case 0x3C6: return (Size == 1); + case 0x3C8: return (Size == 1) && IsWrite; + case 0x3C9: return (Size == 1); + case 0x3DA: return (Size == 1) && !IsWrite; + + // CHECKME! + case 0x1CE: return (Size == 1) && IsWrite; + case 0x1CF: return (Size == 1); + case 0x3B6: return (Size <= 2); + } + + return FALSE; +} + +static +VOID +FASTCALL +x86IoRead( + PFAST486_STATE State, + USHORT Port, + PVOID Buffer, + ULONG DataCount, + UCHAR DataSize) +{ + /* Validate the port */ + if (!ValidatePort(Port, DataSize, FALSE)) + { + DPRINT1("Invalid IO port read access (port: 0x%x, count: 0x%x)\n", Port, DataSize); + } + + switch (DataSize) + { + case 1: READ_PORT_BUFFER_UCHAR((PUCHAR)(ULONG_PTR)Port, Buffer, DataCount); return; + case 2: READ_PORT_BUFFER_USHORT((PUSHORT)(ULONG_PTR)Port, Buffer, DataCount); return; + case 4: READ_PORT_BUFFER_ULONG((PULONG)(ULONG_PTR)Port, Buffer, DataCount); return; + } +} + +static +VOID +FASTCALL +x86IoWrite( + PFAST486_STATE State, + USHORT Port, + PVOID Buffer, + ULONG DataCount, + UCHAR DataSize) +{ + /* Validate the port */ + if (!ValidatePort(Port, DataSize, TRUE)) + { + DPRINT1("Invalid IO port write access (port: 0x%x, count: 0x%x)\n", Port, DataSize); + } + + switch (DataSize) + { + case 1: WRITE_PORT_BUFFER_UCHAR((PUCHAR)(ULONG_PTR)Port, Buffer, DataCount); return; + case 2: WRITE_PORT_BUFFER_USHORT((PUSHORT)(ULONG_PTR)Port, Buffer, DataCount); return; + case 4: WRITE_PORT_BUFFER_ULONG((PULONG)(ULONG_PTR)Port, Buffer, DataCount); return; + } +} + +static +VOID +FASTCALL +x86BOP( + PFAST486_STATE State, + UCHAR BopCode) +{ + ASSERT(FALSE); +} + +static +UCHAR +FASTCALL +x86IntAck ( + PFAST486_STATE State) +{ + ASSERT(FALSE); + return 0; +} + BOOLEAN NTAPI x86BiosCall( - ULONG InterruptNumber, - X86_BIOS_REGISTERS *Registers) + _In_ ULONG InterruptNumber, + _Inout_ PX86_BIOS_REGISTERS Registers) { - X86_VM_STATE VmState; + FAST486_STATE EmulatorContext; struct { USHORT Ip; USHORT SegCs; - } *InterrupTable; - - /* Zero the VmState */ - RtlZeroMemory(&VmState, sizeof(VmState)); + } *Ivt; + ULONG FlatIp; + PUCHAR InstructionPointer; + + /* Initialize the emulator context */ + Fast486Initialize(&EmulatorContext, + x86MemRead, + x86MemWrite, + x86IoRead, + x86IoWrite, + x86BOP, + x86IntAck, + NULL, // FpuCallback, + NULL); // Tlb + +//RegisterBop(BOP_UNSIMULATE, CpuUnsimulateBop); /* Copy the registers */ - VmState.BiosRegisters = *Registers; - - /* Set the physical memory buffer */ - VmState.MemBuffer = x86BiosMemoryMapping; + EmulatorContext.GeneralRegs[FAST486_REG_EAX].Long = Registers->Eax; + EmulatorContext.GeneralRegs[FAST486_REG_EBX].Long = Registers->Ebx; + EmulatorContext.GeneralRegs[FAST486_REG_ECX].Long = Registers->Ecx; + EmulatorContext.GeneralRegs[FAST486_REG_EDX].Long = Registers->Edx; + EmulatorContext.GeneralRegs[FAST486_REG_ESI].Long = Registers->Esi; + EmulatorContext.GeneralRegs[FAST486_REG_EDI].Long = Registers->Edi; + EmulatorContext.SegmentRegs[FAST486_REG_DS].Selector = Registers->SegDs; + EmulatorContext.SegmentRegs[FAST486_REG_ES].Selector = Registers->SegEs; /* Set Eflags */ - VmState.Registers.Eflags.Long = 0; // FIXME + EmulatorContext.Flags.Long = 0; + EmulatorContext.Flags.AlwaysSet = 1; + EmulatorContext.Flags.If = 1; - /* Setup stack */ - VmState.Registers.SegSs = 0; // FIXME - VmState.Registers.Sp = 0x2000 - 2; // FIXME + /* Set the stack pointer */ + Fast486SetStack(&EmulatorContext, 0, 0x2000 - 2); // FIXME - /* Initialize IP from the interrupt vector table */ - InterrupTable = (PVOID)x86BiosMemoryMapping; - VmState.Registers.SegCs = InterrupTable[InterruptNumber].SegCs; - VmState.Registers.Eip = InterrupTable[InterruptNumber].Ip; - - /* Make the function return on IRET */ - VmState.Flags.ReturnOnIret = 1; + /* Set CS:EIP from the IVT entry */ + Ivt = (PVOID)x86BiosMemoryMapping; + Fast486ExecuteAt(&EmulatorContext, + Ivt[InterruptNumber].SegCs, + Ivt[InterruptNumber].Ip); - /* Call the x86 emulator */ - x86Emulator(&VmState); + while (TRUE) + { + /* Step one instruction */ + Fast486StepInto(&EmulatorContext); - /* Copy registers back to caller */ - *Registers = VmState.BiosRegisters; + /* Check for iret */ + FlatIp = (EmulatorContext.SegmentRegs[FAST486_REG_CS].Selector << 4) + + EmulatorContext.InstPtr.Long; + if (FlatIp >= 0x100000) + { + DPRINT1("x86BiosCall: invalid IP (0x%lx) during BIOS execution", FlatIp); + return FALSE; + } + + /* Read the next instruction and check if it's IRET */ + InstructionPointer = x86BiosMemoryMapping + FlatIp; + if (*InstructionPointer == 0xCF) + { + /* We are done! */ + break; + } + } + + /* Copy the registers back */ + Registers->Eax = EmulatorContext.GeneralRegs[FAST486_REG_EAX].Long; + Registers->Ebx = EmulatorContext.GeneralRegs[FAST486_REG_EBX].Long; + Registers->Ecx = EmulatorContext.GeneralRegs[FAST486_REG_ECX].Long; + Registers->Edx = EmulatorContext.GeneralRegs[FAST486_REG_EDX].Long; + Registers->Esi = EmulatorContext.GeneralRegs[FAST486_REG_ESI].Long; + Registers->Edi = EmulatorContext.GeneralRegs[FAST486_REG_EDI].Long; + Registers->SegDs = EmulatorContext.SegmentRegs[FAST486_REG_DS].Selector; + Registers->SegEs = EmulatorContext.SegmentRegs[FAST486_REG_ES].Selector; return TRUE; } -#endif BOOLEAN NTAPI diff --git a/hal/halx86/generic/halinit.c b/hal/halx86/generic/halinit.c index 002605deb9f..90183d1fb4f 100644 --- a/hal/halx86/generic/halinit.c +++ b/hal/halx86/generic/halinit.c @@ -156,6 +156,10 @@ HalInitSystem(IN ULONG BootPhase, /* Do some HAL-specific initialization */ HalpInitPhase1(); + +#ifdef _M_AMD64 + HalInitializeBios(0, LoaderBlock); +#endif } /* All done, return */ diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h index 190bfe84636..9c03a96f43d 100644 --- a/hal/halx86/include/halp.h +++ b/hal/halx86/include/halp.h @@ -871,6 +871,14 @@ HalpInitProcessor( ); #ifdef _M_AMD64 + +VOID +NTAPI +HalInitializeBios( + _In_ ULONG Unknown, + _In_ PLOADER_PARAMETER_BLOCK LoaderBlock +); + #define KfLowerIrql KeLowerIrql #define KiEnterInterruptTrap(TrapFrame) /* We do all neccessary in asm code */ #define KiEoiHelper(TrapFrame) return /* Just return to the caller */

5 years, 2 months

[reactos] 01/06: [NDK] Add BIOS call API for amd64

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f18958ffa2cfa4b8090ae… commit f18958ffa2cfa4b8090ae3108e904c7ad8f322fd Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 11 16:43:51 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 14:13:54 2019 +0200 [NDK] Add BIOS call API for amd64 --- sdk/include/ndk/halfuncs.h | 47 ++++++++++++++++++++++++++++++++++++++++++++-- sdk/include/ndk/haltypes.h | 20 ++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/sdk/include/ndk/halfuncs.h b/sdk/include/ndk/halfuncs.h index 03e869887a2..2086416f000 100644 --- a/sdk/include/ndk/halfuncs.h +++ b/sdk/include/ndk/halfuncs.h @@ -294,5 +294,48 @@ HalSetTimeIncrement( _In_ ULONG Increment ); -#endif -#endif + +// +// BIOS call API +// +#ifdef _M_AMD64 + +NTSTATUS +NTAPI +x86BiosAllocateBuffer( + _In_ ULONG *Size, + _In_ USHORT *Segment, + _In_ USHORT *Offset); + +NTSTATUS +NTAPI +x86BiosFreeBuffer( + _In_ USHORT Segment, + _In_ USHORT Offset); + +NTSTATUS +NTAPI +x86BiosReadMemory( + _In_ USHORT Segment, + _In_ USHORT Offset, + _Out_writes_bytes_(Size) PVOID Buffer, + _In_ ULONG Size); + +NTSTATUS +NTAPI +x86BiosWriteMemory( + _In_ USHORT Segment, + _In_ USHORT Offset, + _In_reads_bytes_(Size) PVOID Buffer, + _In_ ULONG Size); + +BOOLEAN +NTAPI +x86BiosCall( + _In_ ULONG InterruptNumber, + _Inout_ PX86_BIOS_REGISTERS Registers); + +#endif // _M_AMD64 + +#endif // NTOS_MODE_USER +#endif // _HALFUNCS_H diff --git a/sdk/include/ndk/haltypes.h b/sdk/include/ndk/haltypes.h index d27581b83fc..125158b4210 100644 --- a/sdk/include/ndk/haltypes.h +++ b/sdk/include/ndk/haltypes.h @@ -275,6 +275,26 @@ extern PUCHAR NTHALAPI KdComPortInUse; // #define HAL_IRQ_TRANSLATOR_VERSION 0x0 +// +// BIOS call structure +// +#ifdef _M_AMD64 + +typedef struct _X86_BIOS_REGISTERS +{ + ULONG Eax; + ULONG Ecx; + ULONG Edx; + ULONG Ebx; + ULONG Ebp; + ULONG Esi; + ULONG Edi; + USHORT SegDs; + USHORT SegEs; +} X86_BIOS_REGISTERS, *PX86_BIOS_REGISTERS; + +#endif // _M_AMD64 + #endif #endif

5 years, 2 months

[reactos] 01/01: [NTOSKRNL][PS] Implement NtQueueApcThreadEx and use it in NtQueueApcThread

by Andrew Boyarshin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b607e0119ffcc64da433c… commit b607e0119ffcc64da433cf090d463c510d7abfc4 Author: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> AuthorDate: Sun Nov 25 14:11:04 2018 +0700 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 15 12:32:09 2019 +0200 [NTOSKRNL][PS] Implement NtQueueApcThreadEx and use it in NtQueueApcThread Actually rename NtQueueApcThread to NtQueueApcThreadEx and ignore one additional parameter for now. --- ntoskrnl/ps/state.c | 50 +++++++++++++++++++++++++++++++++++++++++++---- sdk/include/ndk/kefuncs.h | 12 ++++++++++++ 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/ps/state.c b/ntoskrnl/ps/state.c index 5d3839b0b95..4511c1ff625 100644 --- a/ntoskrnl/ps/state.c +++ b/ntoskrnl/ps/state.c @@ -470,7 +470,7 @@ NtTestAlert(VOID) } /*++ - * @name NtQueueApcThread + * @name NtQueueApcThreadEx * NT4 * * This routine is used to queue an APC from user-mode for the specified @@ -479,6 +479,10 @@ NtTestAlert(VOID) * @param ThreadHandle * Handle to the Thread. * This handle must have THREAD_SET_CONTEXT privileges. + * + * @param UserApcReserveHandle + * Optional handle to reserve object (introduced in Windows 7), providing ability to + * reserve memory before performing stability-critical parts of code. * * @param ApcRoutine * Pointer to the APC Routine to call when the APC executes. @@ -497,11 +501,12 @@ NtTestAlert(VOID) *--*/ NTSTATUS NTAPI -NtQueueApcThread(IN HANDLE ThreadHandle, +NtQueueApcThreadEx(IN HANDLE ThreadHandle, + IN OPTIONAL HANDLE UserApcReserveHandle, IN PKNORMAL_ROUTINE ApcRoutine, IN PVOID NormalContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) + IN OPTIONAL PVOID SystemArgument1, + IN OPTIONAL PVOID SystemArgument2) { PKAPC Apc; PETHREAD Thread; @@ -564,4 +569,41 @@ Quit: return Status; } +/*++ + * @name NtQueueApcThread + * NT4 + * + * This routine is used to queue an APC from user-mode for the specified + * thread. + * + * @param ThreadHandle + * Handle to the Thread. + * This handle must have THREAD_SET_CONTEXT privileges. + * + * @param ApcRoutine + * Pointer to the APC Routine to call when the APC executes. + * + * @param NormalContext + * Pointer to the context to send to the Normal Routine. + * + * @param SystemArgument[1-2] + * Pointer to a set of two parameters that contain untyped data. + * + * @return STATUS_SUCCESS or failure cute from associated calls. + * + * @remarks The thread must enter an alertable wait before the APC will be + * delivered. + * + *--*/ +NTSTATUS +NTAPI +NtQueueApcThread(IN HANDLE ThreadHandle, + IN PKNORMAL_ROUTINE ApcRoutine, + IN PVOID NormalContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + return NtQueueApcThreadEx(ThreadHandle, NULL, ApcRoutine, NormalContext, SystemArgument1, SystemArgument2); +} + /* EOF */ diff --git a/sdk/include/ndk/kefuncs.h b/sdk/include/ndk/kefuncs.h index 6d7b713cc8d..09627727937 100644 --- a/sdk/include/ndk/kefuncs.h +++ b/sdk/include/ndk/kefuncs.h @@ -467,6 +467,18 @@ NtQueueApcThread( _In_opt_ PVOID SystemArgument2 ); +NTSYSCALLAPI +NTSTATUS +NTAPI +NtQueueApcThreadEx( + _In_ HANDLE ThreadHandle, + _In_opt_ HANDLE UserApcReserveHandle, + _In_ PKNORMAL_ROUTINE ApcRoutine, + _In_opt_ PVOID NormalContext, + _In_opt_ PVOID SystemArgument1, + _In_opt_ PVOID SystemArgument2 +); + NTSYSCALLAPI NTSTATUS NTAPI

5 years, 2 months

← Newer
1
...
15
16
17
18
19
20
21
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2019