Ros-diffs October 2024

ros-diffs@reactos.org

20 participants
117 discussions

[reactos] 01/01: [SHELL32] Fix broken delete file type verb (#7462)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5797340164543d77212b7… commit 5797340164543d77212b7651da863967e36bf767 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Fri Oct 18 14:42:08 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 18 14:42:08 2024 +0200 [SHELL32] Fix broken delete file type verb (#7462) CORE-19809 --- dll/win32/shell32/dialogs/filetypes.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/dialogs/filetypes.cpp b/dll/win32/shell32/dialogs/filetypes.cpp index c02de0eee10..6a958b5cc1c 100644 --- a/dll/win32/shell32/dialogs/filetypes.cpp +++ b/dll/win32/shell32/dialogs/filetypes.cpp @@ -1161,7 +1161,7 @@ EditTypeDlg_WriteClass(HWND hwndDlg, PEDITTYPE_DIALOG pEditType, BOOL OnlyExt = hr != S_OK; HKEY hClassKey; if (FAILED(hr) || RegCreateKeyExW(HKEY_CLASSES_ROOT, ClassKey, 0, NULL, 0, - KEY_QUERY_VALUE |KEY_WRITE, NULL, + KEY_QUERY_VALUE | KEY_WRITE, NULL, &hClassKey, NULL) != ERROR_SUCCESS) { return FALSE; @@ -1221,7 +1221,7 @@ EditTypeDlg_WriteClass(HWND hwndDlg, PEDITTYPE_DIALOG pEditType, } HKEY hShellKey; - if (RegCreateKeyExW(hClassKey, L"shell", 0, NULL, 0, KEY_WRITE, NULL, + if (RegCreateKeyExW(hClassKey, L"shell", 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &hShellKey, NULL) != ERROR_SUCCESS) { RegCloseKey(hClassKey);

2 months, 1 week

[reactos] 05/05: [ADVAPI32] Add some missing Vista+ exports

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30952992e1a13b8f0c0bb… commit 30952992e1a13b8f0c0bb4cabfaffe4ef3451522 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Sep 17 13:35:11 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Oct 17 18:39:37 2024 +0300 [ADVAPI32] Add some missing Vista+ exports --- dll/win32/advapi32/advapi32.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dll/win32/advapi32/advapi32.spec b/dll/win32/advapi32/advapi32.spec index 432a4652f73..b684b09c4e3 100644 --- a/dll/win32/advapi32/advapi32.spec +++ b/dll/win32/advapi32/advapi32.spec @@ -482,6 +482,8 @@ @ stub RegConnectRegistryExA @ stub RegConnectRegistryExW @ stdcall RegConnectRegistryW(wstr long ptr) +@ stdcall -version=0x600+ RegCopyTreeA(ptr str ptr) +@ stdcall -version=0x600+ RegCopyTreeW(ptr wstr ptr) @ stdcall RegCreateKeyA(long str ptr) @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) @@ -490,6 +492,8 @@ @ stdcall RegDeleteKeyExA(long str long long) @ stdcall RegDeleteKeyExW(long wstr long long) @ stdcall RegDeleteKeyW(long wstr) +@ stdcall -version=0x600+ RegDeleteTreeA(long str) +@ stdcall -version=0x600+ RegDeleteTreeW(long wstr) @ stdcall RegDeleteValueA(long str) @ stdcall RegDeleteValueW(long wstr) @ stdcall RegDisablePredefinedCache() @@ -533,6 +537,8 @@ @ stdcall RegSaveKeyExW(long str ptr long) @ stdcall RegSaveKeyW(long ptr ptr) @ stdcall RegSetKeySecurity(long long ptr) +@ stdcall -version=0x600+ RegSetKeyValueA(long str str long ptr long) +@ stdcall -version=0x600+ RegSetKeyValueW(long wstr wstr long ptr long) @ stdcall RegSetValueA(long str long ptr long) @ stdcall RegSetValueExA(long str long long ptr long) @ stdcall RegSetValueExW(long wstr long long ptr long)

2 months, 1 week

