Ros-diffs March 2019

ros-diffs@reactos.org

36 participants
217 discussions

[reactos] 07/08: [SDK][SHIMENG] Ensure that module entrypoints are not called while loading the shim engine This is done by marking everything that is already loaded but not 'processed'. After the shim engine is done initializing, the original state is restored, with the exception of the shim engine itself. CORE-15846

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6abe0e50aa87d8ae573d6… commit 6abe0e50aa87d8ae573d69576b458a0555c92928 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Mar 11 22:51:46 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Mar 14 20:02:01 2019 +0100 [SDK][SHIMENG] Ensure that module entrypoints are not called while loading the shim engine This is done by marking everything that is already loaded but not 'processed'. After the shim engine is done initializing, the original state is restored, with the exception of the shim engine itself. CORE-15846 --- dll/appcompat/apphelp/shimeng.c | 94 ++++++++++++++++++++++++++++++++++++++++- sdk/include/ndk/ldrtypes.h | 1 + 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dll/appcompat/apphelp/shimeng.c b/dll/appcompat/apphelp/shimeng.c index d1ba71d7bd..e3c152bbdf 100644 --- a/dll/appcompat/apphelp/shimeng.c +++ b/dll/appcompat/apphelp/shimeng.c @@ -20,6 +20,9 @@ FARPROC WINAPI StubGetProcAddress(HINSTANCE hModule, LPCSTR lpProcName); BOOL WINAPI SE_IsShimDll(PVOID BaseAddress); +static const UNICODE_STRING Ntdll = RTL_CONSTANT_STRING(L"ntdll.dll"); +static const UNICODE_STRING Kernel32 = RTL_CONSTANT_STRING(L"kernel32.dll"); +static const UNICODE_STRING Verifier = RTL_CONSTANT_STRING(L"verifier.dll"); extern HMODULE g_hInstance; static UNICODE_STRING g_WindowsDirectory; @@ -872,8 +875,9 @@ VOID SeiHookImports(PLDR_DATA_TABLE_ENTRY LdrEntry) PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor; PBYTE DllBase = LdrEntry->DllBase; - if (SE_IsShimDll(DllBase) || g_hInstance == LdrEntry->DllBase || - (g_LoadingShimDll.Buffer && RtlEqualUnicodeString(&g_LoadingShimDll, &LdrEntry->BaseDllName, TRUE))) + if (SE_IsShimDll(DllBase) || + g_hInstance == LdrEntry->DllBase || + RtlEqualUnicodeString(&g_LoadingShimDll, &LdrEntry->BaseDllName, TRUE)) { SHIMENG_INFO("Skipping shim module 0x%p \"%wZ\"\n", LdrEntry->DllBase, &LdrEntry->BaseDllName); return; @@ -1000,6 +1004,86 @@ VOID SeiInitPaths(VOID) #undef WINSXS } +VOID SeiSetEntryProcessed(PPEB Peb) +{ + PLIST_ENTRY ListHead, Entry; + PLDR_DATA_TABLE_ENTRY LdrEntry; + + ListHead = &NtCurrentPeb()->Ldr->InInitializationOrderModuleList; + Entry = ListHead->Flink; + while (Entry != ListHead) + { + LdrEntry = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks); + Entry = Entry->Flink; + + if (RtlEqualUnicodeString(&LdrEntry->BaseDllName, &Ntdll, TRUE) || + RtlEqualUnicodeString(&LdrEntry->BaseDllName, &Kernel32, TRUE) || + RtlEqualUnicodeString(&LdrEntry->BaseDllName, &Verifier, TRUE) || + RtlEqualUnicodeString(&LdrEntry->BaseDllName, &g_LoadingShimDll, TRUE) || + SE_IsShimDll(LdrEntry->DllBase) || + (LdrEntry->Flags & LDRP_ENTRY_PROCESSED)) + { + SHIMENG_WARN("Don't mess with 0x%p '%wZ'\n", LdrEntry->DllBase, &LdrEntry->BaseDllName); + } + else + { + SHIMENG_WARN("Touching 0x%p '%wZ'\n", LdrEntry->DllBase, &LdrEntry->BaseDllName); + LdrEntry->Flags |= (LDRP_ENTRY_PROCESSED | LDRP_SHIMENG_SUPPRESSED_ENTRY); + } + } + + ListHead = &NtCurrentPeb()->Ldr->InMemoryOrderModuleList; + Entry = ListHead->Flink; + SHIMENG_INFO("In memory:\n"); + while (Entry != ListHead) + { + LdrEntry = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InMemoryOrderLinks); + Entry = Entry->Flink; + + SHIMENG_INFO(" 0x%p '%wZ'\n", LdrEntry->DllBase, &LdrEntry->BaseDllName); + } + + ListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; + Entry = ListHead->Flink; + SHIMENG_INFO("In load:\n"); + while (Entry != ListHead) + { + LdrEntry = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + Entry = Entry->Flink; + + SHIMENG_INFO(" 0x%p '%wZ'\n", LdrEntry->DllBase, &LdrEntry->BaseDllName); + } +} + +VOID SeiResetEntryProcessed(PPEB Peb) +{ + PLIST_ENTRY ListHead, Entry; + PLDR_DATA_TABLE_ENTRY LdrEntry; + + ListHead = &NtCurrentPeb()->Ldr->InInitializationOrderModuleList; + Entry = ListHead->Flink; + while (Entry != ListHead) + { + LdrEntry = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks); + Entry = Entry->Flink; + + if (SE_IsShimDll(LdrEntry->DllBase) || + g_hInstance == LdrEntry->DllBase || + RtlEqualUnicodeString(&LdrEntry->BaseDllName, &Ntdll, TRUE) || + RtlEqualUnicodeString(&LdrEntry->BaseDllName, &Kernel32, TRUE) || + RtlEqualUnicodeString(&LdrEntry->BaseDllName, &Verifier, TRUE) || + !(LdrEntry->Flags & LDRP_SHIMENG_SUPPRESSED_ENTRY)) + { + SHIMENG_WARN("Don't mess with 0x%p '%wZ'\n", LdrEntry->DllBase, &LdrEntry->BaseDllName); + } + else + { + SHIMENG_WARN("Resetting 0x%p '%wZ'\n", LdrEntry->DllBase, &LdrEntry->BaseDllName); + LdrEntry->Flags &= ~(LDRP_ENTRY_PROCESSED | LDRP_SHIMENG_SUPPRESSED_ENTRY); + } + } +} + VOID SeiInit(PUNICODE_STRING ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery) { DWORD n; @@ -1022,6 +1106,9 @@ VOID SeiInit(PUNICODE_STRING ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery) SeiCheckComPlusImage(Peb->ImageBaseAddress); + /* Mark all modules loaded until now as 'LDRP_ENTRY_PROCESSED' so that their entrypoint is not called while we are loading shims */ + SeiSetEntryProcessed(Peb); + /* TODO: if (pQuery->trApphelp) SeiDisplayAppHelp(?pQuery->trApphelp?); @@ -1164,6 +1251,9 @@ VOID SeiInit(PUNICODE_STRING ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery) SeiAddInternalHooks(dwTotalHooks); SeiResolveAPIs(); PatchNewModules(Peb); + + /* Remove the 'LDRP_ENTRY_PROCESSED' flag from entries we modified, so that the loader can continue to process them */ + SeiResetEntryProcessed(Peb); } diff --git a/sdk/include/ndk/ldrtypes.h b/sdk/include/ndk/ldrtypes.h index f4a19748d7..fd5dd12594 100644 --- a/sdk/include/ndk/ldrtypes.h +++ b/sdk/include/ndk/ldrtypes.h @@ -37,6 +37,7 @@ Author: // #define LDRP_STATIC_LINK 0x00000002 #define LDRP_IMAGE_DLL 0x00000004 +#define LDRP_SHIMENG_SUPPRESSED_ENTRY 0x00000008 #define LDRP_LOAD_IN_PROGRESS 0x00001000 #define LDRP_UNLOAD_IN_PROGRESS 0x00002000 #define LDRP_ENTRY_PROCESSED 0x00004000

5 years, 9 months

[reactos] 06/08: [LDR] Do not call module entrypoints while loading the shim engine. Manually call the shim engine entrypoint CORE-15846

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1f6a6bdc3709b3abb966… commit a1f6a6bdc3709b3abb9663eabfd74b5942075cb2 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Mar 11 22:48:37 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Mar 14 20:02:01 2019 +0100 [LDR] Do not call module entrypoints while loading the shim engine. Manually call the shim engine entrypoint CORE-15846 --- dll/ntdll/ldr/ldrutils.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 6058a70335..75fc45fd92 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -2696,7 +2696,8 @@ PVOID LdrpGetShimEngineFunction(PCSZ FunctionName) NTSTATUS Status; PVOID Address; RtlInitAnsiString(&Function, FunctionName); - Status = LdrGetProcedureAddress(g_pShimEngineModule, &Function, 0, &Address); + /* Skip Dll init */ + Status = LdrpGetProcedureAddress(g_pShimEngineModule, &Function, 0, &Address, FALSE); return NT_SUCCESS(Status) ? Address : NULL; } @@ -2725,6 +2726,40 @@ LdrpGetShimEngineInterface() } } +VOID +NTAPI +LdrpRunShimEngineInitRoutine(IN ULONG Reason) +{ + PLIST_ENTRY ListHead, Next; + PLDR_DATA_TABLE_ENTRY LdrEntry; + + ListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; + Next = ListHead->Flink; + while (Next != ListHead) + { + LdrEntry = CONTAINING_RECORD(Next, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + + if (g_pShimEngineModule == LdrEntry->DllBase) + { + if (LdrEntry->EntryPoint) + { + _SEH2_TRY + { + LdrpCallInitRoutine(LdrEntry->EntryPoint, LdrEntry->DllBase, Reason, NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("WARNING: Exception 0x%x during LdrpRunShimEngineInitRoutine(%u)\n", + _SEH2_GetExceptionCode(), Reason); + } + _SEH2_END; + } + return; + } + + Next = Next->Flink; + } +} VOID NTAPI @@ -2734,10 +2769,13 @@ LdrpLoadShimEngine(IN PWSTR ImageName, IN PUNICODE_STRING ProcessImage, IN PVOID PVOID ShimLibrary; NTSTATUS Status; RtlInitUnicodeString(&ShimLibraryName, ImageName); - Status = LdrpLoadDll(FALSE, NULL, NULL, &ShimLibraryName, &ShimLibrary, TRUE); + /* We should NOT pass CallInit = TRUE! + If we do this, other init routines will be called before we get a chance to shim stuff.. */ + Status = LdrpLoadDll(FALSE, NULL, NULL, &ShimLibraryName, &ShimLibrary, FALSE); if (NT_SUCCESS(Status)) { g_pShimEngineModule = ShimLibrary; + LdrpRunShimEngineInitRoutine(DLL_PROCESS_ATTACH); LdrpGetShimEngineInterface(); if (g_ShimsEnabled) { @@ -2754,6 +2792,7 @@ LdrpUnloadShimEngine() { /* Make sure we do not call into the shim engine anymore */ g_ShimsEnabled = FALSE; + LdrpRunShimEngineInitRoutine(DLL_PROCESS_DETACH); LdrUnloadDll(g_pShimEngineModule); g_pShimEngineModule = NULL; }

5 years, 9 months

[reactos] 05/08: [SHIMENG] Don't crash on a shim not found CORE-15846

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cfdb7d564c25190c0f9b3… commit cfdb7d564c25190c0f9b377bdfb19fa47c35175d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Mar 11 22:47:22 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Mar 14 20:02:01 2019 +0100 [SHIMENG] Don't crash on a shim not found CORE-15846 --- dll/appcompat/apphelp/shimeng.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/appcompat/apphelp/shimeng.c b/dll/appcompat/apphelp/shimeng.c index 3520266133..d1ba71d7bd 100644 --- a/dll/appcompat/apphelp/shimeng.c +++ b/dll/appcompat/apphelp/shimeng.c @@ -1142,10 +1142,13 @@ VOID SeiInit(PUNICODE_STRING ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery) SHIMENG_INFO("Using SHIM \"%S!%S\"\n", DllName, ShimName); /* Ask this shim what hooks it needs (and pass along the commandline) */ + dwHookCount = 0; pHookApi = pShimModuleInfo->pGetHookAPIs(AnsiCommandLine.Buffer, ShimName, &dwHookCount); SHIMENG_INFO("GetHookAPIs returns %d hooks for DLL \"%wZ\" SHIM \"%S\"\n", dwHookCount, &UnicodeDllName, ShimName); - if (dwHookCount) + if (dwHookCount && pHookApi) pShimInfo = SeiAppendHookInfo(pShimModuleInfo, pHookApi, dwHookCount, ShimName); + else + dwHookCount = 0; /* If this shim has hooks, create the include / exclude lists */ if (pShimInfo)

5 years, 9 months

[reactos] 04/08: [SHIMENG] Find shims case-insensitive CORE-15845

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ebeced143aa5fc6810c3… commit 0ebeced143aa5fc6810c3b747c22e46d929d8eb8 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Mar 11 22:46:18 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Mar 14 20:02:00 2019 +0100 [SHIMENG] Find shims case-insensitive CORE-15845 --- dll/appcompat/shims/layer/forcedxsetupsuccess.c | 2 +- dll/appcompat/shims/shimlib/shimlib.c | 6 +++--- dll/appcompat/shims/shimlib/shimlib.h | 2 +- modules/rostests/apitests/appshim/layer_hooks.c | 9 +++++++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dll/appcompat/shims/layer/forcedxsetupsuccess.c b/dll/appcompat/shims/layer/forcedxsetupsuccess.c index 7ffcedbe60..7b22182da8 100644 --- a/dll/appcompat/shims/layer/forcedxsetupsuccess.c +++ b/dll/appcompat/shims/layer/forcedxsetupsuccess.c @@ -19,7 +19,7 @@ typedef FARPROC(WINAPI* GETPROCADDRESSPROC)(HMODULE hModule, LPCSTR lpProcName); typedef BOOL (WINAPI* FREELIBRARYPROC)(HINSTANCE hLibModule); -#define SHIM_NS ForceDxSetupSuccess +#define SHIM_NS ForceDXSetupSuccess #include <setup_shim.inl> diff --git a/dll/appcompat/shims/shimlib/shimlib.c b/dll/appcompat/shims/shimlib/shimlib.c index fa3b22675e..7ab8aa86e3 100644 --- a/dll/appcompat/shims/shimlib/shimlib.c +++ b/dll/appcompat/shims/shimlib/shimlib.c @@ -69,9 +69,9 @@ PCSTR ShimLib_StringDuplicateA(PCSTR szString) return ShimLib_StringNDuplicateA(szString, lstrlenA(szString) + 1); } -BOOL ShimLib_StrAEqualsW(PCSTR szString, PCWSTR wszString) +BOOL ShimLib_StrAEqualsWNC(PCSTR szString, PCWSTR wszString) { - while (*szString == *wszString) + while (toupper(*szString) == towupper(*wszString)) { if (!*szString) return TRUE; @@ -116,7 +116,7 @@ PHOOKAPI WINAPI ShimLib_GetHookAPIs(IN LPCSTR szCommandLine, IN LPCWSTR wszShimN { if (ps->GetHookAPIs != NULL && ps->ShimName != NULL) { - if (ShimLib_StrAEqualsW(ps->ShimName, wszShimName)) + if (ShimLib_StrAEqualsWNC(ps->ShimName, wszShimName)) { pUsedShim shim = (pUsedShim)ShimLib_ShimMalloc(sizeof(UsedShim)); shim->pShim = ps; diff --git a/dll/appcompat/shims/shimlib/shimlib.h b/dll/appcompat/shims/shimlib/shimlib.h index 0f016ac205..0bda8bd8d2 100644 --- a/dll/appcompat/shims/shimlib/shimlib.h +++ b/dll/appcompat/shims/shimlib/shimlib.h @@ -27,7 +27,7 @@ PVOID ShimLib_ShimMalloc(SIZE_T dwSize); VOID ShimLib_ShimFree(PVOID pData); PCSTR ShimLib_StringDuplicateA(PCSTR szString); PCSTR ShimLib_StringNDuplicateA(PCSTR szString, SIZE_T stringLength); -BOOL ShimLib_StrAEqualsW(PCSTR szString, PCWSTR wszString); +BOOL ShimLib_StrAEqualsWNC(PCSTR szString, PCWSTR wszString); HINSTANCE ShimLib_Instance(VOID); /* Forward events to generic handlers */ diff --git a/modules/rostests/apitests/appshim/layer_hooks.c b/modules/rostests/apitests/appshim/layer_hooks.c index 715de78df2..1a0126b311 100644 --- a/modules/rostests/apitests/appshim/layer_hooks.c +++ b/modules/rostests/apitests/appshim/layer_hooks.c @@ -53,6 +53,15 @@ static expect_shim_data data[] = { "KERNEL32.DLL", "VerifyVersionInfoW" }, } }, + /* Show that it is not case sensitive */ + { + L"VeRiFyVeRsIoNInFoLiTe", + 0, + { + { "KERNEL32.DLL", "VerifyVersionInfoA" }, + { "KERNEL32.DLL", "VerifyVersionInfoW" }, + } + }, }; static DWORD count_shims(expect_shim_data* data)

5 years, 9 months

[reactos] 03/08: [ACLAYERS] Add stubplemented IgnoreLoadLibrary shim CORE-15845

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdc8b721dad8ded6a30f4… commit cdc8b721dad8ded6a30f48ccef6cbb9c5e93f316 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Mar 11 00:04:13 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Mar 14 20:02:00 2019 +0100 [ACLAYERS] Add stubplemented IgnoreLoadLibrary shim CORE-15845 --- dll/appcompat/shims/layer/CMakeLists.txt | 1 + dll/appcompat/shims/layer/ignoreloadlibrary.c | 80 +++++++++++++++++++++++++++ media/sdb/sysmain.xml | 5 ++ 3 files changed, 86 insertions(+) diff --git a/dll/appcompat/shims/layer/CMakeLists.txt b/dll/appcompat/shims/layer/CMakeLists.txt index 92b168f85d..d2b70b2b99 100644 --- a/dll/appcompat/shims/layer/CMakeLists.txt +++ b/dll/appcompat/shims/layer/CMakeLists.txt @@ -6,6 +6,7 @@ spec2def(aclayers.dll layer.spec) list(APPEND SOURCE dispmode.c forcedxsetupsuccess.c + ignoreloadlibrary.c versionlie.c vmhorizon.c main.c diff --git a/dll/appcompat/shims/layer/ignoreloadlibrary.c b/dll/appcompat/shims/layer/ignoreloadlibrary.c new file mode 100644 index 0000000000..43f236f6c5 --- /dev/null +++ b/dll/appcompat/shims/layer/ignoreloadlibrary.c @@ -0,0 +1,80 @@ +/* + * PROJECT: ReactOS 'Layers' Shim library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: IgnoreLoadLibrary shim + * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <shimlib.h> +#include "ntndk.h" + +typedef HMODULE(WINAPI* LOADLIBRARYAPROC)(LPCSTR lpLibFileName); +typedef HMODULE(WINAPI* LOADLIBRARYEXAPROC)(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); +typedef HMODULE(WINAPI* LOADLIBRARYWPROC)(LPCWSTR lpLibFileName); +typedef HMODULE(WINAPI* LOADLIBRARYEXWPROC)(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); + + +#define SHIM_NS IgnoreLoadLibrary +#include <setup_shim.inl> + + +HMODULE WINAPI SHIM_OBJ_NAME(APIHook_LoadLibraryA)(LPCSTR lpLibFileName) +{ + HMODULE Module; + DWORD dwOldErrorMode; + + dwOldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX); + Module = CALL_SHIM(0, LOADLIBRARYAPROC)(lpLibFileName); + SetErrorMode(dwOldErrorMode); + + return Module; +} + +HMODULE WINAPI SHIM_OBJ_NAME(APIHook_LoadLibraryExA)(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags) +{ + HMODULE Module; + DWORD dwOldErrorMode; + + dwOldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX); + Module = CALL_SHIM(1, LOADLIBRARYEXAPROC)(lpLibFileName, hFile, dwFlags); + SetErrorMode(dwOldErrorMode); + + return Module; +} + +HMODULE WINAPI SHIM_OBJ_NAME(APIHook_LoadLibraryW)(LPCWSTR lpLibFileName) +{ + HMODULE Module; + DWORD dwOldErrorMode; + + dwOldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX); + Module = CALL_SHIM(2, LOADLIBRARYWPROC)(lpLibFileName); + SetErrorMode(dwOldErrorMode); + + return Module; +} + +HMODULE WINAPI SHIM_OBJ_NAME(APIHook_LoadLibraryExW)(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags) +{ + HMODULE Module; + DWORD dwOldErrorMode; + + dwOldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX); + Module = CALL_SHIM(3, LOADLIBRARYEXWPROC)(lpLibFileName, hFile, dwFlags); + SetErrorMode(dwOldErrorMode); + + return Module; +} + + +#define SHIM_NUM_HOOKS 4 +#define SHIM_SETUP_HOOKS \ + SHIM_HOOK(0, "KERNEL32.DLL", "LoadLibraryA", SHIM_OBJ_NAME(APIHook_LoadLibraryA)) \ + SHIM_HOOK(1, "KERNEL32.DLL", "LoadLibraryExA", SHIM_OBJ_NAME(APIHook_LoadLibraryExA)) \ + SHIM_HOOK(2, "KERNEL32.DLL", "LoadLibraryW", SHIM_OBJ_NAME(APIHook_LoadLibraryW)) \ + SHIM_HOOK(3, "KERNEL32.DLL", "LoadLibraryExW", SHIM_OBJ_NAME(APIHook_LoadLibraryExW)) + +#include <implement_shim.inl> diff --git a/media/sdb/sysmain.xml b/media/sdb/sysmain.xml index c5123e9d9a..de87df7c0d 100644 --- a/media/sdb/sysmain.xml +++ b/media/sdb/sysmain.xml @@ -222,6 +222,9 @@ <SHIM NAME="IgnoreFreeLibrary"> <DLLFILE>acgenral.dll</DLLFILE> </SHIM> + <SHIM NAME="IgnoreLoadLibrary"> + <DLLFILE>aclayers.dll</DLLFILE> + </SHIM> <SHIM NAME="VMHorizonSetup"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> @@ -244,11 +247,13 @@ <LAYER NAME="WIN95"> <SHIM_REF NAME="Win95VersionLie" /> <SHIM_REF NAME="ForceDXSetupSuccess" /> + <SHIM_REF NAME="IgnoreLoadLibrary" />  </LAYER> <LAYER NAME="WIN98"> <SHIM_REF NAME="Win98VersionLie" /> <SHIM_REF NAME="ForceDXSetupSuccess" /> + <SHIM_REF NAME="IgnoreLoadLibrary" />  </LAYER> <LAYER NAME="NT4SP5">

5 years, 9 months

[reactos] 02/08: [APPSHIM_APITEST] Add test for IgnoreLoadLibrary CORE-15845

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=996f559fd78514c7e1290… commit 996f559fd78514c7e12908084efd372254849818 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Mar 10 23:54:41 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Mar 14 20:02:00 2019 +0100 [APPSHIM_APITEST] Add test for IgnoreLoadLibrary CORE-15845 --- modules/rostests/apitests/appshim/CMakeLists.txt | 1 + modules/rostests/apitests/appshim/ignoreloadlib.c | 301 ++++++++++++++++++++++ modules/rostests/apitests/appshim/testlist.c | 2 + 3 files changed, 304 insertions(+) diff --git a/modules/rostests/apitests/appshim/CMakeLists.txt b/modules/rostests/apitests/appshim/CMakeLists.txt index f853119e50..e70174ca8e 100644 --- a/modules/rostests/apitests/appshim/CMakeLists.txt +++ b/modules/rostests/apitests/appshim/CMakeLists.txt @@ -6,6 +6,7 @@ list(APPEND SOURCE forcedxsetup.c genral_hooks.c ignorefreelib.c + ignoreloadlib.c layer_hooks.c versionlie.c testlist.c diff --git a/modules/rostests/apitests/appshim/ignoreloadlib.c b/modules/rostests/apitests/appshim/ignoreloadlib.c new file mode 100644 index 0000000000..9895faf4ef --- /dev/null +++ b/modules/rostests/apitests/appshim/ignoreloadlib.c @@ -0,0 +1,301 @@ +/* +* PROJECT: appshim_apitest +* LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) +* PURPOSE: Tests for IgnoreLoadLibrary shim +* COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) +*/ + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windows.h> +#include <ntndk.h> +#include "wine/test.h" + +#include "appshim_apitest.h" + +static DWORD g_WinVersion; +static tGETHOOKAPIS pGetHookAPIs; +static HMODULE g_hSentinelModule = (HMODULE)&pGetHookAPIs; /* Not a valid hmodule, so a nice sentinel */ +static HMODULE g_h123 = (HMODULE)123; +static HMODULE g_h111 = (HMODULE)111; +static HMODULE g_h0 = (HMODULE)0; + +typedef HMODULE(WINAPI* LOADLIBRARYAPROC)(LPCSTR lpLibFileName); +typedef HMODULE(WINAPI* LOADLIBRARYWPROC)(LPCWSTR lpLibFileName); +typedef HMODULE(WINAPI* LOADLIBRARYEXAPROC)(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); +typedef HMODULE(WINAPI* LOADLIBRARYEXWPROC)(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); + + +UINT +WINAPI +GetErrorMode(VOID) +{ + NTSTATUS Status; + UINT ErrMode; + + /* Query the current setting */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessDefaultHardErrorMode, + &ErrMode, + sizeof(ErrMode), + NULL); + if (!NT_SUCCESS(Status)) + { + /* Fail if we couldn't query */ + return 0; + } + + /* Check if NOT failing critical errors was requested */ + if (ErrMode & SEM_FAILCRITICALERRORS) + { + /* Mask it out, since the native API works differently */ + ErrMode &= ~SEM_FAILCRITICALERRORS; + } + else + { + /* OR it if the caller didn't, due to different native semantics */ + ErrMode |= SEM_FAILCRITICALERRORS; + } + + /* Return the mode */ + return ErrMode; +} + +static HMODULE WINAPI my_LoadLibraryA(PCSTR Name) +{ + DWORD dwErrorMode = GetErrorMode(); + ok(dwErrorMode == (SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX), + "Unexpected error mode: 0x%x\n", dwErrorMode); + return g_hSentinelModule; +} + +static HMODULE WINAPI my_LoadLibraryExA(PCSTR Name, HANDLE hFile, DWORD dwFlags) +{ + DWORD dwErrorMode = GetErrorMode(); + ok(dwErrorMode == (SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX), + "Unexpected error mode: 0x%x\n", dwErrorMode); + return g_hSentinelModule; +} + +static HMODULE WINAPI my_LoadLibraryW(PCWSTR Name) +{ + DWORD dwErrorMode = GetErrorMode(); + ok(dwErrorMode == (SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX), + "Unexpected error mode: 0x%x\n", dwErrorMode); + return g_hSentinelModule; +} + +static HMODULE WINAPI my_LoadLibraryExW(PCWSTR Name, HANDLE hFile, DWORD dwFlags) +{ + DWORD dwErrorMode = GetErrorMode(); + ok(dwErrorMode == (SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX), + "Unexpected error mode: 0x%x\n", dwErrorMode); + return g_hSentinelModule; +} + + +static void test_LoadLibraryA(PHOOKAPI hook) +{ + LOADLIBRARYAPROC proc; + DWORD dwErrorMode, dwOldErrorMode; + + hook->OriginalFunction = my_LoadLibraryA; + proc = hook->ReplacementFunction; + + dwOldErrorMode = GetErrorMode(); + + /* Exact names return what is specified */ + ok_ptr(proc("test123.dll"), g_h123); + ok_ptr(proc("test111"), g_h111); + /* Extension is not added */ + ok_ptr(proc("test111.dll"), g_hSentinelModule); + /* Zero can be specified */ + ok_ptr(proc("Something.mark"), g_h0); + /* Or default returned */ + ok_ptr(proc("empty"), g_h0); + + /* Paths, do not have to be valid */ + ok_ptr(proc("\\test123.dll"), g_h123); + ok_ptr(proc("/test123.dll"), g_h123); + ok_ptr(proc("\\\\\\\\test123.dll"), g_h123); + ok_ptr(proc("////test123.dll"), g_h123); + ok_ptr(proc("mypath:something\\does\\not\\matter\\test123.dll"), g_h123); + ok_ptr(proc("/put/whatever/you/want/here/test123.dll"), g_h123); + + /* path separator is checked, not just any point in the path */ + ok_ptr(proc("-test123.dll"), g_hSentinelModule); + ok_ptr(proc("test123.dll-"), g_hSentinelModule); + + dwErrorMode = GetErrorMode(); + ok(dwErrorMode == dwOldErrorMode, "ErrorMode changed, was 0x%x, is 0x%x\n", dwOldErrorMode, dwErrorMode); +} + +static void test_LoadLibraryW(PHOOKAPI hook) +{ + LOADLIBRARYWPROC proc; + DWORD dwErrorMode, dwOldErrorMode; + + hook->OriginalFunction = my_LoadLibraryW; + proc = hook->ReplacementFunction; + + dwOldErrorMode = GetErrorMode(); + + /* Exact names return what is specified */ + ok_ptr(proc(L"test123.dll"), g_h123); + ok_ptr(proc(L"test111"), g_h111); + /* Extension is not added */ + ok_ptr(proc(L"test111.dll"), g_hSentinelModule); + /* Zero can be specified */ + ok_ptr(proc(L"Something.mark"), g_h0); + /* Or default returned */ + ok_ptr(proc(L"empty"), g_h0); + + /* Paths, do not have to be valid */ + ok_ptr(proc(L"\\test123.dll"), g_h123); + ok_ptr(proc(L"/test123.dll"), g_h123); + ok_ptr(proc(L"\\\\\\\\test123.dll"), g_h123); + ok_ptr(proc(L"////test123.dll"), g_h123); + ok_ptr(proc(L"mypath:something\\does\\not\\matter\\test123.dll"), g_h123); + ok_ptr(proc(L"/put/whatever/you/want/here/test123.dll"), g_h123); + + /* path separator is checked, not just any point in the path */ + ok_ptr(proc(L"-test123.dll"), g_hSentinelModule); + ok_ptr(proc(L"test123.dll-"), g_hSentinelModule); + + dwErrorMode = GetErrorMode(); + ok(dwErrorMode == dwOldErrorMode, "ErrorMode changed, was 0x%x, is 0x%x\n", dwOldErrorMode, dwErrorMode); +} + +static void test_LoadLibraryExA(PHOOKAPI hook) +{ + LOADLIBRARYEXAPROC proc; + DWORD dwErrorMode, dwOldErrorMode; + + hook->OriginalFunction = my_LoadLibraryExA; + proc = hook->ReplacementFunction; + + dwOldErrorMode = GetErrorMode(); + + /* Exact names return what is specified */ + ok_ptr(proc("test123.dll", INVALID_HANDLE_VALUE, 0), g_h123); + ok_ptr(proc("test111", INVALID_HANDLE_VALUE, 0), g_h111); + /* Extension is not added */ + ok_ptr(proc("test111.dll", INVALID_HANDLE_VALUE, 0), g_hSentinelModule); + /* Zero can be specified */ + ok_ptr(proc("Something.mark", INVALID_HANDLE_VALUE, 0), g_h0); + /* Or default returned */ + ok_ptr(proc("empty", INVALID_HANDLE_VALUE, 0), g_h0); + + /* Paths, do not have to be valid */ + ok_ptr(proc("\\test123.dll", INVALID_HANDLE_VALUE, 0), g_h123); + ok_ptr(proc("/test123.dll", INVALID_HANDLE_VALUE, 0), g_h123); + ok_ptr(proc("\\\\\\\\test123.dll", INVALID_HANDLE_VALUE, 0), g_h123); + ok_ptr(proc("////test123.dll", INVALID_HANDLE_VALUE, 0), g_h123); + ok_ptr(proc("mypath:something\\does\\not\\matter\\test123.dll", INVALID_HANDLE_VALUE, 0), g_h123); + ok_ptr(proc("/put/whatever/you/want/here/test123.dll", INVALID_HANDLE_VALUE, 0), g_h123); + + /* path separator is checked, not just any point in the path */ + ok_ptr(proc("-test123.dll", INVALID_HANDLE_VALUE, 0), g_hSentinelModule); + ok_ptr(proc("test123.dll-", INVALID_HANDLE_VALUE, 0), g_hSentinelModule); + + dwErrorMode = GetErrorMode(); + ok(dwErrorMode == dwOldErrorMode, "ErrorMode changed, was 0x%x, is 0x%x\n", dwOldErrorMode, dwErrorMode); +} + +static void test_LoadLibraryExW(PHOOKAPI hook) +{ + LOADLIBRARYEXWPROC proc; + DWORD dwErrorMode, dwOldErrorMode; + + hook->OriginalFunction = my_LoadLibraryExW; + proc = hook->ReplacementFunction; + + dwOldErrorMode = GetErrorMode(); + + /* Exact names return what is specified */ + ok_ptr(proc(L"test123.dll", INVALID_HANDLE_VALUE, 0), g_h123); + ok_ptr(proc(L"test111", INVALID_HANDLE_VALUE, 0), g_h111); + /* Extension is not added */ + ok_ptr(proc(L"test111.dll", INVALID_HANDLE_VALUE, 0), g_hSentinelModule); + /* Zero can be specified */ + ok_ptr(proc(L"Something.mark", INVALID_HANDLE_VALUE, 0), g_h0); + /* Or default returned */ + ok_ptr(proc(L"empty", INVALID_HANDLE_VALUE, 0), g_h0); + + /* Paths, do not have to be valid */ + ok_ptr(proc(L"\\test123.dll", INVALID_HANDLE_VALUE, 0), g_h123); + ok_ptr(proc(L"/test123.dll", INVALID_HANDLE_VALUE, 0), g_h123); + ok_ptr(proc(L"\\\\\\\\test123.dll", INVALID_HANDLE_VALUE, 0), g_h123); + ok_ptr(proc(L"////test123.dll", INVALID_HANDLE_VALUE, 0), g_h123); + ok_ptr(proc(L"mypath:something\\does\\not\\matter\\test123.dll", INVALID_HANDLE_VALUE, 0), g_h123); + ok_ptr(proc(L"/put/whatever/you/want/here/test123.dll", INVALID_HANDLE_VALUE, 0), g_h123); + + /* path separator is checked, not just any point in the path */ + ok_ptr(proc(L"-test123.dll", INVALID_HANDLE_VALUE, 0), g_hSentinelModule); + ok_ptr(proc(L"test123.dll-", INVALID_HANDLE_VALUE, 0), g_hSentinelModule); + + dwErrorMode = GetErrorMode(); + ok(dwErrorMode == dwOldErrorMode, "ErrorMode changed, was 0x%x, is 0x%x\n", dwOldErrorMode, dwErrorMode); +} + +/* versionlie.c */ +DWORD get_host_winver(void); + +START_TEST(ignoreloadlib) +{ + DWORD num_shims = 0, n, dwErrorMode; + PHOOKAPI hook; + + g_WinVersion = get_host_winver(); + + if (g_WinVersion < _WIN32_WINNT_WIN8) + pGetHookAPIs = LoadShimDLL2(L"aclayers.dll"); + else + pGetHookAPIs = LoadShimDLL2(L"acgenral.dll"); + + if (!pGetHookAPIs) + { + skip("GetHookAPIs not found\n"); + return; + } + + hook = pGetHookAPIs("test123.dll:123;test111:111;Something.mark:0;empty", L"IgnoreLoadLibrary", &num_shims); + + ok(hook != NULL, "Expected hook to be a valid pointer\n"); + ok(num_shims == 4, "Expected num_shims to be 0, was: %u\n", num_shims); + + if (!hook || num_shims != 4) + return; + + dwErrorMode = GetErrorMode(); + trace("Error mode: 0x%x\n", dwErrorMode); + + for (n = 0; n < num_shims; ++n) + { + ok_str(hook[n].LibraryName, "KERNEL32.DLL"); + if (!_stricmp(hook[n].FunctionName, "LoadLibraryA")) + { + ok_int(n, 0); + test_LoadLibraryA(hook + n); + } + else if (!_stricmp(hook[n].FunctionName, "LoadLibraryExA")) + { + ok_int(n, 1); + test_LoadLibraryExA(hook + n); + } + else if (!_stricmp(hook[n].FunctionName, "LoadLibraryW")) + { + ok_int(n, 2); + test_LoadLibraryW(hook + n); + } + else if (!_stricmp(hook[n].FunctionName, "LoadLibraryExW")) + { + ok_int(n, 3); + test_LoadLibraryExW(hook + n); + } + else + { + ok(0, "Unknown function %s\n", hook[n].FunctionName); + } + } +} diff --git a/modules/rostests/apitests/appshim/testlist.c b/modules/rostests/apitests/appshim/testlist.c index 78bf621b9d..672ecb7b32 100644 --- a/modules/rostests/apitests/appshim/testlist.c +++ b/modules/rostests/apitests/appshim/testlist.c @@ -7,6 +7,7 @@ extern void func_dispmode(void); extern void func_forcedxsetup(void); extern void func_genral_hooks(void); extern void func_ignorefreelib(void); +extern void func_ignoreloadlib(void); extern void func_layer_hooks(void); extern void func_versionlie(void); @@ -16,6 +17,7 @@ const struct test winetest_testlist[] = { "forcedxsetup", func_forcedxsetup }, { "genral_hooks", func_genral_hooks }, { "ignorefreelib", func_ignorefreelib }, + { "ignoreloadlib", func_ignoreloadlib }, { "layer_hooks", func_layer_hooks }, { "versionlie", func_versionlie }, { 0, 0 }

5 years, 9 months

[reactos] 01/08: [ACLAYERS] Simplify ForceDXSetupSuccess as suggested by Thomas

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fdfdcb1ea2b124eb0547… commit 0fdfdcb1ea2b124eb054797308100868f9d4e23d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Mar 10 23:09:23 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Mar 14 20:01:47 2019 +0100 [ACLAYERS] Simplify ForceDXSetupSuccess as suggested by Thomas --- dll/appcompat/shims/layer/forcedxsetupsuccess.c | 99 ++++--------------------- 1 file changed, 16 insertions(+), 83 deletions(-) diff --git a/dll/appcompat/shims/layer/forcedxsetupsuccess.c b/dll/appcompat/shims/layer/forcedxsetupsuccess.c index f86339e078..7ffcedbe60 100644 --- a/dll/appcompat/shims/layer/forcedxsetupsuccess.c +++ b/dll/appcompat/shims/layer/forcedxsetupsuccess.c @@ -53,87 +53,6 @@ INT WINAPI DirectXSetupGetVersion(DWORD *lpdwVersion, DWORD *lpdwMinorVersion) return TRUE; } - -static -BOOLEAN -IsCharInAnsiString( - IN CHAR Char, - IN const STRING* MatchString) -{ - USHORT i; - - for (i = 0; i < MatchString->Length; i++) - { - if (Char == MatchString->Buffer[i]) - return TRUE; - } - - return FALSE; -} - - -NTSTATUS -NTAPI -FindCharInAnsiString( - IN const STRING* SearchString, - IN const STRING* MatchString, - OUT PUSHORT Position) -{ - BOOLEAN Found; - ULONG i, Length; - - *Position = 0; - - /* Search */ - Length = SearchString->Length; - for (i = Length - 1; (LONG)i >= 0; i--) - { - Found = IsCharInAnsiString(SearchString->Buffer[i], MatchString); - if (Found) - { - *Position = i; - return STATUS_SUCCESS; - } - } - - return STATUS_NOT_FOUND; -} - - -static BOOL IsDxSetupA(const PSTRING LibraryPath) -{ - static const STRING DxSetupDlls[] = { - RTL_CONSTANT_STRING("dsetup.dll"), - RTL_CONSTANT_STRING("dsetup32.dll"), - RTL_CONSTANT_STRING("dsetup"), - RTL_CONSTANT_STRING("dsetup32"), - }; - static const STRING PathDividerFind = RTL_CONSTANT_STRING("\\/"); - STRING LibraryName; - USHORT PathDivider; - DWORD n; - - if (!NT_SUCCESS(FindCharInAnsiString(LibraryPath, &PathDividerFind, &PathDivider))) - PathDivider = 0; - - if (PathDivider) - PathDivider += sizeof(CHAR); - - LibraryName.Buffer = LibraryPath->Buffer + PathDivider; - LibraryName.Length = LibraryPath->Length - PathDivider; - LibraryName.MaximumLength = LibraryPath->MaximumLength - PathDivider; - - for (n = 0; n < ARRAYSIZE(DxSetupDlls); ++n) - { - if (RtlEqualString(&LibraryName, DxSetupDlls + n, TRUE)) - { - SHIM_MSG("Found %Z\n", DxSetupDlls + n); - return TRUE; - } - } - return FALSE; -} - static BOOL IsDxSetupW(PCUNICODE_STRING LibraryPath) { static const UNICODE_STRING DxSetupDlls[] = { @@ -168,9 +87,23 @@ static BOOL IsDxSetupW(PCUNICODE_STRING LibraryPath) return FALSE; } +static BOOL IsDxSetupA(PCANSI_STRING LibraryPath) +{ + BOOL bIsDxSetup; + UNICODE_STRING LibraryPathW; + + if (NT_SUCCESS(RtlAnsiStringToUnicodeString(&LibraryPathW, LibraryPath, TRUE))) + { + bIsDxSetup = IsDxSetupW(&LibraryPathW); + RtlFreeUnicodeString(&LibraryPathW); + return bIsDxSetup; + } + return FALSE; +} + HMODULE WINAPI SHIM_OBJ_NAME(APIHook_LoadLibraryA)(LPCSTR lpLibFileName) { - STRING Library; + ANSI_STRING Library; RtlInitAnsiString(&Library, lpLibFileName); if (IsDxSetupA(&Library)) @@ -192,7 +125,7 @@ HMODULE WINAPI SHIM_OBJ_NAME(APIHook_LoadLibraryW)(LPCWSTR lpLibFileName) HMODULE WINAPI SHIM_OBJ_NAME(APIHook_LoadLibraryExA)(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags) { - STRING Library; + ANSI_STRING Library; RtlInitAnsiString(&Library, lpLibFileName); if (IsDxSetupA(&Library))

5 years, 9 months

[reactos] 01/01: [GDI32] Fix issue after a Flush

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b4624f32f37c0855d6694… commit b4624f32f37c0855d6694672e2fe9719b312ac36 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Thu Mar 14 12:00:53 2019 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Thu Mar 14 12:00:53 2019 -0500 [GDI32] Fix issue after a Flush While flushing the DC handle goes down with the flush. This was not a regression, just untested old code. --- win32ss/gdi/gdi32/include/gdi32p.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/win32ss/gdi/gdi32/include/gdi32p.h b/win32ss/gdi/gdi32/include/gdi32p.h index f0b4cb46d9..03ce3afcf8 100644 --- a/win32ss/gdi/gdi32/include/gdi32p.h +++ b/win32ss/gdi/gdi32/include/gdi32p.h @@ -409,6 +409,12 @@ GdiAllocBatchCommand( /* Call win32k, the kernel will call NtGdiFlushUserBatch to flush the current batch */ NtGdiFlush(); + + // If Flushed, lose the hDC for this batch job! See CORE-15839. + if (hdc) + { + if (!pTeb->GdiTebBatch.HDC) pTeb->GdiTebBatch.HDC = hdc; + } } /* Get the head of the entry */

5 years, 9 months

[reactos] 02/02: [UNIATA] Update to version 46e8. CORE-15843

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b91cf860cd04be4bbfcfa… commit b91cf860cd04be4bbfcfa9cb9a479010554362d2 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 13 12:36:23 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Mar 14 13:16:43 2019 +0100 [UNIATA] Update to version 46e8. CORE-15843 --- drivers/storage/ide/uniata/atacmd_map.h | 2 +- drivers/storage/ide/uniata/atapi.h | 1 + drivers/storage/ide/uniata/bm_devs.h | 12 ++-- drivers/storage/ide/uniata/bsmaster.h | 11 ++- drivers/storage/ide/uniata/config.h | 2 + drivers/storage/ide/uniata/id_ata.cpp | 61 +++++++++++----- drivers/storage/ide/uniata/id_dma.cpp | 19 +---- drivers/storage/ide/uniata/id_init.cpp | 123 ++++++++++++++++++++++++++------ drivers/storage/ide/uniata/id_probe.cpp | 26 +------ drivers/storage/ide/uniata/id_sata.cpp | 4 -- drivers/storage/ide/uniata/uniata_ver.h | 14 ++-- 11 files changed, 172 insertions(+), 103 deletions(-) diff --git a/drivers/storage/ide/uniata/atacmd_map.h b/drivers/storage/ide/uniata/atacmd_map.h index 6332feb3c3..9158bc8c5d 100644 --- a/drivers/storage/ide/uniata/atacmd_map.h +++ b/drivers/storage/ide/uniata/atacmd_map.h @@ -1,5 +1,5 @@ -// Build Version 0.46e3 +// Build Version 0.46e6 UCHAR const AtaCommands48[256] = { diff --git a/drivers/storage/ide/uniata/atapi.h b/drivers/storage/ide/uniata/atapi.h index 405cfb8467..a190e34013 100644 --- a/drivers/storage/ide/uniata/atapi.h +++ b/drivers/storage/ide/uniata/atapi.h @@ -253,6 +253,7 @@ typedef union _IDE_REGISTERS_2 { #define DFLAGS_HIDDEN 0x8000 // Hidden device, available only with special IOCTLs // via communication virtual device #define DFLAGS_MANUAL_CHS 0x10000 // For devices those have no IDENTIFY commands +#define DFLAGS_LBA32plus 0x20000 // Device is larger than LBA32 //#define DFLAGS_ 0x10000 // // // Used to disable 'advanced' features. diff --git a/drivers/storage/ide/uniata/bm_devs.h b/drivers/storage/ide/uniata/bm_devs.h index 89da4f1550..1de82b2f6e 100644 --- a/drivers/storage/ide/uniata/bm_devs.h +++ b/drivers/storage/ide/uniata/bm_devs.h @@ -155,7 +155,7 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 2920, 8086, 0x00, ATA_SA300, "Intel ICH9" , I6CH | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 2926, 8086, 0x00, ATA_SA300, "Intel ICH9" , I6CH2 | UNIATA_SATA ), - PCI_DEV_HW_SPEC_BM( 2921, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ),/* ??? */ + PCI_DEV_HW_SPEC_BM( 2921, 8086, 0x00, ATA_SA300, "Intel ICH9" , I6CH2 | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 2922, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2923, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2925, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ), @@ -244,12 +244,12 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 23a6, 8086, 0x00, ATA_SA300, "COLETOCRK" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2360, 197b, 0x00, ATA_SA300, "JMB360" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 2361, 197b, 0x00, ATA_UDMA6, "JMB361" , 0 ), + PCI_DEV_HW_SPEC_BM( 2361, 197b, 0x00, ATA_SA300, "JMB361" , UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 2362, 197b, 0x00, ATA_SA300, "JMB362" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 2363, 197b, 0x00, ATA_UDMA6, "JMB363" , 0 ), - PCI_DEV_HW_SPEC_BM( 2365, 197b, 0x00, ATA_UDMA6, "JMB365" , 0 ), - PCI_DEV_HW_SPEC_BM( 2366, 197b, 0x00, ATA_UDMA6, "JMB366" , 0 ), - PCI_DEV_HW_SPEC_BM( 2368, 197b, 0x00, ATA_UDMA6, "JMB368" , 0 ), + PCI_DEV_HW_SPEC_BM( 2363, 197b, 0x00, ATA_SA300, "JMB363" , UNIATA_SATA ), + PCI_DEV_HW_SPEC_BM( 2365, 197b, 0x00, ATA_SA300, "JMB365" , UNIATA_SATA ), + PCI_DEV_HW_SPEC_BM( 2366, 197b, 0x00, ATA_SA300, "JMB366" , UNIATA_SATA ), + PCI_DEV_HW_SPEC_BM( 2368, 197b, 0x00, ATA_SA300, "JMB368" , UNIATA_SATA ), /* PCI_DEV_HW_SPEC_BM( 5040, 11ab, 0x00, ATA_SA150, "Marvell 88SX5040" , UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 5041, 11ab, 0x00, ATA_SA150, "Marvell 88SX5041" , UNIATA_SATA ), diff --git a/drivers/storage/ide/uniata/bsmaster.h b/drivers/storage/ide/uniata/bsmaster.h index 1e2332d75e..ac055b3be2 100644 --- a/drivers/storage/ide/uniata/bsmaster.h +++ b/drivers/storage/ide/uniata/bsmaster.h @@ -1,6 +1,6 @@ /*++ -Copyright (c) 2002-2014 Alexandr A. Telyatnikov (Alter) +Copyright (c) 2002-2018 Alexandr A. Telyatnikov (Alter) Module Name: bsmaster.h @@ -94,6 +94,9 @@ Licence: #define ATA_MAX_IOLBA28 DEF_U64(0x0fffff80) #define ATA_MAX_LBA28 DEF_U64(0x0fffffff) +#define ATA_MAX_IOLBA32 DEF_U64(0xffffff80) +#define ATA_MAX_LBA32 DEF_U64(0xffffffff) + #define ATA_DMA_ENTRIES 256 /* PAGESIZE/2/sizeof(BM_DMA_ENTRY)*/ #define ATA_DMA_EOT 0x80000000 @@ -1588,11 +1591,7 @@ AtapiChipInit( IN ULONG c ); -#ifdef __REACTOS__ -extern ULONG_PTR -#else -extern ULONG -#endif +extern ULONGIO_PTR NTAPI AtapiGetIoRange( IN PVOID HwDeviceExtension, diff --git a/drivers/storage/ide/uniata/config.h b/drivers/storage/ide/uniata/config.h index b59de06467..0f21a9337e 100644 --- a/drivers/storage/ide/uniata/config.h +++ b/drivers/storage/ide/uniata/config.h @@ -103,6 +103,8 @@ #define CRNT_ILK_TYPE (PVOID) #define CRNT_ILK_PTYPE (PVOID*) #define REGRTL_STR_PTYPE (PWCHAR) + #define UlongToPtr(u) ((PVOID)((ULONG)(u))) + #define PtrToUlong(u) ((ULONG)((PVOID)(u))) #endif //USE_REACTOS_DDK /* Are we under GNU C (mingw) ??? */ diff --git a/drivers/storage/ide/uniata/id_ata.cpp b/drivers/storage/ide/uniata/id_ata.cpp index e8e5d009f2..26d9257ad0 100644 --- a/drivers/storage/ide/uniata/id_ata.cpp +++ b/drivers/storage/ide/uniata/id_ata.cpp @@ -1,6 +1,6 @@ /*++ -Copyright (c) 2002-2016 Alexandr A. Telyatnikov (Alter) +Copyright (c) 2002-2018 Alexandr A. Telyatnikov (Alter) Module Name: id_ata.cpp @@ -282,7 +282,7 @@ AtapiWritePort##sz( \ ASSERT(FALSE); /* We should never get here */ \ } \ if(!res->MemIo) { \ - ScsiPortWritePort##_Type((_type*)(ULONG_PTR)(res->Addr), data); \ + ScsiPortWritePort##_Type((_type*)(ULONGIO_PTR)(res->Addr), data); \ } else { \ /*KdPrint(("r_mem @ (%x) %x\n", _port, port));*/ \ ScsiPortWriteRegister##_Type((_type*)(ULONG_PTR)(res->Addr), data); \ @@ -319,7 +319,7 @@ AtapiWritePortEx##sz( \ ASSERT(FALSE); /* We should never get here */ \ } \ if(!res->MemIo) { \ - ScsiPortWritePort##_Type((_type*)(ULONG_PTR)(res->Addr+offs), data); \ + ScsiPortWritePort##_Type((_type*)(ULONGIO_PTR)(res->Addr+offs), data); \ } else { \ /*KdPrint(("r_mem @ (%x) %x\n", _port, port));*/ \ ScsiPortWriteRegister##_Type((_type*)(ULONG_PTR)(res->Addr+offs), data); \ @@ -355,7 +355,7 @@ AtapiReadPort##sz( \ } \ if(!res->MemIo) { \ /*KdPrint(("r_io @ (%x) %x\n", _port, res->Addr));*/ \ - return ScsiPortReadPort##_Type((_type*)(ULONG_PTR)(res->Addr)); \ + return ScsiPortReadPort##_Type((_type*)(ULONGIO_PTR)(res->Addr)); \ } else { \ /*KdPrint(("r_mem @ (%x) %x\n", _port, res->Addr));*/ \ return ScsiPortReadRegister##_Type((_type*)(ULONG_PTR)(res->Addr)); \ @@ -390,7 +390,7 @@ AtapiReadPortEx##sz( \ ASSERT(FALSE); /* We should never get here */ \ } \ if(!res->MemIo) { \ - return ScsiPortReadPort##_Type((_type*)(ULONG_PTR)(res->Addr+offs)); \ + return ScsiPortReadPort##_Type((_type*)(ULONGIO_PTR)(res->Addr+offs)); \ } else { \ /*KdPrint(("r_mem @ (%x) %x\n", _port, port));*/ \ return ScsiPortReadRegister##_Type((_type*)(ULONG_PTR)(res->Addr+offs)); \ @@ -435,7 +435,7 @@ AtapiReadBuffer##sz( \ } \ if(!res->MemIo) { \ /*KdPrint(("r_io @ (%x) %x\n", _port, res->Addr));*/ \ - ScsiPortReadPortBuffer##_Type((_type*)(ULONG_PTR)(res->Addr), (_type*)Buffer, Count); \ + ScsiPortReadPortBuffer##_Type((_type*)(ULONGIO_PTR)(res->Addr), (_type*)Buffer, Count); \ return; \ } \ while(Count) { \ @@ -480,7 +480,7 @@ AtapiWriteBuffer##sz( \ } \ if(!res->MemIo) { \ /*KdPrint(("r_io @ (%x) %x\n", _port, res->Addr));*/ \ - ScsiPortWritePortBuffer##_Type((_type*)(ULONG_PTR)(res->Addr), (_type*)Buffer, Count); \ + ScsiPortWritePortBuffer##_Type((_type*)(ULONGIO_PTR)(res->Addr), (_type*)Buffer, Count); \ return; \ } \ while(Count) { \ @@ -2093,6 +2093,10 @@ IssueIdentify( } } + if(NumOfSectors > ATA_MAX_IOLBA28) { + KdPrint2((PRINT_PREFIX "2TB threshold, force LBA64 WRITE requirement\n")); + LunExt->DeviceFlags |= DFLAGS_LBA32plus; + } } // if(LunExt->DeviceFlags & DFLAGS_LBA_ENABLED) // fill IdentifyData with bogus geometry @@ -5183,14 +5187,25 @@ ServiceInterrupt: chan->AhciLastIS & ~(ATA_AHCI_P_IX_DHR | ATA_AHCI_P_IX_PS | ATA_AHCI_P_IX_DS | ATA_AHCI_P_IX_SDB), chan->AhciLastSError)); if(chan->AhciLastIS & ~ATA_AHCI_P_IX_OF) { - //KdPrint3((PRINT_PREFIX "Err mask (%#x)\n", chan->AhciLastIS & ~ATA_AHCI_P_IX_OF)); - // We have some other error except Overflow - // Just signal ERROR, operation will be aborted in ERROR branch. - statusByte |= IDE_STATUS_ERROR; - AtaReq->ahci.in_serror = chan->AhciLastSError; - if(chan->AhciLastSError & (ATA_SE_HANDSHAKE_ERR | ATA_SE_LINKSEQ_ERR | ATA_SE_TRANSPORT_ERR | ATA_SE_UNKNOWN_FIS)) { - KdPrint2((PRINT_PREFIX "Unrecoverable\n")); - NoRetry = TRUE; + + if((chan->AhciLastIS == ATA_AHCI_P_IX_INF) && + !(statusByte & IDE_STATUS_ERROR) && + !chan->AhciLastSError && + srb && (srb->SrbFlags & SRB_FLAGS_DATA_IN) + ) { + KdPrint3((PRINT_PREFIX "ATA_AHCI_P_IX_INF on READ, assume underflow\n")); + // continue processing in regular way + } else { + + //KdPrint3((PRINT_PREFIX "Err mask (%#x)\n", chan->AhciLastIS & ~ATA_AHCI_P_IX_OF)); + // We have some other error except Overflow + // Just signal ERROR, operation will be aborted in ERROR branch. + statusByte |= IDE_STATUS_ERROR; + AtaReq->ahci.in_serror = chan->AhciLastSError; + if(chan->AhciLastSError & (ATA_SE_HANDSHAKE_ERR | ATA_SE_LINKSEQ_ERR | ATA_SE_TRANSPORT_ERR | ATA_SE_UNKNOWN_FIS)) { + KdPrint2((PRINT_PREFIX "Unrecoverable\n")); + NoRetry = TRUE; + } } } else { // We have only Overflow. Abort operation and continue @@ -6896,13 +6911,23 @@ IdeReadWrite( AtaReq->TransferLength = Srb->DataTransferLength; // Set up 1st block. switch(Srb->Cdb[0]) { - case SCSIOP_READ: case SCSIOP_WRITE: + if(LunExt->DeviceFlags & DFLAGS_LBA32plus) { + KdPrint2((PRINT_PREFIX "Attention: SCSIOP_WRITE on 2TB\n")); + //return SRB_STATUS_ERROR; + } + // FALLTHROUGH + case SCSIOP_READ: MOV_DD_SWP(startingSector, ((PCDB)Srb->Cdb)->CDB10.LBA); MOV_SWP_DW2DD(AtaReq->bcount, ((PCDB)Srb->Cdb)->CDB10.TransferBlocks); break; - case SCSIOP_READ12: case SCSIOP_WRITE12: + if(LunExt->DeviceFlags & DFLAGS_LBA32plus) { + KdPrint2((PRINT_PREFIX "Attention: SCSIOP_WRITE12 on 2TB\n")); + //return SRB_STATUS_ERROR; + } + // FALLTHROUGH + case SCSIOP_READ12: MOV_DD_SWP(startingSector, ((PCDB)Srb->Cdb)->CDB12READWRITE.LBA); MOV_DD_SWP(AtaReq->bcount, ((PCDB)Srb->Cdb)->CDB12READWRITE.NumOfBlocks); break; @@ -10374,7 +10399,7 @@ UniataInitAtaCommands() case IDE_COMMAND_WRITE_LOG_DMA48: case IDE_COMMAND_TRUSTED_RCV_DMA: case IDE_COMMAND_TRUSTED_SEND_DMA: - case IDE_COMMAND_DATA_SET_MGMT: + case IDE_COMMAND_DATA_SET_MGMT: // TRIM //KdPrint2((PRINT_PREFIX "DMA ")); flags |= ATA_CMD_FLAG_DMA; } diff --git a/drivers/storage/ide/uniata/id_dma.cpp b/drivers/storage/ide/uniata/id_dma.cpp index 9ce765552b..309e9040fa 100644 --- a/drivers/storage/ide/uniata/id_dma.cpp +++ b/drivers/storage/ide/uniata/id_dma.cpp @@ -293,11 +293,7 @@ AtapiDmaSetup( return FALSE; } //KdPrint2((PRINT_PREFIX " checkpoint 3\n" )); -#ifdef __REACTOS__ if((ULONG_PTR)data & deviceExtension->AlignmentMask) { -#else - if((ULONG)data & deviceExtension->AlignmentMask) { -#endif KdPrint2((PRINT_PREFIX "AtapiDmaSetup: unaligned data: %#x (%#x)\n", data, deviceExtension->AlignmentMask)); return FALSE; } @@ -345,11 +341,7 @@ retry_DB_IO: return FALSE; } -#ifdef __REACTOS__ dma_count = min(count, (PAGE_SIZE - ((ULONG_PTR)data & PAGE_MASK))); -#else - dma_count = min(count, (PAGE_SIZE - ((ULONG)data & PAGE_MASK))); -#endif data += dma_count; count -= dma_count; i = 0; @@ -444,11 +436,7 @@ retry_DB_IO: *((PULONG)&(AtaReq->ahci.ahci_cmd_ptr->prd_tab[i].DBC_ULONG)) = ((dma_count-1) & 0x3fffff); //AtaReq->ahci.ahci_cmd_ptr->prd_tab[i].I = 1; // interrupt when ready KdPrint2((PRINT_PREFIX " ph data[%d]=%x:%x (%x)\n", i, dma_baseu, dma_base, AtaReq->ahci.ahci_cmd_ptr->prd_tab[i].DBC)); -#ifdef __REACTOS__ if(((ULONG_PTR)&(AtaReq->ahci.ahci_cmd_ptr->prd_tab) & ~PAGE_MASK) != ((ULONG_PTR)&(AtaReq->ahci.ahci_cmd_ptr->prd_tab[i]) & ~PAGE_MASK)) { -#else - if(((ULONG)&(AtaReq->ahci.ahci_cmd_ptr->prd_tab) & ~PAGE_MASK) != ((ULONG)&(AtaReq->ahci.ahci_cmd_ptr->prd_tab[i]) & ~PAGE_MASK)) { -#endif KdPrint2((PRINT_PREFIX "PRD table crosses page boundary! %x vs %x\n", &AtaReq->ahci.ahci_cmd_ptr->prd_tab, &(AtaReq->ahci.ahci_cmd_ptr->prd_tab[i]) )); //AtaReq->Flags |= REQ_FLAG_DMA_DBUF_PRD; @@ -456,11 +444,7 @@ retry_DB_IO: } else { AtaReq->dma_tab[i].base = dma_base; AtaReq->dma_tab[i].count = (dma_count & 0xffff) | ATA_DMA_EOT; -#ifdef __REACTOS__ if(((ULONG_PTR)&(AtaReq->dma_tab) & ~PAGE_MASK) != ((ULONG_PTR)&(AtaReq->dma_tab[i]) & ~PAGE_MASK)) { -#else - if(((ULONG)&(AtaReq->dma_tab) & ~PAGE_MASK) != ((ULONG)&(AtaReq->dma_tab[i]) & ~PAGE_MASK)) { -#endif KdPrint2((PRINT_PREFIX "DMA table crosses page boundary! %x vs %x\n", &AtaReq->dma_tab, &(AtaReq->dma_tab[i]) )); //AtaReq->Flags |= REQ_FLAG_DMA_DBUF_PRD; @@ -2276,10 +2260,13 @@ setup_drive_ite: UCHAR reg40; GetPciConfig1(0x40, reg40); + /* + This is done on chip-init phase if(reg40 & 0x08) { // 80-pin check udmamode = min(udmamode, 2); } + */ /* Nothing to do to setup mode, the controller snoop SET_FEATURE cmd. */ if(apiomode >= 4) apiomode = 4; diff --git a/drivers/storage/ide/uniata/id_init.cpp b/drivers/storage/ide/uniata/id_init.cpp index f27ddc3a2a..2eaa98e696 100644 --- a/drivers/storage/ide/uniata/id_init.cpp +++ b/drivers/storage/ide/uniata/id_init.cpp @@ -1,6 +1,6 @@ /*++ -Copyright (c) 2004-2016 Alexandr A. Telyatnikov (Alter) +Copyright (c) 2004-2018 Alexandr A. Telyatnikov (Alter) Module Name: id_init.cpp @@ -279,19 +279,26 @@ UniataChipDetectChannels( } break; #endif // this code is removed from newer FreeBSD +#if 0 case ATA_JMICRON_ID: /* New JMicron PATA controllers */ if(deviceExtension->DevID == ATA_JMB361 || deviceExtension->DevID == ATA_JMB363 || + deviceExtension->DevID == ATA_JMB365 || + deviceExtension->DevID == ATA_JMB366 || deviceExtension->DevID == ATA_JMB368) { - if(BMList[deviceExtension->DevIndex].channel) { - KdPrint2((PRINT_PREFIX "New JMicron has no 2nd chan\n")); - return FALSE; - } - deviceExtension->NumberChannels = 1; - KdPrint2((PRINT_PREFIX "New JMicron PATA 1 chan\n")); + + ULONG tmp32, port_mask; + + port_mask = BMList[deviceExtension->DevIndex].channel; + + GetPciConfig4(0x40, tmp32); + + deviceExtension->NumberChannels = 2; + //KdPrint2((PRINT_PREFIX "New JMicron PATA 1 chan\n")); } break; +#endif // this code is unnecessary since port mapping is implemented case ATA_CYRIX_ID: if(ChipType == CYRIX_OLD) { UCHAR tmp8; @@ -350,17 +357,10 @@ UniataChipDetect( ULONG ChipFlags; ULONG tmp32; UCHAR tmp8; -#ifdef __REACTOS__ ULONG_PTR BaseMemAddress; ULONG_PTR BaseIoAddress1; ULONG_PTR BaseIoAddress2; ULONG_PTR BaseIoAddressBM; -#else - ULONG BaseMemAddress; - ULONG BaseIoAddress1; - ULONG BaseIoAddress2; - ULONG BaseIoAddressBM; -#endif BOOLEAN MemIo = FALSE; BOOLEAN IsPata = FALSE; @@ -1210,11 +1210,7 @@ for_ugly_chips: tmp8 = AtapiReadPortEx1(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),IDX_BM_Status); KdPrint2((PRINT_PREFIX "BM status: %x\n", tmp8)); /* cleanup */ -#ifdef __REACTOS__ ScsiPortFreeDeviceBase(HwDeviceExtension, (PCHAR)(ULONG_PTR)BaseIoAddressBM); -#else - ScsiPortFreeDeviceBase(HwDeviceExtension, (PCHAR)BaseIoAddressBM); -#endif UniataInitIoResEx(&deviceExtension->BaseIoAddressBM_0, 0, 0, FALSE); if(tmp8 == 0xff) { @@ -1334,7 +1330,7 @@ for_ugly_chips: } break; case ATA_JMICRON_ID: - /* New JMicron PATA controllers */ + /* New JMicron PATA/SATA controllers */ GetPciConfig1(0xdf, tmp8); if(tmp8 & 0x40) { KdPrint((" Check JMicron AHCI\n")); @@ -1342,13 +1338,16 @@ for_ugly_chips: ChipFlags |= UNIATA_AHCI; deviceExtension->HwFlags |= UNIATA_AHCI; } else { - KdPrint((" JMicron PATA\n")); + KdPrint((" JMicron PATA/SATA\n")); } } else { +#if 0 // do not touch, see Linux sources /* set controller configuration to a combined setup we support */ SetPciConfig4(0x40, 0x80c0a131); SetPciConfig4(0x80, 0x01200000); - //KdPrint((" JMicron Combined (not supported yet)\n")); +#endif + //GetPciConfig1(0x40, tmp32); + KdPrint((" JMicron Combined\n")); //return STATUS_NOT_FOUND; } break; @@ -2648,6 +2647,85 @@ AtapiChipInit( } } break; + case ATA_JMICRON_ID: + /* New JMicron PATA controllers */ + if(deviceExtension->DevID == ATA_JMB361 || + deviceExtension->DevID == ATA_JMB363 || + deviceExtension->DevID == ATA_JMB365 || + deviceExtension->DevID == ATA_JMB366 || + deviceExtension->DevID == ATA_JMB368) { + KdPrint2((PRINT_PREFIX "JMicron\n")); + + ULONG c_swp = 0; + ULONG reg40, reg80; + + GetPciConfig4(0x40, reg40); + KdPrint2((PRINT_PREFIX "reg 40: %x\n", reg40)); + + c_swp = (reg40 & (1<<22)) ? 1 : 0; // 1=swap, 0=keep + KdPrint2((PRINT_PREFIX "c_swp: %x\n", c_swp)); + + GetPciConfig4(0x80, reg80); + KdPrint2((PRINT_PREFIX "reg 80: %x\n", reg80)); + + if(c == CHAN_NOT_SPECIFIED) { + UCHAR P1mode; + + P1mode = (reg80 & (1<<24)) ? ATA_UDMA6 : ATA_SA300; + KdPrint2((PRINT_PREFIX "p1 mode: %x\n", P1mode)); + + if(reg40 & (1 << 23)) { + KdPrint2((PRINT_PREFIX "SATA+PATA0\n")); + deviceExtension->chan[0 ^ c_swp].MaxTransferMode = P1mode; + deviceExtension->chan[1 ^ c_swp].MaxTransferMode = ATA_UDMA6; + deviceExtension->chan[1 ^ c_swp].ChannelCtrlFlags |= CTRFLAGS_NO_SLAVE; + + } else { + KdPrint2((PRINT_PREFIX "SATA+SATA\n")); + deviceExtension->chan[0 ^ c_swp].MaxTransferMode = P1mode; + //deviceExtension->chan[0 ^ c_swp].ChannelCtrlFlags |= CTRFLAGS_NO_SLAVE; + deviceExtension->chan[1 ^ c_swp].MaxTransferMode = ATA_SA300; + deviceExtension->chan[1 ^ c_swp].ChannelCtrlFlags |= CTRFLAGS_NO_SLAVE; + } + + } else { + /* + deviceExtension->chan[0 ^ c_swp].lun[0]->SATA_lun_map = + deviceExtension->chan[0 ^ c_swp].lun[0]->SATA_lun_map = 0; + deviceExtension->chan[1 ^ c_swp].lun[0]->SATA_lun_map = + deviceExtension->chan[1 ^ c_swp].lun[0]->SATA_lun_map = 1; + */ + KdPrint2((PRINT_PREFIX "chan %d\n", c)); + chan = &deviceExtension->chan[c]; + + UCHAR ph_channel = (UCHAR)(c ^ c_swp); + //c_swp = chan->lun[0]->SATA_lun_map; + if(chan->MaxTransferMode >= ATA_SA150) { + KdPrint2((PRINT_PREFIX "SATA, map -> %x\n", ph_channel)); + } else { + KdPrint2((PRINT_PREFIX "PATA, map -> %x\n", ph_channel)); + if(!ph_channel) { + if(!(reg40 & (1<<5))) { + KdPrint2((PRINT_PREFIX "disabled\n", ph_channel)); + } else + if(!(reg40 & (1<<3))) { + KdPrint2((PRINT_PREFIX "40-pin\n")); + chan->MaxTransferMode = min(deviceExtension->MaxTransferMode, ATA_UDMA2); + } + } else { + if(!(reg80 & (1<<21))) { + KdPrint2((PRINT_PREFIX "disabled\n", ph_channel)); + } else + if(!(reg80 & (1<<19))) { + KdPrint2((PRINT_PREFIX "40-pin\n")); + chan->MaxTransferMode = min(deviceExtension->MaxTransferMode, ATA_UDMA2); + } + } + } + } + + } + break; default: if(c != CHAN_NOT_SPECIFIED) { // We don't know how to check for 80-pin cable on unknown controllers. @@ -2661,7 +2739,8 @@ AtapiChipInit( // In all places separate channels are inited after common controller init // The only exception is probe. But there we may need info about 40/80 pin and MaxTransferRate - if(CheckCable && !(ChipFlags & (UNIATA_NO80CHK | UNIATA_SATA))) { + // Do not check UNIATA_SATA here since we may have controller with mixed ports + if(CheckCable && !(ChipFlags & (UNIATA_NO80CHK/* | UNIATA_SATA*/))) { for(c=0; c<deviceExtension->NumberChannels; c++) { AtapiChipInit(HwDeviceExtension, DeviceNumber, c); } diff --git a/drivers/storage/ide/uniata/id_probe.cpp b/drivers/storage/ide/uniata/id_probe.cpp index 57c0aa2eb4..0a36684d7f 100644 --- a/drivers/storage/ide/uniata/id_probe.cpp +++ b/drivers/storage/ide/uniata/id_probe.cpp @@ -149,7 +149,7 @@ UniataEnableIoPCI( Get PCI address by ConfigInfo and RID */ #ifdef __REACTOS__ -ULONG_PTR +ULONGIO_PTR #else ULONG #endif @@ -936,7 +936,7 @@ UniataFindCompatBusMasterController1( { return UniataFindBusMasterController( HwDeviceExtension, - (PVOID)0x00000000, + UlongToPtr(0x00000000), BusInformation, ArgumentString, ConfigInfo, @@ -957,11 +957,7 @@ UniataFindCompatBusMasterController2( { return UniataFindBusMasterController( HwDeviceExtension, -#ifdef __REACTOS__ UlongToPtr(0x80000000), -#else - (PVOID)0x80000000, -#endif BusInformation, ArgumentString, ConfigInfo, @@ -1079,11 +1075,7 @@ UniataFindBusMasterController( KdPrint2((PRINT_PREFIX "AdapterInterfaceType: Isa\n")); } if(InDriverEntry) { -#ifdef __REACTOS__ i = PtrToUlong(Context); -#else - i = (ULONG)Context; -#endif if(i & 0x80000000) { AltInit = TRUE; } @@ -1099,11 +1091,7 @@ UniataFindBusMasterController( } if(i >= BMListLen) { KdPrint2((PRINT_PREFIX "unexpected device arrival\n")); -#ifdef __REACTOS__ i = PtrToUlong(Context); -#else - i = (ULONG)Context; -#endif if(FirstMasterOk) { channel = 1; } @@ -2565,22 +2553,14 @@ retryIdentifier: if(BaseIoAddress2) { if(hasPCI) { -#ifdef __REACTOS__ (*ConfigInfo->AccessRanges)[1].RangeStart = ScsiPortConvertUlongToPhysicalAddress((ULONG_PTR)BaseIoAddress2); -#else - (*ConfigInfo->AccessRanges)[1].RangeStart = ScsiPortConvertUlongToPhysicalAddress((ULONG)BaseIoAddress2); -#endif (*ConfigInfo->AccessRanges)[1].RangeLength = ATA_ALTIOSIZE; (*ConfigInfo->AccessRanges)[1].RangeInMemory = FALSE; } else { // NT4 and NT3.51 on ISA-only hardware definitly fail floppy.sys load // when this range is claimed by other driver. // However, floppy should use only 0x3f0-3f5,3f7 -#ifdef __REACTOS__ - if((ULONG_PTR)BaseIoAddress2 >= 0x3f0 && (ULONG_PTR)BaseIoAddress2 <= 0x3f7) { -#else - if((ULONG)BaseIoAddress2 >= 0x3f0 && (ULONG)BaseIoAddress2 <= 0x3f7) { -#endif + if((ULONGIO_PTR)BaseIoAddress2 >= 0x3f0 && (ULONGIO_PTR)BaseIoAddress2 <= 0x3f7) { KdPrint2((PRINT_PREFIX "!!! Possible AltStatus vs Floppy IO range interference !!!\n")); } KdPrint2((PRINT_PREFIX "Do not expose to OS on old ISA\n")); diff --git a/drivers/storage/ide/uniata/id_sata.cpp b/drivers/storage/ide/uniata/id_sata.cpp index 25fa089ea8..c39b0a83fa 100644 --- a/drivers/storage/ide/uniata/id_sata.cpp +++ b/drivers/storage/ide/uniata/id_sata.cpp @@ -903,11 +903,7 @@ UniataAhciDetect( ULONG v_Mn, v_Mj; #endif //_DEBUG ULONG NumberChannels; -#ifdef __REACTOS__ ULONG_PTR BaseMemAddress; -#else - ULONG BaseMemAddress; -#endif BOOLEAN MemIo = FALSE; BOOLEAN found = FALSE; diff --git a/drivers/storage/ide/uniata/uniata_ver.h b/drivers/storage/ide/uniata/uniata_ver.h index 2a6ad98c70..2dc11c5d90 100644 --- a/drivers/storage/ide/uniata/uniata_ver.h +++ b/drivers/storage/ide/uniata/uniata_ver.h @@ -1,10 +1,10 @@ -#define UNIATA_VER_STR "46e5" -#define UNIATA_VER_DOT 0.46.5.5 +#define UNIATA_VER_STR "46e8" +#define UNIATA_VER_DOT 0.46.5.8 #define UNIATA_VER_MJ 0 #define UNIATA_VER_MN 46 #define UNIATA_VER_SUB_MJ 5 -#define UNIATA_VER_SUB_MN 5 -#define UNIATA_VER_DOT_COMMA 0,46,5,5 -#define UNIATA_VER_DOT_STR "0.46.5.5" -#define UNIATA_VER_YEAR 2017 -#define UNIATA_VER_YEAR_STR "2017" +#define UNIATA_VER_SUB_MN 8 +#define UNIATA_VER_DOT_COMMA 0,46,5,8 +#define UNIATA_VER_DOT_STR "0.46.5.8" +#define UNIATA_VER_YEAR 2019 +#define UNIATA_VER_YEAR_STR "2019"

5 years, 9 months

[reactos] 01/02: [UNIATA] Remove an unnecessary ROS-diff.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48870fe35ebe26701517d… commit 48870fe35ebe26701517d59b3cd94bc3e967dd26 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 13 12:35:49 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Mar 14 13:16:41 2019 +0100 [UNIATA] Remove an unnecessary ROS-diff. --- drivers/storage/ide/uniata/ntddk_ex.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/storage/ide/uniata/ntddk_ex.h b/drivers/storage/ide/uniata/ntddk_ex.h index 6949845b4c..1c74fca7f2 100644 --- a/drivers/storage/ide/uniata/ntddk_ex.h +++ b/drivers/storage/ide/uniata/ntddk_ex.h @@ -93,11 +93,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemProcessorPowerInformation, SystemEmulationBasicInformation, SystemEmulationProcessorInformation, -#ifdef __REACTOS__ - SystemExtendedHandleInformation, -#else // Typo! SystemExtendedHanfleInformation, -#endif SystemLostDelayedWriteInformation, SystemBigPoolInformation, SystemSessionPoolTagInformation,

5 years, 9 months

← Newer
1
...
9
10
11
12
13
14
15
...
22
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 March 2019