Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-23 11:04:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K]

Browse source 
Merge r49994 and r49995 from reactx branch

svn path=/trunk/; revision=49996
This commit is contained in:
Timo Kreuzer 2010-12-09 15:53:55 +00:00
parent f1892bd3a3
commit 867a6b79d4
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/subsystems/win32/win32k/eng/ldevobj.c
View file

@ -355,8 +355,12 @@ EngLoadImageEx(
RtlAppendUnicodeToString(&strDriverName, pwsz); RtlAppendUnicodeToString(&strDriverName, pwsz);
/* MSDN says "The driver must include this suffix in the pwszDriver string." /* MSDN says "The driver must include this suffix in the pwszDriver string."
But in fact it's optional. */ But in fact it's optional.
if (_wcsnicmp(pwszDriverName + cwcLength - 4, L".dll", 4) != 0)
ms win32k EngLoadImageEx loading .sys file without append .dll
*/
if ( (_wcsnicmp(pwszDriverName + cwcLength - 4, L".dll", 4) != 0) &&
(_wcsnicmp(pwszDriverName + cwcLength - 4, L".sys", 4) != 0) )
{ {
/* Append the .dll suffix */ /* Append the .dll suffix */
RtlAppendUnicodeToString(&strDriverName, L".dll"); RtlAppendUnicodeToString(&strDriverName, L".dll");

10
reactos/subsystems/win32/win32k/ntddraw/ddraw.c
View file

@ -138,16 +138,8 @@ DxDdStartupDxGraphics( ULONG ulc1,
/* Loading the kernel interface of directx for win32k */ /* Loading the kernel interface of directx for win32k */
DPRINT1("Warning: trying loading vista dxkrnl.sys\n"); DPRINT1("Warning: trying loading xp/2003/windows7/reactos dxg.sys\n");
ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxkrnl.sys");
if ( ghDxGraphics == NULL)
{
DPRINT1("Warning: dxkrnl.sys not found\n");
/* try loading vista dx kernel */
DPRINT1("Warning: trying loading xp/2003/reactos dxg.sys\n");
ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys");
}
if ( ghDxGraphics == NULL) if ( ghDxGraphics == NULL)
{ {
Status = STATUS_DLL_NOT_FOUND; Status = STATUS_DLL_NOT_FOUND;