Ros-diffs December 2016

ros-diffs@reactos.org

10 participants
83 discussions

[mjansen] 73463: [ACGENRAL] Implement the DisableThemes shim. CORE-11927

by mjansen＠svn.reactos.org

Author: mjansen Date: Fri Dec 16 22:05:58 2016 New Revision: 73463 URL: http://svn.reactos.org/svn/reactos?rev=73463&view=rev Log: [ACGENRAL] Implement the DisableThemes shim. CORE-11927 Added: trunk/reactos/dll/appcompat/shims/genral/ trunk/reactos/dll/appcompat/shims/genral/CMakeLists.txt (with props) trunk/reactos/dll/appcompat/shims/genral/genral.spec (with props) trunk/reactos/dll/appcompat/shims/genral/main.c (with props) trunk/reactos/dll/appcompat/shims/genral/themes.c (with props) Modified: trunk/reactos/dll/appcompat/shims/CMakeLists.txt Modified: trunk/reactos/dll/appcompat/shims/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/CMakeL… ============================================================================== --- trunk/reactos/dll/appcompat/shims/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/CMakeLists.txt [iso-8859-1] Fri Dec 16 22:05:58 2016 @@ -1,4 +1,5 @@ add_subdirectory(shimlib) +add_subdirectory(genral) add_subdirectory(layer) Added: trunk/reactos/dll/appcompat/shims/genral/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/genral… ============================================================================== --- trunk/reactos/dll/appcompat/shims/genral/CMakeLists.txt (added) +++ trunk/reactos/dll/appcompat/shims/genral/CMakeLists.txt [iso-8859-1] Fri Dec 16 22:05:58 2016 @@ -0,0 +1,18 @@ + +include_directories(${SHIMLIB_DIR}) + +spec2def(acgenral.dll genral.spec) + +list(APPEND SOURCE + main.c + themes.c + genral.spec) + +add_library(acgenral SHARED + ${SOURCE} + ${CMAKE_CURRENT_BINARY_DIR}/acgenral.def) + +set_module_type(acgenral win32dll) +target_link_libraries(acgenral shimlib) +add_importlibs(acgenral uxtheme msvcrt kernel32 ntdll) +add_cd_file(TARGET acgenral DESTINATION reactos/AppPatch FOR all) Propchange: trunk/reactos/dll/appcompat/shims/genral/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/appcompat/shims/genral/genral.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/genral… ============================================================================== --- trunk/reactos/dll/appcompat/shims/genral/genral.spec (added) +++ trunk/reactos/dll/appcompat/shims/genral/genral.spec [iso-8859-1] Fri Dec 16 22:05:58 2016 @@ -0,0 +1,3 @@ + +@ stdcall GetHookAPIs(str wstr ptr) +@ stdcall NotifyShims(long ptr) Propchange: trunk/reactos/dll/appcompat/shims/genral/genral.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/appcompat/shims/genral/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/genral… ============================================================================== --- trunk/reactos/dll/appcompat/shims/genral/main.c (added) +++ trunk/reactos/dll/appcompat/shims/genral/main.c [iso-8859-1] Fri Dec 16 22:05:58 2016 @@ -0,0 +1,37 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Shim library + * FILE: dll/appcompat/shims/genral/main.c + * PURPOSE: Shim entrypoint + * PROGRAMMER: Mark Jansen + */ + +#include <windows.h> +#include <strsafe.h> +#include <shimlib.h> + +/* Forward to the generic implementation */ +PHOOKAPI WINAPI GetHookAPIs(IN LPCSTR szCommandLine, IN LPCWSTR wszShimName, OUT PDWORD pdwHookCount) +{ + return ShimLib_GetHookAPIs(szCommandLine, wszShimName, pdwHookCount); +} + +/* Forward to the generic implementation */ +BOOL WINAPI NotifyShims(DWORD fdwReason, PVOID ptr) +{ + return ShimLib_NotifyShims(fdwReason, ptr); +} + +BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) +{ + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + ShimLib_Init(hInstance); + break; + case DLL_PROCESS_DETACH: + ShimLib_Deinit(); + break; + } + return TRUE; +} Propchange: trunk/reactos/dll/appcompat/shims/genral/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/appcompat/shims/genral/themes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/genral… ============================================================================== --- trunk/reactos/dll/appcompat/shims/genral/themes.c (added) +++ trunk/reactos/dll/appcompat/shims/genral/themes.c [iso-8859-1] Fri Dec 16 22:05:58 2016 @@ -0,0 +1,31 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Shim library + * FILE: dll/appcompat/shims/genral/themes.c + * PURPOSE: Theme related shims + * PROGRAMMER: Mark Jansen + */ + +#include <windows.h> +#include <shimlib.h> +#include <strsafe.h> +#include <uxtheme.h> + + +#define SHIM_NS DisableThemes +#include <setup_shim.inl> + +#define SHIM_NUM_HOOKS 0 +#define SHIM_NOTIFY_FN SHIM_OBJ_NAME(Notify) + +BOOL WINAPI SHIM_OBJ_NAME(Notify)(DWORD fdwReason, PVOID ptr) +{ + if (fdwReason == SHIM_REASON_INIT) + { + SetThemeAppProperties(0); + } + return TRUE; +} + +#include <implement_shim.inl> + Propchange: trunk/reactos/dll/appcompat/shims/genral/themes.c ------------------------------------------------------------------------------ svn:eol-style = native

7 years, 9 months

[mjansen] 73462: [ACLAYERS] Implement Force8BitColor and Force640x480 shims. CORE-11927

by mjansen＠svn.reactos.org

