Ros-diffs December 2017

ros-diffs@reactos.org

26 participants
355 discussions

[reactos] 01/01: [DISK] Properly implement querying partition information for partition 0. In spite of what was implemented in our NT DDK sample, this is a legit operation.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9b461bde95804f3dcf14… commit b9b461bde95804f3dcf1455a1bfbf25cfdb8aedc Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 24 21:54:09 2017 +0100 [DISK] Properly implement querying partition information for partition 0. In spite of what was implemented in our NT DDK sample, this is a legit operation. This may have been turned legit starting NT5 (reminder, our implementation is NT4 based...). So, in this situation, just return the information about the whole disk (and not a random size) and also, mark everything with default values. See disk_new for an example of how it works in NT5+. CORE-14124 --- drivers/storage/class/disk/disk.c | 71 ++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 30 deletions(-) diff --git a/drivers/storage/class/disk/disk.c b/drivers/storage/class/disk/disk.c index e0c775688d..cb84565691 100644 --- a/drivers/storage/class/disk/disk.c +++ b/drivers/storage/class/disk/disk.c @@ -2235,58 +2235,69 @@ Return Value: sizeof(PARTITION_INFORMATION)) { status = STATUS_INFO_LENGTH_MISMATCH; - + break; } -#if 0 // HACK: ReactOS partition numbers must be wrong - else if (diskData->PartitionNumber == 0) { + + // + // Update the geometry in case it has changed. + // + + status = UpdateRemovableGeometry (DeviceObject, Irp); + + if (!NT_SUCCESS(status)) { // - // Partition zero is not a partition so this is not a - // reasonable request. + // Note the drive is not ready. // - status = STATUS_INVALID_DEVICE_REQUEST; - + diskData->DriveNotReady = TRUE; + break; } -#endif - else { - PPARTITION_INFORMATION outputBuffer; + // + // Note the drive is now ready. + // - if (diskData->PartitionNumber == 0) { - DPRINT1("HACK: Handling partition 0 request!\n"); - //ASSERT(FALSE); - } + diskData->DriveNotReady = FALSE; - // - // Update the geometry in case it has changed. - // + // + // Handle the case were we query the whole disk + // - status = UpdateRemovableGeometry (DeviceObject, Irp); + if (diskData->PartitionNumber == 0) { - if (!NT_SUCCESS(status)) { + PPARTITION_INFORMATION outputBuffer; - // - // Note the drive is not ready. - // + outputBuffer = + (PPARTITION_INFORMATION)Irp->AssociatedIrp.SystemBuffer; - diskData->DriveNotReady = TRUE; - break; - } + outputBuffer->PartitionType = PARTITION_ENTRY_UNUSED; + outputBuffer->StartingOffset = deviceExtension->StartingOffset; + outputBuffer->PartitionLength.QuadPart = deviceExtension->PartitionLength.QuadPart; + outputBuffer->HiddenSectors = 0; + outputBuffer->PartitionNumber = diskData->PartitionNumber; + outputBuffer->BootIndicator = FALSE; + outputBuffer->RewritePartition = FALSE; + outputBuffer->RecognizedPartition = FALSE; + + status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(PARTITION_INFORMATION); + + } else { + + PPARTITION_INFORMATION outputBuffer; // - // Note the drive is now ready. + // We query a single partition here + // FIXME: this can only work for MBR-based disks, check for this! // - diskData->DriveNotReady = FALSE; - outputBuffer = (PPARTITION_INFORMATION)Irp->AssociatedIrp.SystemBuffer; outputBuffer->PartitionType = diskData->PartitionType; outputBuffer->StartingOffset = deviceExtension->StartingOffset; - outputBuffer->PartitionLength.QuadPart = (diskData->PartitionNumber) ? - deviceExtension->PartitionLength.QuadPart : 0x1FFFFFFFFFFFFFFFLL; // HACK + outputBuffer->PartitionLength.QuadPart = deviceExtension->PartitionLength.QuadPart; outputBuffer->HiddenSectors = diskData->HiddenSectors; outputBuffer->PartitionNumber = diskData->PartitionNumber; outputBuffer->BootIndicator = diskData->BootIndicator;

6 years, 10 months

[reactos] 06/06: [NTDLL_APITEST] -Add a hacky Microsoft.Windows.GdiPlus.manifest.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1db8bd46d6d1eff589a20… commit 1db8bd46d6d1eff589a20f6ec7e57047bc9b3a05 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Dec 24 19:22:42 2017 +0200 [NTDLL_APITEST] -Add a hacky Microsoft.Windows.GdiPlus.manifest. This is needed because ntdlltest.manifest has a dependency on gdiplus and won't load because we don't have it in winsxs. Eventually this must be removed. --- modules/rostests/apitests/ntdll/CMakeLists.txt | 2 ++ modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index c1a3aead68..3ac0b604f1 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -77,4 +77,6 @@ add_rostests_file(TARGET ntdll_apitest SUBDIR testdata) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ntdll_apitest.exe.local" SUBDIR testdata) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/shell32.dll" SUBDIR testdata) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/test.dll" SUBDIR testdata) + add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ntdlltest.manifest" SUBDIR testdata) +add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/Microsoft.Windows.GdiPlus.manifest" SUBDIR testdata) diff --git a/modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest b/modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest new file mode 100644 index 0000000000..ba815f4c7b --- /dev/null +++ b/modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.0.100.0" processorArchitecture="x86" /> + <file name="gdiplus.dll"/> +</assembly> + \ No newline at end of file

6 years, 10 months

