Author: ekohl
Date: Sat Dec 6 05:13:50 2008
New Revision: 37891
URL:
http://svn.reactos.org/svn/reactos?rev=37891&view=rev
Log:
Replace call to ExtractIconExW (shell32.dll) by a call to PrivateExtractIconExw
(user32.dll) and remove shell32.dll from the list of linked libraries because shell32.dll
requires a valid user account upon initialization.
Please remember: Don't use high-level DLLs in low-level components (dll or exe)!!!!
Modified:
trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c
trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild
Modified: trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win…
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c [iso-8859-1] Sat Dec 6
05:13:50 2008
@@ -26,6 +26,9 @@
static HWND hAppWindowDlg = NULL;
static HHOOK hhk = NULL;
+UINT WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT);
+
+
BOOL
CALLBACK
EnumWindowEnumProc(
@@ -55,7 +58,7 @@
if (GetModuleFileNameExW(hProcess, NULL, szFileName, MAX_PATH))
{
szFileName[MAX_PATH-1] = L'\0';
- ExtractIconExW(szFileName, 0, &hIcon, NULL, 1);
+ PrivateExtractIconExW(szFileName, 0, &hIcon, NULL, 1);
}
}
}
Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win…
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] Sat Dec 6
05:13:50 2008
@@ -13,9 +13,8 @@
<library>user32</library>
<library>gdi32</library>
<library>advapi32</library>
- <library>win32ksys</library>
+ <library>win32ksys</library>
<library>psapi</library>
- <library>shell32</library>
<pch>w32csr.h</pch>
<file>alias.c</file>
<file>conio.c</file>