Author: mjansen Date: Fri Dec 16 21:54:06 2016 New Revision: 73462 URL: http://svn.reactos.org/svn/reactos?rev=73462&view=rev Log: [ACLAYERS] Implement Force8BitColor and Force640x480 shims. CORE-11927 Added: trunk/reactos/dll/appcompat/shims/layer/dispmode.c (with props) Modified: trunk/reactos/dll/appcompat/shims/layer/CMakeLists.txt Modified: trunk/reactos/dll/appcompat/shims/layer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/layer/… ============================================================================== --- trunk/reactos/dll/appcompat/shims/layer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/layer/CMakeLists.txt [iso-8859-1] Fri Dec 16 21:54:06 2016 @@ -4,6 +4,7 @@ spec2def(aclayers.dll layer.spec) list(APPEND SOURCE + dispmode.c versionlie.c main.c layer.spec) @@ -14,5 +15,5 @@ set_module_type(aclayers win32dll) target_link_libraries(aclayers shimlib) -add_importlibs(aclayers msvcrt kernel32 ntdll) +add_importlibs(aclayers user32 msvcrt kernel32 ntdll) add_cd_file(TARGET aclayers DESTINATION reactos/AppPatch FOR all) Added: trunk/reactos/dll/appcompat/shims/layer/dispmode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/layer/… ============================================================================== --- trunk/reactos/dll/appcompat/shims/layer/dispmode.c (added) +++ trunk/reactos/dll/appcompat/shims/layer/dispmode.c [iso-8859-1] Fri Dec 16 21:54:06 2016 @@ -0,0 +1,67 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Shim library + * FILE: dll/appcompat/shims/layer/dispmode.c + * PURPOSE: Display settings related shims + * PROGRAMMER: Mark Jansen + */ + +#include <windows.h> +#include <shimlib.h> +#include <strsafe.h> + + +#define SHIM_NS Force8BitColor +#include <setup_shim.inl> + +#define SHIM_NUM_HOOKS 0 +#define SHIM_NOTIFY_FN SHIM_OBJ_NAME(Notify) + +BOOL WINAPI SHIM_OBJ_NAME(Notify)(DWORD fdwReason, PVOID ptr) +{ + if (fdwReason == SHIM_REASON_INIT) + { + DEVMODEA dm = { { 0 } }; + dm.dmSize = sizeof(dm); + if (EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm) && + dm.dmBitsPerPel != 8) + { + dm.dmBitsPerPel = 8; + dm.dmFields |= DM_BITSPERPEL; + ChangeDisplaySettingsA(&dm, CDS_FULLSCREEN); + } + } + return TRUE; +} + +#include <implement_shim.inl> + + + +#define SHIM_NS Force640x480 +#include <setup_shim.inl> + +#define SHIM_NUM_HOOKS 0 +#define SHIM_NOTIFY_FN SHIM_OBJ_NAME(Notify) + +BOOL WINAPI SHIM_OBJ_NAME(Notify)(DWORD fdwReason, PVOID ptr) +{ + if (fdwReason == SHIM_REASON_INIT) + { + DEVMODEA dm = { { 0 } }; + dm.dmSize = sizeof(dm); + if (EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm) && + (dm.dmPelsWidth != 640 || dm.dmPelsHeight != 480)) + { + dm.dmPelsWidth = 640; + dm.dmPelsHeight = 480; + dm.dmFields |= (DM_PELSWIDTH | DM_PELSHEIGHT); + ChangeDisplaySettingsA(&dm, CDS_FULLSCREEN); + } + } + return TRUE; +} + +#include <implement_shim.inl> + + Propchange: trunk/reactos/dll/appcompat/shims/layer/dispmode.c ------------------------------------------------------------------------------ svn:eol-style = native

7 years, 9 months

[mjansen] 73461: [SHIMLIB] Shim helper functions keep a list of used shims, so that events can be forwarded. CORE-11329

by mjansen＠svn.reactos.org