[reactos] 04/05: [ADVAPI32][ETWTRACE] Add etwtrace library and link advapi32 to it on NT6+

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b27429b12610063c05f95… commit b27429b12610063c05f951db21ecdea38af50b5e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Sep 14 17:35:15 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Oct 17 18:39:37 2024 +0300 [ADVAPI32][ETWTRACE] Add etwtrace library and link advapi32 to it on NT6+ --- dll/ntdll/CMakeLists.txt | 10 +++++++--- dll/win32/advapi32/CMakeLists.txt | 3 +++ dll/win32/advapi32/advapi32.spec | 42 +++++++++++++++++++-------------------- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt index 065188705f6..fdd7c11262a 100644 --- a/dll/ntdll/CMakeLists.txt +++ b/dll/ntdll/CMakeLists.txt @@ -24,14 +24,18 @@ add_library(rtl_um OBJECT target_link_libraries(rtl_um apisets ${PSEH_LIB}) add_dependencies(rtl_um psdk) +# On NT6+ this is used by advapi32 +add_library(etwtrace etw/trace.c) +target_link_libraries(etwtrace ${PSEH_LIB}) +add_dependencies(etwtrace psdk) + list(APPEND SOURCE dbg/dbgui.c ldr/ldrapi.c ldr/ldrinit.c ldr/ldrpe.c ldr/ldrutils.c - ldr/verifier.c - etw/trace.c) + ldr/verifier.c) if(ARCH STREQUAL "i386") list(APPEND ASM_SOURCE dispatch/i386/dispatch.S) @@ -61,7 +65,7 @@ set_module_type(ntdll win32dll ENTRYPOINT 0) set_subsystem(ntdll console) ################# END HACK ################# -target_link_libraries(ntdll csrlib rtl rtl_um rtl_vista ntdllsys libcntpr uuid ${PSEH_LIB}) +target_link_libraries(ntdll etwtrace csrlib rtl rtl_um rtl_vista ntdllsys libcntpr uuid ${PSEH_LIB}) if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600) target_link_libraries(ntdll cryptlib) endif() diff --git a/dll/win32/advapi32/CMakeLists.txt b/dll/win32/advapi32/CMakeLists.txt index cb2e495b1da..d1833586bb0 100644 --- a/dll/win32/advapi32/CMakeLists.txt +++ b/dll/win32/advapi32/CMakeLists.txt @@ -62,6 +62,9 @@ add_library(advapi32 MODULE set_module_type(advapi32 win32dll UNICODE ENTRYPOINT DllMain 12) target_link_libraries(advapi32 cryptlib wine ${PSEH_LIB}) +if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600) + target_link_libraries(advapi32 etwtrace) +endif() add_delay_importlibs(advapi32 secur32) add_importlibs(advapi32 advapi32_vista rpcrt4 kernel32 ntdll) add_pch(advapi32 advapi32.h "${PCH_SKIP_SOURCE}") diff --git a/dll/win32/advapi32/advapi32.spec b/dll/win32/advapi32/advapi32.spec index e79390f57ba..432a4652f73 100644 --- a/dll/win32/advapi32/advapi32.spec +++ b/dll/win32/advapi32/advapi32.spec @@ -70,9 +70,9 @@ @ stub ComputeAccessTokenFromCodeAuthzLevel @ stdcall ControlService(long long ptr) @ stdcall -version=0x502 ControlTraceA(double str ptr long) ntdll.EtwControlTraceA -@ stdcall -stub -version=0x600+ ControlTraceA(double str ptr long) +@ stdcall -version=0x600+ ControlTraceA(double str ptr long) EtwControlTraceA @ stdcall -version=0x502 ControlTraceW(double wstr ptr long) ntdll.EtwControlTraceW -@ stdcall -stub -version=0x600+ ControlTraceW(double wstr ptr long) +@ stdcall -version=0x600+ ControlTraceW(double wstr ptr long) EtwControlTraceW @ stub ConvertAccessToSecurityDescriptorA @ stub ConvertAccessToSecurityDescriptorW @ stub ConvertSDToStringSDRootDomainA @@ -207,7 +207,7 @@ @ stdcall ElfReportEventAndSourceW(long long ptr long long long ptr ptr long long ptr ptr long ptr ptr) @ stdcall ElfReportEventW(long long long long ptr long long ptr ptr long ptr ptr) @ stdcall -version=0x502 EnableTrace(long long long ptr double) ntdll.EtwEnableTrace -@ stdcall -stub -version=0x600+ EnableTrace(long long long ptr double) +@ stdcall -version=0x600+ EnableTrace(long long long ptr double) EtwEnableTrace @ stdcall EncryptFileA(str) @ stdcall EncryptFileW(wstr) @ stub EncryptedFileKeyInfo @@ -220,7 +220,7 @@ @ stdcall EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr) @ stdcall EnumServicesStatusW(long long long ptr long ptr ptr ptr) @ stdcall -version=0x502 EnumerateTraceGuids(ptr long ptr) ntdll.EtwEnumerateTraceGuids -@ stdcall -stub -version=0x600+ EnumerateTraceGuids(ptr long ptr) +@ stdcall -stub -version=0x600+ EnumerateTraceGuids(ptr long ptr) # EtwEnumerateTraceGuids @ stdcall EqualDomainSid(ptr ptr ptr) @ stdcall EqualPrefixSid(ptr ptr) @ stdcall EqualSid(ptr ptr) @@ -228,9 +228,9 @@ @ stdcall FileEncryptionStatusW(wstr ptr) @ stdcall FindFirstFreeAce(ptr ptr) @ stdcall -version=0x502 FlushTraceA(double str ptr) ntdll.EtwFlushTraceA -@ stdcall -stub -version=0x600+ FlushTraceA(double str ptr) +@ stdcall -version=0x600+ FlushTraceA(double str ptr) EtwFlushTraceA @ stdcall -version=0x502 FlushTraceW(double wstr ptr) ntdll.EtwFlushTraceW -@ stdcall -stub -version=0x600+ FlushTraceW(double wstr ptr) +@ stdcall -version=0x600+ FlushTraceW(double wstr ptr) EtwFlushTraceW @ stub FreeEncryptedFileKeyInfo @ stdcall FreeEncryptionCertificateHashList(ptr) @ stdcall FreeInheritedFromArray(ptr long ptr) @@ -456,9 +456,9 @@ @ stub ProcessIdleTasks @ stdcall ProcessTrace(ptr long ptr ptr) @ stdcall -version=0x502 QueryAllTracesA(ptr long ptr) ntdll.EtwQueryAllTracesA -@ stdcall -stub -version=0x600+ QueryAllTracesA(ptr long ptr) +@ stdcall -version=0x600+ QueryAllTracesA(ptr long ptr) EtwQueryAllTracesA @ stdcall -version=0x502 QueryAllTracesW(ptr long ptr) ntdll.EtwQueryAllTracesW -@ stdcall -stub -version=0x600+ QueryAllTracesW(ptr long ptr) +@ stdcall -version=0x600+ QueryAllTracesW(ptr long ptr) EtwQueryAllTracesW @ stdcall QueryRecoveryAgentsOnEncryptedFile(wstr ptr) @ stdcall QueryServiceConfig2A(long long ptr long ptr) @ stdcall QueryServiceConfig2W(long long ptr long ptr) @@ -470,9 +470,9 @@ @ stdcall QueryServiceStatus(long ptr) @ stdcall QueryServiceStatusEx(long long ptr long ptr) @ stdcall -version=0x502 QueryTraceA(double str ptr) ntdll.EtwQueryTraceA -@ stdcall -stub -version=0x600+ QueryTraceA(double str ptr) +@ stdcall -version=0x600+ QueryTraceA(double str ptr) EtwQueryTraceA @ stdcall -version=0x502 QueryTraceW(double str ptr) ntdll.EtwQueryTraceW -@ stdcall -stub -version=0x600+ QueryTraceW(double str ptr) +@ stdcall -version=0x600+ QueryTraceW(double str ptr) EtwQueryTraceW @ stdcall QueryUsersOnEncryptedFile(wstr ptr) @ stdcall ReadEncryptedFileRaw(ptr ptr ptr) @ stdcall ReadEventLogA(long long long ptr long ptr ptr) @@ -608,13 +608,13 @@ @ stdcall StartServiceCtrlDispatcherW(ptr) @ stdcall StartServiceW(long long ptr) @ stdcall -version=0x502 StartTraceA(ptr str ptr) ntdll.EtwStartTraceA -@ stdcall -stub -version=0x600+ StartTraceA(ptr str ptr) +@ stdcall -version=0x600+ StartTraceA(ptr str ptr) EtwStartTraceA @ stdcall -version=0x502 StartTraceW(ptr wstr ptr) ntdll.EtwStartTraceW -@ stdcall -stub -version=0x600+ StartTraceW(ptr wstr ptr) +@ stdcall -version=0x600+ StartTraceW(ptr wstr ptr) EtwStartTraceW @ stdcall -version=0x502 StopTraceA(double str ptr) ntdll.EtwStopTraceA -@ stdcall -stub -version=0x600+ StopTraceA(double str ptr) +@ stdcall -version=0x600+ StopTraceA(double str ptr) EtwStopTraceA @ stdcall -version=0x502 StopTraceW(double wstr ptr) ntdll.EtwStopTraceW -@ stdcall -stub -version=0x600+ StopTraceW(double wstr ptr) +@ stdcall -version=0x600+ StopTraceW(double wstr ptr) EtwStopTraceW @ stdcall SystemFunction001(ptr ptr ptr) @ stdcall SystemFunction002(ptr ptr ptr) @ stdcall SystemFunction003(ptr ptr) @@ -654,7 +654,7 @@ @ stdcall SystemFunction040(ptr long long) # RtlEncryptMemory @ stdcall SystemFunction041(ptr long long) # RtlDecryptMemory @ stdcall -version=0x502 TraceEvent(double ptr) ntdll.EtwTraceEvent -@ stdcall -stub -version=0x600+ TraceEvent(double ptr) +@ stdcall -version=0x600+ TraceEvent(double ptr) EtwTraceEvent @ stdcall TraceEventInstance(double ptr ptr ptr) ntdll.EtwTraceEventInstance @ varargs TraceMessage() ntdll.EtwTraceMessage @ stdcall TraceMessageVa() ntdll.EtwTraceMessageVa @@ -667,9 +667,9 @@ @ stub UnregisterIdleTask @ stdcall UnregisterTraceGuids(double) ntdll.EtwUnregisterTraceGuids @ stdcall -version=0x502 UpdateTraceA(double str ptr) ntdll.EtwUpdateTraceA -@ stdcall -stub -version=0x600+ UpdateTraceA(double str ptr) +@ stdcall -version=0x600+ UpdateTraceA(double str ptr) EtwUpdateTraceA @ stdcall -version=0x502 UpdateTraceW(double wstr ptr) ntdll.EtwUpdateTraceW -@ stdcall -stub -version=0x600+ UpdateTraceW(double wstr ptr) +@ stdcall -version=0x600+ UpdateTraceW(double wstr ptr) EtwUpdateTraceW @ stub WdmWmiServiceMain @ stub WmiCloseBlock @ stub WmiCloseTraceWithCursor @@ -688,9 +688,9 @@ @ stub WmiMofEnumerateResourcesA @ stub WmiMofEnumerateResourcesW @ stdcall -version=0x502 WmiNotificationRegistrationA(ptr long ptr long long) ntdll.EtwNotificationRegistrationA -@ stdcall -stub -version=0x600+ WmiNotificationRegistrationA(ptr long ptr long long) +@ stdcall -stub -version=0x600+ WmiNotificationRegistrationA(ptr long ptr long long) # EtwNotificationRegistrationA @ stdcall -version=0x502 WmiNotificationRegistrationW(ptr long ptr long long) ntdll.EtwNotificationRegistrationW -@ stdcall -stub -version=0x600+ WmiNotificationRegistrationW(ptr long ptr long long) +@ stdcall -stub -version=0x600+ WmiNotificationRegistrationW(ptr long ptr long long) # EtwNotificationRegistrationW @ stub WmiOpenBlock @ stub WmiOpenTraceWithCursor @ stub WmiParseTraceEvent @@ -704,9 +704,9 @@ @ stub WmiQuerySingleInstanceMultipleW @ stub WmiQuerySingleInstanceW @ stdcall -version=0x502 WmiReceiveNotificationsA(long long long long) ntdll.EtwReceiveNotificationsA -@ stdcall -stub -version=0x600+ WmiReceiveNotificationsA(long long long long) +@ stdcall -stub -version=0x600+ WmiReceiveNotificationsA(long long long long) # EtwReceiveNotificationsA @ stdcall -version=0x502 WmiReceiveNotificationsW(long long long long) ntdll.EtwReceiveNotificationsW -@ stdcall -stub -version=0x600+ WmiReceiveNotificationsW(long long long long) +@ stdcall -stub -version=0x600+ WmiReceiveNotificationsW(long long long long) # EtwReceiveNotificationsW @ stub WmiSetSingleInstanceA @ stub WmiSetSingleInstanceW @ stub WmiSetSingleItemA

2 months, 1 week

[reactos] 03/05: [SOFTPUB] Replace some stubs with forwarders

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98e7e643911375193405d… commit 98e7e643911375193405d3d92d967e38cb8adcea Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jul 30 13:00:57 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Oct 17 18:39:37 2024 +0300 [SOFTPUB] Replace some stubs with forwarders --- dll/win32/softpub/softpub.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/softpub/softpub.spec b/dll/win32/softpub/softpub.spec index 11952704e13..2c9f56e1e63 100644 --- a/dll/win32/softpub/softpub.spec +++ b/dll/win32/softpub/softpub.spec @@ -2,9 +2,9 @@ 2 stdcall GenericChainFinalProv(ptr) wintrust.GenericChainFinalProv 3 stdcall HTTPSCertificateTrust(ptr) wintrust.HTTPSCertificateTrust 4 stdcall SoftpubDefCertInit(ptr) wintrust.SoftpubDefCertInit -5 stub SoftpubFreeDefUsageCallData -6 stub SoftpubLoadDefUsageCallData -7 stub AddPersonalTrustDBPages +5 stdcall SoftpubFreeDefUsageCallData(long ptr) wintrust.SoftpubFreeDefUsageCallData +6 stdcall SoftpubLoadDefUsageCallData(long ptr) wintrust.SoftpubLoadDefUsageCallData +7 stdcall AddPersonalTrustDBPages() wintrust.AddPersonalTrustDBPages @ stdcall -private DllRegisterServer() wintrust.SoftpubDllRegisterServer @ stdcall -private DllUnregisterServer() wintrust.SoftpubDllUnregisterServer 10 stdcall DriverCleanupPolicy(ptr) wintrust.DriverCleanupPolicy

2 months, 1 week

[reactos] 02/05: [WINSPOOL.DRV] Improve some stubs

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2a8ce494761a083585d6… commit a2a8ce494761a083585d66e30db7374d4d384fbd Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Aug 1 11:52:07 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Oct 17 18:39:37 2024 +0300 [WINSPOOL.DRV] Improve some stubs --- sdk/include/psdk/winspool.h | 2 +- win32ss/printing/base/winspool/devmode.c | 27 +++++++++++++++++++++++ win32ss/printing/base/winspool/printers.c | 33 ++++++++++++++++++++++++++++ win32ss/printing/base/winspool/winspool.spec | 10 ++++----- 4 files changed, 66 insertions(+), 6 deletions(-) diff --git a/sdk/include/psdk/winspool.h b/sdk/include/psdk/winspool.h index 7d615730405..3750599e6a3 100644 --- a/sdk/include/psdk/winspool.h +++ b/sdk/include/psdk/winspool.h @@ -1011,7 +1011,7 @@ WINBOOL WINAPI EnumPrintersW(DWORD Flags,LPWSTR Name,DWORD Level,LPBYTE pPrinter LONG WINAPI DocumentPropertiesW(HWND hWnd,HANDLE hPrinter,LPWSTR pDeviceName,PDEVMODEW pDevModeOutput,PDEVMODEW pDevModeInput,DWORD fMode); LONG WINAPI AdvancedDocumentPropertiesA(HWND hWnd,HANDLE hPrinter,LPSTR pDeviceName,PDEVMODEA pDevModeOutput,PDEVMODEA pDevModeInput); LONG WINAPI AdvancedDocumentPropertiesW(HWND hWnd,HANDLE hPrinter,LPWSTR pDeviceName,PDEVMODEW pDevModeOutput,PDEVMODEW pDevModeInput); - LONG ExtDeviceMode(HWND hWnd,HANDLE hInst,LPDEVMODEA pDevModeOutput,LPSTR pDeviceName,LPSTR pPort,LPDEVMODEA pDevModeInput,LPSTR pProfile,DWORD fMode); + LONG WINAPI ExtDeviceMode(HWND hWnd,HANDLE hInst,LPDEVMODEA pDevModeOutput,LPSTR pDeviceName,LPSTR pPort,LPDEVMODEA pDevModeInput,LPSTR pProfile,DWORD fMode); DWORD WINAPI GetPrinterDataA(HANDLE hPrinter,LPSTR pValueName,LPDWORD pType,LPBYTE pData,DWORD nSize,LPDWORD pcbNeeded); DWORD WINAPI GetPrinterDataW(HANDLE hPrinter,LPWSTR pValueName,LPDWORD pType,LPBYTE pData,DWORD nSize,LPDWORD pcbNeeded); DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter,LPCSTR pKeyName,LPCSTR pValueName,LPDWORD pType,LPBYTE pData,DWORD nSize,LPDWORD pcbNeeded); diff --git a/win32ss/printing/base/winspool/devmode.c b/win32ss/printing/base/winspool/devmode.c index fd1a615e3f4..e1fb4cedd4a 100644 --- a/win32ss/printing/base/winspool/devmode.c +++ b/win32ss/printing/base/winspool/devmode.c @@ -364,3 +364,30 @@ void RosConvertUnicodeDevModeToAnsiDevmode(PDEVMODEW pDevModeInput, PDEVMODEA pD memcpy( pDevModeOutput, pTmp, pTmp->dmSize + pTmp->dmDriverExtra); // Copy into a Wide char (Larger) buffer. HeapFree(hProcessHeap, 0, pTmp); } + +VOID +WINAPI +DeviceMode( + PVOID param_1, + PVOID param_2, + PCHAR param_3, + PVOID param_4) +{ + UNIMPLEMENTED; +} + +LONG +WINAPI +ExtDeviceMode( + HWND hWnd, + HANDLE hInst, + LPDEVMODEA pDevModeOutput, + LPSTR pDeviceName, + LPSTR pPort, + LPDEVMODEA pDevModeInput, + LPSTR pProfile, + DWORD fMode) +{ + UNIMPLEMENTED; + return 0; +} diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 6011571d341..6f22ce57bc0 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -4059,3 +4059,36 @@ Cleanup: SetLastError(dwErrorCode); return (dwErrorCode == ERROR_SUCCESS); } + +HANDLE +WINAPI +CreatePrinterIC( + _In_ HANDLE hPrinter, + _In_opt_ LPDEVMODEW pDevMode) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +WINAPI +DeletePrinterIC( + _In_ HANDLE hPrinterIC) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +PlayGdiScriptOnPrinterIC( + _In_ HANDLE hPrinterIC, + _In_reads_bytes_(cIn) LPBYTE pIn, + _In_ DWORD cIn, + _Out_writes_bytes_(cOut) LPBYTE pOut, + _In_ DWORD cOut, + _In_ DWORD ul) +{ + UNIMPLEMENTED; + return FALSE; +} diff --git a/win32ss/printing/base/winspool/winspool.spec b/win32ss/printing/base/winspool/winspool.spec index dbd454ca0c5..750499f2f5b 100644 --- a/win32ss/printing/base/winspool/winspool.spec +++ b/win32ss/printing/base/winspool/winspool.spec @@ -40,7 +40,7 @@ 139 stub ConnectToPrinterDlg 140 stub ConvertAnsiDevModeToUnicodeDevmode 141 stub ConvertUnicodeDevModeToAnsiDevmode -142 stdcall -stub CreatePrinterIC(ptr ptr) +142 stdcall CreatePrinterIC(ptr ptr) 143 stdcall DEVICECAPABILITIES(str str long ptr ptr) DeviceCapabilitiesA 144 stdcall DEVICEMODE(ptr ptr str ptr) DeviceMode 145 stdcall DeleteFormA(ptr str) @@ -64,7 +64,7 @@ 163 stdcall DeletePrinterDriverExA(str str str long long) 164 stdcall DeletePrinterDriverExW(wstr wstr wstr long long) 165 stdcall DeletePrinterDriverW(wstr wstr wstr) -166 stdcall -stub DeletePrinterIC(ptr) +166 stdcall DeletePrinterIC(ptr) 167 stdcall DeletePrinterKeyA(ptr str) 168 stdcall DeletePrinterKeyW(ptr wstr) 169 stdcall DevQueryPrint(ptr ptr ptr) @@ -72,7 +72,7 @@ 171 stdcall DeviceCapabilities(str str long ptr ptr) DeviceCapabilitiesA 172 stdcall DeviceCapabilitiesA(str str long ptr ptr) 173 stdcall DeviceCapabilitiesW(wstr wstr long ptr ptr) -174 stdcall -stub DeviceMode(ptr ptr str ptr) +174 stdcall DeviceMode(ptr ptr str ptr) 175 stdcall DevicePropertySheets(ptr long) 176 stdcall DocumentEvent(ptr ptr long long ptr long ptr) 177 stdcall DocumentPropertiesA(ptr ptr str ptr ptr long) @@ -134,7 +134,7 @@ 233 stdcall EnumPrinterKeyW(ptr wstr wstr long ptr) 234 stdcall EnumPrintersA(long ptr long ptr long ptr ptr) 235 stdcall EnumPrintersW(long ptr long ptr long ptr ptr) -236 stdcall -stub ExtDeviceMode(ptr ptr ptr str str ptr str long) +236 stdcall ExtDeviceMode(ptr ptr ptr str str ptr str long) 237 stub FindClosePrinterChangeNotification 238 stub FindFirstPrinterChangeNotification 239 stub FindNextPrinterChangeNotification @@ -161,7 +161,7 @@ 260 stdcall IsValidDevmodeW(ptr long) 261 stdcall OpenPrinterA(str ptr ptr) 262 stdcall OpenPrinterW(wstr ptr ptr) -263 stdcall -stub PlayGdiScriptOnPrinterIC(ptr ptr long ptr long long) +263 stdcall PlayGdiScriptOnPrinterIC(ptr ptr long ptr long long) 264 stdcall PrinterMessageBoxA(ptr long ptr str str long) 265 stdcall PrinterMessageBoxW(ptr long ptr wstr wstr long) 266 stdcall PrinterProperties(ptr ptr)

2 months, 1 week

[reactos] 01/05: [MSVCRT] Properly export sprintf_s and _vcwprintf

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5ed1198134ad0bb2f66e… commit a5ed1198134ad0bb2f66ef3e0f5332897d06b91b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 27 11:37:41 2020 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Oct 17 18:39:37 2024 +0300 [MSVCRT] Properly export sprintf_s and _vcwprintf --- dll/win32/msvcrt/msvcrt.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index 605e783ccb7..9e66349fc80 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -1085,7 +1085,7 @@ @ stub -version=0x600+ _vcprintf_p_l @ stub -version=0x600+ _vcprintf_s @ stub -version=0x600+ _vcprintf_s_l -@ stub -version=0x600+ _vcwprintf +@ cdecl -version=0x600+ _vcwprintf(wstr ptr) @ stub -version=0x600+ _vcwprintf_l @ stub -version=0x600+ _vcwprintf_p @ stub -version=0x600+ _vcwprintf_p_l @@ -1452,7 +1452,7 @@ @ cdecl sinh(double) @ cdecl -arch=x86_64,arm sinhf(long) @ varargs sprintf(ptr str) -@ stub -version=0x600+ sprintf_s +@ varargs -version=0x600+ sprintf_s(ptr long str) @ cdecl sqrt(double) @ cdecl -arch=x86_64,arm sqrtf(long) @ cdecl srand(long)

2 months, 1 week

[reactos] 01/01: [FREELDR][NDK][X64] Remove KIP0PCRADDRESS definition and mapping

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bed8b2a0a6ebab75d678b… commit bed8b2a0a6ebab75d678be9a5e59c15b427f159a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed May 24 14:16:23 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Oct 17 18:31:32 2024 +0300 [FREELDR][NDK][X64] Remove KIP0PCRADDRESS definition and mapping It is not used by either ReactOS or Windows. --- boot/freeldr/freeldr/include/arch/amd64/amd64.h | 4 ---- boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c | 27 +++++++++---------------- sdk/include/ndk/amd64/ketypes.h | 11 ---------- 3 files changed, 10 insertions(+), 32 deletions(-) diff --git a/boot/freeldr/freeldr/include/arch/amd64/amd64.h b/boot/freeldr/freeldr/include/arch/amd64/amd64.h index 17d6214c1a8..c3ffa40856b 100644 --- a/boot/freeldr/freeldr/include/arch/amd64/amd64.h +++ b/boot/freeldr/freeldr/include/arch/amd64/amd64.h @@ -22,10 +22,6 @@ #pragma once #endif -// This is needed because headers define wrong one for ReactOS -#undef KIP0PCRADDRESS -#define KIP0PCRADDRESS 0xFFFFF78000001000ULL /* FIXME!!! */ - #define VA_MASK 0x0000FFFFFFFFFFFFUL #define PtrToPfn(p) \ diff --git a/boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c b/boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c index a5fc5a0fc53..174bacd62a9 100644 --- a/boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c +++ b/boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c @@ -24,7 +24,7 @@ PHARDWARE_PTE PxeBase; //PHARDWARE_PTE HalPageTable; PVOID GdtIdt; -ULONG_PTR PcrBasePage; +PFN_NUMBER SharedUserDataPfn; ULONG_PTR TssBasePage; /* FUNCTIONS **************************************************************/ @@ -246,15 +246,8 @@ WinLdrMapSpecialPages(VOID) { PHARDWARE_PTE PpeBase, PdeBase; - /* Map the PCR page */ - if (!MempMapSinglePage(KIP0PCRADDRESS, PcrBasePage * PAGE_SIZE)) - { - ERR("Could not map PCR @ %lx\n", PcrBasePage); - return FALSE; - } - /* Map KI_USER_SHARED_DATA */ - if (!MempMapSinglePage(KI_USER_SHARED_DATA, (PcrBasePage+1) * PAGE_SIZE)) + if (!MempMapSinglePage(KI_USER_SHARED_DATA, SharedUserDataPfn * PAGE_SIZE)) { ERR("Could not map KI_USER_SHARED_DATA\n"); return FALSE; @@ -380,22 +373,22 @@ WinLdrSetProcessorContext( void WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock) { - ULONG_PTR Pcr = 0; + PVOID SharedUserDataAddress = NULL; ULONG_PTR Tss = 0; ULONG BlockSize, NumPages; LoaderBlock->u.I386.CommonDataArea = (PVOID)DbgPrint; // HACK LoaderBlock->u.I386.MachineType = MACHINE_TYPE_ISA; - /* Allocate 2 pages for PCR */ - Pcr = (ULONG_PTR)MmAllocateMemoryWithType(2 * MM_PAGE_SIZE, LoaderStartupPcrPage); - PcrBasePage = Pcr >> MM_PAGE_SHIFT; - if (Pcr == 0) + /* Allocate 1 page for SharedUserData */ + SharedUserDataAddress = MmAllocateMemoryWithType(MM_PAGE_SIZE, LoaderStartupPcrPage); + SharedUserDataPfn = (ULONG_PTR)SharedUserDataAddress >> MM_PAGE_SHIFT; + if (SharedUserDataAddress == NULL) { - UiMessageBox("Can't allocate PCR."); + UiMessageBox("Can't allocate SharedUserData page."); return; } - RtlZeroMemory((PVOID)Pcr, 2 * MM_PAGE_SIZE); + RtlZeroMemory(SharedUserDataAddress, MM_PAGE_SIZE); /* Allocate TSS */ BlockSize = (sizeof(KTSS) + MM_PAGE_SIZE) & ~(MM_PAGE_SIZE - 1); @@ -422,7 +415,7 @@ void WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock) // FIXME: bugcheck } - /* Map stuff like PCR, KI_USER_SHARED_DATA and Apic */ + /* Map KI_USER_SHARED_DATA, Apic and HAL space */ WinLdrMapSpecialPages(); } diff --git a/sdk/include/ndk/amd64/ketypes.h b/sdk/include/ndk/amd64/ketypes.h index 7cdc94fb32e..410e0b55cb0 100644 --- a/sdk/include/ndk/amd64/ketypes.h +++ b/sdk/include/ndk/amd64/ketypes.h @@ -80,17 +80,6 @@ Author: #define KF_FPU_LEAKAGE_BIT 41 // From ksamd64.inc (0x29 -> 0x20000000000) #define KF_CAT_BIT 44 // From ksamd64.inc (0x2C -> 0x100000000000) -// -// KPCR Access for non-IA64 builds -// -//#define K0IPCR ((ULONG_PTR)(KIP0PCRADDRESS)) -//#define PCR ((volatile KPCR * const)K0IPCR) -#define PCR ((volatile KPCR * const)__readgsqword(FIELD_OFFSET(KPCR, Self))) -//#if defined(CONFIG_SMP) || defined(NT_BUILD) -//#undef KeGetPcr -//#define KeGetPcr() ((volatile KPCR * const)__readfsdword(0x1C)) -//#endif - // // Double fault stack size //

2 months, 1 week

[reactos] 01/01: [CMAKE] Silence ML's "Assembling ..." message

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e5e72fa12c01948fc292… commit 4e5e72fa12c01948fc2921961b26ac325b22a906 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Oct 11 11:36:42 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Oct 17 12:01:17 2024 +0300 [CMAKE] Silence ML's "Assembling ..." message --- sdk/cmake/msvc.cmake | 10 +++++++--- subsystems/mvdm/asm16.cmake | 5 ++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 24f59b2d833..67c2e451d7b 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -205,12 +205,16 @@ else() set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <INCLUDES> <FLAGS> <DEFINES> ${I18N_DEFS} /fo <OBJECT> <SOURCE>") endif() +if(MSVC_VERSION GREATER_EQUAL 1936) + set(_quiet_flag "/quiet") +endif() + # We don't put <INCLUDES> <DEFINES> <FLAGS> because this is handled in add_asm_files macro if (NOT MSVC_IDE) if(ARCH STREQUAL "arm" OR ARCH STREQUAL "arm64") set(CMAKE_ASM_MASM_COMPILE_OBJECT "<CMAKE_ASM_MASM_COMPILER> -nologo -o <OBJECT> <SOURCE>") else() - set(CMAKE_ASM_MASM_COMPILE_OBJECT "<CMAKE_ASM_MASM_COMPILER> /nologo /Cp /Fo <OBJECT> /c /Ta <SOURCE>") + set(CMAKE_ASM_MASM_COMPILE_OBJECT "<CMAKE_ASM_MASM_COMPILER> /nologo ${_quiet_flag} /Cp /Fo <OBJECT> /c /Ta <SOURCE>") endif() endif() @@ -329,7 +333,7 @@ function(generate_import_lib _libname _dllname _spec_file __version_arg) if(ARCH STREQUAL "arm" OR ARCH STREQUAL "arm64") set(_asm_stub_command ${CMAKE_ASM_MASM_COMPILER} -nologo -o ${_asm_stubs_file}.obj ${_asm_stubs_file}) else() - set(_asm_stub_command ${CMAKE_ASM_MASM_COMPILER} /nologo /Cp /Fo${_asm_stubs_file}.obj /c /Ta ${_asm_stubs_file}) + set(_asm_stub_command ${CMAKE_ASM_MASM_COMPILER} /nologo ${_quiet_flag} /Cp /Fo${_asm_stubs_file}.obj /c /Ta ${_asm_stubs_file}) endif() add_custom_command( OUTPUT ${_asm_stubs_file}.obj @@ -447,7 +451,7 @@ function(CreateBootSectorTarget _target_name _asm_file _binary_file _base_addres COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag} /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_includes} ${_defines} /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file} DEPENDS ${_asm_file}) - set(_asm16_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_temp_file}) + set(_asm16_command ${CMAKE_ASM16_COMPILER} /nologo ${_quiet_flag} /Cp /Fo${_object_file} /c /Ta ${_temp_file}) add_custom_command( OUTPUT ${_object_file} diff --git a/subsystems/mvdm/asm16.cmake b/subsystems/mvdm/asm16.cmake index 073314f308b..53d9e78abd2 100644 --- a/subsystems/mvdm/asm16.cmake +++ b/subsystems/mvdm/asm16.cmake @@ -112,7 +112,10 @@ function(add_asm16_bin _target _binary_file _base_address) COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_concatenated_asm_file} > ${_preprocessed_asm_file} DEPENDS ${_concatenated_asm_file}) - set(_pp_asm16_compile_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_preprocessed_asm_file}) + if(MSVC_VERSION GREATER_EQUAL 1936) + set(_quiet_flag "/quiet") + endif() + set(_pp_asm16_compile_command ${CMAKE_ASM16_COMPILER} /nologo ${_quiet_flag} /Cp /Fo${_object_file} /c /Ta ${_preprocessed_asm_file}) add_custom_command( OUTPUT ${_object_file}

2 months, 1 week

[reactos] 01/01: [NTOS:KE/i386] KeStartAllProcessors(): ProcessorCount is a ULONG (#7455)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c84e191fddda365b07aa… commit 4c84e191fddda365b07aa91a6732061f9a6f4d0f Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Oct 16 22:38:01 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 16 22:38:01 2024 +0200 [NTOS:KE/i386] KeStartAllProcessors(): ProcessorCount is a ULONG (#7455) Let's be explicit. Addendum to 516ccad (0.4.15-dev-7016). --- ntoskrnl/ke/i386/mproc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/ke/i386/mproc.c b/ntoskrnl/ke/i386/mproc.c index 6e526d28636..63e7a748bd1 100644 --- a/ntoskrnl/ke/i386/mproc.c +++ b/ntoskrnl/ke/i386/mproc.c @@ -38,7 +38,7 @@ NTAPI KeStartAllProcessors(VOID) { PVOID KernelStack, DPCStack; - SIZE_T ProcessorCount = 0; + ULONG ProcessorCount = 0; PAPINFO APInfo; while (TRUE) @@ -127,7 +127,7 @@ KeStartAllProcessors(VOID) KeLoaderBlock->Thread = (ULONG_PTR)&APInfo->Pcr.Prcb->IdleThread; // Start the CPU - DPRINT("Attempting to Start a CPU with number: %u\n", ProcessorCount); + DPRINT("Attempting to Start a CPU with number: %lu\n", ProcessorCount); if (!HalStartNextProcessor(KeLoaderBlock, ProcessorState)) { break; @@ -152,5 +152,5 @@ KeStartAllProcessors(VOID) if (DPCStack) MmDeleteKernelStack(DPCStack, FALSE); - DPRINT1("KeStartAllProcessors: Successful AP startup count is %u\n", ProcessorCount); + DPRINT1("KeStartAllProcessors: Successful AP startup count is %lu\n", ProcessorCount); }

2 months, 1 week

[reactos] 01/01: [FREELDR] fs.c: Fix handling of file handles, (de)referencing, and direct-device access (#7414)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d361b602d45917ae966f… commit 5d361b602d45917ae966ff3ae36a4e6f0bbf0665 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 26 21:45:49 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 16 22:20:52 2024 +0200 [FREELDR] fs.c: Fix handling of file handles, (de)referencing, and direct-device access (#7414) - The original code was just incrementing the reference counts (RefCounts) of the device objects or the device/file handles, without decrementing them when closing the handles. This is now fixed. Notice the following: * When opening a file on a device (disk), the device's (and its handle's) RefCount is incremented, and the file handle's RefCount is incremented as well. * When closing a file, the file handle's RefCount is decremented (and the file closed if the RefCount reaches zero), and the file's parent device handle is also closed, recursively. This has the effect of decrementing the parent device handle's RefCount, and the device's own RefCount is decremented as well. IMPORTANT NOTE: The usefulness of handle-level RefCount is still under question, and might be (consistently) removed in the future. - Fix opening a device (disk) in direct access, when this device is already opened. Indeed, we previously allowed direct access only if the device was opened as such for the very first time (its RefCount = 0 originally); no filesystem mounting was attempted as well. Then for any later open-operations on this device (while keeping an already-opened handle to it), filesystem access was assumed. Thus, this problem would show up in two ways: * Either the device is first opened for direct access, this succeeded and no filesystem was mounted. Then, for any other open-operations, the filesystem was NOT mounted, and opening files on it would fail. Direct accesses would succeed but would create an unnecessary second file handle. * Or, the device is first opened for file-access: a filesystem was mounted and file opening would succeed. Any other file opening operation would succeed as well (if the file exists). But, a direct access open-operation would fail, because now any open-operations on the device would be assumed to be a file opening. This is now correctly fixed. If direct-open is requested, just do it. If this is a file opening, we open the device, then try to mount a filesystem on it (if not already done), then we try to open the file. If file opening fails, derereference the device. - Pass the file path to the filesystem-specific Open() functions without truncating the leading path separator, if any. This has to be handled by the filesystem routines themselves. --- boot/freeldr/freeldr/include/fs.h | 10 +- boot/freeldr/freeldr/lib/fs/ext2.c | 3 + boot/freeldr/freeldr/lib/fs/fat.c | 3 + boot/freeldr/freeldr/lib/fs/fs.c | 256 +++++++++++++++++++++++++++++-------- boot/freeldr/freeldr/lib/fs/iso.c | 3 + boot/freeldr/freeldr/lib/fs/ntfs.c | 5 + boot/freeldr/freeldr/lib/fs/pxe.c | 12 +- 7 files changed, 236 insertions(+), 56 deletions(-) diff --git a/boot/freeldr/freeldr/include/fs.h b/boot/freeldr/freeldr/include/fs.h index a7acd071112..edc515b8715 100644 --- a/boot/freeldr/freeldr/include/fs.h +++ b/boot/freeldr/freeldr/include/fs.h @@ -35,7 +35,11 @@ typedef struct tagDEVVTBL #define INVALID_FILE_ID ((ULONG)-1) ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId); -ARC_STATUS ArcClose(ULONG FileId); + +ARC_STATUS +ArcClose( + _In_ ULONG FileId); + ARC_STATUS ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count); ARC_STATUS ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode); ARC_STATUS ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information); @@ -58,7 +62,7 @@ FsRegisterDevice( _In_ const DEVVTBL* FuncTable); PCWSTR FsGetServiceName(ULONG FileId); -VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific); -VOID* FsGetDeviceSpecific(ULONG FileId); +VOID FsSetDeviceSpecific(ULONG FileId, PVOID Specific); +PVOID FsGetDeviceSpecific(ULONG FileId); ULONG FsGetDeviceId(ULONG FileId); VOID FsInit(VOID); diff --git a/boot/freeldr/freeldr/lib/fs/ext2.c b/boot/freeldr/freeldr/lib/fs/ext2.c index fa68cd9d96a..6ff59398f29 100644 --- a/boot/freeldr/freeldr/lib/fs/ext2.c +++ b/boot/freeldr/freeldr/lib/fs/ext2.c @@ -216,6 +216,9 @@ BOOLEAN Ext2LookupFile(PEXT2_VOLUME_INFO Volume, PCSTR FileName, PEXT2_FILE_INFO RtlZeroMemory(Ext2FileInfo, sizeof(EXT2_FILE_INFO)); + /* Skip leading path separator, if any */ + if (*FileName == '\\' || *FileName == '/') + ++FileName; // // Figure out how many sub-directories we are nested in // diff --git a/boot/freeldr/freeldr/lib/fs/fat.c b/boot/freeldr/freeldr/lib/fs/fat.c index 257f1e43c63..a31467b6310 100644 --- a/boot/freeldr/freeldr/lib/fs/fat.c +++ b/boot/freeldr/freeldr/lib/fs/fat.c @@ -785,6 +785,9 @@ ARC_STATUS FatLookupFile(PFAT_VOLUME_INFO Volume, PCSTR FileName, PFAT_FILE_INFO RtlZeroMemory(FatFileInfoPointer, sizeof(FAT_FILE_INFO)); + /* Skip leading path separator, if any */ + if (*FileName == '\\' || *FileName == '/') + ++FileName; // // Figure out how many sub-directories we are nested in // diff --git a/boot/freeldr/freeldr/lib/fs/fs.c b/boot/freeldr/freeldr/lib/fs/fs.c index 4bc9f2863f0..cefdad7249f 100644 --- a/boot/freeldr/freeldr/lib/fs/fs.c +++ b/boot/freeldr/freeldr/lib/fs/fs.c @@ -30,24 +30,24 @@ DBG_DEFAULT_CHANNEL(FILESYSTEM); #define TAG_DEVICE_NAME 'NDsF' #define TAG_DEVICE 'vDsF' -typedef struct tagFILEDATA -{ - ULONG DeviceId; - ULONG ReferenceCount; - const DEVVTBL* FuncTable; - const DEVVTBL* FileFuncTable; - VOID* Specific; -} FILEDATA; - typedef struct tagDEVICE { LIST_ENTRY ListEntry; - const DEVVTBL* FuncTable; + const DEVVTBL* FuncTable; ///< Driver function table. + const DEVVTBL* FileFuncTable; ///< Used only by mounted storage devices. PSTR DeviceName; - ULONG DeviceId; + ULONG DeviceId; ///< Entry ID in FileData when the device gets referenced. ULONG ReferenceCount; } DEVICE; +typedef struct tagFILEDATA +{ + ULONG DeviceId; ///< Parent device's ID. + ULONG ReferenceCount; + const DEVVTBL* FuncTable; + PVOID Specific; +} FILEDATA; + static FILEDATA FileData[MAX_FDS]; static LIST_ENTRY DeviceListHead; @@ -75,6 +75,84 @@ PFS_MOUNT FileSystems[] = }; +/* DEBUGGING HELPERS **********************************************************/ + +#if DBG && 0 +static VOID +DumpDeviceList(VOID) +{ + PLIST_ENTRY pEntry; + + DbgPrint("\n== Dumping ARC devices ==\n"); + + for (pEntry = DeviceListHead.Flink; + pEntry != &DeviceListHead; + pEntry = pEntry->Flink) + { + DEVICE* pDevice = CONTAINING_RECORD(pEntry, DEVICE, ListEntry); + ULONG DeviceId = pDevice->DeviceId; + const DEVVTBL* FuncTable; + + DbgPrint("\n" + "DeviceId %lu\n" + " RefCount: %lu\n" + " DeviceName : '%s'\n", + DeviceId, pDevice->ReferenceCount, pDevice->DeviceName); + + FuncTable = pDevice->FuncTable; + DbgPrint(" DevFuncTable: 0x%p (In array: 0x%p) ; Name: '%S'\n", + FuncTable, + (DeviceId != INVALID_FILE_ID ? FileData[DeviceId].FuncTable : NULL), + (FuncTable && FuncTable->ServiceName) + ? FuncTable->ServiceName : L"n/a"); + + FuncTable = pDevice->FileFuncTable; + DbgPrint(" FileFuncTable: 0x%p ; Name: '%S'\n", + FuncTable, + (FuncTable && FuncTable->ServiceName) + ? FuncTable->ServiceName : L"n/a"); + } + + DbgPrint("\n== END Dumping ARC devices ==\n\n"); +} + +static VOID +DumpFileTable(VOID) +{ + ULONG i; + + DbgPrint("\n== Dumping ARC files table ==\n"); + + for (i = 0; i < _countof(FileData); ++i) + { + FILEDATA* pFileData = &FileData[i]; + const DEVVTBL* FuncTable; + + /* Show only occupied slots */ + if (!pFileData->FuncTable) + continue; + + DbgPrint("\n" + "FileId %lu\n" + " RefCount: %lu\n" + " ParentDeviceId: %lu\n" + /*" FileName : '%s'\n"*/ + " Specific: 0x%p\n", + i, pFileData->ReferenceCount, + pFileData->DeviceId, pFileData->Specific); + + FuncTable = pFileData->FuncTable; + DbgPrint(" FuncTable: 0x%p ; Name: '%S'\n", + FuncTable, + (FuncTable && FuncTable->ServiceName) + ? FuncTable->ServiceName : L"n/a"); + } + + DbgPrint("\n== END Dumping ARC files table ==\n\n"); +} +#endif // DBG + + /* ARC FUNCTIONS **************************************************************/ /** @@ -204,6 +282,7 @@ ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) } /* Try to open the device */ + FileData[DeviceId].ReferenceCount = 0; FileData[DeviceId].FuncTable = pDevice->FuncTable; Status = pDevice->FuncTable->Open(pDevice->DeviceName, DeviceOpenMode, &DeviceId); if (Status != ESUCCESS) @@ -211,57 +290,71 @@ ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) FileData[DeviceId].FuncTable = NULL; return Status; } - else if (!*FileName) - { - /* Done, caller wanted to open the raw device */ - *FileId = DeviceId; - pDevice->ReferenceCount++; - return ESUCCESS; - } - - /* Try to detect the file system */ - for (ULONG fs = 0; fs < _countof(FileSystems); ++fs) - { - FileData[DeviceId].FileFuncTable = FileSystems[fs](DeviceId); - if (FileData[DeviceId].FileFuncTable) - break; - } - if (!FileData[DeviceId].FileFuncTable) - { - /* Error, unable to detect the file system */ - pDevice->FuncTable->Close(DeviceId); - FileData[DeviceId].FuncTable = NULL; - return ENODEV; - } - pDevice->DeviceId = DeviceId; } else { + /* Reuse the existing entry */ DeviceId = pDevice->DeviceId; + ASSERT(FileData[DeviceId].FuncTable == pDevice->FuncTable); } + + /* Done, increase the device reference count */ pDevice->ReferenceCount++; + FileData[DeviceId].ReferenceCount++; - /* At this point, device is found and opened. Its file id is stored - * in DeviceId, and FileData[DeviceId].FileFuncTable contains what - * needs to be called to open the file */ + if (!*FileName) + { + /* The caller wanted to open the raw device: return its ID */ + *FileId = DeviceId; + return ESUCCESS; + } + + + /* + * We are opening a file. + */ /* Find some room for the file */ for (i = 0; ; ++i) { if (i >= _countof(FileData)) - return EMFILE; + { + Status = EMFILE; + goto Done; + } if (!FileData[i].FuncTable) break; } - /* Skip leading path separator, if any */ - if (*FileName == '\\' || *FileName == '/') - FileName++; + /* The device is accessed using filesystem semantics. + * Try to detect the file system if not already done. */ + if (!pDevice->FileFuncTable && (pDevice->ReferenceCount <= 1)) + { + for (ULONG fs = 0; fs < _countof(FileSystems); ++fs) + { + pDevice->FileFuncTable = FileSystems[fs](DeviceId); + if (pDevice->FileFuncTable) + break; + } + } + if (!pDevice->FileFuncTable) + { + /* Error, unable to detect the file system */ + Status = ENOENT; // ENXIO; + goto Done; + } + + /* + * At this point, the device is found and opened. Its file ID is stored + * in DeviceId, and pDevice->FileFuncTable contains what needs to be + * called to manipulate the file. + */ /* Open the file */ - FileData[i].FuncTable = FileData[DeviceId].FileFuncTable; FileData[i].DeviceId = DeviceId; + FileData[i].ReferenceCount = 0; + FileData[i].FuncTable = pDevice->FileFuncTable; *FileId = i; Status = FileData[i].FuncTable->Open(FileName, OpenMode, FileId); if (Status != ESUCCESS) @@ -271,24 +364,85 @@ ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) FileData[i].Specific = NULL; *FileId = INVALID_FILE_ID; } + else + { + /* Reference the file */ + FileData[i].ReferenceCount++; + } + +Done: + /* If we failed somewhere, dereference the device as well */ + if (Status != ESUCCESS) + { + // ArcClose(DeviceId); + if (--FileData[DeviceId].ReferenceCount == 0) + { + (void)FileData[DeviceId].FuncTable->Close(DeviceId); + FileData[DeviceId].DeviceId = INVALID_FILE_ID; + FileData[DeviceId].FuncTable = NULL; + FileData[DeviceId].Specific = NULL; + } + if (--pDevice->ReferenceCount == 0) + pDevice->DeviceId = INVALID_FILE_ID; + } + return Status; } -ARC_STATUS ArcClose(ULONG FileId) +static DEVICE* +FsGetDeviceById(ULONG DeviceId) { - ARC_STATUS Status; + PLIST_ENTRY pEntry; + + for (pEntry = DeviceListHead.Flink; + pEntry != &DeviceListHead; + pEntry = pEntry->Flink) + { + DEVICE* pDevice = CONTAINING_RECORD(pEntry, DEVICE, ListEntry); + if (pDevice->DeviceId == DeviceId) + return pDevice; + } + return NULL; +} + +ARC_STATUS +ArcClose( + _In_ ULONG FileId) +{ + ULONG DeviceId; + DEVICE* pDevice; if (!IS_VALID_FILEID(FileId)) return EBADF; - Status = FileData[FileId].FuncTable->Close(FileId); - if (Status == ESUCCESS) + /* Retrieve the parent device's ID if any, for later */ + DeviceId = FileData[FileId].DeviceId; + + /* Dereference the file and close it if needed */ + ASSERT(FileData[FileId].ReferenceCount > 0); + if (--FileData[FileId].ReferenceCount == 0) { + (void)FileData[FileId].FuncTable->Close(FileId); FileData[FileId].DeviceId = INVALID_FILE_ID; FileData[FileId].FuncTable = NULL; FileData[FileId].Specific = NULL; } - return Status; + + /* Check whether this file actually references a device */ + pDevice = FsGetDeviceById(FileId); + if (pDevice) + { + /* It does, dereference it */ + ASSERT(pDevice->ReferenceCount > 0); + if (--pDevice->ReferenceCount == 0) + pDevice->DeviceId = INVALID_FILE_ID; + } + + /* And dereference the parent device too, if there is one */ + if (IS_VALID_FILEID(DeviceId)) + ArcClose(DeviceId); + + return ESUCCESS; } ARC_STATUS ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) @@ -381,7 +535,7 @@ FsOpenFile( /* * FsGetNumPathParts() * This function parses a path in the form of dir1\dir2\file1.ext - * and returns the number of parts it has (i.e. 3 - dir1,dir2,file1.ext) + * and returns the number of parts it has (i.e. 3 - dir1,dir2,file1.ext). */ ULONG FsGetNumPathParts(PCSTR Path) { @@ -409,7 +563,7 @@ ULONG FsGetNumPathParts(PCSTR Path) * FsGetFirstNameFromPath() * This function parses a path in the form of dir1\dir2\file1.ext * and puts the first name of the path (e.g. "dir1") in buffer - * compatible with the MSDOS directory structure + * compatible with the MSDOS directory structure. */ VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path) { @@ -468,14 +622,14 @@ PCWSTR FsGetServiceName(ULONG FileId) return FileData[FileId].FuncTable->ServiceName; } -VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific) +VOID FsSetDeviceSpecific(ULONG FileId, PVOID Specific) { if (!IS_VALID_FILEID(FileId)) return; FileData[FileId].Specific = Specific; } -VOID* FsGetDeviceSpecific(ULONG FileId) +PVOID FsGetDeviceSpecific(ULONG FileId) { if (!IS_VALID_FILEID(FileId)) return NULL; diff --git a/boot/freeldr/freeldr/lib/fs/iso.c b/boot/freeldr/freeldr/lib/fs/iso.c index 1079d578883..a8314b1ac8a 100644 --- a/boot/freeldr/freeldr/lib/fs/iso.c +++ b/boot/freeldr/freeldr/lib/fs/iso.c @@ -182,6 +182,9 @@ static ARC_STATUS IsoLookupFile(PCSTR FileName, ULONG DeviceId, PISO_FILE_INFO I DirectorySector = Pvd->RootDirRecord.ExtentLocationL; DirectoryLength = Pvd->RootDirRecord.DataLengthL; + /* Skip leading path separator, if any */ + if (*FileName == '\\' || *FileName == '/') + ++FileName; // // Figure out how many sub-directories we are nested in // diff --git a/boot/freeldr/freeldr/lib/fs/ntfs.c b/boot/freeldr/freeldr/lib/fs/ntfs.c index fb4db082cd8..c8d4a547d58 100644 --- a/boot/freeldr/freeldr/lib/fs/ntfs.c +++ b/boot/freeldr/freeldr/lib/fs/ntfs.c @@ -718,6 +718,11 @@ static BOOLEAN NtfsLookupFile(PNTFS_VOLUME_INFO Volume, PCSTR FileName, PNTFS_MF TRACE("NtfsLookupFile() FileName = %s\n", FileName); CurrentMFTIndex = NTFS_FILE_ROOT; + + /* Skip leading path separator, if any */ + if (*FileName == '\\' || *FileName == '/') + ++FileName; + NumberOfPathParts = FsGetNumPathParts(FileName); for (i = 0; i < NumberOfPathParts; i++) { diff --git a/boot/freeldr/freeldr/lib/fs/pxe.c b/boot/freeldr/freeldr/lib/fs/pxe.c index 66145a3d328..1a1866ed058 100644 --- a/boot/freeldr/freeldr/lib/fs/pxe.c +++ b/boot/freeldr/freeldr/lib/fs/pxe.c @@ -155,10 +155,18 @@ static ARC_STATUS PxeOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) if (OpenMode != OpenReadOnly) return EACCES; + /* Skip leading path separator, if any, so as to ensure that + * we always lookup the file at the root of the TFTP server's + * file space ("virtual root"), even if the server doesn't + * support this, and NOT from the root of the file system. */ + if (*Path == '\\' || *Path == '/') + ++Path; + /* Retrieve the path length without NULL terminator */ - PathLen = (Path ? min(strlen(Path), sizeof(_OpenFileName) - 1) : 0); + PathLen = min(strlen(Path), sizeof(_OpenFileName) - 1); - /* Lowercase the path and always use slashes as separators */ + /* Lowercase the path and always use slashes as separators, + * for supporting TFTP servers on POSIX systems */ for (i = 0; i < PathLen; i++) { if (Path[i] == '\\')

2 months, 1 week

← Newer
1
2
3
4
5
6
7
8
9
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2024