[reactos] 05/06: [COMCTL32] Install comctl32 v6 and its manifest in first stage

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=435b0b19d25b533a03bcc… commit 435b0b19d25b533a03bccd1eb1eedc918ff559ec Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Oct 3 22:28:12 2017 +0300 [COMCTL32] Install comctl32 v6 and its manifest in first stage --- boot/bootdata/packages/reactos.dff.in | 4 ++ dll/win32/comctl32/CMakeLists.txt | 6 +- dll/win32/comctl32/commctrl.c | 73 ---------------------- dll/win32/comctl32/rsrc.rc | 4 -- ...44ccf1df_5.82.2600.2982_none_deadbeef.manifest} | 0 ...144ccf1df_6.0.2600.2982_none_deadbeef.manifest} | 0 sdk/cmake/CMakeMacros.cmake | 8 +++ 7 files changed, 16 insertions(+), 79 deletions(-) diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index 283f32dad5..a365760608 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -71,6 +71,10 @@ Signature = "$ReactOS$" 51 = system32\CatRoot 52 = system32\CatRoot2 53 = AppPatch +54 = winsxs +55 = winsxs\manifests +56 = winsxs\x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef +57 = winsxs\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef .InfEnd diff --git a/dll/win32/comctl32/CMakeLists.txt b/dll/win32/comctl32/CMakeLists.txt index 1b55c5dfdf..9285001478 100644 --- a/dll/win32/comctl32/CMakeLists.txt +++ b/dll/win32/comctl32/CMakeLists.txt @@ -64,5 +64,7 @@ add_delay_importlibs(comctl32 winmm uxtheme) add_importlibs(comctl32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_pch(comctl32 comctl32.h SOURCE) add_cd_file(TARGET comctl32 DESTINATION reactos/system32 FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/comctl32v5.manifest DESTINATION reactos/winsxs/manifests NAME_ON_CD x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest FOR livecd) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/comctl32.manifest DESTINATION reactos/winsxs/manifests NAME_ON_CD x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest FOR livecd) \ No newline at end of file +add_cd_file(TARGET comctl32 DESTINATION reactos/winsxs/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef FOR all) +add_cd_file(TARGET comctl32 DESTINATION reactos/winsxs/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) \ No newline at end of file diff --git a/dll/win32/comctl32/commctrl.c b/dll/win32/comctl32/commctrl.c index e091cccabd..df063c0313 100644 --- a/dll/win32/comctl32/commctrl.c +++ b/dll/win32/comctl32/commctrl.c @@ -129,64 +129,6 @@ static WCHAR* GetManifestPath(BOOL create, BOOL bV6) return pwszBuf; } -static BOOL create_manifest(BOOL install, BOOL bV6) -{ - WCHAR *pwszBuf; - HRSRC hResInfo; - HGLOBAL hResData; - PVOID pManifest; - DWORD cbManifest, cbWritten; - HANDLE hFile; - BOOL bRet = FALSE; - - if (bV6) - hResInfo = FindResourceW(COMCTL32_hModule, L"WINE_MANIFEST", (LPWSTR)RT_MANIFEST); - else - hResInfo = FindResourceW(COMCTL32_hModule, L"WINE_MANIFESTV5", (LPWSTR)RT_MANIFEST); - - if (!hResInfo) - return FALSE; - - cbManifest = SizeofResource(COMCTL32_hModule, hResInfo); - if (!cbManifest) - return FALSE; - - hResData = LoadResource(COMCTL32_hModule, hResInfo); - if (!hResData) - return FALSE; - - pManifest = LockResource(hResData); - if (!pManifest) - return FALSE; - - pwszBuf = GetManifestPath(TRUE, bV6); - if (!pwszBuf) - return FALSE; - - if (install) - { - hFile = CreateFileW(pwszBuf, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - if (hFile != INVALID_HANDLE_VALUE) - { - if (WriteFile(hFile, pManifest, cbManifest, &cbWritten, NULL) && cbWritten == cbManifest) - bRet = TRUE; - - CloseHandle(hFile); - - if (!bRet) - DeleteFileW(pwszBuf); - else - TRACE("created %s\n", debugstr_w(pwszBuf)); - } - } - else - bRet = DeleteFileW(pwszBuf); - - HeapFree(GetProcessHeap(), 0, pwszBuf); - - return bRet; -} - static HANDLE CreateComctl32ActCtx(BOOL bV6) { HANDLE ret; @@ -1179,21 +1121,6 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) { TRACE("(%u, %s): stub\n", bInstall, debugstr_w(cmdline)); -#ifdef __REACTOS__ - - if (!create_manifest(bInstall, TRUE)) - { - ERR("Failed to install comctl32 v6 manifest!\n"); - return HRESULT_FROM_WIN32(GetLastError()); - } - - if (!create_manifest(bInstall, FALSE)) - { - ERR("Failed to install comctl32 v5 manifest!\n"); - return HRESULT_FROM_WIN32(GetLastError()); - } -#endif - return S_OK; } diff --git a/dll/win32/comctl32/rsrc.rc b/dll/win32/comctl32/rsrc.rc index 0fb8289440..e0a937685f 100644 --- a/dll/win32/comctl32/rsrc.rc +++ b/dll/win32/comctl32/rsrc.rc @@ -36,10 +36,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "wine/wine_common_ver.rc" -/* @makedep: comctl32.manifest */ -WINE_MANIFEST RT_MANIFEST comctl32.manifest -WINE_MANIFESTV5 RT_MANIFEST comctl32v5.manifest - /* @makedep: idt_check.bmp */ IDT_CHECK BITMAP idt_check.bmp diff --git a/dll/win32/comctl32/comctl32v5.manifest b/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest similarity index 100% rename from dll/win32/comctl32/comctl32v5.manifest rename to dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest diff --git a/dll/win32/comctl32/comctl32.manifest b/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest similarity index 100% rename from dll/win32/comctl32/comctl32.manifest rename to dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 95f99f3af7..dc9a58e631 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -271,6 +271,14 @@ macro(dir_to_num dir var) set(${var} 52) elseif(${dir} STREQUAL reactos/AppPatch) set(${var} 53) + elseif(${dir} STREQUAL reactos/winsxs) + set(${var} 54) + elseif(${dir} STREQUAL reactos/winsxs/manifests) + set(${var} 55) + elseif(${dir} STREQUAL reactos/winsxs/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef) + set(${var} 56) + elseif(${dir} STREQUAL reactos/winsxs/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef) + set(${var} 57) else() message(FATAL_ERROR "Wrong destination: ${dir}") endif()

6 years, 10 months

[reactos] 04/06: [NTDLL_APITEST] Add several tests for RtlDosApplyFileIsolationRedirection_Ustr

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7059421a23f1169dbb848… commit 7059421a23f1169dbb848ced63177f89e6899217 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Wed Oct 4 11:10:59 2017 +0300 [NTDLL_APITEST] Add several tests for RtlDosApplyFileIsolationRedirection_Ustr --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../RtlDosApplyFileIsolationRedirection_Ustr.c | 269 ++++++++++++++++++++- modules/rostests/apitests/ntdll/ntdlltest.manifest | 16 ++ 3 files changed, 280 insertions(+), 6 deletions(-) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 42fc3fbdb8..c1a3aead68 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -77,3 +77,4 @@ add_rostests_file(TARGET ntdll_apitest SUBDIR testdata) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ntdll_apitest.exe.local" SUBDIR testdata) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/shell32.dll" SUBDIR testdata) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/test.dll" SUBDIR testdata) +add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ntdlltest.manifest" SUBDIR testdata) diff --git a/modules/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c b/modules/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c index 9b9f15955b..fb2b51694a 100644 --- a/modules/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c +++ b/modules/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c @@ -33,6 +33,11 @@ struct test_data Tests[] = {__LINE__, STATUS_SUCCESS, L"COMCTL32.DLL", L"\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82"}, {__LINE__, STATUS_SUCCESS, L"comctl32.DLL", L"\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82"}, {__LINE__, STATUS_SUCCESS, L"c:\\windows\\system32\\comctl32.DLL", L"\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82"}, + /* Files defined in the manifest, one exists, one doesn't */ + {__LINE__, STATUS_SUCCESS, L"deptest.dll", EXPECT_IN_SAME_DIR}, + {__LINE__, STATUS_SUCCESS, L"adllfile.dll", EXPECT_IN_SAME_DIR}, + /* A file that exists in the same dir but isn't mentioned in the manifest */ + {__LINE__, STATUS_SUCCESS, L"fil1.txt", EXPECT_IN_SAME_DIR}, /* This is a weird case; the source doesn't exist but does get redirected */ {__LINE__, STATUS_SUCCESS, L"c:\\windows\\system32\\gdiplus.DLL", L"\\winsxs\\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1."}, /* But redirecting gdiplus from a different directory doesn't work */ @@ -48,6 +53,28 @@ struct test_data Tests[] = {__LINE__, STATUS_SUCCESS, L"c:\\shell32.dll", EXPECT_IN_SAME_DIR} }; +HANDLE _CreateActCtxFromFile(LPCWSTR FileName, int line) +{ + ACTCTXW ActCtx = {sizeof(ACTCTX)}; + HANDLE h; + WCHAR buffer[MAX_PATH] , *separator; + + ok (GetModuleFileNameW(NULL, buffer, MAX_PATH), "GetModuleFileName failed\n"); + separator = wcsrchr(buffer, L'\\'); + if (separator) + wcscpy(separator + 1, FileName); + + ActCtx.lpSource = buffer; + + SetLastError(0xdeaddead); + h = CreateActCtxW(&ActCtx); + ok_(__FILE__, line)(h != INVALID_HANDLE_VALUE, "CreateActCtx failed for %S\n", FileName); + // In win10 last error is unchanged and in win2k3 it is ERROR_BAD_EXE_FORMAT + ok_(__FILE__, line)(GetLastError() == ERROR_BAD_EXE_FORMAT || GetLastError() == 0xdeaddead, "Wrong last error %lu\n", GetLastError()); + + return h; +} + void TestRedirection(void) { WCHAR SystemDir[MAX_PATH]; @@ -92,12 +119,6 @@ void TestRedirection(void) NULL); ok(Status == Tests[i].ExpectedStatus, "%d: Status 0x%lx, expected 0x%lx\n", Tests[i].testline, Status, Tests[i].ExpectedStatus); - if (DynamicString.Buffer) - { - BOOL exists = RtlDoesFileExists_U(DynamicString.Buffer); - ok(exists, "%d: Expected file %S to exist!\n", Tests[i].testline, DynamicString.Buffer); - } - if(Tests[i].ExpectedSubString && DynamicString.Buffer == NULL) { ok(0, "%d: Expected a returned string\n", Tests[i].testline); @@ -118,6 +139,231 @@ void TestRedirection(void) } } +void TestBuffers() +{ + UNICODE_STRING Param, DynamicString, StaticString; + PUNICODE_STRING StringUsed = NULL; + NTSTATUS Status; + WCHAR buffer[MAX_PATH]; + + RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + NULL, + NULL, + NULL, + &DynamicString, + &StringUsed, + NULL, + NULL, + NULL); + ok(Status ==STATUS_INVALID_PARAMETER, "0x%lx\n", Status); + + RtlInitEmptyUnicodeString(&Param, NULL, 0); + RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + &Param, + NULL, + NULL, + &DynamicString, + &StringUsed, + NULL, + NULL, + NULL); + ok(Status ==STATUS_SXS_KEY_NOT_FOUND, "0x%lx\n", Status); + + /* Tests for NULL termination of OriginalName */ + Param.MaximumLength = Param.Length = 12 * sizeof(WCHAR); + Param.Buffer = L"comctl32.dllcrapcrap"; + RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + &Param, + NULL, + NULL, + &DynamicString, + &StringUsed, + NULL, + NULL, + NULL); + ok(Status ==STATUS_SUCCESS, "\n"); + + /* Tests for the Extension parameter */ + RtlInitUnicodeString(&Param, L"comctl32.dll"); + RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + &Param, + NULL, + NULL, + &DynamicString, + &StringUsed, + NULL, + NULL, + NULL); + ok(Status ==STATUS_SUCCESS, "\n"); + + RtlInitUnicodeString(&Param, L"comctl32"); + RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + &Param, + NULL, + NULL, + &DynamicString, + &StringUsed, + NULL, + NULL, + NULL); + ok(Status ==STATUS_SXS_KEY_NOT_FOUND, "0x%lx\n", Status); + + RtlInitUnicodeString(&Param, L"comctl32"); + RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + &Param, + &DotDll, + NULL, + &DynamicString, + &StringUsed, + NULL, + NULL, + NULL); + ok(Status ==STATUS_SUCCESS, "\n"); + + /* Tests for the DynamicString parameter */ + RtlInitUnicodeString(&Param, L"comctl32.dll"); + RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + &Param, + NULL, + NULL, + &DynamicString, + &StringUsed, + NULL, + NULL, + NULL); + ok(Status ==STATUS_SUCCESS, "\n"); + ok(DynamicString.Length >0 , "\n"); + ok(DynamicString.MaximumLength == DynamicString.Length + sizeof(WCHAR) , "\n"); + if (DynamicString.Buffer && DynamicString.Length) + ok(wcslen(DynamicString.Buffer) * sizeof(WCHAR) == DynamicString.Length, "got %d and %d\n", wcslen(DynamicString.Buffer) * sizeof(WCHAR) , DynamicString.Length); + else + ok(DynamicString.Buffer != NULL, "Expected non NULL buffer\n"); + ok(StringUsed == &DynamicString, "\n"); + + /* Tests for the StaticString parameter */ + wcscpy(buffer, L"comctl32.dll"); + StaticString.Buffer = buffer; + StaticString.Length = sizeof(L"comctl32.dll"); + StaticString.MaximumLength = sizeof(buffer); + Param = StaticString; + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + &Param, + NULL, + &StaticString, + NULL, + &StringUsed, + NULL, + NULL, + NULL); + ok(Status ==STATUS_SXS_KEY_NOT_FOUND, "0x%lx\n", Status); + + wcscpy(buffer, L"comctl32.dll"); + StaticString.Buffer = buffer; + StaticString.Length = sizeof(L"comctl32.dll"); + StaticString.MaximumLength = sizeof(buffer); + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + &StaticString, + NULL, + &StaticString, + NULL, + &StringUsed, + NULL, + NULL, + NULL); + ok(Status ==STATUS_SXS_KEY_NOT_FOUND, "0x%lx\n", Status); + + RtlInitUnicodeString(&Param, L"comctl32.dll"); + RtlInitEmptyUnicodeString(&StaticString, buffer, sizeof(buffer)); + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + &Param, + NULL, + &StaticString, + NULL, + &StringUsed, + NULL, + NULL, + NULL); + ok(Status ==STATUS_SUCCESS, "\n"); + ok(StaticString.Length >0 , "\n"); + ok(StaticString.MaximumLength == sizeof(buffer) , "\n"); + if (StaticString.Buffer && StaticString.Length) + ok(wcslen(StaticString.Buffer) * sizeof(WCHAR) == StaticString.Length, "got %d and %d\n", wcslen(StaticString.Buffer) * sizeof(WCHAR) , StaticString.Length); + else + ok(StaticString.Length != 0, "Expected non 0 lenght\n"); + ok(StringUsed == &StaticString, "\n"); + + RtlInitEmptyUnicodeString(&StaticString, buffer, 5 * sizeof(WCHAR)); + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + &Param, + NULL, + &StaticString, + NULL, + &StringUsed, + NULL, + NULL, + NULL); + ok(Status == STATUS_BUFFER_TOO_SMALL, "0x%lx\n", Status); + + RtlInitUnicodeString(&Param, L"comctl32.dll"); + RtlInitEmptyUnicodeString(&StaticString, buffer, sizeof(buffer)); + RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + &Param, + NULL, + &StaticString, + &DynamicString, + &StringUsed, + NULL, + NULL, + NULL); + ok(Status ==STATUS_SUCCESS, "\n"); + ok(StaticString.Length >0 , "\n"); + ok(StaticString.MaximumLength == sizeof(buffer) , "\n"); + if (StaticString.Buffer && StaticString.Length) + ok(wcslen(StaticString.Buffer) * sizeof(WCHAR) == StaticString.Length, "got %d and %d\n", wcslen(StaticString.Buffer) * sizeof(WCHAR) , StaticString.Length); + else + ok(StaticString.Length != 0, "Expected non 0 lenght\n"); + ok(DynamicString.Buffer == NULL, "\n"); + ok(DynamicString.Length == 0, "\n"); + ok(DynamicString.MaximumLength == 0, "\n"); + ok(StringUsed == &StaticString, "\n"); + + /* Test a small buffer and a dynamic buffer */ + RtlInitUnicodeString(&Param, L"comctl32.dll"); + RtlInitEmptyUnicodeString(&StaticString, buffer, 5 * sizeof(WCHAR)); + RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); + StaticString.Buffer[0] = 1; + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + &Param, + NULL, + &StaticString, + &DynamicString, + &StringUsed, + NULL, + NULL, + NULL); + ok(Status ==STATUS_SUCCESS, "\n"); + ok(StaticString.Buffer == buffer, "\n"); + ok(StaticString.Length == 0 , "%d\n", StaticString.Length); + ok(StaticString.Buffer[0] == 0, "\n"); + ok(StaticString.MaximumLength == 5 * sizeof(WCHAR) , "%d\n", StaticString.MaximumLength); + ok(DynamicString.Length >0 , "\n"); + ok(DynamicString.MaximumLength == DynamicString.Length + sizeof(WCHAR) , "\n"); + if (DynamicString.Buffer && DynamicString.Length) + ok(wcslen(DynamicString.Buffer) * sizeof(WCHAR) == DynamicString.Length, "got %d and %d\n", wcslen(DynamicString.Buffer) * sizeof(WCHAR) , DynamicString.Length); + else + ok(DynamicString.Length != 0, "Expected non 0 lenght\n"); + + ok(StringUsed == &DynamicString, "\n"); +} + START_TEST(RtlDosApplyFileIsolationRedirection_Ustr) { int argc; @@ -125,7 +371,18 @@ START_TEST(RtlDosApplyFileIsolationRedirection_Ustr) argc = winetest_get_mainargs( &test_argv ); if (argc >= 3) { + HANDLE h = _CreateActCtxFromFile(L"ntdlltest.manifest", __LINE__); + BOOL bactivated = FALSE; + ULONG_PTR cookie; + + if (h != INVALID_HANDLE_VALUE) + bactivated = ActivateActCtx(h, &cookie); + TestRedirection(); + TestBuffers(); + + if (bactivated) + DeactivateActCtx(0, cookie); } else { diff --git a/modules/rostests/apitests/ntdll/ntdlltest.manifest b/modules/rostests/apitests/ntdll/ntdlltest.manifest new file mode 100644 index 0000000000..a91a9b68a2 --- /dev/null +++ b/modules/rostests/apitests/ntdll/ntdlltest.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="ntdll_apitest" version="1.0.0.0"/> + <dependency> + <dependentAssembly> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.0.100.0" language="*" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/> + </dependentAssembly> + </dependency> + <dependency> + <dependentAssembly> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.0.0" language="*" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/> + </dependentAssembly> + </dependency> + <file name="deptest.dll"/> + <file name="adllfile.dll"/> +</assembly>

6 years, 10 months

[reactos] 03/06: [LDR] Overhaul sxs support in ldr * Remove the hacky find_actctx_dll form ldr that was taken from wine. LdrpResolveDllName and LdrpCheckForLoadedDll should get a parameter that is already redirected. * Use RtlDosApplyFileIsolationRedirection_Ustr in LdrpLoadImportModule and LdrpUpdateLoadCount3 to redirerect the input parameter.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f318a25e1059d0a80999e… commit f318a25e1059d0a80999ebf649ea215b584c3a0e Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Oct 3 22:11:47 2017 +0300 [LDR] Overhaul sxs support in ldr * Remove the hacky find_actctx_dll form ldr that was taken from wine. LdrpResolveDllName and LdrpCheckForLoadedDll should get a parameter that is already redirected. * Use RtlDosApplyFileIsolationRedirection_Ustr in LdrpLoadImportModule and LdrpUpdateLoadCount3 to redirerect the input parameter. --- dll/ntdll/ldr/ldrpe.c | 92 +++++---- dll/ntdll/ldr/ldrutils.c | 471 +++++++++++++++++++++++++---------------------- 2 files changed, 287 insertions(+), 276 deletions(-) diff --git a/dll/ntdll/ldr/ldrpe.c b/dll/ntdll/ldr/ldrpe.c index 10d128f2c9..fb217ed686 100644 --- a/dll/ntdll/ldr/ldrpe.c +++ b/dll/ntdll/ldr/ldrpe.c @@ -815,7 +815,6 @@ LdrpWalkImportDescriptor(IN LPWSTR DllPath OPTIONAL, return Status; } -/* FIXME: This function is missing SxS support */ NTSTATUS NTAPI LdrpLoadImportModule(IN PWSTR DllPath OPTIONAL, @@ -831,9 +830,14 @@ LdrpLoadImportModule(IN PWSTR DllPath OPTIONAL, NTSTATUS Status; PPEB Peb = RtlGetCurrentPeb(); PTEB Teb = NtCurrentTeb(); + UNICODE_STRING RedirectedImpDescName; + BOOLEAN RedirectedDll; DPRINT("LdrpLoadImportModule('%S' '%s' %p %p)\n", DllPath, ImportName, DataTableEntry, Existing); + RedirectedDll = FALSE; + RtlInitEmptyUnicodeString(&RedirectedImpDescName, NULL, 0); + /* Convert import descriptor name to unicode string */ ImpDescName = &Teb->StaticUnicodeString; RtlInitAnsiString(&AnsiString, ImportName); @@ -883,76 +887,59 @@ LdrpLoadImportModule(IN PWSTR DllPath OPTIONAL, &LdrApiDefaultExtension); } + /* Check if the SxS Assemblies specify another file */ + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + ImpDescName, + &LdrApiDefaultExtension, + NULL, + &RedirectedImpDescName, + &ImpDescName, + NULL, + NULL, + NULL); + + /* Check success */ + if (NT_SUCCESS(Status)) + { + /* Let Ldrp know */ + RedirectedDll = TRUE; + } + else if (Status != STATUS_SXS_KEY_NOT_FOUND) + { + /* Unrecoverable SxS failure */ + DPRINT1("LDR: RtlDosApplyFileIsolationRedirection_Ustr failed with status %x for dll %wZ\n", Status, ImpDescName); + goto done; + } + /* Check if it's loaded */ if (LdrpCheckForLoadedDll(DllPath, ImpDescName, TRUE, - FALSE, + RedirectedDll, DataTableEntry)) { /* It's already existing in the list */ *Existing = TRUE; - return STATUS_SUCCESS; + Status = STATUS_SUCCESS; + goto done; } /* We're loading it for the first time */ *Existing = FALSE; -#if 0 - /* Load manifest */ - { - ACTCTX_SECTION_KEYED_DATA data; - NTSTATUS status; - - //DPRINT1("find_actctx_dll for %S\n", fullname); - //RtlInitUnicodeString(&nameW, libname); - data.cbSize = sizeof(data); - status = RtlFindActivationContextSectionString( - FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, - ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, - ImpDescName, - &data); - //if (status != STATUS_SUCCESS) return status; - DPRINT1("Status: 0x%08X\n", status); - - if (NT_SUCCESS(status)) - { - ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *info; - SIZE_T needed, size = 1024; - - for (;;) - { - if (!(info = RtlAllocateHeap(RtlGetProcessHeap(), 0, size))) - { - status = STATUS_NO_MEMORY; - goto done; - } - status = RtlQueryInformationActivationContext(0, data.hActCtx, &data.ulAssemblyRosterIndex, - AssemblyDetailedInformationInActivationContext, - info, size, &needed); - if (status == STATUS_SUCCESS) break; - if (status != STATUS_BUFFER_TOO_SMALL) goto done; - RtlFreeHeap(RtlGetProcessHeap(), 0, info); - size = needed; - } - - DPRINT("manifestpath === %S\n", info->lpAssemblyManifestPath); - DPRINT("DirectoryName === %S\n", info->lpAssemblyDirectoryName); - } - } -done: -#endif - /* Map it */ Status = LdrpMapDll(DllPath, NULL, ImpDescName->Buffer, NULL, TRUE, - FALSE, + RedirectedDll, DataTableEntry); - - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + DPRINT1("LDR: LdrpMapDll failed with status %x for dll %wZ\n", Status, ImpDescName); + goto done; + } /* Walk its import descriptor table */ Status = LdrpWalkImportDescriptor(DllPath, @@ -964,6 +951,9 @@ done: &(*DataTableEntry)->InInitializationOrderLinks); } +done: + RtlFreeUnicodeString(&RedirectedImpDescName); + return Status; } diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index d960c7fcee..2542a9a324 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -28,101 +28,6 @@ PVOID g_pfnSE_ProcessDying; /* FUNCTIONS *****************************************************************/ -/* NOTE: Remove this one once our actctx support becomes better */ -NTSTATUS find_actctx_dll( LPCWSTR libname, WCHAR *fullname ) -{ - static const WCHAR winsxsW[] = {'\\','w','i','n','s','x','s','\\'}; - static const WCHAR dotManifestW[] = {'.','m','a','n','i','f','e','s','t',0}; - - ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *info; - ACTCTX_SECTION_KEYED_DATA data; - UNICODE_STRING nameW; - NTSTATUS status; - SIZE_T needed, size = 1024; - WCHAR *p; - - RtlInitUnicodeString( &nameW, libname ); - data.cbSize = sizeof(data); - status = RtlFindActivationContextSectionString( FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, - ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, - &nameW, &data ); - if (status != STATUS_SUCCESS) return status; - - for (;;) - { - if (!(info = RtlAllocateHeap( RtlGetProcessHeap(), 0, size ))) - { - status = STATUS_NO_MEMORY; - goto done; - } - status = RtlQueryInformationActivationContext( 0, data.hActCtx, &data.ulAssemblyRosterIndex, - AssemblyDetailedInformationInActivationContext, - info, size, &needed ); - if (status == STATUS_SUCCESS) break; - if (status != STATUS_BUFFER_TOO_SMALL) goto done; - RtlFreeHeap( RtlGetProcessHeap(), 0, info ); - size = needed; - } - - DPRINT("manifestpath === %S\n", info->lpAssemblyManifestPath); - DPRINT("DirectoryName === %S\n", info->lpAssemblyDirectoryName); - if (!info->lpAssemblyManifestPath || !info->lpAssemblyDirectoryName) - { - status = STATUS_SXS_KEY_NOT_FOUND; - goto done; - } - - if ((p = wcsrchr( info->lpAssemblyManifestPath, '\\' ))) - { - DWORD dirlen = info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); - - p++; - if (_wcsnicmp( p, info->lpAssemblyDirectoryName, dirlen ) || wcsicmp( p + dirlen, dotManifestW )) - { - /* manifest name does not match directory name, so it's not a global - * windows/winsxs manifest; use the manifest directory name instead */ - dirlen = p - info->lpAssemblyManifestPath; - needed = (dirlen + 1) * sizeof(WCHAR) + nameW.Length; - - p = fullname; - /*if (!(*fullname = p = RtlAllocateHeap( GetProcessHeap(), 0, needed ))) - { - status = STATUS_NO_MEMORY; - goto done; - }*/ - memcpy( p, info->lpAssemblyManifestPath, dirlen * sizeof(WCHAR) ); - p += dirlen; - wcscpy( p, libname ); - goto done; - } - } - - needed = (wcslen(SharedUserData->NtSystemRoot) * sizeof(WCHAR) + - sizeof(winsxsW) + info->ulAssemblyDirectoryNameLength + nameW.Length + 2*sizeof(WCHAR)); - - p = fullname; - //if (!(*fullname = p = RtlAllocateHeap( GetProcessHeap(), 0, needed ))) - //{ - //status = STATUS_NO_MEMORY; - //goto done; - //} - wcscpy( p, SharedUserData->NtSystemRoot ); - p += wcslen(p); - memcpy( p, winsxsW, sizeof(winsxsW) ); - p += sizeof(winsxsW) / sizeof(WCHAR); - memcpy( p, info->lpAssemblyDirectoryName, info->ulAssemblyDirectoryNameLength ); - p += info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); - *p++ = '\\'; - wcscpy( p, libname ); - -done: - RtlFreeHeap( RtlGetProcessHeap(), 0, info ); - RtlReleaseActivationContext( data.hActCtx ); - DPRINT("%S\n", fullname); - return status; -} - - NTSTATUS NTAPI LdrpAllocateUnicodeString(IN OUT PUNICODE_STRING StringOut, @@ -214,19 +119,30 @@ LdrpUpdateLoadCount3(IN PLDR_DATA_TABLE_ENTRY LdrEntry, PIMAGE_IMPORT_DESCRIPTOR ImportEntry; PIMAGE_THUNK_DATA FirstThunk; PLDR_DATA_TABLE_ENTRY Entry; - PUNICODE_STRING ImportNameUnic; + PUNICODE_STRING ImportNameUnic, RedirectedImportName; ANSI_STRING ImportNameAnsi; LPSTR ImportName; ULONG ImportSize; NTSTATUS Status; ULONG i; + BOOLEAN RedirectedDll; + RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED ActCtx; + + /* Set up the Act Ctx */ + ActCtx.Size = sizeof(ActCtx); + ActCtx.Format = RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER; + RtlZeroMemory(&ActCtx.Frame, sizeof(RTL_ACTIVATION_CONTEXT_STACK_FRAME)); + + /* Activate the ActCtx */ + RtlActivateActivationContextUnsafeFast(&ActCtx, + LdrEntry->EntryPointActivationContext); /* Check the action we need to perform */ if ((Flags == LDRP_UPDATE_REFCOUNT) || (Flags == LDRP_UPDATE_PIN)) { /* Make sure entry is not being loaded already */ if (LdrEntry->Flags & LDRP_LOAD_IN_PROGRESS) - return; + goto done; LdrEntry->Flags |= LDRP_LOAD_IN_PROGRESS; } @@ -234,7 +150,7 @@ LdrpUpdateLoadCount3(IN PLDR_DATA_TABLE_ENTRY LdrEntry, { /* Make sure the entry is not being unloaded already */ if (LdrEntry->Flags & LDRP_UNLOAD_IN_PROGRESS) - return; + goto done; LdrEntry->Flags |= LDRP_UNLOAD_IN_PROGRESS; } @@ -267,54 +183,38 @@ LdrpUpdateLoadCount3(IN PLDR_DATA_TABLE_ENTRY LdrEntry, if (NT_SUCCESS(Status)) { - if (LdrpCheckForLoadedDll(NULL, - ImportNameUnic, - TRUE, - FALSE, - &Entry)) + RedirectedDll = FALSE; + RedirectedImportName = ImportNameUnic; + + /* Check if the SxS Assemblies specify another file */ + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + ImportNameUnic, + &LdrApiDefaultExtension, + UpdateString, + NULL, + &RedirectedImportName, + NULL, + NULL, + NULL); + + /* Check success */ + if (NT_SUCCESS(Status)) { - if (Entry->LoadCount != 0xFFFF) + /* Let Ldrp know */ + if (ShowSnaps) { - /* Perform the required action */ - switch (Flags) - { - case LDRP_UPDATE_REFCOUNT: - Entry->LoadCount++; - break; - case LDRP_UPDATE_DEREFCOUNT: - Entry->LoadCount--; - break; - case LDRP_UPDATE_PIN: - Entry->LoadCount = 0xFFFF; - break; - } - - /* Show snaps */ - if (ShowSnaps) - { - DPRINT1("LDR: Flags %lu %wZ (%lx)\n", Flags, ImportNameUnic, Entry->LoadCount); - } + DPRINT1("LDR: %Z got redirected to %wZ\n", &ImportNameAnsi, RedirectedImportName); } - /* Recurse into this entry */ - LdrpUpdateLoadCount3(Entry, Flags, UpdateString); + RedirectedDll = TRUE; } - } - /* Go through forwarders */ - NewImportForwarder = (PIMAGE_BOUND_FORWARDER_REF)(BoundEntry + 1); - for (i = 0; i < BoundEntry->NumberOfModuleForwarderRefs; i++) - { - ImportName = (LPSTR)FirstEntry + NewImportForwarder->OffsetModuleName; - - RtlInitAnsiString(&ImportNameAnsi, ImportName); - Status = RtlAnsiStringToUnicodeString(ImportNameUnic, &ImportNameAnsi, FALSE); - if (NT_SUCCESS(Status)) + if (RedirectedDll || Status == STATUS_SXS_KEY_NOT_FOUND) { if (LdrpCheckForLoadedDll(NULL, - ImportNameUnic, + RedirectedImportName, TRUE, - FALSE, + RedirectedDll, &Entry)) { if (Entry->LoadCount != 0xFFFF) @@ -336,13 +236,105 @@ LdrpUpdateLoadCount3(IN PLDR_DATA_TABLE_ENTRY LdrEntry, /* Show snaps */ if (ShowSnaps) { - DPRINT1("LDR: Flags %lu %wZ (%lx)\n", Flags, ImportNameUnic, Entry->LoadCount); + DPRINT1("LDR: Flags %lu %wZ (%lx)\n", Flags, RedirectedImportName, Entry->LoadCount); } } /* Recurse into this entry */ LdrpUpdateLoadCount3(Entry, Flags, UpdateString); } + else if (RedirectedDll) + { + DPRINT1("LDR: LdrpCheckForLoadedDll failed for redirected dll %wZ\n", RedirectedImportName); + } + } + else + { + /* Unrecoverable SxS failure */ + DPRINT1("LDR: RtlDosApplyFileIsolationRedirection_Ustr failed with status %x for dll %wZ\n", Status, ImportNameUnic); + } + + } + + /* Go through forwarders */ + NewImportForwarder = (PIMAGE_BOUND_FORWARDER_REF)(BoundEntry + 1); + for (i = 0; i < BoundEntry->NumberOfModuleForwarderRefs; i++) + { + ImportName = (LPSTR)FirstEntry + NewImportForwarder->OffsetModuleName; + + RtlInitAnsiString(&ImportNameAnsi, ImportName); + Status = RtlAnsiStringToUnicodeString(ImportNameUnic, &ImportNameAnsi, FALSE); + if (NT_SUCCESS(Status)) + { + RedirectedDll = FALSE; + RedirectedImportName = ImportNameUnic; + + /* Check if the SxS Assemblies specify another file */ + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + ImportNameUnic, + &LdrApiDefaultExtension, + UpdateString, + NULL, + &RedirectedImportName, + NULL, + NULL, + NULL); + /* Check success */ + if (NT_SUCCESS(Status)) + { + if (ShowSnaps) + { + DPRINT1("LDR: %Z got redirected to %wZ\n", &ImportNameAnsi, RedirectedImportName); + } + /* Let Ldrp know */ + RedirectedDll = TRUE; + } + + if (RedirectedDll || Status == STATUS_SXS_KEY_NOT_FOUND) + { + if (LdrpCheckForLoadedDll(NULL, + RedirectedImportName, + TRUE, + RedirectedDll, + &Entry)) + { + if (Entry->LoadCount != 0xFFFF) + { + /* Perform the required action */ + switch (Flags) + { + case LDRP_UPDATE_REFCOUNT: + Entry->LoadCount++; + break; + case LDRP_UPDATE_DEREFCOUNT: + Entry->LoadCount--; + break; + case LDRP_UPDATE_PIN: + Entry->LoadCount = 0xFFFF; + break; + } + + /* Show snaps */ + if (ShowSnaps) + { + DPRINT1("LDR: Flags %lu %wZ (%lx)\n", Flags, RedirectedImportName, Entry->LoadCount); + } + } + + /* Recurse into this entry */ + LdrpUpdateLoadCount3(Entry, Flags, UpdateString); + } + else if (RedirectedDll) + { + DPRINT1("LDR: LdrpCheckForLoadedDll failed with status %x for redirected dll %wZ\n", Status, RedirectedImportName); + } + } + else + { + /* Unrecoverable SxS failure */ + DPRINT1("LDR: RtlDosApplyFileIsolationRedirection_Ustr failed with status %x for dll %wZ\n", Status, ImportNameUnic); + } + } NewImportForwarder++; @@ -352,7 +344,7 @@ LdrpUpdateLoadCount3(IN PLDR_DATA_TABLE_ENTRY LdrEntry, } /* We're done */ - return; + goto done; } /* Check oldstyle import descriptor */ @@ -380,44 +372,87 @@ LdrpUpdateLoadCount3(IN PLDR_DATA_TABLE_ENTRY LdrEntry, Status = RtlAnsiStringToUnicodeString(ImportNameUnic, &ImportNameAnsi, FALSE); if (NT_SUCCESS(Status)) { - if (LdrpCheckForLoadedDll(NULL, - ImportNameUnic, - TRUE, - FALSE, - &Entry)) + RedirectedDll = FALSE; + RedirectedImportName = ImportNameUnic; + + /* Check if the SxS Assemblies specify another file */ + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + ImportNameUnic, + &LdrApiDefaultExtension, + UpdateString, + NULL, + &RedirectedImportName, + NULL, + NULL, + NULL); + /* Check success */ + if (NT_SUCCESS(Status)) { - if (Entry->LoadCount != 0xFFFF) + if (ShowSnaps) { - /* Perform the required action */ - switch (Flags) - { - case LDRP_UPDATE_REFCOUNT: - Entry->LoadCount++; - break; - case LDRP_UPDATE_DEREFCOUNT: - Entry->LoadCount--; - break; - case LDRP_UPDATE_PIN: - Entry->LoadCount = 0xFFFF; - break; - } + DPRINT1("LDR: %Z got redirected to %wZ\n", &ImportNameAnsi, RedirectedImportName); + } - /* Show snaps */ - if (ShowSnaps) + /* Let Ldrp know */ + RedirectedDll = TRUE; + } + + if (RedirectedDll || Status == STATUS_SXS_KEY_NOT_FOUND) + { + if (LdrpCheckForLoadedDll(NULL, + RedirectedImportName, + TRUE, + RedirectedDll, + &Entry)) + { + if (Entry->LoadCount != 0xFFFF) { - DPRINT1("LDR: Flags %lu %wZ (%lx)\n", Flags, ImportNameUnic, Entry->LoadCount); + /* Perform the required action */ + switch (Flags) + { + case LDRP_UPDATE_REFCOUNT: + Entry->LoadCount++; + break; + case LDRP_UPDATE_DEREFCOUNT: + Entry->LoadCount--; + break; + case LDRP_UPDATE_PIN: + Entry->LoadCount = 0xFFFF; + break; + } + + /* Show snaps */ + if (ShowSnaps) + { + DPRINT1("LDR: Flags %lu %wZ (%lx)\n", Flags, RedirectedImportName, Entry->LoadCount); + } } + + /* Recurse */ + LdrpUpdateLoadCount3(Entry, Flags, UpdateString); + } + else if (RedirectedDll) + { + DPRINT1("LDR: LdrpCheckForLoadedDll failed for redirected dll %wZ\n", RedirectedImportName); } - /* Recurse */ - LdrpUpdateLoadCount3(Entry, Flags, UpdateString); } + else + { + /* Unrecoverable SxS failure */ + DPRINT1("LDR: RtlDosApplyFileIsolationRedirection_Ustr failed for dll %wZ\n", ImportNameUnic); + } + } /* Go to the next entry */ ImportEntry++; } } + +done: + /* Release the context */ + RtlDeactivateActivationContextUnsafeFast(&ActCtx); } VOID @@ -665,7 +700,6 @@ LdrpResolveDllName(PWSTR DllPath, PWCHAR NameBuffer, p1, p2 = 0; ULONG Length; ULONG BufSize = 500; - NTSTATUS Status; /* Allocate space for full DLL name */ FullDllName->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufSize + sizeof(UNICODE_NULL)); @@ -680,25 +714,14 @@ LdrpResolveDllName(PWSTR DllPath, if (!Length || Length > BufSize) { - /* HACK: Try to find active context dll */ - Status = find_actctx_dll(DllName, FullDllName->Buffer); - if(Status == STATUS_SUCCESS) + if (ShowSnaps) { - Length = wcslen(FullDllName->Buffer) * sizeof(WCHAR); - DPRINT1("found %S for %S\n", FullDllName->Buffer, DllName); + DPRINT1("LDR: LdrResolveDllName - Unable to find "); + DPRINT1("%ws from %ws\n", DllName, DllPath ? DllPath : LdrpDefaultPath.Buffer); } - else - { - /* NOTE: This code should remain after removing the hack */ - if (ShowSnaps) - { - DPRINT1("LDR: LdrResolveDllName - Unable to find "); - DPRINT1("%ws from %ws\n", DllName, DllPath ? DllPath : LdrpDefaultPath.Buffer); - } - RtlFreeUnicodeString(FullDllName); - return FALSE; - } + RtlFreeUnicodeString(FullDllName); + return FALSE; } /* Construct full DLL name */ @@ -1038,7 +1061,7 @@ LdrpMapDll(IN PWSTR SearchPath OPTIONAL, } /* Check if we have a known dll directory */ - if (LdrpKnownDllObjectDirectory) + if (LdrpKnownDllObjectDirectory && Redirect == FALSE) { /* Check if the path is full */ while (*p1) @@ -1977,8 +2000,10 @@ LdrpCheckForLoadedDll(IN PWSTR DllPath, /* Look in the hash table if flag was set */ lookinhash: - if (Flag) + if (Flag /* the second check is a hack */ && !RedirectedDll) { + /* FIXME: if we get redirected dll it means that we also get a full path so we need to find its filename for the hash lookup */ + /* Get hash index */ HashIndex = LDR_GET_HASH_ENTRY(DllName->Buffer[0]); @@ -2006,58 +2031,54 @@ lookinhash: return FALSE; } - /* Check if there is a full path in this DLL */ - wc = DllName->Buffer; - while (*wc) + /* Check if this is a redirected DLL */ + if (RedirectedDll) { - /* Check for a slash in the current position*/ - if ((*wc == L'\\') || (*wc == L'/')) + /* Redirected dlls already have a full path */ + FullPath = TRUE; + FullDllName = *DllName; + } + else + { + /* Check if there is a full path in this DLL */ + wc = DllName->Buffer; + while (*wc) { - /* Found the slash, so dll name contains path */ - FullPath = TRUE; - - /* Setup full dll name string */ - FullDllName.Buffer = NameBuf; - - /* FIXME: This is from the Windows 2000 loader, not XP/2003, we should call LdrpSearchPath */ - Length = RtlDosSearchPath_U(DllPath ? DllPath : LdrpDefaultPath.Buffer, - DllName->Buffer, - NULL, - sizeof(NameBuf) - sizeof(UNICODE_NULL), - FullDllName.Buffer, - NULL); - - /* Check if that was successful */ - if (!(Length) || (Length > (sizeof(NameBuf) - sizeof(UNICODE_NULL)))) + /* Check for a slash in the current position*/ + if ((*wc == L'\\') || (*wc == L'/')) { - /* HACK: Try to find active context dll */ - Status = find_actctx_dll(DllName->Buffer, FullDllName.Buffer); - if(Status == STATUS_SUCCESS) + /* Found the slash, so dll name contains path */ + FullPath = TRUE; + + /* Setup full dll name string */ + FullDllName.Buffer = NameBuf; + + /* FIXME: This is from the Windows 2000 loader, not XP/2003, we should call LdrpSearchPath */ + Length = RtlDosSearchPath_U(DllPath ? DllPath : LdrpDefaultPath.Buffer, + DllName->Buffer, + NULL, + sizeof(NameBuf) - sizeof(UNICODE_NULL), + FullDllName.Buffer, + NULL); + + /* Check if that was successful */ + if (!(Length) || (Length > (sizeof(NameBuf) - sizeof(UNICODE_NULL)))) { - Length = wcslen(FullDllName.Buffer) * sizeof(WCHAR); - DPRINT1("found %S for %S\n", FullDllName.Buffer, DllName->Buffer); - } - else - { - - if (ShowSnaps) - { - DPRINT1("LDR: LdrpCheckForLoadedDll - Unable To Locate %wZ: 0x%08x\n", - &DllName, Length); + if (ShowSnaps) + { + DPRINT1("LDR: LdrpCheckForLoadedDll - Unable To Locate %wZ: 0x%08x\n", + &DllName, Length); + } } - /* Return failure */ - return FALSE; - } + /* Full dll name is found */ + FullDllName.Length = Length; + FullDllName.MaximumLength = FullDllName.Length + sizeof(UNICODE_NULL); + break; } - /* Full dll name is found */ - FullDllName.Length = Length; - FullDllName.MaximumLength = FullDllName.Length + sizeof(UNICODE_NULL); - break; + wc++; } - - wc++; } /* Go check the hash table */

6 years, 10 months

[reactos] 02/06: [NTDLL] Implement RtlDosApplyFileIsolationRedirection_Ustr based on existing wine's code for ldr. .local redirection is not implemented yet.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7000fe2340aedfd1c1fc6… commit 7000fe2340aedfd1c1fc643f50d1aa1036c7530e Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Oct 3 21:57:44 2017 +0300 [NTDLL] Implement RtlDosApplyFileIsolationRedirection_Ustr based on existing wine's code for ldr. .local redirection is not implemented yet. --- dll/ntdll/rtl/libsupp.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 222 insertions(+), 1 deletion(-) diff --git a/dll/ntdll/rtl/libsupp.c b/dll/ntdll/rtl/libsupp.c index 08a26ccc99..d29ccaf82d 100644 --- a/dll/ntdll/rtl/libsupp.c +++ b/dll/ntdll/rtl/libsupp.c @@ -642,6 +642,133 @@ RtlPcToFileHeader(IN PVOID PcValue, return ImageBase; } +NTSTATUS get_buffer(LPWSTR *buffer, SIZE_T needed, PUNICODE_STRING CallerBuffer, BOOLEAN bAllocateBuffer) +{ + WCHAR *p; + + if (CallerBuffer && CallerBuffer->MaximumLength > needed) + { + p = CallerBuffer->Buffer; + CallerBuffer->Length = needed - sizeof(WCHAR); + } + else + { + if (!bAllocateBuffer) + return STATUS_BUFFER_TOO_SMALL; + + if (CallerBuffer) + CallerBuffer->Buffer[0] = 0; + + p = RtlAllocateHeap(RtlGetProcessHeap(), 0, needed ); + if (!p) + return STATUS_NO_MEMORY; + } + *buffer = p; + + return STATUS_SUCCESS; +} + +/* NOTE: Remove this one once our actctx support becomes better */ +NTSTATUS find_actctx_dll( PUNICODE_STRING pnameW, LPWSTR *fullname, PUNICODE_STRING CallerBuffer, BOOLEAN bAllocateBuffer) +{ + static const WCHAR winsxsW[] = {'\\','w','i','n','s','x','s','\\'}; + static const WCHAR dotManifestW[] = {'.','m','a','n','i','f','e','s','t',0}; + + ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *info; + ACTCTX_SECTION_KEYED_DATA data; + NTSTATUS status; + SIZE_T needed, size = 1024; + WCHAR *p; + + data.cbSize = sizeof(data); + status = RtlFindActivationContextSectionString( FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, + ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, + pnameW, &data ); + if (status != STATUS_SUCCESS) + { + //DPRINT1("RtlFindActivationContextSectionString returned 0x%x for %wZ\n", status, pnameW); + return status; + } + + for (;;) + { + if (!(info = RtlAllocateHeap( RtlGetProcessHeap(), 0, size ))) + { + status = STATUS_NO_MEMORY; + goto done; + } + status = RtlQueryInformationActivationContext( 0, data.hActCtx, &data.ulAssemblyRosterIndex, + AssemblyDetailedInformationInActivationContext, + info, size, &needed ); + if (status == STATUS_SUCCESS) break; + if (status != STATUS_BUFFER_TOO_SMALL) goto done; + RtlFreeHeap( RtlGetProcessHeap(), 0, info ); + size = needed; + } + + DPRINT("manifestpath === %S\n", info->lpAssemblyManifestPath); + DPRINT("DirectoryName === %S\n", info->lpAssemblyDirectoryName); + if (!info->lpAssemblyManifestPath /*|| !info->lpAssemblyDirectoryName*/) + { + status = STATUS_SXS_KEY_NOT_FOUND; + goto done; + } + + if ((p = wcsrchr( info->lpAssemblyManifestPath, '\\' ))) + { + DWORD dirlen = info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); + + p++; + if (!info->lpAssemblyDirectoryName || _wcsnicmp( p, info->lpAssemblyDirectoryName, dirlen ) || wcsicmp( p + dirlen, dotManifestW )) + { + /* manifest name does not match directory name, so it's not a global + * windows/winsxs manifest; use the manifest directory name instead */ + dirlen = p - info->lpAssemblyManifestPath; + needed = (dirlen + 1) * sizeof(WCHAR) + pnameW->Length; + + status = get_buffer(fullname, needed, CallerBuffer, bAllocateBuffer); + if (!NT_SUCCESS(status)) + goto done; + + p = *fullname; + + memcpy( p, info->lpAssemblyManifestPath, dirlen * sizeof(WCHAR) ); + p += dirlen; + memcpy( p, pnameW->Buffer, pnameW->Length); + p += (pnameW->Length / sizeof(WCHAR)); + *p = L'\0'; + + goto done; + } + } + + needed = (wcslen(SharedUserData->NtSystemRoot) * sizeof(WCHAR) + + sizeof(winsxsW) + info->ulAssemblyDirectoryNameLength + pnameW->Length + 2*sizeof(WCHAR)); + + status = get_buffer(fullname, needed, CallerBuffer, bAllocateBuffer); + if (!NT_SUCCESS(status)) + goto done; + + p = *fullname; + + wcscpy( p, SharedUserData->NtSystemRoot ); + p += wcslen(p); + memcpy( p, winsxsW, sizeof(winsxsW) ); + p += sizeof(winsxsW) / sizeof(WCHAR); + memcpy( p, info->lpAssemblyDirectoryName, info->ulAssemblyDirectoryNameLength ); + p += info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); + *p++ = L'\\'; + memcpy( p, pnameW->Buffer, pnameW->Length); + p += (pnameW->Length / sizeof(WCHAR)); + *p = L'\0'; + +done: + RtlFreeHeap( RtlGetProcessHeap(), 0, info ); + RtlReleaseActivationContext( data.hActCtx ); + DPRINT("%S\n", fullname); + return status; +} + /* * @unimplemented */ @@ -658,7 +785,101 @@ RtlDosApplyFileIsolationRedirection_Ustr(IN ULONG Flags, IN PSIZE_T FileNameSize, IN PSIZE_T RequiredLength) { - return STATUS_SXS_KEY_NOT_FOUND; + NTSTATUS Status; + LPWSTR fullname; + WCHAR buffer [MAX_PATH]; + UNICODE_STRING localStr, localStr2, *pstrParam; + WCHAR *p; + BOOLEAN GotExtension; + WCHAR c; + + /* Check for invalid parameters */ + if (!OriginalName) + { + return STATUS_INVALID_PARAMETER; + } + + if (!DynamicString && !StaticString) + { + return STATUS_INVALID_PARAMETER; + } + + if ((DynamicString) && (StaticString) && !(NewName)) + { + return STATUS_INVALID_PARAMETER; + } + + if (!OriginalName->Buffer || OriginalName->Length == 0) + { + return STATUS_SXS_KEY_NOT_FOUND; + } + + if (StaticString && (OriginalName == StaticString || OriginalName->Buffer == StaticString->Buffer)) + { + return STATUS_SXS_KEY_NOT_FOUND; + } + + pstrParam = OriginalName; + + /* Get the file name with an extension */ + p = OriginalName->Buffer + OriginalName->Length / sizeof(WCHAR) - 1; + GotExtension = FALSE; + while (p >= OriginalName->Buffer) + { + c = *p--; + if (c == L'.') + { + GotExtension = TRUE; + } + else if (c == L'\\') + { + localStr.Buffer = p + 2; + localStr.Length = OriginalName->Length - ((ULONG_PTR)localStr.Buffer - (ULONG_PTR)OriginalName->Buffer); + localStr.MaximumLength = OriginalName->MaximumLength - ((ULONG_PTR)localStr.Buffer - (ULONG_PTR)OriginalName->Buffer); + pstrParam = &localStr; + break; + } + } + + if (!GotExtension) + { + if (!Extension) + { + return STATUS_SXS_KEY_NOT_FOUND; + } + + if (pstrParam->Length + Extension->Length > sizeof(buffer)) + { + //FIXME! + return STATUS_NO_MEMORY; + } + + RtlInitEmptyUnicodeString(&localStr2, buffer, sizeof(buffer)); + RtlAppendUnicodeStringToString(&localStr2, pstrParam); + RtlAppendUnicodeStringToString(&localStr2, Extension); + pstrParam = &localStr2; + } + + /* Use wine's function as long as we use wine's sxs implementation in ntdll */ + Status = find_actctx_dll(pstrParam, &fullname, StaticString, DynamicString != NULL); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + DPRINT("Redirecting %wZ to %S\n", OriginalName, fullname); + + if (!StaticString || StaticString->Buffer != fullname) + { + RtlInitUnicodeString(DynamicString, fullname); + *NewName = DynamicString; + } + else + { + *NewName = StaticString; + } + + return Status; } /*

6 years, 10 months

[reactos] 01/06: [RTL] find_string_index: name parameter may not be null terminated

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51c694274f3eef1fbb18a… commit 51c694274f3eef1fbb18ac54794bb43eab333b4b Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Oct 3 21:51:46 2017 +0300 [RTL] find_string_index: name parameter may not be null terminated --- sdk/lib/rtl/actctx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/lib/rtl/actctx.c b/sdk/lib/rtl/actctx.c index 3768f7201b..4cf9bbaa4b 100644 --- a/sdk/lib/rtl/actctx.c +++ b/sdk/lib/rtl/actctx.c @@ -3222,7 +3222,8 @@ static struct string_index *find_string_index(const struct strsection_header *se { const WCHAR *nameW = (WCHAR*)((BYTE*)section + iter->name_offset); - if (!strcmpiW(nameW, name->Buffer)) + if (!_wcsnicmp(nameW, name->Buffer, name->Length / sizeof(WCHAR)) && + wcslen(nameW) == name->Length / sizeof(WCHAR)) { index = iter; break;

6 years, 10 months

[reactos] 01/01: Revert 57c0678 (PR #194) that has been erroneously committed too early.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff8d8a81621d3e036fc92… commit ff8d8a81621d3e036fc92e6c400b831ac973ef5b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 24 16:54:48 2017 +0100 Revert 57c0678 (PR #194) that has been erroneously committed too early. --- ntoskrnl/ex/init.c | 2 +- ntoskrnl/inbv/inbv.c | 235 +++++---------------------------------- ntoskrnl/inbv/logo/line.bmp | Bin 2038 -> 0 bytes ntoskrnl/include/internal/inbv.h | 15 +-- ntoskrnl/include/resource.h | 3 - ntoskrnl/ntoskrnl.rc | 1 - 6 files changed, 28 insertions(+), 228 deletions(-) diff --git a/ntoskrnl/ex/init.c b/ntoskrnl/ex/init.c index e4ffdd63bd..71f27efe60 100644 --- a/ntoskrnl/ex/init.c +++ b/ntoskrnl/ex/init.c @@ -1382,7 +1382,7 @@ Phase1InitializationDiscard(IN PVOID Context) /* Setup the boot driver */ InbvEnableBootDriver(!NoGuiBoot); - InbvDriverInitialize(LoaderBlock, IDB_MAX_RESOURCE); + InbvDriverInitialize(LoaderBlock, 18); /* Check if GUI boot is enabled */ if (!NoGuiBoot) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index 45520c254e..698e8bf380 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -27,7 +27,7 @@ /* * Enable this define when Inbv will support rotating progress bar. */ -#define INBV_ROTBAR_IMPLEMENTED +// #define INBV_ROTBAR_IMPLEMENTED static KSPIN_LOCK BootDriverLock; static KIRQL InbvOldIrql; @@ -41,19 +41,12 @@ static INBV_PROGRESS_STATE InbvProgressState; static BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; static INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters = NULL; static ULONG ResourceCount = 0; -static PUCHAR ResourceList[1 + IDB_MAX_RESOURCE]; // First entry == NULL, followed by 'ResourceCount' entries. +static PUCHAR ResourceList[1 + IDB_CLUSTER_SERVER]; // First entry == NULL, followed by 'ResourceCount' entries. #ifdef INBV_ROTBAR_IMPLEMENTED -/* - * Change this to modify progress bar behaviour - */ -#define ROT_BAR_DEFAULT_MODE RB_PROGRESS_BAR static BOOLEAN RotBarThreadActive = FALSE; static ROT_BAR_TYPE RotBarSelection; static ULONG PltRotBarStatus; -static PVOID RotBarThread = NULL; -static UCHAR RotBarBuffer[24 * 9]; -static UCHAR RotLineBuffer[640 * 6]; #endif @@ -769,147 +762,6 @@ NtDisplayString(IN PUNICODE_STRING DisplayString) return STATUS_SUCCESS; } -#ifdef INBV_ROTBAR_IMPLEMENTED -static -VOID -NTAPI -InbvRotationThread( - _In_ PVOID Context) -{ - ULONG X, Y, Index, Total = 18; - LARGE_INTEGER Delay; - - InbvAcquireLock(); - if (RotBarSelection == RB_SQUARE_CELLS) - { - Delay.QuadPart = -800000; // 0.08 sec - Index = 0; - } - else - { - Delay.QuadPart = -600000; // 0.06 sec - Index = 32; - } - X = ProgressBarLeft + 2; - Y = ProgressBarTop + 2; - InbvReleaseLock(); - - while (InbvDisplayState == INBV_DISPLAY_STATE_OWNED && PltRotBarStatus != 3) - { - InbvAcquireLock(); - - if (RotBarSelection == RB_SQUARE_CELLS) - { - if (Index >= 3) - { - /* Fill previous bar position */ - VidSolidColorFill(X + ((Index - 3) * 8), Y, (X + ((Index - 3) * 8)) + 8 - 1, Y + 9 - 1, 0); - } - if (Index < Total - 1) - { - /* Draw the progress bar bit */ - if (Index < 2) - { - /* Appearing from the left */ - VidBufferToScreenBlt(RotBarBuffer + 8 * (2 - Index) / 2, X, Y, 22 - 8 * (2 - Index), 9, 24); - } - else if (Index >= Total - 3) - { - /* Hiding to the right */ - VidBufferToScreenBlt(RotBarBuffer, X + ((Index - 2) * 8), Y, 22 - 8 * (4 - (Total - Index)), 9, 24); - } - else - { - VidBufferToScreenBlt(RotBarBuffer, X + ((Index - 2) * 8), Y, 22, 9, 24); - } - } - Index = (Index + 1) % Total; - } - else if (RotBarSelection == RB_PROGRESS_BAR) - { - /* Right part */ - VidBufferToScreenBlt(RotLineBuffer, Index, 474, 640 - Index, 6, 640); - if (Index > 0) - { - /* Left part */ - VidBufferToScreenBlt(RotLineBuffer + (640 - Index) / 2, 0, 474, Index - 2, 6, 640); - } - Index = (Index + 32) % 640; - } - - InbvReleaseLock(); - - /* Wait for a bit */ - KeDelayExecutionThread(KernelMode, FALSE, &Delay); - } - PsTerminateSystemThread(STATUS_SUCCESS); -} - -VOID -NTAPI -INIT_FUNCTION -InbvRotBarInit(VOID) -{ - NTSTATUS Status; - HANDLE ThreadHandle = NULL; - - if (!InbvBootDriverInstalled || RotBarSelection == RB_UNSPECIFIED) - return; - - RotBarThread = NULL; - PltRotBarStatus = 0; - - Status = PsCreateSystemThread(&ThreadHandle, - SYNCHRONIZE, - NULL, - NULL, - NULL, - InbvRotationThread, - NULL); - - if (NT_SUCCESS(Status)) - { - Status = ObReferenceObjectByHandle(ThreadHandle, - SYNCHRONIZE, - PsThreadType, - KernelMode, - &RotBarThread, - NULL); - if (NT_SUCCESS(Status)) - { - KeSetPriorityThread(RotBarThread, HIGH_PRIORITY); - RotBarThreadActive = TRUE; - } - ObCloseHandle(ThreadHandle, KernelMode); - } -} - -VOID -NTAPI -INIT_FUNCTION -InbvRotBarStop(VOID) -{ - if (!RotBarThread) - { - RotBarThreadActive = FALSE; - return; - } - - InbvAcquireLock(); - PltRotBarStatus = 3; - InbvReleaseLock(); - - KeWaitForSingleObject(RotBarThread, - Executive, - KernelMode, - FALSE, - NULL); - ObDereferenceObject(RotBarThread); - RotBarThread = NULL; - RotBarThreadActive = FALSE; -} -#endif - VOID NTAPI INIT_FUNCTION @@ -918,14 +770,13 @@ DisplayBootBitmap(IN BOOLEAN TextMode) PVOID Header = NULL, Footer = NULL, Screen = NULL; #ifdef INBV_ROTBAR_IMPLEMENTED - UCHAR Buffer[24 * 9]; - PVOID Bar = NULL, LineBmp = NULL; + PVOID Bar = NULL; ROT_BAR_TYPE TempRotBarSelection = RB_UNSPECIFIED; - LARGE_INTEGER Delay; #endif #ifdef REACTOS_SKUS PVOID Text = NULL; + UCHAR Buffer[64]; #endif #ifdef INBV_ROTBAR_IMPLEMENTED @@ -933,7 +784,9 @@ DisplayBootBitmap(IN BOOLEAN TextMode) if (RotBarThreadActive) { /* Reset the progress bar */ - InbvRotBarStop(); + InbvAcquireLock(); + RotBarSelection = RB_UNSPECIFIED; + InbvReleaseLock(); } #endif @@ -1018,9 +871,6 @@ DisplayBootBitmap(IN BOOLEAN TextMode) Bar = InbvGetResourceAddress(IDB_BAR_SERVER); #endif } -#else - /* Use default status bar */ - Bar = InbvGetResourceAddress(IDB_BAR_WKSTA); #endif /* Make sure we have a logo */ @@ -1043,7 +893,7 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #ifdef INBV_ROTBAR_IMPLEMENTED /* Choose progress bar */ - TempRotBarSelection = ROT_BAR_DEFAULT_MODE; + TempRotBarSelection = RB_SQUARE_CELLS; #endif /* Set progress bar coordinates and display it */ @@ -1070,61 +920,28 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #endif #ifdef INBV_ROTBAR_IMPLEMENTED - if (Bar) - { - /* Save previous screen pixels to buffer */ - InbvScreenToBufferBlt(Buffer, 0, 0, 22, 9, 24); - /* Draw the progress bar bit */ - InbvBitBlt(Bar, 0, 0); - /* Store it in global buffer */ - InbvScreenToBufferBlt(RotBarBuffer, 0, 0, 22, 9, 24); - /* Restore screen pixels */ - InbvBufferToScreenBlt(Buffer, 0, 0, 22, 9, 24); - } - - LineBmp = InbvGetResourceAddress(IDB_ROTATING_LINE); - if (LineBmp && TempRotBarSelection == RB_PROGRESS_BAR) - { - /* Draw the line */ - InbvBitBlt(LineBmp, 0, 474); - /* Store it in global buffer */ - InbvScreenToBufferBlt(RotLineBuffer, 0, 474, 640, 6, 640); - } + /* Draw the progress bar bit */ + if (Bar) InbvBitBlt(Bar, 0, 0); #endif /* Display the boot logo and fade it in */ BootLogoFadeIn(); -#ifdef INBV_ROTBAR_IMPLEMENTED - if (TempRotBarSelection != RB_PROGRESS_BAR) - { - /* Hide simple progress bar if not used */ - ShowProgressBar = FALSE; - } - - /* Do we have a system thread? */ - if (!RotBarThreadActive) - { - /* We don't, initialize the progress bar */ - RotBarSelection = TempRotBarSelection; - InbvRotBarInit(); - } + /* Set filter which will draw text display if needed */ + InbvInstallDisplayStringFilter(DisplayFilter); + } - /* Start rotating bar */ +#ifdef INBV_ROTBAR_IMPLEMENTED + /* Do we have a system thread? */ + if (RotBarThreadActive) + { + /* We do, initialize the progress bar */ InbvAcquireLock(); - PltRotBarStatus = 1; + RotBarSelection = TempRotBarSelection; + // InbvRotBarInit(); InbvReleaseLock(); - - if (TempRotBarSelection != RB_UNSPECIFIED) - { - Delay.QuadPart = -3000000; // 0.3 sec - KeDelayExecutionThread(KernelMode, FALSE, &Delay); - } -#endif - - /* Set filter which will draw text display if needed */ - InbvInstallDisplayStringFilter(DisplayFilter); } +#endif } VOID @@ -1156,10 +973,6 @@ NTAPI INIT_FUNCTION FinalizeBootLogo(VOID) { -#ifdef INBV_ROTBAR_IMPLEMENTED - /* Reset rotation bar */ - InbvRotBarStop(); -#endif /* Acquire lock and check the display state */ InbvAcquireLock(); if (InbvGetDisplayState() == INBV_DISPLAY_STATE_OWNED) @@ -1167,6 +980,10 @@ FinalizeBootLogo(VOID) /* Clear the screen */ VidSolidColorFill(0, 0, 639, 479, 0); } - /* Reset lock */ + + /* Reset progress bar and lock */ +#ifdef INBV_ROTBAR_IMPLEMENTED + PltRotBarStatus = 3; +#endif InbvReleaseLock(); } diff --git a/ntoskrnl/inbv/logo/line.bmp b/ntoskrnl/inbv/logo/line.bmp deleted file mode 100644 index d080cad7bb..0000000000 Binary files a/ntoskrnl/inbv/logo/line.bmp and /dev/null differ diff --git a/ntoskrnl/include/internal/inbv.h b/ntoskrnl/include/internal/inbv.h index c1d901ba5a..84d44ba03a 100644 --- a/ntoskrnl/include/internal/inbv.h +++ b/ntoskrnl/include/internal/inbv.h @@ -17,8 +17,7 @@ typedef struct _BT_PROGRESS_INDICATOR typedef enum _ROT_BAR_TYPE { RB_UNSPECIFIED, - RB_SQUARE_CELLS, - RB_PROGRESS_BAR + RB_SQUARE_CELLS } ROT_BAR_TYPE; VOID @@ -27,18 +26,6 @@ InbvUpdateProgressBar( IN ULONG Progress ); -VOID -NTAPI -InbvRotBarInit( - VOID -); - -VOID -NTAPI -InbvRotBarStop( - VOID -); - BOOLEAN NTAPI InbvDriverInitialize( diff --git a/ntoskrnl/include/resource.h b/ntoskrnl/include/resource.h index 2f7c22b1cc..d58d7913f9 100644 --- a/ntoskrnl/include/resource.h +++ b/ntoskrnl/include/resource.h @@ -10,7 +10,6 @@ #define IDB_BAR_SERVER 4 #define IDB_BAR_WKSTA 8 #define IDB_BAR_HOME 9 -#define IDB_ROTATING_LINE 19 #define IDB_PROF_TEXT 10 #define IDB_HOME_TEXT 11 @@ -22,5 +21,3 @@ #define IDB_SERVER_FOOTER 15 #define IDB_STORAGE_SERVER 16 #define IDB_CLUSTER_SERVER 17 - -#define IDB_MAX_RESOURCE IDB_ROTATING_LINE diff --git a/ntoskrnl/ntoskrnl.rc b/ntoskrnl/ntoskrnl.rc index dbe2caccc0..93595d0a42 100644 --- a/ntoskrnl/ntoskrnl.rc +++ b/ntoskrnl/ntoskrnl.rc @@ -39,4 +39,3 @@ IDB_BAR_WKSTA BITMAP "inbv/logo/8.bmp" IDB_SERVER_LOGO BITMAP "inbv/logo/5.bmp" IDB_SERVER_HEADER BITMAP "inbv/logo/14.bmp" IDB_SERVER_FOOTER BITMAP "inbv/logo/15.bmp" -IDB_ROTATING_LINE BITMAP "inbv/logo/line.bmp"

6 years, 10 months

[reactos] 02/02: [SDK] Fix copy-pasta, addendum to 7861960 by Mark Jansen.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f49caecb3b0e0d090693c… commit f49caecb3b0e0d090693c18aa96f3f97daadbbb7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 24 16:48:13 2017 +0100 [SDK] Fix copy-pasta, addendum to 7861960 by Mark Jansen. --- sdk/include/reactos/manifest_dll.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/manifest_dll.rc b/sdk/include/reactos/manifest_dll.rc index 3a036bf3a2..4349cab659 100644 --- a/sdk/include/reactos/manifest_dll.rc +++ b/sdk/include/reactos/manifest_dll.rc @@ -1,5 +1,5 @@ -#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID +#ifndef ISOLATIONAWARE_MANIFEST_RESOURCE_ID #error please include winuser.h before including me! #endif

6 years, 10 months

[reactos] 01/02: [NTOS:INBV] Implement rotation bar for boot screen

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57c067881820c54b7faf8… commit 57c067881820c54b7faf8f03ab57b5f136c5a02c Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Dec 14 15:49:15 2017 +0300 [NTOS:INBV] Implement rotation bar for boot screen --- ntoskrnl/ex/init.c | 2 +- ntoskrnl/inbv/inbv.c | 235 ++++++++++++++++++++++++++++++++++----- ntoskrnl/inbv/logo/line.bmp | Bin 0 -> 2038 bytes ntoskrnl/include/internal/inbv.h | 15 ++- ntoskrnl/include/resource.h | 3 + ntoskrnl/ntoskrnl.rc | 1 + 6 files changed, 228 insertions(+), 28 deletions(-) diff --git a/ntoskrnl/ex/init.c b/ntoskrnl/ex/init.c index 71f27efe60..e4ffdd63bd 100644 --- a/ntoskrnl/ex/init.c +++ b/ntoskrnl/ex/init.c @@ -1382,7 +1382,7 @@ Phase1InitializationDiscard(IN PVOID Context) /* Setup the boot driver */ InbvEnableBootDriver(!NoGuiBoot); - InbvDriverInitialize(LoaderBlock, 18); + InbvDriverInitialize(LoaderBlock, IDB_MAX_RESOURCE); /* Check if GUI boot is enabled */ if (!NoGuiBoot) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index 698e8bf380..45520c254e 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -27,7 +27,7 @@ /* * Enable this define when Inbv will support rotating progress bar. */ -// #define INBV_ROTBAR_IMPLEMENTED +#define INBV_ROTBAR_IMPLEMENTED static KSPIN_LOCK BootDriverLock; static KIRQL InbvOldIrql; @@ -41,12 +41,19 @@ static INBV_PROGRESS_STATE InbvProgressState; static BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; static INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters = NULL; static ULONG ResourceCount = 0; -static PUCHAR ResourceList[1 + IDB_CLUSTER_SERVER]; // First entry == NULL, followed by 'ResourceCount' entries. +static PUCHAR ResourceList[1 + IDB_MAX_RESOURCE]; // First entry == NULL, followed by 'ResourceCount' entries. #ifdef INBV_ROTBAR_IMPLEMENTED +/* + * Change this to modify progress bar behaviour + */ +#define ROT_BAR_DEFAULT_MODE RB_PROGRESS_BAR static BOOLEAN RotBarThreadActive = FALSE; static ROT_BAR_TYPE RotBarSelection; static ULONG PltRotBarStatus; +static PVOID RotBarThread = NULL; +static UCHAR RotBarBuffer[24 * 9]; +static UCHAR RotLineBuffer[640 * 6]; #endif @@ -762,6 +769,147 @@ NtDisplayString(IN PUNICODE_STRING DisplayString) return STATUS_SUCCESS; } +#ifdef INBV_ROTBAR_IMPLEMENTED +static +VOID +NTAPI +InbvRotationThread( + _In_ PVOID Context) +{ + ULONG X, Y, Index, Total = 18; + LARGE_INTEGER Delay; + + InbvAcquireLock(); + if (RotBarSelection == RB_SQUARE_CELLS) + { + Delay.QuadPart = -800000; // 0.08 sec + Index = 0; + } + else + { + Delay.QuadPart = -600000; // 0.06 sec + Index = 32; + } + X = ProgressBarLeft + 2; + Y = ProgressBarTop + 2; + InbvReleaseLock(); + + while (InbvDisplayState == INBV_DISPLAY_STATE_OWNED && PltRotBarStatus != 3) + { + InbvAcquireLock(); + + if (RotBarSelection == RB_SQUARE_CELLS) + { + if (Index >= 3) + { + /* Fill previous bar position */ + VidSolidColorFill(X + ((Index - 3) * 8), Y, (X + ((Index - 3) * 8)) + 8 - 1, Y + 9 - 1, 0); + } + if (Index < Total - 1) + { + /* Draw the progress bar bit */ + if (Index < 2) + { + /* Appearing from the left */ + VidBufferToScreenBlt(RotBarBuffer + 8 * (2 - Index) / 2, X, Y, 22 - 8 * (2 - Index), 9, 24); + } + else if (Index >= Total - 3) + { + /* Hiding to the right */ + VidBufferToScreenBlt(RotBarBuffer, X + ((Index - 2) * 8), Y, 22 - 8 * (4 - (Total - Index)), 9, 24); + } + else + { + VidBufferToScreenBlt(RotBarBuffer, X + ((Index - 2) * 8), Y, 22, 9, 24); + } + } + Index = (Index + 1) % Total; + } + else if (RotBarSelection == RB_PROGRESS_BAR) + { + /* Right part */ + VidBufferToScreenBlt(RotLineBuffer, Index, 474, 640 - Index, 6, 640); + if (Index > 0) + { + /* Left part */ + VidBufferToScreenBlt(RotLineBuffer + (640 - Index) / 2, 0, 474, Index - 2, 6, 640); + } + Index = (Index + 32) % 640; + } + + InbvReleaseLock(); + + /* Wait for a bit */ + KeDelayExecutionThread(KernelMode, FALSE, &Delay); + } + PsTerminateSystemThread(STATUS_SUCCESS); +} + +VOID +NTAPI +INIT_FUNCTION +InbvRotBarInit(VOID) +{ + NTSTATUS Status; + HANDLE ThreadHandle = NULL; + + if (!InbvBootDriverInstalled || RotBarSelection == RB_UNSPECIFIED) + return; + + RotBarThread = NULL; + PltRotBarStatus = 0; + + Status = PsCreateSystemThread(&ThreadHandle, + SYNCHRONIZE, + NULL, + NULL, + NULL, + InbvRotationThread, + NULL); + + if (NT_SUCCESS(Status)) + { + Status = ObReferenceObjectByHandle(ThreadHandle, + SYNCHRONIZE, + PsThreadType, + KernelMode, + &RotBarThread, + NULL); + if (NT_SUCCESS(Status)) + { + KeSetPriorityThread(RotBarThread, HIGH_PRIORITY); + RotBarThreadActive = TRUE; + } + ObCloseHandle(ThreadHandle, KernelMode); + } +} + +VOID +NTAPI +INIT_FUNCTION +InbvRotBarStop(VOID) +{ + if (!RotBarThread) + { + RotBarThreadActive = FALSE; + return; + } + + InbvAcquireLock(); + PltRotBarStatus = 3; + InbvReleaseLock(); + + KeWaitForSingleObject(RotBarThread, + Executive, + KernelMode, + FALSE, + NULL); + ObDereferenceObject(RotBarThread); + RotBarThread = NULL; + RotBarThreadActive = FALSE; +} +#endif + VOID NTAPI INIT_FUNCTION @@ -770,13 +918,14 @@ DisplayBootBitmap(IN BOOLEAN TextMode) PVOID Header = NULL, Footer = NULL, Screen = NULL; #ifdef INBV_ROTBAR_IMPLEMENTED - PVOID Bar = NULL; + UCHAR Buffer[24 * 9]; + PVOID Bar = NULL, LineBmp = NULL; ROT_BAR_TYPE TempRotBarSelection = RB_UNSPECIFIED; + LARGE_INTEGER Delay; #endif #ifdef REACTOS_SKUS PVOID Text = NULL; - UCHAR Buffer[64]; #endif #ifdef INBV_ROTBAR_IMPLEMENTED @@ -784,9 +933,7 @@ DisplayBootBitmap(IN BOOLEAN TextMode) if (RotBarThreadActive) { /* Reset the progress bar */ - InbvAcquireLock(); - RotBarSelection = RB_UNSPECIFIED; - InbvReleaseLock(); + InbvRotBarStop(); } #endif @@ -871,6 +1018,9 @@ DisplayBootBitmap(IN BOOLEAN TextMode) Bar = InbvGetResourceAddress(IDB_BAR_SERVER); #endif } +#else + /* Use default status bar */ + Bar = InbvGetResourceAddress(IDB_BAR_WKSTA); #endif /* Make sure we have a logo */ @@ -893,7 +1043,7 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #ifdef INBV_ROTBAR_IMPLEMENTED /* Choose progress bar */ - TempRotBarSelection = RB_SQUARE_CELLS; + TempRotBarSelection = ROT_BAR_DEFAULT_MODE; #endif /* Set progress bar coordinates and display it */ @@ -920,28 +1070,61 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #endif #ifdef INBV_ROTBAR_IMPLEMENTED - /* Draw the progress bar bit */ - if (Bar) InbvBitBlt(Bar, 0, 0); + if (Bar) + { + /* Save previous screen pixels to buffer */ + InbvScreenToBufferBlt(Buffer, 0, 0, 22, 9, 24); + /* Draw the progress bar bit */ + InbvBitBlt(Bar, 0, 0); + /* Store it in global buffer */ + InbvScreenToBufferBlt(RotBarBuffer, 0, 0, 22, 9, 24); + /* Restore screen pixels */ + InbvBufferToScreenBlt(Buffer, 0, 0, 22, 9, 24); + } + + LineBmp = InbvGetResourceAddress(IDB_ROTATING_LINE); + if (LineBmp && TempRotBarSelection == RB_PROGRESS_BAR) + { + /* Draw the line */ + InbvBitBlt(LineBmp, 0, 474); + /* Store it in global buffer */ + InbvScreenToBufferBlt(RotLineBuffer, 0, 474, 640, 6, 640); + } #endif /* Display the boot logo and fade it in */ BootLogoFadeIn(); - /* Set filter which will draw text display if needed */ - InbvInstallDisplayStringFilter(DisplayFilter); - } - #ifdef INBV_ROTBAR_IMPLEMENTED - /* Do we have a system thread? */ - if (RotBarThreadActive) - { - /* We do, initialize the progress bar */ + if (TempRotBarSelection != RB_PROGRESS_BAR) + { + /* Hide simple progress bar if not used */ + ShowProgressBar = FALSE; + } + + /* Do we have a system thread? */ + if (!RotBarThreadActive) + { + /* We don't, initialize the progress bar */ + RotBarSelection = TempRotBarSelection; + InbvRotBarInit(); + } + + /* Start rotating bar */ InbvAcquireLock(); - RotBarSelection = TempRotBarSelection; - // InbvRotBarInit(); + PltRotBarStatus = 1; InbvReleaseLock(); - } + + if (TempRotBarSelection != RB_UNSPECIFIED) + { + Delay.QuadPart = -3000000; // 0.3 sec + KeDelayExecutionThread(KernelMode, FALSE, &Delay); + } #endif + + /* Set filter which will draw text display if needed */ + InbvInstallDisplayStringFilter(DisplayFilter); + } } VOID @@ -973,6 +1156,10 @@ NTAPI INIT_FUNCTION FinalizeBootLogo(VOID) { +#ifdef INBV_ROTBAR_IMPLEMENTED + /* Reset rotation bar */ + InbvRotBarStop(); +#endif /* Acquire lock and check the display state */ InbvAcquireLock(); if (InbvGetDisplayState() == INBV_DISPLAY_STATE_OWNED) @@ -980,10 +1167,6 @@ FinalizeBootLogo(VOID) /* Clear the screen */ VidSolidColorFill(0, 0, 639, 479, 0); } - - /* Reset progress bar and lock */ -#ifdef INBV_ROTBAR_IMPLEMENTED - PltRotBarStatus = 3; -#endif + /* Reset lock */ InbvReleaseLock(); } diff --git a/ntoskrnl/inbv/logo/line.bmp b/ntoskrnl/inbv/logo/line.bmp new file mode 100644 index 0000000000..d080cad7bb Binary files /dev/null and b/ntoskrnl/inbv/logo/line.bmp differ diff --git a/ntoskrnl/include/internal/inbv.h b/ntoskrnl/include/internal/inbv.h index 84d44ba03a..c1d901ba5a 100644 --- a/ntoskrnl/include/internal/inbv.h +++ b/ntoskrnl/include/internal/inbv.h @@ -17,7 +17,8 @@ typedef struct _BT_PROGRESS_INDICATOR typedef enum _ROT_BAR_TYPE { RB_UNSPECIFIED, - RB_SQUARE_CELLS + RB_SQUARE_CELLS, + RB_PROGRESS_BAR } ROT_BAR_TYPE; VOID @@ -26,6 +27,18 @@ InbvUpdateProgressBar( IN ULONG Progress ); +VOID +NTAPI +InbvRotBarInit( + VOID +); + +VOID +NTAPI +InbvRotBarStop( + VOID +); + BOOLEAN NTAPI InbvDriverInitialize( diff --git a/ntoskrnl/include/resource.h b/ntoskrnl/include/resource.h index d58d7913f9..2f7c22b1cc 100644 --- a/ntoskrnl/include/resource.h +++ b/ntoskrnl/include/resource.h @@ -10,6 +10,7 @@ #define IDB_BAR_SERVER 4 #define IDB_BAR_WKSTA 8 #define IDB_BAR_HOME 9 +#define IDB_ROTATING_LINE 19 #define IDB_PROF_TEXT 10 #define IDB_HOME_TEXT 11 @@ -21,3 +22,5 @@ #define IDB_SERVER_FOOTER 15 #define IDB_STORAGE_SERVER 16 #define IDB_CLUSTER_SERVER 17 + +#define IDB_MAX_RESOURCE IDB_ROTATING_LINE diff --git a/ntoskrnl/ntoskrnl.rc b/ntoskrnl/ntoskrnl.rc index 93595d0a42..dbe2caccc0 100644 --- a/ntoskrnl/ntoskrnl.rc +++ b/ntoskrnl/ntoskrnl.rc @@ -39,3 +39,4 @@ IDB_BAR_WKSTA BITMAP "inbv/logo/8.bmp" IDB_SERVER_LOGO BITMAP "inbv/logo/5.bmp" IDB_SERVER_HEADER BITMAP "inbv/logo/14.bmp" IDB_SERVER_FOOTER BITMAP "inbv/logo/15.bmp" +IDB_ROTATING_LINE BITMAP "inbv/logo/line.bmp"

6 years, 10 months

← Newer
1
...
6
7
8
9
10
11
12
...
36
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 December 2017