Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 09:13:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix two smaller bugs in DxDdStartupDxGraphics

Browse source 
------------------------------------------------
fix : use full path to dxg.sys when we trying load it
fix : only try unload dxg.sys if it really been load and got a fail status code. 



svn path=/trunk/; revision=30963
This commit is contained in:
Magnus Olsen 2007-12-02 17:31:12 +00:00
parent 7ab27912da
commit 42fa951ba7
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -50,10 +50,12 @@ DxDdStartupDxGraphics( ULONG ulc1,
// DxApiGetVersion() // DxApiGetVersion()
/* Loading the kernel interface of directx for win32k */ /* Loading the kernel interface of directx for win32k */
ghDxGraphics = EngLoadImage(L"drivers\\dxg.sys");
if (!ghDxGraphics) ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys");
if (ghDxGraphics == NULL)
{ {
DPRINT1("Warning: dxg.sys not found\n"); DPRINT1("Warning: dxg.sys not found\n");
Status = STATUS_DLL_NOT_FOUND; Status = STATUS_DLL_NOT_FOUND;
} }
else else
@ -83,8 +85,11 @@ DxDdStartupDxGraphics( ULONG ulc1,
{ {
gpfnStartupDxGraphics = NULL; gpfnStartupDxGraphics = NULL;
gpfnCleanupDxGraphics = NULL; gpfnCleanupDxGraphics = NULL;
EngUnloadImage( ghDxGraphics); if (ghDxGraphics != NULL)
ghDxGraphics = NULL; {
EngUnloadImage( ghDxGraphics);
ghDxGraphics = NULL;
}
DPRINT1("Warning: DirectX graphics interface can not be initialized\n"); DPRINT1("Warning: DirectX graphics interface can not be initialized\n");
} }
else else