Author: mjansen Date: Fri Dec 16 19:18:26 2016 New Revision: 73461 URL: http://svn.reactos.org/svn/reactos?rev=73461&view=rev Log: [SHIMLIB] Shim helper functions keep a list of used shims, so that events can be forwarded. CORE-11329 Added: trunk/reactos/dll/appcompat/shims/shimlib/shimdbgsupp.c (with props) Modified: trunk/reactos/dll/appcompat/shims/layer/main.c trunk/reactos/dll/appcompat/shims/layer/versionlie.c trunk/reactos/dll/appcompat/shims/layer/versionlie.inl trunk/reactos/dll/appcompat/shims/shimlib/CMakeLists.txt trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl trunk/reactos/dll/appcompat/shims/shimlib/setup_shim.inl trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h Modified: trunk/reactos/dll/appcompat/shims/layer/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/layer/… ============================================================================== --- trunk/reactos/dll/appcompat/shims/layer/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/layer/main.c [iso-8859-1] Fri Dec 16 19:18:26 2016 @@ -16,10 +16,10 @@ return ShimLib_GetHookAPIs(szCommandLine, wszShimName, pdwHookCount); } -/* PLDR_DATA_TABLE_ENTRY */ -BOOL WINAPI NotifyShims(DWORD fdwReason, PVOID P) +/* Forward to the generic implementation */ +BOOL WINAPI NotifyShims(DWORD fdwReason, PVOID ptr) { - return TRUE; + return ShimLib_NotifyShims(fdwReason, ptr); } BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) Modified: trunk/reactos/dll/appcompat/shims/layer/versionlie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/layer/… ============================================================================== --- trunk/reactos/dll/appcompat/shims/layer/versionlie.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/layer/versionlie.c [iso-8859-1] Fri Dec 16 19:18:26 2016 @@ -89,7 +89,6 @@ #define SHIM_NS Win95VersionLie - #include <setup_shim.inl> DWORD WINAPI SHIM_OBJ_NAME(APIHook_GetVersion)() @@ -128,7 +127,6 @@ #define SHIM_NS Win98VersionLie - #include <setup_shim.inl> DWORD WINAPI SHIM_OBJ_NAME(APIHook_GetVersion)() Modified: trunk/reactos/dll/appcompat/shims/layer/versionlie.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/layer/… ============================================================================== --- trunk/reactos/dll/appcompat/shims/layer/versionlie.inl [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/layer/versionlie.inl [iso-8859-1] Fri Dec 16 19:18:26 2016 @@ -43,9 +43,9 @@ return FALSE; } -BOOL WINAPI SHIM_OBJ_NAME(Notify)(DWORD fdwReason) +BOOL WINAPI SHIM_OBJ_NAME(Notify)(DWORD fdwReason, PVOID ptr) { - if (fdwReason == SHIM_REASON_ATTACH && VERSION_INFO.wServicePackMajor) + if (fdwReason == SHIM_NOTIFY_ATTACH && VERSION_INFO.wServicePackMajor) { static CONST WCHAR szServicePack[] = {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','%','u',0}; HRESULT hr = StringCbPrintfA(VERSION_INFO.szCSDVersionA, sizeof(VERSION_INFO.szCSDVersionA), Modified: trunk/reactos/dll/appcompat/shims/shimlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/shimlib/CMakeLists.txt [iso-8859-1] Fri Dec 16 19:18:26 2016 @@ -1,7 +1,11 @@ list(APPEND SOURCE + shimdbgsupp.c shimlib.c - shimlib.h) + shimlib.h + # These .inl functions are included so they show up in vs + setup_shim.inl + implement_shim.inl) add_library(shimlib ${SOURCE}) add_dependencies(shimlib xdk) Modified: trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl [iso-8859-1] Fri Dec 16 19:18:26 2016 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Shim library * FILE: dll/appcompat/shims/shimlib/implement_shim.inl - * PURPOSE: Shimlib helper file, used to register shims using the earlier prepared macro's + * PURPOSE: Shimlib helper file, used to register shims setup with macro's from setup_shim.inl * PROGRAMMER: Mark Jansen */ @@ -18,57 +18,56 @@ #error "setup_shim.inl should be included before this file!" #endif +#if SHIM_NUM_HOOKS > 0 #ifndef SHIM_SETUP_HOOKS #error "Please define a hook: #define SHIM_SETUP_HOOKS SHIM_HOOK(num, dll_name, function_name, your_function)" #endif +#else +#ifdef SHIM_SETUP_HOOKS +#error "Hooks are defined, yet SHIM_NUM_HOOKS is <= 0 !" +#endif +#endif -PHOOKAPI WINAPI SHIM_OBJ_NAME(InitializeHooksMulti)(DWORD fdwReason, PCSTR pszCmdLine, PDWORD pdwHookCount) +PHOOKAPI WINAPI SHIM_OBJ_NAME(GetHookAPIs)(DWORD fdwReason, PCSTR pszCmdLine, PDWORD pdwHookCount) { - if (fdwReason == SHIM_REASON_ATTACH) + if (pszCmdLine) { - if (pszCmdLine) - { - SHIM_OBJ_NAME(g_szCommandLine) = ShimLib_StringDuplicateA(pszCmdLine); - } - else - { - SHIM_OBJ_NAME(g_szCommandLine) = ""; - } - SHIM_OBJ_NAME(g_pAPIHooks) = ShimLib_ShimMalloc(sizeof(HOOKAPI) * SHIM_NUM_HOOKS); - ZeroMemory(SHIM_OBJ_NAME(g_pAPIHooks), sizeof(HOOKAPI) * SHIM_NUM_HOOKS); - *pdwHookCount = SHIM_NUM_HOOKS; + SHIM_OBJ_NAME(g_szCommandLine) = ShimLib_StringDuplicateA(pszCmdLine); } + else + { + SHIM_OBJ_NAME(g_szCommandLine) = ""; + } + SHIM_OBJ_NAME(g_pAPIHooks) = ShimLib_ShimMalloc(sizeof(HOOKAPI) * SHIM_NUM_HOOKS); + ZeroMemory(SHIM_OBJ_NAME(g_pAPIHooks), sizeof(HOOKAPI) * SHIM_NUM_HOOKS); + *pdwHookCount = SHIM_NUM_HOOKS; #ifdef SHIM_NOTIFY_FN - if (!SHIM_NOTIFY_FN(fdwReason) && fdwReason == SHIM_REASON_ATTACH) + if (!SHIM_NOTIFY_FN(fdwReason, NULL)) return NULL; #endif - if (fdwReason == SHIM_REASON_ATTACH) - { - SHIM_SETUP_HOOKS - } +#if SHIM_NUM_HOOKS > 0 + SHIM_SETUP_HOOKS +#endif return SHIM_OBJ_NAME(g_pAPIHooks); } - -PVOID SHIM_OBJ_NAME(FindShim)(PCWSTR wszString) -{ - PCSTR szString = SHIM_OBJ_NAME(g_szModuleName); - while (*szString == *wszString) - { - if (!*szString) - return SHIM_OBJ_NAME(InitializeHooksMulti); - szString++; wszString++; - } - return NULL; -} #if defined(_MSC_VER) #pragma section(".shm$BBB",long,read) #endif -_SHMALLOC(".shm$BBB") _PVSHIM SHIM_OBJ_NAME(_shim_fn) = SHIM_OBJ_NAME(FindShim); +_SHMALLOC(".shm$BBB") SHIMREG SHIM_OBJ_NAME(_shim_fn) = +{ + SHIM_OBJ_NAME(GetHookAPIs), +#ifdef SHIM_NOTIFY_FN + SHIM_NOTIFY_FN, +#else + NULL, +#endif + SHIM_STRINGIFY(SHIM_NS) +}; #undef SHIM_SETUP_HOOKS #undef SHIM_NOTIFY_FN Modified: trunk/reactos/dll/appcompat/shims/shimlib/setup_shim.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/setup_shim.inl [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/shimlib/setup_shim.inl [iso-8859-1] Fri Dec 16 19:18:26 2016 @@ -19,13 +19,15 @@ #define SHIM_STRINGIFY2(X_) # X_ #define SHIM_STRINGIFY(X_) SHIM_STRINGIFY2(X_) +/* TODO: static_assert on (num < SHIM_NUM_HOOKS) */ + #define SHIM_HOOK(num, dll, function, target) \ SHIM_OBJ_NAME(g_pAPIHooks)[num].LibraryName = dll; \ SHIM_OBJ_NAME(g_pAPIHooks)[num].FunctionName = function; \ SHIM_OBJ_NAME(g_pAPIHooks)[num].ReplacementFunction = target; \ SHIM_OBJ_NAME(g_pAPIHooks)[num].OriginalFunction = NULL; \ - SHIM_OBJ_NAME(g_pAPIHooks)[num].Unk1 = NULL; \ - SHIM_OBJ_NAME(g_pAPIHooks)[num].Unk2 = NULL; + SHIM_OBJ_NAME(g_pAPIHooks)[num].Reserved[0] = NULL; \ + SHIM_OBJ_NAME(g_pAPIHooks)[num].Reserved[1] = NULL; #define CALL_SHIM(SHIM_NUM, SHIM_CALLCONV) \ ((SHIM_CALLCONV)(SHIM_OBJ_NAME(g_pAPIHooks)[SHIM_NUM].OriginalFunction)) Added: trunk/reactos/dll/appcompat/shims/shimlib/shimdbgsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/shimdbgsupp.c (added) +++ trunk/reactos/dll/appcompat/shims/shimlib/shimdbgsupp.c [iso-8859-1] Fri Dec 16 19:18:26 2016 @@ -0,0 +1,79 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Shim library + * FILE: dll/appcompat/shims/shimlib/shimdbgsupp.c + * PURPOSE: Shim debug helper functions + * PROGRAMMER: Mark Jansen + */ + +#include <windef.h> +#include <winbase.h> +#include <shimlib.h> +#include <strsafe.h> + +#include "wine/winternl.h" + +#define DPFLTR_APPCOMPAT_ID 123 + +void ApphelppInitDebugSupport(PCWSTR KeyName, PULONG Level); +static void SeiInitDebugSupport() +{ + ApphelppInitDebugSupport(L"SHIMENG_DEBUG_LEVEL", &g_ShimEngDebugLevel); +} + + +/** + * Outputs diagnostic info. + * + * @param [in] Level The level to log this message with, choose any of [SHIM_ERR, + * SHIM_WARN, SHIM_INFO]. + * @param [in] FunctionName The function this log should be attributed to. + * @param [in] Format The format string. + * @param ... Variable arguments providing additional information. + * + * @return Success: TRUE Failure: FALSE. + */ +BOOL WINAPIV SeiDbgPrint(SEI_LOG_LEVEL Level, PCSTR FunctionName, PCSTR Format, ...) +{ + char Buffer[512]; + va_list ArgList; + char* Current = Buffer; + const char* LevelStr; + size_t Length = sizeof(Buffer); + + if (g_ShimEngDebugLevel == 0xffffffff) + SeiInitDebugSupport(); + + if (Level > g_ShimEngDebugLevel) + return FALSE; + + switch (Level) + { + case SEI_ERR: + LevelStr = "Err "; + Level = DPFLTR_MASK | (1 << DPFLTR_ERROR_LEVEL); + break; + case SEI_WARN: + LevelStr = "Warn"; + Level = DPFLTR_MASK | (1 << DPFLTR_WARNING_LEVEL); + break; + case SEI_INFO: + LevelStr = "Info"; + Level = DPFLTR_MASK | (1 << DPFLTR_INFO_LEVEL); + break; + default: + LevelStr = "User"; + Level = DPFLTR_MASK | (1 << DPFLTR_INFO_LEVEL); + break; + } + StringCchPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, "[%s][%-20s] ", LevelStr, FunctionName); + va_start(ArgList, Format); + StringCchVPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, Format, ArgList); + va_end(ArgList); +#if defined(APPCOMPAT_USE_DBGPRINTEX) && APPCOMPAT_USE_DBGPRINTEX + return NT_SUCCESS(DbgPrintEx(DPFLTR_APPCOMPAT_ID, Level, "%s", Buffer)); +#else + OutputDebugStringA(Buffer); + return TRUE; +#endif +} Propchange: trunk/reactos/dll/appcompat/shims/shimlib/shimdbgsupp.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c [iso-8859-1] Fri Dec 16 19:18:26 2016 @@ -11,13 +11,25 @@ #include <shimlib.h> #include <strsafe.h> -HINSTANCE g_hinstDll; +typedef struct UsedShim +{ + SLIST_ENTRY Entry; + PSHIMREG pShim; +#if (WINVER > _WIN32_WINNT_WS03) + BOOL bInitCalled; +#endif +} UsedShim, *pUsedShim; + + static HANDLE g_ShimLib_Heap; +static PSLIST_HEADER g_UsedShims; void ShimLib_Init(HINSTANCE hInstance) { - g_hinstDll = hInstance; g_ShimLib_Heap = HeapCreate(0, 0x10000, 0); + + g_UsedShims = (PSLIST_HEADER)ShimLib_ShimMalloc(sizeof(SLIST_HEADER)); + RtlInitializeSListHead(g_UsedShims); } void ShimLib_Deinit() @@ -43,6 +55,18 @@ return lstrcpyA(NewString, szString); } +BOOL ShimLib_StrAEqualsW(PCSTR szString, PCWSTR wszString) +{ + while (*szString == *wszString) + { + if (!*szString) + return TRUE; + + szString++; wszString++; + } + return FALSE; +} + #if defined(_MSC_VER) #if defined(_M_IA64) || defined(_M_AMD64) @@ -62,8 +86,8 @@ #endif -_SHMALLOC(".shm") _PVSHIM _shim_start = 0; -_SHMALLOC(".shm$ZZZ") _PVSHIM _shim_end = 0; +_SHMALLOC(".shm") SHIMREG _shim_start = { 0 }; +_SHMALLOC(".shm$ZZZ") SHIMREG _shim_end = { 0 }; /* Generic GetHookAPIs function. @@ -72,21 +96,53 @@ This helper function will return the correct shim, and call the init function */ PHOOKAPI WINAPI ShimLib_GetHookAPIs(IN LPCSTR szCommandLine, IN LPCWSTR wszShimName, OUT PDWORD pdwHookCount) { - uintptr_t ps = (uintptr_t)&_shim_start; - ps += sizeof(uintptr_t); - for (; ps != (uintptr_t)&_shim_end; ps += sizeof(uintptr_t)) + PSHIMREG ps = &_shim_start; + ps++; + for (; ps != &_shim_end; ps++) { - _PVSHIM* pfunc = (_PVSHIM *)ps; - if (*pfunc != NULL) + if (ps->GetHookAPIs != NULL && ps->ShimName != NULL) { - PVOID res = (*pfunc)(wszShimName); - if (res) + if (ShimLib_StrAEqualsW(ps->ShimName, wszShimName)) { - PHOOKAPI (WINAPI* PFN)(DWORD, PCSTR, PDWORD) = res; - return (*PFN)(SHIM_REASON_ATTACH, szCommandLine, pdwHookCount); + pUsedShim shim = (pUsedShim)ShimLib_ShimMalloc(sizeof(UsedShim)); + shim->pShim = ps; +#if (WINVER > _WIN32_WINNT_WS03) + shim->bInitCalled = FALSE; +#endif + RtlInterlockedPushEntrySList(g_UsedShims, &(shim->Entry)); + + return ps->GetHookAPIs(SHIM_NOTIFY_ATTACH, szCommandLine, pdwHookCount); } } } return NULL; } + +BOOL WINAPI ShimLib_NotifyShims(DWORD fdwReason, PVOID ptr) +{ + PSLIST_ENTRY pEntry = RtlFirstEntrySList(g_UsedShims); + + if (fdwReason < SHIM_REASON_INIT) + fdwReason += (SHIM_REASON_INIT - SHIM_NOTIFY_ATTACH); + + while (pEntry) + { + pUsedShim pUsed = CONTAINING_RECORD(pEntry, UsedShim, Entry); + _PVNotify Notify = pUsed->pShim->Notify; +#if (WINVER > _WIN32_WINNT_WS03) + if (pUsed->bInitCalled && fdwReason == SHIM_REASON_INIT) + Notify = NULL; +#endif + if (Notify) + Notify(fdwReason, ptr); +#if (WINVER > _WIN32_WINNT_WS03) + if (fdwReason == SHIM_REASON_INIT) + pUsed->bInitCalled = TRUE; +#endif + + pEntry = pEntry->Next; + } + + return TRUE; +} Modified: trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h [iso-8859-1] Fri Dec 16 19:18:26 2016 @@ -8,32 +8,71 @@ #pragma once -typedef struct tagHOOKAPI { +typedef struct tagHOOKAPI +{ PCSTR LibraryName; PCSTR FunctionName; PVOID ReplacementFunction; PVOID OriginalFunction; - PVOID Unk1; - PVOID Unk2; + PVOID Reserved[2]; } HOOKAPI, *PHOOKAPI; -extern HINSTANCE g_hinstDll; -void ShimLib_Init(HINSTANCE); -void ShimLib_Deinit(void); PVOID ShimLib_ShimMalloc(SIZE_T); void ShimLib_ShimFree(PVOID); PCSTR ShimLib_StringDuplicateA(PCSTR); -PHOOKAPI WINAPI ShimLib_GetHookAPIs(LPCSTR,LPCWSTR,PDWORD); +BOOL ShimLib_StrAEqualsW(PCSTR, PCWSTR); -#define SHIM_REASON_ATTACH 1 -#define SHIM_REASON_DETACH 2 -#define SHIM_REASON_DLL_LOAD 3 /* Arg: PLDR_DATA_TABLE_ENTRY */ -#define SHIM_REASON_DLL_UNLOAD 4 /* Arg: Module Handle */ +/* Forward events to generic handlers */ +void ShimLib_Init(HINSTANCE); +void ShimLib_Deinit(void); +PHOOKAPI WINAPI ShimLib_GetHookAPIs(LPCSTR,LPCWSTR,PDWORD); +BOOL WINAPI ShimLib_NotifyShims(DWORD fdwReason, PVOID ptr); -typedef PVOID (__cdecl *_PVSHIM)(PCWSTR); +/* Shims should respond to SHIM_REASON_XXXX in the Notify routines. + SHIM_NOTIFY_ codes are sent by apphelp, and translated to SHIM_REASON_ by the shimlib routines. + The only exception being SHIM_NOTIFY_ATTACH, that is also set for one-time init. + */ + +#define SHIM_REASON_INIT 100 +#define SHIM_REASON_DEINIT 101 +#define SHIM_REASON_DLL_LOAD 102 /* Arg: PLDR_DATA_TABLE_ENTRY */ +#define SHIM_REASON_DLL_UNLOAD 103 /* Arg: PLDR_DATA_TABLE_ENTRY */ + +#define SHIM_NOTIFY_ATTACH 1 +#define SHIM_NOTIFY_DETACH 2 +#define SHIM_NOTIFY_DLL_LOAD 3 /* Arg: PLDR_DATA_TABLE_ENTRY */ +#define SHIM_NOTIFY_DLL_UNLOAD 4 /* Arg: PLDR_DATA_TABLE_ENTRY */ + + + +typedef enum _SEI_LOG_LEVEL { + SEI_ERR = 1, + SEI_WARN = 2, + SEI_INFO = 3, +} SEI_LOG_LEVEL; + +BOOL WINAPIV SeiDbgPrint(SEI_LOG_LEVEL Level, PCSTR FunctionName, PCSTR Format, ...); +extern ULONG g_ShimEngDebugLevel; + +#define SHIMENG_ERR(fmt, ...) do { if (g_ShimEngDebugLevel) SeiDbgPrint(SEI_ERR, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) +#define SHIMENG_WARN(fmt, ...) do { if (g_ShimEngDebugLevel) SeiDbgPrint(SEI_WARN, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) +#define SHIMENG_INFO(fmt, ...) do { if (g_ShimEngDebugLevel) SeiDbgPrint(SEI_INFO, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) + + + +typedef PHOOKAPI (WINAPI* _PVGetHookAPIs)(DWORD, PCSTR, PDWORD); +typedef BOOL (WINAPI* _PVNotify)(DWORD, PVOID); + +typedef struct tagSHIMREG +{ + _PVGetHookAPIs GetHookAPIs; + _PVNotify Notify; + PCSTR ShimName; +} SHIMREG, *PSHIMREG; + #if defined(_MSC_VER) #define _SHMALLOC(x) __declspec(allocate(x))

