winevdm: Move the loading of the system drivers into their specific 16-bit module.
This commit is contained in:
parent
a3e80956d1
commit
40a264b0e7
|
@ -86,6 +86,7 @@ BOOL WINAPI KERNEL_DllEntryPoint( DWORD reasion, HINSTANCE16 inst, WORD ds,
|
|||
|
||||
/* Force loading of some dlls */
|
||||
LoadLibrary16( "system.drv" );
|
||||
LoadLibrary16( "comm.drv" );
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
|
|
@ -69,8 +69,9 @@ CRITICAL_SECTION mmdrv_cs = { &mmdrv_critsect_debug, -1, 0, 0, 0, 0 };
|
|||
BOOL WINAPI MMSYSTEM_LibMain(DWORD fdwReason, HINSTANCE hinstDLL, WORD ds,
|
||||
WORD wHeapSize, DWORD dwReserved1, WORD wReserved2)
|
||||
{
|
||||
TRACE("%p 0x%x\n", hinstDLL, fdwReason);
|
||||
static int done;
|
||||
|
||||
if (!done++) LoadLibrary16( "sound.drv" );
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
|
@ -1940,6 +1940,9 @@ BOOL WINAPI DllEntryPoint( DWORD reason, HINSTANCE16 inst, WORD ds,
|
|||
|
||||
USER_HeapSel = ds;
|
||||
register_wow_handlers();
|
||||
LoadLibrary16( "display.drv" );
|
||||
LoadLibrary16( "keyboard.drv" );
|
||||
LoadLibrary16( "mouse.drv" );
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
|
@ -273,9 +273,6 @@ static BOOL process_attach(void)
|
|||
{
|
||||
LoadLibrary16( "user.exe" );
|
||||
|
||||
/* some Win9x dlls expect keyboard to be loaded */
|
||||
if (GetVersion() & 0x80000000) LoadLibrary16( "keyboard.drv" );
|
||||
|
||||
winstation_init();
|
||||
|
||||
/* Initialize system colors and metrics */
|
||||
|
|
|
@ -438,13 +438,6 @@ int main( int argc, char *argv[] )
|
|||
LoadLibrary16( "user.exe" );
|
||||
LoadLibrary16( "mmsystem.dll" );
|
||||
|
||||
/* make sure system drivers are loaded */
|
||||
LoadLibrary16( "comm.drv" );
|
||||
LoadLibrary16( "display.drv" );
|
||||
LoadLibrary16( "keyboard.drv" );
|
||||
LoadLibrary16( "mouse.drv" );
|
||||
LoadLibrary16( "sound.drv" );
|
||||
|
||||
if ((instance = LoadModule16( appname, ¶ms )) < 32)
|
||||
{
|
||||
if (instance == 11)
|
||||
|
|
Loading…
Reference in New Issue