Author: hbelusca
Date: Thu May 29 23:20:31 2014
New Revision: 63498
URL:
http://svn.reactos.org/svn/reactos?rev=63498&view=rev
Log:
[USERINIT]
- Remove two unuseful imports.
- Rewrite StrToColorref to not use shell functions, and increase a bit the size of the
szColor buffer in SetUserSysColors to match the capabilities of windows.
Modified:
trunk/reactos/base/system/userinit/CMakeLists.txt
trunk/reactos/base/system/userinit/userinit.c
Modified: trunk/reactos/base/system/userinit/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/CMake…
==============================================================================
--- trunk/reactos/base/system/userinit/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/CMakeLists.txt [iso-8859-1] Thu May 29 23:20:31
2014
@@ -2,5 +2,5 @@
add_executable(userinit userinit.c userinit.rc)
target_link_libraries(userinit wine)
set_module_type(userinit win32gui UNICODE)
-add_importlibs(userinit user32 gdi32 advapi32 shell32 shlwapi msvcrt kernel32 ntdll)
+add_importlibs(userinit user32 advapi32 shell32 msvcrt kernel32 ntdll)
add_cd_file(TARGET userinit DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/base/system/userinit/userinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri…
==============================================================================
--- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Thu May 29 23:20:31 2014
@@ -227,7 +227,7 @@
{
if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
(findData.nFileSizeHigh || findData.nFileSizeLow))
{
- memset(&ExecInfo, 0x0, sizeof(SHELLEXECUTEINFOW));
+ ZeroMemory(&ExecInfo, sizeof(SHELLEXECUTEINFOW));
ExecInfo.cbSize = sizeof(ExecInfo);
wcscpy(&szPath[len+1], findData.cFileName);
ExecInfo.lpVerb = L"open";
@@ -430,11 +430,9 @@
TRACE("(%s)\n", debugstr_w(lpszCol));
- rgb[0] = StrToIntW(lpszCol);
- lpszCol = StrChrW(lpszCol, L' ') + 1;
- rgb[1] = StrToIntW(lpszCol);
- lpszCol = StrChrW(lpszCol, L' ') + 1;
- rgb[2] = StrToIntW(lpszCol);
+ rgb[0] = (BYTE)wcstoul(lpszCol, &lpszCol, 10);
+ rgb[1] = (BYTE)wcstoul(lpszCol, &lpszCol, 10);
+ rgb[2] = (BYTE)wcstoul(lpszCol, &lpszCol, 10);
return RGB(rgb[0], rgb[1], rgb[2]);
}
@@ -443,7 +441,7 @@
{
HKEY hKey;
INT i;
- WCHAR szColor[20];
+ WCHAR szColor[25];
DWORD Type, Size;
COLORREF crColor;
LONG rc;