7 years, 9 months

[gadamopoulos] 73460: [PSDK] -Add some definitions needed by the previous commit.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Dec 16 10:39:16 2016 New Revision: 73460 URL: http://svn.reactos.org/svn/reactos?rev=73460&view=rev Log: [PSDK] -Add some definitions needed by the previous commit. Modified: trunk/reactos/sdk/include/psdk/shlobj.h Modified: trunk/reactos/sdk/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/shlobj.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/shlobj.h [iso-8859-1] Fri Dec 16 10:39:16 2016 @@ -2213,6 +2213,8 @@ #define DFM_MERGECONTEXTMENU 1 #define DFM_INVOKECOMMAND 2 +#define DFM_INVOKECOMMANDEX 12 +#define DFM_GETDEFSTATICID 14 #define DFM_CMD_DELETE ((UINT)-1) #define DFM_CMD_MOVE ((UINT)-2)

7 years, 9 months

[gadamopoulos] 73459: [SHELL32] - CNetFolder: Fix opening items which was broken after having a callback for the default context menu became mandatory.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Dec 16 10:31:13 2016 New Revision: 73459 URL: http://svn.reactos.org/svn/reactos?rev=73459&view=rev Log: [SHELL32] - CNetFolder: Fix opening items which was broken after having a callback for the default context menu became mandatory. Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] Fri Dec 16 10:31:13 2016 @@ -61,6 +61,25 @@ return initIcon->QueryInterface(riid, ppvOut); } +HRESULT CALLBACK NetFolderMenuCallback(IShellFolder *psf, + HWND hwnd, + IDataObject *pdtobj, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case DFM_MERGECONTEXTMENU: + return S_OK; + case DFM_INVOKECOMMAND: + case DFM_INVOKECOMMANDEX: + case DFM_GETDEFSTATICID: // Required for Windows 7 to pick a default + return S_FALSE; + } + return E_NOTIMPL; +} + class CNetFolderEnum : public CEnumIDListBase { @@ -421,7 +440,7 @@ HKEY hkey; UINT cKeys = 0; AddClassKeyToArray(L"Folder", &hkey, &cKeys); - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), NULL, cKeys, &hkey, &pCm); + hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, this, NetFolderMenuCallback, cKeys, &hkey, &pCm); pObj = pCm; } else if (IsEqualIID(riid, IID_IDataObject) && (cidl >= 1))

