Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: Updated release version on readme
by Benjamin Aerni 15 Mar '19

15 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d75f93cbc2ae10e3c015… commit 8d75f93cbc2ae10e3c015e29e4e4851a8d70e725 Author: Benjamin Aerni <daprogramerforbatch(a)gmail.com> AuthorDate: Thu Mar 14 08:46:54 2019 -0700 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 15 00:05:21 2019 +0100 Updated release version on readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 02199953e6..759059bb38 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ --- <p align=center> - <a href="https://reactos.org/project-news/reactos-0410-released"> - <img alt="ReactOS 0.4.10 Release" src="https://img.shields.io/badge/release-0.4.10-0688CB.svg"> + <a href="https://reactos.org/project-news/reactos-0411-released"> + <img alt="ReactOS 0.4.11 Release" src="https://img.shields.io/badge/release-0.4.11-0688CB.svg"> </a> <a href="https://reactos.org/download"> <img alt="Download ReactOS" src="https://img.shields.io/badge/download-latest-0688CB.svg">

1 0

[reactos] 01/01: [README] Improve the layout of the Quick-Links; add the chat link (#1409)
by Alexander Rechitskiy 15 Mar '19

15 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fc1c5fa24518fe3015451… commit fc1c5fa24518fe3015451b1867925d8055a8bfd6 Author: Alexander Rechitskiy <art1st.tm(a)gmail.com> AuthorDate: Fri Mar 15 02:04:57 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 15 00:04:57 2019 +0100 [README] Improve the layout of the Quick-Links; add the chat link (#1409) --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 547610c847..02199953e6 100644 --- a/README.md +++ b/README.md @@ -28,13 +28,14 @@ </p> ## Quick Links +[Website](https://reactos.org) • +[Official chat](https://chat.reactos.org) • +[Wiki](https://reactos.org/wiki) • +[Forum](https://reactos.org/forum) • +[JIRA Bug Tracker](https://jira.reactos.org/issues) • +[ReactOS Git mirror](https://git.reactos.org) • +[Testman](https://reactos.org/testman/) -- [Website](https://reactos.org) -- [Wiki](https://reactos.org/wiki) -- [Forum](https://reactos.org/forum) -- [JIRA Bug Tracker](https://jira.reactos.org/issues) -- [ReactOS Git mirror](https://git.reactos.org) -- [Testman](https://reactos.org/testman/) ## What is ReactOS?

1 0

[reactos] 01/01: [USERENV] LoadUserProfileW: If a user profile has already been loaded, just open and return the profile key.
by Eric Kohl 14 Mar '19

14 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30c501fc9ffea2687145f… commit 30c501fc9ffea2687145f2604277d6fccad915d7 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Mar 14 23:47:34 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Mar 14 23:49:16 2019 +0100 [USERENV] LoadUserProfileW: If a user profile has already been loaded, just open and return the profile key. --- dll/win32/userenv/profile.c | 149 ++++++++++++++++++++++---------------------- 1 file changed, 76 insertions(+), 73 deletions(-) diff --git a/dll/win32/userenv/profile.c b/dll/win32/userenv/profile.c index 40d4b323af..c250d8846d 100644 --- a/dll/win32/userenv/profile.c +++ b/dll/win32/userenv/profile.c @@ -1436,100 +1436,102 @@ LoadUserProfileW( DPRINT("UserName: %S\n", lpProfileInfo->lpUserName); - /* Don't load a profile twice */ - if (CheckForLoadedProfile(hToken)) + /* Get the user SID string */ + ret = GetUserSidStringFromToken(hToken, &SidString); + if (!ret) { - DPRINT ("Profile already loaded\n"); - lpProfileInfo->hProfile = NULL; - return TRUE; + DPRINT1("GetUserSidStringFromToken() failed\n"); + goto cleanup; } + ret = FALSE; - if (lpProfileInfo->lpProfilePath) + /* Don't load a profile twice */ + if (CheckForLoadedProfile(hToken)) { - /* Use the caller's specified roaming user profile path */ - StringCbCopyW(szUserHivePath, sizeof(szUserHivePath), lpProfileInfo->lpProfilePath); + DPRINT1("Profile %S already loaded\n", SidString.Buffer); } else { - /* FIXME: check if MS Windows allows lpProfileInfo->lpProfilePath to be NULL */ - if (!GetProfilesDirectoryW(szUserHivePath, &dwLength)) - { - DPRINT1("GetProfilesDirectoryW() failed (error %ld)\n", GetLastError()); - return FALSE; - } - } + DPRINT1("Loading profile %S\n", SidString.Buffer); - /* Create user hive name */ - StringCbCatW(szUserHivePath, sizeof(szUserHivePath), L"\\"); - StringCbCatW(szUserHivePath, sizeof(szUserHivePath), lpProfileInfo->lpUserName); - StringCbCatW(szUserHivePath, sizeof(szUserHivePath), L"\\ntuser.dat"); - DPRINT("szUserHivePath: %S\n", szUserHivePath); - - /* Create user profile directory if needed */ - if (GetFileAttributesW(szUserHivePath) == INVALID_FILE_ATTRIBUTES) - { - /* Get user sid */ - if (GetTokenInformation(hToken, TokenUser, NULL, 0, &dwLength) || - GetLastError() != ERROR_INSUFFICIENT_BUFFER) + if (lpProfileInfo->lpProfilePath) { - DPRINT1 ("GetTokenInformation() failed\n"); - return FALSE; + /* Use the caller's specified roaming user profile path */ + StringCbCopyW(szUserHivePath, sizeof(szUserHivePath), lpProfileInfo->lpProfilePath); } - - UserSid = (PTOKEN_USER)HeapAlloc(GetProcessHeap(), 0, dwLength); - if (!UserSid) + else { - DPRINT1("HeapAlloc() failed\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; + /* FIXME: check if MS Windows allows lpProfileInfo->lpProfilePath to be NULL */ + if (!GetProfilesDirectoryW(szUserHivePath, &dwLength)) + { + DPRINT1("GetProfilesDirectoryW() failed (error %ld)\n", GetLastError()); + goto cleanup; + } } - if (!GetTokenInformation(hToken, TokenUser, UserSid, dwLength, &dwLength)) + /* Create user hive name */ + StringCbCatW(szUserHivePath, sizeof(szUserHivePath), L"\\"); + StringCbCatW(szUserHivePath, sizeof(szUserHivePath), lpProfileInfo->lpUserName); + StringCbCatW(szUserHivePath, sizeof(szUserHivePath), L"\\ntuser.dat"); + DPRINT("szUserHivePath: %S\n", szUserHivePath); + + /* Create user profile directory if needed */ + if (GetFileAttributesW(szUserHivePath) == INVALID_FILE_ATTRIBUTES) { - DPRINT1("GetTokenInformation() failed\n"); - goto cleanup; + /* Get user sid */ + if (GetTokenInformation(hToken, TokenUser, NULL, 0, &dwLength) || + GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + DPRINT1 ("GetTokenInformation() failed\n"); + goto cleanup; + } + + UserSid = (PTOKEN_USER)HeapAlloc(GetProcessHeap(), 0, dwLength); + if (!UserSid) + { + DPRINT1("HeapAlloc() failed\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + + if (!GetTokenInformation(hToken, TokenUser, UserSid, dwLength, &dwLength)) + { + DPRINT1("GetTokenInformation() failed\n"); + goto cleanup; + } + + /* Create profile */ + ret = CreateUserProfileW(UserSid->User.Sid, lpProfileInfo->lpUserName); + if (!ret) + { + DPRINT1("CreateUserProfileW() failed\n"); + goto cleanup; + } } - /* Create profile */ - ret = CreateUserProfileW(UserSid->User.Sid, lpProfileInfo->lpUserName); - if (!ret) + /* Acquire restore privilege */ + if (!AcquireRemoveRestorePrivilege(TRUE)) { - DPRINT1("CreateUserProfileW() failed\n"); + DPRINT1("AcquireRemoveRestorePrivilege() failed (Error %ld)\n", GetLastError()); goto cleanup; } - } - - /* Get the user SID string */ - ret = GetUserSidStringFromToken(hToken, &SidString); - if (!ret) - { - DPRINT1("GetUserSidStringFromToken() failed\n"); - goto cleanup; - } - ret = FALSE; - /* Acquire restore privilege */ - if (!AcquireRemoveRestorePrivilege(TRUE)) - { - DPRINT1("AcquireRemoveRestorePrivilege() failed (Error %ld)\n", GetLastError()); - goto cleanup; - } - - /* Load user registry hive */ - Error = RegLoadKeyW(HKEY_USERS, - SidString.Buffer, - szUserHivePath); - AcquireRemoveRestorePrivilege(FALSE); + /* Load user registry hive */ + Error = RegLoadKeyW(HKEY_USERS, + SidString.Buffer, + szUserHivePath); + AcquireRemoveRestorePrivilege(FALSE); - /* HACK: Do not fail if the profile has already been loaded! */ - if (Error == ERROR_SHARING_VIOLATION) - Error = ERROR_SUCCESS; + /* HACK: Do not fail if the profile has already been loaded! */ + if (Error == ERROR_SHARING_VIOLATION) + Error = ERROR_SUCCESS; - if (Error != ERROR_SUCCESS) - { - DPRINT1("RegLoadKeyW() failed (Error %ld)\n", Error); - SetLastError((DWORD)Error); - goto cleanup; + if (Error != ERROR_SUCCESS) + { + DPRINT1("RegLoadKeyW() failed (Error %ld)\n", Error); + SetLastError((DWORD)Error); + goto cleanup; + } } /* Open future HKEY_CURRENT_USER */ @@ -1548,7 +1550,8 @@ LoadUserProfileW( ret = TRUE; cleanup: - HeapFree(GetProcessHeap(), 0, UserSid); + if (UserSid != NULL) + HeapFree(GetProcessHeap(), 0, UserSid); RtlFreeUnicodeString(&SidString); DPRINT("LoadUserProfileW() done\n");

1 0

[reactos] 08/08: [SHIMENG] Implement experimental support for multiple hooks on the same function
by Mark Jansen 14 Mar '19

14 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee62837ec08f8913754f8… commit ee62837ec08f8913754f8d1d57e1593db30cd080 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Mar 13 20:15:18 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Mar 14 20:02:01 2019 +0100 [SHIMENG] Implement experimental support for multiple hooks on the same function --- dll/appcompat/apphelp/shimeng.c | 91 +++++++++++++++++++++++++++++++++-------- dll/appcompat/apphelp/shimeng.h | 6 ++- 2 files changed, 78 insertions(+), 19 deletions(-) diff --git a/dll/appcompat/apphelp/shimeng.c b/dll/appcompat/apphelp/shimeng.c index e3c152bbdf..3e8a169617 100644 --- a/dll/appcompat/apphelp/shimeng.c +++ b/dll/appcompat/apphelp/shimeng.c @@ -46,7 +46,7 @@ HOOKAPIEX g_IntHookEx[] = StubGetProcAddress, /* ReplacementFunction*/ NULL, /* OriginalFunction */ NULL, /* pShimInfo */ - NULL /* Unused */ + NULL /* ApiLink */ }, }; @@ -545,17 +545,7 @@ VOID SeiAddHooks(PHOOKAPIEX hooks, DWORD dwHookCount, PSHIMINFO pShim) RtlInitAnsiString(&AnsiString, hook->FunctionName); if (NT_SUCCESS(LdrGetDllHandle(NULL, 0, &UnicodeModName, &DllHandle))) { - PVOID ProcAddress; - - - if (!NT_SUCCESS(LdrGetProcedureAddress(DllHandle, &AnsiString, 0, &ProcAddress))) - { - SHIMENG_FAIL("Unable to retrieve %s!%s\n", hook->LibraryName, hook->FunctionName); - continue; - } - HookModuleInfo = SeiFindHookModuleInfo(NULL, DllHandle); - hook->OriginalFunction = ProcAddress; } else { @@ -582,14 +572,22 @@ VOID SeiAddHooks(PHOOKAPIEX hooks, DWORD dwHookCount, PSHIMINFO pShim) int CmpResult = strcmp(hook->FunctionName, HookApi->FunctionName); if (CmpResult == 0) { - /* Multiple hooks on one function? --> use ApiLink */ - SHIMENG_FAIL("Multiple hooks on one API is not yet supported!\n"); - ASSERT(0); + while (HookApi->ApiLink) + { + HookApi = HookApi->ApiLink; + } + HookApi->ApiLink = hook; + hook = NULL; + break; } } - pHookApi = ARRAY_Append(&HookModuleInfo->HookApis, PHOOKAPIEX); - if (pHookApi) - *pHookApi = hook; + /* No place found yet, append it */ + if (hook) + { + pHookApi = ARRAY_Append(&HookModuleInfo->HookApis, PHOOKAPIEX); + if (pHookApi) + *pHookApi = hook; + } } } @@ -641,8 +639,57 @@ FARPROC WINAPI StubGetProcAddress(HINSTANCE hModule, LPCSTR lpProcName) return proc; } +VOID SeiResolveAPI(PHOOKMODULEINFO HookModuleInfo) +{ + DWORD n; + ANSI_STRING AnsiString; + + ASSERT(HookModuleInfo->BaseAddress != NULL); + + for (n = 0; n < ARRAY_Size(&HookModuleInfo->HookApis); ++n) + { + PVOID ProcAddress; + PHOOKAPIEX HookApi = *ARRAY_At(&HookModuleInfo->HookApis, PHOOKAPIEX, n); + RtlInitAnsiString(&AnsiString, HookApi->FunctionName); + + if (!NT_SUCCESS(LdrGetProcedureAddress(HookModuleInfo->BaseAddress, &AnsiString, 0, &ProcAddress))) + { + SHIMENG_FAIL("Unable to retrieve %s!%s\n", HookApi->LibraryName, HookApi->FunctionName); + continue; + } + + HookApi->OriginalFunction = ProcAddress; + if (HookApi->ApiLink) + { + SHIMENG_MSG("TODO: Figure out how to handle conflicting In/Exports with ApiLink!\n"); + } + while (HookApi->ApiLink) + { + HookApi->ApiLink->OriginalFunction = HookApi->OriginalFunction; + HookApi->OriginalFunction = HookApi->ApiLink->ReplacementFunction; + HookApi = HookApi->ApiLink; + } + } +} + /* Walk all shim modules / enabled shims, and add their hooks */ VOID SeiResolveAPIs(VOID) +{ + DWORD n; + + for (n = 0; n < ARRAY_Size(&g_pHookArray); ++n) + { + PHOOKMODULEINFO pModuleInfo = ARRAY_At(&g_pHookArray, HOOKMODULEINFO, n); + + /* Is this module loaded? */ + if (pModuleInfo->BaseAddress) + { + SeiResolveAPI(pModuleInfo); + } + } +} + +VOID SeiCombineHookInfo(VOID) { DWORD mod, n; @@ -1249,6 +1296,7 @@ VOID SeiInit(PUNICODE_STRING ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery) } SeiAddInternalHooks(dwTotalHooks); + SeiCombineHookInfo(); SeiResolveAPIs(); PatchNewModules(Peb); @@ -1347,8 +1395,17 @@ VOID NTAPI SE_ProcessDying(VOID) VOID WINAPI SE_DllLoaded(PLDR_DATA_TABLE_ENTRY LdrEntry) { + PHOOKMODULEINFO HookModuleInfo; SHIMENG_INFO("%sINIT. loading DLL \"%wZ\"\n", g_bShimDuringInit ? "" : "AFTER ", &LdrEntry->BaseDllName); + HookModuleInfo = SeiFindHookModuleInfo(&LdrEntry->BaseDllName, NULL); + if (HookModuleInfo) + { + ASSERT(HookModuleInfo->BaseAddress == NULL); + HookModuleInfo->BaseAddress = LdrEntry->DllBase; + SeiResolveAPI(HookModuleInfo); + } + SeiHookImports(LdrEntry); NotifyShims(SHIM_REASON_DLL_LOAD, LdrEntry); diff --git a/dll/appcompat/apphelp/shimeng.h b/dll/appcompat/apphelp/shimeng.h index 0081c49bc9..c6e3888d53 100644 --- a/dll/appcompat/apphelp/shimeng.h +++ b/dll/appcompat/apphelp/shimeng.h @@ -23,6 +23,8 @@ typedef struct _ARRAY typedef struct _SHIMINFO *PSHIMINFO; typedef struct _SHIMMODULE *PSHIMMODULE; +typedef struct tagHOOKAPIEX *PHOOKAPIEX; + /* Shims know this structure as HOOKAPI, with 2 reserved members (the last 2). */ typedef struct tagHOOKAPIEX { @@ -31,8 +33,8 @@ typedef struct tagHOOKAPIEX PVOID ReplacementFunction; PVOID OriginalFunction; PSHIMINFO pShimInfo; - PVOID Unused; -} HOOKAPIEX, *PHOOKAPIEX; + PHOOKAPIEX ApiLink; +} HOOKAPIEX; C_ASSERT(sizeof(HOOKAPIEX) == sizeof(HOOKAPI)); C_ASSERT(offsetof(HOOKAPIEX, pShimInfo) == offsetof(HOOKAPI, Reserved));

1 0

[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 14 Mar '19

14 Mar '19

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

1 0

[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 14 Mar '19

14 Mar '19

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; }

1 0

[reactos] 05/08: [SHIMENG] Don't crash on a shim not found CORE-15846
by Mark Jansen 14 Mar '19

14 Mar '19

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)

1 0

[reactos] 04/08: [SHIMENG] Find shims case-insensitive CORE-15845
by Mark Jansen 14 Mar '19

14 Mar '19

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)

1 0

[reactos] 03/08: [ACLAYERS] Add stubplemented IgnoreLoadLibrary shim CORE-15845
by Mark Jansen 14 Mar '19

14 Mar '19

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">

1 0

[reactos] 02/08: [APPSHIM_APITEST] Add test for IgnoreLoadLibrary CORE-15845
by Mark Jansen 14 Mar '19

14 Mar '19

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 }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs