From 867a6b79d410819314ba3eeec70aaf95a1316660 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Thu, 9 Dec 2010 15:53:55 +0000 Subject: [PATCH] [WIN32K] Merge r49994 and r49995 from reactx branch svn path=/trunk/; revision=49996 --- reactos/subsystems/win32/win32k/eng/ldevobj.c | 8 ++++++-- reactos/subsystems/win32/win32k/ntddraw/ddraw.c | 12 ++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/reactos/subsystems/win32/win32k/eng/ldevobj.c b/reactos/subsystems/win32/win32k/eng/ldevobj.c index 0e6c0eea540..2b3f73aff44 100644 --- a/reactos/subsystems/win32/win32k/eng/ldevobj.c +++ b/reactos/subsystems/win32/win32k/eng/ldevobj.c @@ -355,8 +355,12 @@ EngLoadImageEx( RtlAppendUnicodeToString(&strDriverName, pwsz); /* MSDN says "The driver must include this suffix in the pwszDriver string." - But in fact it's optional. */ - if (_wcsnicmp(pwszDriverName + cwcLength - 4, L".dll", 4) != 0) + But in fact it's optional. + + 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 */ RtlAppendUnicodeToString(&strDriverName, L".dll"); diff --git a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c index 19b6931b01b..604c150fc2e 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c +++ b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c @@ -138,16 +138,8 @@ DxDdStartupDxGraphics( ULONG ulc1, /* Loading the kernel interface of directx for win32k */ - DPRINT1("Warning: trying loading vista dxkrnl.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"); - } - + DPRINT1("Warning: trying loading xp/2003/windows7/reactos dxg.sys\n"); + ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); if ( ghDxGraphics == NULL) { Status = STATUS_DLL_NOT_FOUND;