7 years, 9 months

[hbelusca] 73458: [APITESTS]: Add a test for userenv.dll API Load/UnloadUserProfile. CORE-12541

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 15 18:44:47 2016 New Revision: 73458 URL: http://svn.reactos.org/svn/reactos?rev=73458&view=rev Log: [APITESTS]: Add a test for userenv.dll API Load/UnloadUserProfile. CORE-12541 Added: trunk/rostests/apitests/userenv/ trunk/rostests/apitests/userenv/CMakeLists.txt (with props) trunk/rostests/apitests/userenv/LoadUserProfile.c (with props) trunk/rostests/apitests/userenv/testlist.c (with props) Modified: trunk/rostests/apitests/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Thu Dec 15 18:44:47 2016 @@ -30,6 +30,7 @@ add_subdirectory(psapi) add_subdirectory(user32) add_subdirectory(user32_dynamic) +add_subdirectory(userenv) if(NOT ARCH STREQUAL "amd64" AND NOT CMAKE_BUILD_TYPE STREQUAL "Release") add_subdirectory(win32kdll) add_subdirectory(win32nt) Added: trunk/rostests/apitests/userenv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/userenv/CMakeLis… ============================================================================== --- trunk/rostests/apitests/userenv/CMakeLists.txt (added) +++ trunk/rostests/apitests/userenv/CMakeLists.txt [iso-8859-1] Thu Dec 15 18:44:47 2016 @@ -0,0 +1,10 @@ + +list(APPEND SOURCE + LoadUserProfile.c + testlist.c) + +add_executable(userenv_apitest ${SOURCE}) +target_link_libraries(userenv_apitest wine ${PSEH_LIB}) +set_module_type(userenv_apitest win32cui) +add_importlibs(userenv_apitest userenv advapi32 msvcrt kernel32) +add_cd_file(TARGET userenv_apitest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/apitests/userenv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/userenv/LoadUserProfile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/userenv/LoadUser… ============================================================================== --- trunk/rostests/apitests/userenv/LoadUserProfile.c (added) +++ trunk/rostests/apitests/userenv/LoadUserProfile.c [iso-8859-1] Thu Dec 15 18:44:47 2016 @@ -0,0 +1,217 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Tests for Load/UnloadUserProfile + * PROGRAMMERS: Hermes Belusca-Maito + */ + +#include <apitest.h> +// #include <windef.h> +// #include <winbase.h> +#include <sddl.h> +#include <userenv.h> +#include <strsafe.h> + +#undef SE_RESTORE_NAME +#undef SE_BACKUP_NAME +#define SE_RESTORE_NAME L"SeRestorePrivilege" +#define SE_BACKUP_NAME L"SeBackupPrivilege" + +/* + * Taken from dll/win32/shell32/dialogs/dialogs.cpp ; + * See also base/applications/shutdown/shutdown.c . + */ +static BOOL +EnablePrivilege(LPCWSTR lpszPrivilegeName, BOOL bEnablePrivilege) +{ + BOOL Success; + HANDLE hToken; + TOKEN_PRIVILEGES tp; + + Success = OpenProcessToken(GetCurrentProcess(), + TOKEN_ADJUST_PRIVILEGES, + &hToken); + if (!Success) return Success; + + Success = LookupPrivilegeValueW(NULL, + lpszPrivilegeName, + &tp.Privileges[0].Luid); + if (!Success) goto Quit; + + tp.PrivilegeCount = 1; + tp.Privileges[0].Attributes = (bEnablePrivilege ? SE_PRIVILEGE_ENABLED : 0); + + Success = AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL); + +Quit: + CloseHandle(hToken); + return Success; +} + +/* + * Taken from dll/win32/userenv/sid.c . + * We cannot directly use the USERENV.DLL export, because: 1) it is exported + * by ordinal (#142), and: 2) it is simply not exported at all in Vista+ + * (and ordinal #142 is assigned there to LoadUserProfileA). + */ +PSID +WINAPI +GetUserSid(IN HANDLE hToken) +{ + BOOL Success; + PSID pSid; + ULONG Length; + PTOKEN_USER UserBuffer; + PTOKEN_USER TempBuffer; + + Length = 256; + UserBuffer = LocalAlloc(LPTR, Length); + if (UserBuffer == NULL) + return NULL; + + Success = GetTokenInformation(hToken, + TokenUser, + (PVOID)UserBuffer, + Length, + &Length); + if (!Success && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) + { + TempBuffer = LocalReAlloc(UserBuffer, Length, LMEM_MOVEABLE); + if (TempBuffer == NULL) + { + LocalFree(UserBuffer); + return NULL; + } + + UserBuffer = TempBuffer; + Success = GetTokenInformation(hToken, + TokenUser, + (PVOID)UserBuffer, + Length, + &Length); + } + + if (!Success) + { + LocalFree(UserBuffer); + return NULL; + } + + Length = GetLengthSid(UserBuffer->User.Sid); + + pSid = LocalAlloc(LPTR, Length); + if (pSid == NULL) + { + LocalFree(UserBuffer); + return NULL; + } + + Success = CopySid(Length, pSid, UserBuffer->User.Sid); + + LocalFree(UserBuffer); + + if (!Success) + { + LocalFree(pSid); + return NULL; + } + + return pSid; +} + +START_TEST(LoadUserProfile) +{ + BOOL Success; + HANDLE hToken = NULL; + PSID pUserSid = NULL; + USHORT i; + PROFILEINFOW ProfileInfo[2] = { {0}, {0} }; + + Success = OpenThreadToken(GetCurrentThread(), + TOKEN_QUERY | TOKEN_IMPERSONATE | TOKEN_DUPLICATE, + TRUE, + &hToken); + if (!Success && (GetLastError() == ERROR_NO_TOKEN)) + { + trace("OpenThreadToken failed with error %lu, falling back to OpenProcessToken\n", GetLastError()); + Success = OpenProcessToken(GetCurrentProcess(), + TOKEN_QUERY | TOKEN_IMPERSONATE | TOKEN_DUPLICATE, + &hToken); + } + if (!Success || (hToken == NULL)) + { + skip("Open[Thread|Process]Token failed with error %lu\n", GetLastError()); + return; + } + + pUserSid = GetUserSid(hToken); + ok(pUserSid != NULL, "GetUserSid failed with error %lu\n", GetLastError()); + if (pUserSid) + { + LPWSTR pSidStr = NULL; + Success = ConvertSidToStringSidW(pUserSid, &pSidStr); + ok(Success, "ConvertSidToStringSidW failed with error %lu\n", GetLastError()); + if (Success) + { + trace("User SID is '%ls'\n", pSidStr); + LocalFree(pSidStr); + } + LocalFree(pUserSid); + pUserSid = NULL; + } + else + { + trace("No SID available!\n"); + } + + /* Check whether ProfileInfo.lpUserName is really needed */ + ZeroMemory(&ProfileInfo[0], sizeof(ProfileInfo[0])); + ProfileInfo[0].dwSize = sizeof(ProfileInfo[0]); + ProfileInfo[0].dwFlags = PI_NOUI; + ProfileInfo[0].lpUserName = NULL; + Success = LoadUserProfileW(hToken, &ProfileInfo[0]); + ok(!Success, "LoadUserProfile succeeded with error %lu, expected failing\n", GetLastError()); + ok(ProfileInfo[0].hProfile == NULL, "ProfileInfo[0].hProfile != NULL, expected NULL\n"); + /* Unload the user profile if we erroneously succeeded, just in case... */ + if (Success) + { + trace("LoadUserProfileW(ProfileInfo[0]) unexpectedly succeeded, unload the user profile just in case...\n"); + UnloadUserProfile(hToken, ProfileInfo[0].hProfile); + } + + /* TODO: Check which privileges we do need */ + + /* Enable both the SE_RESTORE_NAME and SE_BACKUP_NAME privileges */ + Success = EnablePrivilege(SE_RESTORE_NAME, TRUE); + ok(Success, "EnablePrivilege(SE_RESTORE_NAME) failed with error %lu\n", GetLastError()); + Success = EnablePrivilege(SE_BACKUP_NAME, TRUE); + ok(Success, "EnablePrivilege(SE_BACKUP_NAME) failed with error %lu\n", GetLastError()); + + /* Check whether we can load multiple times the same user profile */ + for (i = 0; i < ARRAYSIZE(ProfileInfo); ++i) + { + ZeroMemory(&ProfileInfo[i], sizeof(ProfileInfo[i])); + ProfileInfo[i].dwSize = sizeof(ProfileInfo[i]); + ProfileInfo[i].dwFlags = PI_NOUI; + ProfileInfo[i].lpUserName = L"toto"; // Dummy name; normally this should be the user name... + Success = LoadUserProfileW(hToken, &ProfileInfo[i]); + ok(Success, "LoadUserProfileW(ProfileInfo[%d]) failed with error %lu\n", i, GetLastError()); + ok(ProfileInfo[i].hProfile != NULL, "ProfileInfo[%d].hProfile == NULL\n", i); + trace("ProfileInfo[%d].hProfile = 0x%p\n", i, ProfileInfo[i].hProfile); + } + + i = ARRAYSIZE(ProfileInfo); + while (i-- > 0) + { + trace("UnloadUserProfile(ProfileInfo[%d].hProfile)\n", i); + Success = UnloadUserProfile(hToken, ProfileInfo[i].hProfile); + ok(Success, "UnloadUserProfile(ProfileInfo[%d].hProfile) failed with error %lu\n", i, GetLastError()); + } + + /* Disable the privileges */ + EnablePrivilege(SE_BACKUP_NAME, FALSE); + EnablePrivilege(SE_RESTORE_NAME, FALSE); + + /* Final cleanup */ + CloseHandle(hToken); +} Propchange: trunk/rostests/apitests/userenv/LoadUserProfile.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/userenv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/userenv/testlist… ============================================================================== --- trunk/rostests/apitests/userenv/testlist.c (added) +++ trunk/rostests/apitests/userenv/testlist.c [iso-8859-1] Thu Dec 15 18:44:47 2016 @@ -0,0 +1,12 @@ +#define __ROS_LONG64__ + +#define STANDALONE +#include <apitest.h> + +extern void func_LoadUserProfile(void); + +const struct test winetest_testlist[] = +{ + { "LoadUserProfile", func_LoadUserProfile }, + { 0, 0 } +}; Propchange: trunk/rostests/apitests/userenv/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

7 years, 9 months

[hbelusca] 73457: [NETAPI32]: Fix misusage of a pointer, that caused a crash when using the command "net localgroup". Address one of the problems described in CORE-11081. Note that those ((ULONG_PT...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 15 14:45:58 2016 New Revision: 73457 URL: http://svn.reactos.org/svn/reactos?rev=73457&view=rev Log: [NETAPI32]: Fix misusage of a pointer, that caused a crash when using the command "net localgroup". Address one of the problems described in CORE-11081. Note that those ((ULONG_PTR)the_pointer + sizeof(type_pointed_by_the_pointer)) could be somewhat short cut into: (the_pointer + 1) (with the_pointer being of type *type_pointed_by_the_pointer). But anyway... Modified: trunk/reactos/dll/win32/netapi32/local_group.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Thu Dec 15 14:45:58 2016 @@ -103,7 +103,7 @@ case 0: LocalInfo0 = (PLOCALGROUP_INFO_0)LocalBuffer; - Ptr = (LPWSTR)LocalInfo0++; + Ptr = (LPWSTR)((ULONG_PTR)LocalInfo0 + sizeof(LOCALGROUP_INFO_0)); LocalInfo0->lgrpi0_name = Ptr; memcpy(LocalInfo0->lgrpi0_name,

7 years, 9 months

[hbelusca] 73456: [NET]: Correct one entry in the help list of commands.

by hbelusca＠svn.reactos.org

7 years, 9 months

[rnaumann] 73455: [MSTSC] Decrease the size of the header font as it was cropped in some languages.

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Wed Dec 14 21:10:35 2016 New Revision: 73455 URL: http://svn.reactos.org/svn/reactos?rev=73455&view=rev Log: [MSTSC] Decrease the size of the header font as it was cropped in some languages. Modified: trunk/reactos/base/applications/mstsc/connectdialog.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Wed Dec 14 21:10:35 2016 @@ -1244,7 +1244,7 @@ szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) { - lf.lfHeight = 24; + lf.lfHeight = 20; lf.lfCharSet = OEM_CHARSET; lf.lfQuality = DEFAULT_QUALITY; lf.lfWeight = FW_MEDIUM; @@ -1282,7 +1282,7 @@ szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) { - lf.lfHeight = 30; + lf.lfHeight = 24; lf.lfCharSet = OEM_CHARSET; lf.lfQuality = DEFAULT_QUALITY; lf.lfWeight = FW_EXTRABOLD;

7 years, 9 months

[mjansen] 73454: [USRMGR] Load 32bit icons for groups tab. Patch by Jared Smudde. CORE-12547 #resolve #comment Thanks!

by mjansen＠svn.reactos.org

Author: mjansen Date: Wed Dec 14 20:33:39 2016 New Revision: 73454 URL: http://svn.reactos.org/svn/reactos?rev=73454&view=rev Log: [USRMGR] Load 32bit icons for groups tab. Patch by Jared Smudde. CORE-12547 #resolve #comment Thanks! Modified: trunk/reactos/dll/cpl/usrmgr/groups.c trunk/reactos/dll/cpl/usrmgr/userprops.c Modified: trunk/reactos/dll/cpl/usrmgr/groups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groups.c?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] Wed Dec 14 20:33:39 2016 @@ -301,9 +301,9 @@ HICON hIcon; /* Create the image list */ - hImgList = ImageList_Create(16,16,ILC_COLOR8 | ILC_MASK,5,5); - hIcon = LoadImage(hApplet,MAKEINTRESOURCE(IDI_GROUP),IMAGE_ICON,16,16,LR_DEFAULTCOLOR); - ImageList_AddIcon(hImgList,hIcon); + hImgList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 5, 5); + hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_GROUP), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + ImageList_AddIcon(hImgList, hIcon); DestroyIcon(hIcon); hwndListView = GetDlgItem(hwndDlg, IDC_GROUPS_LIST); Modified: trunk/reactos/dll/cpl/usrmgr/userprops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/userprops.c… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/userprops.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/userprops.c [iso-8859-1] Wed Dec 14 20:33:39 2016 @@ -274,7 +274,7 @@ hwndLV = GetDlgItem(hwndDlg, IDC_USER_MEMBERSHIP_LIST); /* Create the image list */ - hImgList = ImageList_Create(16, 16, ILC_COLOR8 | ILC_MASK, 5, 5); + hImgList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 5, 5); hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_GROUP), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); ImageList_AddIcon(hImgList, hIcon); DestroyIcon(hIcon); @@ -382,9 +382,9 @@ hwndLV = GetDlgItem(hwndDlg, IDC_USER_ADD_MEMBERSHIP_LIST); GetClientRect(hwndLV, &rect); - hImgList = ImageList_Create(16,16,ILC_COLOR8 | ILC_MASK,5,5); - hIcon = LoadImage(hApplet,MAKEINTRESOURCE(IDI_GROUP),IMAGE_ICON,16,16,LR_DEFAULTCOLOR); - ImageList_AddIcon(hImgList,hIcon); + hImgList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 5, 5); + hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_GROUP), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + ImageList_AddIcon(hImgList, hIcon); DestroyIcon(hIcon); (void)ListView_SetImageList(hwndLV, hImgList, LVSIL_SMALL);

7 years, 9 months

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2016